[Pkg-virtualbox-commits] [virtualbox] 01/03: Imported Upstream version 5.0.0~RC2-dfsg

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Fri Jun 26 08:02:28 UTC 2015


This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch experimental
in repository virtualbox.

commit 46c7908bf0c48d6de7ed1f73f29e1b24d78550d2
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jun 26 09:51:29 2015 +0200

    Imported Upstream version 5.0.0~RC2-dfsg
---
 .scm-settings                                      |     7 +-
 Config.kmk                                         |    71 +-
 Makefile.kmk                                       |     6 +-
 configure                                          |     2 +-
 doc/manual/Makefile.kmk                            |   612 +-
 doc/manual/common-formatcfg.xsl                    |    76 +
 doc/manual/docbook-htmlhelp-formatcfg.xsl          |    33 +-
 doc/manual/docbook-refentry-to-C-help.xsl          |   879 +
 doc/manual/docbook-refentry-to-H-help.xsl          |    92 +
 .../docbook-refentry-to-manpage-preprocessing.xsl  |    71 +
 ...-to-man.xsl => docbook-refentry-to-manpage.xsl} |     0
 doc/manual/docbook-refentry-to-manual-overview.xsl |    63 +
 doc/manual/docbook-refentry-to-manual-sect1.xsl    |    79 +-
 doc/manual/docbook2latex.xsl                       |   296 +-
 doc/manual/en_US/SDKRef.xml                        |  1884 ++-
 doc/manual/en_US/UserManual.xml                    |    10 +-
 doc/manual/en_US/images/clone-vm.png               |   Bin 100972 -> 87747 bytes
 doc/manual/en_US/images/create-vdi-1.png           |   Bin 81293 -> 134442 bytes
 doc/manual/en_US/images/create-vm-1.png            |   Bin 78820 -> 141652 bytes
 doc/manual/en_US/images/create-vm-2.png            |   Bin 94345 -> 157453 bytes
 doc/manual/en_US/images/dnd-modes.png              |   Bin 84541 -> 149172 bytes
 doc/manual/en_US/images/ovf-import.png             |   Bin 111985 -> 200797 bytes
 doc/manual/en_US/images/seamless.png               |   Bin 874877 -> 2499275 bytes
 doc/manual/en_US/images/virtual-disk-manager.png   |   Bin 100098 -> 94196 bytes
 doc/manual/en_US/images/virtual-disk-manager2.png  |   Bin 115239 -> 107755 bytes
 doc/manual/en_US/images/virtualbox-main-empty.png  |   Bin 81467 -> 108117 bytes
 doc/manual/en_US/images/vm-close.png               |   Bin 24522 -> 27509 bytes
 doc/manual/en_US/images/vm-groups.png              |   Bin 593012 -> 248830 bytes
 doc/manual/en_US/images/vm-hostkey.png             |   Bin 33065 -> 10655 bytes
 doc/manual/en_US/images/vm-settings-harddisk.png   |   Bin 55406 -> 67423 bytes
 doc/manual/en_US/images/vm-vista-running.png       |   Bin 336122 -> 300956 bytes
 doc/manual/en_US/man_VBoxManage-debugvm.xml        |   593 +
 ...nage_extpack.xml => man_VBoxManage-extpack.xml} |    49 +-
 doc/manual/en_US/user_AdvancedTopics.xml           |   268 +-
 doc/manual/en_US/user_BasicConcepts.xml            |    13 +-
 doc/manual/en_US/user_ChangeLog.xml                |    12 +-
 doc/manual/en_US/user_Frontends.xml                |    14 +-
 doc/manual/en_US/user_GuestAdditions.xml           |   211 +-
 doc/manual/en_US/user_Installation.xml             |     8 +-
 doc/manual/en_US/user_Introduction.xml             |     8 +-
 doc/manual/en_US/user_KnownIssues.xml              |    26 +-
 doc/manual/en_US/user_Networking.xml               |    24 +-
 doc/manual/en_US/user_Security.xml                 |   264 +-
 doc/manual/en_US/user_ThirdParty.xml               |    15 +-
 doc/manual/en_US/user_Troubleshooting.xml          |    10 +-
 doc/manual/en_US/user_VBoxManage.xml               |   132 +-
 doc/manual/fr_FR/SDKRef.xml                        |    15 +-
 doc/manual/fr_FR/UserManual.xml                    |    10 +-
 doc/manual/fr_FR/user_GuestAdditions.xml           |    38 +-
 doc/manual/fr_FR/user_Installation.xml             |     8 +-
 doc/manual/fr_FR/user_Introduction.xml             |     2 +-
 doc/manual/fr_FR/user_KnownIssues.xml              |     2 +-
 doc/manual/fr_FR/user_VBoxManage.xml               |    15 +-
 doc/manual/user_ChangeLogImpl.xml                  | 10159 +-----------
 doc/manual/xidl2docbook.xsl                        |    98 +-
 include/Makefile.kmk                               |     2 +-
 include/VBox/ExtPack/ExtPack.h                     |     2 +-
 include/VBox/GuestHost/SharedClipboard.h           |     2 +-
 include/VBox/GuestHost/clipboard-helper.h          |     2 +-
 include/VBox/HGSMI/HGSMIChSetup.h                  |     2 +-
 include/VBox/HGSMI/HGSMIChannels.h                 |     2 +-
 include/VBox/HGSMI/HGSMIDefs.h                     |     2 +-
 include/VBox/HGSMI/HGSMIMemAlloc.h                 |     2 +-
 include/VBox/Hardware/VBoxVideoVBE.h               |     2 +-
 include/VBox/HostServices/GuestControlSvc.h        |     2 +-
 include/VBox/HostServices/GuestPropertySvc.h       |     2 +-
 include/VBox/HostServices/Service.h                |     4 +-
 include/VBox/HostServices/VBoxClipboardExt.h       |     2 +-
 include/VBox/HostServices/VBoxClipboardSvc.h       |     2 +-
 include/VBox/HostServices/VBoxCrOpenGLSvc.h        |     2 +-
 include/VBox/HostServices/VBoxHostChannel.h        |     2 +-
 include/VBox/HostServices/VBoxOGLOp.h              |     2 +-
 include/VBox/HostServices/VBoxOpenGLSvc.h          |     2 +-
 include/VBox/RemoteDesktop/VRDE.h                  |     2 +-
 include/VBox/RemoteDesktop/VRDEImage.h             |     2 +-
 include/VBox/RemoteDesktop/VRDEInput.h             |     2 +-
 include/VBox/RemoteDesktop/VRDEMousePtr.h          |     2 +-
 include/VBox/RemoteDesktop/VRDEOrders.h            |     2 +-
 include/VBox/RemoteDesktop/VRDESCard.h             |     2 +-
 include/VBox/RemoteDesktop/VRDETSMF.h              |     2 +-
 include/VBox/RemoteDesktop/VRDEVideoIn.h           |     2 +-
 include/VBox/SUPDrvMangling.h                      |     2 +-
 include/VBox/VBoxAuth.h                            |     2 +-
 include/VBox/VBoxCocoa.h                           |     2 +-
 include/VBox/VBoxCrHgsmi.h                         |     2 +-
 include/VBox/VBoxDrvCfg-win.h                      |     2 +-
 include/VBox/VBoxGL2D.h                            |     2 +-
 include/VBox/VBoxGuest2.h                          |     2 +-
 include/VBox/VBoxGuestMangling.h                   |     2 +-
 include/VBox/VBoxNetCfg-win.h                      |     2 +-
 .../win/ndis6 => include/VBox}/VBoxNetCmn-win.h    |    11 +-
 include/VBox/VBoxTpG.h                             |     2 +-
 include/VBox/VBoxUhgsmi.h                          |     2 +-
 include/VBox/VBoxVideo.h                           |     4 +-
 include/VBox/VBoxVideo3D.h                         |     2 +-
 include/VBox/VBoxVideoGuest.h                      |     4 +-
 include/VBox/VBoxVideoHost3D.h                     |     2 +-
 include/VBox/VDEPlug.h                             |     2 +-
 include/VBox/VDEPlugSymDefs.h                      |     2 +-
 include/VBox/VMMDev.h                              |     2 +-
 include/VBox/VMMDev2.h                             |     2 +-
 include/VBox/apic.h                                |     2 +-
 include/VBox/asmdefs.mac                           |     2 +-
 include/VBox/bioslogo.h                            |     2 +-
 include/VBox/cdefs.h                               |     2 +-
 include/VBox/com/AutoLock.h                        |     2 +-
 include/VBox/com/ErrorInfo.h                       |     2 +-
 include/VBox/com/EventQueue.h                      |     2 +-
 include/VBox/com/Guid.h                            |     2 +-
 include/VBox/com/MultiResult.h                     |     2 +-
 include/VBox/com/NativeEventQueue.h                |     2 +-
 include/VBox/com/VirtualBox.h                      |     2 +-
 include/VBox/com/array.h                           |     2 +-
 include/VBox/com/assert.h                          |     2 +-
 include/VBox/com/com.h                             |     2 +-
 include/VBox/com/defs.h                            |     2 +-
 include/VBox/com/errorprint.h                      |     2 +-
 include/VBox/com/list.h                            |     2 +-
 include/VBox/com/listeners.h                       |     2 +-
 include/VBox/com/mtlist.h                          |     2 +-
 include/VBox/com/ptr.h                             |     2 +-
 include/VBox/com/string.h                          |     2 +-
 include/VBox/dbggui.h                              |     2 +-
 include/VBox/dbus-calls.h                          |     2 +-
 include/VBox/dbus.h                                |     2 +-
 include/VBox/dis.h                                 |     2 +-
 include/VBox/err.h                                 |    32 +-
 include/VBox/err.mac                               |    31 +-
 include/VBox/err.sed                               |     2 +-
 include/VBox/hgcmsvc.h                             |     2 +-
 include/VBox/intnet.h                              |     2 +-
 include/VBox/intnetinline.h                        |     2 +-
 include/VBox/log.h                                 |     3 +
 include/VBox/msi.h                                 |     2 +-
 include/VBox/nasm.mac                              |     2 +-
 include/VBox/ostypes.h                             |     2 +-
 include/VBox/pci.h                                 |     2 +-
 include/VBox/rawpci.h                              |     2 +-
 include/VBox/refentry.h                            |   107 +
 include/VBox/scsi.h                                |     2 +-
 include/VBox/settings.h                            |    13 +-
 include/VBox/shflsvc.h                             |     2 +-
 include/VBox/sup.h                                 |    14 -
 include/VBox/types.h                               |    17 +-
 include/VBox/usb.h                                 |     2 +-
 include/VBox/usbfilter.h                           |     2 +-
 include/VBox/usblib-darwin.h                       |     2 +-
 include/VBox/usblib-solaris.h                      |     2 +-
 include/VBox/usblib-win.h                          |     2 +-
 include/VBox/usblib.h                              |     2 +-
 include/VBox/vd-cache-backend.h                    |     2 +-
 include/VBox/vd-filter-backend.h                   |     2 +-
 include/VBox/vd-ifs-internal.h                     |     2 +-
 include/VBox/vd-plugin.h                           |     2 +-
 include/VBox/vd.h                                  |     2 +-
 include/VBox/vddbg.h                               |     2 +-
 include/VBox/vmm/cpumctx-v1_6.h                    |     2 +-
 include/VBox/vmm/cpumdis.h                         |     2 +-
 include/VBox/vmm/dbgf.h                            |     2 +-
 include/VBox/vmm/dbgfcorefmt.h                     |    98 +-
 include/VBox/vmm/dbgfsel.h                         |     2 +-
 include/VBox/vmm/dbgftrace.h                       |     2 +-
 include/VBox/vmm/gvmm.h                            |     2 +-
 include/VBox/vmm/hm.h                              |     2 +
 include/VBox/vmm/hm_vmx.h                          |     2 +-
 include/VBox/vmm/hm_vmx.mac                        |     2 +-
 include/VBox/vmm/iem.h                             |     7 +-
 include/VBox/vmm/iom.h                             |    26 +-
 include/VBox/vmm/mm.h                              |     2 +-
 include/VBox/vmm/pdm.h                             |     2 +-
 include/VBox/vmm/pdmasynccompletion.h              |     2 +-
 include/VBox/vmm/pdmasynctask.h                    |     2 +-
 include/VBox/vmm/pdmblkcache.h                     |     2 +-
 include/VBox/vmm/pdmcardreaderinfs.h               |     2 +-
 include/VBox/vmm/pdmcommon.h                       |     2 +-
 include/VBox/vmm/pdmcritsect.h                     |     6 +-
 include/VBox/vmm/pdmcritsectrw.h                   |     2 +-
 include/VBox/vmm/pdmdev.h                          |     2 +-
 include/VBox/vmm/pdmdrv.h                          |     2 +-
 include/VBox/vmm/pdmifs.h                          |    22 +
 include/VBox/vmm/pdmins.h                          |     2 +-
 include/VBox/vmm/pdmnetifs.h                       |     2 +-
 include/VBox/vmm/pdmnetinline.h                    |     2 +-
 include/VBox/vmm/pdmnetshaper.h                    |     2 +-
 include/VBox/vmm/pdmnvram.h                        |     2 +-
 include/VBox/vmm/pdmpci.h                          |     2 +-
 include/VBox/vmm/pdmqueue.h                        |     2 +-
 include/VBox/vmm/pdmsrv.h                          |     2 +-
 include/VBox/vmm/pdmthread.h                       |     2 +-
 include/VBox/vmm/pdmusb.h                          |     7 +-
 include/VBox/vmm/pdmwebcaminfs.h                   |     2 +-
 include/VBox/vmm/pgm.h                             |    62 +-
 include/VBox/vmm/ssm.h                             |     2 +-
 include/VBox/vmm/stam.h                            |     2 +-
 include/VBox/vmm/stam.mac                          |     2 +-
 include/VBox/vmm/trpm.mac                          |     2 +-
 include/VBox/vmm/uvm.h                             |     2 +-
 include/VBox/vmm/vm.h                              |    20 +-
 include/VBox/vmm/vm.mac                            |     2 +-
 include/VBox/vmm/vmapi.h                           |     2 +-
 include/VBox/vmm/vmm.h                             |     6 +-
 include/VBox/vrdpusb.h                             |     2 +-
 include/VBox/vscsi.h                               |     8 +-
 include/VBox/vusb.h                                |    22 +-
 include/iprt/aiomgr.h                              |     2 +-
 include/iprt/alloc.h                               |     2 +-
 include/iprt/asm-amd64-x86.h                       |     2 +-
 include/iprt/asm-math.h                            |     2 +-
 include/iprt/asm.h                                 |     2 +-
 include/iprt/asmdefs.mac                           |     2 +-
 include/iprt/asn1-generator-asn1-decoder.h         |     2 +-
 include/iprt/asn1-generator-core.h                 |     2 +-
 include/iprt/asn1-generator-init.h                 |     2 +-
 include/iprt/asn1-generator-internal-header.h      |     2 +-
 include/iprt/asn1-generator-pass.h                 |     2 +-
 include/iprt/asn1-generator-sanity.h               |     2 +-
 include/iprt/asn1.h                                |     2 +-
 include/iprt/assert.h                              |    18 +-
 include/iprt/base64.h                              |     2 +-
 include/iprt/bignum.h                              |     2 +-
 include/iprt/buildconfig.h                         |     2 +-
 include/iprt/cdefs.h                               |     2 +-
 include/iprt/cidr.h                                |     2 +-
 include/iprt/circbuf.h                             |     2 +-
 include/iprt/condvar.h                             |     2 +-
 include/iprt/coredumper.h                          |     2 +-
 include/iprt/cpp/autores.h                         |     2 +-
 include/iprt/cpp/exception.h                       |     2 +-
 include/iprt/cpp/list.h                            |     2 +-
 include/iprt/cpp/lock.h                            |     2 +-
 include/iprt/cpp/mem.h                             |     2 +-
 include/iprt/cpp/meta.h                            |     2 +-
 include/iprt/cpp/ministring.h                      |     2 +-
 include/iprt/cpp/mtlist.h                          |     2 +-
 include/iprt/cpp/xml.h                             |     2 +-
 include/iprt/cpuset.h                              |     2 +-
 include/iprt/crc.h                                 |     2 +-
 include/iprt/critsect.h                            |     6 +-
 include/iprt/crypto/digest.h                       |     2 +-
 include/iprt/crypto/pem.h                          |     2 +-
 include/iprt/crypto/pkcs7.h                        |     2 +-
 include/iprt/crypto/pkix.h                         |     2 +-
 include/iprt/crypto/rsa.h                          |     2 +-
 include/iprt/crypto/spc.h                          |     2 +-
 include/iprt/crypto/store.h                        |     2 +-
 include/iprt/crypto/taf.h                          |     2 +-
 include/iprt/crypto/tsp.h                          |     2 +-
 include/iprt/crypto/x509.h                         |     2 +-
 include/iprt/ctype.h                               |     2 +-
 include/iprt/dbg.h                                 |     2 +-
 include/iprt/dir.h                                 |     2 +-
 include/iprt/dvm.h                                 |     2 +-
 include/iprt/env.h                                 |     2 +-
 include/iprt/err.mac                               |     3 +
 include/iprt/err.sed                               |     2 +-
 include/iprt/errno.h                               |     2 +-
 include/iprt/file.h                                |     2 +-
 include/iprt/filesystem.h                          |     2 +-
 include/iprt/formats/asn1.h                        |     2 +-
 include/iprt/formats/codeview.h                    |     2 +-
 include/iprt/formats/hfs.h                         |     2 +-
 include/iprt/formats/mach-o.h                      |     2 +-
 include/iprt/formats/mz.mac                        |     2 +-
 include/iprt/formats/pe.mac                        |     2 +-
 include/iprt/formats/xar.h                         |     2 +-
 include/iprt/fs.h                                  |     2 +-
 include/iprt/getopt.h                              |     2 +-
 include/iprt/handle.h                              |     2 +-
 include/iprt/handletable.h                         |     2 +-
 include/iprt/heap.h                                |     2 +-
 include/iprt/http.h                                |     2 +-
 include/iprt/initterm.h                            |     2 +-
 include/iprt/isofs.h                               |     2 +-
 include/iprt/ldr.h                                 |    14 +-
 include/iprt/ldrlazy.h                             |     2 +-
 include/iprt/linux/sysfs.h                         |     2 +-
 include/iprt/list.h                                |     2 +-
 include/iprt/localipc.h                            |     2 +-
 include/iprt/lockvalidator.h                       |     2 +-
 include/iprt/log.h                                 |    28 +-
 include/iprt/mangling.h                            |     2 +-
 include/iprt/manifest.h                            |     2 +-
 include/iprt/md2.h                                 |     2 +-
 include/iprt/md5.h                                 |     2 +-
 include/iprt/mem.h                                 |     2 +-
 include/iprt/memcache.h                            |     2 +-
 include/iprt/memobj.h                              |     2 +-
 include/iprt/mempool.h                             |     2 +-
 include/iprt/memsafer.h                            |     2 +-
 include/iprt/memtracker.h                          |     2 +-
 include/iprt/message.h                             |     2 +-
 include/iprt/mp.h                                  |     2 +-
 include/iprt/net.h                                 |     2 +-
 include/iprt/nocrt/amd64/fenv.h                    |     2 +-
 include/iprt/nocrt/amd64/math.h                    |     2 +-
 include/iprt/nocrt/compiler/compiler.h             |     2 +-
 include/iprt/nocrt/compiler/gcc.h                  |     2 +-
 include/iprt/nocrt/compiler/msc.h                  |     2 +-
 include/iprt/nocrt/fenv.h                          |     2 +-
 include/iprt/nocrt/inttypes.h                      |     2 +-
 include/iprt/nocrt/limits.h                        |     2 +-
 include/iprt/nocrt/math.h                          |     2 +-
 include/iprt/nocrt/setjmp.h                        |     2 +-
 include/iprt/nocrt/stdarg.h                        |     2 +-
 include/iprt/nocrt/stddef.h                        |     2 +-
 include/iprt/nocrt/stdlib.h                        |     2 +-
 include/iprt/nocrt/string.h                        |     2 +-
 include/iprt/nocrt/x86/fenv.h                      |     2 +-
 include/iprt/nocrt/x86/math.h                      |     2 +-
 include/iprt/nt/nt-and-windows.h                   |     2 +-
 include/iprt/nt/nt.h                               |     2 +-
 include/iprt/once.h                                |     2 +-
 include/iprt/param.h                               |     2 +-
 include/iprt/path.h                                |     2 +-
 include/iprt/pipe.h                                |     2 +-
 include/iprt/poll.h                                |     2 +-
 include/iprt/power.h                               |     2 +-
 include/iprt/process.h                             |     2 +-
 include/iprt/rand.h                                |     2 +-
 include/iprt/req.h                                 |     2 +-
 include/iprt/runtime-loader.h                      |     2 +-
 include/iprt/runtime.h                             |     2 +-
 include/iprt/s3.h                                  |     2 +-
 include/iprt/semaphore.h                           |     2 +-
 include/iprt/sg.h                                  |     2 +-
 include/iprt/sha.h                                 |     2 +-
 include/iprt/solaris/kmoddeps.mac                  |     2 +-
 include/iprt/sort.h                                |     2 +-
 include/iprt/spinlock.h                            |     2 +-
 include/iprt/stdarg.h                              |     2 +-
 include/iprt/stdint.h                              |     2 +-
 include/iprt/strcache.h                            |     2 +-
 include/iprt/stream.h                              |     2 +-
 include/iprt/string.h                              |     2 +-
 include/iprt/symlink.h                             |     2 +-
 include/iprt/system.h                              |     2 +-
 include/iprt/table.h                               |     2 +-
 include/iprt/tar.h                                 |     2 +-
 include/iprt/test.h                                |     2 +-
 include/iprt/thread.h                              |     2 +-
 include/iprt/timer.h                               |     2 +-
 include/iprt/trace.h                               |     2 +-
 include/iprt/types.h                               |     2 +-
 include/iprt/udp.h                                 |     2 +-
 include/iprt/uni.h                                 |     2 +-
 include/iprt/uuid.h                                |     2 +-
 include/iprt/vector.h                              |     2 +-
 include/iprt/vfs.h                                 |     2 +-
 include/iprt/vfslowlevel.h                         |     2 +-
 include/iprt/win/lazy-dbghelp.h                    |     2 +-
 include/iprt/x509-branch-collision.h               |     2 +-
 include/iprt/x86.h                                 |     9 +-
 include/iprt/x86.mac                               |    31 +-
 include/iprt/x86extra.mac                          |     2 +-
 include/iprt/zero.h                                |     2 +-
 include/iprt/zip.h                                 |     2 +-
 src/Makefile.kmk                                   |     2 +-
 src/VBox/Additions/Makefile.kmk                    |     2 +-
 src/VBox/Additions/common/Makefile.kmk             |     2 +-
 src/VBox/Additions/common/VBoxControl/Makefile.kmk |     2 +-
 .../Additions/common/VBoxControl/VBoxControl.cpp   |     2 +-
 .../Additions/common/VBoxControl/VBoxControl.rc    |     2 +-
 .../common/VBoxControl/testcase/Makefile.kmk       |     2 +-
 .../common/VBoxControl/testcase/tstVBoxControl.cpp |     2 +-
 src/VBox/Additions/common/VBoxGuest/Makefile.kmk   |     2 +-
 .../Additions/common/VBoxGuest/VBoxGuest-os2.def   |     2 +-
 .../Additions/common/VBoxGuest/VBoxGuest-solaris.c |     2 +
 .../common/VBoxGuest/VBoxGuest-solaris.conf        |     2 +-
 src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp  |     4 +-
 .../Additions/common/VBoxGuest/linux/dkms.conf     |     2 +-
 .../Additions/common/VBoxGuest/solaris/deps.asm    |     2 +-
 .../Additions/common/VBoxGuest/win/VBoxGuest.inf   |     2 +-
 .../Additions/common/VBoxGuest/win/VBoxGuest.rc    |     2 +-
 .../common/VBoxGuest/win/VBoxGuestInst.cpp         |     2 +-
 .../common/VBoxGuestLib/GenericRequest.cpp         |     2 +-
 src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp    |     2 +-
 .../Additions/common/VBoxGuestLib/HGCMInternal.cpp |     2 +-
 src/VBox/Additions/common/VBoxGuestLib/Init.cpp    |     2 +-
 .../Additions/common/VBoxGuestLib/Makefile.kmk     |     2 +-
 src/VBox/Additions/common/VBoxGuestLib/Mouse.cpp   |     2 +-
 .../Additions/common/VBoxGuestLib/PhysHeap.cpp     |     2 +-
 src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp  |     2 +-
 src/VBox/Additions/common/VBoxGuestLib/SysHlp.h    |     2 +-
 .../Additions/common/VBoxGuestLib/VBGLInternal.h   |     2 +-
 .../Additions/common/VBoxGuestLib/VBGLR3Internal.h |     2 +-
 .../Additions/common/VBoxGuestLib/VBoxGuestLog.h   |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp    |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR0LibCrOgl.h      |     2 +-
 .../VBoxGuestLib/VBoxGuestR0LibSharedFolders.c     |     2 +-
 .../VBoxGuestLib/VBoxGuestR0LibSharedFolders.h     |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3Lib.cpp         |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibAdditions.cpp       |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibAutoLogon.cpp       |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp  |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibClipboard.cpp       |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp      |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibCredentials.cpp     |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp       |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp     |   195 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp    |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibGR.cpp       |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp       |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp       |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibGuestUser.cpp       |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibHostChannel.cpp     |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp     |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibLog.cpp      |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp     |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibModule.cpp   |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp    |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp     |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp |     2 +-
 .../VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp   |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibStat.cpp     |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibTime.cpp     |     2 +-
 .../common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp    |     2 +-
 src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp  |     2 +-
 .../VBoxGuestLib/VbglR0CanUsePhysPageList.cpp      |     2 +-
 src/VBox/Additions/common/VBoxService/Makefile.kmk |     2 +-
 .../common/VBoxService/VBoxService-os2.def         |     2 +-
 .../common/VBoxService/VBoxService-win.cpp         |     2 +-
 .../common/VBoxService/VBoxService-win.rc          |     2 +-
 .../Additions/common/VBoxService/VBoxService.cpp   |     4 +-
 .../common/VBoxService/VBoxServiceAutoMount.cpp    |     2 +-
 .../common/VBoxService/VBoxServiceBalloon.cpp      |     2 +-
 .../VBoxService/VBoxServiceClipboard-os2.cpp       |     2 +-
 .../common/VBoxService/VBoxServiceControl.cpp      |     2 +-
 .../common/VBoxService/VBoxServiceControl.h        |     2 +-
 .../VBoxService/VBoxServiceControlProcess.cpp      |     2 +-
 .../VBoxService/VBoxServiceControlSession.cpp      |     2 +-
 .../common/VBoxService/VBoxServiceCpuHotPlug.cpp   |     2 +-
 .../common/VBoxService/VBoxServiceInternal.h       |     4 +-
 .../common/VBoxService/VBoxServicePageSharing.cpp  |    14 +-
 .../common/VBoxService/VBoxServicePropCache.cpp    |     2 +-
 .../common/VBoxService/VBoxServicePropCache.h      |     2 +-
 .../common/VBoxService/VBoxServiceResource-win.h   |     2 +-
 .../common/VBoxService/VBoxServiceStats.cpp        |   134 +-
 .../common/VBoxService/VBoxServiceTimeSync.cpp     |     2 +-
 .../common/VBoxService/VBoxServiceToolBox.cpp      |     2 +-
 .../common/VBoxService/VBoxServiceUtils.cpp        |     2 +-
 .../common/VBoxService/VBoxServiceUtils.h          |     2 +-
 .../common/VBoxService/VBoxServiceVMInfo-win.cpp   |     2 +-
 .../common/VBoxService/VBoxServiceVMInfo.cpp       |     2 +-
 .../common/VBoxService/VBoxServiceVMInfo.h         |     2 +-
 .../common/VBoxService/testcase/Makefile.kmk       |     2 +-
 .../common/VBoxService/testcase/tstUserInfo.cpp    |     2 +-
 src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp  |    16 +-
 .../Additions/common/VBoxVideo/Modesetting.cpp     |     8 +-
 src/VBox/Additions/common/VBoxVideo/VBVABase.cpp   |     2 +-
 src/VBox/Additions/common/crOpenGL/DD_glc.py       |     2 +-
 src/VBox/Additions/common/crOpenGL/DD_glh.py       |     2 +-
 .../common/crOpenGL/Linux_i386_glxapi_exports.py   |     2 +-
 src/VBox/Additions/common/crOpenGL/Makefile.kmk    |     2 +-
 .../common/crOpenGL/SunOS_i386_exports.py          |     2 +-
 .../common/crOpenGL/SunOS_i386_exports_dri.py      |     2 +-
 .../common/crOpenGL/SunOS_i386_glxapi_exports.py   |     2 +-
 src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc    |     2 +-
 src/VBox/Additions/common/crOpenGL/VBoxICDList.h   |     2 +-
 src/VBox/Additions/common/crOpenGL/cr_gl.py        |     2 +-
 src/VBox/Additions/common/crOpenGL/dri_drv.c       |     2 +-
 src/VBox/Additions/common/crOpenGL/dri_drv.h       |     2 +-
 src/VBox/Additions/common/crOpenGL/dri_glx.h       |     2 +-
 src/VBox/Additions/common/crOpenGL/fakedri_drv.c   |     2 +-
 src/VBox/Additions/common/crOpenGL/fakedri_drv.h   |     2 +-
 .../common/crOpenGL/fakedri_glfuncsList.h          |     2 +-
 .../common/crOpenGL/fakedri_glxfuncsList.h         |     2 +-
 .../common/crOpenGL/feedback/feedback_context.c    |     2 +-
 src/VBox/Additions/common/crOpenGL/glx_c_exports.c |     2 +-
 src/VBox/Additions/common/crOpenGL/glx_proto.h     |     2 +-
 src/VBox/Additions/common/crOpenGL/icd_drv.c       |     2 +-
 src/VBox/Additions/common/crOpenGL/icd_drv.h       |     2 +-
 .../common/crOpenGL/pack/packspu_framebuffer.c     |     2 +-
 .../common/crOpenGL/pack/packspu_getshaders.c      |     2 +-
 .../Additions/common/crOpenGL/pack/packspu_glsl.c  |     2 +-
 .../common/crOpenGL/pack/packspu_texture.c         |     2 +-
 .../common/crOpenGL/passthrough/passthroughspu.rc  |     2 +-
 src/VBox/Additions/common/pam/Makefile.kmk         |     2 +-
 src/VBox/Additions/common/pam/pam_vbox.cpp         |     2 +-
 src/VBox/Additions/common/testcase/Makefile.kmk    |     2 +-
 .../Additions/common/testcase/tstPageFusion.cpp    |     2 +-
 src/VBox/Additions/darwin/Installer/Makefile.kmk   |     2 +-
 src/VBox/Additions/darwin/Makefile.kmk             |     2 +-
 src/VBox/Additions/darwin/VBoxClient/Makefile.kmk  |     2 +-
 src/VBox/Additions/freebsd/Makefile.kmk            |     2 +-
 src/VBox/Additions/freebsd/drm/Makefile.kmk        |     2 +-
 src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk    |     2 +-
 src/VBox/Additions/haiku/Makefile.kmk              |     2 +-
 .../Additions/haiku/SharedFolders/Makefile.kmk     |     2 +-
 src/VBox/Additions/haiku/VBoxMouse/Makefile.kmk    |     2 +-
 src/VBox/Additions/haiku/VBoxTray/Makefile.kmk     |     2 +-
 src/VBox/Additions/haiku/VBoxVideo/Makefile.kmk    |     2 +-
 .../haiku/VBoxVideo/accelerant/Makefile.kmk        |     2 +-
 .../Additions/haiku/VBoxVideo/driver/Makefile.kmk  |     2 +-
 src/VBox/Additions/linux/Makefile.kmk              |     2 +-
 src/VBox/Additions/linux/drm/Makefile.kmk          |     2 +-
 src/VBox/Additions/linux/drm/vbox_drv.h            |    12 +-
 src/VBox/Additions/linux/drm/vbox_fb.c             |     4 +
 src/VBox/Additions/linux/drm/vbox_mode.c           |    11 +
 src/VBox/Additions/linux/drm/vbox_ttm.c            |    35 +-
 .../Additions/linux/lightdm-greeter/Makefile.kmk   |     2 +-
 .../liblightdm-gobject-1.5.0/Makefile.kmk          |     2 +-
 .../Additions/linux/sharedfolders/Makefile.kmk     |     2 +-
 src/VBox/Additions/solaris/DRM/Makefile.kmk        |     2 +-
 .../Additions/solaris/Installer/vboxdevlink.sed    |     2 +-
 src/VBox/Additions/solaris/Makefile.kmk            |     2 +-
 src/VBox/Additions/solaris/Mouse/Makefile.kmk      |     2 +-
 .../Additions/solaris/SharedFolders/Makefile.kmk   |     2 +-
 src/VBox/Additions/solaris/Virtio/Makefile.kmk     |     2 +-
 src/VBox/Additions/x11/Makefile.kmk                |     2 +-
 src/VBox/Additions/x11/VBoxClient/Makefile.kmk     |     2 +-
 src/VBox/Additions/x11/VBoxClient/display.cpp      |     6 +-
 src/VBox/Additions/x11/VBoxClient/draganddrop.cpp  |     2 +-
 src/VBox/Additions/x11/VBoxClient/main.cpp         |     2 +-
 .../x11/VBoxClient/testcase/tstSeamlessX11.cpp     |     1 -
 src/VBox/Additions/x11/vboxmouse/Makefile.kmk      |     2 +-
 src/VBox/Additions/x11/vboxvideo/Makefile.kmk      |     2 +-
 src/VBox/Additions/x11/vboxvideo/getmode.c         |    10 +-
 src/VBox/Additions/x11/vboxvideo/helpers.c         |     1 -
 src/VBox/Additions/x11/vboxvideo/pointer.c         |     4 +-
 src/VBox/Additions/x11/vboxvideo/vboxvideo.c       |    11 +-
 src/VBox/Additions/x11/vboxvideo/vboxvideo.h       |     6 +-
 src/VBox/Additions/x11/vboxvideo/vbva.c            |     1 -
 src/VBox/Additions/x11/x11stubs/Makefile.kmk       |     2 +-
 src/VBox/Debugger/DBGCBuiltInSymbols.cpp           |     2 +-
 src/VBox/Debugger/DBGCCmdHlp.cpp                   |     2 +-
 src/VBox/Debugger/DBGCCmdWorkers.cpp               |     2 +-
 src/VBox/Debugger/DBGCEmulateCodeView.cpp          |     2 +-
 src/VBox/Debugger/DBGCEval.cpp                     |     2 +-
 src/VBox/Debugger/DBGCFunctions.cpp                |     2 +-
 src/VBox/Debugger/DBGCGdbRemoteStub.cpp            |     2 +-
 src/VBox/Debugger/DBGCOps.cpp                      |     2 +-
 src/VBox/Debugger/DBGCTcp.cpp                      |     2 +-
 src/VBox/Debugger/DBGConsole.cpp                   |     4 +-
 src/VBox/Debugger/DBGPlugInCommonELF.cpp           |     2 +-
 src/VBox/Debugger/DBGPlugInCommonELF.h             |     2 +-
 src/VBox/Debugger/DBGPlugInCommonELFTmpl.cpp.h     |     2 +-
 src/VBox/Debugger/DBGPlugInDarwin.cpp              |     2 +-
 src/VBox/Debugger/DBGPlugInLinux.cpp               |     2 +-
 src/VBox/Debugger/DBGPlugInOS2.cpp                 |     2 +-
 src/VBox/Debugger/DBGPlugInSolaris.cpp             |     2 +-
 src/VBox/Debugger/DBGPlugInWinNt.cpp               |     2 +-
 src/VBox/Debugger/DBGPlugIns.h                     |     2 +-
 src/VBox/Debugger/Makefile.kmk                     |     2 +-
 src/VBox/Debugger/VBoxDbg.cpp                      |     2 +-
 src/VBox/Debugger/VBoxDbgBase.cpp                  |     2 +-
 src/VBox/Debugger/VBoxDbgBase.h                    |     2 +-
 src/VBox/Debugger/VBoxDbgConsole.cpp               |     2 +-
 src/VBox/Debugger/VBoxDbgConsole.h                 |     2 +-
 src/VBox/Debugger/VBoxDbgDisas.h                   |     2 +-
 src/VBox/Debugger/VBoxDbgGui.cpp                   |     2 +-
 src/VBox/Debugger/VBoxDbgGui.h                     |     2 +-
 src/VBox/Debugger/VBoxDbgStatsQt4.cpp              |     2 +-
 src/VBox/Debugger/VBoxDbgStatsQt4.h                |     2 +-
 src/VBox/Debugger/testcase/tstDBGCParser.cpp       |     2 +-
 src/VBox/Debugger/testcase/tstDBGCStubs.cpp        |     2 +-
 src/VBox/Debugger/testcase/tstVBoxDbg.cpp          |     2 +-
 src/VBox/Devices/Audio/DevIchAc97.cpp              |    18 +-
 src/VBox/Devices/Audio/DevIchHda.cpp               |     2 +-
 src/VBox/Devices/Audio/DevIchHdaCodec.cpp          |     2 +-
 src/VBox/Devices/Audio/DevIchHdaCodec.h            |     2 +-
 src/VBox/Devices/Audio/DevSB16.cpp                 |    39 +-
 src/VBox/Devices/Audio/DrvAudio.cpp                |     2 +-
 src/VBox/Devices/Audio/DrvAudio.h                  |     2 +-
 src/VBox/Devices/Audio/DrvAudioCommon.cpp          |     2 +-
 src/VBox/Devices/Audio/DrvHostALSAAudio.cpp        |     2 -
 src/VBox/Devices/Audio/DrvHostCoreAudio.cpp        |     3 +-
 src/VBox/Devices/Audio/DrvHostNullAudio.cpp        |     1 -
 src/VBox/Devices/Audio/DrvHostOSSAudio.cpp         |     1 -
 src/VBox/Devices/Audio/DrvHostPulseAudio.cpp       |     5 +-
 src/VBox/Devices/Audio/alsa_mangling.h             |     2 +-
 src/VBox/Devices/Audio/alsa_stubs.c                |     2 +-
 src/VBox/Devices/Audio/alsa_stubs.h                |     2 +-
 src/VBox/Devices/Audio/pulse_mangling.h            |     2 +-
 src/VBox/Devices/Audio/pulse_stubs.c               |     2 +-
 src/VBox/Devices/Audio/pulse_stubs.h               |     2 +-
 .../BiosCommonCode/MakeAlternativeSource.cpp       |     2 +-
 src/VBox/Devices/BiosCommonCode/Makefile.kmk       |     2 +-
 src/VBox/Devices/BiosCommonCode/support.asm        |     2 +-
 src/VBox/Devices/Bus/DevPCI.cpp                    |     6 +-
 src/VBox/Devices/Bus/DevPciIch9.cpp                |     6 +-
 src/VBox/Devices/Bus/MsiCommon.cpp                 |     2 +-
 src/VBox/Devices/Bus/MsiCommon.h                   |     2 +-
 src/VBox/Devices/Bus/MsixCommon.cpp                |     2 +-
 src/VBox/Devices/Bus/PCIInternal.h                 |     2 +-
 src/VBox/Devices/Bus/SrvPciRawR0.cpp               |     2 +-
 src/VBox/Devices/Config.kmk                        |     2 +-
 src/VBox/Devices/EFI/DevEFI.cpp                    |     2 +-
 src/VBox/Devices/EFI/DevEFI.h                      |     2 +-
 src/VBox/Devices/EFI/DevSmc.cpp                    |     4 +-
 .../Devices/EFI/Firmware/BaseTools/Makefile.kmk    |     2 +-
 .../BaseTools/Source/C/BootSectImage/Makefile.kmk  |     2 +-
 .../BaseTools/Source/C/Common/Makefile.kmk         |     2 +-
 .../BaseTools/Source/C/EfiLdrImage/Makefile.kmk    |     2 +-
 .../BaseTools/Source/C/EfiRom/Makefile.kmk         |     2 +-
 .../BaseTools/Source/C/GenCrc32/Makefile.kmk       |     2 +-
 .../BaseTools/Source/C/GenFfs/Makefile.kmk         |     2 +-
 .../Firmware/BaseTools/Source/C/GenFv/Makefile.kmk |     2 +-
 .../Firmware/BaseTools/Source/C/GenFw/Makefile.kmk |     2 +-
 .../BaseTools/Source/C/GenPage/Makefile.kmk        |     2 +-
 .../BaseTools/Source/C/GenSec/Makefile.kmk         |     2 +-
 .../BaseTools/Source/C/GenVtf/Makefile.kmk         |     2 +-
 .../Source/C/GnuGenBootSector/Makefile.kmk         |     2 +-
 .../BaseTools/Source/C/LzmaCompress/Makefile.kmk   |     2 +-
 .../EFI/Firmware/BaseTools/Source/C/Makefile.kmk   |     2 +-
 .../Firmware/BaseTools/Source/C/Split/Makefile.kmk |     2 +-
 .../BaseTools/Source/C/TianoCompress/Makefile.kmk  |     2 +-
 .../BaseTools/Source/C/VfrCompile/Makefile.kmk     |     2 +-
 .../BaseTools/Source/C/VolInfo/Makefile.kmk        |     2 +-
 .../EFI/Firmware/BaseTools/Source/Makefile.kmk     |     2 +-
 src/VBox/Devices/EFI/Firmware/Config.kmk           |     2 +-
 src/VBox/Devices/EFI/Firmware/Makefile.kmk         |     2 +-
 .../VBoxPkg/AcpiPlatformDxe/AcpiPlatform.c         |     2 +-
 .../VBoxPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf    |     2 +-
 .../Include/IndustryStandard/VBoxFatImage.h        |     2 +-
 .../EFI/Firmware/VBoxPkg/Include/VBoxDebugLib.h    |     2 +-
 .../EFI/Firmware/VBoxPkg/Include/VBoxMemLayout.h   |     2 +-
 .../Devices/EFI/Firmware/VBoxPkg/Include/VBoxPkg.h |     2 +-
 .../VBoxPkg/Library/AcpiTimerLib/AcpiTimerLib.c    |     2 +-
 .../VBoxPkg/Library/AcpiTimerLib/AcpiTimerLib.inf  |     2 +-
 .../Library/VBoxDebugAgentLib/VBoxDebugAgentLib.c  |     2 +-
 .../VBoxDebugAgentLib/VBoxDebugAgentLib.inf        |     2 +-
 .../VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c    |     2 +-
 .../VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf  |     2 +-
 .../VBoxPkg/Library/VBoxDebugLib/VBoxPrintChar.c   |     2 +-
 .../VBoxPkg/Library/VBoxDebugLib/VBoxPrintGuid.c   |     2 +-
 .../VBoxPkg/Library/VBoxDebugLib/VBoxPrintHex.c    |     2 +-
 .../Library/VBoxDebugLib/VBoxPrintHexDump.c        |     2 +-
 .../VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c |     2 +-
 .../VBoxOemHookStatusCodeLib.c                     |     2 +-
 .../VBoxOemHookStatusCodeLib.inf                   |     2 +-
 .../VBoxPeCoffExtraActionLib.c                     |     2 +-
 .../VBoxPeCoffExtraActionLib.inf                   |     2 +-
 .../VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c     |     2 +-
 .../Library/VBoxPeCoffLib/BasePeCoffLibInternals.h |     2 +-
 .../VBoxPkg/Library/VBoxPeCoffLib/PeCoffLoaderEx.c |     2 +-
 .../Library/VBoxPeCoffLib/VBoxPeCoffLib.inf        |     2 +-
 .../EFI/Firmware/VBoxPkg/PartitionDxe/Apple.c      |     2 +-
 .../Firmware/VBoxPkg/PartitionDxe/ComponentName.c  |     2 +-
 .../EFI/Firmware/VBoxPkg/PartitionDxe/ElTorito.c   |     2 +-
 .../EFI/Firmware/VBoxPkg/PartitionDxe/Gpt.c        |     2 +-
 .../EFI/Firmware/VBoxPkg/PartitionDxe/Mbr.c        |     2 +-
 .../EFI/Firmware/VBoxPkg/PartitionDxe/Partition.c  |     2 +-
 .../EFI/Firmware/VBoxPkg/PartitionDxe/Partition.h  |     2 +-
 .../Firmware/VBoxPkg/PartitionDxe/PartitionDxe.inf |     2 +-
 .../EFI/Firmware/VBoxPkg/PlatformPei/Cmos.c        |     2 +-
 .../EFI/Firmware/VBoxPkg/PlatformPei/Cmos.h        |     2 +-
 .../Devices/EFI/Firmware/VBoxPkg/PlatformPei/Fv.c  |     2 +-
 .../EFI/Firmware/VBoxPkg/PlatformPei/MemDetect.c   |     2 +-
 .../EFI/Firmware/VBoxPkg/PlatformPei/Platform.c    |     2 +-
 .../EFI/Firmware/VBoxPkg/PlatformPei/Platform.h    |     2 +-
 .../Firmware/VBoxPkg/PlatformPei/PlatformPei.inf   |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxAppleSim/Console.c    |     2 +-
 .../Firmware/VBoxPkg/VBoxAppleSim/ConsoleControl.h |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxAppleSim/Cpu.c        |     2 +-
 .../Firmware/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c   |     2 +-
 .../Firmware/VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf |     2 +-
 .../Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsole.c  |     2 +-
 .../Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsole.h  |     2 +-
 .../VBoxPkg/VBoxConsoleDxe/VBoxConsoleDxe.inf      |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFsDxe.c     |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFsDxe.inf   |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFswParam.h  |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxHfs.inf     |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_base.h      |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_core.h      |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.c       |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.h       |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi_base.h  |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi_lib.c   |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.c       |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.h       |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_iso9660.c   |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_lib.c       |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_strfunc.h   |     2 +-
 .../VBoxPkg/VBoxInterceptorDxe/BootService.c       |     2 +-
 .../Firmware/VBoxPkg/VBoxInterceptorDxe/RunTime.c  |     2 +-
 .../VBoxPkg/VBoxInterceptorDxe/VBoxInterceptor.c   |     2 +-
 .../VBoxPkg/VBoxInterceptorDxe/VBoxInterceptor.h   |     2 +-
 .../VBoxInterceptorDxe/VBoxInterceptorDxe.inf      |     2 +-
 .../VBoxInterceptorDxe/boot_service_table.h        |     2 +-
 .../VBoxPkg/VBoxInterceptorDxe/interceptor.h       |     2 +-
 .../VBoxPkg/VBoxInterceptorDxe/print_types.h       |     2 +-
 .../VBoxInterceptorDxe/runtime_service_table.h     |     2 +-
 .../Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicry.c  |     2 +-
 .../Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicry.h  |     2 +-
 .../VBoxPkg/VBoxMimicryDxe/VBoxMimicryDxe.inf      |     2 +-
 .../Firmware/VBoxPkg/VBoxMimicryDxe/mimic_tbl.h    |     2 +-
 .../Devices/EFI/Firmware/VBoxPkg/VBoxMisc/Makefile |     2 +-
 .../Firmware/VBoxPkg/VBoxMisc/efi-app/Readme.txt   |     2 +-
 src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxPkg.dec  |     2 +-
 .../VBoxPkg/VBoxSysTables/LegacyBiosMpTable.h      |     2 +-
 .../VBoxPkg/VBoxSysTables/TableConversion.c        |     2 +-
 .../Firmware/VBoxPkg/VBoxSysTables/VBoxSysTables.c |     2 +-
 .../VBoxPkg/VBoxSysTables/VBoxSysTables.inf        |     2 +-
 .../Firmware/VBoxPkg/VBoxVariable/EmuVariable.c    |     2 +-
 .../Firmware/VBoxPkg/VBoxVariable/InitVariable.c   |     2 +-
 .../VBoxVariable/VBoxVariableRuntimeDxe.inf        |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxVariable/Variable.h   |     2 +-
 .../Firmware/VBoxPkg/VBoxVgaDxe/ComponentName.c    |     2 +-
 .../VBoxPkg/VBoxVgaDxe/DriverSupportedEfiVersion.c |     2 +-
 .../Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/Edid.c |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVga.c      |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVga.h      |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaDxe.inf |     2 +-
 .../VBoxPkg/VBoxVgaDxe/VBoxVgaGraphicsOutput.c     |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.c   |     2 +-
 .../EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.h   |     2 +-
 .../Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaUgaDraw.c   |     2 +-
 .../VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.c        |     2 +-
 .../VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.inf      |     2 +-
 src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd      |   Bin 1048576 -> 1048576 bytes
 src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd      |   Bin 1048576 -> 1048576 bytes
 src/VBox/Devices/EFI/VBoxSmcUtil-darwin.cpp        |     2 +-
 src/VBox/Devices/GIMDev/GIMDev.cpp                 |     4 +-
 src/VBox/Devices/Graphics/BIOS/Makefile.kmk        |     2 +-
 .../Graphics/BIOS/VBoxVgaBiosAlternative.asm       |     6 +-
 .../Graphics/BIOS/VBoxVgaBiosAlternative.md5sum    |     2 +-
 src/VBox/Devices/Graphics/BIOS/inlines.h           |     2 +-
 src/VBox/Devices/Graphics/DevVGA-SVGA.cpp          |    52 +-
 src/VBox/Devices/Graphics/DevVGA-SVGA.h            |     2 +-
 src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.h    |     2 +-
 src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m    |    80 +-
 src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp    |     4 +-
 src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp |     2 +-
 src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.h   |     2 +-
 src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp    |     3 +-
 src/VBox/Devices/Graphics/DevVGA.cpp               |    18 +-
 src/VBox/Devices/Graphics/DevVGA.h                 |     2 +-
 src/VBox/Devices/Graphics/DevVGAModes.h            |     2 +-
 src/VBox/Devices/Graphics/DevVGASavedState.h       |     2 +-
 src/VBox/Devices/Graphics/DevVGATmpl.h             |     2 +-
 src/VBox/Devices/Graphics/DevVGA_VBVA.cpp          |    10 +-
 src/VBox/Devices/Graphics/DevVGA_VDMA.cpp          |     2 +-
 src/VBox/Devices/Graphics/HGSMI/SHGSMIHost.cpp     |     2 +-
 src/VBox/Devices/Graphics/HGSMI/SHGSMIHost.h       |     2 +-
 src/VBox/Devices/Graphics/VBoxSVGA3D.def           |     2 +-
 src/VBox/Devices/Graphics/VBoxSVGA3DObjC.def       |    12 +-
 src/VBox/Devices/Graphics/shaderlib/utils.c        |     2 +-
 src/VBox/Devices/Graphics/shaderlib/vboxext.h      |     2 +-
 .../Graphics/shaderlib/wine/vbox/VBoxDbgGl.c       |     2 +-
 .../Graphics/shaderlib/wine/vbox/VBoxDbgGl.h       |     2 +-
 .../Graphics/shaderlib/wine/vbox/VBoxWineEx.h      |     2 +-
 src/VBox/Devices/Graphics/shaderlib/winoverride.h  |     2 +-
 src/VBox/Devices/Graphics/testcase/dump-vmwgfx.c   |    10 +-
 src/VBox/Devices/Input/DevPS2.cpp                  |     4 +-
 src/VBox/Devices/Input/DrvKeyboardQueue.cpp        |     2 +-
 src/VBox/Devices/Input/DrvMouseQueue.cpp           |     2 +-
 src/VBox/Devices/Input/PS2Dev.h                    |     2 +-
 src/VBox/Devices/Input/PS2K.cpp                    |     2 +-
 src/VBox/Devices/Input/PS2M.cpp                    |     2 +-
 src/VBox/Devices/Input/UsbKbd.cpp                  |     2 +-
 src/VBox/Devices/Input/UsbMouse.cpp                |     2 +-
 src/VBox/Devices/Input/testcase/Makefile.kmk       |     2 +-
 src/VBox/Devices/Input/testcase/tstUsbMouse.cpp    |     2 +-
 src/VBox/Devices/Makefile.kmk                      |    90 +-
 src/VBox/Devices/Misc/VirtualKD.cpp                |     2 +-
 src/VBox/Devices/Network/DevE1000.cpp              |     4 +-
 src/VBox/Devices/Network/DevE1000Phy.cpp           |     2 +-
 src/VBox/Devices/Network/DevE1000Phy.h             |     2 +-
 src/VBox/Devices/Network/DevEEPROM.cpp             |     2 +-
 src/VBox/Devices/Network/DevEEPROM.h               |     2 +-
 src/VBox/Devices/Network/DevINIP.cpp               |     2 +-
 src/VBox/Devices/Network/DevPCNet.cpp              |     4 +-
 src/VBox/Devices/Network/DevVirtioNet.cpp          |     4 +-
 src/VBox/Devices/Network/DrvDedicatedNic.cpp       |     2 +-
 src/VBox/Devices/Network/DrvIntNet.cpp             |     4 +-
 src/VBox/Devices/Network/DrvNAT.cpp                |     2 +-
 src/VBox/Devices/Network/DrvNetShaper.cpp          |     2 +-
 src/VBox/Devices/Network/DrvNetSniffer.cpp         |     2 +-
 src/VBox/Devices/Network/DrvTAP.cpp                |     2 +-
 src/VBox/Devices/Network/DrvUDPTunnel.cpp          |     2 +-
 src/VBox/Devices/Network/DrvVDE.cpp                |     2 +-
 src/VBox/Devices/Network/Pcap.cpp                  |     2 +-
 src/VBox/Devices/Network/Pcap.h                    |     2 +-
 src/VBox/Devices/Network/SrvIntNetR0.cpp           |    12 +-
 src/VBox/Devices/Network/VDEPlug.cpp               |     2 +-
 src/VBox/Devices/Network/lwip-new/Makefile.kmk     |     2 +-
 .../Devices/Network/lwip-new/src/core/ipv4/icmp.c  |     2 +-
 .../Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp |     2 +-
 .../Devices/Network/lwip-new/vbox/VBoxLwipCore.h   |     2 +-
 src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c  |     2 +-
 .../Devices/Network/scripts/VBoxConvertNATStats.sh |     2 +-
 .../Devices/Network/scripts/VBoxPortForwarding.py  |     2 +-
 src/VBox/Devices/Network/slirp/bootp.c             |     2 +-
 src/VBox/Devices/Network/slirp/bootp.h             |     2 +-
 src/VBox/Devices/Network/slirp/cksum.c             |     2 +-
 src/VBox/Devices/Network/slirp/counters.h          |     2 +-
 src/VBox/Devices/Network/slirp/ctl.h               |     2 +-
 src/VBox/Devices/Network/slirp/debug.c             |     2 +-
 src/VBox/Devices/Network/slirp/debug.h             |     2 +-
 src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.c |     2 +-
 src/VBox/Devices/Network/slirp/ext.h               |     2 +-
 src/VBox/Devices/Network/slirp/icmp_var.h          |     2 +-
 src/VBox/Devices/Network/slirp/if.h                |     2 +-
 src/VBox/Devices/Network/slirp/ip.h                |     2 +-
 src/VBox/Devices/Network/slirp/ip_icmp.c           |     2 +-
 src/VBox/Devices/Network/slirp/ip_icmp.h           |     2 +-
 src/VBox/Devices/Network/slirp/ip_icmpwin.c        |     2 +-
 src/VBox/Devices/Network/slirp/ip_input.c          |     2 +-
 src/VBox/Devices/Network/slirp/ip_output.c         |     2 +-
 src/VBox/Devices/Network/slirp/libalias/alias.c    |    11 +-
 .../Devices/Network/slirp/libalias/alias_dns.c     |     4 +-
 src/VBox/Devices/Network/slirp/libslirp.h          |     2 +-
 src/VBox/Devices/Network/slirp/main.h              |     2 +-
 src/VBox/Devices/Network/slirp/misc.c              |     2 +-
 src/VBox/Devices/Network/slirp/misc.h              |     2 +-
 src/VBox/Devices/Network/slirp/queue.h             |     2 +-
 .../Devices/Network/slirp/resolv_conf_parser.c     |     2 +-
 .../Devices/Network/slirp/resolv_conf_parser.h     |     2 +-
 src/VBox/Devices/Network/slirp/sbuf.c              |     2 +-
 src/VBox/Devices/Network/slirp/sbuf.h              |     2 +-
 src/VBox/Devices/Network/slirp/slirp.c             |     2 +-
 src/VBox/Devices/Network/slirp/slirp.h             |     2 +-
 src/VBox/Devices/Network/slirp/slirp_config.h      |     2 +-
 src/VBox/Devices/Network/slirp/slirp_dns.c         |     2 +-
 src/VBox/Devices/Network/slirp/slirp_dns.h         |     2 +-
 src/VBox/Devices/Network/slirp/slirp_state.h       |     4 +-
 src/VBox/Devices/Network/slirp/socket.c            |    30 +-
 src/VBox/Devices/Network/slirp/socket.h            |     2 +-
 src/VBox/Devices/Network/slirp/tcp.h               |     2 +-
 src/VBox/Devices/Network/slirp/tcp_input.c         |     2 +-
 src/VBox/Devices/Network/slirp/tcp_output.c        |     2 +-
 src/VBox/Devices/Network/slirp/tcp_subr.c          |     2 +-
 src/VBox/Devices/Network/slirp/tcp_timer.c         |     2 +-
 src/VBox/Devices/Network/slirp/tcp_timer.h         |     2 +-
 src/VBox/Devices/Network/slirp/tcp_var.h           |     2 +-
 src/VBox/Devices/Network/slirp/tcpip.h             |     2 +-
 src/VBox/Devices/Network/slirp/tftp.c              |     2 +-
 src/VBox/Devices/Network/slirp/tftp.h              |     2 +-
 src/VBox/Devices/Network/slirp/udp.c               |     2 +-
 src/VBox/Devices/Network/slirp/udp.h               |     2 +-
 src/VBox/Devices/Network/slirp/zone.h              |     2 +-
 src/VBox/Devices/Network/testcase/tstDevEEPROM.cpp |     2 +-
 src/VBox/Devices/Network/testcase/tstDevPhy.cpp    |     2 +-
 src/VBox/Devices/Network/testcase/tstIntNet-1.cpp  |     4 +-
 src/VBox/Devices/Network/testcase/tstIntNetR0.cpp  |     2 +-
 src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp              |     2 +-
 src/VBox/Devices/PC/BIOS/Makefile.kmk              |     2 +-
 src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm   |    60 +-
 .../Devices/PC/BIOS/VBoxBiosAlternative.md5sum     |     2 +-
 src/VBox/Devices/PC/BIOS/ahci.c                    |     2 +-
 src/VBox/Devices/PC/BIOS/apm.c                     |     2 +-
 src/VBox/Devices/PC/BIOS/apm_pm.asm                |     2 +-
 src/VBox/Devices/PC/BIOS/ata.c                     |     2 +-
 src/VBox/Devices/PC/BIOS/ata.h                     |     2 +-
 src/VBox/Devices/PC/BIOS/bios.c                    |     2 +-
 src/VBox/Devices/PC/BIOS/biosint.h                 |     2 +-
 src/VBox/Devices/PC/BIOS/boot.c                    |     2 +-
 src/VBox/Devices/PC/BIOS/disk.c                    |     2 +-
 src/VBox/Devices/PC/BIOS/ebda.h                    |     2 +-
 src/VBox/Devices/PC/BIOS/eltorito.c                |     2 +-
 src/VBox/Devices/PC/BIOS/floppy.c                  |    22 +-
 src/VBox/Devices/PC/BIOS/floppyt.c                 |     2 +-
 src/VBox/Devices/PC/BIOS/inlines.h                 |     2 +-
 src/VBox/Devices/PC/BIOS/invop.c                   |     2 +-
 src/VBox/Devices/PC/BIOS/keyboard.c                |     2 +-
 src/VBox/Devices/PC/BIOS/logo.c                    |     2 +-
 src/VBox/Devices/PC/BIOS/orgs.asm                  |     2 +-
 src/VBox/Devices/PC/BIOS/parallel.c                |     2 +-
 src/VBox/Devices/PC/BIOS/pci32.c                   |     2 +-
 src/VBox/Devices/PC/BIOS/pcibio32.asm              |     2 +-
 src/VBox/Devices/PC/BIOS/pcibios.c                 |     2 +-
 src/VBox/Devices/PC/BIOS/pcibios.inc               |     2 +-
 src/VBox/Devices/PC/BIOS/pciutil.c                 |     2 +-
 src/VBox/Devices/PC/BIOS/pciutil.h                 |     2 +-
 src/VBox/Devices/PC/BIOS/pirq.inc                  |     2 +-
 src/VBox/Devices/PC/BIOS/pmode.inc                 |     2 +-
 src/VBox/Devices/PC/BIOS/pmsetup.inc               |     2 +-
 src/VBox/Devices/PC/BIOS/post.c                    |     2 +-
 src/VBox/Devices/PC/BIOS/print.c                   |     2 +-
 src/VBox/Devices/PC/BIOS/ps2mouse.c                |     2 +-
 src/VBox/Devices/PC/BIOS/scsi.c                    |     2 +-
 src/VBox/Devices/PC/BIOS/serial.c                  |     2 +-
 src/VBox/Devices/PC/BIOS/smidmi.inc                |     2 +-
 src/VBox/Devices/PC/BIOS/system.c                  |     2 +-
 src/VBox/Devices/PC/BIOS/timepci.c                 |     2 +-
 src/VBox/Devices/PC/BIOS/vds.c                     |     2 +-
 src/VBox/Devices/PC/DevACPI.cpp                    |     4 +-
 src/VBox/Devices/PC/DevAPIC.cpp                    |     4 +-
 src/VBox/Devices/PC/DevApic.h                      |     2 +-
 src/VBox/Devices/PC/DevDMA.cpp                     |     2 +-
 src/VBox/Devices/PC/DevFwCommon.cpp                |     2 +-
 src/VBox/Devices/PC/DevFwCommon.h                  |     2 +-
 src/VBox/Devices/PC/DevHPET.cpp                    |     4 +-
 src/VBox/Devices/PC/DevIoApic.cpp                  |     4 +-
 src/VBox/Devices/PC/DevLPC.cpp                     |     4 +-
 src/VBox/Devices/PC/DevPIC.cpp                     |     4 +-
 src/VBox/Devices/PC/DevPcArch.cpp                  |     2 +-
 src/VBox/Devices/PC/DevPcBios.cpp                  |     2 +-
 src/VBox/Devices/PC/DevPcBios.h                    |     2 +-
 src/VBox/Devices/PC/DevPit-i8254.cpp               |     4 +-
 src/VBox/Devices/PC/DevRTC.cpp                     |     4 +-
 src/VBox/Devices/PC/DrvACPI.cpp                    |     2 +-
 src/VBox/Devices/PC/DrvAcpiCpu.cpp                 |     2 +-
 src/VBox/Devices/PC/ipxe/Makefile.kmk              |     2 +-
 src/VBox/Devices/PC/vbox-cpuhotplug.dsl            |     2 +-
 src/VBox/Devices/PC/vbox-standard.dsl              |     2 +-
 src/VBox/Devices/PC/vbox.dsl                       |     2 +-
 src/VBox/Devices/Parallel/DevParallel.cpp          |     4 +-
 src/VBox/Devices/Parallel/DrvHostParallel.cpp      |     2 +-
 src/VBox/Devices/Samples/DrvStorageFilter.cpp      |     2 +-
 src/VBox/Devices/Samples/Makefile.kmk              |     2 +-
 src/VBox/Devices/Samples/VBoxSampleDevice.cpp      |     2 +-
 src/VBox/Devices/Serial/DevSerial.cpp              |     4 +-
 src/VBox/Devices/Serial/DrvChar.cpp                |     2 +-
 src/VBox/Devices/Serial/DrvHostSerial.cpp          |     2 +-
 src/VBox/Devices/Serial/DrvNamedPipe.cpp           |     2 +-
 src/VBox/Devices/Serial/DrvRawFile.cpp             |     2 +-
 src/VBox/Devices/Storage/ATAPIPassthrough.cpp      |     2 +-
 src/VBox/Devices/Storage/ATAPIPassthrough.h        |     2 +-
 src/VBox/Devices/Storage/Debug.cpp                 |     2 +-
 src/VBox/Devices/Storage/DevAHCI.cpp               |    11 +-
 src/VBox/Devices/Storage/DevATA.cpp                |  1859 ++-
 src/VBox/Devices/Storage/DevBusLogic.cpp           |    67 +-
 src/VBox/Devices/Storage/DevFdc.cpp                |     4 +-
 src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp       |    60 +-
 src/VBox/Devices/Storage/DevLsiLogicSCSI.h         |     2 +-
 src/VBox/Devices/Storage/DrvBlock.cpp              |     2 +-
 src/VBox/Devices/Storage/DrvDiskIntegrity.cpp      |     2 +-
 src/VBox/Devices/Storage/DrvHostBase.cpp           |     2 +-
 src/VBox/Devices/Storage/DrvHostBase.h             |     2 +-
 src/VBox/Devices/Storage/DrvHostDVD.cpp            |     2 +-
 src/VBox/Devices/Storage/DrvHostFloppy.cpp         |     2 +-
 src/VBox/Devices/Storage/DrvMediaISO.cpp           |     2 +-
 src/VBox/Devices/Storage/DrvRawImage.cpp           |     2 +-
 src/VBox/Devices/Storage/DrvSCSI.cpp               |    25 +-
 src/VBox/Devices/Storage/DrvSCSIHost.cpp           |     2 +-
 src/VBox/Devices/Storage/PIIX3ATABmDma.h           |     2 +-
 src/VBox/Devices/Storage/UsbMsd.cpp                |   107 +-
 src/VBox/Devices/Storage/VBoxSCSI.cpp              |   252 +-
 src/VBox/Devices/Storage/VBoxSCSI.h                |    16 +-
 src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp     |    11 +-
 src/VBox/Devices/Storage/VSCSI/VSCSIInline.h       |     2 +-
 src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h     |     2 +-
 src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp      |     2 +-
 src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp        |     2 +-
 src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp     |     2 +-
 src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp     |     2 +-
 src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp      |     2 +-
 .../Devices/Storage/VSCSI/VSCSIVpdPagePool.cpp     |     2 +-
 src/VBox/Devices/Storage/VSCSI/VSCSIVpdPages.h     |     2 +-
 src/VBox/Devices/Storage/ide.h                     |     2 +-
 src/VBox/Devices/Storage/swab.h                    |     2 +-
 src/VBox/Devices/USB/DevOHCI.cpp                   |   144 +-
 src/VBox/Devices/USB/DrvVUSBRootHub.cpp            |     5 +-
 src/VBox/Devices/USB/USBProxyDevice-stub.cpp       |     2 +-
 src/VBox/Devices/USB/USBProxyDevice.cpp            |     2 +-
 src/VBox/Devices/USB/USBProxyDevice.h              |     2 +-
 src/VBox/Devices/USB/VUSBDevice.cpp                |    35 +-
 src/VBox/Devices/USB/VUSBInternal.h                |    11 +-
 src/VBox/Devices/USB/VUSBReadAhead.cpp             |     2 +-
 src/VBox/Devices/USB/VUSBSniffer.cpp               |     2 +-
 src/VBox/Devices/USB/VUSBSniffer.h                 |     2 +-
 src/VBox/Devices/USB/VUSBUrb.cpp                   |    26 +-
 .../Devices/USB/darwin/USBProxyDevice-darwin.cpp   |     2 +-
 .../Devices/USB/freebsd/USBProxyDevice-freebsd.cpp |     2 +-
 .../Devices/USB/linux/USBProxyDevice-linux.cpp     |     2 +-
 src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp    |     2 +-
 .../Devices/USB/solaris/USBProxyDevice-solaris.cpp |     2 +-
 .../Devices/USB/testcase/tstOhciRegisterAccess.cpp |     2 +-
 src/VBox/Devices/USB/testcase/tstPalmOne.c         |     2 +-
 src/VBox/Devices/USB/testcase/tstTrekStorGo.c      |     2 +-
 .../Devices/USB/usbip/USBProxyDevice-usbip.cpp     |     2 +-
 src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp  |     2 +-
 src/VBox/Devices/USB/win/USBProxyDevice-win.cpp    |     2 +-
 src/VBox/Devices/VMMDev/VMMDev.cpp                 |     4 +-
 src/VBox/Devices/VMMDev/VMMDevHGCM.cpp             |     2 +-
 src/VBox/Devices/VMMDev/VMMDevHGCM.h               |     2 +-
 src/VBox/Devices/VMMDev/VMMDevState.h              |     2 +-
 src/VBox/Devices/VMMDev/VMMDevTesting.cpp          |     2 +-
 src/VBox/Devices/VMMDev/VMMDevTesting.h            |     2 +-
 src/VBox/Devices/VirtIO/Virtio.cpp                 |     2 +-
 src/VBox/Devices/VirtIO/Virtio.h                   |     2 +-
 src/VBox/Devices/build/VBoxDD.d                    |     2 +-
 src/VBox/Devices/build/VBoxDD2.cpp                 |     2 +-
 src/VBox/Devices/build/VBoxDD2.h                   |     2 +-
 src/VBox/Devices/build/VBoxDD2R0.cpp               |     2 +-
 src/VBox/Devices/build/VBoxDDR0.cpp                |     2 +-
 src/VBox/Devices/build/VBoxDDUDeps.cpp             |     2 +-
 src/VBox/Devices/build/vl_vbox.h                   |   374 -
 src/VBox/Devices/testcase/Makefile.kmk             |     4 +-
 src/VBox/Devices/testcase/tstDeviceStructSize.cpp  |     2 +-
 .../Devices/testcase/tstDeviceStructSizeRC.cpp     |     6 +-
 src/VBox/Disassembler/Disasm.cpp                   |     2 +-
 src/VBox/Disassembler/DisasmCore.cpp               |     2 +-
 src/VBox/Disassembler/DisasmFormatBytes.cpp        |     2 +-
 src/VBox/Disassembler/DisasmFormatYasm.cpp         |     2 +-
 src/VBox/Disassembler/DisasmInternal.h             |     2 +-
 src/VBox/Disassembler/DisasmReg.cpp                |     2 +-
 src/VBox/Disassembler/DisasmTables.cpp             |     2 +-
 src/VBox/Disassembler/DisasmTablesX64.cpp          |     2 +-
 src/VBox/Disassembler/Makefile.kmk                 |     2 +-
 src/VBox/Disassembler/testcase/Makefile.kmk        |     2 +-
 src/VBox/Disassembler/testcase/tstAsm.mac          |     2 +-
 src/VBox/Disassembler/testcase/tstAsm3DNow-1.asm   |     2 +-
 src/VBox/Disassembler/testcase/tstAsmFnstsw-1.asm  |     2 +-
 src/VBox/Disassembler/testcase/tstAsmLock-1.asm    |     2 +-
 src/VBox/Disassembler/testcase/tstAsmLock-2.asm    |     2 +-
 src/VBox/Disassembler/testcase/tstAsmLock-3.asm    |     2 +-
 .../Disassembler/testcase/tstAsmMovFixedReg-1.asm  |     2 +-
 src/VBox/Disassembler/testcase/tstAsmMovSeg-1.asm  |     2 +-
 src/VBox/Disassembler/testcase/tstAsmMovzx-1.asm   |     2 +-
 src/VBox/Disassembler/testcase/tstAsmPop-1.asm     |     2 +-
 src/VBox/Disassembler/testcase/tstAsmPush-1.asm    |     2 +-
 src/VBox/Disassembler/testcase/tstAsmRegs-1.asm    |     2 +-
 .../Disassembler/testcase/tstAsmSignExtend-1.asm   |     2 +-
 src/VBox/Disassembler/testcase/tstDisasm-1.cpp     |     2 +-
 src/VBox/Disassembler/testcase/tstDisasm-1A.asm    |     2 +-
 src/VBox/Disassembler/testcase/tstDisasm-2.cpp     |     4 +-
 src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp      |     4 +-
 src/VBox/ExtPacks/BusMouseSample/Makefile.kmk      |     2 +-
 .../ExtPacks/BusMouseSample/VBoxBusMouseMain.cpp   |     2 +-
 src/VBox/ExtPacks/Makefile.kmk                     |     2 +-
 src/VBox/ExtPacks/Skeleton/Makefile.kmk            |     2 +-
 src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp    |     2 +-
 .../VBoxDTrace/.scm-settings}                      |    15 +-
 src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp    |     2 +-
 src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceWrapper.cpp |     2 +-
 src/VBox/ExtPacks/VNC/Makefile.kmk                 |     2 +-
 src/VBox/ExtPacks/VNC/VBoxVNC.cpp                  |     2 +-
 src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp              |     2 +-
 src/VBox/Frontends/Common/Makefile.kmk             |     2 +-
 .../Frontends/Common/VBoxKeyboard/Makefile.kmk     |     2 +-
 src/VBox/Frontends/Makefile.kmk                    |     2 +-
 src/VBox/Frontends/VBoxAutostart/Makefile.kmk      |     2 +-
 src/VBox/Frontends/VBoxBalloonCtrl/Makefile.kmk    |     2 +-
 src/VBox/Frontends/VBoxFB/Makefile.kmk             |     2 +-
 src/VBox/Frontends/VBoxHeadless/Makefile.kmk       |     2 +-
 .../Frontends/VBoxHeadless/testcase/Makefile.kmk   |     2 +-
 src/VBox/Frontends/VBoxManage/Makefile.kmk         |   118 +-
 .../Frontends/VBoxManage/VBoxInternalManage.cpp    |     2 +-
 src/VBox/Frontends/VBoxManage/VBoxManage.cpp       |   126 +-
 src/VBox/Frontends/VBoxManage/VBoxManage.h         |    15 +
 .../VBoxManage/VBoxManageBandwidthControl.cpp      |     2 +
 .../Frontends/VBoxManage/VBoxManageDebugVM.cpp     |   123 +-
 src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp   |   526 +-
 src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp   |    26 +-
 src/VBox/Frontends/VBoxManage/VBoxManageList.cpp   |     4 +-
 .../Frontends/VBoxManage/VBoxManageMetrics.cpp     |    46 +-
 src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp   |    22 +-
 .../Frontends/VBoxManage/VBoxManageModifyVM.cpp    |    62 +-
 src/VBox/Frontends/VBoxSDL/Framebuffer-darwin.m    |     2 +-
 src/VBox/Frontends/VBoxSDL/Framebuffer.h           |    24 +-
 src/VBox/Frontends/VBoxSDL/Makefile.kmk            |     2 +-
 src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m    |    36 +-
 src/VBox/Frontends/VBoxShell/Makefile.kmk          |     2 +-
 src/VBox/Frontends/VirtualBox/VirtualBox1.qrc      |     1 +
 .../Frontends/VirtualBox/VirtualBox1_hidpi.qrc     |     1 +
 src/VBox/Frontends/VirtualBox/VirtualBox2.qrc      |     3 +-
 .../Frontends/VirtualBox/VirtualBox2_hidpi.qrc     |     3 +-
 src/VBox/Frontends/VirtualBox/images/OSE/about.png |   Bin 498695 -> 153570 bytes
 .../VirtualBox/images/OSE/about_hidpi.png          |   Bin 0 -> 384157 bytes
 .../VirtualBox/images/hidpi/hostkey_16px_hidpi.png |   Bin 1366 -> 1496 bytes
 .../VirtualBox/images/hidpi/hostkey_24px_hidpi.png |   Bin 1974 -> 2222 bytes
 .../VirtualBox/images/hidpi/hostkey_32px_hidpi.png |   Bin 3108 -> 3441 bytes
 .../images/hidpi/hostkey_captured_16px_hidpi.png   |   Bin 1434 -> 1552 bytes
 .../hidpi/hostkey_captured_pressed_16px_hidpi.png  |   Bin 1411 -> 1500 bytes
 .../images/hidpi/hostkey_pressed_16px_hidpi.png    |   Bin 1350 -> 1451 bytes
 .../images/hidpi/hostkey_warning_16px_hidpi.png    |   Bin 1843 -> 1977 bytes
 .../images/hidpi/vm_start_headless_16px_hidpi.png  |   Bin 0 -> 1858 bytes
 .../images/hidpi/vm_start_separate_16px_hidpi.png  |   Bin 0 -> 1889 bytes
 .../Frontends/VirtualBox/images/hostkey_16px.png   |   Bin 3317 -> 707 bytes
 .../Frontends/VirtualBox/images/hostkey_24px.png   |   Bin 940 -> 1028 bytes
 .../Frontends/VirtualBox/images/hostkey_32px.png   |   Bin 1366 -> 1496 bytes
 .../VirtualBox/images/hostkey_captured_16px.png    |   Bin 668 -> 682 bytes
 .../images/hostkey_captured_pressed_16px.png       |   Bin 718 -> 707 bytes
 .../VirtualBox/images/hostkey_pressed_16px.png     |   Bin 665 -> 696 bytes
 .../VirtualBox/images/hostkey_warning_16px.png     |   Bin 775 -> 807 bytes
 .../VirtualBox/images/vm_start_headless_16px.png   |   Bin 0 -> 655 bytes
 .../VirtualBox/images/vm_start_separate_16px.png   |   Bin 0 -> 637 bytes
 .../Frontends/VirtualBox/nls/ApprovedLanguages.kmk |     2 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts |    59 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts |  2015 ++-
 .../Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts   |  2016 ++-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts |  1147 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts |  1871 ++-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts |  2236 +--
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts |  1027 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts | 15860 +++++++++----------
 .../Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts   |  1756 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts |  1075 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts |  1748 +-
 .../Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts   |  1032 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts |  1857 ++-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts |  3438 ++--
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts |   657 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts |   645 +-
 .../Frontends/VirtualBox/nls/VirtualBox_km_KH.ts   |  2086 +--
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts |    59 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts |  1020 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts |   652 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts |  1357 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts |  1234 +-
 .../Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts   |    59 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts |  1265 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts |  1377 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts |  1101 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts |  1119 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts |  2635 +--
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts |   659 +-
 src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts |  1087 +-
 .../Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts   |    65 +-
 .../Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts   |   701 +-
 .../Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts   |    59 +-
 src/VBox/Frontends/VirtualBox/nls/qt_eu.ts         |  3677 +++--
 .../Frontends/VirtualBox/src/VBoxFBOverlay.cpp     |    16 +-
 .../src/converter/UIConverterBackendCOM.cpp        |     1 +
 .../VirtualBox/src/extensions/QIArrowSplitter.cpp  |     6 +-
 .../src/extensions/graphics/QIGraphicsView.cpp     |     2 +-
 .../src/extradata/UIExtraDataManager.cpp           |     4 +-
 .../VirtualBox/src/globals/VBoxGlobal.cpp          |     8 +-
 .../VirtualBox/src/medium/UIMediumManager.cpp      |     2 +-
 .../src/platform/darwin/UICocoaSpecialControls.mm  |     8 +-
 .../VirtualBox/src/runtime/UIActionPoolRuntime.cpp |    22 +-
 .../runtime/UIAddDiskEncryptionPasswordDialog.cpp  |     2 +-
 .../VirtualBox/src/runtime/UIDnDDataObject_win.cpp |     2 +-
 .../VirtualBox/src/runtime/UIDnDHandler.cpp        |   227 +-
 .../VirtualBox/src/runtime/UIDnDHandler.h          |    55 +-
 .../VirtualBox/src/runtime/UIDnDMIMEData.cpp       |   207 +-
 .../VirtualBox/src/runtime/UIDnDMIMEData.h         |    32 +-
 .../VirtualBox/src/runtime/UIFrameBuffer.cpp       |    12 +-
 .../VirtualBox/src/runtime/UIIndicatorsPool.cpp    |    13 +-
 .../VirtualBox/src/runtime/UIMachineLogic.cpp      |     8 +
 .../VirtualBox/src/runtime/UIMachineLogic.h        |     3 +
 .../VirtualBox/src/runtime/UIMachineView.cpp       |   223 +-
 .../VirtualBox/src/runtime/UIMachineView.h         |    34 +-
 .../VirtualBox/src/runtime/UIMachineWindow.cpp     |     6 +
 .../VirtualBox/src/runtime/UIMachineWindow.h       |     3 +
 .../VirtualBox/src/runtime/UIMouseHandler.cpp      |    21 +-
 .../Frontends/VirtualBox/src/runtime/UISession.cpp |     4 +
 .../src/runtime/normal/UIMachineViewNormal.cpp     |    21 +-
 .../src/runtime/scale/UIMachineViewScale.cpp       |     6 +-
 .../src/selector/UIActionPoolSelector.cpp          |    32 +-
 .../VirtualBox/src/selector/UISelectorWindow.cpp   |     4 +-
 .../VirtualBox/src/selector/VBoxSnapshotsWgt.cpp   |     2 +-
 .../graphics/details/UIGDetailsElements.cpp        |     2 +-
 .../graphics/details/UIGMachinePreview.cpp         |     4 +-
 .../src/settings/VBoxSettingsSelector.cpp          |     2 +-
 .../global/UIGlobalSettingsNetworkDetailsHost.ui   |     2 +-
 .../global/UIGlobalSettingsNetworkDetailsNAT.ui    |     2 +-
 .../settings/machine/UIMachineSettingsDisplay.cpp  |     2 +-
 .../settings/machine/UIMachineSettingsNetwork.cpp  |    24 +-
 .../settings/machine/UIMachineSettingsStorage.cpp  |     4 +-
 .../VirtualBox/src/widgets/UIProgressDialog.cpp    |     4 +
 .../VirtualBox/src/widgets/UIProgressDialog.h      |    10 +
 .../src/widgets/graphics/UIGraphicsTextPane.cpp    |     2 +-
 .../VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp |    11 +
 .../VirtualBox/src/wizards/newvm/UIWizardNewVM.h   |     1 +
 src/VBox/GuestHost/HGSMI/HGSMICommon.cpp           |     2 +-
 src/VBox/GuestHost/HGSMI/Makefile.kmk              |     2 +-
 src/VBox/GuestHost/Makefile.kmk                    |     2 +-
 src/VBox/GuestHost/OpenGL/Makefile.kmk             |     2 +-
 src/VBox/GuestHost/OpenGL/include/cr_hash.h        |     3 +
 .../GuestHost/OpenGL/spu_loader/dispatchheader.py  |     6 +
 src/VBox/GuestHost/OpenGL/util/hash.c              |    76 +
 src/VBox/GuestHost/OpenGL/util/util.def            |     2 +
 src/VBox/GuestHost/OpenGL/util/vreg.cpp            |     8 +-
 src/VBox/GuestHost/SharedClipboard/Makefile.kmk    |     2 +-
 src/VBox/HostDrivers/Makefile.kmk                  |     4 +-
 src/VBox/HostDrivers/Support/Makefile.kmk          |     3 +
 src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp     |     2 +-
 src/VBox/HostDrivers/Support/SUPDrv.cpp            |    95 +-
 src/VBox/HostDrivers/Support/SUPDrv.d              |     2 +-
 src/VBox/HostDrivers/Support/SUPDrvIDC.h           |     2 +-
 src/VBox/HostDrivers/Support/SUPDrvInternal.h      |     3 +-
 src/VBox/HostDrivers/Support/SUPDrvTracer.cpp      |     2 +-
 src/VBox/HostDrivers/Support/SUPDrvTracerA.asm     |     2 +-
 src/VBox/HostDrivers/Support/SUPLib.cpp            |     2 +-
 src/VBox/HostDrivers/Support/SUPLibInternal.h      |     2 +-
 src/VBox/HostDrivers/Support/SUPLibLdr.cpp         |     2 +-
 src/VBox/HostDrivers/Support/SUPLibSem.cpp         |     2 +-
 src/VBox/HostDrivers/Support/SUPLibTracerA.asm     |     2 +-
 src/VBox/HostDrivers/Support/SUPR0-def-lx.sed      |     2 +-
 src/VBox/HostDrivers/Support/SUPR0-def-pe.sed      |     2 +-
 src/VBox/HostDrivers/Support/SUPR0IdcClient.c      |     2 +-
 .../HostDrivers/Support/SUPR0IdcClientComponent.c  |     2 +-
 .../HostDrivers/Support/SUPR0IdcClientInternal.h   |     2 +-
 src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c |     2 +-
 src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp |     2 +-
 src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp |     2 +-
 .../Support/SUPR3HardenedMainTemplate.cpp          |     2 +-
 .../HostDrivers/Support/SUPR3HardenedNoCrt.cpp     |     2 +-
 .../HostDrivers/Support/SUPR3HardenedVerify.cpp    |     8 +-
 src/VBox/HostDrivers/Support/SUPSvc.cpp            |     2 +-
 src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp      |     2 +-
 src/VBox/HostDrivers/Support/SUPSvcGrant.cpp       |     2 +-
 src/VBox/HostDrivers/Support/SUPSvcInternal.h      |     2 +-
 .../HostDrivers/Support/darwin/SUPDrv-darwin.cpp   |   173 +-
 .../HostDrivers/Support/darwin/SUPLib-darwin.cpp   |     2 +-
 .../Support/darwin/SUPR0IdcClient-darwin.c         |     2 +-
 src/VBox/HostDrivers/Support/darwin/load.sh        |     2 +-
 .../HostDrivers/Support/freebsd/SUPLib-freebsd.cpp |     2 +-
 .../Support/freebsd/SUPR0IdcClient-freebsd.c       |     2 +-
 src/VBox/HostDrivers/Support/linux/Makefile        |     2 +-
 src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c  |     4 +-
 .../HostDrivers/Support/linux/SUPDrv-linux.mod.c   |     2 +-
 .../HostDrivers/Support/linux/SUPLib-linux.cpp     |     2 +-
 .../Support/linux/SUPR0IdcClient-linux.c           |     2 +-
 src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp    |     2 +-
 src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def    |     2 +-
 src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp    |     2 +-
 .../HostDrivers/Support/os2/SUPR0IdcClient-os2.c   |     2 +-
 .../HostDrivers/Support/solaris/SUPDrv-solaris.c   |     2 +-
 .../HostDrivers/Support/solaris/SUPLib-solaris.cpp |     2 +-
 .../Support/solaris/SUPR0IdcClient-solaris.c       |     2 +-
 src/VBox/HostDrivers/Support/solaris/vboxdrv.conf  |     2 +-
 src/VBox/HostDrivers/Support/testcase/Makefile.kmk |     2 +-
 .../HostDrivers/Support/testcase/SUPInstall.cpp    |     2 +-
 .../HostDrivers/Support/testcase/SUPLoggerCtl.cpp  |     2 +-
 .../HostDrivers/Support/testcase/SUPUninstall.cpp  |     2 +-
 .../HostDrivers/Support/testcase/tstContiguous.cpp |     2 +-
 src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp |     2 +-
 .../Support/testcase/tstGetPagingMode.cpp          |     2 +-
 src/VBox/HostDrivers/Support/testcase/tstInit.cpp  |     2 +-
 src/VBox/HostDrivers/Support/testcase/tstInt.cpp   |     2 +-
 src/VBox/HostDrivers/Support/testcase/tstLow.cpp   |     2 +-
 .../Support/testcase/tstNtQueryStuff.cpp           |     2 +-
 src/VBox/HostDrivers/Support/testcase/tstPage.cpp  |     2 +-
 src/VBox/HostDrivers/Support/testcase/tstPin.cpp   |     2 +-
 .../Support/testcase/tstSupLoadModule.cpp          |     4 +-
 .../Support/testcase/tstSupSem-Zombie.cpp          |     2 +-
 .../HostDrivers/Support/testcase/tstSupSem.cpp     |     2 +-
 .../Support/testcase/tstSupTscDelta.cpp            |     1 -
 src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp    |     2 +-
 src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm   |     2 +-
 .../Support/win/SUPHardenedVerify-win.h            |     2 +-
 .../Support/win/SUPHardenedVerifyImage-win.cpp     |     2 +-
 .../Support/win/SUPHardenedVerifyProcess-win.cpp   |     2 +-
 src/VBox/HostDrivers/Support/win/SUPLib-win.cpp    |     2 +-
 .../HostDrivers/Support/win/SUPR0IdcClient-win.c   |     2 +-
 .../Support/win/SUPR3HardenedMain-win.cpp          |     2 +-
 .../Support/win/SUPR3HardenedMainA-win.asm         |     2 +-
 .../Support/win/SUPR3HardenedMainImports-win.cpp   |     2 +-
 .../Support/win/SUPR3HardenedNoCrt-win.cpp         |     2 +-
 src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp    |     2 +-
 src/VBox/HostDrivers/Support/win/VBoxDrv.inf       |     2 +-
 .../HostDrivers/Support/win/VBoxSupLib-win.cpp     |     2 +-
 src/VBox/HostDrivers/Support/win/winstub.com       |   Bin 0 -> 128 bytes
 src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk       |    61 +-
 src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c       |     2 +-
 .../HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h    |     2 +-
 .../VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp        |     2 +-
 .../HostDrivers/VBoxNetAdp/darwin/loadnetadp.sh    |     2 +-
 src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile   |     2 +-
 .../VBoxNetAdp/freebsd/files_vboxnetadp            |     2 +-
 src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile     |     2 +-
 .../VBoxNetAdp/linux/VBoxNetAdp-linux.c            |     2 +-
 .../HostDrivers/VBoxNetAdp/linux/files_vboxnetadp  |     4 +-
 .../VBoxNetAdp/solaris/VBoxNetAdp-solaris.c        |     2 +-
 .../HostDrivers/VBoxNetAdp/solaris/vboxnet.conf    |     2 +-
 .../ndis6 => VBoxNetAdp/win}/VBoxNetAdp-win.cpp    |    90 +-
 .../win/ndis6 => VBoxNetAdp/win}/VBoxNetAdp-win.h  |     2 +-
 .../win/ndis6 => VBoxNetAdp/win}/VBoxNetAdp-win.rc |     2 +-
 .../win/ndis6 => VBoxNetAdp/win}/VBoxNetAdp6.inf   |     2 +-
 src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk       |    66 +-
 src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c       |     2 +-
 src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.rc      |     2 +-
 .../HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h    |     2 +-
 .../VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp        |    84 +-
 .../HostDrivers/VBoxNetFlt/darwin/loadnetflt.sh    |     2 +-
 src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile   |     2 +-
 .../VBoxNetFlt/freebsd/files_vboxnetflt            |     2 +-
 src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile     |     2 +-
 .../VBoxNetFlt/linux/VBoxNetFlt-linux.c            |    49 +-
 .../HostDrivers/VBoxNetFlt/linux/files_vboxnetflt  |     2 +-
 .../VBoxNetFlt/solaris/VBoxNetFlt-solaris.c        |     2 +-
 .../VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c     |     2 +-
 .../HostDrivers/VBoxNetFlt/solaris/vboxbow.conf    |     2 +-
 .../HostDrivers/VBoxNetFlt/solaris/vboxflt.conf    |     2 +-
 .../HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp  |    40 +-
 .../HostDrivers/VBoxNetFlt/win/drv/VBoxNetAdp.inf  |     2 +-
 .../HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt.inf  |     2 +-
 .../VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h         |     2 +-
 .../VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp         |     2 +-
 .../VBoxNetFlt/win/drv/VBoxNetFltM-win.h           |     2 +-
 .../HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM.inf |     2 +-
 .../VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp         |     2 +-
 .../VBoxNetFlt/win/drv/VBoxNetFltP-win.h           |     2 +-
 .../VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp        |     2 +-
 .../VBoxNetFlt/win/drv/VBoxNetFltRt-win.h          |     2 +-
 .../win/{ndis6 => drv}/VBoxNetLwf-win.cpp          |   422 +-
 .../VBoxNetFlt/win/{ndis6 => drv}/VBoxNetLwf-win.h |     2 +-
 .../VBoxNetFlt/win/{ndis6 => drv}/VBoxNetLwf.inf   |     2 +-
 .../VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp         |     2 +-
 .../VBoxNetFlt/win/nobj/VBoxNetFltNobj.def         |     4 +-
 .../VBoxNetFlt/win/nobj/VBoxNetFltNobj.h           |     2 +-
 .../VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h         |     2 +-
 .../VBoxNetFlt/win/nobj/VBoxNetFltNobjT.idl        |     2 +-
 .../VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp     |     2 +-
 .../VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp   |     2 +-
 .../VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp     |     2 +-
 .../VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp   |     2 +-
 .../VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp     |     2 +-
 .../VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp   |     2 +-
 src/VBox/HostDrivers/VBoxPci/Makefile.kmk          |     2 +-
 src/VBox/HostDrivers/VBoxPci/VBoxPci.c             |     2 +-
 src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h     |     2 +-
 src/VBox/HostDrivers/VBoxPci/linux/Makefile        |     2 +-
 src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c |     2 +-
 src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci   |     2 +-
 src/VBox/HostDrivers/VBoxUSB/Makefile.kmk          |     2 +-
 src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp         |     2 +-
 src/VBox/HostDrivers/VBoxUSB/USBLib.cpp            |     2 +-
 src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp  |     2 +-
 src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h    |     2 +-
 src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk   |     2 +-
 .../HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp   |     2 +-
 src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp    |     2 +-
 .../HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h  |     2 +-
 src/VBox/HostDrivers/VBoxUSB/darwin/loadusb.sh     |     2 +-
 .../VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp      |     4 +-
 src/VBox/HostDrivers/VBoxUSB/solaris/Makefile.kmk  |     2 +-
 .../HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp |     2 +-
 .../HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c  |     2 +-
 .../VBoxUSB/solaris/VBoxUSBMon-solaris.c           |     2 +-
 src/VBox/HostDrivers/VBoxUSB/solaris/vboxusb.conf  |     2 +-
 .../HostDrivers/VBoxUSB/solaris/vboxusbmon.conf    |     2 +-
 .../HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp  |     2 +-
 .../HostDrivers/VBoxUSB/win/Install/USBInstall.cpp |     2 +-
 .../VBoxUSB/win/Install/USBUninstall.cpp           |     2 +-
 src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk      |     2 +-
 .../HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp    |     6 +-
 src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.h |     2 +-
 src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbIdc.h  |     2 +-
 .../HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp    |     2 +-
 src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.h |     2 +-
 src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUSB.inf   |     2 +-
 src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbCmn.h  |     2 +-
 .../HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp     |     2 +-
 src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h  |     2 +-
 .../HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.cpp     |    10 +-
 src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.h  |     2 +-
 .../HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp     |     2 +-
 src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.h  |     2 +-
 src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp |     3 +-
 src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.h   |     2 +-
 .../HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp |    15 +-
 .../HostDrivers/VBoxUSB/win/mon/VBoxUSBMon.inf     |     2 +-
 .../HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp     |     2 +-
 src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.h  |     2 +-
 .../HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp    |     2 +-
 src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.h |     2 +-
 .../HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp     |     6 +-
 src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.h  |     2 +-
 .../HostDrivers/VBoxUSB/win/testcase/USBTest.cpp   |     2 +-
 src/VBox/HostDrivers/VBoxUSB/win/usbd/usbd.def     |     2 +-
 src/VBox/HostDrivers/darwin/Makefile.kmk           |     2 +-
 src/VBox/HostDrivers/darwin/VBoxNetSend.h          |     2 +-
 src/VBox/HostDrivers/darwin/loadall.sh             |     2 +-
 src/VBox/HostDrivers/freebsd/Makefile              |     2 +-
 src/VBox/HostDrivers/freebsd/Makefile.kmk          |     2 +-
 src/VBox/HostDrivers/linux/Makefile                |     2 +-
 src/VBox/HostDrivers/linux/Makefile.kmk            |     2 +-
 src/VBox/HostDrivers/linux/build_in_tmp            |     2 +-
 src/VBox/HostDrivers/linux/dkms.conf               |     2 +-
 src/VBox/HostDrivers/linux/do_Module.symvers       |     2 +-
 src/VBox/HostDrivers/linux/do_dkms                 |     2 +-
 src/VBox/HostDrivers/linux/export_modules          |     2 +-
 src/VBox/HostDrivers/linux/load.sh                 |     2 +-
 src/VBox/HostDrivers/linux/loadall.sh              |     2 +-
 src/VBox/HostDrivers/win/Makefile.kmk              |     2 +-
 src/VBox/HostDrivers/win/VBoxDbgLog.h              |     3 +-
 src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp        |     2 +-
 src/VBox/HostDrivers/win/load.cmd                  |     2 +-
 src/VBox/HostDrivers/win/load.sh                   |     2 +-
 src/VBox/HostDrivers/win/loadall.cmd               |     2 +-
 src/VBox/HostDrivers/win/loadall.sh                |     2 +-
 src/VBox/HostServices/DragAndDrop/Makefile.kmk     |     2 +-
 src/VBox/HostServices/GuestControl/Makefile.kmk    |     2 +-
 .../GuestControl/testcase/Makefile.kmk             |     2 +-
 src/VBox/HostServices/GuestProperties/Makefile.kmk |     2 +-
 .../GuestProperties/testcase/Makefile.kmk          |     2 +-
 src/VBox/HostServices/HostChannel/Makefile.kmk     |     2 +-
 src/VBox/HostServices/Makefile.kmk                 |     2 +-
 src/VBox/HostServices/SharedClipboard/Makefile.kmk |     2 +-
 .../SharedClipboard/testcase/Makefile.kmk          |     2 +-
 src/VBox/HostServices/SharedFolders/Makefile.kmk   |     2 +-
 .../SharedFolders/testcase/Makefile.kmk            |     2 +-
 src/VBox/HostServices/SharedOpenGL/Makefile.kmk    |     7 +-
 .../SharedOpenGL/crserver/crservice.cpp            |    34 +-
 .../SharedOpenGL/crserverlib/server_lists.c        |     2 +
 .../SharedOpenGL/crserverlib/server_main.c         |     9 +-
 .../SharedOpenGL/crserverlib/server_misc.c         |     5 +-
 src/VBox/HostServices/SharedOpenGL/dlm/dlm.c       |   171 +-
 src/VBox/HostServices/SharedOpenGL/dlm/dlm.h       |     2 +-
 .../HostServices/SharedOpenGL/dlm/dlm_calllist.c   |     4 +
 .../HostServices/SharedOpenGL/dlm/dlm_generated.py |     4 +
 .../HostServices/SharedOpenGL/dlm/dlm_header.py    |    47 +-
 src/VBox/HostServices/SharedOpenGL/dlm/dlm_lists.c |   577 +-
 src/VBox/HostServices/SharedOpenGL/dlm/dlm_special |     4 +-
 .../SharedOpenGL/expando/expando_special           |     1 +
 .../HostServices/SharedOpenGL/expando/expandospu.c |   208 +-
 .../HostServices/SharedOpenGL/expando/expandospu.h |     1 +
 .../SharedOpenGL/expando/expandospu_init.c         |    11 +
 .../SharedOpenGL/render/renderspu_cocoa_helper.m   |     4 +-
 src/VBox/HostServices/auth/Makefile.kmk            |     2 +-
 src/VBox/HostServices/testcase/Makefile.kmk        |     2 +-
 src/VBox/ImageMounter/VBoxFUSE/Makefile.kmk        |     2 +-
 src/VBox/Installer/common/Makefile.kmk             |     2 +-
 .../darwin/DiskImage/VirtualBox_Uninstall.tool     |    12 +-
 src/VBox/Installer/darwin/Makefile.kmk             |    40 +-
 src/VBox/Installer/darwin/VBoxKEXTs/postflight     |     2 +-
 .../darwin/VirtualBox/VBoxAutostartDarwin.sh       |     2 +-
 src/VBox/Installer/darwin/VirtualBox/preflight     |     2 +-
 .../darwin/VirtualBox_mpkg/distribution.dist       |     2 +-
 src/VBox/Installer/freebsd/Makefile.kmk            |     8 +-
 src/VBox/Installer/freebsd/pkg_plist               |     6 +-
 src/VBox/Installer/freebsd/postdeinstall.sh        |     2 +-
 src/VBox/Installer/freebsd/postinstall.sh          |     2 +-
 src/VBox/Installer/linux/Makefile.include.footer   |     2 +-
 src/VBox/Installer/linux/Makefile.include.header   |     2 +-
 src/VBox/Installer/linux/Makefile.kmk              |     8 +-
 src/VBox/Installer/linux/VBox.sh                   |     2 +-
 src/VBox/Installer/linux/VBoxCreateUSBNode.sh      |     2 +-
 src/VBox/Installer/linux/VBoxSysInfo.sh            |     2 +-
 src/VBox/Installer/linux/deffiles                  |     9 +-
 src/VBox/Installer/linux/distributions_rpm         |     2 +
 src/VBox/Installer/linux/install.sh                |     2 +-
 .../Installer/linux/install_service/Makefile.kmk   |     2 +-
 .../install_service/generate_service_file.cpp      |     2 +-
 .../linux/install_service/init_template.sh         |     2 +-
 .../linux/install_service/install_service.sh       |     2 +-
 src/VBox/Installer/linux/installer-common.sh       |     2 +-
 src/VBox/Installer/linux/routines.sh               |     2 +-
 src/VBox/Installer/linux/rpm/LocalConfig.kmk       |     2 +-
 src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec  |     4 +-
 src/VBox/Installer/linux/rpm/rules                 |     2 +-
 src/VBox/Installer/linux/run-inst.sh               |     2 +-
 src/VBox/Installer/linux/runasroot.sh              |     2 +-
 .../Installer/linux/scripts/VBoxHeadlessXOrg.sh    |     2 +-
 .../linux/scripts/check_module_dependencies.sh     |     2 +-
 src/VBox/Installer/linux/scripts/install.sh        |     2 +-
 src/VBox/Installer/linux/sh-utils.sh               |     2 +-
 src/VBox/Installer/linux/testcase/Makefile.kmk     |     2 +-
 .../Installer/linux/testcase/tstHeadlessXOrg.sh    |     2 +-
 .../Installer/linux/testcase/tstInstallInit.sh     |     2 +-
 src/VBox/Installer/linux/testcase/tstInstaller.sh  |     2 +-
 .../Installer/linux/testcase/tstInstallerLinux.sh  |     2 +-
 src/VBox/Installer/linux/uninstall.sh              |     2 +-
 src/VBox/Installer/linux/vboxautostart-service.sh  |     2 +-
 .../Installer/linux/vboxballoonctrl-service.sh     |     2 +-
 src/VBox/Installer/linux/vboxdrv.sh.in             |     2 +-
 src/VBox/Installer/linux/vboxweb-service.sh        |     2 +-
 src/VBox/Installer/solaris/Makefile.kmk            |     6 +-
 src/VBox/Installer/solaris/VBoxISAExec.c           |     2 +-
 src/VBox/Installer/solaris/VBoxZoneAccess.c        |     2 +-
 src/VBox/Installer/solaris/checkinstall.sh         |    24 +-
 src/VBox/Installer/solaris/makepackage.sh          |     2 +-
 src/VBox/Installer/solaris/pkginstall.sh           |     2 +-
 src/VBox/Installer/solaris/postinstall.sh          |     2 +-
 src/VBox/Installer/solaris/preremove.sh            |     2 +-
 src/VBox/Installer/solaris/smf-vboxautostart.sh    |     2 +-
 src/VBox/Installer/solaris/smf-vboxballoonctrl.sh  |     2 +-
 src/VBox/Installer/solaris/smf-vboxwebsrv.sh       |     2 +-
 src/VBox/Installer/solaris/vboxconfig.sh           |     2 +-
 .../Installer/solaris/virtualbox-autostart.xml     |     2 +-
 .../Installer/solaris/virtualbox-balloonctrl.xml   |     2 +-
 .../Installer/solaris/virtualbox-webservice.xml    |     2 +-
 .../Installer/solaris/virtualbox-zoneaccess.xml    |     2 +-
 src/VBox/Installer/win/InstallHelper/Makefile.kmk  |     2 +-
 .../Installer/win/InstallHelper/VBoxCommon.cpp     |     2 +-
 src/VBox/Installer/win/InstallHelper/VBoxCommon.h  |     2 +-
 .../win/InstallHelper/VBoxInstallHelper.cpp        |    14 +-
 .../win/InstallHelper/VBoxInstallHelper.def        |     7 +-
 src/VBox/Installer/win/Makefile.kmk                |     4 +-
 src/VBox/Installer/win/NLS/de_DE.wxl               |     2 +-
 src/VBox/Installer/win/NLS/en_US.wxl               |     2 +-
 src/VBox/Installer/win/NLS/fa_IR.wxl               |     2 +-
 src/VBox/Installer/win/NLS/fr_FR.wxl               |     2 +-
 src/VBox/Installer/win/NLS/it_IT.wxl               |     2 +-
 src/VBox/Installer/win/NLS/tr_TR.wxl               |     2 +-
 src/VBox/Installer/win/NLS/zh_TW.wxl               |     2 +-
 src/VBox/Installer/win/Properties.wxi              |     2 +-
 src/VBox/Installer/win/Resources/Makefile.kmk      |     2 +-
 src/VBox/Installer/win/Resources/VBoxRes.rc        |     2 +-
 src/VBox/Installer/win/Resources/dummy.cpp         |     2 +-
 src/VBox/Installer/win/Resources/resource.h        |     2 +-
 src/VBox/Installer/win/Stub/Makefile.kmk           |     2 +-
 src/VBox/Installer/win/Stub/VBoxStub.cpp           |     2 +-
 src/VBox/Installer/win/Stub/VBoxStub.h             |     2 +-
 src/VBox/Installer/win/Stub/VBoxStub.rc            |     2 +-
 src/VBox/Installer/win/Stub/VBoxStubCertUtil.cpp   |     2 +-
 src/VBox/Installer/win/Stub/VBoxStubCertUtil.h     |     2 +-
 src/VBox/Installer/win/Stub/resource.h             |     2 +-
 src/VBox/Installer/win/StubBld/Makefile.kmk        |     2 +-
 src/VBox/Installer/win/StubBld/VBoxStubBld.cpp     |     2 +-
 src/VBox/Installer/win/StubBld/VBoxStubBld.h       |     2 +-
 src/VBox/Installer/win/UserInterface.wxi           |     2 +-
 src/VBox/Installer/win/VBoxMergeApp.wxi            |    14 +-
 src/VBox/Installer/win/VBoxMergeApp.wxs            |     2 +-
 src/VBox/Installer/win/VBoxMergeAppCA.wxi          |     2 +-
 src/VBox/Installer/win/VBoxMergeAppSeq.wxi         |     2 +-
 src/VBox/Installer/win/VBoxMergeCOM32On64.wxi      |     2 +-
 src/VBox/Installer/win/VBoxMergeCOM32On64.wxs      |     2 +-
 src/VBox/Installer/win/VBoxMergeCOM32On64CA.wxi    |     2 +-
 src/VBox/Installer/win/VBoxMergeCOM32On64Seq.wxi   |     2 +-
 src/VBox/Installer/win/VBoxMergeNetAdp.wxi         |     2 +-
 src/VBox/Installer/win/VBoxMergeNetAdp.wxs         |     2 +-
 src/VBox/Installer/win/VBoxMergeNetAdp6.wxi        |     2 +-
 src/VBox/Installer/win/VBoxMergeNetAdp6.wxs        |     2 +-
 src/VBox/Installer/win/VBoxMergeNetAdp6CA.wxi      |     2 +-
 src/VBox/Installer/win/VBoxMergeNetAdp6Seq.wxi     |     2 +-
 src/VBox/Installer/win/VBoxMergeNetAdpCA.wxi       |     2 +-
 src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi      |     2 +-
 src/VBox/Installer/win/VBoxMergeNetFlt.wxi         |     2 +-
 src/VBox/Installer/win/VBoxMergeNetFlt.wxs         |     2 +-
 src/VBox/Installer/win/VBoxMergeNetFltCA.wxi       |     2 +-
 src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi      |     2 +-
 src/VBox/Installer/win/VBoxMergeNetLwf.wxi         |     2 +-
 src/VBox/Installer/win/VBoxMergeNetLwf.wxs         |     2 +-
 src/VBox/Installer/win/VBoxMergeNetLwfCA.wxi       |     2 +-
 src/VBox/Installer/win/VBoxMergeNetLwfSeq.wxi      |     2 +-
 src/VBox/Installer/win/VBoxMergePython.wxi         |     2 +-
 src/VBox/Installer/win/VBoxMergePython.wxs         |     2 +-
 src/VBox/Installer/win/VBoxMergePythonCA.wxi       |     2 +-
 src/VBox/Installer/win/VBoxMergePythonSeq.wxi      |     2 +-
 src/VBox/Installer/win/VBoxMergeUSB.wxi            |     2 +-
 src/VBox/Installer/win/VBoxMergeUSB.wxs            |     2 +-
 src/VBox/Installer/win/VBoxMergeUSBCA.wxi          |     2 +-
 src/VBox/Installer/win/VBoxMergeUSBSeq.wxi         |     2 +-
 src/VBox/Installer/win/VirtualBox.wxs              |     4 +-
 src/VBox/Installer/win/VirtualBox_TypeLib.xsl      |     2 +-
 src/VBox/Main/Config.kmk                           |     2 +-
 src/VBox/Main/cbinding/Makefile.kmk                |     2 +-
 src/VBox/Main/cbinding/capiidl.xsl                 |    28 +
 src/VBox/Main/glue/glue-java.xsl                   |    31 +-
 src/VBox/Main/glue/tests/TestVBox.java             |    15 +
 src/VBox/Main/glue/tests/TestVBoxNATEngine.java    |    13 +-
 src/VBox/Main/idl/VirtualBox.dtd                   |     4 +-
 src/VBox/Main/idl/VirtualBox.xidl                  |   305 +-
 src/VBox/Main/idl/apiwrap-server.xsl               |    53 +-
 src/VBox/Main/idl/comimpl.xsl                      |     2 +-
 src/VBox/Main/idl/midl.xsl                         |    35 +-
 src/VBox/Main/idl/xpidl.xsl                        |    39 +-
 src/VBox/Main/include/AudioAdapterImpl.h           |     2 +
 src/VBox/Main/include/ConsoleImpl.h                |     5 -
 src/VBox/Main/include/DHCPServerImpl.h             |     4 +-
 src/VBox/Main/include/DisplayImpl.h                |     8 +
 src/VBox/Main/include/Global.h                     |     1 +
 src/VBox/Main/include/GuestDnDSourceImpl.h         |     2 +-
 src/VBox/Main/include/GuestImpl.h                  |     5 +
 src/VBox/Main/include/GuestOSTypeImpl.h            |     2 +
 src/VBox/Main/include/MachineDebuggerImpl.h        |     2 +-
 src/VBox/Main/include/MachineImpl.h                |     1 +
 src/VBox/Main/include/Performance.h                |    11 +-
 src/VBox/Main/include/PerformanceImpl.h            |   149 +-
 src/VBox/Main/include/RemoteUSBDeviceImpl.h        |    82 +-
 src/VBox/Main/include/SessionImpl.h                |     2 +-
 src/VBox/Main/include/StorageControllerImpl.h      |     2 -
 src/VBox/Main/include/SystemPropertiesImpl.h       |     1 +
 src/VBox/Main/include/USBDeviceImpl.h              |    11 +-
 src/VBox/Main/include/VirtualBoxImpl.h             |     1 +
 src/VBox/Main/src-all/Global.cpp                   |   350 +-
 src/VBox/Main/src-client/ConsoleImpl.cpp           |    57 +-
 src/VBox/Main/src-client/ConsoleImpl2.cpp          |    50 +-
 src/VBox/Main/src-client/DisplayImpl.cpp           |    59 +-
 src/VBox/Main/src-client/GuestDnDPrivate.cpp       |     9 +-
 src/VBox/Main/src-client/GuestDnDSourceImpl.cpp    |   181 +-
 src/VBox/Main/src-client/GuestDnDTargetImpl.cpp    |    14 +-
 src/VBox/Main/src-client/GuestImpl.cpp             |    26 +-
 src/VBox/Main/src-client/MachineDebuggerImpl.cpp   |    53 +-
 src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp   |   123 +-
 src/VBox/Main/src-client/SessionImpl.cpp           |    23 +-
 src/VBox/Main/src-client/xpcom/module.cpp          |     7 +-
 .../Main/src-helper-apps/VBoxExtPackHelperApp.cpp  |     9 +
 src/VBox/Main/src-server/ApplianceImplIO.cpp       |     4 +-
 src/VBox/Main/src-server/ApplianceImplImport.cpp   |    12 +-
 src/VBox/Main/src-server/AudioAdapterImpl.cpp      |    75 +-
 src/VBox/Main/src-server/GuestOSTypeImpl.cpp       |    10 +
 src/VBox/Main/src-server/HostDnsService.cpp        |     2 +-
 src/VBox/Main/src-server/HostDnsService.h          |     8 +-
 src/VBox/Main/src-server/HostImpl.cpp              |     4 +-
 src/VBox/Main/src-server/MachineImpl.cpp           |    37 +-
 src/VBox/Main/src-server/MachineImplCloneVM.cpp    |   122 +-
 src/VBox/Main/src-server/MediumImpl.cpp            |     4 +-
 src/VBox/Main/src-server/NetworkAdapterImpl.cpp    |     2 +-
 src/VBox/Main/src-server/Performance.cpp           |    83 +-
 src/VBox/Main/src-server/PerformanceImpl.cpp       |   291 +-
 src/VBox/Main/src-server/ProgressProxyImpl.cpp     |    14 +-
 src/VBox/Main/src-server/StorageControllerImpl.cpp |    90 +-
 src/VBox/Main/src-server/SystemPropertiesImpl.cpp  |    11 +
 src/VBox/Main/src-server/VirtualBoxImpl.cpp        |    19 +
 src/VBox/Main/src-server/xpcom/server.cpp          |    27 +-
 src/VBox/Main/testcase/Makefile.kmk                |     2 +-
 src/VBox/Main/webservice/vboxweb.cpp               |   192 +-
 src/VBox/Main/xml/Settings.cpp                     |    76 +-
 src/VBox/Makefile.kmk                              |     2 +-
 src/VBox/NetworkServices/DHCP/ClientDataInt.h      |     2 +-
 src/VBox/NetworkServices/DHCP/Config.cpp           |     4 +-
 src/VBox/NetworkServices/DHCP/Config.h             |     2 +-
 src/VBox/NetworkServices/DHCP/Makefile.kmk         |     2 +-
 .../NetworkServices/DHCP/NetworkManagerDhcp.cpp    |     2 +-
 src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp      |     2 +-
 .../NetworkServices/DHCP/VBoxNetDHCPHardened.cpp   |     2 +-
 src/VBox/NetworkServices/Makefile.kmk              |     2 +-
 src/VBox/NetworkServices/NAT/Makefile.kmk          |     2 +-
 src/VBox/NetworkServices/NAT/RTWinPoll.cpp         |     2 +-
 src/VBox/NetworkServices/NAT/RTWinSocketPair.cpp   |     2 +-
 src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp    |     4 +-
 .../NetworkServices/NAT/VBoxNetNATHardened.cpp     |     2 +-
 src/VBox/NetworkServices/NAT/dhcp6.h               |     4 +-
 src/VBox/NetworkServices/NAT/fwtcp.c               |     2 +-
 src/VBox/NetworkServices/NAT/fwudp.c               |     2 +-
 src/VBox/NetworkServices/NAT/lwipopts.h            |     2 +-
 src/VBox/NetworkServices/NAT/portfwd.c             |     2 +-
 src/VBox/NetworkServices/NAT/portfwd.h             |     4 +-
 src/VBox/NetworkServices/NAT/proxy.c               |     2 +-
 src/VBox/NetworkServices/NAT/proxy.h               |     4 +-
 src/VBox/NetworkServices/NAT/proxy_dhcp6ds.c       |     2 +-
 src/VBox/NetworkServices/NAT/proxy_pollmgr.c       |     2 +-
 src/VBox/NetworkServices/NAT/proxy_pollmgr.h       |     4 +-
 src/VBox/NetworkServices/NAT/proxy_rtadvd.c        |     2 +-
 src/VBox/NetworkServices/NAT/proxy_tftpd.c         |     2 +-
 src/VBox/NetworkServices/NAT/pxdns.c               |     2 +-
 src/VBox/NetworkServices/NAT/pxping.c              |     2 +-
 src/VBox/NetworkServices/NAT/pxping_win.c          |     2 +-
 src/VBox/NetworkServices/NAT/pxremap.c             |     2 +-
 src/VBox/NetworkServices/NAT/pxremap.h             |     4 +-
 src/VBox/NetworkServices/NAT/pxtcp.c               |     2 +-
 src/VBox/NetworkServices/NAT/pxtcp.h               |     4 +-
 src/VBox/NetworkServices/NAT/pxudp.c               |     2 +-
 src/VBox/NetworkServices/NAT/rtmon_bsd.c           |     2 +-
 src/VBox/NetworkServices/NAT/rtmon_linux.c         |     2 +-
 src/VBox/NetworkServices/NAT/rtmon_win.c           |     2 +-
 src/VBox/NetworkServices/NAT/tftp.h                |     4 +-
 src/VBox/NetworkServices/NAT/winpoll.h             |     4 +-
 src/VBox/NetworkServices/NAT/winutils.h            |     4 +-
 src/VBox/NetworkServices/NetLib/ComHostUtils.cpp   |     2 +-
 src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp     |     2 +-
 .../NetworkServices/NetLib/VBoxNetBaseService.h    |     2 +-
 src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp   |     2 +-
 src/VBox/NetworkServices/NetLib/VBoxNetLib.h       |     2 +-
 .../NetLib/VBoxNetPortForwardString.cpp            |     2 +-
 src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp     |     2 +-
 .../NetworkServices/NetLib/VBoxPortForwardString.h |     2 +-
 src/VBox/NetworkServices/NetLib/cpp/utils.h        |     2 +-
 src/VBox/NetworkServices/NetLib/shared_ptr.h       |     2 +-
 src/VBox/NetworkServices/NetLib/utils.h            |     2 +-
 src/VBox/RDP/client-1.8.3/Makefile.kmk             |     2 +-
 src/VBox/Runtime/.scm-settings                     |     2 +-
 src/VBox/Runtime/Makefile.kmk                      |     2 +-
 src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp |     2 +-
 src/VBox/Runtime/VBox/dbus.cpp                     |     2 +-
 src/VBox/Runtime/VBox/errmsgvboxcom.xsl            |     2 +-
 src/VBox/Runtime/VBox/log-vbox.cpp                 |     2 +-
 src/VBox/Runtime/VBox/logbackdoor.cpp              |     2 +-
 src/VBox/Runtime/common/alloc/alloc.cpp            |     2 +-
 src/VBox/Runtime/common/alloc/heapoffset.cpp       |     2 +-
 src/VBox/Runtime/common/alloc/heapsimple.cpp       |     2 +-
 src/VBox/Runtime/common/alloc/memcache.cpp         |     2 +-
 src/VBox/Runtime/common/alloc/memtracker.cpp       |     2 +-
 .../Runtime/common/asm/ASMAtomicCmpXchgExU64.asm   |     2 +-
 .../Runtime/common/asm/ASMAtomicCmpXchgU64.asm     |     2 +-
 src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm |     2 +-
 src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm   |     2 +-
 src/VBox/Runtime/common/asm/ASMAtomicUoAndU32.asm  |     2 +-
 src/VBox/Runtime/common/asm/ASMAtomicUoAndU64.asm  |     2 +-
 src/VBox/Runtime/common/asm/ASMAtomicUoDecU32.asm  |     2 +-
 src/VBox/Runtime/common/asm/ASMAtomicUoIncU32.asm  |     2 +-
 src/VBox/Runtime/common/asm/ASMAtomicUoOrU32.asm   |     2 +-
 src/VBox/Runtime/common/asm/ASMAtomicUoOrU64.asm   |     2 +-
 src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm |     2 +-
 src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm   |     2 +-
 src/VBox/Runtime/common/asm/ASMCpuIdExSlow.asm     |     2 +-
 src/VBox/Runtime/common/asm/ASMCpuId_Idx_ECX.asm   |     2 +-
 src/VBox/Runtime/common/asm/ASMGetGDTR.asm         |     2 +-
 src/VBox/Runtime/common/asm/ASMGetIDTR.asm         |     2 +-
 src/VBox/Runtime/common/asm/ASMGetLDTR.asm         |     2 +-
 src/VBox/Runtime/common/asm/ASMGetSegAttr.asm      |     2 +-
 src/VBox/Runtime/common/asm/ASMGetTR.asm           |     2 +-
 .../Runtime/common/asm/ASMMultU32ByU32DivByU32.asm |     2 +-
 .../Runtime/common/asm/ASMMultU64ByU32DivByU32.asm |     2 +-
 src/VBox/Runtime/common/asm/ASMNopPause.asm        |     2 +-
 src/VBox/Runtime/common/asm/ASMRdMsrEx.asm         |     2 +-
 src/VBox/Runtime/common/asm/ASMSetGDTR.asm         |     2 +-
 src/VBox/Runtime/common/asm/ASMSetIDTR.asm         |     2 +-
 src/VBox/Runtime/common/asm/ASMWrMsrEx.asm         |     2 +-
 src/VBox/Runtime/common/asm/asm-fake.cpp           |     2 +-
 src/VBox/Runtime/common/asn1/asn1-basics.cpp       |     2 +-
 src/VBox/Runtime/common/asn1/asn1-cursor.cpp       |     2 +-
 .../Runtime/common/asn1/asn1-default-allocator.cpp |     2 +-
 src/VBox/Runtime/common/asn1/asn1-dump.cpp         |     2 +-
 .../Runtime/common/asn1/asn1-efence-allocator.cpp  |     2 +-
 src/VBox/Runtime/common/asn1/asn1-encode.cpp       |     2 +-
 .../common/asn1/asn1-ut-bitstring-decode.cpp       |     2 +-
 .../common/asn1/asn1-ut-bitstring-template.h       |     2 +-
 src/VBox/Runtime/common/asn1/asn1-ut-bitstring.cpp |     2 +-
 .../Runtime/common/asn1/asn1-ut-boolean-decode.cpp |     2 +-
 .../Runtime/common/asn1/asn1-ut-boolean-template.h |     2 +-
 src/VBox/Runtime/common/asn1/asn1-ut-boolean.cpp   |     2 +-
 .../Runtime/common/asn1/asn1-ut-core-decode.cpp    |     2 +-
 .../Runtime/common/asn1/asn1-ut-core-template.h    |     2 +-
 src/VBox/Runtime/common/asn1/asn1-ut-core.cpp      |     2 +-
 .../Runtime/common/asn1/asn1-ut-dyntype-decode.cpp |     2 +-
 src/VBox/Runtime/common/asn1/asn1-ut-dyntype.cpp   |     2 +-
 .../Runtime/common/asn1/asn1-ut-integer-decode.cpp |     2 +-
 .../Runtime/common/asn1/asn1-ut-integer-template.h |     2 +-
 src/VBox/Runtime/common/asn1/asn1-ut-integer.cpp   |     2 +-
 .../Runtime/common/asn1/asn1-ut-null-decode.cpp    |     2 +-
 src/VBox/Runtime/common/asn1/asn1-ut-null.cpp      |     2 +-
 .../Runtime/common/asn1/asn1-ut-objid-decode.cpp   |     2 +-
 .../Runtime/common/asn1/asn1-ut-objid-template.h   |     2 +-
 src/VBox/Runtime/common/asn1/asn1-ut-objid.cpp     |     2 +-
 .../common/asn1/asn1-ut-octetstring-decode.cpp     |     2 +-
 .../common/asn1/asn1-ut-octetstring-template.h     |     2 +-
 .../Runtime/common/asn1/asn1-ut-octetstring.cpp    |     2 +-
 .../Runtime/common/asn1/asn1-ut-string-decode.cpp  |     2 +-
 .../Runtime/common/asn1/asn1-ut-string-template.h  |     2 +-
 .../Runtime/common/asn1/asn1-ut-string-template2.h |     2 +-
 src/VBox/Runtime/common/asn1/asn1-ut-string.cpp    |     2 +-
 .../Runtime/common/asn1/asn1-ut-time-decode.cpp    |     2 +-
 .../Runtime/common/asn1/asn1-ut-time-template.h    |     2 +-
 .../Runtime/common/asn1/asn1-ut-time-template2.h   |     2 +-
 src/VBox/Runtime/common/asn1/asn1-ut-time.cpp      |     2 +-
 src/VBox/Runtime/common/checksum/RTSha1Digest.cpp  |     2 +-
 .../Runtime/common/checksum/RTSha256Digest.cpp     |     2 +-
 src/VBox/Runtime/common/checksum/adler32.cpp       |     2 +-
 src/VBox/Runtime/common/checksum/alt-md2.cpp       |     2 +-
 src/VBox/Runtime/common/checksum/alt-md5.cpp       |     2 +-
 src/VBox/Runtime/common/checksum/alt-sha1.cpp      |     2 +-
 src/VBox/Runtime/common/checksum/alt-sha256.cpp    |     2 +-
 src/VBox/Runtime/common/checksum/alt-sha512.cpp    |     2 +-
 src/VBox/Runtime/common/checksum/crc32-zlib.cpp    |     2 +-
 src/VBox/Runtime/common/checksum/crc32.cpp         |     2 +-
 src/VBox/Runtime/common/checksum/crc32c.cpp        |     2 +-
 src/VBox/Runtime/common/checksum/crc64.cpp         |     2 +-
 src/VBox/Runtime/common/checksum/ipv4.cpp          |     2 +-
 src/VBox/Runtime/common/checksum/ipv6.cpp          |     2 +-
 src/VBox/Runtime/common/checksum/manifest-file.cpp |     2 +-
 src/VBox/Runtime/common/checksum/manifest.cpp      |     2 +-
 src/VBox/Runtime/common/checksum/manifest2.cpp     |     2 +-
 src/VBox/Runtime/common/checksum/manifest3.cpp     |     2 +-
 src/VBox/Runtime/common/checksum/md2str.cpp        |     2 +-
 src/VBox/Runtime/common/checksum/md5str.cpp        |     2 +-
 src/VBox/Runtime/common/checksum/openssl-md2.cpp   |     2 +-
 src/VBox/Runtime/common/checksum/openssl-md5.cpp   |     2 +-
 src/VBox/Runtime/common/checksum/openssl-sha1.cpp  |     2 +-
 .../Runtime/common/checksum/openssl-sha256.cpp     |     2 +-
 .../Runtime/common/checksum/openssl-sha512.cpp     |     2 +-
 src/VBox/Runtime/common/checksum/sha1str.cpp       |     2 +-
 src/VBox/Runtime/common/checksum/sha224str.cpp     |     2 +-
 src/VBox/Runtime/common/checksum/sha256str.cpp     |     2 +-
 src/VBox/Runtime/common/checksum/sha384str.cpp     |     2 +-
 src/VBox/Runtime/common/checksum/sha512str.cpp     |     2 +-
 src/VBox/Runtime/common/checksum/sha512t224str.cpp |     2 +-
 src/VBox/Runtime/common/checksum/sha512t256str.cpp |     2 +-
 src/VBox/Runtime/common/checksum/x509.cpp          |     2 +-
 .../common/crypto/RTCrStoreCertAddFromFile.cpp     |     2 +-
 src/VBox/Runtime/common/crypto/digest-builtin.cpp  |     2 +-
 src/VBox/Runtime/common/crypto/digest-core.cpp     |     2 +-
 src/VBox/Runtime/common/crypto/iprt-openssl.cpp    |     2 +-
 src/VBox/Runtime/common/crypto/pemfile.cpp         |     2 +-
 .../Runtime/common/crypto/pkcs7-asn1-decoder.cpp   |     2 +-
 src/VBox/Runtime/common/crypto/pkcs7-core.cpp      |     2 +-
 src/VBox/Runtime/common/crypto/pkcs7-init.cpp      |     2 +-
 src/VBox/Runtime/common/crypto/pkcs7-internal.h    |     2 +-
 src/VBox/Runtime/common/crypto/pkcs7-sanity.cpp    |     2 +-
 src/VBox/Runtime/common/crypto/pkcs7-template.h    |     2 +-
 src/VBox/Runtime/common/crypto/pkcs7-verify.cpp    |     2 +-
 .../common/crypto/pkix-signature-builtin.cpp       |     2 +-
 .../Runtime/common/crypto/pkix-signature-builtin.h |     2 +-
 .../Runtime/common/crypto/pkix-signature-core.cpp  |     2 +-
 .../Runtime/common/crypto/pkix-signature-rsa.cpp   |     2 +-
 src/VBox/Runtime/common/crypto/pkix-util.cpp       |     2 +-
 src/VBox/Runtime/common/crypto/pkix-verify.cpp     |     2 +-
 .../Runtime/common/crypto/rsa-asn1-decoder.cpp     |     2 +-
 src/VBox/Runtime/common/crypto/rsa-core.cpp        |     2 +-
 src/VBox/Runtime/common/crypto/rsa-init.cpp        |     2 +-
 src/VBox/Runtime/common/crypto/rsa-internal.h      |     2 +-
 src/VBox/Runtime/common/crypto/rsa-sanity.cpp      |     2 +-
 src/VBox/Runtime/common/crypto/rsa-template.h      |     2 +-
 .../Runtime/common/crypto/spc-asn1-decoder.cpp     |     2 +-
 src/VBox/Runtime/common/crypto/spc-core.cpp        |     2 +-
 src/VBox/Runtime/common/crypto/spc-init.cpp        |     2 +-
 src/VBox/Runtime/common/crypto/spc-internal.h      |     2 +-
 src/VBox/Runtime/common/crypto/spc-sanity.cpp      |     2 +-
 src/VBox/Runtime/common/crypto/spc-template.h      |     2 +-
 src/VBox/Runtime/common/crypto/store-inmem.cpp     |     2 +-
 src/VBox/Runtime/common/crypto/store-internal.h    |     2 +-
 src/VBox/Runtime/common/crypto/store.cpp           |     2 +-
 .../Runtime/common/crypto/taf-asn1-decoder.cpp     |     2 +-
 src/VBox/Runtime/common/crypto/taf-core.cpp        |     2 +-
 src/VBox/Runtime/common/crypto/taf-init.cpp        |     2 +-
 src/VBox/Runtime/common/crypto/taf-internal.h      |     2 +-
 src/VBox/Runtime/common/crypto/taf-sanity.cpp      |     2 +-
 src/VBox/Runtime/common/crypto/taf-template.h      |     2 +-
 .../Runtime/common/crypto/tsp-asn1-decoder.cpp     |     2 +-
 src/VBox/Runtime/common/crypto/tsp-core.cpp        |     2 +-
 src/VBox/Runtime/common/crypto/tsp-init.cpp        |     2 +-
 src/VBox/Runtime/common/crypto/tsp-internal.h      |     2 +-
 src/VBox/Runtime/common/crypto/tsp-sanity.cpp      |     2 +-
 src/VBox/Runtime/common/crypto/tsp-template.h      |     2 +-
 .../Runtime/common/crypto/x509-asn1-decoder.cpp    |     2 +-
 src/VBox/Runtime/common/crypto/x509-certpaths.cpp  |     2 +-
 src/VBox/Runtime/common/crypto/x509-core.cpp       |     2 +-
 src/VBox/Runtime/common/crypto/x509-file.cpp       |     2 +-
 src/VBox/Runtime/common/crypto/x509-init.cpp       |     2 +-
 src/VBox/Runtime/common/crypto/x509-internal.h     |     2 +-
 src/VBox/Runtime/common/crypto/x509-sanity.cpp     |     2 +-
 src/VBox/Runtime/common/crypto/x509-template.h     |     2 +-
 src/VBox/Runtime/common/crypto/x509-verify.cpp     |     2 +-
 src/VBox/Runtime/common/dbg/dbg.cpp                |     2 +-
 src/VBox/Runtime/common/dbg/dbgas.cpp              |     2 +-
 src/VBox/Runtime/common/dbg/dbgcfg.cpp             |     2 +-
 src/VBox/Runtime/common/dbg/dbgmod.cpp             |     2 +-
 src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp     |     2 +-
 src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp    |     2 +-
 src/VBox/Runtime/common/dbg/dbgmoddbghelp.cpp      |     2 +-
 src/VBox/Runtime/common/dbg/dbgmoddeferred.cpp     |     2 +-
 src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp        |     2 +-
 src/VBox/Runtime/common/dbg/dbgmodexports.cpp      |     2 +-
 src/VBox/Runtime/common/dbg/dbgmodldr.cpp          |     2 +-
 src/VBox/Runtime/common/dbg/dbgmodnm.cpp           |     2 +-
 src/VBox/Runtime/common/dvm/dvm.cpp                |     2 +-
 src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp        |     2 +-
 src/VBox/Runtime/common/dvm/dvmgpt.cpp             |     2 +-
 src/VBox/Runtime/common/dvm/dvmmbr.cpp             |     2 +-
 src/VBox/Runtime/common/dvm/dvmvfs.cpp             |     2 +-
 .../Runtime/common/err/RTErrConvertFromErrno.cpp   |     2 +-
 .../Runtime/common/err/RTErrConvertToErrno.cpp     |     2 +-
 src/VBox/Runtime/common/err/errinfo-alloc.cpp      |     2 +-
 src/VBox/Runtime/common/err/errinfo.cpp            |     2 +-
 src/VBox/Runtime/common/err/errmsg.cpp             |     2 +-
 src/VBox/Runtime/common/err/errmsg.sed             |     2 +-
 src/VBox/Runtime/common/err/errmsgcom.sed          |     2 +-
 src/VBox/Runtime/common/err/errmsgxpcom.cpp        |     2 +-
 src/VBox/Runtime/common/filesystem/filesystem.cpp  |     2 +-
 .../Runtime/common/filesystem/filesystemext.cpp    |     2 +-
 src/VBox/Runtime/common/ldr/ldr.cpp                |     2 +-
 src/VBox/Runtime/common/ldr/ldrELF.cpp             |     2 +-
 .../Runtime/common/ldr/ldrELFRelocatable.cpp.h     |     2 +-
 src/VBox/Runtime/common/ldr/ldrEx.cpp              |     2 +-
 src/VBox/Runtime/common/ldr/ldrFile.cpp            |     2 +-
 src/VBox/Runtime/common/ldr/ldrMemory.cpp          |     2 +-
 src/VBox/Runtime/common/ldr/ldrNative.cpp          |     2 +-
 src/VBox/Runtime/common/ldr/ldrPE.cpp              |     2 +-
 src/VBox/Runtime/common/ldr/ldrkStuff.cpp          |     2 +-
 src/VBox/Runtime/common/log/log.cpp                |    32 +-
 src/VBox/Runtime/common/log/logcom.cpp             |     2 +-
 src/VBox/Runtime/common/log/logellipsis.cpp        |     2 +-
 src/VBox/Runtime/common/log/logformat.cpp          |     2 +-
 src/VBox/Runtime/common/log/logrel.cpp             |     2 +-
 src/VBox/Runtime/common/log/logrelellipsis.cpp     |     2 +-
 src/VBox/Runtime/common/math/RTUInt128MulByU64.asm |     2 +-
 src/VBox/Runtime/common/math/bignum-amd64-x86.asm  |     2 +-
 src/VBox/Runtime/common/math/bignum.cpp            |     2 +-
 src/VBox/Runtime/common/math/ceill.asm             |     2 +-
 src/VBox/Runtime/common/math/cosl.asm              |     2 +-
 src/VBox/Runtime/common/math/fabs.asm              |     2 +-
 src/VBox/Runtime/common/math/fabsf.asm             |     2 +-
 src/VBox/Runtime/common/math/fabsl.asm             |     2 +-
 src/VBox/Runtime/common/math/floor.asm             |     2 +-
 src/VBox/Runtime/common/math/floorf.asm            |     2 +-
 src/VBox/Runtime/common/math/floorl.asm            |     2 +-
 src/VBox/Runtime/common/math/ldexpl.asm            |     2 +-
 src/VBox/Runtime/common/math/llrint.asm            |     2 +-
 src/VBox/Runtime/common/math/llrintf.asm           |     2 +-
 src/VBox/Runtime/common/math/llrintl.asm           |     2 +-
 src/VBox/Runtime/common/math/logl.asm              |     2 +-
 src/VBox/Runtime/common/math/lrint.asm             |     2 +-
 src/VBox/Runtime/common/math/lrintf.asm            |     2 +-
 src/VBox/Runtime/common/math/lrintl.asm            |     2 +-
 src/VBox/Runtime/common/math/remainder.asm         |     2 +-
 src/VBox/Runtime/common/math/remainderf.asm        |     2 +-
 src/VBox/Runtime/common/math/remainderl.asm        |     2 +-
 src/VBox/Runtime/common/math/sinl.asm              |     2 +-
 src/VBox/Runtime/common/math/tanl.asm              |     2 +-
 src/VBox/Runtime/common/math/trunc.asm             |     2 +-
 src/VBox/Runtime/common/math/truncf.asm            |     2 +-
 src/VBox/Runtime/common/math/truncl.asm            |     2 +-
 src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp  |     2 +-
 src/VBox/Runtime/common/misc/RTAssertMsg2.cpp      |     2 +-
 src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp   |     2 +-
 .../Runtime/common/misc/RTAssertMsg2AddWeak.cpp    |     2 +-
 .../Runtime/common/misc/RTAssertMsg2AddWeakV.cpp   |     2 +-
 src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp  |     2 +-
 src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp |     2 +-
 src/VBox/Runtime/common/misc/RTFileModeToFlags.cpp |     2 +-
 src/VBox/Runtime/common/misc/RTFileOpenF.cpp       |     2 +-
 src/VBox/Runtime/common/misc/RTFileOpenV.cpp       |     2 +-
 .../Runtime/common/misc/RTMemWipeThoroughly.cpp    |     2 +-
 src/VBox/Runtime/common/misc/aiomgr.cpp            |     2 +-
 src/VBox/Runtime/common/misc/assert.cpp            |     2 +-
 src/VBox/Runtime/common/misc/buildconfig.cpp       |     2 +-
 src/VBox/Runtime/common/misc/cidr.cpp              |     2 +-
 src/VBox/Runtime/common/misc/circbuf.cpp           |     2 +-
 src/VBox/Runtime/common/misc/getopt.cpp            |     2 +-
 src/VBox/Runtime/common/misc/getoptargv.cpp        |     2 +-
 src/VBox/Runtime/common/misc/handle.cpp            |     2 +-
 src/VBox/Runtime/common/misc/handletable.cpp       |     2 +-
 src/VBox/Runtime/common/misc/handletable.h         |     2 +-
 src/VBox/Runtime/common/misc/handletablectx.cpp    |     2 +-
 src/VBox/Runtime/common/misc/handletablesimple.cpp |     2 +-
 src/VBox/Runtime/common/misc/http.cpp              |     2 +-
 src/VBox/Runtime/common/misc/lockvalidator.cpp     |     2 +-
 src/VBox/Runtime/common/misc/message.cpp           |     2 +-
 src/VBox/Runtime/common/misc/once.cpp              |     2 +-
 src/VBox/Runtime/common/misc/req.cpp               |     2 +-
 src/VBox/Runtime/common/misc/reqpool.cpp           |     2 +-
 src/VBox/Runtime/common/misc/reqqueue.cpp          |     2 +-
 src/VBox/Runtime/common/misc/s3.cpp                |     2 +-
 src/VBox/Runtime/common/misc/sanity-c.c            |     2 +-
 src/VBox/Runtime/common/misc/sanity-cpp.cpp        |     2 +-
 src/VBox/Runtime/common/misc/sanity.h              |     2 +-
 src/VBox/Runtime/common/misc/semspingpong.cpp      |     2 +-
 src/VBox/Runtime/common/misc/setjmp.asm            |     2 +-
 src/VBox/Runtime/common/misc/sg.cpp                |     2 +-
 src/VBox/Runtime/common/misc/term.cpp              |     2 +-
 src/VBox/Runtime/common/misc/thread.cpp            |     2 +-
 src/VBox/Runtime/common/misc/uri.cpp               |     2 +-
 src/VBox/Runtime/common/misc/zero.asm              |     2 +-
 src/VBox/Runtime/common/net/macstr.cpp             |     2 +-
 src/VBox/Runtime/common/net/netaddrstr.cpp         |     2 +-
 src/VBox/Runtime/common/net/netaddrstr2.cpp        |     2 +-
 src/VBox/Runtime/common/path/RTPathAbsDup.cpp      |     2 +-
 src/VBox/Runtime/common/path/RTPathAbsEx.cpp       |     2 +-
 src/VBox/Runtime/common/path/RTPathAbsExDup.cpp    |     2 +-
 src/VBox/Runtime/common/path/RTPathAppend.cpp      |     2 +-
 src/VBox/Runtime/common/path/RTPathAppendEx.cpp    |     2 +-
 .../Runtime/common/path/RTPathCalcRelative.cpp     |     2 +-
 .../common/path/RTPathChangeToDosSlashes.cpp       |     2 +-
 .../common/path/RTPathChangeToUnixSlashes.cpp      |     2 +-
 .../Runtime/common/path/RTPathCopyComponents.cpp   |     2 +-
 .../Runtime/common/path/RTPathCountComponents.cpp  |     2 +-
 src/VBox/Runtime/common/path/RTPathExt.cpp         |     2 +-
 src/VBox/Runtime/common/path/RTPathFilename.cpp    |     2 +-
 src/VBox/Runtime/common/path/RTPathHasExt.cpp      |     2 +-
 src/VBox/Runtime/common/path/RTPathHasPath.cpp     |     2 +-
 src/VBox/Runtime/common/path/RTPathJoin.cpp        |     2 +-
 src/VBox/Runtime/common/path/RTPathJoinA.cpp       |     2 +-
 src/VBox/Runtime/common/path/RTPathJoinEx.cpp      |     2 +-
 src/VBox/Runtime/common/path/RTPathParse.cpp       |     2 +-
 src/VBox/Runtime/common/path/RTPathParse.cpp.h     |     2 +-
 src/VBox/Runtime/common/path/RTPathParseSimple.cpp |     2 +-
 .../Runtime/common/path/RTPathParsedReassemble.cpp |     2 +-
 src/VBox/Runtime/common/path/RTPathRealDup.cpp     |     2 +-
 src/VBox/Runtime/common/path/RTPathRmCmd.cpp       |     2 +-
 src/VBox/Runtime/common/path/RTPathSplit.cpp       |     2 +-
 src/VBox/Runtime/common/path/RTPathSplitA.cpp      |     2 +-
 .../Runtime/common/path/RTPathSplitReassemble.cpp  |     2 +-
 .../Runtime/common/path/RTPathStartsWithRoot.cpp   |     2 +-
 src/VBox/Runtime/common/path/RTPathStripExt.cpp    |     2 +-
 .../Runtime/common/path/RTPathStripFilename.cpp    |     2 +-
 .../common/path/RTPathStripTrailingSlash.cpp       |     2 +-
 .../Runtime/common/path/RTPathTraverseList.cpp     |     2 +-
 src/VBox/Runtime/common/path/comparepaths.cpp      |     2 +-
 src/VBox/Runtime/common/path/rtPathRootSpecLen.cpp |     2 +-
 .../Runtime/common/path/rtPathVolumeSpecLen.cpp    |     2 +-
 .../common/path/rtpath-expand-template.cpp.h       |     2 +-
 src/VBox/Runtime/common/rand/rand.cpp              |     2 +-
 src/VBox/Runtime/common/rand/randadv.cpp           |     2 +-
 src/VBox/Runtime/common/rand/randparkmiller.cpp    |     2 +-
 src/VBox/Runtime/common/sort/RTSortApvIsSorted.cpp |     2 +-
 src/VBox/Runtime/common/sort/RTSortIsSorted.cpp    |     2 +-
 src/VBox/Runtime/common/sort/shellsort.cpp         |     2 +-
 src/VBox/Runtime/common/string/RTStrCat.cpp        |     2 +-
 src/VBox/Runtime/common/string/RTStrCatEx.cpp      |     2 +-
 src/VBox/Runtime/common/string/RTStrCatP.cpp       |     2 +-
 src/VBox/Runtime/common/string/RTStrCatPEx.cpp     |     2 +-
 src/VBox/Runtime/common/string/RTStrCmp.cpp        |     2 +-
 src/VBox/Runtime/common/string/RTStrCopy.cpp       |     2 +-
 src/VBox/Runtime/common/string/RTStrCopyEx.cpp     |     2 +-
 src/VBox/Runtime/common/string/RTStrCopyP.cpp      |     2 +-
 src/VBox/Runtime/common/string/RTStrCopyPEx.cpp    |     2 +-
 src/VBox/Runtime/common/string/RTStrNCmp.cpp       |     2 +-
 src/VBox/Runtime/common/string/RTStrNLen.cpp       |     2 +-
 src/VBox/Runtime/common/string/RTStrNLenEx.cpp     |     2 +-
 .../Runtime/common/string/RTStrPrintHexBytes.cpp   |     2 +-
 src/VBox/Runtime/common/string/RTStrStr.cpp        |     2 +-
 src/VBox/Runtime/common/string/RTUtf16Cat.cpp      |     2 +-
 src/VBox/Runtime/common/string/RTUtf16CatAscii.cpp |     2 +-
 src/VBox/Runtime/common/string/RTUtf16CmpAscii.cpp |     2 +-
 src/VBox/Runtime/common/string/RTUtf16Copy.cpp     |     2 +-
 .../Runtime/common/string/RTUtf16CopyAscii.cpp     |     2 +-
 src/VBox/Runtime/common/string/RTUtf16End.cpp      |     2 +-
 .../Runtime/common/string/RTUtf16ICmpAscii.cpp     |     2 +-
 src/VBox/Runtime/common/string/RTUtf16NLen.cpp     |     2 +-
 src/VBox/Runtime/common/string/RTUtf16NLenEx.cpp   |     2 +-
 .../Runtime/common/string/RTUtf16PrintHexBytes.cpp |     2 +-
 src/VBox/Runtime/common/string/base64.cpp          |     2 +-
 src/VBox/Runtime/common/string/memchr.asm          |     2 +-
 src/VBox/Runtime/common/string/memchr.cpp          |     2 +-
 src/VBox/Runtime/common/string/memchr_alias.c      |     2 +-
 src/VBox/Runtime/common/string/memcmp.asm          |     2 +-
 src/VBox/Runtime/common/string/memcmp.cpp          |     2 +-
 src/VBox/Runtime/common/string/memcmp_alias.c      |     2 +-
 src/VBox/Runtime/common/string/memcpy.asm          |     2 +-
 src/VBox/Runtime/common/string/memcpy.cpp          |     2 +-
 src/VBox/Runtime/common/string/memcpy_alias.c      |     2 +-
 src/VBox/Runtime/common/string/memmove.asm         |     2 +-
 src/VBox/Runtime/common/string/memmove_alias.c     |     2 +-
 src/VBox/Runtime/common/string/mempcpy.asm         |     2 +-
 src/VBox/Runtime/common/string/memset.asm          |     2 +-
 src/VBox/Runtime/common/string/memset.cpp          |     2 +-
 src/VBox/Runtime/common/string/memset_alias.c      |     2 +-
 src/VBox/Runtime/common/string/ministring.cpp      |     2 +-
 src/VBox/Runtime/common/string/simplepattern.cpp   |     2 +-
 src/VBox/Runtime/common/string/straprintf.cpp      |     2 +-
 src/VBox/Runtime/common/string/strcache.cpp        |     2 +-
 src/VBox/Runtime/common/string/strchr.asm          |     2 +-
 src/VBox/Runtime/common/string/strchr_alias.c      |     2 +-
 src/VBox/Runtime/common/string/strcmp.asm          |     2 +-
 src/VBox/Runtime/common/string/strcmp_alias.c      |     2 +-
 src/VBox/Runtime/common/string/strcpy.asm          |     2 +-
 src/VBox/Runtime/common/string/strcpy.cpp          |     2 +-
 src/VBox/Runtime/common/string/strcpy_alias.c      |     2 +-
 src/VBox/Runtime/common/string/strformat.cpp       |     2 +-
 src/VBox/Runtime/common/string/strformatnum.cpp    |     2 +-
 src/VBox/Runtime/common/string/strformatrt.cpp     |     2 +-
 src/VBox/Runtime/common/string/strformattype.cpp   |     2 +-
 src/VBox/Runtime/common/string/strhash1.cpp        |     2 +-
 src/VBox/Runtime/common/string/stringalloc.cpp     |     2 +-
 src/VBox/Runtime/common/string/strlen.asm          |     2 +-
 src/VBox/Runtime/common/string/strlen.cpp          |     2 +-
 src/VBox/Runtime/common/string/strlen_alias.c      |     2 +-
 src/VBox/Runtime/common/string/strncmp.asm         |     2 +-
 src/VBox/Runtime/common/string/strncmp.cpp         |     2 +-
 src/VBox/Runtime/common/string/strncpy.asm         |     2 +-
 src/VBox/Runtime/common/string/strpbrk.cpp         |     2 +-
 src/VBox/Runtime/common/string/strprintf.cpp       |     2 +-
 src/VBox/Runtime/common/string/strspace.cpp        |     2 +-
 src/VBox/Runtime/common/string/strstrip.cpp        |     2 +-
 src/VBox/Runtime/common/string/strtonum.cpp        |     2 +-
 src/VBox/Runtime/common/string/strversion.cpp      |     2 +-
 src/VBox/Runtime/common/string/uni.cpp             |     2 +-
 src/VBox/Runtime/common/string/unidata-flags.cpp   |     2 +-
 src/VBox/Runtime/common/string/unidata-lower.cpp   |     2 +-
 src/VBox/Runtime/common/string/unidata-upper.cpp   |     2 +-
 src/VBox/Runtime/common/string/uniread.cpp         |     4 +-
 src/VBox/Runtime/common/string/utf-16-case.cpp     |     2 +-
 src/VBox/Runtime/common/string/utf-16-latin-1.cpp  |     2 +-
 src/VBox/Runtime/common/string/utf-16.cpp          |     2 +-
 src/VBox/Runtime/common/string/utf-8-case.cpp      |     2 +-
 src/VBox/Runtime/common/string/utf-8-case2.cpp     |     2 +-
 src/VBox/Runtime/common/string/utf-8.cpp           |     2 +-
 src/VBox/Runtime/common/table/avl_Enum.cpp.h       |     2 +-
 src/VBox/Runtime/common/time/time.cpp              |     4 +-
 src/VBox/Runtime/common/time/timeprog.cpp          |     2 +-
 src/VBox/Runtime/common/time/timesupA.asm          |     2 +-
 src/VBox/Runtime/common/time/timesupA.mac          |     2 +-
 src/VBox/Runtime/common/time/timesysalias.cpp      |     2 +-
 src/VBox/Runtime/common/vfs/vfsbase.cpp            |     2 +-
 src/VBox/Runtime/common/vfs/vfschain.cpp           |     2 +-
 src/VBox/Runtime/common/vfs/vfsiosmisc.cpp         |     2 +-
 src/VBox/Runtime/common/vfs/vfsmemory.cpp          |     2 +-
 src/VBox/Runtime/common/vfs/vfsmisc.cpp            |     2 +-
 src/VBox/Runtime/common/vfs/vfsstdfile.cpp         |     2 +-
 src/VBox/Runtime/common/zip/gzipvfs.cpp            |     2 +-
 src/VBox/Runtime/common/zip/pkzip.cpp              |     2 +-
 src/VBox/Runtime/common/zip/pkzipvfs.cpp           |     2 +-
 src/VBox/Runtime/common/zip/tar.cpp                |     2 +-
 src/VBox/Runtime/common/zip/tar.h                  |     2 +-
 src/VBox/Runtime/common/zip/tarcmd.cpp             |     2 +-
 src/VBox/Runtime/common/zip/tarvfs.cpp             |     2 +-
 src/VBox/Runtime/common/zip/unzipcmd.cpp           |     2 +-
 src/VBox/Runtime/common/zip/xarvfs.cpp             |     2 +-
 src/VBox/Runtime/common/zip/zip.cpp                |     2 +-
 src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp |     2 +-
 .../Runtime/darwin/RTErrConvertFromDarwinCOM.cpp   |     2 +-
 .../Runtime/darwin/RTErrConvertFromDarwinIO.cpp    |     2 +-
 .../Runtime/darwin/RTErrConvertFromDarwinKern.cpp  |     2 +-
 src/VBox/Runtime/gc/initterm-gc.cpp                |     2 +-
 .../generic/RTAssertShouldPanic-generic.cpp        |     2 +-
 .../generic/RTDirCreateUniqueNumbered-generic.cpp  |     2 +-
 src/VBox/Runtime/generic/RTDirExists-generic.cpp   |     2 +-
 .../Runtime/generic/RTDirQueryInfo-generic.cpp     |     2 +-
 src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp |     2 +-
 src/VBox/Runtime/generic/RTEnvDupEx-generic.cpp    |     2 +-
 src/VBox/Runtime/generic/RTFileCopy-generic.cpp    |     2 +-
 src/VBox/Runtime/generic/RTFileExists-generic.cpp  |     2 +-
 src/VBox/Runtime/generic/RTFileMove-generic.cpp    |     2 +-
 .../Runtime/generic/RTFileQuerySize-generic.cpp    |     2 +-
 src/VBox/Runtime/generic/RTFileReadAll-generic.cpp |     2 +-
 .../generic/RTFileReadAllByHandle-generic.cpp      |     2 +-
 .../generic/RTFileReadAllByHandleEx-generic.cpp    |     2 +-
 .../Runtime/generic/RTFileReadAllEx-generic.cpp    |     2 +-
 .../Runtime/generic/RTFileReadAllFree-generic.cpp  |     2 +-
 .../Runtime/generic/RTLogDefaultInit-generic.cpp   |     2 +-
 .../Runtime/generic/RTLogWriteDebugger-generic.cpp |     2 +-
 .../Runtime/generic/RTLogWriteStdErr-generic.cpp   |     2 +-
 .../generic/RTLogWriteStdErr-stub-generic.cpp      |     2 +-
 .../Runtime/generic/RTLogWriteStdOut-generic.cpp   |     2 +-
 .../generic/RTLogWriteStdOut-stub-generic.cpp      |     2 +-
 .../Runtime/generic/RTLogWriteUser-generic.cpp     |     2 +-
 src/VBox/Runtime/generic/RTMpCpuId-generic.cpp     |     2 +-
 .../generic/RTMpCpuIdFromSetIndex-generic.cpp      |     2 +-
 .../generic/RTMpCpuIdToSetIndex-generic.cpp        |     2 +-
 .../Runtime/generic/RTMpGetArraySize-generic.cpp   |     2 +-
 .../Runtime/generic/RTMpGetCoreCount-generic.cpp   |     2 +-
 src/VBox/Runtime/generic/RTMpGetCount-generic.cpp  |     2 +-
 .../generic/RTMpGetCurFrequency-generic.cpp        |     2 +-
 .../generic/RTMpGetDescription-generic-stub.cpp    |     2 +-
 .../Runtime/generic/RTMpGetDescription-generic.cpp |     2 +-
 .../Runtime/generic/RTMpGetMaxCpuId-generic.cpp    |     2 +-
 .../generic/RTMpGetMaxFrequency-generic.cpp        |     2 +-
 .../generic/RTMpGetOnlineCoreCount-generic.cpp     |     2 +-
 .../Runtime/generic/RTMpGetOnlineCount-generic.cpp |     2 +-
 .../Runtime/generic/RTMpGetOnlineSet-generic.cpp   |     2 +-
 src/VBox/Runtime/generic/RTMpGetSet-generic.cpp    |     2 +-
 .../Runtime/generic/RTMpIsCpuOnline-generic.cpp    |     2 +-
 .../Runtime/generic/RTMpIsCpuPossible-generic.cpp  |     2 +-
 src/VBox/Runtime/generic/RTPathAbs-generic.cpp     |     2 +-
 .../generic/RTPathGetCurrentDrive-generic.cpp      |     2 +-
 .../generic/RTPathGetCurrentOnDrive-generic.cpp    |     2 +-
 src/VBox/Runtime/generic/RTPathIsSame-generic.cpp  |     2 +-
 .../Runtime/generic/RTProcDaemonize-generic.cpp    |     2 +-
 .../generic/RTProcIsRunningByName-generic.cpp      |     2 +-
 .../generic/RTProcessQueryUsernameA-generic.cpp    |     2 +-
 .../RTRandAdvCreateSystemFaster-generic.cpp        |     2 +-
 .../generic/RTRandAdvCreateSystemTruer-generic.cpp |     2 +-
 .../generic/RTSemEventMultiWait-2-ex-generic.cpp   |     2 +-
 .../generic/RTSemEventMultiWait-generic.cpp        |     2 +-
 .../RTSemEventMultiWaitNoResume-2-ex-generic.cpp   |     2 +-
 .../generic/RTSemEventWait-2-ex-generic.cpp        |     2 +-
 .../Runtime/generic/RTSemEventWait-generic.cpp     |     2 +-
 .../RTSemEventWaitNoResume-2-ex-generic.cpp        |     2 +-
 .../Runtime/generic/RTSemMutexRequest-generic.cpp  |     2 +-
 .../generic/RTSemMutexRequestDebug-generic.cpp     |     2 +-
 .../generic/RTSystemQueryDmiString-generic.cpp     |     2 +-
 .../generic/RTSystemQueryOSInfo-generic.cpp        |     2 +-
 .../Runtime/generic/RTSystemShutdown-generic.cpp   |     2 +-
 .../generic/RTThreadGetAffinity-stub-generic.cpp   |     2 +-
 .../generic/RTThreadGetNativeState-generic.cpp     |     2 +-
 .../generic/RTThreadSetAffinity-stub-generic.cpp   |     2 +-
 .../generic/RTThreadSetAffinityToCpu-generic.cpp   |     2 +-
 .../generic/RTTimeLocalDeltaNano-generic.cpp       |     2 +-
 .../Runtime/generic/RTTimeLocalExplode-generic.cpp |     2 +-
 .../Runtime/generic/RTTimeLocalNow-generic.cpp     |     2 +-
 src/VBox/Runtime/generic/RTTimerCreate-generic.cpp |     2 +-
 .../Runtime/generic/RTTimerLRCreate-generic.cpp    |     2 +-
 src/VBox/Runtime/generic/RTUuidCreate-generic.cpp  |     2 +-
 src/VBox/Runtime/generic/cdrom-generic.cpp         |     2 +-
 src/VBox/Runtime/generic/createtemp-generic.cpp    |     2 +-
 src/VBox/Runtime/generic/critsect-generic.cpp      |     2 +-
 src/VBox/Runtime/generic/critsectrw-generic.cpp    |     2 +-
 src/VBox/Runtime/generic/env-generic.cpp           |     2 +-
 src/VBox/Runtime/generic/errvars-generic.cpp       |     2 +-
 src/VBox/Runtime/generic/fs-stubs-generic.cpp      |     2 +-
 src/VBox/Runtime/generic/mempool-generic.cpp       |     2 +-
 src/VBox/Runtime/generic/memsafer-generic.cpp      |     2 +-
 src/VBox/Runtime/generic/mppresent-generic.cpp     |     2 +-
 src/VBox/Runtime/generic/pathhost-generic.cpp      |     2 +-
 src/VBox/Runtime/generic/sched-generic.cpp         |     2 +-
 src/VBox/Runtime/generic/semfastmutex-generic.cpp  |     2 +-
 src/VBox/Runtime/generic/semrw-generic.cpp         |     2 +-
 .../Runtime/generic/semrw-lockless-generic.cpp     |     2 +-
 src/VBox/Runtime/generic/semxroads-generic.cpp     |     2 +-
 src/VBox/Runtime/generic/spinlock-generic.cpp      |     2 +-
 .../Runtime/generic/strcache-stubs-generic.cpp     |     2 +-
 src/VBox/Runtime/generic/timer-generic.cpp         |     2 +-
 src/VBox/Runtime/generic/timerlr-generic.cpp       |     2 +-
 src/VBox/Runtime/generic/tls-generic.cpp           |     2 +-
 src/VBox/Runtime/generic/utf16locale-generic.cpp   |     2 +-
 src/VBox/Runtime/generic/uuid-generic.cpp          |     2 +-
 .../Runtime/include/internal/alignmentchecks.h     |     2 +-
 src/VBox/Runtime/include/internal/assert.h         |     2 +-
 src/VBox/Runtime/include/internal/bignum.mac       |     2 +-
 src/VBox/Runtime/include/internal/dbgmod.h         |     2 +-
 src/VBox/Runtime/include/internal/dir.h            |     2 +-
 src/VBox/Runtime/include/internal/dvm.h            |     2 +-
 src/VBox/Runtime/include/internal/file.h           |     2 +-
 src/VBox/Runtime/include/internal/fileaio.h        |     2 +-
 src/VBox/Runtime/include/internal/filesystem.h     |     2 +-
 src/VBox/Runtime/include/internal/fs.h             |     2 +-
 src/VBox/Runtime/include/internal/initterm.h       |     2 +-
 src/VBox/Runtime/include/internal/iprt-openssl.h   |     2 +-
 src/VBox/Runtime/include/internal/iprt.h           |     2 +-
 src/VBox/Runtime/include/internal/ldr.h            |     2 +-
 src/VBox/Runtime/include/internal/ldrELF.h         |     2 +-
 src/VBox/Runtime/include/internal/ldrELF32.h       |     2 +-
 src/VBox/Runtime/include/internal/ldrELF64.h       |     2 +-
 src/VBox/Runtime/include/internal/ldrMZ.h          |     2 +-
 src/VBox/Runtime/include/internal/ldrPE.h          |     2 +-
 src/VBox/Runtime/include/internal/lockvalidator.h  |     2 +-
 src/VBox/Runtime/include/internal/magics.h         |     2 +-
 src/VBox/Runtime/include/internal/mem.h            |     2 +-
 src/VBox/Runtime/include/internal/memobj.h         |     2 +-
 src/VBox/Runtime/include/internal/path.h           |     2 +-
 src/VBox/Runtime/include/internal/pipe.h           |     2 +-
 src/VBox/Runtime/include/internal/process.h        |     2 +-
 src/VBox/Runtime/include/internal/rand.h           |     2 +-
 src/VBox/Runtime/include/internal/req.h            |     2 +-
 src/VBox/Runtime/include/internal/sched.h          |     2 +-
 src/VBox/Runtime/include/internal/socket.h         |     2 +-
 src/VBox/Runtime/include/internal/strhash.h        |     2 +-
 src/VBox/Runtime/include/internal/strict.h         |     2 +-
 src/VBox/Runtime/include/internal/string.h         |     2 +-
 src/VBox/Runtime/include/internal/thread.h         |     2 +-
 src/VBox/Runtime/include/internal/time.h           |     2 +-
 src/VBox/Runtime/nt/NtProcessStartup-stub.cpp      |     2 +-
 src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp   |     2 +-
 src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp       |     2 +-
 .../Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp     |     2 +-
 src/VBox/Runtime/os2/sys0.asm                      |     2 +-
 src/VBox/Runtime/r0drv/alloc-r0drv.cpp             |     2 +-
 src/VBox/Runtime/r0drv/alloc-r0drv.h               |     2 +-
 .../darwin/RTLogWriteDebugger-r0drv-darwin.cpp     |     2 +-
 .../r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp |     2 +-
 .../Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp    |     2 +-
 .../Runtime/r0drv/darwin/assert-r0drv-darwin.cpp   |     4 +-
 .../r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp      |     6 +-
 .../Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp |     2 +-
 .../Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp   |     2 +-
 .../r0drv/darwin/memuserkernel-r0drv-darwin.cpp    |     2 +-
 src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp  |     4 +-
 .../Runtime/r0drv/darwin/process-r0drv-darwin.cpp  |     2 +-
 .../Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp |     2 +-
 .../r0drv/darwin/semeventmulti-r0drv-darwin.cpp    |     2 +-
 .../r0drv/darwin/semfastmutex-r0drv-darwin.cpp     |     2 +-
 .../Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp |     2 +-
 .../Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp |     2 +-
 src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h  |     2 +-
 .../Runtime/r0drv/darwin/thread-r0drv-darwin.cpp   |     2 +-
 .../Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp  |     2 +-
 .../r0drv/darwin/threadpreempt-r0drv-darwin.cpp    |     4 +-
 .../Runtime/r0drv/darwin/time-r0drv-darwin.cpp     |     2 +-
 .../r0drv/freebsd/memuserkernel-r0drv-freebsd.c    |     2 +-
 src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c  |     2 +-
 .../Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c |     2 +-
 .../r0drv/freebsd/sleepqueue-r0drv-freebsd.h       |     2 +-
 .../Runtime/r0drv/freebsd/thread-r0drv-freebsd.c   |     2 +-
 .../generic/RTMpIsCpuWorkPending-r0drv-generic.cpp |     2 +-
 .../r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp    |     2 +-
 .../RTThreadPreemptDisable-r0drv-generic.cpp       |     2 +-
 .../RTThreadPreemptIsEnabled-r0drv-generic.cpp     |     2 +-
 .../RTThreadPreemptIsPending-r0drv-generic.cpp     |     2 +-
 ...TThreadPreemptIsPendingTrusty-r0drv-generic.cpp |     2 +-
 .../RTThreadPreemptRestore-r0drv-generic.cpp       |     2 +-
 .../r0drv/generic/mpnotification-r0drv-generic.cpp |     2 +-
 .../r0drv/generic/semspinmutex-r0drv-generic.c     |     2 +-
 .../r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c   |     2 +-
 .../r0drv/haiku/RTLogWriteStdOut-r0drv-haiku.c     |     2 +-
 src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c   |     2 +-
 src/VBox/Runtime/r0drv/haiku/assert-r0drv-haiku.c  |     2 +-
 .../Runtime/r0drv/haiku/initterm-r0drv-haiku.c     |     2 +-
 src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c  |     2 +-
 src/VBox/Runtime/r0drv/haiku/process-r0drv-haiku.c |     2 +-
 .../Runtime/r0drv/haiku/semevent-r0drv-haiku.c     |     2 +-
 .../r0drv/haiku/semeventmulti-r0drv-haiku.c        |     2 +-
 .../Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c |     2 +-
 .../Runtime/r0drv/haiku/semmutex-r0drv-haiku.c     |     2 +-
 .../Runtime/r0drv/haiku/spinlock-r0drv-haiku.c     |     2 +-
 src/VBox/Runtime/r0drv/haiku/the-haiku-kernel.h    |     2 +-
 src/VBox/Runtime/r0drv/haiku/thread-r0drv-haiku.c  |     2 +-
 src/VBox/Runtime/r0drv/haiku/thread2-r0drv-haiku.c |     2 +-
 src/VBox/Runtime/r0drv/haiku/time-r0drv-haiku.c    |     2 +-
 src/VBox/Runtime/r0drv/initterm-r0drv.cpp          |     2 +-
 .../r0drv/linux/RTLogWriteDebugger-r0drv-linux.c   |     2 +-
 src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c   |     2 +-
 src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c  |     2 +-
 .../Runtime/r0drv/linux/initterm-r0drv-linux.c     |     2 +-
 src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c  |     2 +-
 .../r0drv/linux/memuserkernel-r0drv-linux.c        |     2 +-
 src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c      |     2 +-
 src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c |     2 +-
 .../Runtime/r0drv/linux/semevent-r0drv-linux.c     |     2 +-
 .../r0drv/linux/semeventmulti-r0drv-linux.c        |     2 +-
 .../Runtime/r0drv/linux/semfastmutex-r0drv-linux.c |     2 +-
 .../Runtime/r0drv/linux/semmutex-r0drv-linux.c     |     2 +-
 .../Runtime/r0drv/linux/spinlock-r0drv-linux.c     |     2 +-
 src/VBox/Runtime/r0drv/linux/string.h              |     2 +-
 src/VBox/Runtime/r0drv/linux/the-linux-kernel.h    |     2 +-
 src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c |     2 +-
 src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c    |     2 +-
 src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c   |     2 +-
 .../Runtime/r0drv/linux/waitqueue-r0drv-linux.h    |     2 +-
 src/VBox/Runtime/r0drv/memobj-r0drv.cpp            |     2 +-
 src/VBox/Runtime/r0drv/mp-r0drv.h                  |     2 +-
 src/VBox/Runtime/r0drv/mpnotification-r0drv.c      |     2 +-
 .../r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp       |     2 +-
 .../nt/RTTimerGetSystemGranularity-r0drv-nt.cpp    |     2 +-
 src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp       |     2 +-
 src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp      |     2 +-
 src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp    |     2 +-
 src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h      |     2 +-
 src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp      |     2 +-
 .../Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp    |     2 +-
 src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp          |     2 +-
 .../Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp   |     2 +-
 src/VBox/Runtime/r0drv/nt/ntBldSymDb.cpp           |     6 +-
 src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp     |     2 +-
 src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp    |     2 +-
 .../Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp    |     2 +-
 .../Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp     |     2 +-
 src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp    |     2 +-
 src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp    |     2 +-
 src/VBox/Runtime/r0drv/nt/symdb.h                  |     2 +-
 src/VBox/Runtime/r0drv/nt/symdbdata.h              |     2 +-
 src/VBox/Runtime/r0drv/nt/the-nt-kernel.h          |     2 +-
 src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp      |     2 +-
 src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp     |     2 +-
 src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp        |     2 +-
 src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp       |     2 +-
 .../Runtime/r0drv/nt/toxic-chkstk-r0drv-nt.asm     |     2 +-
 .../Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp  |     2 +-
 src/VBox/Runtime/r0drv/power-r0drv.h               |     2 +-
 src/VBox/Runtime/r0drv/powernotification-r0drv.c   |     2 +-
 .../solaris/RTLogWriteDebugger-r0drv-solaris.c     |     2 +-
 .../r0drv/solaris/RTMpPokeCpu-r0drv-solaris.c      |     2 +-
 .../Runtime/r0drv/solaris/alloc-r0drv-solaris.c    |     2 +-
 .../Runtime/r0drv/solaris/assert-r0drv-solaris.c   |     2 +-
 .../r0drv/solaris/dbgkrnlinfo-r0drv-solaris.c      |     2 +-
 .../Runtime/r0drv/solaris/memobj-r0drv-solaris.c   |     2 +-
 .../Runtime/r0drv/solaris/memobj-r0drv-solaris.h   |     2 +-
 .../r0drv/solaris/memuserkernel-r0drv-solaris.c    |     2 +-
 src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c  |     2 +-
 .../Runtime/r0drv/solaris/process-r0drv-solaris.c  |     2 +-
 .../Runtime/r0drv/solaris/semevent-r0drv-solaris.c |     2 +-
 .../r0drv/solaris/semeventmulti-r0drv-solaris.c    |     2 +-
 .../r0drv/solaris/semeventwait-r0drv-solaris.h     |     2 +-
 .../r0drv/solaris/semfastmutex-r0drv-solaris.c     |     2 +-
 .../Runtime/r0drv/solaris/semmutex-r0drv-solaris.c |     2 +-
 .../Runtime/r0drv/solaris/spinlock-r0drv-solaris.c |     2 +-
 .../Runtime/r0drv/solaris/thread-r0drv-solaris.c   |     2 +-
 .../Runtime/r0drv/solaris/thread2-r0drv-solaris.c  |     2 +-
 .../Runtime/r0drv/solaris/time-r0drv-solaris.c     |     2 +-
 src/VBox/Runtime/r3/alloc-ef-cpp.cpp               |     2 +-
 src/VBox/Runtime/r3/alloc-ef.cpp                   |     2 +-
 src/VBox/Runtime/r3/alloc-ef.h                     |     2 +-
 src/VBox/Runtime/r3/alloc.cpp                      |     2 +-
 src/VBox/Runtime/r3/allocex.cpp                    |     2 +-
 src/VBox/Runtime/r3/allocex.h                      |     2 +-
 .../r3/darwin/RTPathUserDocuments-darwin.cpp       |     2 +-
 .../r3/darwin/RTSystemQueryDmiString-darwin.cpp    |     2 +-
 src/VBox/Runtime/r3/darwin/filelock-darwin.cpp     |     2 +-
 src/VBox/Runtime/r3/darwin/mp-darwin.cpp           |     2 +-
 src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp     |     2 +-
 .../Runtime/r3/darwin/rtProcInitExePath-darwin.cpp |     2 +-
 src/VBox/Runtime/r3/darwin/sched-darwin.cpp        |     2 +-
 src/VBox/Runtime/r3/darwin/systemmem-darwin.cpp    |     2 +-
 src/VBox/Runtime/r3/darwin/time-darwin.cpp         |     2 +-
 src/VBox/Runtime/r3/dir.cpp                        |     2 +-
 src/VBox/Runtime/r3/dir2.cpp                       |     2 +-
 src/VBox/Runtime/r3/fileio.cpp                     |     2 +-
 src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp    |     2 +-
 src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp         |     2 +-
 .../r3/freebsd/rtProcInitExePath-freebsd.cpp       |     2 +-
 src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp  |     2 +-
 src/VBox/Runtime/r3/fs.cpp                         |     2 +-
 src/VBox/Runtime/r3/generic/allocex-r3-generic.cpp |     2 +-
 .../Runtime/r3/generic/semspinmutex-r3-generic.cpp |     2 +-
 .../Runtime/r3/haiku/rtProcInitExePath-haiku.cpp   |     2 +-
 src/VBox/Runtime/r3/haiku/time-haiku.cpp           |     2 +-
 src/VBox/Runtime/r3/init.cpp                       |     2 +-
 src/VBox/Runtime/r3/init.h                         |     2 +-
 src/VBox/Runtime/r3/isofs.cpp                      |     2 +-
 .../r3/linux/RTProcIsRunningByName-linux.cpp       |     2 +-
 .../r3/linux/RTSystemQueryDmiString-linux.cpp      |     2 +-
 .../Runtime/r3/linux/RTSystemShutdown-linux.cpp    |     2 +-
 .../r3/linux/RTThreadGetNativeState-linux.cpp      |     2 +-
 src/VBox/Runtime/r3/linux/mp-linux.cpp             |     2 +-
 .../Runtime/r3/linux/rtProcInitExePath-linux.cpp   |     2 +-
 src/VBox/Runtime/r3/linux/sched-linux.cpp          |     2 +-
 src/VBox/Runtime/r3/linux/semevent-linux.cpp       |     2 +-
 src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp  |     2 +-
 src/VBox/Runtime/r3/linux/semmutex-linux.cpp       |     2 +-
 src/VBox/Runtime/r3/linux/sysfs.cpp                |     2 +-
 src/VBox/Runtime/r3/linux/systemmem-linux.cpp      |     2 +-
 .../Runtime/r3/linux/thread-affinity-linux.cpp     |     2 +-
 src/VBox/Runtime/r3/linux/time-linux.cpp           |     5 +-
 src/VBox/Runtime/r3/memsafer-r3.cpp                |     2 +-
 src/VBox/Runtime/r3/nt/RTProcQueryParent-r3-nt.cpp |     2 +-
 src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp           |     2 +-
 src/VBox/Runtime/r3/nt/fs-nt.cpp                   |     2 +-
 src/VBox/Runtime/r3/nt/internal-r3-nt.h            |     2 +-
 src/VBox/Runtime/r3/nt/pathint-nt.cpp              |     2 +-
 src/VBox/Runtime/r3/nt/time-nt.cpp                 |     2 +-
 src/VBox/Runtime/r3/os2/filelock-os2.cpp           |     2 +-
 src/VBox/Runtime/r3/os2/mp-os2.cpp                 |     2 +-
 src/VBox/Runtime/r3/os2/pipe-os2.cpp               |     2 +-
 src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp  |     2 +-
 src/VBox/Runtime/r3/os2/sched-os2.cpp              |     2 +-
 src/VBox/Runtime/r3/os2/sems-os2.cpp               |     2 +-
 src/VBox/Runtime/r3/os2/systemmem-os2.cpp          |     2 +-
 src/VBox/Runtime/r3/os2/thread-os2.cpp             |     2 +-
 src/VBox/Runtime/r3/path.cpp                       |     2 +-
 src/VBox/Runtime/r3/poll.cpp                       |     2 +-
 .../Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp  |     2 +-
 .../Runtime/r3/posix/RTHandleGetStandard-posix.cpp |     2 +-
 src/VBox/Runtime/r3/posix/RTMemProtect-posix.cpp   |     2 +-
 src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp   |     2 +-
 .../Runtime/r3/posix/RTPathUserDocuments-posix.cpp |     2 +-
 src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp |     2 +-
 .../Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp |     2 +-
 .../r3/posix/RTSystemQueryTotalRam-posix.cpp       |     2 +-
 src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp      |     2 +-
 src/VBox/Runtime/r3/posix/RTTimeSet-posix.cpp      |     2 +-
 src/VBox/Runtime/r3/posix/allocex-r3-posix.cpp     |     2 +-
 src/VBox/Runtime/r3/posix/dir-posix.cpp            |     2 +-
 src/VBox/Runtime/r3/posix/env-posix.cpp            |     2 +-
 src/VBox/Runtime/r3/posix/errvars-posix.cpp        |     2 +-
 src/VBox/Runtime/r3/posix/fileaio-posix.cpp        |     2 +-
 src/VBox/Runtime/r3/posix/fileio-posix.cpp         |     3 +-
 src/VBox/Runtime/r3/posix/fileio2-posix.cpp        |     2 +-
 src/VBox/Runtime/r3/posix/filelock-posix.cpp       |     2 +-
 src/VBox/Runtime/r3/posix/fs-posix.cpp             |     2 +-
 src/VBox/Runtime/r3/posix/fs2-posix.cpp            |     2 +-
 src/VBox/Runtime/r3/posix/fs3-posix.cpp            |     2 +-
 src/VBox/Runtime/r3/posix/ldrNative-posix.cpp      |     2 +-
 src/VBox/Runtime/r3/posix/path-posix.cpp           |     2 +-
 src/VBox/Runtime/r3/posix/path2-posix.cpp          |     2 +-
 src/VBox/Runtime/r3/posix/pathhost-posix.cpp       |     2 +-
 src/VBox/Runtime/r3/posix/pipe-posix.cpp           |     2 +-
 .../Runtime/r3/posix/process-creation-posix.cpp    |     2 +-
 src/VBox/Runtime/r3/posix/process-posix.cpp        |     2 +-
 src/VBox/Runtime/r3/posix/rand-posix.cpp           |     2 +-
 .../r3/posix/rtmempage-exec-mmap-heap-posix.cpp    |     2 +-
 .../Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp |     2 +-
 src/VBox/Runtime/r3/posix/sched-posix.cpp          |     2 +-
 src/VBox/Runtime/r3/posix/semevent-posix.cpp       |     2 +-
 src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp  |     2 +-
 src/VBox/Runtime/r3/posix/semmutex-posix.cpp       |     2 +-
 src/VBox/Runtime/r3/posix/semrw-posix.cpp          |     2 +-
 src/VBox/Runtime/r3/posix/symlink-posix.cpp        |     2 +-
 src/VBox/Runtime/r3/posix/thread-posix.cpp         |     2 +-
 src/VBox/Runtime/r3/posix/thread2-posix.cpp        |     2 +-
 src/VBox/Runtime/r3/posix/time-posix.cpp           |     2 +-
 src/VBox/Runtime/r3/posix/timelocal-posix.cpp      |     2 +-
 src/VBox/Runtime/r3/posix/timer-posix.cpp          |     2 +-
 src/VBox/Runtime/r3/posix/tls-posix.cpp            |     2 +-
 src/VBox/Runtime/r3/posix/utf8-posix.cpp           |     2 +-
 src/VBox/Runtime/r3/process.cpp                    |     2 +-
 src/VBox/Runtime/r3/socket.cpp                     |     2 +-
 .../r3/solaris/RTSystemQueryDmiString-solaris.cpp  |     2 +-
 .../r3/solaris/RTSystemShutdown-solaris.cpp        |     2 +-
 src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp |     2 +-
 src/VBox/Runtime/r3/solaris/coredumper-solaris.h   |     2 +-
 src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp    |     2 +-
 src/VBox/Runtime/r3/solaris/mp-solaris.cpp         |     2 +-
 .../r3/solaris/rtProcInitExePath-solaris.cpp       |     2 +-
 src/VBox/Runtime/r3/solaris/systemmem-solaris.cpp  |     2 +-
 .../Runtime/r3/solaris/thread-affinity-solaris.cpp |     2 +-
 src/VBox/Runtime/r3/stream.cpp                     |     2 +-
 src/VBox/Runtime/r3/tcp.cpp                        |     2 +-
 src/VBox/Runtime/r3/test.cpp                       |     2 +-
 src/VBox/Runtime/r3/testi.cpp                      |     2 +-
 src/VBox/Runtime/r3/udp.cpp                        |     2 +-
 .../Runtime/r3/win/RTHandleGetStandard-win.cpp     |     2 +-
 src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp |     2 +-
 .../Runtime/r3/win/RTSystemQueryDmiString-win.cpp  |     2 +-
 .../Runtime/r3/win/RTSystemQueryOSInfo-win.cpp     |     2 +-
 .../Runtime/r3/win/RTSystemQueryTotalRam-win.cpp   |     2 +-
 src/VBox/Runtime/r3/win/RTSystemShutdown-win.cpp   |     2 +-
 src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp       |     2 +-
 src/VBox/Runtime/r3/win/VBoxRT-openssl-ose.def     |     2 +-
 src/VBox/Runtime/r3/win/VBoxRT-openssl.def         |     2 +-
 src/VBox/Runtime/r3/win/alloc-win.cpp              |     2 +-
 src/VBox/Runtime/r3/win/allocex-win.cpp            |     2 +-
 src/VBox/Runtime/r3/win/dir-win.cpp                |     2 +-
 src/VBox/Runtime/r3/win/direnum-win.cpp            |     2 +-
 src/VBox/Runtime/r3/win/dllmain-win.cpp            |     2 +-
 src/VBox/Runtime/r3/win/env-win.cpp                |     2 +-
 src/VBox/Runtime/r3/win/errvars-win.cpp            |     2 +-
 src/VBox/Runtime/r3/win/fileaio-win.cpp            |     2 +-
 src/VBox/Runtime/r3/win/fileio-win.cpp             |     2 +-
 src/VBox/Runtime/r3/win/fs-win.cpp                 |     2 +-
 src/VBox/Runtime/r3/win/init-win.cpp               |     2 +-
 src/VBox/Runtime/r3/win/ldrNative-win.cpp          |    97 +-
 src/VBox/Runtime/r3/win/localipc-win.cpp           |     2 +-
 src/VBox/Runtime/r3/win/mp-win.cpp                 |     4 +-
 src/VBox/Runtime/r3/win/path-win.cpp               |     2 +-
 src/VBox/Runtime/r3/win/pipe-win.cpp               |     2 +-
 src/VBox/Runtime/r3/win/process-win.cpp            |     2 +-
 .../r3/win/rtFileNativeSetAttributes-win.cpp       |     2 +-
 src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp  |     2 +-
 src/VBox/Runtime/r3/win/sched-win.cpp              |     2 +-
 src/VBox/Runtime/r3/win/semevent-win.cpp           |     2 +-
 src/VBox/Runtime/r3/win/semeventmulti-win.cpp      |     2 +-
 src/VBox/Runtime/r3/win/semmutex-win.cpp           |     2 +-
 src/VBox/Runtime/r3/win/symlink-win.cpp            |     2 +-
 src/VBox/Runtime/r3/win/thread-win.cpp             |     2 +-
 src/VBox/Runtime/r3/win/thread2-win.cpp            |     2 +-
 src/VBox/Runtime/r3/win/time-win.cpp               |     2 +-
 src/VBox/Runtime/r3/win/time2-win.cpp              |     2 +-
 src/VBox/Runtime/r3/win/timer-win.cpp              |     2 +-
 src/VBox/Runtime/r3/win/tls-win.cpp                |     2 +-
 src/VBox/Runtime/r3/win/utf16locale-win.cpp        |     2 +-
 src/VBox/Runtime/r3/win/utf8-win.cpp               |     2 +-
 src/VBox/Runtime/r3/win/uuid-win.cpp               |     2 +-
 src/VBox/Runtime/r3/win/vcc100-kernel32-fakes.cpp  |     2 +-
 src/VBox/Runtime/r3/xml.cpp                        |     3 +-
 src/VBox/Runtime/testcase/72kb-random.h            |     2 +-
 src/VBox/Runtime/testcase/Makefile.kmk             |     2 +-
 src/VBox/Runtime/testcase/ntGetTimerResolution.cpp |     2 +-
 src/VBox/Runtime/testcase/tstDir-2.cpp             |     2 +-
 src/VBox/Runtime/testcase/tstDir-3.cpp             |     2 +-
 src/VBox/Runtime/testcase/tstDir.cpp               |     2 +-
 src/VBox/Runtime/testcase/tstEnv.cpp               |     2 +-
 src/VBox/Runtime/testcase/tstFile.cpp              |     2 +-
 src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp   |     2 +-
 src/VBox/Runtime/testcase/tstFileLock.cpp          |     2 +-
 src/VBox/Runtime/testcase/tstFork.cpp              |     2 +-
 src/VBox/Runtime/testcase/tstHandleTable.cpp       |     4 +-
 src/VBox/Runtime/testcase/tstIprtList.cpp          |     2 +-
 src/VBox/Runtime/testcase/tstIprtMiniString.cpp    |     2 +-
 src/VBox/Runtime/testcase/tstLdr-2.cpp             |     2 +-
 src/VBox/Runtime/testcase/tstLdr-3.cpp             |     2 +-
 src/VBox/Runtime/testcase/tstLdr-4.cpp             |     2 +-
 src/VBox/Runtime/testcase/tstLdr-4Imp-os2.def      |     2 +-
 src/VBox/Runtime/testcase/tstLdr-4Imp-win.def      |     2 +-
 src/VBox/Runtime/testcase/tstLdr.cpp               |     2 +-
 src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp     |     2 +-
 src/VBox/Runtime/testcase/tstLdrLoad.cpp           |     2 +-
 src/VBox/Runtime/testcase/tstLdrObj.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstLdrObjR0.cpp          |     2 +-
 src/VBox/Runtime/testcase/tstLog.cpp               |     2 +-
 src/VBox/Runtime/testcase/tstMemAutoPtr.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstMove.cpp              |     2 +-
 src/VBox/Runtime/testcase/tstNoCrt-1.cpp           |     2 +-
 src/VBox/Runtime/testcase/tstOnce.cpp              |     2 +-
 src/VBox/Runtime/testcase/tstPrfRT.cpp             |     2 +-
 src/VBox/Runtime/testcase/tstRTAssertCompile.cpp   |     2 +-
 src/VBox/Runtime/testcase/tstRTAvl.cpp             |     2 +-
 src/VBox/Runtime/testcase/tstRTBase64.cpp          |     2 +-
 src/VBox/Runtime/testcase/tstRTBigNum.cpp          |     2 +-
 src/VBox/Runtime/testcase/tstRTBitOperations.cpp   |     2 +-
 src/VBox/Runtime/testcase/tstRTCType.cpp           |     2 +-
 src/VBox/Runtime/testcase/tstRTCidr.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstRTCircBuf.cpp         |     2 +-
 src/VBox/Runtime/testcase/tstRTCoreDump.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTCoreDump.h          |     2 +-
 src/VBox/Runtime/testcase/tstRTCritSect.cpp        |     4 +-
 src/VBox/Runtime/testcase/tstRTCritSectRw.cpp      |     2 +-
 .../Runtime/testcase/tstRTDarwinMachKernel.cpp     |     2 +-
 src/VBox/Runtime/testcase/tstRTDigest-2.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTDigest.cpp          |     2 +-
 .../testcase/tstRTDirCreateUniqueNumbered.cpp      |     2 +-
 src/VBox/Runtime/testcase/tstRTDvm.cpp             |     2 +-
 src/VBox/Runtime/testcase/tstRTErrUnique.cpp       |     2 +-
 src/VBox/Runtime/testcase/tstRTFileAio.cpp         |     2 +-
 src/VBox/Runtime/testcase/tstRTFileAppend-1.cpp    |     2 +-
 src/VBox/Runtime/testcase/tstRTFileGetSize-1.cpp   |     2 +-
 .../testcase/tstRTFileModeStringToFlags.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTFilesystem.cpp      |     2 +-
 src/VBox/Runtime/testcase/tstRTFsQueries.cpp       |     2 +-
 src/VBox/Runtime/testcase/tstRTGetOpt.cpp          |     2 +-
 src/VBox/Runtime/testcase/tstRTGetOptArgv.cpp      |     2 +-
 src/VBox/Runtime/testcase/tstRTHeapOffset.cpp      |     2 +-
 src/VBox/Runtime/testcase/tstRTHeapSimple.cpp      |     2 +-
 src/VBox/Runtime/testcase/tstRTHttp.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstRTInlineAsm.cpp       |     2 +-
 .../Runtime/testcase/tstRTLdrVerifyPeImage.cpp     |     2 +-
 src/VBox/Runtime/testcase/tstRTList.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstRTLocalIpc.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTLockValidator.cpp   |     2 +-
 src/VBox/Runtime/testcase/tstRTManifest.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTMemCache.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTMemEf.cpp           |     2 +-
 src/VBox/Runtime/testcase/tstRTMemPool.cpp         |     2 +-
 src/VBox/Runtime/testcase/tstRTMemSafer.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTMemWipe.cpp         |     2 +-
 src/VBox/Runtime/testcase/tstRTMp-1.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstRTNetIPv4.cpp         |     2 +-
 src/VBox/Runtime/testcase/tstRTNetIPv6.cpp         |     2 +-
 src/VBox/Runtime/testcase/tstRTPath.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstRTPipe.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstRTPoll.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstRTPrfIO.cpp           |     4 +-
 src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp    |     2 +-
 src/VBox/Runtime/testcase/tstRTProcCreatePrf.cpp   |     2 +-
 .../Runtime/testcase/tstRTProcIsRunningByName.cpp  |     2 +-
 .../Runtime/testcase/tstRTProcQueryUsername.cpp    |     2 +-
 src/VBox/Runtime/testcase/tstRTProcWait.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTR0Common.h          |     2 +-
 src/VBox/Runtime/testcase/tstRTR0CommonDriver.h    |     2 +-
 src/VBox/Runtime/testcase/tstRTR0CommonReq.h       |     2 +-
 src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfo.cpp   |     2 +-
 src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfo.h     |     2 +-
 .../Runtime/testcase/tstRTR0DbgKrnlInfoDriver.cpp  |     2 +-
 src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp |     2 +-
 src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h   |     2 +-
 .../testcase/tstRTR0MemUserKernelDriver.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp      |     2 +-
 src/VBox/Runtime/testcase/tstRTR0SemMutex.h        |     2 +-
 .../Runtime/testcase/tstRTR0SemMutexDriver.cpp     |     2 +-
 src/VBox/Runtime/testcase/tstRTR0Timer.cpp         |     2 +-
 src/VBox/Runtime/testcase/tstRTR0Timer.h           |     2 +-
 src/VBox/Runtime/testcase/tstRTR0TimerDriver.cpp   |     2 +-
 src/VBox/Runtime/testcase/tstRTReqPool.cpp         |     2 +-
 src/VBox/Runtime/testcase/tstRTS3.cpp              |     2 +-
 src/VBox/Runtime/testcase/tstRTSemEventMulti.cpp   |     2 +-
 src/VBox/Runtime/testcase/tstRTSemRW.cpp           |     2 +-
 src/VBox/Runtime/testcase/tstRTSemXRoads.cpp       |     2 +-
 src/VBox/Runtime/testcase/tstRTSort.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstRTStrAlloc.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTStrCache.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTStrCatCopy.cpp      |     2 +-
 src/VBox/Runtime/testcase/tstRTStrFormat.cpp       |     2 +-
 src/VBox/Runtime/testcase/tstRTStrVersion.cpp      |     2 +-
 src/VBox/Runtime/testcase/tstRTSymlink.cpp         |     2 +-
 src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp  |     2 +-
 .../Runtime/testcase/tstRTSystemQueryOsInfo.cpp    |     2 +-
 src/VBox/Runtime/testcase/tstRTTemp.cpp            |     2 +-
 .../Runtime/testcase/tstRTThreadExecutionTime.cpp  |     2 +-
 src/VBox/Runtime/testcase/tstRTThreadPoke.cpp      |     2 +-
 src/VBox/Runtime/testcase/tstRTTime.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstRTTimeSpec.cpp        |     2 +-
 src/VBox/Runtime/testcase/tstRTUri.cpp             |     2 +-
 src/VBox/Runtime/testcase/tstRTUuid.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstRTZip.cpp             |     2 +-
 src/VBox/Runtime/testcase/tstRand.cpp              |     2 +-
 src/VBox/Runtime/testcase/tstSemMutex.cpp          |     2 +-
 src/VBox/Runtime/testcase/tstSemPingPong.cpp       |     2 +-
 src/VBox/Runtime/testcase/tstStrSimplePattern.cpp  |     2 +-
 src/VBox/Runtime/testcase/tstStrToNum.cpp          |     2 +-
 src/VBox/Runtime/testcase/tstTSC.cpp               |     4 +-
 src/VBox/Runtime/testcase/tstTermCallbacks.cpp     |     2 +-
 src/VBox/Runtime/testcase/tstThread-1.cpp          |     2 +-
 src/VBox/Runtime/testcase/tstTime-2.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstTime-3.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstTime-4.cpp            |     2 +-
 src/VBox/Runtime/testcase/tstTimer.cpp             |     2 +-
 src/VBox/Runtime/testcase/tstTimerLR.cpp           |     2 +-
 src/VBox/Runtime/testcase/tstUtf8.cpp              |     2 +-
 src/VBox/Runtime/testcase/tstVector.cpp            |     2 +-
 src/VBox/Runtime/tools/Makefile.kmk                |     2 +-
 src/VBox/Runtime/tools/RTDbgSymCache.cpp           |     2 +-
 src/VBox/Runtime/tools/RTGzip.cpp                  |     2 +-
 src/VBox/Runtime/tools/RTLdrFlt.cpp                |     4 +-
 src/VBox/Runtime/tools/RTManifest.cpp              |     2 +-
 src/VBox/Runtime/tools/RTNtDbgHelp.cpp             |     4 +-
 src/VBox/Runtime/tools/RTRm.cpp                    |     2 +-
 src/VBox/Runtime/tools/RTShutdown.cpp              |     2 +-
 src/VBox/Runtime/tools/RTSignTool.cpp              |     2 +-
 src/VBox/Runtime/tools/RTTar.cpp                   |     2 +-
 src/VBox/Runtime/tools/RTUnzip.cpp                 |     2 +-
 src/VBox/Runtime/win/RTErrConvertFromWin32.cpp     |     2 +-
 src/VBox/Runtime/win/amd64/ASMAtomicBitClear.asm   |     2 +-
 .../win/amd64/ASMAtomicBitTestAndToggle.asm        |     2 +-
 src/VBox/Runtime/win/amd64/ASMAtomicBitToggle.asm  |     2 +-
 src/VBox/Runtime/win/amd64/ASMAtomicReadU64.asm    |     2 +-
 src/VBox/Runtime/win/amd64/ASMAtomicXchgU16.asm    |     2 +-
 src/VBox/Runtime/win/amd64/ASMAtomicXchgU8.asm     |     2 +-
 src/VBox/Runtime/win/amd64/ASMBitFirstClear.asm    |     2 +-
 src/VBox/Runtime/win/amd64/ASMBitFirstSet.asm      |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetCS.asm            |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetDR0.asm           |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetDR1.asm           |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetDR2.asm           |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetDR3.asm           |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetDR6.asm           |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetDR7.asm           |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetDS.asm            |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetES.asm            |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetFS.asm            |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetFlags.asm         |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetGS.asm            |     2 +-
 src/VBox/Runtime/win/amd64/ASMGetSS.asm            |     2 +-
 src/VBox/Runtime/win/amd64/ASMProbeReadByte.asm    |     2 +-
 src/VBox/Runtime/win/amd64/ASMSetFlags.asm         |     2 +-
 src/VBox/Runtime/win/errmsgwin.cpp                 |     2 +-
 src/VBox/Storage/Debug/Makefile.kmk                |     2 +-
 src/VBox/Storage/ISCSI.cpp                         |     1 -
 src/VBox/Storage/Makefile.kmk                      |     2 +-
 src/VBox/Storage/VCICache.cpp                      |     2 +-
 src/VBox/Storage/VMDK.cpp                          |    31 +-
 src/VBox/Storage/testcase/Makefile.kmk             |     2 +-
 src/VBox/Storage/testcase/tstVDIo.cpp              |    37 +-
 src/VBox/VMM/Docs-CodingGuidelines.cpp             |     2 +-
 src/VBox/VMM/Docs-RawMode.cpp                      |     2 +-
 src/VBox/VMM/Makefile.kmk                          |     8 +-
 src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp                |     2 +-
 src/VBox/VMM/VMMAll/CSAMAll.cpp                    |    17 +-
 src/VBox/VMM/VMMAll/DBGFAll.cpp                    |     2 +-
 src/VBox/VMM/VMMAll/EMAll.cpp                      |     2 +-
 src/VBox/VMM/VMMAll/EMAllA.asm                     |     2 +-
 src/VBox/VMM/VMMAll/FTMAll.cpp                     |     2 +-
 src/VBox/VMM/VMMAll/HMAll.cpp                      |     2 +-
 src/VBox/VMM/VMMAll/IEMAll.cpp                     |   126 +-
 src/VBox/VMM/VMMAll/IEMAllAImpl.asm                |     2 +-
 src/VBox/VMM/VMMAll/IEMAllAImplC.cpp               |     2 +-
 src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h              |    10 +-
 src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h      |   241 +-
 src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h       |    34 +-
 src/VBox/VMM/VMMAll/IOMAll.cpp                     |   244 +-
 src/VBox/VMM/VMMAll/IOMAllMMIO.cpp                 |   140 +-
 src/VBox/VMM/VMMAll/MMAll.cpp                      |     2 +-
 src/VBox/VMM/VMMAll/MMAllHyper.cpp                 |     2 +-
 src/VBox/VMM/VMMAll/MMAllPagePool.cpp              |     2 +-
 src/VBox/VMM/VMMAll/PATMAll.cpp                    |    12 +-
 src/VBox/VMM/VMMAll/PDMAll.cpp                     |     2 +-
 src/VBox/VMM/VMMAll/PDMAllCritSect.cpp             |    47 +-
 src/VBox/VMM/VMMAll/PDMAllCritSectBoth.cpp         |     2 +-
 src/VBox/VMM/VMMAll/PDMAllCritSectRw.cpp           |     2 +-
 src/VBox/VMM/VMMAll/PDMAllNetShaper.cpp            |     2 +-
 src/VBox/VMM/VMMAll/PDMAllQueue.cpp                |     2 +-
 src/VBox/VMM/VMMAll/PGMAll.cpp                     |     2 +-
 src/VBox/VMM/VMMAll/PGMAllGst.h                    |    16 +-
 src/VBox/VMM/VMMAll/PGMAllHandler.cpp              |    29 +-
 src/VBox/VMM/VMMAll/PGMAllMap.cpp                  |     2 +-
 src/VBox/VMM/VMMAll/PGMAllPhys.cpp                 |    36 +-
 src/VBox/VMM/VMMAll/PGMAllPool.cpp                 |     2 +-
 src/VBox/VMM/VMMAll/PGMAllShw.h                    |     2 +-
 src/VBox/VMM/VMMAll/REMAll.cpp                     |     2 +-
 src/VBox/VMM/VMMAll/SELMAll.cpp                    |     2 +-
 src/VBox/VMM/VMMAll/TMAllReal.cpp                  |     2 +-
 src/VBox/VMM/VMMAll/TMAllVirtual.cpp               |     2 +-
 src/VBox/VMM/VMMAll/TRPMAll.cpp                    |     2 +-
 src/VBox/VMM/VMMAll/VMAll.cpp                      |     2 +-
 src/VBox/VMM/VMMAll/VMMAll.cpp                     |     2 +-
 src/VBox/VMM/VMMAll/VMMAllA.asm                    |     2 +-
 src/VBox/VMM/VMMR0/GIMR0Hv.cpp                     |     2 +-
 src/VBox/VMM/VMMR0/GMMR0.cpp                       |     2 +-
 src/VBox/VMM/VMMR0/GMMR0Internal.h                 |     2 +-
 src/VBox/VMM/VMMR0/GVMMR0.cpp                      |     2 +-
 src/VBox/VMM/VMMR0/GVMMR0Internal.h                |     2 +-
 src/VBox/VMM/VMMR0/HMR0.cpp                        |   420 +-
 src/VBox/VMM/VMMR0/HMR0Mixed.mac                   |     2 +-
 src/VBox/VMM/VMMR0/HMSVMR0.h                       |     2 +-
 src/VBox/VMM/VMMR0/HMVMXR0.cpp                     |     7 +-
 src/VBox/VMM/VMMR0/HMVMXR0.h                       |     2 +-
 src/VBox/VMM/VMMR0/PDMR0Device.cpp                 |     2 +-
 src/VBox/VMM/VMMR0/PDMR0Driver.cpp                 |     2 +-
 src/VBox/VMM/VMMR0/PGMR0.cpp                       |     2 +-
 src/VBox/VMM/VMMR0/PGMR0Bth.h                      |     2 +-
 src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp             |     2 +-
 src/VBox/VMM/VMMR0/TRPMR0.cpp                      |     2 +-
 src/VBox/VMM/VMMR0/TRPMR0A.asm                     |     2 +-
 src/VBox/VMM/VMMR0/VMMR0.cpp                       |    34 +-
 src/VBox/VMM/VMMR0/VMMR0.def                       |     1 +
 src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm             |     2 +-
 src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm               |     2 +-
 src/VBox/VMM/VMMR0/VMMR0TripleFaultHack.cpp        |     2 +-
 src/VBox/VMM/VMMR0/VMMR0TripleFaultHackA.asm       |     2 +-
 src/VBox/VMM/VMMR3/CFGM.cpp                        |     2 +-
 src/VBox/VMM/VMMR3/CSAM.cpp                        |     2 +-
 src/VBox/VMM/VMMR3/DBGF.cpp                        |     2 +-
 src/VBox/VMM/VMMR3/DBGFAddr.cpp                    |     2 +-
 src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp               |     2 +-
 src/VBox/VMM/VMMR3/DBGFBp.cpp                      |     2 +-
 src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp               |   204 +-
 src/VBox/VMM/VMMR3/DBGFCpu.cpp                     |     2 +-
 src/VBox/VMM/VMMR3/DBGFDisas.cpp                   |     2 +-
 src/VBox/VMM/VMMR3/DBGFLog.cpp                     |     2 +-
 src/VBox/VMM/VMMR3/DBGFMem.cpp                     |     2 +-
 src/VBox/VMM/VMMR3/DBGFModule.cpp                  |     2 +-
 src/VBox/VMM/VMMR3/DBGFOS.cpp                      |     3 +-
 src/VBox/VMM/VMMR3/DBGFR3Trace.cpp                 |     2 +-
 src/VBox/VMM/VMMR3/DBGFReg.cpp                     |     2 +-
 src/VBox/VMM/VMMR3/DBGFStack.cpp                   |     2 +-
 src/VBox/VMM/VMMR3/EM.cpp                          |     4 +
 src/VBox/VMM/VMMR3/EMHM.cpp                        |     2 +-
 src/VBox/VMM/VMMR3/EMR3Dbg.cpp                     |     7 +-
 src/VBox/VMM/VMMR3/EMRaw.cpp                       |     2 +-
 src/VBox/VMM/VMMR3/FTM.cpp                         |     2 +-
 src/VBox/VMM/VMMR3/GIMKvm.cpp                      |    14 +-
 src/VBox/VMM/VMMR3/GMM.cpp                         |     2 +-
 src/VBox/VMM/VMMR3/HM.cpp                          |    17 +-
 src/VBox/VMM/VMMR3/IEMR3.cpp                       |     4 +-
 src/VBox/VMM/VMMR3/IOM.cpp                         |    50 +-
 src/VBox/VMM/VMMR3/MM.cpp                          |     8 +-
 src/VBox/VMM/VMMR3/MMHeap.cpp                      |     2 +-
 src/VBox/VMM/VMMR3/MMHyper.cpp                     |     2 +-
 src/VBox/VMM/VMMR3/MMPagePool.cpp                  |     2 +-
 src/VBox/VMM/VMMR3/MMUkHeap.cpp                    |     2 +-
 src/VBox/VMM/VMMR3/PATM.cpp                        |     2 +-
 src/VBox/VMM/VMMR3/PATMGuest.cpp                   |     2 +-
 src/VBox/VMM/VMMR3/PATMPatch.h                     |     2 +-
 src/VBox/VMM/VMMR3/PATMR3Dbg.cpp                   |     2 +-
 src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp          |     2 +-
 .../VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp   |     2 +-
 src/VBox/VMM/VMMR3/PDMBlkCache.cpp                 |     2 +-
 src/VBox/VMM/VMMR3/PDMCritSect.cpp                 |    32 +-
 src/VBox/VMM/VMMR3/PDMDevHlp.cpp                   |     2 +-
 src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp               |     2 +-
 src/VBox/VMM/VMMR3/PDMDevice.cpp                   |     2 +-
 src/VBox/VMM/VMMR3/PDMDriver.cpp                   |     2 +-
 src/VBox/VMM/VMMR3/PDMLdr.cpp                      |    12 +-
 src/VBox/VMM/VMMR3/PDMNetShaper.cpp                |     2 +-
 src/VBox/VMM/VMMR3/PDMQueue.cpp                    |     2 +-
 src/VBox/VMM/VMMR3/PDMThread.cpp                   |     2 +-
 src/VBox/VMM/VMMR3/PDMUsb.cpp                      |     4 +-
 src/VBox/VMM/VMMR3/PGM.cpp                         |    21 +-
 src/VBox/VMM/VMMR3/PGMBth.h                        |     2 +-
 src/VBox/VMM/VMMR3/PGMDbg.cpp                      |     2 +-
 src/VBox/VMM/VMMR3/PGMGst.h                        |     2 +-
 src/VBox/VMM/VMMR3/PGMHandler.cpp                  |    13 +-
 src/VBox/VMM/VMMR3/PGMMap.cpp                      |     2 +-
 src/VBox/VMM/VMMR3/PGMPhys.cpp                     |     2 +-
 src/VBox/VMM/VMMR3/PGMPool.cpp                     |     6 +-
 src/VBox/VMM/VMMR3/PGMSavedState.cpp               |     2 +-
 src/VBox/VMM/VMMR3/PGMSharedPage.cpp               |    11 +-
 src/VBox/VMM/VMMR3/PGMShw.h                        |     2 +-
 src/VBox/VMM/VMMR3/SELM.cpp                        |     2 +-
 src/VBox/VMM/VMMR3/SSM.cpp                         |     2 +-
 src/VBox/VMM/VMMR3/STAM.cpp                        |     2 +-
 src/VBox/VMM/VMMR3/TRPM.cpp                        |    14 +-
 src/VBox/VMM/VMMR3/VMEmt.cpp                       |     2 +-
 src/VBox/VMM/VMMR3/VMM.cpp                         |     9 +-
 src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp           |     2 +-
 src/VBox/VMM/VMMR3/VMMR3.def                       |     3 +-
 src/VBox/VMM/VMMR3/VMMSwitcher.cpp                 |     2 +-
 src/VBox/VMM/VMMR3/VMMTests.cpp                    |    56 +-
 src/VBox/VMM/VMMR3/VMReq.cpp                       |     2 +-
 src/VBox/VMM/VMMRC/CSAMRC.cpp                      |     4 +-
 src/VBox/VMM/VMMRC/EMRCA.asm                       |     2 +-
 src/VBox/VMM/VMMRC/IOMRC.cpp                       |     8 +-
 src/VBox/VMM/VMMRC/MMRamRC.cpp                     |     2 +-
 src/VBox/VMM/VMMRC/MMRamRCA.asm                    |     2 +-
 src/VBox/VMM/VMMRC/PATMRC.cpp                      |    10 +-
 src/VBox/VMM/VMMRC/PDMRCDevice.cpp                 |     2 +-
 src/VBox/VMM/VMMRC/PGMRC.cpp                       |     2 +-
 src/VBox/VMM/VMMRC/PGMRCBth.h                      |     2 +-
 src/VBox/VMM/VMMRC/PGMRCGst.h                      |     2 +-
 src/VBox/VMM/VMMRC/PGMRCShw.h                      |     2 +-
 src/VBox/VMM/VMMRC/SELMRC.cpp                      |     2 +-
 src/VBox/VMM/VMMRC/TRPMRC.cpp                      |     4 +-
 src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp              |     7 +-
 src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm             |     2 +-
 src/VBox/VMM/VMMRC/VMMRC.cpp                       |    56 +-
 src/VBox/VMM/VMMRC/VMMRC.def                       |     2 +-
 src/VBox/VMM/VMMRC/VMMRC.mac                       |     8 +-
 src/VBox/VMM/VMMRC/VMMRCA.asm                      |     4 +-
 src/VBox/VMM/VMMRC/VMMRCBuiltin.def                |     2 +-
 src/VBox/VMM/VMMRC/VMMRCDeps.cpp                   |     6 +-
 src/VBox/VMM/VMMRZ/DBGFRZ.cpp                      |     2 +-
 src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp                 |     2 +-
 src/VBox/VMM/VMMRZ/VMMRZ.cpp                       |     2 +-
 src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm          |     2 +-
 src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm          |     2 +-
 src/VBox/VMM/VMMSwitcher/32BitToPAE.asm            |     2 +-
 src/VBox/VMM/VMMSwitcher/AMD64Stub.asm             |     2 +-
 src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm          |     2 +-
 src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm            |     2 +-
 src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac        |     2 +-
 src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac        |     2 +-
 src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm            |     2 +-
 src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm            |     2 +-
 src/VBox/VMM/VMMSwitcher/PAEToPAE.asm              |     2 +-
 src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac           |     2 +-
 src/VBox/VMM/VMMSwitcher/X86Stub.asm               |     2 +-
 src/VBox/VMM/dtrace/int-1.d                        |     2 +-
 src/VBox/VMM/dtrace/lib/amd64/vbox-arch-types.d    |     2 +-
 src/VBox/VMM/dtrace/lib/vbox-types.d               |     2 +-
 src/VBox/VMM/dtrace/lib/x86/vbox-arch-types.d      |     2 +-
 .../VMM/dtrace/return-to-ring-3-aggregation-1.d    |     2 +-
 src/VBox/VMM/dtrace/vmexit-rip-aggregation-1.d     |     2 +-
 src/VBox/VMM/include/CFGMInternal.h                |     2 +-
 src/VBox/VMM/include/CPUMInternal.mac              |     2 -
 src/VBox/VMM/include/CSAMInternal.h                |     2 +-
 src/VBox/VMM/include/DBGFInternal.h                |     2 +-
 src/VBox/VMM/include/EMHandleRCTmpl.h              |     2 +-
 src/VBox/VMM/include/EMInternal.h                  |     2 +-
 src/VBox/VMM/include/FTMInternal.h                 |     2 +-
 src/VBox/VMM/include/HMInternal.mac                |     2 +-
 src/VBox/VMM/include/IEMInternal.h                 |    59 +-
 src/VBox/VMM/include/IOMInline.h                   |     2 +-
 src/VBox/VMM/include/IOMInternal.h                 |     2 +-
 src/VBox/VMM/include/MMInternal.h                  |     2 +-
 src/VBox/VMM/include/PATMInternal.h                |     2 +-
 .../VMM/include/PDMAsyncCompletionFileInternal.h   |     2 +-
 src/VBox/VMM/include/PDMAsyncCompletionInternal.h  |     2 +-
 src/VBox/VMM/include/PDMBlkCacheInternal.h         |     2 +-
 src/VBox/VMM/include/PDMInline.h                   |     2 +-
 src/VBox/VMM/include/PDMInternal.h                 |     8 +-
 src/VBox/VMM/include/PDMNetShaperInternal.h        |     2 +-
 src/VBox/VMM/include/PGMGstDefs.h                  |     2 +-
 src/VBox/VMM/include/PGMInline.h                   |    30 +-
 src/VBox/VMM/include/PGMInternal.h                 |    48 +-
 src/VBox/VMM/include/REMInternal.h                 |     2 +-
 src/VBox/VMM/include/SELMInline.h                  |     2 +-
 src/VBox/VMM/include/SELMInternal.h                |     2 +-
 src/VBox/VMM/include/SSMInternal.h                 |     2 +-
 src/VBox/VMM/include/STAMInternal.h                |     2 +-
 src/VBox/VMM/include/TMInline.h                    |     2 +-
 src/VBox/VMM/include/TRPMInternal.h                |     2 +-
 src/VBox/VMM/include/TRPMInternal.mac              |     2 +-
 src/VBox/VMM/include/VMInternal.h                  |     2 +-
 src/VBox/VMM/include/VMMInternal.h                 |    60 +-
 src/VBox/VMM/include/VMMInternal.mac               |     2 +-
 src/VBox/VMM/include/VMMTracing.h                  |     2 +-
 src/VBox/VMM/include/internal/pgm.h                |    54 +-
 src/VBox/VMM/pure_test.sh                          |     2 +-
 .../testcase/Instructions/InstructionTestGen.py    |     4 +-
 src/VBox/VMM/testcase/Instructions/Makefile.kmk    |     2 +-
 .../testcase/Instructions/env-bs2-r0-32-big.mac    |     2 +-
 .../testcase/Instructions/env-bs2-r0-64-big.mac    |     2 +-
 .../VMM/testcase/Instructions/env-bs2-r0-64.mac    |     2 +-
 .../VMM/testcase/Instructions/env-bs2-r0-big.mac   |     2 +-
 .../testcase/Instructions/env-bs2-r0-common.mac    |     2 +-
 src/VBox/VMM/testcase/Instructions/env-bs2-r0.mac  |     2 +-
 src/VBox/VMM/testcase/Instructions/env-common.mac  |     2 +-
 .../VMM/testcase/Instructions/env-iprt-r3-32.mac   |     2 +-
 .../VMM/testcase/Instructions/env-iprt-r3-64.mac   |     2 +-
 src/VBox/VMM/testcase/Instructions/env-iprt-r3.mac |     2 +-
 src/VBox/VMM/testcase/Instructions/itgTableDaa.py  |     4 +-
 src/VBox/VMM/testcase/Instructions/itgTableDas.py  |     4 +-
 .../VMM/testcase/Instructions/tstVBInsTstR3.cpp    |     2 +-
 src/VBox/VMM/testcase/Makefile.kmk                 |     4 +-
 src/VBox/VMM/testcase/mkdsk.sh                     |     2 +-
 src/VBox/VMM/testcase/tstAnimate.cpp               |     2 +-
 src/VBox/VMM/testcase/tstAsmStructs.cpp            |     2 +-
 src/VBox/VMM/testcase/tstAsmStructsAsm.asm         |     2 +-
 src/VBox/VMM/testcase/tstCFGM.cpp                  |     2 +-
 src/VBox/VMM/testcase/tstCompressionBenchmark.cpp  |     2 +-
 src/VBox/VMM/testcase/tstGlobalConfig.cpp          |     2 +-
 src/VBox/VMM/testcase/tstHelp.h                    |     2 +-
 src/VBox/VMM/testcase/tstIEMCheckMc.cpp            |     2 +-
 src/VBox/VMM/testcase/tstInstrEmul.cpp             |     2 +-
 src/VBox/VMM/testcase/tstMMHyperHeap.cpp           |     2 +-
 src/VBox/VMM/testcase/tstMicro.cpp                 |     2 +-
 src/VBox/VMM/testcase/tstMicro.h                   |     2 +-
 src/VBox/VMM/testcase/tstMicro.mac                 |     2 +-
 src/VBox/VMM/testcase/tstMicroRC.cpp               |     2 +-
 src/VBox/VMM/testcase/tstMicroRC.def               |     2 +-
 src/VBox/VMM/testcase/tstMicroRCA.asm              |     2 +-
 src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp    |     2 +-
 .../VMM/testcase/tstPDMAsyncCompletionStress.cpp   |     2 +-
 src/VBox/VMM/testcase/tstSSM.cpp                   |     2 +-
 src/VBox/VMM/testcase/tstVMM-HM.cpp                |     2 +-
 src/VBox/VMM/testcase/tstVMM.cpp                   |     4 +-
 src/VBox/VMM/testcase/tstVMMFork.cpp               |     2 +-
 src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp       |     2 +-
 src/VBox/VMM/testcase/tstVMREQ.cpp                 |     2 +-
 src/VBox/VMM/testcase/tstVMStruct.h                |     4 +
 src/VBox/VMM/testcase/tstVMStructDTrace.cpp        |     2 +-
 src/VBox/VMM/testcase/tstVMStructRC.cpp            |     2 +-
 src/VBox/VMM/testcase/tstVMStructSize.cpp          |     2 +-
 src/VBox/VMM/testcase/tstX86-1.cpp                 |     2 +-
 src/VBox/VMM/testcase/tstX86-1A.asm                |     2 +-
 src/VBox/VMM/testcase/tstX86-FpuSaveRestore.cpp    |     2 +-
 src/VBox/VMM/testcase/tstX86-FpuSaveRestoreA.asm   |     2 +-
 src/VBox/VMM/tools/Makefile.kmk                    |     2 +-
 src/VBox/VMM/tools/VBoxVMMPreload.cpp              |     2 +-
 src/VBox/VMM/tools/VBoxVMMPreloadHardened.cpp      |     2 +-
 src/VBox/ValidationKit/Config.kmk                  |     2 +-
 src/VBox/ValidationKit/Makefile.kmk                |     2 +-
 .../ValidationKitCodingGuidelines.cpp              |     2 +-
 src/VBox/ValidationKit/bootsectors/Makefile.kmk    |     2 +-
 .../ValidationKit/bootsectors/VBoxBs2Linker.cpp    |     4 +-
 .../ValidationKit/bootsectors/bootsector-empty.asm |     2 +-
 .../ValidationKit/bootsectors/bootsector-pae.asm   |     2 +-
 .../bootsectors/bootsector-shutdown.asm            |     2 +-
 .../ValidationKit/bootsectors/bootsector2-api.mac  |     2 +-
 .../bootsectors/bootsector2-boot-registers-1.asm   |     2 +-
 .../bootsectors/bootsector2-common-end.mac         |     2 +-
 .../bootsectors/bootsector2-common-init-code.mac   |     2 +-
 .../bootsectors/bootsector2-common-init-traps.mac  |     2 +-
 .../bootsectors/bootsector2-common-macros-1.mac    |     2 +-
 .../bootsector2-common-routines-template-1.mac     |     2 +-
 .../bootsector2-common-routines-template-2.mac     |     2 +-
 .../bootsectors/bootsector2-common-routines.mac    |     2 +-
 .../bootsector2-common-traprec-template.mac        |     2 +-
 .../bootsectors/bootsector2-common-traprec.mac     |     2 +-
 .../bootsectors/bootsector2-cpu-a20-1-template.mac |     2 +-
 .../bootsectors/bootsector2-cpu-a20-1.asm          |     2 +-
 .../bootsector2-cpu-basic-1-template.mac           |     2 +-
 .../bootsectors/bootsector2-cpu-basic-1.asm        |     2 +-
 .../bootsector2-cpu-hidden-regs-1-template.mac     |     2 +-
 .../bootsectors/bootsector2-cpu-hidden-regs-1.asm  |     2 +-
 .../bootsector2-cpu-instr-1-template.mac           |     2 +-
 .../bootsectors/bootsector2-cpu-instr-1.asm        |     2 +-
 .../bootsectors/bootsector2-cpu-pf-1-template.mac  |     2 +-
 .../bootsectors/bootsector2-cpu-pf-1.asm           |     2 +-
 .../bootsector2-cpu-xcpt-1-template.mac            |     2 +-
 .../bootsectors/bootsector2-cpu-xcpt-1.asm         |     2 +-
 .../bootsector2-cpu-xcpt-2-template.mac            |     2 +-
 .../bootsectors/bootsector2-cpu-xcpt-2.asm         |     2 +-
 .../bootsectors/bootsector2-first.mac              |     2 +-
 .../bootsectors/bootsector2-structures.mac         |     2 +-
 .../bootsectors/bootsector2-template-footer.mac    |     2 +-
 .../bootsectors/bootsector2-template-header.mac    |     2 +-
 .../bootsectors/bootsector2-test1.asm              |     2 +-
 .../bootsectors/bootsector2-triple-fault-1.asm     |     2 +-
 .../bootsectors/bootsector2-vbinstst-64-1.asm      |     2 +-
 .../bootsector2-vbinstst-big-template.asm          |     2 +-
 .../bootsectors/bootsector2-vbinstst-kernel.asm    |     2 +-
 src/VBox/ValidationKit/common/Makefile.kmk         |     2 +-
 src/VBox/ValidationKit/common/__init__.py          |     4 +-
 .../ValidationKit/common/constants/__init__.py     |     4 +-
 src/VBox/ValidationKit/common/constants/result.py  |     4 +-
 .../ValidationKit/common/constants/rtexitcode.py   |     4 +-
 src/VBox/ValidationKit/common/constants/tbreq.py   |     5 +-
 src/VBox/ValidationKit/common/constants/tbresp.py  |     4 +-
 .../ValidationKit/common/constants/valueunit.py    |     4 +-
 src/VBox/ValidationKit/common/utils.py             |     4 +-
 src/VBox/ValidationKit/common/webutils.py          |     4 +-
 .../ValidationKit/docs/AutomaticTestingRevamp.html |     2 +-
 .../ValidationKit/docs/AutomaticTestingRevamp.txt  |     2 +-
 src/VBox/ValidationKit/docs/Makefile.kmk           |     2 +-
 .../docs/VBoxValidationKitReadMe.html              |     2 +-
 .../ValidationKit/docs/VBoxValidationKitReadMe.txt |     2 +-
 src/VBox/ValidationKit/snippets/alloc-1.c          |     2 +-
 src/VBox/ValidationKit/snippets/time-1.c           |     2 +-
 src/VBox/ValidationKit/td-dummy.py                 |     2 +-
 src/VBox/ValidationKit/testanalysis/Makefile.kmk   |     2 +-
 src/VBox/ValidationKit/testanalysis/__init__.py    |     4 +-
 src/VBox/ValidationKit/testanalysis/diff.py        |     4 +-
 src/VBox/ValidationKit/testanalysis/reader.py      |     4 +-
 src/VBox/ValidationKit/testanalysis/reporting.py   |     4 +-
 src/VBox/ValidationKit/testanalysis/tst-a1.py      |     4 +-
 src/VBox/ValidationKit/testboxscript/Makefile.kmk  |     2 +-
 .../ValidationKit/testboxscript/TestBoxHelper.cpp  |     2 +-
 .../testboxscript/darwin/setup-routines.sh         |     2 +-
 .../testboxscript/linux/setup-routines.sh          |     2 +-
 .../testboxscript/linux/testboxscript-service.sh   |     2 +-
 src/VBox/ValidationKit/testboxscript/setup.sh      |    22 +-
 .../testboxscript/solaris/setup-routines.sh        |     2 +-
 .../ValidationKit/testboxscript/testboxcommand.py  |     4 +-
 .../ValidationKit/testboxscript/testboxcommons.py  |     4 +-
 .../testboxscript/testboxconnection.py             |     4 +-
 .../ValidationKit/testboxscript/testboxscript.py   |     4 +-
 .../testboxscript/testboxscript_real.py            |    21 +-
 .../ValidationKit/testboxscript/testboxtasks.py    |     4 +-
 .../ValidationKit/testboxscript/testboxupgrade.py  |     4 +-
 src/VBox/ValidationKit/testdriver/Makefile.kmk     |     2 +-
 src/VBox/ValidationKit/testdriver/__init__.py      |     4 +-
 src/VBox/ValidationKit/testdriver/base.py          |     4 +-
 src/VBox/ValidationKit/testdriver/reporter.py      |     4 +-
 src/VBox/ValidationKit/testdriver/tst-txsclient.py |     4 +-
 src/VBox/ValidationKit/testdriver/txsclient.py     |     4 +-
 src/VBox/ValidationKit/testdriver/vbox.py          |    36 +-
 src/VBox/ValidationKit/testdriver/vboxcon.py       |     4 +-
 src/VBox/ValidationKit/testdriver/vboxinstaller.py |     4 +-
 src/VBox/ValidationKit/testdriver/vboxtestvms.py   |     9 +-
 src/VBox/ValidationKit/testdriver/winbase.py       |     4 +-
 src/VBox/ValidationKit/testmanager/Makefile.kmk    |     2 +-
 src/VBox/ValidationKit/testmanager/__init__.py     |     4 +-
 .../testmanager/apache-template-2.2.conf           |     2 +-
 .../testmanager/apache-template-2.4.conf           |     2 +-
 .../ValidationKit/testmanager/batch/Makefile.kmk   |     2 +-
 .../ValidationKit/testmanager/batch/add_build.py   |     4 +-
 .../testmanager/batch/close_orphaned_testsets.py   |     4 +-
 .../ValidationKit/testmanager/batch/del_build.py   |     4 +-
 .../testmanager/batch/filearchiver.py              |     4 +-
 .../ValidationKit/testmanager/batch/vcs_import.py  |     4 +-
 .../ValidationKit/testmanager/cgi/Makefile.kmk     |     2 +-
 src/VBox/ValidationKit/testmanager/cgi/admin.py    |     4 +-
 .../ValidationKit/testmanager/cgi/debuginfo.py     |     4 +-
 src/VBox/ValidationKit/testmanager/cgi/index.py    |     4 +-
 src/VBox/ValidationKit/testmanager/cgi/logout.py   |     4 +-
 src/VBox/ValidationKit/testmanager/cgi/logout2.py  |     4 +-
 .../ValidationKit/testmanager/cgi/testboxdisp.py   |     4 +-
 src/VBox/ValidationKit/testmanager/config.py       |     6 +-
 .../ValidationKit/testmanager/core/Makefile.kmk    |     2 +-
 .../ValidationKit/testmanager/core/__init__.py     |     4 +-
 src/VBox/ValidationKit/testmanager/core/base.py    |     4 +-
 src/VBox/ValidationKit/testmanager/core/build.py   |     4 +-
 .../testmanager/core/buildblacklist.py             |     4 +-
 .../ValidationKit/testmanager/core/buildsource.py  |     4 +-
 .../ValidationKit/testmanager/core/coreconsts.py   |     4 +-
 src/VBox/ValidationKit/testmanager/core/db.py      |     4 +-
 .../ValidationKit/testmanager/core/dbobjcache.py   |     4 +-
 .../testmanager/core/failurecategory.py            |     4 +-
 .../testmanager/core/failurereason.py              |     4 +-
 .../testmanager/core/globalresource.pgsql          |     2 +-
 .../testmanager/core/globalresource.py             |     4 +-
 src/VBox/ValidationKit/testmanager/core/report.py  |     4 +-
 .../ValidationKit/testmanager/core/schedgroup.py   |     4 +-
 .../testmanager/core/schedulerbase.py              |     4 +-
 .../testmanager/core/schedulerbeci.py              |     4 +-
 .../ValidationKit/testmanager/core/systemlog.py    |     4 +-
 src/VBox/ValidationKit/testmanager/core/testbox.py |     4 +-
 .../testmanager/core/testboxcontroller.py          |     4 +-
 .../testmanager/core/testboxstatus.py              |     4 +-
 .../ValidationKit/testmanager/core/testcase.pgsql  |     2 +-
 .../ValidationKit/testmanager/core/testcase.py     |     4 +-
 .../ValidationKit/testmanager/core/testcaseargs.py |     4 +-
 .../ValidationKit/testmanager/core/testgroup.py    |     4 +-
 .../ValidationKit/testmanager/core/testresults.py  |     4 +-
 src/VBox/ValidationKit/testmanager/core/testset.py |     4 +-
 .../testmanager/core/useraccount.pgsql             |     2 +-
 .../ValidationKit/testmanager/core/useraccount.py  |     4 +-
 .../ValidationKit/testmanager/core/vcsrevisions.py |     4 +-
 .../testmanager/core/webservergluebase.py          |     4 +-
 .../testmanager/core/webservergluecgi.py           |     4 +-
 src/VBox/ValidationKit/testmanager/db/Makefile.kmk |     2 +-
 .../TestManagerDatabaseDefaultUserAccounts.pgsql   |     2 +-
 .../db/TestManagerDatabaseForeignKeyErHacks.pgsql  |     2 +-
 .../db/TestManagerDatabaseForeignKeyErHacks2.pgsql |     2 +-
 .../testmanager/db/TestManagerDatabaseInit.pgsql   |     2 +-
 .../testmanager/db/TestManagerVBoxPilot-1.pgsql    |     2 +-
 .../testmanager/db/gen-sql-comments.py             |     2 +-
 .../testmanager/db/tmdb-r01-builds-1.pgsql         |     2 +-
 .../testmanager/db/tmdb-r02-testboxes-1.pgsql      |     2 +-
 .../testmanager/db/tmdb-r03-teststatus-1.pgsql     |     2 +-
 .../testmanager/db/tmdb-r04-teststatus-2.pgsql     |     2 +-
 .../testmanager/db/tmdb-r05-teststatus-3.pgsql     |     2 +-
 .../testmanager/db/tmdb-r06-buildsources-1.pgsql   |     2 +-
 .../testmanager/db/tmdb-r07-testresults-1.pgsql    |     2 +-
 .../db/tmdb-r08-testresultvalues-1.pgsql           |     2 +-
 .../testmanager/db/tmdb-r09-testsets-1.pgsql       |     2 +-
 .../db/tmdb-r10-testresultvalues-2.pgsql           |     2 +-
 .../testmanager/db/tmdb-r11-testsets-2.pgsql       |     2 +-
 .../tmdb-r12-testresultvalues-3-testsets-3.pgsql   |     2 +-
 ...tmdb-r13-buildcategories-1-vcsrevisions-1.pgsql |     2 +-
 .../testmanager/db/tmdb-r14-testboxes-2.pgsql      |     2 +-
 .../ValidationKit/testmanager/debug/Makefile.kmk   |     2 +-
 .../ValidationKit/testmanager/debug/__init__.py    |     4 +-
 .../testmanager/debug/add_testbox.pgsql            |     2 +-
 .../testmanager/debug/cgiprofiling.py              |     4 +-
 .../testmanager/debug/functions.pgsql              |     2 +-
 .../testmanager/htdocs/css/common.css              |     2 +-
 .../testmanager/htdocs/css/details.css             |     2 +-
 .../testmanager/htdocs/css/graphwiz.css            |     2 +-
 .../testmanager/htdocs/css/tooltip.css             |     2 +-
 .../ValidationKit/testmanager/htdocs/js/common.js  |     2 +-
 .../testmanager/htdocs/js/graphwiz.js              |     2 +-
 .../ValidationKit/testmanager/misc/Makefile.kmk    |     2 +-
 .../testmanager/selftest/st1-load.pgsql            |     2 +-
 .../testmanager/selftest/st1-unload.pgsql          |     2 +-
 .../ValidationKit/testmanager/webui/Makefile.kmk   |     2 +-
 .../ValidationKit/testmanager/webui/__init__.py    |     4 +-
 .../ValidationKit/testmanager/webui/template.html  |     2 +-
 .../ValidationKit/testmanager/webui/wuiadmin.py    |     4 +-
 .../testmanager/webui/wuiadminbuild.py             |     4 +-
 .../testmanager/webui/wuiadminbuildblacklist.py    |     4 +-
 .../testmanager/webui/wuiadminbuildcategory.py     |     4 +-
 .../testmanager/webui/wuiadminbuildsource.py       |     4 +-
 .../testmanager/webui/wuiadminfailurereason.py     |     4 +-
 .../testmanager/webui/wuiadminglobalrsrc.py        |     4 +-
 .../testmanager/webui/wuiadminschedgroup.py        |     4 +-
 .../testmanager/webui/wuiadminsystemlog.py         |     4 +-
 .../testmanager/webui/wuiadmintestbox.py           |     4 +-
 .../testmanager/webui/wuiadmintestcase.py          |     4 +-
 .../testmanager/webui/wuiadmintestgroup.py         |     4 +-
 .../testmanager/webui/wuiadminuseraccount.py       |     4 +-
 .../ValidationKit/testmanager/webui/wuibase.py     |     4 +-
 .../testmanager/webui/wuicontentbase.py            |     4 +-
 .../testmanager/webui/wuifailurecategory.py        |     4 +-
 .../ValidationKit/testmanager/webui/wuigraphwiz.py |     4 +-
 .../ValidationKit/testmanager/webui/wuihlpform.py  |     4 +-
 .../ValidationKit/testmanager/webui/wuihlpgraph.py |     4 +-
 .../testmanager/webui/wuihlpgraphbase.py           |     4 +-
 .../testmanager/webui/wuihlpgraphgooglechart.py    |     4 +-
 .../testmanager/webui/wuihlpgraphmatplotlib.py     |     4 +-
 .../testmanager/webui/wuihlpgraphsimple.py         |     4 +-
 .../testmanager/webui/wuilogviewer.py              |     4 +-
 .../ValidationKit/testmanager/webui/wuimain.py     |     4 +-
 .../ValidationKit/testmanager/webui/wuireport.py   |     4 +-
 .../testmanager/webui/wuitestresult.py             |     4 +-
 .../testmanager/webui/wuivcshistory.py             |     4 +-
 src/VBox/ValidationKit/tests/Makefile.kmk          |     2 +-
 .../ValidationKit/tests/additions/Makefile.kmk     |     2 +-
 .../ValidationKit/tests/additions/tdAddBasic1.py   |     4 +-
 src/VBox/ValidationKit/tests/api/tdPython1.py      |     4 +-
 .../ValidationKit/tests/autostart/Makefile.kmk     |     2 +-
 .../ValidationKit/tests/autostart/tdAutostart1.py  |     2 +-
 .../ValidationKit/tests/benchmarks/Makefile.kmk    |     2 +-
 .../ValidationKit/tests/benchmarks/tdBenchmark1.py |     4 +-
 src/VBox/ValidationKit/tests/cpu/Makefile.kmk      |     2 +-
 src/VBox/ValidationKit/tests/cpu/tdCpuPae1.py      |     4 +-
 .../ValidationKit/tests/installation/Makefile.kmk  |     2 +-
 .../tests/installation/tdGuestOsInstOs2.py         |     4 +-
 .../tests/installation/tdGuestOsInstTest1.py       |     4 +-
 src/VBox/ValidationKit/tests/network/Makefile.kmk  |     2 +-
 .../ValidationKit/tests/network/tdNetBenchmark1.py |     4 +-
 .../ValidationKit/tests/selftests/Makefile.kmk     |     2 +-
 .../ValidationKit/tests/selftests/tdSelfTest1.py   |     4 +-
 .../ValidationKit/tests/selftests/tdSelfTest2.py   |     4 +-
 .../ValidationKit/tests/selftests/tdSelfTest3.py   |     4 +-
 .../ValidationKit/tests/selftests/tdSelfTest4.py   |     4 +-
 .../tests/shutdown/tdGuestOsShutdown1.py           |     4 +-
 .../ValidationKit/tests/smoketests/Makefile.kmk    |     2 +-
 .../ValidationKit/tests/smoketests/tdSmokeTest1.py |     4 +-
 src/VBox/ValidationKit/tests/storage/Makefile.kmk  |     2 +-
 .../tests/storage/tdStorageSnapshotMerging1.py     |     2 +-
 .../ValidationKit/tests/teleportation/Makefile.kmk |     2 +-
 .../tests/teleportation/tdTeleportLocal1.py        |     4 +-
 .../ValidationKit/tests/unittests/Makefile.kmk     |     2 +-
 .../ValidationKit/tests/unittests/tdUnitTest1.py   |     4 +-
 src/VBox/ValidationKit/tests/usb/Makefile.kmk      |     2 +-
 src/VBox/ValidationKit/tests/usb/tdUsb1.py         |     4 +-
 src/VBox/ValidationKit/tests/usb/usbgadget.py      |     4 +-
 src/VBox/ValidationKit/utils/Makefile.kmk          |     2 +-
 .../ValidationKit/utils/TestExecServ/Makefile.kmk  |     2 +-
 .../utils/TestExecServ/TestExecService.cpp         |     4 +-
 .../utils/TestExecServ/TestExecServiceInternal.h   |     2 +-
 .../utils/TestExecServ/TestExecServiceTcp.cpp      |     2 +-
 .../utils/TestExecServ/linux/vboxtxs-nat.sh        |     2 +-
 .../utils/TestExecServ/linux/vboxtxs.sh            |     2 +-
 .../utils/TestExecServ/solaris/vboxtxs-sol10.xml   |     2 +-
 .../utils/TestExecServ/solaris/vboxtxs.sh          |     2 +-
 .../utils/TestExecServ/solaris/vboxtxs.xml         |     2 +-
 .../utils/TestExecServ/win/vboxtxs-nat.cmd         |     2 +-
 .../utils/TestExecServ/win/vboxtxs.cmd             |     2 +-
 src/VBox/ValidationKit/utils/cpu/Makefile.kmk      |     2 +-
 src/VBox/ValidationKit/utils/cpu/cidet-app.cpp     |     2 +-
 src/VBox/ValidationKit/utils/cpu/cidet-appA.asm    |     2 +-
 src/VBox/ValidationKit/utils/cpu/cidet-core.cpp    |     2 +-
 src/VBox/ValidationKit/utils/cpu/cidet-instr-1.cpp |     2 +-
 src/VBox/ValidationKit/utils/cpu/cidet.h           |     2 +-
 src/VBox/ValidationKit/utils/cpu/cidet.mac         |     2 +-
 .../ValidationKit/utils/cpu/cpu-alloc-all-mem.cpp  |     2 +-
 src/VBox/ValidationKit/utils/cpu/cpu-numa.cpp      |     2 +-
 .../ValidationKit/utils/cpu/exceptionsR3-asm.asm   |     2 +-
 src/VBox/ValidationKit/utils/cpu/exceptionsR3.cpp  |     2 +-
 src/VBox/ValidationKit/utils/cpu/rdtsc.cpp         |     2 +-
 src/VBox/ValidationKit/utils/cpu/xmmsaving-asm.asm |     2 +-
 src/VBox/ValidationKit/utils/cpu/xmmsaving.cpp     |     2 +-
 src/VBox/ValidationKit/utils/misc/Makefile.kmk     |     2 +-
 .../ValidationKit/utils/misc/loadgenerator.cpp     |     4 +-
 .../ValidationKit/utils/misc/loadgeneratorR0.cpp   |     2 +-
 src/VBox/ValidationKit/utils/misc/vts_rm.cpp       |     2 +-
 src/VBox/ValidationKit/utils/misc/vts_tar.cpp      |     2 +-
 src/VBox/ValidationKit/utils/network/Makefile.kmk  |     2 +-
 src/VBox/ValidationKit/utils/network/NetPerf.cpp   |     4 +-
 src/VBox/ValidationKit/utils/nt/Makefile.kmk       |     2 +-
 src/VBox/ValidationKit/utils/nt/ntsetfreq.cpp      |     2 +-
 src/VBox/ValidationKit/utils/nt/nttimesources.cpp  |     2 +-
 src/VBox/ValidationKit/utils/usb/Makefile.kmk      |     2 +-
 src/VBox/ValidationKit/utils/usb/UsbTest.cpp       |     2 +-
 src/apps/Makefile.kmk                              |     2 +-
 src/apps/adpctl/Makefile.kmk                       |     2 +-
 src/apps/svnsync-vbox/Makefile.kmk                 |     2 +-
 src/apps/tunctl/Makefile.kmk                       |     2 +-
 src/bldprogs/Makefile.kmk                          |    10 +-
 src/bldprogs/VBoxCPP.cpp                           |     4 +-
 src/bldprogs/VBoxCmp.cpp                           |     2 +-
 src/bldprogs/VBoxPeSetVersion.cpp                  |     2 +-
 src/bldprogs/VBoxTpG.cpp                           |     4 +-
 src/bldprogs/bin2c.c                               |     2 +-
 src/bldprogs/biossums.c                            |     2 +-
 src/bldprogs/checkUndefined.sh                     |     2 +-
 src/bldprogs/deftoimp.sed                          |     2 +-
 src/bldprogs/filesplitter.cpp                      |     2 +-
 src/bldprogs/preload.cpp                           |     4 +-
 src/bldprogs/scm.cpp                               |    27 +-
 src/bldprogs/scm.h                                 |     2 +-
 src/bldprogs/scmdiff.cpp                           |     2 +-
 src/bldprogs/scmdiff.h                             |     2 +-
 src/bldprogs/scmrw.cpp                             |     2 +-
 src/bldprogs/scmstream.cpp                         |     2 +-
 src/bldprogs/scmstream.h                           |     2 +-
 src/bldprogs/scmsubversion.cpp                     |   450 +-
 src/libs/Makefile.kmk                              |     4 +-
 src/libs/kStuff/Makefile.kmk                       |     2 +-
 src/libs/liblzf-3.4/Makefile.kmk                   |     2 +-
 src/libs/xpcom18a4/Config.kmk                      |     2 +-
 src/libs/xpcom18a4/Makefile.kmk                    |     2 +-
 src/libs/xpcom18a4/java/Makefile.kmk               |     2 +-
 src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp   |     4 +-
 src/libs/xpcom18a4/java/src/nsJavaWrapper.cpp      |     5 +-
 .../xpcom18a4/java/src/nsJavaXPCOMBindingUtils.cpp |     7 +
 src/libs/xpcom18a4/java/src/nsJavaXPCOMGlue.cpp    |     7 +
 src/libs/xpcom18a4/python/Makefile.kmk             |     2 +-
 .../xpcom18a4/xpcom/base/nsExceptionService.cpp    |     2 +-
 src/recompiler/Makefile.kmk                        |     2 +-
 3240 files changed, 47064 insertions(+), 48991 deletions(-)

diff --git a/.scm-settings b/.scm-settings
index c688df3..3d1bb1c 100644
--- a/.scm-settings
+++ b/.scm-settings
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright (C) 2010-2011 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -45,8 +45,11 @@
 --filter-out-dirs  "*/tools/."
 --filter-out-dirs  "*/webtools/."
 --filter-out-dirs  "*/kBuild/."
+--filter-out-dirs  "*/_kBuild/."
+--filter-out-dirs  "*/kBuild_/."
 --filter-out-dirs  "*/debian/."
 --filter-out-dirs  "*/SlickEdit/."
+--filter-out-dirs  "*/doc/manual/texfiles/."
 --filter-out-dirs  "*/src/libs/*/."
 --filter-out-dirs  "*/src/apps/kchmviewer*/."
 --filter-out-dirs  "*/src/VBox/Additions/x11/x11include/."
@@ -71,7 +74,7 @@
 --filter-out-dirs  "*/src/VBox/Devices/Network/lwip*/doc*/."
 --filter-out-dirs  "*/src/VBox/Devices/Network/lwip*/test*/."
 --filter-out-dirs  "*/src/VBox/Storage/VDFormats/StorageCraft/*/."
---filter-out-dirs  "*/src/VBox/RDP/client/."
+--filter-out-dirs  "*/src/VBox/RDP/client-*/."
 --filter-out-dirs  "*/src/recompiler/tests/."
 
 
diff --git a/Config.kmk b/Config.kmk
index d0c9580..922b48d 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -220,9 +220,9 @@ VBOX_BUILD_PUBLISHER =
 # Note! The BETA[n],ALPHA[n],RC[n] indicators should be inserted before the
 #       publisher so that RTStrVersionCompare have a chance of comparing
 #       prerelease from different publishers correctly.
-VBOX_VERSION_STRING = $(VBOX_VERSION_STRING_RAW)_RC1$(VBOX_BUILD_PUBLISHER)
+VBOX_VERSION_STRING = $(VBOX_VERSION_STRING_RAW)_RC2$(VBOX_BUILD_PUBLISHER)
 # Just the BETA[n],ALPHA[n],RC[n] indicators. Set to empty string for release.
-VBOX_VERSION_PRERELEASE = RC1
+VBOX_VERSION_PRERELEASE = RC2
 
 # Force the additions.sh script to get an exact additions build when we're doing the release.
 ifeq ($(int-mod $(VBOX_VERSION_BUILD),2),0)
@@ -368,7 +368,9 @@ endif
 ## @name VMM related settings.
 ## @{
 # Enable the tradition raw-mode virtualization.
-VBOX_WITH_RAW_MODE = 1
+if !$(intersects $(KBUILD_TARGET), darwin) || defined(VBOX_ONLY_EXTPACKS)
+ VBOX_WITH_RAW_MODE = 1
+endif
 # Enable the ring-1 compression option (mainly for QNX).
 VBOX_WITH_RAW_RING1 = 1
 # Enable safe STR (store task register) emulation for raw-mode.
@@ -384,7 +386,9 @@ VBOX_WITH_DEBUGGER = 1
 # Enable the debugger GUI.
 VBOX_WITH_DEBUGGER_GUI = 1
 # Enables the second step using IEM (the interpreter).
-#VBOX_WITH_2ND_IEM_STEP = 1
+VBOX_WITH_2ND_IEM_STEP = 1
+# Enables the third step using IEM (the interpreter).
+#VBOX_WITH_3RD_IEM_STEP = 1
 ## @}
 
 
@@ -643,8 +647,8 @@ VBOX_WITH_S3 = 1
 # Enable Host=>Guest Drag'n'Drop
 if1of ($(KBUILD_TARGET), darwin linux solaris win)
  VBOX_WITH_DRAG_AND_DROP = 1
- if1of ($(KBUILD_TARGET), linux solaris win)
-  VBOX_WITH_DRAG_AND_DROP_GH = 1
+ if1of ($(KBUILD_TARGET), darwin linux solaris win)
+  VBOX_WITH_DRAG_AND_DROP_GH = $(VBOX_WITH_DRAG_AND_DROP)
  endif
 endif
 # Enables use of merge modules in the windows installer. This will increase
@@ -664,7 +668,7 @@ if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
   VBOX_WITH_NETFLT_CROSSBOW = 1
  endif
  # Use VBoxNetAdp for host only networking.
- if1of ($(KBUILD_TARGET), darwin freebsd linux solaris) ## @todo this should be set and used on windows too.
+ if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
   VBOX_WITH_NETADP = 1
  endif
 endif
@@ -1095,7 +1099,7 @@ ifdef VBOX_OSE
  VBOX_BRAND_LICENSE_TXT              := $(PATH_ROOT)/doc/License-gpl-2.0.txt
  VBOX_BRAND_BIOS_LOGO                := $(PATH_ROOT)/src/VBox/Devices/Graphics/BIOS/ose_logo.bmp
  VBOX_BRAND_GUI_ABOUT_PNG            := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about.png
- VBOX_BRAND_GUI_ABOUT_HIDPI_PNG      := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about.png
+ VBOX_BRAND_GUI_ABOUT_HIDPI_PNG      := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_hidpi.png
  VBOX_BRAND_GUI_ABOUT_16PX_PNG       := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_16px.png
  VBOX_BRAND_GUI_ABOUT_16PX_HIDPI_PNG := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/about_16px.png
  VBOX_BRAND_GUI_VBOX_16PX_PNG        := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_16px.png
@@ -1665,7 +1669,7 @@ ifeq ($(KBUILD_TARGET),darwin)
  VBOX_LIB_RUNTIME_X86   = $(PATH_STAGE_BIN)/VBoxRT-x86.dylib
  LIB_KPROFILE    = $(PATH_STAGE_BIN)/kPrf2.dylib
  LIB_VMM         = $(PATH_STAGE_BIN)/VBoxVMM.dylib
- LIB_VMMGC       = $(PATH_STAGE_BIN)/VMMGC.gc
+ LIB_VMMRC       = $(PATH_STAGE_BIN)/VMMRC.rc
  LIB_REM         = $(PATH_STAGE_LIB)/VBoxREM.dylib
  LIB_XPCOM       = $(PATH_STAGE_BIN)/VBoxXPCOM.dylib
  VBOX_LIB_XPCOM_X86     = $(PATH_STAGE_BIN)/VBoxXPCOM-x86.dylib
@@ -1677,7 +1681,7 @@ if1of ($(KBUILD_TARGET), freebsd haiku linux netbsd openbsd solaris)
  VBOX_LIB_RUNTIME_X86   = $(PATH_STAGE_BIN)/VBoxRT-x86.so
  LIB_KPROFILE    = $(PATH_STAGE_BIN)/kPrf2.so
  LIB_VMM         = $(PATH_STAGE_BIN)/VBoxVMM.so
- LIB_VMMGC       = $(PATH_STAGE_BIN)/VMMGC.gc
+ LIB_VMMRC       = $(PATH_STAGE_BIN)/VMMRC.rc
  LIB_REM         = $(PATH_STAGE_LIB)/VBoxREM.so
  LIB_XPCOM       = $(PATH_STAGE_BIN)/VBoxXPCOM.so
  VBOX_LIB_XPCOM_X86   = $(PATH_STAGE_BIN)/VBoxXPCOM-x86.so
@@ -1689,7 +1693,7 @@ ifeq ($(KBUILD_TARGET),os2)
  VBOX_LIB_RUNTIME_X86   = $(PATH_STAGE_BIN)/VBoxRT-x86.dll
  LIB_KPROFILE    = $(PATH_STAGE_BIN)/kPrf2.dll
  LIB_VMM         = $(PATH_STAGE_BIN)/VBoxVMM.dll
- LIB_VMMGC       = $(PATH_STAGE_LIB)/VMMRCImp.lib
+ LIB_VMMRC       = $(PATH_STAGE_LIB)/VMMRCImp.lib
  LIB_REM         = $(PATH_STAGE_LIB)/VBoxREMImp.lib
  LIB_XPCOM       = $(PATH_STAGE_BIN)/VBoxXCOM.dll
  VBOX_LIB_XPCOM_X86     = $(PATH_STAGE_BIN)/VBoxXPCOM-x86.dll
@@ -1702,7 +1706,7 @@ ifeq ($(KBUILD_TARGET),win)
  VBOX_LIB_RUNTIME_X86   = $(PATH_STAGE_LIB)/VBoxRT-x86.lib
  LIB_KPROFILE    = $(PATH_STAGE_LIB)/kPrf2.lib
  LIB_VMM         = $(PATH_STAGE_LIB)/VBoxVMM.lib
- LIB_VMMGC       = $(PATH_OBJ)/VMMRC/VMMGC.lib
+ LIB_VMMRC       = $(PATH_OBJ)/VMMRC/VMMRC.lib
  LIB_REM         = $(PATH_STAGE_LIB)/VBoxREMImp.lib
  LIB_XPCOM       = $(PATH_STAGE_BIN)/VBoxXPCOM.lib
  VBOX_LIB_XPCOM_X86     = $(PATH_STAGE_BIN)/VBoxXPCOM-x86.lib
@@ -1835,10 +1839,10 @@ VBOX_IASLCMD   ?= $(firstword $(wildcard $(KBUILD_DEVTOOLS_HST)/bin/iasl$(HOSTSU
 # libxslt XSLT processor. (see PATH_TOOL_YASM for explanation why it's temporarily located in bin.)
 ifeq ($(VBOX_XSLTPROC),)
  ifeq ($(KBUILD_HOST),win)
-   VBOX_XSLTPROC := $(wildcard $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)/libxslt/10128/bin/xsltproc.exe)
-   ifeq ($(VBOX_XSLTPROC),)
-    VBOX_XSLTPROC := $(KBUILD_DEVTOOLS)/win.x86/bin/xsltproc.exe
-   endif
+  VBOX_XSLTPROC := $(wildcard $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)/libxslt/10128/bin/xsltproc.exe)
+  ifeq ($(VBOX_XSLTPROC),)
+   VBOX_XSLTPROC := $(KBUILD_DEVTOOLS)/win.x86/bin/xsltproc.exe
+  endif
  else ifeq ($(KBUILD_HOST),os2)
   VBOX_XSLTPROC  := BEGINLIBPATH="$(KBUILD_DEVTOOLS_HST)/bin;$$BEGINLIBPATH" $(KBUILD_DEVTOOLS_HST)/bin/xsltproc.exe
  else ifeq ($(KBUILD_HOST),haiku)
@@ -2521,8 +2525,9 @@ ifdef VBOX_PATH_PREFIX_MINGW64
 	$(QUIET)$(APPEND) '$@' 'VBOX_MINGW64_Wno-maybe-uninitialized     ?= $(call VBOX_GCC_CHECK_EX_CXX,$(VBOX_PATH_PREFIX_MINGW64)g++ -m64,-Wno-maybe-uninitialized,)'
 	$(QUIET)$(APPEND) '$@' 'VBOX_MINGW64_USER_LABEL_PREFIX           ?= $(shell echo "__USER_LABEL_PREFIX__" | $(VBOX_PATH_PREFIX_MINGW64)g++ -m64 -E -xc++ - | $(SED) -e "/^$(HASH)/d")'
 endif
-	$(QUIET)$(APPEND) '$@' 'VBOX_HAVE_FLEX  ?= $(if $(which flex),1,)'
-	$(QUIET)$(APPEND) '$@' 'VBOX_HAVE_BISON ?= $(if $(which bison),1,)'
+	$(QUIET)$(APPEND) '$@' 'VBOX_HAVE_FLEX    ?= $(if $(which flex),1,)'
+	$(QUIET)$(APPEND) '$@' 'VBOX_HAVE_BISON   ?= $(if $(which bison),1,)'
+	$(QUIET)$(APPEND) '$@' 'VBOX_HAVE_XMLLINT ?= $(which xmllint)'
 	$(QUIET)$(ECHO) '========= START OF $@ ========='
 	$(QUIET)$(CAT) $@
 	$(QUIET)$(ECHO) '=========== END OF $@ ========='
@@ -2546,6 +2551,30 @@ endif
 
 
 #
+# Misc stuff that should be after including DynamicConfig.kmk.
+#
+
+# libxml XML linter.
+ifeq ($(VBOX_XMLLINT),)
+ ifeq ($(KBUILD_HOST),win)
+  VBOX_XMLLINT := $(wildcard $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)/libxslt/10128/bin/xmllint.exe)
+ endif
+ ifeq ($(VBOX_XMLLINT),)
+  VBOX_XMLLINT := $(VBOX_HAVE_XMLLINT)
+ endif
+ ifneq ($(VBOX_XMLLINT),)
+  VBOX_HAVE_XMLLINT := 1
+ else
+  VBOX_XMLLINT := xmllint
+  VBOX_HAVE_XMLLINT :=
+ endif
+else
+ VBOX_HAVE_XMLLINT := 1
+endif
+
+
+
+#
 # Misc macros.
 #
 
@@ -3364,7 +3393,7 @@ ifdef VBOX_WITH_RAW_MODE
  TEMPLATE_VBoxRc_ASFLAGS             = $(VBOX_ASFLAGS32)
  TEMPLATE_VBoxRc_DEFS                = IN_RC IPRT_NO_CRT RT_WITH_NOCRT_ALIASES $(ARCH_BITS_DEFS)
  TEMPLATE_VBoxRc_INCS                = $(PATH_ROOT)/include/iprt/nocrt
- TEMPLATE_VBoxRc_SYSSUFF             = .gc
+ TEMPLATE_VBoxRc_SYSSUFF             = .rc
  TEMPLATE_VBoxRc_BLD_TRG_ARCH        = x86
  TEMPLATE_VBoxRc_MODE                = a+r,u+w
 
@@ -4266,7 +4295,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
 	$(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib \
  	$(PATH_TOOL_$(TEMPLATE_VBOXR3HARDENEDEXE_TOOL.win.x86)_LIB)/chkstk.obj
  TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS      = $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_CXXFLAGS)) -GS-
- TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS.debug= $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_CXXFLAGS.debug)) -GS- -O2 -Oy-
+ TEMPLATE_VBOXR3HARDENEDEXE_CXXFLAGS.debug= $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_CXXFLAGS.debug)) -GS- #-O2 -Oy-
  TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS        = $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_CFLAGS)) -GS-
  TEMPLATE_VBOXR3HARDENEDEXE_CFLAGS.debug  = $(filter-out -RTC% -GZ -GS,$(TEMPLATE_VBOXR3EXE_CFLAGS.debug)) -GS- -O2 -Oy-
  TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(TEMPLATE_VBOXR3EXE_LDFLAGS) \
@@ -6049,7 +6078,7 @@ endif
 SVN                    ?= svn$(HOSTSUFF_EXE)
 VBOX_SVN_REV_KMK        = $(PATH_OUT)/revision.kmk
 ifndef VBOX_SVN_REV
- VBOX_SVN_REV_FALLBACK := $(patsubst %:,,  $Rev: 100731 $  )
+ VBOX_SVN_REV_FALLBACK := $(patsubst %:,,  $Rev: 101271 $  )
  VBOX_SVN_DEP          := $(firstword $(wildcard $(PATH_ROOT)/.svn/wc.db $(abspath $(PATH_ROOT)/../.svn/wc.db) $(abspath $(PATH_ROOT)/../../.svn/wc.db) $(PATH_ROOT)/.svn/entries))
  ifeq ($(which $(SVN)),)
   VBOX_SVN_DEP         :=
diff --git a/Makefile.kmk b/Makefile.kmk
index d86269e..b079530 100644
--- a/Makefile.kmk
+++ b/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -22,7 +22,8 @@ include $(KBUILD_PATH)/subheader.kmk
 # Sub-makefiles / Sub-directories.
 #
 ifndef VBOX_ONLY_ROOT_MAKEFILE
- if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
+ if  (defined(VBOX_WITH_DOCS) || defined(VBOX_WITH_MAIN)) \
+  && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
   include $(PATH_SUB_CURRENT)/doc/manual/Makefile.kmk
  endif
  include $(PATH_SUB_CURRENT)/src/Makefile.kmk
@@ -1722,3 +1723,4 @@ sdk:
 sdk-fetch:
 	+ $(KMK) VBOX_ONLY_SDK=1 -C tools
 
+
diff --git a/configure b/configure
index 930428d..f907cee 100755
--- a/configure
+++ b/configure
@@ -2650,7 +2650,7 @@ fi
 # some things are not available in for OSE
 if [ $OSE -ge 1 ]; then
   cnf_append "VBOX_OSE" "1"
-  cnf_append "VBOX_WITH_TESTSUITE" ""
+  cnf_append "VBOX_WITH_VALIDATIONKIT" ""
   cnf_append "VBOX_WITH_WIN32_ADDITIONS" ""
 
   if [ "$OS" = "linux" ]; then
diff --git a/doc/manual/Makefile.kmk b/doc/manual/Makefile.kmk
index a05b1fa..0c86d83 100644
--- a/doc/manual/Makefile.kmk
+++ b/doc/manual/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -100,9 +100,13 @@ endif
 
 # xsltproc with the catalog trick if applicable.
 ifdef VBOX_XML_CATALOG
- VBOX_XSLTPROC_WITH_CAT    = $(REDIRECT) -E "XML_CATALOG_FILES=$(VBOX_XML_CATALOG)" -- $(VBOX_XSLTPROC)
+ VBOX_XSLTPROC_WITH_CAT    = $(REDIRECT) -E "XML_CATALOG_FILES=$(VBOX_XML_CATALOG)" -- \
+ 	$(VBOX_XSLTPROC) --nonet --xinclude $(VBOX_XSLTPROC_OPTS)
+ VBOX_XMLLINT_WITH_CAT     = $(REDIRECT) -E "XML_CATALOG_FILES=$(VBOX_XML_CATALOG)" -- \
+	$(VBOX_XMLLINT) --nonet --xinclude --noout $(VBOX_XMLLINT_OPTS)
 else
- VBOX_XSLTPROC_WITH_CAT    = $(VBOX_XSLTPROC)
+ VBOX_XSLTPROC_WITH_CAT    = $(VBOX_XSLTPROC) --nonet --xinclude $(VBOX_XSLTPROC_OPTS)
+ VBOX_XMLLINT_WITH_CAT     = $(VBOX_XMLLINT) --nonet --xinclude --noout $(VBOX_XMLLINT_OPTS)
 endif
 
 VBOXMANAGEHELP_PATH       ?= $(PATH_STAGE_BIN)/VBoxManageHelp$(SUFF_EXE)
@@ -143,31 +147,61 @@ VBOX_DOC_XIDL_SRC_TMP  = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.xidl.tmp
 ##
 # Non-pattern-rule approach to editing XSLT files.
 # $(evalcall2 def_vbox_replace_paths_in_xslt)
-# @param    1   The XSLT source file.
-# @param    2   Optional output subdirectory.
+# @param    1   The XSLT source file (relative to Makefile dir).
+# @param    2   Optional output subdirectory (leading slash).
 define def_vbox_replace_paths_in_xslt
-OTHER_CLEAN += $$(VBOX_PATH_MANUAL_OUTBASE)/$2$(notdir $1)
-$$(VBOX_PATH_MANUAL_OUTBASE)/$2$(notdir $1): $1 | $$$$(dir $$$$@)
-	$$(call MSG_GENERATE,,$$@,$$<)
+OTHER_CLEAN += $$(VBOX_PATH_MANUAL_OUTBASE)$2/$(notdir $1)
+$$(VBOX_PATH_MANUAL_OUTBASE)$2/$(notdir $1): $$(VBOX_PATH_MANUAL_SRC)/$1 | $$$$(dir $$$$@)
+	$$(call MSG_L1,Pre-processing $$(<) to $$(@))
 	$$(QUIET)$$(SED) \
 		-e 's|@VBOX_PATH_DOCBOOK@|$$(VBOX_PATH_DOCBOOK)|g' \
 		-e 's|@VBOX_PATH_MANUAL_SRC@|$$(VBOX_PATH_MANUAL_SRC)|g' \
 		-e 's|@VBOX_PATH_MANUAL_OUTBASE@|$$(VBOX_PATH_MANUAL_OUTBASE)|g' \
-		\
-		-e 's|@CFGPATH@|$$(VBOX_PATH_MANUAL_SRC)|g' \
-		-e 's|@TARGETPATH@|$$(@D)|g' \
+		-e 's|@VBOX_PATH_MANUAL_OUT_LANG@|$$(VBOX_PATH_MANUAL_OUTBASE)$2|g' \
 		--output "$$(@)" $$<
 endef
 
+##
+# Non-pattern-rule approach to editing XML files.
+# $(evalcall2 def_vbox_replace_stuff_in_xml)
+# @param    1   The XSLT source file (relative to Makefile dir).
+# @param    2   Optional output subdirectory (leading slash).
+#
+define def_vbox_replace_stuff_in_xml
+OTHER_CLEAN += $$(VBOX_PATH_MANUAL_OUTBASE)$2/$(notdir $1)
+$$(VBOX_PATH_MANUAL_OUTBASE)$2/$(notdir $1): $$(VBOX_PATH_MANUAL_SRC)/$1 $$(VBOX_VERSION_STAMP) | $$$$(dir $$$$@)
+	$$(call MSG_L1,Pre-processing $$(<) to $$(@))
+	$$(QUIET)$$(SED) \
+		-e 's|@VBOX_PATH_DOCBOOK@|$$(VBOX_PATH_DOCBOOK)|g' \
+		-e 's|@VBOX_PATH_MANUAL_SRC@|$$(VBOX_PATH_MANUAL_SRC)|g' \
+		-e 's|@VBOX_PATH_MANUAL_OUTBASE@|$$(VBOX_PATH_MANUAL_OUTBASE)|g' \
+		-e 's|@VBOX_PATH_MANUAL_OUT_LANG@|$$(VBOX_PATH_MANUAL_OUTBASE)$2|g' \
+               \
+		-e 's/@VBOX_VERSION_MAJOR@/$$(VBOX_VERSION_MAJOR)/g' \
+	        -e 's/@VBOX_VERSION_MINOR@/$$(VBOX_VERSION_MINOR)/g' \
+	        -e 's/@VBOX_VERSION_BUILD@/$$(VBOX_VERSION_BUILD)/g' \
+	        -e 's/@VBOX_VERSION_STRING@/$$(VBOX_VERSION_STRING)/g' \
+	        -e 's/@VBOX_VENDOR@/$$(VBOX_VENDOR)/g' \
+	        -e 's/@VBOX_PRODUCT@/$$(VBOX_PRODUCT)/g' \
+	        -e 's/@VBOX_C_YEAR@/$$(VBOX_C_YEAR)/g' \
+               \
+		--output "$$(@)" $$<
+endef
+
+## List of refentry files (manpages).
+VBOX_MANUAL_XML_REFENTRY_FILES = \
+	man_VBoxManage-debugvm.xml \
+	man_VBoxManage-extpack.xml
 
 
 #
 # Targets
 #
 
-BLDDIRS += $(VBOX_PATH_MANUAL_OUTBASE)
+BLDDIRS += $(VBOX_PATH_MANUAL_OUTBASE) $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/, $(VBOX_MANUAL_LANGUAGES))
+
 
-ifdef VBOX_WITH_DOCS
+if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
  if defined(VBOX_ONLY_SDK) || defined(VBOX_WITH_DOCS_SDKREF)
   ## @todo make this an install target, drop the BLDDIRS.
   OTHERS += \
@@ -238,9 +272,6 @@ ifdef VBOX_WITH_DOCS
  VBOX_MANUAL_XML_FILES_INCL_CHANGELOG = $(VBOX_MANUAL_XML_FILES) \
  	user_ChangeLog.xml
 
- VBOX_MANUAL_XML_REFENTRY_FILES = \
- 	man_VBoxManage_extpack.xml
-
  VBOX_SDKREF_XML_FILES = \
  	SDKRef.xml
 
@@ -259,7 +290,6 @@ ifdef VBOX_WITH_DOCS
 
  BLDDIRS += \
  	$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/,\
- 		$(VBOX_MANUAL_LANGUAGES) \
  		$(addsuffix /images, $(VBOX_MANUAL_LANGUAGES)) \
  		$(addsuffix /html-single, $(VBOX_MANUAL_LANGUAGES)) \
  		$(addsuffix /html-chunks, $(VBOX_MANUAL_LANGUAGES)) \
@@ -278,15 +308,20 @@ ifdef VBOX_WITH_DOCS
  	$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/, \
  		$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG) \
                $(VBOX_MANUAL_XML_REFENTRY_FILES) \
+               $(addprefix user_,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
+               $(patsubst man_%,%.1,$(basename $(VBOX_MANUAL_XML_REFENTRY_FILES))) \
  		$(VBOX_MANUAL_LATEX_FILES_TARGET) \
 		$(VBOX_MANUAL_PNG_FILES_$(lang)) \
  		$(notdir $(VBOX_MANUAL_TEX_UNICODE_FILES)) \
 		$(addprefix HTMLHelp/,$(VBOX_MANUAL_PNG_FILES_$(lang))) \
                html-single/UserManual.html \
-               $(addprefix html-chunks/ HTMLHelp/, index.html go01.html) \
+               $(addprefix HTMLHelp/,    index.html go01.html) \
+               $(addprefix html-chunks/, index.html go01.html) \
                $(foreach n,01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 \
 			,html-chunks/ch$(n).html \
+			html-chunks/re$(n).html \
 			HTMLHelp/ch$(n).html \
+			HTMLHelp/re$(n).html \
 			$(foreach d2,0 1 2 3 4 5 6 7 8 9,$(foreach d1,0 1 2 3 4 5 6 7 8 9,HTMLHelp/ch$(n)s$(d2)$(d1).html)) ) \
                $(foreach n,a b c \
 			,html-chunks/ap$(n).html \
@@ -294,14 +329,15 @@ ifdef VBOX_WITH_DOCS
                	$(foreach s,01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20,HTMLHelp/ap$(n)s$(s).html) ) \
                HTMLHelp/toc.hhc \
                HTMLHelp/htmlhelp.hhp \
-		docbook-htmlhelp-formatcfg.xsl \
-		docbook-html-one-page-formatcfg.xsl \
-		docbook-html-chunks-formatcfg.xsl \
  		titlepage-htmlhelp.xsl \
 		UserManual.pdf \
 		VirtualBox.chm \
+               ChangeLog.html \
+               validatemanual.run \
 		)) \
  	$(VBOX_PATH_MANUAL_OUTBASE)/$(VBOX_MANUAL_XML_CHANGELOG) \
+ 	$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/overview_,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
+ 	$(VBOX_PATH_MANUAL_OUTBASE)/user_VBoxManage_CommandsOverview.xml \
  	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf) \
  	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm) \
  	$(PATH_STAGE_BIN)/UserManual.pdf \
@@ -316,7 +352,7 @@ ifdef VBOX_WITH_DOCS
 	$(VBOX_MANUAL_APIREF_TMP) \
  	$(PATH_STAGE_BIN)/sdk/docs/SDKRef.pdf
 
-endif # VBOX_WITH_DOCS
+endif # if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
 
 
 
@@ -383,6 +419,9 @@ $(VBOX_XML_CATALOG_DOCBOOK): $(MAKEFILE_CURRENT) | $$(dir $$@)
 endif
 
 
+if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
+
+
 ##########################################################################################
 #
 #  Rules: Preprocess DocBook XML files
@@ -409,138 +448,79 @@ endif
 # $(VBOX_PATH_MANUAL_OUTBASE)/$(VBOX_MANUAL_XML_CHANGELOG): $(VBOX_PATH_MANUAL_SRC)/$(VBOX_MANUAL_XML_CHANGELOG) | $$(dir $$@)
 # 	$(QUIET)$(INSTALL) -m 0644 $< $@
 
-# intermediate step to do some variable replacement in the document
-$(foreach f,$(VBOX_MANUAL_LANGUAGES),$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$f/,$(filter-out user_VBoxManage.xml,$(VBOX_MANUAL_XML_FILES)))): \
-		$(VBOX_PATH_MANUAL_OUTBASE)/% : $(VBOX_PATH_MANUAL_SRC)/% $(VBOX_VERSION_STAMP) | $$(dir $$@)
-	$(call MSG_L1,Pre-processing [1] $(@F) to $@)
-	$(QUIET)$(RM) -f $@ $@.tmp
-	$(QUIET)$(SED) -e 's/\$$VBOX_VERSION_MAJOR/$(VBOX_VERSION_MAJOR)/g' \
-	               -e 's/\$$VBOX_VERSION_MINOR/$(VBOX_VERSION_MINOR)/g' \
-	               -e 's/\$$VBOX_VERSION_BUILD/$(VBOX_VERSION_BUILD)/g' \
-	               -e 's/\$$VBOX_VERSION_STRING/$(VBOX_VERSION_STRING)/g' \
-	               -e 's/\$$VBOX_VENDOR/$(VBOX_VENDOR)/g' \
-	               -e 's/\$$VBOX_PRODUCT/$(VBOX_PRODUCT)/g' \
-	               -e 's/\$$VBOX_C_YEAR/$(VBOX_C_YEAR)/g' \
-	               --output $@.tmp $<
-	$(QUIET)$(MV) -f $@.tmp $@
+# Manual dependency on user_ChangeLogImpl.xml
+$(foreach lang,$(VBOX_MANUAL_LANGUAGES) \
+,$(eval $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/user_ChangeLog.xml: $(VBOX_PATH_MANUAL_SRC)/user_ChangeLogImpl.xml))
 
-$(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/user_ChangeLog.xml): \
-		$(VBOX_PATH_MANUAL_OUTBASE)/% : \
-		$(VBOX_PATH_MANUAL_SRC)/% $(VBOX_PATH_MANUAL_SRC)/user_ChangeLogImpl.xml | $$(dir $$@)
-	$(call MSG_L1,Pre-processing [3] $(@F) to $@)
-	$(QUIET)$(RM) -f $@ $@.tmp $@.tmp2
-	$(QUIET)$(SED) -e 's/\$$VBOX_VERSION_MAJOR/$(VBOX_VERSION_MAJOR)/g' \
-	               -e 's/\$$VBOX_VERSION_MINOR/$(VBOX_VERSION_MINOR)/g' \
-	               -e 's/\$$VBOX_VERSION_BUILD/$(VBOX_VERSION_BUILD)/g' \
-	               -e 's/\$$VBOX_VERSION_STRING/$(VBOX_VERSION_STRING)/g' \
-	               -e 's/\$$VBOX_VENDOR/$(VBOX_VENDOR)/g' \
-	               -e 's/\$$VBOX_PRODUCT/$(VBOX_PRODUCT)/g' \
-	               -e 's/\$$VBOX_C_YEAR/$(VBOX_C_YEAR)/g' \
-	               --output $@.tmp $<
-	$(QUIET)$(SED) -e '1,/<!--\$$VIRTUALBOX_CHANGELOG_IMPL-->/!d' \
-	               -e 's/<!--\$$VIRTUALBOX_CHANGELOG_IMPL-->//' \
-	               --output $@ $@.tmp
-	var=`$(SED) -n '/!--\$$VIRTUALBOX_CHANGELOG_IMPL-->/p' $<`; \
-		test -n "$${var}" \
-		&& $(SED) -e 's/<?xml version=\"1.0\" encoding=\"UTF-8\"?>//g' \
-			--append $@ $(VBOX_PATH_MANUAL_SRC)/user_ChangeLogImpl.xml; \
-       	true
-	$(QUIET)$(SED) -e '/<!--\$$VIRTUALBOX_CHANGELOG_IMPL-->/,$$!d' \
-	               -e 's/<!--\$$VIRTUALBOX_CHANGELOG_IMPL-->//' --append $@ $@.tmp
-	$(QUIET)$(RM) -f -- "$@.tmp"
-
-# TODO: figure why the rule below doesn't cause kmk to rebuild the manual when a man page changes!
+# Manual dependency for user_VBoxManage.xml.
 $(foreach lang,$(VBOX_MANUAL_LANGUAGES), \
 $(eval $$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/user_VBoxManage.xml: $(VBOX_PATH_MANUAL_SRC)/$(lang)/user_VBoxManage.xml \
-	$$(addprefix $$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/,$$(filter man_VBoxManage%,$$(VBOX_MANUAL_XML_REFENTRY_FILES)))))
-
-# user_VBoxManage.xml currently needs some extra processing to stitch in the VBoxManage usage blob.
-$(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/user_VBoxManage.xml): \
-		$(VBOX_PATH_MANUAL_OUTBASE)/% : \
-		$(VBOX_PATH_MANUAL_SRC)/% \
-               $$(addprefix $$(@D)/,$$(filter man_VBoxManage%,$$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
-		$(VBOX_XML_CATALOG) \
-		$(VBOX_XML_CATALOG_DOCBOOK) \
-		$(VBOXMANAGEHELP_PATH) | $$(dir $$@)
-	$(call MSG_L1,Pre-processing [2] $(@F) to $@)
-	$(QUIET)$(RM) -f $@ $@.tmp $@.tmp2
-	$(QUIET)$(SED) \
-		-e 's/\$$VBOX_VERSION_MAJOR/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/\$$VBOX_VERSION_MINOR/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/\$$VBOX_VERSION_BUILD/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/\$$VBOX_VERSION_STRING/$(VBOX_VERSION_STRING)/g' \
-		-e 's/\$$VBOX_VENDOR/$(VBOX_VENDOR)/g' \
-		-e 's/\$$VBOX_PRODUCT/$(VBOX_PRODUCT)/g' \
-		-e 's/\$$VBOX_C_YEAR/$(VBOX_C_YEAR)/g' \
-		-e 's|@VBOX_PATH_DOCBOOK@|$(VBOX_PATH_DOCBOOK)|g' \
-		-e 's|@VBOX_PATH_MANUAL_SRC@|$(VBOX_PATH_MANUAL_SRC)|g' \
-		--output $@.tmp $<
-	$(QUIET)$(SED) \
-		-e '1,/\$$VBOX_MANAGE_OUTPUT/!d' \
-	        -e 's/\$$VBOX_MANAGE_OUTPUT.*//' \
-	        --output $@.tmp3 $@.tmp
-	$(QUIET)$(REDIRECT) -wo $@.tmp2 -E 'VBOX_LOG_FLAGS=disabled' -E 'VBOX_LOG_DEST=nofile' \
-		$(if $(eq $(KBUILD_TARGET),darwin), -E 'DYLD_FALLBACK_LIBRARY_PATH=$(dir $(LIB_RUNTIME))') \
-		-- \
-		$(VBOXMANAGEHELP_PATH) --dumpopts
-	$(QUIET)$(SED) -e 's/</\</g' -e 's/>/\>/g' --append $@.tmp3 $@.tmp2
-	$(QUIET)$(SED) \
-		-e '/\$$VBOX_MANAGE_OUTPUT/,$$!d' \
-		-e 's/.*\$$VBOX_MANAGE_OUTPUT//' \
-		--append $@.tmp3 $@.tmp
-if 0 # Not currently needed.
-	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --xinclude --nonet --output $@ \
-		$(VBOX_PATH_MANUAL_SRC)/usage-to-docbook-manual.xsl \
-		$@.tmp3
-else
-	$(QUIET)$(CP) $@.tmp3 $@
-endif
-	$(QUIET)$(RM) -f $@.tmp $@.tmp2 $@.tmp3
+	$$(addprefix $$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/user_,$$(filter man_VBoxManage%,$$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
+	$$(addprefix $$(VBOX_PATH_MANUAL_OUTBASE)/overview_,$$(filter man_VBoxManage%,$$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
+	$(VBOX_PATH_MANUAL_OUTBASE)/user_VBoxManage_CommandsOverview.xml ))
 
+# Intermediate step to do some variable replacement in the document.
+$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(foreach file,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG) \
+,$(evalcall2 def_vbox_replace_stuff_in_xml,/$(lang)/$(file),/$(lang))))
 
+##
 # Morph man pages into manual sections.
-$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/,$(VBOX_MANUAL_XML_REFENTRY_FILES))): \
-		$(VBOX_PATH_MANUAL_OUTBASE)/% : $(VBOX_PATH_MANUAL_SRC)/% \
-		$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manual-sect1.xsl \
-		$(VBOX_VERSION_STAMP) | $$(dir $$@)
-	$(call MSG_GENERATE,,$@,$<)
-	$(QUIET)$(RM) -f $@
-	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --xinclude --nonet --output $@ \
-		$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manual-sect1.xsl $<
+# $(evalcall2 def_vbox_refentry_to_user_sect1)
+# @param    1   The XSLT source file (relative to Makefile dir).
+# @param    2   Optional output subdirectory.
+define def_vbox_refentry_to_user_sect1
+$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/user_$(2): \
+		$$(VBOX_PATH_MANUAL_SRC)/$(1)/$(2) \
+		$$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manual-sect1.xsl \
+		$$(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) \
+		$$(VBOX_VERSION_STAMP) | $$(dir $$@)
+	$$(call MSG_TOOL,xsltproc $$(notdir $$(filter %.xsl,$$^)),,$$(filter %.xml,$$^),$$@)
+	$$(QUIET)$$(RM) -f "$$@"
+	$$(QUIET)$$(VBOX_XSLTPROC_WITH_CAT) --output $$@ $$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manual-sect1.xsl $$<
+endef
+$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(foreach file,$(VBOX_MANUAL_XML_REFENTRY_FILES) \
+, $(evalcall2 def_vbox_refentry_to_user_sect1,$(lang),$(file))))
 
 
-$(VBOX_DOC_XIDL_SRC_TMP): $(VBOX_DOC_XIDL_SRC) $(MAKEFILE_CURRENT) | $$(dir $$@)
-	$(call MSG_L1,Generating $@)
-	$(QUIET)$(SED) -e 's|@a \+\(\w\+\)|<tt>\1</tt>|g' \
-	       -e 's|@c \+\(\w\+\)|<tt>\1</tt>|g' \
-	       --output $@ $<
+# Generates the VBoxManage command overview include file (shared between
+# languages) from the refsynopsisdiv section of the man pages.
+$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/overview_,$(VBOX_MANUAL_XML_REFENTRY_FILES)): \
+		$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manual-overview.xsl \
+		$$(patsubst overview_%,$$(VBOX_PATH_MANUAL_SRC)/en_US/%,$$(notdir $$@)) \
+		$(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) \
+               | $$(dir $$@)
+	$(call MSG_TOOL,xsltproc $(notdir $(filter %.xsl,$^)),,$(firstword $(filter %.xml,$^)),$@)
+	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --output "$@" $< $(filter %.xml,$^)
+
+$(VBOX_PATH_MANUAL_OUTBASE)/user_VBoxManage_CommandsOverview.xml: $(VBOXMANAGEHELP_PATH) $(MAKEFILE_CURRENT) | $$(dir $$@)
+	$(call MSG_GENERATE,,$@,)
+	$(QUIET)$(RM) -f $@ $@.dumpopts
+	$(QUIET)$(APPEND) -tn "$@" \
+		'<?xml version="1.0" encoding="UTF-8"?>' \
+               '<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">' \
+               '<sect1> <!-- this will be skipped via xpointer in the include. --> '
+	$(QUIET)$(REDIRECT) -wo $@.dumpopts -E 'VBOX_LOG_FLAGS=disabled' -E 'VBOX_LOG_DEST=nofile' \
+		$(if $(eq $(KBUILD_TARGET),darwin), -E 'DYLD_FALLBACK_LIBRARY_PATH=$(dir $(LIB_RUNTIME))') \
+		-- \
+		$(VBOXMANAGEHELP_PATH) --dumpopts
+	$(QUIET)$(SED) \
+		-e ':a' \
+		-e 'N' \
+		-e '$(DOLLAR)!ba' \
+		-e 's/</\&lt\;/g' \
+		-e 's/>/\&gt\;/g' \
+		-e 's/\n*$(DOLLAR)/<\/screen>/' \
+		-e 's/^/<screen>/' \
+		--append $@ $@.dumpopts
+	$(QUIET)$(RM) -f $@.dumpopts
+	$(QUIET)$(APPEND) -n "$@" \
+               '  <remark role="VBoxManage-overview">' \
+               $(foreach refentry, $(filter man_VBoxManage%,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
+		, '  <xi:include href="overview_$(refentry)" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />') \
+               '  </remark>' \
+               '</sect1>'
 
-# generate SDKRef_apiref.xml as a docbook file excerpt that will be referenced from the SDKRef.xml.
-$(VBOX_MANUAL_APIREF_TMP): $(VBOX_DOC_XIDL_SRC_TMP) $(VBOX_PATH_MANUAL_SRC)/xidl2docbook.xsl
-	$(call MSG_L1,Generating $@)
-	$(QUIET)$(VBOX_XSLTPROC) --xinclude -o $@ $(VBOX_PATH_MANUAL_SRC)/xidl2docbook.xsl $(VBOX_DOC_XIDL_SRC_TMP)
 
-$(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.xml: \
-		$(VBOX_PATH_MANUAL_SRC)/en_US/SDKRef.xml $(VBOX_MANUAL_APIREF_TMP) \
-		| $$(dir $$@)
-	$(call MSG_L1,Pre-processing [2] $(@F) to $@)
-	$(QUIET)$(RM) -f $@ $@.tmp
-	$(QUIET)$(SED) -e 's/\$$VBOX_VERSION_MAJOR/$(VBOX_VERSION_MAJOR)/g' \
-	               -e 's/\$$VBOX_VERSION_MINOR/$(VBOX_VERSION_MINOR)/g' \
-	               -e 's/\$$VBOX_VERSION_BUILD/$(VBOX_VERSION_BUILD)/g' \
-	               -e 's/\$$VBOX_VERSION_STRING/$(VBOX_VERSION_STRING)/g' \
-	               -e 's/\$$VBOX_VENDOR/$(VBOX_VENDOR)/g' \
-	               -e 's/\$$VBOX_PRODUCT/$(VBOX_PRODUCT)/g' \
-	               -e 's/\$$VBOX_C_YEAR/$(VBOX_C_YEAR)/g' \
-	               --output $@.tmp $<
-	$(QUIET)$(SED) -e '1,/<!--\$$VIRTUALBOX_MAIN_API_REFERENCE-->/!d' \
-	               -e 's/<!--\$$VIRTUALBOX_MAIN_API_REFERENCE-->//' \
-	               --output $@ $@.tmp
-	$(QUIET)$(SED) -e 's/<?xml version=\"1.0\" encoding=\"utf-8\"?>//g' --append $@ $(VBOX_MANUAL_APIREF_TMP)
-	$(QUIET)$(SED) -e '/<!--\$$VIRTUALBOX_MAIN_API_REFERENCE-->/,$$!d' \
-	               -e 's/<!--\$$VIRTUALBOX_MAIN_API_REFERENCE-->//' --append $@ $@.tmp
-#	$(QUIET)$(MV) -f $@.tmp $@
-	$(QUIET)$(RM) -f -- "$@.tmp"
 
 
 ##########################################################################################
@@ -553,7 +533,7 @@ ifndef VBOX_OSE
 # copy ucs.sty and related files
 $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/ucs.sty):
 	$(call MSG_L1,Copying unicode support for LaTeX)
-	$(QUIET)$(INSTALL_STAGING) -- $(VBOX_MANUAL_TEX_UNICODE_FILES) "$(@D)"
+	$(QUIET)$(INSTALL_STAGING) -m0644 -- $(VBOX_MANUAL_TEX_UNICODE_FILES) "$(@D)"
 endif
 
 # copy the PNG files.
@@ -563,10 +543,10 @@ local out_dir := $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)
 $(addprefix $$(out_dir)/,$(VBOX_MANUAL_PNG_FILES_$(lang))): \
 		$$(out_dir)/%: $(VBOX_PATH_MANUAL_SRC)/$(lang)/% | $$$$(dir $$$$@)
 	$$(call MSG_L1,Copying temporary $$< => $$@)
-	$$(QUIET)$$(INSTALL_STAGING) -- '$$<' '$$(@D)'
+	$$(QUIET)$$(INSTALL_STAGING) -m0644 -- '$$<' '$$(@D)'
 endef
 
-$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(eval $(def_vbox_cp_images_pdf)))
+$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(evalcall2 def_vbox_cp_images_pdf))
 
 
 ##########################################################################################
@@ -606,16 +586,18 @@ $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/UserManual.p
 
 # generate temporary LaTeX source from processed XML
 $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/UserManual.tex): \
-				$(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.tex : \
-				$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/%/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
-				$(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl \
-				$(MAKEFILE_CURRENT)
-	$(call MSG_L1,Generating $@ from DocBook XML)
+		$(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.tex : \
+		$(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.xml \
+		$(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl \
+		$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/%/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
+		$(if $(VBOX_HAVE_XMLLINT),$(VBOX_PATH_MANUAL_OUTBASE)/%/validatemanual.run,) \
+		$(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE_CURRENT)
+	$(call MSG_TOOL,xsltproc $(notdir $(filter %.xsl,$^)),,$(firstword $(filter %.xml,$^)),$@)
 	$(QUIET)$(RM) -f $(addprefix $(@D)/,$(VBOX_MANUAL_LATEX_FILES_TARGET))
 #   generate TeX source from processed docbook and store it in UserManual.tex.tmp;
 #   pass current language to xsltproc in TARGETLANG variable (extract it from the
 #   current directory, should become "de_DE" or the like)
-	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) $(XSLTPROC_VERBOSE) --xinclude --nonet --stringparam TARGETLANG $(notdir $(@D)) \
+	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --stringparam TARGETLANG $(notdir $(@D)) \
 		-o $@.tmp $(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl $<
 #   for pretty quotes, replace " with `` or '' depending on whether it's at the start of a word;
 #   the \QUOTE{} was inserted by docbook2latex.xsl for all quotes _outside_ of screen sections
@@ -626,15 +608,79 @@ $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/UserManual.t
 		--output $@ $@.tmp
 	$(QUIET)$(RM) -f $@.tmp
 
+# Useful aliases
+usermanual UserManual.pdf:: $(PATH_STAGE_BIN)/UserManual.pdf
+
+debug-usermanual:
+	$(MAKE) --pretty-command-printing -j1 VBOX_PDFLATEX_INTERACTION=errorstopmode $(PATH_STAGE_BIN)/UserManual.pdf
+
+#
+# Generate rules for validating the UserManual.xml.  These are invoked
+# automatically at build time, but can also be manually invoked via the
+# 'validatemanual' and 'validatemanual_<lang>' aliases.
+#
+define def_vbox_validate_xml
+validatemanual_$(lang):: $$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/validatemanual.run
+$$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/validatemanual.run: \
+		$$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/UserManual.xml \
+		$$(addprefix $$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/,$$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
+		$$(VBOX_XML_CATALOG) $$(VBOX_XML_CATALOG_DOCBOOK) $$(MAKEFILE_CURRENT) | $$$$(dir $$$$@)
+	$$(call MSG_L1,Validating $$<)
+	$$(QUIET)$$(VBOX_XMLLINT_WITH_CAT) --dtdvalid $$(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd $$<
+	$$(QUIET)$$(APPEND) -t "$$@" "done"
+endef
+$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(evalcall2 def_vbox_validate_xml))
+validatemanual:: $(foreach lang,$(VBOX_MANUAL_LANGUAGES),validatemanual_$(lang))
+
+
 
 #
 # SDKRef.pdf
 #
+
+# Replace <tt> tags in VirtualBox.xidl.
+$(VBOX_DOC_XIDL_SRC_TMP): $(VBOX_DOC_XIDL_SRC) $(MAKEFILE_CURRENT) | $$(dir $$@)
+	$(call MSG_L1,Generating $@)
+	$(QUIET)$(SED) -e 's|@a \+\(\w\+\)|<tt>\1</tt>|g' \
+	       -e 's|@c \+\(\w\+\)|<tt>\1</tt>|g' \
+	       --output $@ $<
+
+# Generate SDKRef_apiref.xml as a docbook file excerpt that will be referenced from the SDKRef.xml.
+$(VBOX_MANUAL_APIREF_TMP): $(VBOX_PATH_MANUAL_SRC)/xidl2docbook.xsl $(VBOX_DOC_XIDL_SRC_TMP)
+	$(call MSG_L1,Generating $@)
+	$(QUIET)$(VBOX_XSLTPROC) $(VBOX_XSLTPROC_OPTS) --xinclude --nonet -o $@ $< $(VBOX_DOC_XIDL_SRC_TMP)
+
+$(evalcall2 def_vbox_replace_stuff_in_xml,/en_US/SDKRef.xml,/en_US)
+$(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.xml: $(VBOX_MANUAL_APIREF_TMP)
+
+# Turn SDKRef.xml into latex.
+$(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.tex: \
+		$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_SDKREF_XML_FILES)) \
+		$(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl \
+		$(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE_CURRENT) | $$(dir $$@)
+	$(call MSG_TOOL,xsltproc $(notdir $(filter %.xsl,$^)),,$(firstword $(filter %.xml,$^)),$@)
+	$(QUIET)$(RM) -f $(addprefix $(@D/),$(VBOX_SDKREF_LATEX_FILES_TARGET))
+##      check it for validity first.
+#ifdef VBOX_HAVE_XMLLINT
+#	$(QUIET)$(VBOX_XMLLINT_WITH_CAT) --dtdvalid $(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd $<
+#endif
+#	generate TeX source from processed docbook and store it in SDKRef.tex.tmp
+	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --stringparam TARGETLANG en_US \
+		-o $@.tmp $(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl $<
+#	for pretty quotes, replace " with `` or '' depending on whether it's at the start of a word;
+#   the \QUOTE{} was inserted by docbook2latex.xsl for all quotes _outside_ of screen sections
+	$(QUIET)$(SED) \
+		-e 's|^\\QUOTE{}|\\OQ{}|g' \
+		-e 's|\(\W\)\\QUOTE{}|\1\\OQ{}|g' \
+		-e 's|\(\w\)\\QUOTE{}|\1\\CQ{}|g' \
+		--output $@ $@.tmp
+	$(QUIET)$(RM) -f $@.tmp
+
+# Turn SDKRef.tex into a PDF.
 $(VBOX_PATH_SDK)/docs/SDKRef.pdf: \
 		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.tex \
 		$(if $(VBOX_OSE),,$(VBOX_PATH_MANUAL_OUTBASE)/en_US/ucs.sty) \
 		$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_PNG_FILES_en_US)) | $$(dir $$@)
-# PDF generation via Latex: generate the .tex file
 	$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/docs
 	$(call MSG_L1,pdflatex $< (three passes))
 	$(QUIET)$(REDIRECT) -C $(<D) -- $(VBOX_PDFLATEX_CMD) SDKRef.tex
@@ -647,23 +693,10 @@ $(VBOX_PATH_SDK)/docs/SDKRef.pdf: \
 	$(QUIET)$(CP) $(<D)/SDKRef.pdf $@
 	$(call MSG_L1,Fresh LaTeX-generated PDF is now at $@)
 
-# generate temporary LaTeX source from processed XML
-$(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.tex: $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_SDKREF_XML_FILES)) \
-		$(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl $(MAKEFILE_CURRENT)
-	$(call MSG_L1,Generating $@ from DocBook XML)
-	$(QUIET)$(RM) -f $(addprefix $(@D/),$(VBOX_SDKREF_LATEX_FILES_TARGET))
-#	generate TeX source from processed docbook and store it in SDKRef.tex.tmp
-	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) $(XSLTPROC_VERBOSE) --xinclude --nonet --stringparam TARGETLANG en_US \
-		-o $@.tmp $(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl $<
-#	for pretty quotes, replace " with `` or '' depending on whether it's at the start of a word;
-#   the \QUOTE{} was inserted by docbook2latex.xsl for all quotes _outside_ of screen sections
-	$(QUIET)$(SED) \
-		-e 's|^\\QUOTE{}|\\OQ{}|g' \
-		-e 's|\(\W\)\\QUOTE{}|\1\\OQ{}|g' \
-		-e 's|\(\w\)\\QUOTE{}|\1\\CQ{}|g' \
-		--output $@ $@.tmp
-	$(QUIET)$(RM) -f $@.tmp
 
+# Handy aliases.
+validate-sdkref:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.xml
+sdkref:: $(VBOX_PATH_SDK)/docs/SDKRef.pdf
 
 
 ifdef VBOX_WITH_DOCS_CHM
@@ -674,6 +707,13 @@ ifdef VBOX_WITH_DOCS_CHM
  # DocBook XML files, as defined above, then feed that into the
  # Microsoft Help Compiler.
  #
+ $(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(evalcall2 def_vbox_replace_paths_in_xslt,docbook-htmlhelp-formatcfg.xsl,/$(lang)))
+
+ # Manual formatcfg dependencies for the above.
+ $(foreach lang,$(VBOX_MANUAL_LANGUAGES), $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/docbook-htmlhelp-formatcfg.xsl): \
+ 	$(VBOX_PATH_MANUAL_SRC)/common-formatcfg.xsl \
+ 	$(VBOX_PATH_MANUAL_SRC)/common-html-formatcfg.xsl
+
  $(PATH_STAGE_BIN)/VirtualBox.chm: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.chm
 	$(QUIET)$(CP) $< $@
 	$(call MSG_L1,Fresh CHM is now at $@)
@@ -691,16 +731,6 @@ ifdef VBOX_WITH_DOCS_CHM
 	$(QUIET)$(RM) -f $@
 	$(QUIET)$(VBOX_HHC) $(subst /,\\,$<)
 
-
- # intermediate step to do some variable replacement in the XSL configuration
- $(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/docbook-htmlhelp-formatcfg.xsl): \
-		$(VBOX_PATH_MANUAL_SRC)/docbook-htmlhelp-formatcfg.xsl $(MAKEFILE_CURRENT) | $$(dir $$@)
-	$(call MSG_GENERATE,,$@,$<)
-	$(QUIET)$(RM) -f $@
-	$(QUIET)$(SED) -e 's|\$$DOCBOOKPATH|$(VBOX_PATH_DOCBOOK)|g' \
-	               -e 's|\$$CFGPATH|$(VBOX_PATH_MANUAL_SRC)|g' \
-	               -e 's|\$$TARGETPATH|$(@D)|g' --output $@ $<
-
  # Prepare the XSL file for our title page, htmlhelp variant.
  $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/titlepage-htmlhelp.xsl): \
 		$(VBOX_PATH_MANUAL_SRC)/titlepage-htmlhelp.xml $(MAKEFILE_CURRENT) | $$(dir $$@)
@@ -709,17 +739,18 @@ ifdef VBOX_WITH_DOCS_CHM
 	$(QUIET)$(VBOX_XSLTPROC) --xinclude --nonet -o $@.tmp $(VBOX_PATH_DOCBOOK)/template/titlepage.xsl $<
 	$(QUIET)$(MV) -f $@.tmp $@
 
-
  $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/HTMLHelp/htmlhelp.hhp): \
 		$(VBOX_PATH_MANUAL_OUTBASE)/%/HTMLHelp/htmlhelp.hhp: \
-		$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/%/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
+		$(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.xml \
 		$(VBOX_PATH_MANUAL_OUTBASE)/%/docbook-htmlhelp-formatcfg.xsl \
 		$(VBOX_PATH_MANUAL_OUTBASE)/%/titlepage-htmlhelp.xsl \
+		$(VBOX_PATH_MANUAL_OUTBASE)/%/validatemanual.run \
+		$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/%/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
 		$(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK)
-	$(call MSG_L1,xsltproc $<,=> $@)
+	$(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(firstword $(filter %.xml,$^)),$@)
 	$(QUIET)$(RM) -f $@
 	$(QUIET)$(MKDIR) -p $(@D)
-	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --xinclude --nonet --output $(@D)/ \
+	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --output $(@D)/ \
 		--stringparam htmlhelp.chm \
 		$(subst /,\\,$(@D)/../VirtualBox.chm) \
 		$(HTMLHELPOPTS) $(@D)/../docbook-htmlhelp-formatcfg.xsl \
@@ -751,48 +782,37 @@ endif # VBOX_WITH_DOCS_CHM
 #  UserManual.html
 #
 ##########################################################################################
+$(evalcall2 def_vbox_replace_paths_in_xslt,docbook-html-one-page-formatcfg.xsl,/en_US)
+$(evalcall2 def_vbox_replace_paths_in_xslt,docbook-html-chunks-formatcfg.xsl,/en_US)
 
-# intermediate step to do some variable replacement in the XSL configuration
-$(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-html-one-page-formatcfg.xsl: \
-		$(VBOX_PATH_MANUAL_SRC)/docbook-html-one-page-formatcfg.xsl $(MAKEFILE_CURRENT) | $$(dir $$@)
-	$(call MSG_L1,Pre-processing $(@F) to $@)
-	$(QUIET)$(RM) -f $@.tmp $@
-	$(QUIET)$(SED) -e 's|\$$DOCBOOKPATH|$(VBOX_PATH_DOCBOOK)|g' \
-	               -e 's|\$$CFGPATH|$(VBOX_PATH_MANUAL_SRC)|g' \
-	               -e 's|\$$TARGETPATH|$(@D)|g' --output $@.tmp $<
-	$(QUIET)$(MV) -f $@.tmp $@
-
+# Manual formatcfg dependencies.
+$(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-html-one-page-formatcfg.xsl \
 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-html-chunks-formatcfg.xsl: \
-		$(VBOX_PATH_MANUAL_SRC)/docbook-html-chunks-formatcfg.xsl $(MAKEFILE_CURRENT) | $$(dir $$@)
-	$(call MSG_L1,Pre-processing $(@F) to $@)
-	$(QUIET)$(RM) -f $@.tmp $@
-	$(QUIET)$(SED) -e 's|\$$DOCBOOKPATH|$(VBOX_PATH_DOCBOOK)|g' \
-	               -e 's|\$$CFGPATH|$(VBOX_PATH_MANUAL_SRC)|g' \
-	               -e 's|\$$TARGETPATH|$(@D)|g' --output $@.tmp $<
-	$(QUIET)$(MV) -f $@.tmp $@
+	$(VBOX_PATH_MANUAL_SRC)/common-formatcfg.xsl \
+	$(VBOX_PATH_MANUAL_SRC)/common-html-formatcfg.xsl
 
 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html: \
 		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-html-one-page-formatcfg.xsl \
-		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.xml \
 		$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
 		$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_PNG_FILES_en_US)) \
+		$(if $(VBOX_HAVE_XMLLINT),$(VBOX_PATH_MANUAL_OUTBASE)/en_US/validatemanual.run,) \
 		$(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) \
 		| $$(dir $$@)
-	$(call MSG_L1,xsltproc $<)
-	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --xinclude --nonet \
+	$(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(firstword $(filter %.xml,$^)),$@)
+	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) \
 		--output $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html \
 		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-html-one-page-formatcfg.xsl \
 		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.xml
 
 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html: \
 		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-html-chunks-formatcfg.xsl \
-		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.xml \
 		$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_XML_FILES_INCL_CHANGELOG)) \
 		$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_PNG_FILES_en_US)) \
+		$(if $(VBOX_HAVE_XMLLINT),$(VBOX_PATH_MANUAL_OUTBASE)/en_US/validatemanual.run,) \
 		$(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) \
 		| $$(dir $$@)
-	$(call MSG_L1,xsltproc $<)
-	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --xinclude --nonet \
+	$(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(firstword $(filter %.xml,$^)),$@)
+	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) \
 		--output $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html \
 		--stringparam chunk.section.depth 0 \
 		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-html-chunks-formatcfg.xsl \
@@ -807,57 +827,167 @@ $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip: \
 		-9 -r $@ html-single html-chunks $(VBOX_MANUAL_PNG_FILES_en_US)
 
 html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html
-
 html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html
-
 html-zip:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip
 
-##########################################################################################
+
 #
-#  ChangeLog.html
+# ChangeLog.html
 #
-##########################################################################################
-
-# intermediate step to do some variable replacement in the XSL configuration
-$(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-changelog-formatcfg.xsl: \
-		$(VBOX_PATH_MANUAL_SRC)/docbook-changelog-formatcfg.xsl $(MAKEFILE_CURRENT) | $$(dir $$@)
-	$(call MSG_L1,Pre-processing $(@F) to $@)
-	$(QUIET)$(RM) -f $@.tmp $@
-	$(QUIET)$(SED) -e 's|\$$DOCBOOKPATH|$(VBOX_PATH_DOCBOOK)|g' \
-	               -e 's|\$$CFGPATH|$(VBOX_PATH_MANUAL_SRC)|g' \
-	               -e 's|\$$TARGETPATH|$(@D)|g' --output $@.tmp $<
-	$(QUIET)$(MV) -f $@.tmp $@
-
 # This XSLT rule depends on $(VBOX_PATH_MANUAL_OUTBASE)/en_US/user_ChangeLog.xml, which is build by the complex rule
 #    $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/user_ChangeLog.xml): ...
 # much further above. That rule takes en_US/user_ChangeLog.xml and replaces $VIRTUALBOX_CHANGELOG_IMPL
 # with the actual change log contained in user_ChangeLogImpl.xml
+#
+$(evalcall2 def_vbox_replace_paths_in_xslt,docbook-changelog-formatcfg.xsl,/en_US)
 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/ChangeLog.html: \
 		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-changelog-formatcfg.xsl \
-		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/user_ChangeLog.xml
-	$(QUIET)$(VBOX_XSLTPROC) --xinclude --nonet --output $(VBOX_PATH_MANUAL_OUTBASE)/en_US/ChangeLog.html \
-		$(@D)/docbook-changelog-formatcfg.xsl \
-		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/user_ChangeLog.xml
+		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/user_ChangeLog.xml \
+		$(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) | $$(dir $$@)
+	$(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(firstword $(filter %.xml,$^)),$@)
+	$(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --output "$@" "$<" $(filter %.xml,$^)
 	$(call MSG_L1,Fresh ChangeLog.html is now at $@)
 
-cl-html: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/ChangeLog.html
+cl-html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/ChangeLog.html
+
+
+
+endif # if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
 
 
-##########################################################################################
 #
-#  VBoxManage man pages.
+# VBoxManage man pages (parts also required by VBoxManage build-in help).
 #
-##########################################################################################
-$(evalcall2 def_vbox_replace_paths_in_xslt,docbook-refentry-to-man.xsl,)
-
-man-experiment: \
-		$(VBOX_PATH_MANUAL_SRC)/en_US/man_VBoxManage_extpack.xml \
-		$(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-man.xsl \
-		$(VBOX_XML_CATALOG) \
-		$(VBOX_XML_CATALOG_DOCBOOK)
-	$(VBOX_XSLTPROC_WITH_CAT) --xinclude --nonet --output z:/tmp/vboxmanage-extpack.1 \
-		$(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-man.xsl \
-		$(VBOX_PATH_MANUAL_SRC)/en_US/man_VBoxManage_extpack.xml
+$(evalcall2 def_vbox_replace_paths_in_xslt,docbook-refentry-to-manpage.xsl,)
+
+##
+# Emits rules for preprocessing refentry sources (applying remarks element),
+# and for producing the actual man pages.
+# $(evalcall2 def_vbox_refentry_to_manpage)
+# @param    1   The language
+# @param    2   The file name (no path).
+define def_vbox_refentry_to_manpage
+$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/$(2): \
+		$$(VBOX_PATH_MANUAL_SRC)/$(1)/$(2) \
+		$$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manpage-preprocessing.xsl \
+		$$(VBOX_XML_CATALOG) $$(VBOX_XML_CATALOG_DOCBOOK) \
+		$$(VBOX_VERSION_STAMP) | $$$$(dir $$$$@)
+	$$(call MSG_TOOL,xsltproc $$(notdir $$(firstword $$(filter %.xsl,$$^))),,$$(firstword $$(filter %.xml,$$^)),$$@)
+	$$(QUIET)$$(RM) -f "$$@"
+	$$(QUIET)$$(VBOX_XSLTPROC_WITH_CAT) --output $$@ \
+		$$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manpage-preprocessing.xsl $$<
+if defined(VBOX_HAVE_XMLLINT) && "$(USER)" == "bird" # Effing stuff happends on build servers, probably kmk related...
+	$$(VBOX_XMLLINT_WITH_CAT) --dtdvalid $$(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd $$@
+endif
+
+$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/$(patsubst man_%,%.1,$(basename $(2))): \
+		$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/$(2) \
+		$$(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-manpage.xsl \
+		$$(VBOX_XML_CATALOG) $$(VBOX_XML_CATALOG_DOCBOOK) \
+		$$(VBOX_VERSION_STAMP) | $$$$(dir $$$$@)
+	$$(call MSG_TOOL,xsltproc $$(notdir $$(firstword $$(filter %.xsl,$$^))),,$$(firstword $$(filter %.xml,$$^)),$$@)
+	$$(QUIET)$$(RM) -f "$$@"
+	$$(QUIET)$$(VBOX_XSLTPROC_WITH_CAT) --output $$@ $$(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-manpage.xsl $$<
+endef
+$(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(foreach file,$(VBOX_MANUAL_XML_REFENTRY_FILES) \
+, $(evalcall2 def_vbox_refentry_to_manpage,$(lang),$(file))))
+
+
+# Handy aliases.
+validate-manpages:: $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_XML_REFENTRY_FILES))
+man-experiment:: $(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(foreach file,$(VBOX_MANUAL_XML_REFENTRY_FILES) \
+			,$$(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/$(patsubst man_%,%.1,$(basename $(file)))))
+
+
+#
+# VBoxManage built-in help.
+#
+# Note! Generating the stuff here is a bit annoying, but currently the most
+#       practical way I can come up with.
+#
+OTHERS += \
+	$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp \
+	$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h
+OTHER_CLEAN += \
+	$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp \
+	$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp.ts \
+	$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h \
+	$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h.ts
+help-experiment:: \
+	$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp \
+	$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h
+
+$(evalcall2 def_vbox_replace_paths_in_xslt,docbook-refentry-to-C-help.xsl,)
+$(evalcall2 def_vbox_replace_paths_in_xslt,docbook-refentry-to-H-help.xsl,)
+
+$(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-C-help.xsl: $(VBOX_PATH_MANUAL_SRC)/common-formatcfg.xsl # manual dependency.
+
+$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp.ts \
++| $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.cpp: \
+		$(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-C-help.xsl \
+		$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(filter man_VBoxManage-%,$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
+		$(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE) | $$(dir $$@)
+	$(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(filter %.xml,$^),$(patsubst %.ts,%,$@))
+	$(QUIET)$(APPEND) -tn "$@" \
+		'/* Autogenerated by $<, do not edit! */' \
+		'' \
+		'#include <iprt/types.h>' \
+		'#include "VBoxManageBuiltInHelp.h"' \
+		''
+	$(foreach refentry,$(filter %.xml,$^) \
+	,$(NLTAB)$(QUIET)$(REDIRECT) -a+to "$@" -- $(VBOX_XSLTPROC_WITH_CAT) $< $(refentry))
+	$(QUIET)$(APPEND) -n "$@" \
+       	'' \
+		'PCREFENTRY     g_apHelpEntries[] = ' \
+		'{'
+	$(foreach refentry,$(filter %.xml,$^) \
+		,$(NLTAB)$(QUIET)$(APPEND) -n "$@" \
+		'    &g_$(subst -,_,$(tolower $(patsubst man_%,%,$(notdir $(basename $(refentry)))))), ')
+	$(QUIET)$(APPEND) -n "$@" \
+		'};' \
+		'const uint32_t g_cHelpEntries = RT_ELEMENTS(g_apHelpEntries);' \
+               ''
+	$(QUIET)$(CP) --changed -- "$@" "$(patsubst %.ts,%,$@)"
+# The above APPEND stuff trigger some kind of problem on some boxes when not split up...
+
+$(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h.ts \
++| $(VBOX_PATH_MANUAL_OUTBASE)/VBoxManageBuiltInHelp.h: \
+		$(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-H-help.xsl \
+		$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(filter man_VBoxManage-%,$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
+		$(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) $(MAKEFILE) | $$(dir $$@)
+	$(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(filter %.xml,$^),$(patsubst %.ts,%,$@))
+	$(QUIET)$(APPEND) -tn "$@" \
+		'/* Autogenerated by $<, do not edit! */' \
+               '' \
+               '#ifndef ___VBoxManageBuiltInHelp_h___' \
+               '#define ___VBoxManageBuiltInHelp_h___' \
+               '' \
+               '#include <VBox/refentry.h>' \
+               '' \
+               'RT_C_DECLS_BEGIN' \
+               '' \
+               'typedef enum HELP_CMD_VBOXMANAGE' \
+               '{' \
+               '    HELP_CMD_VBOXMANAGE_INVALID = 0,'
+	$(foreach refentry,$(filter %.xml,$^) \
+	,$(NLTAB)$(QUIET)$(REDIRECT) -a+to "$@" -- $(VBOX_XSLTPROC_WITH_CAT) \
+		--stringparam 'g_sMode' 'cmd' $< $(refentry))
+	$(QUIET)$(APPEND) -n "$@" \
+		'    HELP_CMD_VBOXMANAGE_END' \
+		'} HELP_CMD_VBOXMANAGE;'
+	$(foreach refentry,$(filter %.xml,$^) \
+	,$(NLTAB)$(QUIET)$(REDIRECT) -a+to "$@" -- $(VBOX_XSLTPROC_WITH_CAT) \
+		--stringparam 'g_sMode' 'subcmd' $< $(refentry))
+	$(QUIET)$(APPEND) -n "$@" \
+		'' \
+		'extern PCREFENTRY     g_apHelpEntries[];' \
+		'extern const uint32_t g_cHelpEntries;' \
+		'' \
+               'RT_C_DECLS_END' \
+		'' \
+		'#endif' \
+               ''
+	$(QUIET)$(CP) --changed -- "$@" "$(patsubst %.ts,%,$@)"
 
 
 include $(FILE_KBUILD_SUB_FOOTER)
diff --git a/doc/manual/common-formatcfg.xsl b/doc/manual/common-formatcfg.xsl
index c6ac1e0..a05a1b8 100644
--- a/doc/manual/common-formatcfg.xsl
+++ b/doc/manual/common-formatcfg.xsl
@@ -55,4 +55,80 @@
   </xsl:attribute>
 </xsl:attribute-set>
 
+<!-- command synopsis -->
+<xsl:variable name="arg.choice.opt.open.str">[</xsl:variable>
+<xsl:variable name="arg.choice.opt.close.str">]</xsl:variable>
+<xsl:variable name="arg.choice.req.open.str"><</xsl:variable>
+<xsl:variable name="arg.choice.req.close.str">></xsl:variable>
+<xsl:variable name="arg.choice.plain.open.str"><xsl:text> </xsl:text></xsl:variable>
+<xsl:variable name="arg.choice.plain.close.str"><xsl:text> </xsl:text></xsl:variable>
+<xsl:variable name="arg.choice.def.open.str">[</xsl:variable>
+<xsl:variable name="arg.choice.def.close.str">]</xsl:variable>
+<xsl:variable name="arg.rep.repeat.str">...</xsl:variable>
+<xsl:variable name="arg.rep.norepeat.str"></xsl:variable>
+<xsl:variable name="arg.rep.def.str"></xsl:variable>
+<xsl:variable name="arg.or.sep"> | </xsl:variable>
+<xsl:variable name="cmdsynopsis.hanging.indent">4pi</xsl:variable>
+
+<!--
+  refentry related layout tweaks.
+
+  Note! While we could save us all this work by using refsect1..3 and
+        refsynopsisdiv docbook-refentry-to-manual-sect1.xsl, we'd like to have
+        a valid XML document and thus do do some extra markup using the role
+        and condition attributes.  We catch some of it here.  But the XSLT
+        for specific targets (html, latex, etc) have a few more tweaks
+        related to this.
+
+        The @role has only one special trick 'not-in-toc' that excludes sections
+        like 'Synopsis' and 'Description' from the TOCs.
+
+        The @condition records the original refentry element name, i.e. it will
+        have values like refentry, refsynopsisdiv, refsect1, refsect2 and refsect3.
+  -->
+
+<!-- This removes the not-in-toc bits from the toc. -->
+<xsl:template match="sect2[@role = 'not-in-toc']"      mode="toc" />
+<xsl:template match="sect3[@role = 'not-in-toc']"      mode="toc" />
+<xsl:template match="sect4[@role = 'not-in-toc']"      mode="toc" />
+<xsl:template match="sect5[@role = 'not-in-toc']"      mode="toc" />
+<xsl:template match="section[@role = 'not-in-toc']"    mode="toc" />
+<xsl:template match="simplesect[@role = 'not-in-toc']" mode="toc" />
+
+<!-- This removes unnecessary <dd><dl> stuff caused by the above. -->
+<xsl:template match="sect1[sect2/@role = 'not-in-toc']" mode="toc">
+  <xsl:param name="toc-context" select="."/>
+  <xsl:call-template name="subtoc">
+    <xsl:with-param name="toc-context" select="$toc-context"/>
+    <xsl:with-param name="nodes" select="sect2[@role != 'not-in-toc'] | bridgehead[$bridgehead.in.toc != 0]"/>
+  </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="sect2[sect3/@role = 'not-in-toc']" mode="toc">
+  <xsl:param name="toc-context" select="."/>
+  <xsl:call-template name="subtoc">
+    <xsl:with-param name="toc-context" select="$toc-context"/>
+    <xsl:with-param name="nodes" select="sect3[@role != 'not-in-toc'] | bridgehead[$bridgehead.in.toc != 0]"/>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- This make the refsect* and refsynopsisdiv unnumbered like the default refentry rendering. -->
+<xsl:template match="sect2[@condition = 'refsynopsisdiv']
+                   | sect2[starts-with(@condition, 'refsect')]
+                   | sect3[starts-with(@condition, 'refsect')]
+                   | sect4[starts-with(@condition, 'refsect')]
+                   | sect5[starts-with(@condition, 'refsect')]
+                   | section[starts-with(@condition, 'refsect')]
+                   | simplesect[starts-with(@condition, 'refsect')]"
+  mode="object.title.template"
+  >
+    <xsl:call-template name="gentext.template">
+      <xsl:with-param name="context" select="'title-unnumbered'"/>
+      <xsl:with-param name="name">
+        <xsl:call-template name="xpath.location"/>
+      </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+
 </xsl:stylesheet>
diff --git a/doc/manual/docbook-htmlhelp-formatcfg.xsl b/doc/manual/docbook-htmlhelp-formatcfg.xsl
index 715bda1..81d1ae7 100644
--- a/doc/manual/docbook-htmlhelp-formatcfg.xsl
+++ b/doc/manual/docbook-htmlhelp-formatcfg.xsl
@@ -1,10 +1,37 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:import href="$DOCBOOKPATH/htmlhelp/htmlhelp.xsl"/>
-<xsl:import href="$CFGPATH/common-formatcfg.xsl"/>
+<xsl:import href="@VBOX_PATH_DOCBOOK@/htmlhelp/htmlhelp.xsl"/>
+<xsl:import href="@VBOX_PATH_MANUAL_SRC@/common-formatcfg.xsl"/>
+<xsl:import href="@VBOX_PATH_MANUAL_SRC@/common-html-formatcfg.xsl"/>
+
+<xsl:include href="@VBOX_PATH_MANUAL_OUT_LANG@/titlepage-htmlhelp.xsl"/>
+
+<!-- Override the style sheet stuff from common-html-formatcfg.xsl, we don't
+     the same as the html-chunks and html-one-page.  Also, the microsoft
+     help viewer may have limited CSS support, depending on which browser
+     version it emulated, so keep it simple. -->
+<xsl:template name="user.head.content">
+ <style type="text/css">
+  <xsl:comment>
+   .cmdsynopsis p
+   {
+     padding-left: 3.4em;
+     text-indent: -2.2em;
+   }
+   p.nextcommand
+   {
+     margin-top:    0px;
+     margin-bottom: 0px;
+   }
+   p.lastcommand
+   {
+     margin-top:    0px;
+   }
+  </xsl:comment>
+ </style>
+</xsl:template>
 
-<xsl:include href="$TARGETPATH/titlepage-htmlhelp.xsl"/>
 
 <!-- for some reason, the default docbook stuff doesn't wrap simple <arg> elements
      into HTML <code>, so with a default CSS a cmdsynopsis ends up with a mix of
diff --git a/doc/manual/docbook-refentry-to-C-help.xsl b/doc/manual/docbook-refentry-to-C-help.xsl
new file mode 100644
index 0000000..f997982
--- /dev/null
+++ b/doc/manual/docbook-refentry-to-C-help.xsl
@@ -0,0 +1,879 @@
+<?xml version="1.0"?>
+<!--
+    docbook-refentry-to-manual-sect1.xsl:
+        XSLT stylesheet for nicking the refsynopsisdiv bit of a
+        refentry (manpage) for use in the command overview section
+        in the user manual.
+
+    Copyright (C) 2006-2015 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+-->
+
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:str="http://xsltsl.org/string"
+  >
+
+  <xsl:import href="@VBOX_PATH_MANUAL_SRC@/string.xsl"/>
+  <xsl:import href="@VBOX_PATH_MANUAL_SRC@/common-formatcfg.xsl"/>
+
+  <xsl:output method="text" version="1.0" encoding="utf-8" indent="yes"/>
+  <xsl:strip-space elements="*"/>
+
+  <xsl:param name="g_fDebugText" select="0"/>
+
+  <xsl:variable name="g_sUnderlineRefSect1">
+    <xsl:text>===================================================================================================================</xsl:text>
+  </xsl:variable>
+  <xsl:variable name="g_sUnderlineRefSect2">
+    <xsl:text>-------------------------------------------------------------------------------------------------------------------</xsl:text>
+  </xsl:variable>
+
+
+  <!-- Default action, do nothing. -->
+  <xsl:template match="node()|@*"/>
+
+  <!--
+    main() - because we need to order the output in a specific manner
+             that is contrary to the data flow in the refentry, this is
+             going to look a bit more like a C program than a stylesheet.
+    -->
+  <xsl:template match="refentry">
+    <!-- Assert refetry expectations. -->
+    <xsl:if test="not(./refsynopsisdiv)">
+        <xsl:message terminate="yes">refentry must have a refsynopsisdiv</xsl:message>
+    </xsl:if>
+    <xsl:if test="not(./refentryinfo/title)">
+      <xsl:message terminate="yes">refentry must have a refentryinfo with title</xsl:message>
+    </xsl:if>
+    <xsl:if test="not(./refmeta/refentrytitle)">
+      <xsl:message terminate="yes">refentry must have a refentryinfo with title</xsl:message>
+    </xsl:if>
+    <xsl:if test="./refmeta/refentrytitle != ./refnamediv/refname">
+      <xsl:message terminate="yes">The refmeta/refentrytitle and the refnamediv/refname must be identical</xsl:message>
+    </xsl:if>
+    <xsl:if test="not(./refsect1/title)">
+      <xsl:message terminate="yes">refentry must have a refsect1 with title</xsl:message>
+    </xsl:if>
+    <xsl:if test="not(@id) or @id = ''">
+      <xsl:message terminate="yes">refentry must have an id attribute</xsl:message>
+    </xsl:if>
+
+    <!-- variables -->
+    <xsl:variable name="sBaseId" select="@id"/>
+    <xsl:variable name="sDataBaseSym" select="concat('g_', translate(@id, '-', '_'))"/>
+
+
+    <!--
+      Convert the refsynopsisdiv into REFENTRY::Synopsis data.
+      -->
+    <xsl:text>
+
+static const REFENTRYSTR </xsl:text><xsl:value-of select="$sDataBaseSym"/><xsl:text>_synopsis[] =
+{</xsl:text>
+    <xsl:for-each select="./refsynopsisdiv/cmdsynopsis">
+      <!-- Assert synopsis expectations -->
+      <xsl:if test="not(@id) or substring-before(@id, '-') != 'synopsis'">
+        <xsl:message terminate="yes">The refsynopsisdiv/cmdsynopsis elements must have an id starting with 'synopsis-'.</xsl:message>
+      </xsl:if>
+      <xsl:if test="not(starts-with(substring-after(@id, '-'), $sBaseId))">
+        <xsl:message terminate="yes">The refsynopsisdiv/cmdsynopsis elements @id is expected to include the refentry @id.</xsl:message>
+      </xsl:if>
+      <xsl:if test="not(../../refsect1/refsect2[@id=./@id])">
+        <xsl:message terminate="yes">No refsect2 with id="<xsl:value-of select="@id"/>" found.</xsl:message>
+      </xsl:if>
+
+      <!-- Do the work. -->
+      <xsl:apply-templates select="."/>
+
+    </xsl:for-each>
+    <xsl:text>
+};</xsl:text>
+
+
+    <!--
+      Convert the whole manpage to help text.
+      -->
+    <xsl:text>
+static const REFENTRYSTR </xsl:text><xsl:value-of select="$sDataBaseSym"/><xsl:text>_full_help[] =
+{</xsl:text>
+    <!-- We start by combining the refentry title and the refpurpose into a short description. -->
+    <xsl:text>
+    {   </xsl:text><xsl:call-template name="calc-scope-for-refentry"/><xsl:text>,
+        "</xsl:text>
+        <xsl:apply-templates select="./refentryinfo/title/node()"/>
+        <xsl:text> -- </xsl:text>
+        <xsl:call-template name="capitalize">
+          <xsl:with-param name="text">
+            <xsl:apply-templates select="./refnamediv/refpurpose/node()"/>
+          </xsl:with-param>
+        </xsl:call-template>
+        <xsl:text>." },
+    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+
+    <!-- The follows the usage (synopsis) section. -->
+    <xsl:text>
+    {   REFENTRYSTR_SCOPE_GLOBAL,
+        "Usage" },
+    {   REFENTRYSTR_SCOPE_SAME,
+        "=====" },
+    {   REFENTRYSTR_SCOPE_SAME,
+        "" },</xsl:text>
+        <xsl:apply-templates select="./refsynopsisdiv/node()"/>
+
+    <!-- Then comes the description and other refsect1 -->
+    <xsl:for-each select="./refsect1">
+      <xsl:if test="name(*[1]) != 'title'"><xsl:message terminate="yes">Expected title as the first element in refsect1.</xsl:message></xsl:if>
+      <xsl:if test="text()"><xsl:message terminate="yes">No text supported in refsect1.</xsl:message></xsl:if>
+      <xsl:if test="not(./remark[@role='help-skip'])">
+        <xsl:variable name="sTitle">
+          <xsl:apply-templates select="./title/node()"/>
+        </xsl:variable>
+        <xsl:text>
+    {   </xsl:text><xsl:call-template name="calc-scope-refsect1"/><xsl:text>, "" },
+    {   REFENTRYSTR_SCOPE_SAME,
+        "</xsl:text><xsl:value-of select="$sTitle"/><xsl:text>" },
+    {   REFENTRYSTR_SCOPE_SAME,
+        "</xsl:text>
+        <xsl:value-of select="substring($g_sUnderlineRefSect1, 1, string-length($sTitle))"/>
+        <xsl:text>" },</xsl:text>
+
+        <xsl:apply-templates select="./*[name() != 'title']"/>
+      </xsl:if>
+    </xsl:for-each>
+
+    <xsl:text>
+};</xsl:text>
+
+    <!--
+      Generate the refentry structure.
+      -->
+    <xsl:text>
+static const REFENTRY </xsl:text><xsl:value-of select="$sDataBaseSym"/><xsl:text> =
+{
+    /* .idInternal = */   HELP_CMD_</xsl:text>
+    <xsl:call-template name="str:to-upper">
+      <xsl:with-param name="text" select="translate(substring-after(@id, '-'), '-', '_')"/>
+    </xsl:call-template>
+    <xsl:text>,
+    /* .Synopsis   = */   { RT_ELEMENTS(</xsl:text>
+    <xsl:value-of select="$sDataBaseSym"/><xsl:text>_synopsis), 0, </xsl:text>
+    <xsl:value-of select="$sDataBaseSym"/><xsl:text>_synopsis },
+    /* .Help       = */   { RT_ELEMENTS(</xsl:text>
+    <xsl:value-of select="$sDataBaseSym"/><xsl:text>_full_help), 0, </xsl:text>
+    <xsl:value-of select="$sDataBaseSym"/><xsl:text>_full_help },
+    /* pszBrief    = */   "</xsl:text>
+    <xsl:apply-templates select="./refnamediv/refpurpose/node()"/>
+    <!-- TODO: Add the command name too. -->
+    <xsl:text>"
+};
+</xsl:text>
+  </xsl:template>
+
+
+  <!--
+    Convert command synopsis to text.
+    -->
+  <xsl:template match="cmdsynopsis">
+    <xsl:if test="text()"><xsl:message terminate="yes">cmdsynopsis with text is not supported.</xsl:message></xsl:if>
+    <xsl:text>
+    {   </xsl:text><xsl:call-template name="calc-scope-cmdsynopsis"/><xsl:text> | REFENTRYSTR_FLAGS_SYNOPSIS,
+        "</xsl:text><xsl:call-template name="emit-indentation"/><xsl:apply-templates select="*|@*"/><xsl:text>" },</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="sbr">
+    <xsl:text>" },
+    {   REFENTRYSTR_SCOPE_SAME | REFENTRYSTR_FLAGS_SYNOPSIS,
+        "    </xsl:text><xsl:call-template name="emit-indentation"/> <!-- hardcoded in VBoxManageHelp.cpp too -->
+  </xsl:template>
+
+  <xsl:template match="cmdsynopsis/command">
+    <xsl:text>" },
+    {   REFENTRYSTR_SCOPE_SAME | REFENTRYSTR_FLAGS_SYNOPSIS,
+        "</xsl:text><xsl:call-template name="emit-indentation"/>
+    <xsl:apply-templates select="node()|@*"/>
+  </xsl:template>
+
+  <xsl:template match="cmdsynopsis/command[1]" priority="2">
+    <xsl:apply-templates select="node()|@*"/>
+  </xsl:template>
+
+  <xsl:template match="command|option|computeroutput">
+    <xsl:apply-templates select="node()|@*"/>
+  </xsl:template>
+
+  <xsl:template match="replaceable">
+    <xsl:choose>
+      <xsl:when test="not(ancestor::cmdsynopsis) or ancestor::arg">
+        <xsl:apply-templates />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text><</xsl:text>
+        <xsl:apply-templates />
+        <xsl:text>></xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- duplicated in docbook2latex.xsl -->
+  <xsl:template match="arg|group">
+    <!-- separator char if we're not the first child -->
+    <xsl:if test="position() > 1">
+      <xsl:choose>
+        <xsl:when test="parent::group"><xsl:value-of select="$arg.or.sep"/></xsl:when>
+        <xsl:when test="ancestor-or-self::*/@sepchar"><xsl:value-of select="ancestor-or-self::*/@sepchar"/></xsl:when>
+        <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
+      </xsl:choose>
+    </xsl:if>
+    <!-- open wrapping -->
+    <xsl:choose>
+      <xsl:when test="not(@choice) or @choice = ''">  <xsl:value-of select="$arg.choice.def.open.str"/></xsl:when>
+      <xsl:when test="@choice = 'opt'">               <xsl:value-of select="$arg.choice.opt.open.str"/></xsl:when>
+      <xsl:when test="@choice = 'req'">               <xsl:value-of select="$arg.choice.req.open.str"/></xsl:when>
+      <xsl:when test="@choice = 'plain'"/>
+      <xsl:otherwise><xsl:message terminate="yes">Invalid arg choice: "<xsl:value-of select="@choice"/>"</xsl:message></xsl:otherwise>
+    </xsl:choose>
+
+    <!-- render the arg (TODO: may need to do more work here) -->
+    <xsl:apply-templates />
+
+    <!-- repeat wrapping -->
+    <xsl:choose>
+      <xsl:when test="@rep = 'norepeat' or not(@rep) or @rep = ''"/>
+      <xsl:when test="@rep = 'repeat'">               <xsl:value-of select="$arg.rep.repeat.str"/></xsl:when>
+      <xsl:otherwise><xsl:message terminate="yes">Invalid rep choice: "<xsl:value-of select="@rep"/>"</xsl:message></xsl:otherwise>
+    </xsl:choose>
+    <!-- close wrapping -->
+    <xsl:choose>
+      <xsl:when test="not(@choice) or @choice = ''">  <xsl:value-of select="$arg.choice.def.close.str"/></xsl:when>
+      <xsl:when test="@choice = 'opt'">               <xsl:value-of select="$arg.choice.opt.close.str"/></xsl:when>
+      <xsl:when test="@choice = 'req'">               <xsl:value-of select="$arg.choice.req.close.str"/></xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+
+  <!--
+    refsect2
+    -->
+  <xsl:template match="refsect2">
+    <!-- assertions -->
+    <xsl:if test="text()"><xsl:message terminate="yes">refsect2 shouldn't contain text</xsl:message></xsl:if>
+    <xsl:if test="count(./title) != 1"><xsl:message terminate="yes">refsect2 requires a title (<xsl:value-of select="ancestor-or-self::*[@id][1]/@id"/>)</xsl:message></xsl:if>
+
+    <!-- title / command synopsis - sets the scope. -->
+    <xsl:variable name="sTitle">
+      <xsl:apply-templates select="./title/text()"/>
+    </xsl:variable>
+    <xsl:text>
+    {   </xsl:text><xsl:call-template name="calc-scope-refsect2"/><xsl:text>, "" },
+    {   REFENTRYSTR_SCOPE_SAME,
+        "</xsl:text><xsl:call-template name="emit-indentation"/>
+    <xsl:value-of select="$sTitle"/>
+    <xsl:text>" },
+    {   REFENTRYSTR_SCOPE_SAME,
+        "</xsl:text><xsl:call-template name="emit-indentation"/>
+    <xsl:value-of select="substring($g_sUnderlineRefSect2, 1, string-length($sTitle))"/>
+    <xsl:text>" },
+    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+
+    <!-- Format the text in the section -->
+    <xsl:for-each select="./*[name() != 'title']">
+      <xsl:apply-templates select="."/>
+    </xsl:for-each>
+
+    <!-- Add two blank lines, unless we're the last element in this refsect1. -->
+    <xsl:if test="position() != last()">
+      <xsl:text>
+    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+    </xsl:if>
+  </xsl:template>
+
+
+  <!--
+    para
+    -->
+  <xsl:template match="para">
+    <xsl:if test="position() != 1 or not(parent::listitem)">
+      <xsl:text>
+    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+    </xsl:if>
+    <xsl:call-template name="process-mixed"/>
+  </xsl:template>
+
+
+  <!--
+    variablelist
+    -->
+  <xsl:template match="variablelist">
+    <xsl:if test="*[not(self::varlistentry)]|text()">
+      <xsl:message terminate="yes">Only varlistentry elements are supported in variablelist</xsl:message>
+    </xsl:if>
+    <xsl:for-each select="./varlistentry">
+      <xsl:if test="count(*) != 2 or not(term) or not(listitem)">
+        <xsl:message terminate="yes">Expected exactly one term and one listentry member in varlistentry element.</xsl:message>
+      </xsl:if>
+      <xsl:if test="not(@spacing) or @spacing != 'compact'">
+        <xsl:text>
+    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+      </xsl:if>
+      <xsl:apply-templates select="*"/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="varlistentry/term">
+    <xsl:call-template name="process-mixed"/>
+  </xsl:template>
+
+  <xsl:template match="varlistentry/listitem">
+    <xsl:call-template name="check-children">
+      <xsl:with-param name="UnsupportedNodes" select="*[not(self::para or self::itemizedlist or self::orderedlist)]|text()"/>
+      <xsl:with-param name="SupportedNames">para, itemizedlist and orderedlist</xsl:with-param>
+    </xsl:call-template>
+
+    <xsl:apply-templates select="*"/>
+  </xsl:template>
+
+
+  <!--
+    itemizedlist and orderedlist
+    -->
+  <xsl:template match="itemizedlist|orderedlist">
+    <xsl:if test="*[not(self::listitem)]|text()">
+      <xsl:message terminate="yes">
+        <xsl:call-template name="get-node-path"/>: error: Only listitem elements are supported in <xsl:value-of select="name()"/>:
+        <xsl:call-template name="list-nodes">
+          <xsl:with-param name="Nodes" select="*[not(self::listitem)]|text()"/>
+        </xsl:call-template>
+        </xsl:message>
+    </xsl:if>
+    <xsl:if test="parent::para">
+      <xsl:message terminate="yes"><xsl:value-of select="name()"/> inside a para is current not supported. <!-- no newline
+        -->Close the para before the list, it makes no difference to html and latex/pdf output.</xsl:message>
+    </xsl:if>
+    <xsl:if test="position() != 1 and (not(@spacing) or @spacing != 'compact')">
+      <xsl:text>
+    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+    </xsl:if>
+    <xsl:for-each select="./listitem">
+      <xsl:apply-templates select="*"/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="itemizedlist/listitem|orderedlist/listitem">
+    <xsl:if test="*[not(self::para)]|text()">
+      <xsl:message terminate="yes">
+        <xsl:call-template name="get-node-path"/>: error: Expected <xsl:value-of select="name()"/>/listitem to only contain para elements:
+        <xsl:call-template name="list-nodes">
+          <xsl:with-param name="Nodes" select="*[not(self::para)]|text()"/>
+        </xsl:call-template>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:if test="position() != 1 and @spaceing != 'compact'">
+      <xsl:text>
+    {   REFENTRYSTR_SCOPE_SAME, "" },</xsl:text>
+    </xsl:if>
+    <xsl:apply-templates select="*"/>
+  </xsl:template>
+
+
+  <!--
+    Screen
+    -->
+  <xsl:template match="screen">
+    <xsl:if test="ancestor::para">
+      <xsl:text>" },</xsl:text>
+    </xsl:if>
+
+    <xsl:text>
+    {   REFENTRYSTR_SCOPE_SAME,
+        "</xsl:text>
+
+    <xsl:for-each select="node()">
+      <xsl:choose>
+        <xsl:when test="name() = ''">
+          <xsl:call-template name="screen_text_line">
+            <xsl:with-param name="sText" select="."/>
+          </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:if test="*">
+            <xsl:message terminate="yes">Support for elements under screen has not been implemented: <xsl:value-of select="name()"/></xsl:message>
+          </xsl:if>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+
+    <xsl:if test="not(ancestor::para)">
+      <xsl:text>" },</xsl:text>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="screen_text_line">
+    <xsl:param name="sText"/>
+    <xsl:call-template name="escape_fixed_text">
+      <xsl:with-param name="sText" select="substring-before($sText,'&#x0a;')"/>
+    </xsl:call-template>
+
+    <xsl:if test="substring-after($sText,'&#x0a;')">
+      <xsl:text>" },
+    {   REFENTRYSTR_SCOPE_SAME,
+        "</xsl:text>
+      <xsl:call-template name="screen_text_line">
+        <xsl:with-param name="sText" select="substring-after($sText,'&#x0a;')"/>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+
+  <!--
+    Text escaping for C.
+    -->
+  <xsl:template match="text()" name="escape_text">
+    <!-- Leading whitespace hack! -->
+    <xsl:if test="substring(.,1,1) = ' ' and position() != 1">
+      <xsl:text> </xsl:text>
+      <xsl:if test="boolean($g_fDebugText)">
+        <xsl:message>text: add space</xsl:message>
+      </xsl:if>
+    </xsl:if>
+
+    <!-- Body of text -->
+    <xsl:choose>
+
+      <xsl:when test="contains(., '\') or contains(., '"')">
+        <xsl:variable name="sTmp">
+          <xsl:call-template name="str:subst">
+            <xsl:with-param name="text" select="normalize-space(.)"/>
+            <xsl:with-param name="replace" select="'\'"/>
+            <xsl:with-param name="with" select="'\\'"/>
+            <xsl:with-param name="disable-output-escaping" select="yes"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="sTmp2">
+          <xsl:call-template name="str:subst">
+            <xsl:with-param name="text" select="$sTmp"/>
+            <xsl:with-param name="replace" select="'"'"/>
+            <xsl:with-param name="with" select="'\"'"/>
+            <xsl:with-param name="disable-output-escaping" select="yes"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="$sTmp2"/>
+        <xsl:if test="boolean($g_fDebugText)">
+          <xsl:message>text: |<xsl:value-of select="$sTmp2"/>|</xsl:message>
+        </xsl:if>
+      </xsl:when>
+
+      <xsl:otherwise>
+        <xsl:value-of select="normalize-space(.)"/>
+        <xsl:if test="boolean($g_fDebugText)">
+          <xsl:message>text: |<xsl:value-of select="normalize-space(.)"/>|</xsl:message>
+        </xsl:if>
+      </xsl:otherwise>
+    </xsl:choose>
+
+    <!-- Trailing whitespace hack! -->
+    <xsl:if test="substring(.,string-length(.)) = ' ' and position() != last() and string-length(.) != 1">
+      <xsl:text> </xsl:text>
+      <xsl:if test="boolean($g_fDebugText)">
+        <xsl:message>text: add space</xsl:message>
+      </xsl:if>
+    </xsl:if>
+
+  </xsl:template>
+
+  <!-- Elements producing non-breaking strings (single line). -->
+  <xsl:template match="command/text()|option/text()|computeroutput/text()|arg/text()" name="escape_fixed_text">
+    <xsl:param name="sText" select="."/>
+    <xsl:choose>
+
+      <xsl:when test="contains($sText, '\') or contains($sText, '"')">
+        <xsl:variable name="sTmp1">
+          <xsl:call-template name="str:subst">
+            <xsl:with-param name="text" select="$sText"/>
+            <xsl:with-param name="replace" select="'\'"/>
+            <xsl:with-param name="with" select="'\\'"/>
+            <xsl:with-param name="disable-output-escaping" select="yes"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="sTmp2">
+          <xsl:call-template name="str:subst">
+            <xsl:with-param name="text" select="$sTmp1"/>
+            <xsl:with-param name="replace" select="'"'"/>
+            <xsl:with-param name="with" select="'\"'"/>
+            <xsl:with-param name="disable-output-escaping" select="yes"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="sTmp3">
+          <xsl:call-template name="str:subst">
+            <xsl:with-param name="text" select="$sTmp2"/>
+            <xsl:with-param name="replace" select="' '"/>
+            <xsl:with-param name="with" select="'\b'"/>
+            <xsl:with-param name="disable-output-escaping" select="yes"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="$sTmp3"/>
+        <xsl:if test="boolean($g_fDebugText)">
+          <xsl:message>text! |<xsl:value-of select="$sTmp3"/>|</xsl:message>
+        </xsl:if>
+      </xsl:when>
+
+      <xsl:when test="contains($sText, ' ')">
+        <xsl:variable name="sTmp">
+          <xsl:call-template name="str:subst">
+            <xsl:with-param name="text" select="$sText"/>
+            <xsl:with-param name="replace" select="' '"/>
+            <xsl:with-param name="with" select="'\b'"/>
+            <xsl:with-param name="disable-output-escaping" select="yes"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="$sTmp"/>
+        <xsl:if test="boolean($g_fDebugText)">
+          <xsl:message>text! |<xsl:value-of select="$sTmp"/>|</xsl:message>
+        </xsl:if>
+      </xsl:when>
+
+      <xsl:otherwise>
+        <xsl:value-of select="$sText"/>
+        <xsl:if test="boolean($g_fDebugText)">
+          <xsl:message>text! |<xsl:value-of select="$sText"/>|</xsl:message>
+        </xsl:if>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+
+  <!--
+    Unsupported elements and elements handled directly.
+    -->
+  <xsl:template match="synopfragment|synopfragmentref|title|refsect1">
+    <xsl:message terminate="yes">The <xsl:value-of select="name()"/> element is not supported</xsl:message>
+  </xsl:template>
+
+  <!--
+    Fail on misplaced scoping remarks.
+    -->
+  <xsl:template match="remark[@role = 'help-scope']">
+    <xsl:choose>
+      <xsl:when test="parent::refsect1"/>
+      <xsl:when test="parent::refsect2"/>
+      <xsl:when test="parent::cmdsynopsis and ancestor::refsynopsisdiv"/>
+      <xsl:otherwise>
+        <xsl:message terminate="yes">Misplaced remark/@role=help-scope element.
+Only supported on: refsect1, refsect2, refsynopsisdiv/cmdsynopsis</xsl:message>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!--
+    Execute synopsis copy remark (avoids duplication for complicated xml).
+    -->
+  <xsl:template match="remark[@role = 'help-copy-synopsis']">
+    <xsl:message terminate="yes">remark/@role=help-copy-synopsis is not supported by this stylesheet. Must preprocess input!</xsl:message>
+  </xsl:template>
+
+  <!--
+    Warn about unhandled elements
+    -->
+  <xsl:template match="*">
+    <xsl:message terminate="no">Warning: Unhandled element: <!-- no newline -->
+      <xsl:for-each select="ancestor-or-self::*">
+        <xsl:text>/</xsl:text>
+        <xsl:value-of select="name(.)"/>
+        <xsl:if test="@id">
+          <xsl:value-of select="concat('[id=', @id ,']')"/>
+        </xsl:if>
+      </xsl:for-each>
+    </xsl:message>
+  </xsl:template>
+
+
+  <!--
+    Functions
+    Functions
+    Functions
+    -->
+
+  <!--
+    Processes mixed children, i.e. both text and regular elements.
+    Normalizes whitespace. -->
+  <xsl:template name="process-mixed">
+    <xsl:text>
+    {   REFENTRYSTR_SCOPE_SAME,
+        "</xsl:text><xsl:call-template name="emit-indentation"/>
+
+    <xsl:for-each select="node()[not(self::remark)]">
+      <xsl:choose>
+        <xsl:when test="name() = ''">
+          <xsl:call-template name="escape_text"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="."/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+
+    <xsl:text>" },</xsl:text>
+  </xsl:template>
+
+
+  <!--
+    Element specific scoping.
+    -->
+
+  <xsl:template name="calc-scope-for-refentry">
+    <xsl:call-template name="calc-scope-const-from-id"/>
+  </xsl:template>
+
+  <!-- Figures out the scope of a refsect1 element. -->
+  <xsl:template name="calc-scope-refsect1">
+    <xsl:choose>
+      <xsl:when test="title[text() = 'Description']">
+        <xsl:text>REFENTRYSTR_SCOPE_GLOBAL</xsl:text>
+      </xsl:when>
+      <xsl:when test="@id or remark[@role='help-scope']">
+        <xsl:call-template name="calc-scope-from-remark-or-id"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>REFENTRYSTR_SCOPE_GLOBAL</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- Figures out the scope of a refsect2 element. -->
+  <xsl:template name="calc-scope-refsect2">
+    <xsl:choose>
+      <xsl:when test="@id or remark[@role='help-scope']">
+        <xsl:call-template name="calc-scope-from-remark-or-id"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>REFENTRYSTR_SCOPE_SAME</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- Figures out the scope of a refsect1 element. -->
+  <xsl:template name="calc-scope-cmdsynopsis">
+    <xsl:choose>
+      <xsl:when test="ancestor::refsynopsisdiv">
+        <xsl:call-template name="calc-scope-from-remark-or-id">
+          <xsl:with-param name="sId" select="substring-after(@id, '-')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>REFENTRYSTR_SCOPE_SAME</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+
+  <!--
+    Scoping worker functions.
+    -->
+
+  <!-- Calculates the current scope from the scope remark or @id.  -->
+  <xsl:template name="calc-scope-from-remark-or-id">
+    <xsl:param name="sId" select="@id"/>
+    <xsl:choose>
+      <xsl:when test="remark[@role='help-scope']">
+        <xsl:call-template name="calc-scope-consts-from-remark"/>
+      </xsl:when>
+      <xsl:when test="$sId != ''">
+        <xsl:call-template name="calc-scope-const-from-id">
+          <xsl:with-param name="sId" select="$sId"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:message terminate="yes">expected remark child or id attribute.</xsl:message>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- Turns a @id into a scope constant.
+    Some woodoo taking place here here that chops the everything up to and
+    including the first refentry/@id word from all IDs before turning them into
+    constants (word delimiter '-'). -->
+  <xsl:template name="calc-scope-const-from-id">
+    <xsl:param name="sId" select="@id"/>
+    <xsl:variable name="sPrefix" select="concat(substring-before(ancestor::refentry/@id, '-'), '-')"/>
+    <xsl:if test="not(contains($sId, sPrefix))">
+      <xsl:message terminate="yes">Expected sId (<xsl:value-of select="$sId"/>) to contain <xsl:value-of select="$sPrefix"/></xsl:message>
+    </xsl:if>
+    <xsl:text>HELP_SCOPE_</xsl:text>
+    <xsl:call-template name="str:to-upper">
+      <xsl:with-param name="text" select="translate(substring-after($sId, $sPrefix), '-', '_')"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <!-- Turns a remark into one or more scope constant. -->
+  <xsl:template name="calc-scope-consts-from-remark">
+    <xsl:param name="sCondition" select="remark/@condition"/>
+    <xsl:variable name="sNormalized" select="concat(normalize-space(translate($sCondition, ',;:|', '    ')), ' ')"/>
+    <xsl:if test="$sNormalized = ' ' or $sNormalized = ''">
+      <xsl:message terminate="yes">Empty @condition for help-scope remark.</xsl:message>
+    </xsl:if>
+    <xsl:choose>
+      <xsl:when test="substring-before($sNormalized, ' ') = 'GLOBAL'">
+        <xsl:text>REFENTRYSTR_SCOPE_GLOBAL</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>HELP_SCOPE_</xsl:text><xsl:value-of select="substring-before($sNormalized, ' ')"/>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:call-template name="calc-scope-const-from-remark-worker">
+      <xsl:with-param name="sList" select="substring-after($sNormalized, ' ')"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="calc-scope-const-from-remark-worker">
+    <xsl:param name="sList"/>
+    <xsl:if test="$sList != ''">
+      <xsl:choose>
+        <xsl:when test="substring-before($sList, ' ') = 'GLOBAL'">
+          <xsl:text>| REFENTRYSTR_SCOPE_GLOBAL</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> | HELP_SCOPE_</xsl:text><xsl:value-of select="substring-before($sList, ' ')"/>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:call-template name="calc-scope-const-from-remark-worker">
+        <xsl:with-param name="sList" select="substring-after($sList, ' ')"/>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+
+  <!--
+    Calculates and emits indentation list markup.
+    -->
+  <xsl:template name="emit-indentation">
+    <xsl:variable name="iDepth" select="count(ancestor-or-self::*)"/>
+    <xsl:for-each select="ancestor-or-self::*">
+      <xsl:choose>
+
+        <xsl:when test="self::refsect1
+                      | self::refsect2
+                      | self::refsect3
+                      | self::refsynopsisdiv">
+          <xsl:text>  </xsl:text>
+        </xsl:when>
+
+        <xsl:when test="self::term">
+           <!-- currently no indent. -->
+        </xsl:when>
+
+        <!-- Evidence here (especially with orderedlist) that doing list by for-each
+             listitem in the template matching the list type would be easier... -->
+        <xsl:when test="self::listitem and parent::itemizedlist and (position() + 1) = $iDepth">
+          <xsl:text>  - </xsl:text>
+        </xsl:when>
+
+        <xsl:when test="self::listitem and parent::orderedlist and (position() + 1) = $iDepth">
+          <xsl:variable name="iNumber" select="count(preceding-sibling::listitem) + 1"/>
+          <xsl:if test="$iNumber <= 9">
+            <xsl:text> </xsl:text>
+          </xsl:if>
+          <xsl:value-of select="$iNumber"/>
+          <xsl:text>. </xsl:text>
+        </xsl:when>
+
+        <xsl:when test="self::listitem">
+          <xsl:text>    </xsl:text>
+        </xsl:when>
+
+      </xsl:choose>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!--
+    Captializes the given text.
+    -->
+  <xsl:template name="capitalize">
+    <xsl:param name="text"/>
+    <xsl:call-template name="str:to-upper">
+      <xsl:with-param name="text" select="substring($text,1,1)"/>
+    </xsl:call-template>
+    <xsl:value-of select="substring($text,2)"/>
+  </xsl:template>
+
+
+  <!--
+    Debug/Diagnostics: Return the path to the specified node (by default the current).
+    -->
+  <xsl:template name="get-node-path">
+    <xsl:param name="Node" select="."/>
+    <xsl:for-each select="$Node">
+      <xsl:for-each select="ancestor-or-self::node()">
+        <xsl:choose>
+          <xsl:when test="name(.) = ''">
+            <xsl:text>text()</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="concat('/', name(.))"/>
+            <xsl:if test="@id">
+              <xsl:text>[@id=</xsl:text>
+              <xsl:value-of select="@id"/>
+              <xsl:text>]</xsl:text>
+            </xsl:if>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:for-each>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!--
+    Debug/Diagnostics: Print list of nodes (by default all children of current node).
+    -->
+  <xsl:template name="list-nodes">
+    <xsl:param name="Nodes" select="node()"/>
+
+    <for-each select="$Nodes">
+      <xsl:if test="posision() != 1">
+        <xsl:text>, </xsl:text>
+      </xsl:if>
+      <xsl:choose>
+        <xsl:when test="name(.) = ''">
+          <xsl:text>text()</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="name(.)"/>
+          <xsl:if test="@id">
+            <xsl:text>[@id=</xsl:text>
+            <xsl:value-of select="@id"/>
+            <xsl:text>]</xsl:text>
+          </xsl:if>
+        </xsl:otherwise>
+      </xsl:choose>
+    </for-each>
+
+  </xsl:template>
+
+  <xsl:template name="check-children">
+    <xsl:param name="Node"             select="."/>
+    <xsl:param name="UnsupportedNodes" select="*"/>
+    <xsl:param name="SupportedNames"   select="'none'"/>
+    <xsl:if test="count($UnsupportedNodes) != 0">
+      <xsl:message terminate="yes">
+        <xsl:call-template name="get-node-path">
+          <xsl:with-param name="Node" select="$Node"/>
+        </xsl:call-template>
+        <!-- -->: error: Only <xsl:value-of select="$SupportedNames"/> are supported as children to <!-- -->
+        <xsl:value-of select="name($Node)"/>
+        <!-- -->Unsupported children: <!-- -->
+        <xsl:call-template name="list-nodes">
+          <xsl:with-param name="Nodes" select="$UnsupportedNodes"/>
+        </xsl:call-template>
+      </xsl:message>
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/doc/manual/docbook-refentry-to-H-help.xsl b/doc/manual/docbook-refentry-to-H-help.xsl
new file mode 100644
index 0000000..b2d0e96
--- /dev/null
+++ b/doc/manual/docbook-refentry-to-H-help.xsl
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+    docbook-refentry-to-H-help.xsl:
+        XSLT stylesheet for generating command and sub-command
+        constants header for the built-in help.
+
+    Copyright (C) 2006-2015 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+-->
+
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:str="http://xsltsl.org/string"
+  >
+
+  <xsl:import href="@VBOX_PATH_MANUAL_SRC@/string.xsl"/>
+
+  <xsl:output method="text" version="1.0" encoding="utf-8" indent="yes"/>
+  <xsl:strip-space elements="*"/>
+
+  <xsl:param name="g_sMode" select="not-specified"/>
+
+
+  <!-- Default action, do nothing. -->
+  <xsl:template match="node()|@*"/>
+
+  <!--
+    Generate SCOPE enum for a refentry.  We convert the
+    cmdsynopsisdiv/cmdsynopsis IDs into constants.
+    -->
+  <xsl:template match="refentry">
+    <xsl:variable name="sBaseNm">
+      <xsl:call-template name="str:to-upper">
+        <xsl:with-param name="text" select="translate(substring-after(@id, '-'), '-', '_')"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:choose>
+      <!-- Generate subcommand enums and defines -->
+      <xsl:when test="$g_sMode = 'subcmd'">
+        <xsl:text>
+enum
+{
+#define HELP_SCOPE_</xsl:text>
+        <xsl:value-of select="$sBaseNm"/>
+        <xsl:value-of select="substring('                                               ',1,56 - string-length($sBaseNm) - 11)"/>
+        <xsl:text> RT_BIT_32(HELP_SCOPE_</xsl:text><xsl:value-of select="$sBaseNm"/><xsl:text>_BIT)
+        HELP_SCOPE_</xsl:text><xsl:value-of select="$sBaseNm"/><xsl:text>_BIT = 0</xsl:text>
+        <xsl:for-each select="./refsynopsisdiv/cmdsynopsis">
+          <xsl:variable name="sSubNm">
+            <xsl:text>HELP_SCOPE_</xsl:text>
+            <xsl:call-template name="str:to-upper">
+              <xsl:with-param name="text" select="translate(substring-after(substring-after(@id, '-'), '-'), '-', '_')"/>
+            </xsl:call-template>
+          </xsl:variable>
+          <xsl:text>,
+#define </xsl:text>
+        <xsl:value-of select="$sSubNm"/>
+        <xsl:value-of select="substring('                                               ',1,56 - string-length($sSubNm))"/>
+        <xsl:text> RT_BIT_32(</xsl:text><xsl:value-of select="$sSubNm"/><xsl:text>_BIT)
+        </xsl:text><xsl:value-of select="$sSubNm"/><xsl:text>_BIT</xsl:text>
+        </xsl:for-each>
+
+        <xsl:text>,
+    HELP_SCOPE_</xsl:text><xsl:value-of select="$sBaseNm"/><xsl:text>_END
+};
+</xsl:text>
+      </xsl:when>
+
+      <!-- Generate command enum value. -->
+      <xsl:when test="$g_sMode = 'cmd'">
+        <xsl:text>    HELP_CMD_</xsl:text><xsl:value-of select="$sBaseNm"/><xsl:text>,
+</xsl:text>
+      </xsl:when>
+
+      <!-- Shouldn't happen. -->
+      <xsl:otherwise>
+        <xsl:message terminate="yes">Bad or missing g_sMode string parameter value.</xsl:message>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/doc/manual/docbook-refentry-to-manpage-preprocessing.xsl b/doc/manual/docbook-refentry-to-manpage-preprocessing.xsl
new file mode 100644
index 0000000..91c0df1
--- /dev/null
+++ b/doc/manual/docbook-refentry-to-manpage-preprocessing.xsl
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+<!--
+    docbook-refentry-to-manpage-preprocessing.xsl:
+        XSLT stylesheet preprocessing remarks elements before
+        turning a refentry (manpage) into a unix manual page and
+        VBoxManage built-in help.
+
+    Copyright (C) 2006-2015 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+-->
+
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:str="http://xsltsl.org/string"
+  >
+
+  <xsl:output method="xml" version="1.0" encoding="utf-8" indent="no"/>
+
+  <!--
+    The default action is to copy everything.
+    -->
+  <xsl:template match="node()|@*">
+    <xsl:copy>
+      <xsl:apply-templates select="node()|@*"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <!--
+    Execute synopsis copy remark (avoids duplication for complicated xml).
+    We strip the attributes off it.
+    -->
+  <xsl:template match="remark[@role = 'help-copy-synopsis']">
+    <xsl:choose>
+      <xsl:when test="parent::refsect2"/>
+      <xsl:otherwise>
+        <xsl:message terminate="yes">Misplaced remark/@role=help-copy-synopsis element.
+Only supported on: refsect2</xsl:message>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:variable name="sSrcId">
+      <xsl:choose>
+        <xsl:when test="@condition"><xsl:value-of select="concat('synopsis-', @condition)"/></xsl:when>
+        <xsl:otherwise><xsl:value-of select="concat('synopsis-', ../@id)"/></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="CmdSynopsis" select="/refentry/refsynopsisdiv/cmdsynopsis[@id = $sSrcId]"/>
+    <xsl:if test="not($CmdSynopsis)">
+      <xsl:message terminate="yes">Could not find any cmdsynopsis with id=<xsl:value-of select="$sSrcId"/> in refsynopsisdiv.</xsl:message>
+    </xsl:if>
+
+    <xsl:element name="cmdsynopsis">
+      <xsl:apply-templates select="$CmdSynopsis/node()"/>
+    </xsl:element>
+
+  </xsl:template>
+
+  <!--
+    Remove bits only intended for the manual.
+    -->
+  <xsl:template match="remark[@role='help-manual']"/>
+
+</xsl:stylesheet>
+
diff --git a/doc/manual/docbook-refentry-to-man.xsl b/doc/manual/docbook-refentry-to-manpage.xsl
similarity index 100%
rename from doc/manual/docbook-refentry-to-man.xsl
rename to doc/manual/docbook-refentry-to-manpage.xsl
diff --git a/doc/manual/docbook-refentry-to-manual-overview.xsl b/doc/manual/docbook-refentry-to-manual-overview.xsl
new file mode 100644
index 0000000..50aa279
--- /dev/null
+++ b/doc/manual/docbook-refentry-to-manual-overview.xsl
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+    docbook-refentry-to-manual-sect1.xsl:
+        XSLT stylesheet for nicking the refsynopsisdiv bit of a
+        refentry (manpage) for use in the command overview section
+        in the user manual.
+
+    Copyright (C) 2006-2015 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+-->
+
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  >
+
+  <xsl:output method="xml" version="1.0" encoding="utf-8" indent="yes"/>
+  <xsl:strip-space elements="*"/>
+
+
+<!-- Base operation is to copy. -->
+<xsl:template match="node()|@*">
+  <xsl:copy>
+     <xsl:apply-templates select="node()|@*"/>
+  </xsl:copy>
+</xsl:template>
+
+<!--
+  The refentry element is the top level one.  We only process the
+  refsynopsisdiv sub element within it, since that is all we want.
+  -->
+<xsl:template match="refentry">
+  <xsl:apply-templates select="refsynopsisdiv"/>
+</xsl:template>
+
+<!--
+  Combine all cmdsynopsis lines into a bunch of commands.
+ -->
+<xsl:template match="refsynopsisdiv">
+  <xsl:if test="not(cmdsynopsis)">
+    <xsl:message terminate="yes">What? No cmdsynopsis in the refsynopsisdiv?</xsl:message>
+  </xsl:if>
+  <xsl:element name="cmdsynopsis">
+    <xsl:attribute name="id"><xsl:value-of select="/refentry/@id"/><xsl:text>-overview</xsl:text></xsl:attribute>
+    <xsl:for-each select="cmdsynopsis">
+      <xsl:copy-of select="node()"/>
+    </xsl:for-each>
+  </xsl:element>
+</xsl:template>
+
+<!-- Remove all remarks (for now). -->
+<xsl:template match="remark"/>
+
+
+</xsl:stylesheet>
+
diff --git a/doc/manual/docbook-refentry-to-manual-sect1.xsl b/doc/manual/docbook-refentry-to-manual-sect1.xsl
index d8528d5..8ac1e47 100644
--- a/doc/manual/docbook-refentry-to-manual-sect1.xsl
+++ b/doc/manual/docbook-refentry-to-manual-sect1.xsl
@@ -50,9 +50,10 @@
 
 <!-- rename refentry to sect1 -->
 <xsl:template match="refentry">
-  <sect1>
+  <xsl:element name="sect1">
+    <xsl:attribute name="condition">refentry</xsl:attribute>
     <xsl:apply-templates select="node()|@*"/>
-  </sect1>
+  </xsl:element>
 </xsl:template>
 
 <!-- Remove refentryinfo, keeping the title element. -->
@@ -64,20 +65,88 @@
 
 <!-- Morph refnamediv into a brief description. -->
 <xsl:template match="refnamediv">
-  <para>
+  <xsl:element name="para">
     <xsl:call-template name="capitalize">
       <xsl:with-param name="text" select="normalize-space(./refpurpose)"/>
     </xsl:call-template>
     <xsl:text>.</xsl:text>
-  </para>
+  </xsl:element>
 </xsl:template>
 
+<!-- Morph the refsynopsisdiv part into a synopsis section. -->
+<xsl:template match="refsynopsisdiv">
+  <xsl:if test="name(*[1]) != 'cmdsynopsis'"><xsl:message terminate="yes">Expected refsynopsisdiv to start with cmdsynopsis</xsl:message></xsl:if>
+  <xsl:if test="title"><xsl:message terminate="yes">No title element supported in refsynopsisdiv</xsl:message></xsl:if>
+
+  <xsl:element name="sect2">
+    <xsl:attribute name="role">not-in-toc</xsl:attribute>
+    <xsl:attribute name="condition">refsynopsisdiv</xsl:attribute>
+    <xsl:element name="title">
+    <xsl:text>Synopsis</xsl:text>
+    </xsl:element>
+    <xsl:apply-templates />
+  </xsl:element>
+
+</xsl:template>
+
+<!-- refsect1 -> sect2 -->
+<xsl:template match="refsect1">
+  <xsl:if test="not(title)"><xsl:message terminate="yes">refsect1 requires title</xsl:message></xsl:if>
+  <xsl:element name="sect2">
+    <xsl:attribute name="role">not-in-toc</xsl:attribute>
+    <xsl:attribute name="condition">refsect1</xsl:attribute>
+    <xsl:apply-templates />
+  </xsl:element>
+</xsl:template>
+
+<!-- refsect2 -> sect3 -->
+<xsl:template match="refsect2">
+  <xsl:if test="not(title)"><xsl:message terminate="yes">refsect2 requires title</xsl:message></xsl:if>
+  <xsl:element name="sect3">
+    <xsl:attribute name="role">not-in-toc</xsl:attribute>
+    <xsl:attribute name="condition">refsect2</xsl:attribute>
+    <xsl:apply-templates />
+  </xsl:element>
+</xsl:template>
+
+<!-- refsect3 -> sect4 -->
+<xsl:template match="refsect3">
+  <xsl:if test="not(title)"><xsl:message terminate="yes">refsect3 requires title</xsl:message></xsl:if>
+  <xsl:element name="sect4">
+    <xsl:attribute name="role">not-in-toc</xsl:attribute>
+    <xsl:attribute name="condition">refsect3</xsl:attribute>
+    <xsl:apply-templates />
+  </xsl:element>
+</xsl:template>
+
+
 <!-- Remove refmeta. -->
 <xsl:template match="refmeta"/>
 
-<!-- Remove all remarks (for now). -->
+<!--
+ remark extensions:
+ -->
+<!-- Default: remove all remarks. -->
 <xsl:template match="remark"/>
 
+<!-- help-manual - stuff that should only be included in the manual. -->
+<xsl:template match="remark[@role = 'help-manual']">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<!-- help-copy-synopsis - used in refsect2 to copy synopsis from the refsynopsisdiv. -->
+<xsl:template match="remark[@role = 'help-copy-synopsis']">
+  <xsl:if test="not(parent::refsect2)">
+    <xsl:message terminate="yes">The help-copy-synopsis remark is only applicable in refsect2.</xsl:message>
+  </xsl:if>
+  <xsl:variable name="sSrcId" select="concat('synopsis-',../@id)"/>
+  <xsl:if test="not(/refentry/refsynopsisdiv/cmdsynopsis[@id = $sSrcId])">
+    <xsl:message terminate="yes">Could not find any cmdsynopsis with id=<xsl:value-of select="$sSrcId"/> in refsynopsisdiv.</xsl:message>
+  </xsl:if>
+  <xsl:element name="cmdsynopsis">
+    <xsl:copy-of select="/refentry/refsynopsisdiv/cmdsynopsis[@id = $sSrcId]/node()"/>
+  </xsl:element>
+</xsl:template>
 
 <!--
  Captializes the given text.
diff --git a/doc/manual/docbook2latex.xsl b/doc/manual/docbook2latex.xsl
index 665e7d8..43b49d4 100644
--- a/doc/manual/docbook2latex.xsl
+++ b/doc/manual/docbook2latex.xsl
@@ -37,6 +37,7 @@
 >
 
   <xsl:import href="string.xsl"/>
+  <xsl:import href="common-formatcfg.xsl"/>
 
   <xsl:variable name="g_nlsChapter">
     <xsl:choose>
@@ -111,6 +112,7 @@
 
 \usepackage{nameref}
 \usepackage{graphicx}
+\usepackage{hyperref}
 \usepackage{fancybox}
 \usepackage{fancyvrb}
 \usepackage{alltt}
@@ -276,7 +278,43 @@
     </xsl:choose>
   </xsl:template>
 
+  <!--
+    Inserts \hypertarget{@id} that can be referenced via the /A "nameddest=@id"
+    command line or #nameddest=@id URL parameter.
+
+    TODO: The placement of the target could be improved on. The raisebox
+          stuff is a crude hack to make it a little more acceptable.  -->
+  <xsl:template name="title-wrapper">
+    <xsl:param name="texcmd" select="concat('\',name(..))"/>
+    <xsl:param name="refid" select="../@id"/>
+
+    <xsl:call-template name="xsltprocNewlineOutputHack"/>
+    <xsl:choose>
+      <xsl:when test="$refid">
+        <xsl:text>&#x0a;</xsl:text>
+        <xsl:value-of select="$texcmd"/>
+        <xsl:if test="not(contains($texcmd, '*'))">
+          <xsl:text>[</xsl:text> <!-- for toc -->
+          <xsl:apply-templates />
+          <xsl:text>]</xsl:text>
+        </xsl:if>
+        <xsl:text>{</xsl:text> <!-- for doc -->
+        <xsl:text>\raisebox{\ht\strutbox}{\hypertarget{</xsl:text>
+        <xsl:value-of select="$refid"/>
+        <xsl:text>}{}}</xsl:text>
+        <xsl:apply-templates />
+        <xsl:text>}</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>&#x0a;</xsl:text><xsl:value-of select="$texcmd"/><xsl:text>{</xsl:text>
+        <xsl:apply-templates />
+        <xsl:text>}</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
   <xsl:template match="title">
+    <xsl:variable name="refid" select="../@id" />
     <xsl:choose>
       <xsl:when test="name(..)='bookinfo'">
         <xsl:text>\newcommand\docbooktitle{</xsl:text>
@@ -284,67 +322,64 @@
         <xsl:text>}</xsl:text>
       </xsl:when>
       <xsl:when test="name(..)='chapter'">
-        <xsl:call-template name="xsltprocNewlineOutputHack"/>
-        <xsl:text>&#x0a;\chapter{</xsl:text>
-        <xsl:apply-templates />
-        <xsl:text>}</xsl:text>
+        <xsl:call-template name="title-wrapper"/>
       </xsl:when>
       <xsl:when test="name(..)='sect1'">
-        <xsl:call-template name="xsltprocNewlineOutputHack"/>
-        <xsl:text>&#x0a;\section{</xsl:text>
-        <xsl:apply-templates />
-        <xsl:text>}</xsl:text>
+        <xsl:call-template name="title-wrapper">
+          <xsl:with-param name="texcmd">\section</xsl:with-param>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="parent::sect2[@role='not-in-toc'] or parent::refsect1 or (parent::section and count(ancestor::section) = 2)">
+        <xsl:call-template name="title-wrapper">
+          <xsl:with-param name="texcmd">\subsection*</xsl:with-param>
+        </xsl:call-template>
       </xsl:when>
       <xsl:when test="name(..)='sect2'">
-        <xsl:call-template name="xsltprocNewlineOutputHack"/>
-        <xsl:text>&#x0a;\subsection{</xsl:text>
-        <xsl:apply-templates />
-        <xsl:text>}</xsl:text>
+        <xsl:call-template name="title-wrapper">
+          <xsl:with-param name="texcmd">\subsection</xsl:with-param>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="parent::sect3[@role='not-in-toc'] or parent::refsect2 or (parent::section and count(ancestor::section) = 3)">
+        <xsl:call-template name="title-wrapper">
+          <xsl:with-param name="texcmd">\subsubsection*</xsl:with-param>
+        </xsl:call-template>
       </xsl:when>
       <xsl:when test="name(..)='sect3'">
-        <xsl:call-template name="xsltprocNewlineOutputHack"/>
-        <xsl:text>&#x0a;\subsubsection{</xsl:text>
-        <xsl:apply-templates />
-        <xsl:text>}</xsl:text>
+        <xsl:call-template name="title-wrapper">
+          <xsl:with-param name="texcmd">\subsubsection</xsl:with-param>
+        </xsl:call-template>
       </xsl:when>
-      <xsl:when test="name(..)='sect4'">
-        <xsl:call-template name="xsltprocNewlineOutputHack"/>
-        <xsl:text>&#x0a;\paragraph{</xsl:text>
-        <xsl:apply-templates />
-        <xsl:text>}</xsl:text>
+      <xsl:when test="parent::sect4[@role='not-in-toc'] or parent::refsect3 or (parent::section and count(ancestor::section) = 4)">
+        <xsl:call-template name="title-wrapper">
+          <xsl:with-param name="texcmd">\paragraph*</xsl:with-param>
+        </xsl:call-template>
       </xsl:when>
-      <xsl:when test="name(..)='sect5'">
-        <xsl:call-template name="xsltprocNewlineOutputHack"/>
-        <xsl:text>&#x0a;\subparagraph{</xsl:text>
-        <xsl:apply-templates />
-        <xsl:text>}</xsl:text>
+      <xsl:when test="name(..)='sect4'">
+        <xsl:call-template name="title-wrapper">
+          <xsl:with-param name="texcmd">\paragraph</xsl:with-param>
+        </xsl:call-template>
       </xsl:when>
-      <xsl:when test="name(..)='refsect1'">
-        <xsl:call-template name="xsltprocNewlineOutputHack"/>
-        <xsl:text>&#x0a;\paragraph{</xsl:text>
-        <xsl:apply-templates />
-        <xsl:text>}&#x0a;\begin{addmargin}{1em}&#x0a;</xsl:text> <!-- addmargin is ended by refsect1 template way further down. -->
+      <xsl:when test="parent::sect5[@role='not-in-toc'] or parent::refsect4 or (parent::section and count(ancestor::section) = 5)">
+        <xsl:call-template name="title-wrapper">
+          <xsl:with-param name="texcmd">\subparagraph*</xsl:with-param>
+        </xsl:call-template>
       </xsl:when>
-      <xsl:when test="name(..)='refsect2'">
-        <xsl:call-template name="xsltprocNewlineOutputHack"/>
-        <xsl:text>&#x0a;\subparagraph{</xsl:text>
-        <xsl:apply-templates />
-        <xsl:text>}</xsl:text>
+      <xsl:when test="name(..)='sect5'">
+        <xsl:call-template name="title-wrapper">
+          <xsl:with-param name="texcmd">\subparagraph</xsl:with-param>
+        </xsl:call-template>
       </xsl:when>
       <xsl:when test="name(..)='appendix'">
-        <xsl:call-template name="xsltprocNewlineOutputHack"/>
-        <xsl:text>&#x0a;\chapter{</xsl:text>
-        <xsl:apply-templates />
-        <xsl:text>}</xsl:text>
+        <xsl:call-template name="title-wrapper">
+          <xsl:with-param name="texcmd">\chapter</xsl:with-param>
+        </xsl:call-template>
       </xsl:when>
       <xsl:when test="name(..)='glossdiv'">
-        <xsl:call-template name="xsltprocNewlineOutputHack"/>
-        <xsl:text>&#x0a;\section*{</xsl:text>
-        <xsl:apply-templates />
-        <xsl:text>}</xsl:text>
+        <xsl:call-template name="title-wrapper">
+          <xsl:with-param name="texcmd">\section*</xsl:with-param>
+        </xsl:call-template>
       </xsl:when>
     </xsl:choose>
-    <xsl:variable name="refid" select="../@id" />
     <xsl:if test="$refid">
       <xsl:value-of select="concat('&#x0a;\label{', $refid, '}')" />
     </xsl:if>
@@ -585,12 +620,23 @@
 
   <xsl:template match="xref">
     <xsl:choose>
-      <xsl:when test="@xreflabel">
-        <xsl:value-of select="concat('\hyperref[', @linkend, ']{\mbox{', @xreflabel, '}}')" />
+      <xsl:when test="@endterm">
+        <xsl:value-of select="concat('\hyperref[', @linkend, ']{\mbox{', @endterm, '}}')" />
       </xsl:when>
-      <xsl:when test="@apiref='yes'">
+      <xsl:otherwise>
+        <xsl:value-of select="concat($g_nlsChapter, ' \ref{', @linkend, '}, \textit{\nameref{', @linkend, '}}, ', $g_nlsPage, ' \pageref{', @linkend, '}')" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="link">
+    <xsl:choose>
+      <xsl:when test="@endterm">
+        <xsl:value-of select="concat('\hyperref[', @linkend, ']{\mbox{', @endterm, '}}')" />
+      </xsl:when>
+      <xsl:when test="./text()">
         <xsl:value-of select="concat('\hyperref[', @linkend, ']{\mbox{')" />
-        <xsl:apply-templates />
+        <xsl:apply-templates select="./text()"/>
         <xsl:value-of select="'}}'" />
       </xsl:when>
       <xsl:otherwise>
@@ -620,30 +666,23 @@
     <xsl:if test="name(*[1]) != 'cmdsynopsis'"><xsl:message terminate="yes">Expected refsynopsisdiv to start with cmdsynopsis</xsl:message></xsl:if>
     <xsl:if test="title"><xsl:message terminate="yes">No title element supported in refsynopsisdiv</xsl:message></xsl:if>
     <xsl:call-template name="xsltprocNewlineOutputHack"/>
-    <xsl:text>&#x0a;\paragraph{Synopsis} \hfill \\&#x0a;\begin{addmargin}{1em}&#x0a;</xsl:text>
+    <xsl:text>&#x0a;\subsection*{Synopsis}</xsl:text>
+    <xsl:if test="name(*[1]) != 'cmdsynopsis'"> <!-- just in case -->
+      <xsl:text>\hfill \\&#x0a;</xsl:text>
+    </xsl:if>
+    <xsl:text>&#x0a;</xsl:text>
     <xsl:apply-templates />
-    <xsl:text>\end{addmargin}&#x0a;</xsl:text>
   </xsl:template>
 
   <!--
     The refsect1 is used for 'Description' and such. Do same as with refsynopsisdiv
     and turn it into a named & indented paragraph.
-
-    Note! If the section has a title, the title template way up above will begin
-          the addmargin stuff.  We'll just end it here.
-          If there is no title, we ASSUME (HACK ALERT) that this is part of the
-          VBoxManage Command Overview section in the manual.
     -->
   <xsl:template match="refsect1">
-    <xsl:if test="(name(*[1]) != 'title' and name(*[1]) != 'cmdsynopsis') or not(title) = not(cmdsynopsis)">
-      <xsl:message terminate="yes">Expected title or cmdsynopsis element as the first child of refsect1.</xsl:message>
-    </xsl:if>
-    <xsl:if test="not(title)">
-      <xsl:call-template name="xsltprocNewlineOutputHack"/>
-      <xsl:text>&#x0a;\begin{addmargin}{1em}&#x0a;</xsl:text>
+    <xsl:if test="name(*[1]) != 'title' or count(title) != 1">
+      <xsl:message terminate="yes">Expected exactly one title as the first refsect1 element (remarks goes after title!).</xsl:message>
     </xsl:if>
     <xsl:apply-templates/>
-    <xsl:text>&#x0a;\end{addmargin}&#x0a;</xsl:text>
   </xsl:template>
 
   <!--
@@ -653,12 +692,8 @@
     here (HACK ALERT) for the non-title case to feign a paragraph.
     -->
   <xsl:template match="refsect2">
-    <xsl:if test="(name(*[1]) != 'title' and name(*[1]) != 'cmdsynopsis') or not(title) = not(cmdsynopsis)">
-      <xsl:message terminate="yes">Expected title or cmdsynopsis element as the first child of refsect2.</xsl:message>
-    </xsl:if>
-    <xsl:if test="not(title)">
-      <xsl:call-template name="xsltprocNewlineOutputHack"/>
-      <xsl:text>\vspace{1.2em}&#x0a;</xsl:text>
+    <xsl:if test="name(*[1]) != 'title' or count(title) != 1">
+      <xsl:message terminate="yes">Expected exactly one title as the first refsect2 element (remarks goes after title!).</xsl:message>
     </xsl:if>
     <xsl:apply-templates/>
     <xsl:text>&#x0a;</xsl:text>
@@ -667,75 +702,138 @@
 
   <!--
     Command Synopsis elements.
+
+    We treat each command element inside a cmdsynopsis as the start of
+    a new paragraph.  The DocBook HTML converter does so too, but the
+    manpage one doesn't.
+
+    sbr and linebreaks made by latex should be indented from the base
+    command level. This is done by the \hangindent3em\hangafter1 bits.
+
+    We exploit the default paragraph indentation to get each command
+    indented from the left margin.  This, unfortunately, doesn't work
+    if we're the first paragraph in a (sub*)section.  \noindent cannot
+    counter this due to when latex enforces first paragraph stuff. Since
+    it's tedious to figure out when we're in the first paragraph and when
+    not, we just do \noindent\hspace{1em} everywhere.
     -->
   <xsl:template match="sbr">
+    <xsl:if test="not(ancestor::cmdsynopsis)">
+      <xsl:message terminate="yes">sbr only supported inside cmdsynopsis (because of hangindent)</xsl:message>
+    </xsl:if>
     <xsl:text>\linebreak</xsl:text>
   </xsl:template>
+
   <xsl:template match="refentry|refnamediv|refentryinfo|refmeta|refsect3|refsect4|refsect5|synopfragment|synopfragmentref|cmdsynopsis/info">
     <xsl:message terminate="yes"><xsl:value-of select="name()"/> is not supported</xsl:message>
   </xsl:template>
 
   <xsl:template match="cmdsynopsis">
-    <xsl:text>&#x0a;\noindent\texttt{</xsl:text>
+    <xsl:if test="preceding-sibling::cmdsynopsis">
+      <xsl:text>\par%cmdsynopsis</xsl:text>
+    </xsl:if>
+    <xsl:text>&#x0a;</xsl:text>
+    <xsl:if test="parent::remark[@role='VBoxManage-overview']">
+      <!-- Overview fontsize trick -->
+      <xsl:text>{\footnotesize</xsl:text>
+    </xsl:if>
+    <xsl:text>\noindent\hspace{1em}</xsl:text>
+    <xsl:text>\hangindent3em\hangafter1\texttt{</xsl:text>
     <xsl:apply-templates />
-    <xsl:text>}\linebreak</xsl:text>
+    <xsl:text>}</xsl:text>
+    <xsl:if test="following-sibling::*">
+    </xsl:if>
+
+    <!-- For refsect2 subcommand descriptions. -->
+    <xsl:if test="not(following-sibling::cmdsynopsis) and position() != last()">
+      <xsl:text>\linebreak</xsl:text>
+    </xsl:if>
+    <!-- Special overview trick for the current VBoxManage command overview. -->
+    <xsl:if test="parent::remark[@role='VBoxManage-overview']">
+      <xsl:text>}\vspace{1em}</xsl:text>
+    </xsl:if>
   </xsl:template>
 
-  <xsl:template match="replaceable">
+  <xsl:template match="command">
     <xsl:choose>
-      <xsl:when test="not(ancestor::cmdsynopsis)">
-        <xsl:text>\texttt{\textit{</xsl:text>
+      <xsl:when test="ancestor::cmdsynopsis">
+        <!-- Trigger a line break if this isn't the first command in a the synopsis -->
+        <xsl:if test="preceding-sibling::command">
+          <xsl:text>}\par%command&#x0a;</xsl:text>
+          <xsl:text>\noindent\hspace{1em}</xsl:text>
+          <xsl:text>\hangindent3em\hangafter1\texttt{</xsl:text>
+        </xsl:if>
         <xsl:apply-templates />
-        <xsl:text>}}</xsl:text>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:text>\textit{</xsl:text>
+        <xsl:text>\texttt{</xsl:text>
         <xsl:apply-templates />
         <xsl:text>}</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template match="command|option">
+  <xsl:template match="option">
     <xsl:choose>
-      <xsl:when test="not(ancestor::cmdsynopsis)">
-        <xsl:text>\texttt{</xsl:text>
+      <xsl:when test="ancestor::cmdsynopsis">
         <xsl:apply-templates />
-        <xsl:text>}</xsl:text>
       </xsl:when>
       <xsl:otherwise>
+        <xsl:text>\texttt{</xsl:text>
         <xsl:apply-templates />
+        <xsl:text>}</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
+  <!-- duplicated in docbook2latex.xsl -->
   <xsl:template match="arg|group">
     <!-- separator char if we're not the first child -->
     <xsl:if test="position() > 1">
       <xsl:choose>
+        <xsl:when test="parent::group"><xsl:value-of select="$arg.or.sep"/></xsl:when>
         <xsl:when test="ancestor-or-self::*/@sepchar"><xsl:value-of select="ancestor-or-self::*/@sepchar"/></xsl:when>
         <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
       </xsl:choose>
     </xsl:if>
     <!-- open wrapping -->
     <xsl:choose>
-      <xsl:when test="@choice = 'opt' or @choice = ''"> <xsl:text>[</xsl:text></xsl:when>
-      <xsl:when test="@choice = 'req'">                 <xsl:text>{</xsl:text></xsl:when>
+      <xsl:when test="not(@choice) or @choice = ''">  <xsl:value-of select="$arg.choice.def.open.str"/></xsl:when>
+      <xsl:when test="@choice = 'opt'">               <xsl:value-of select="$arg.choice.opt.open.str"/></xsl:when>
+      <xsl:when test="@choice = 'req'">               <xsl:value-of select="$arg.choice.req.open.str"/></xsl:when>
       <xsl:when test="@choice = 'plain'"/>
-      <xsl:otherwise><xsl:message terminate="yes">Invalid arg choice</xsl:message></xsl:otherwise>
+      <xsl:otherwise><xsl:message terminate="yes">Invalid arg choice: "<xsl:value-of select="@choice"/>"</xsl:message></xsl:otherwise>
     </xsl:choose>
+
     <!-- render the arg (TODO: may need to do more work here) -->
     <xsl:apply-templates />
+
     <!-- repeat wrapping -->
     <xsl:choose>
-      <xsl:when test="@rep = 'norepeat' or @rep = ''"/>
-      <xsl:when test="@rep = 'repeat'">                 <xsl:text>...</xsl:text></xsl:when>
-      <xsl:otherwise><xsl:message terminate="yes">Invalid rep choice</xsl:message></xsl:otherwise>
+      <xsl:when test="@rep = 'norepeat' or not(@rep) or @rep = ''"/>
+      <xsl:when test="@rep = 'repeat'">               <xsl:value-of select="$arg.rep.repeat.str"/></xsl:when>
+      <xsl:otherwise><xsl:message terminate="yes">Invalid rep choice: "<xsl:value-of select="@rep"/>"</xsl:message></xsl:otherwise>
     </xsl:choose>
     <!-- close wrapping -->
     <xsl:choose>
-      <xsl:when test="@choice = 'opt' or @choice = ''"> <xsl:text>]</xsl:text></xsl:when>
-      <xsl:when test="@choice = 'req'">                 <xsl:text>}</xsl:text></xsl:when>
+      <xsl:when test="not(@choice) or @choice = ''">  <xsl:value-of select="$arg.choice.def.close.str"/></xsl:when>
+      <xsl:when test="@choice = 'opt'">               <xsl:value-of select="$arg.choice.opt.close.str"/></xsl:when>
+      <xsl:when test="@choice = 'req'">               <xsl:value-of select="$arg.choice.req.close.str"/></xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="replaceable">
+    <xsl:choose>
+      <xsl:when test="not(ancestor::cmdsynopsis) or ancestor::arg">
+        <xsl:text>\texttt{\textit{</xsl:text>
+        <xsl:apply-templates />
+        <xsl:text>}}</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>\textit{<</xsl:text>
+        <xsl:apply-templates />
+        <xsl:text>>}</xsl:text>
+      </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
@@ -744,6 +842,7 @@
     Generic element text magic.
     -->
   <xsl:template match="//text()">
+
     <xsl:variable name="subst1">
       <xsl:call-template name="str:subst">
         <xsl:with-param name="text" select="." />
@@ -752,10 +851,12 @@
         <xsl:with-param name="disable-output-escaping" select="no" />
       </xsl:call-template>
     </xsl:variable>
+
     <xsl:choose>
       <xsl:when test="(name(..)='screen') or (name(../..)='screen')">
         <xsl:value-of select="." />
       </xsl:when>
+
       <xsl:when test="(name(..) = 'computeroutput') or (name(../..) = 'computeroutput')
                    or (name(..) = 'code')           or (name(../..) = 'code')
                    or (name(..) = 'arg')            or (name(../..) = 'arg')
@@ -820,8 +921,24 @@
             <xsl:with-param name="disable-output-escaping" select="no" />
           </xsl:call-template>
         </xsl:variable>
-        <xsl:value-of select="$subst8" />
+        <xsl:choose>
+          <xsl:when test="parent::arg or parent::command">
+            <xsl:variable name="subst9">
+              <xsl:call-template name="str:subst">
+                <xsl:with-param name="text" select="$subst8" />
+                <xsl:with-param name="replace" select="' '" />
+                <xsl:with-param name="with" select="'~'" />
+                <xsl:with-param name="disable-output-escaping" select="no" />
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:value-of select="$subst9" />
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$subst8" />
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:when>
+
       <xsl:when test="(name(..)='address') or (name(../..)='address')">
         <xsl:variable name="subst2">
           <xsl:call-template name="str:subst">
@@ -833,6 +950,7 @@
         </xsl:variable>
         <xsl:value-of select="$subst2" />
       </xsl:when>
+
       <xsl:otherwise>
         <xsl:variable name="subst2">
           <xsl:call-template name="str:subst">
diff --git a/doc/manual/en_US/SDKRef.xml b/doc/manual/en_US/SDKRef.xml
index 0b02af4..b982de2 100644
--- a/doc/manual/en_US/SDKRef.xml
+++ b/doc/manual/en_US/SDKRef.xml
@@ -3,20 +3,20 @@
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <book>
   <bookinfo>
-    <title>$VBOX_PRODUCT<superscript>®</superscript></title>
+    <title>@VBOX_PRODUCT@<superscript>®</superscript></title>
 
     <subtitle>Programming Guide and Reference</subtitle>
 
-    <edition>Version $VBOX_VERSION_STRING</edition>
+    <edition>Version @VBOX_VERSION_STRING@</edition>
 
-    <corpauthor>$VBOX_VENDOR</corpauthor>
+    <corpauthor>@VBOX_VENDOR@</corpauthor>
 
     <address>http://www.virtualbox.org</address>
 
     <copyright>
-      <year>2004-$VBOX_C_YEAR</year>
+      <year>2004- at VBOX_C_YEAR@</year>
 
-      <holder>$VBOX_VENDOR</holder>
+      <holder>@VBOX_VENDOR@</holder>
     </copyright>
   </bookinfo>
 
@@ -37,7 +37,7 @@
       <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/vbox-components.png"
-                     width="12cm" />
+                     width="12cm"/>
         </imageobject>
       </mediaobject>
 
@@ -61,7 +61,7 @@
       This API, which we call the <emphasis role="bold">"Main API"</emphasis>,
       exposes the entire feature set of the virtualization engine below. It is
       completely documented in this SDK Reference -- see <xref
-      linkend="sdkref_classes" /> and <xref linkend="sdkref_enums" /> -- and
+      linkend="sdkref_classes"/> and <xref linkend="sdkref_enums"/> -- and
       available to anyone who wishes to control VirtualBox programmatically.
       We chose the name "Main API" to differentiate it from other programming
       interfaces of VirtualBox that may be publicly accessible.</para>
@@ -113,8 +113,8 @@
                   service (OOWS)"</emphasis>.</para>
 
                   <para>The OO bindings for Java are described in <xref
-                  linkend="javaapi" />, those for Python in <xref lang=""
-                  linkend="glue-python-ws" />.</para>
+                  linkend="javaapi"/>, those for Python in <xref
+                  linkend="glue-python-ws"/>.</para>
                 </listitem>
 
                 <listitem>
@@ -132,7 +132,7 @@
                   client wrapper code from it.</para>
 
                   <para>We describe this further in <xref
-                  linkend="raw-webservice" />, with samples for Java and
+                  linkend="raw-webservice"/>, with samples for Java and
                   Perl.</para>
                 </listitem>
               </orderedlist></para>
@@ -154,7 +154,7 @@
             use the COM/XPCOM API directly. VirtualBox comes with all
             necessary files and documentation to build fully functional COM
             applications. For an introduction, please see <xref
-            linkend="api_com" /> below.</para>
+            linkend="api_com"/> below.</para>
 
             <para>The VirtualBox front-ends (the graphical user interfaces as
             well as the command line), which are all written in C++, use
@@ -345,7 +345,8 @@
 
           <listitem>
             <para><computeroutput>--ssl</computeroutput> (or
-            <computeroutput>-s</computeroutput>): This enables SSL support.</para>
+            <computeroutput>-s</computeroutput>): This enables SSL
+            support.</para>
           </listitem>
 
           <listitem>
@@ -433,7 +434,8 @@
             <para><computeroutput>--keepalive</computeroutput> (or
             <computeroutput>-k</computeroutput>): This specifies the maximum
             number of requests which can be sent in one web service connection,
-            and defaults to 100. This normally does not need to be changed.</para>
+            and defaults to 100. This normally does not need to be
+            changed.</para>
           </listitem>
 
           <listitem>
@@ -502,8 +504,8 @@
 
         <para>As opposed to the COM/XPCOM variant of the Main API, a client
         that wants to use the web service must first log on by calling the
-        <computeroutput>IWebsessionManager::logon()</computeroutput> API (see
-        <xref linkend="IWebsessionManager__logon" />) that is specific to the
+        <link linkend="IWebsessionManager__logon">IWebsessionManager::logon()</link>
+        API that is specific to the
         web service. Logon is necessary for the web service to be stateful;
         internally, it maintains a session for each client that connects to
         it.</para>
@@ -514,7 +516,8 @@
         performs the actual authentication.</para>
 
         <para>For testing purposes, it is recommended that you first disable
-        authentication with this command:<screen>VBoxManage setproperty websrvauthlibrary null</screen></para>
+        authentication with this command:
+        <screen>VBoxManage setproperty websrvauthlibrary null</screen></para>
 
         <para><warning>
             <para>This will cause all logons to succeed, regardless of user
@@ -532,7 +535,7 @@
         role="bold">VRDE authentication</emphasis> of the VirtualBox User
         Manual; the web service uses the same kind of modules as the
         VirtualBox VRDE server. For technical details on VirtualBox external
-        authentication modules see <xref linkend="vbox-auth" /></para>
+        authentication modules see <xref linkend="vbox-auth"/></para>
 
         <para>By default, after installation, the web service uses the
         VBoxAuth module that ships with VirtualBox. This module uses PAM on
@@ -556,11 +559,11 @@
   <chapter>
     <title>Environment-specific notes</title>
 
-    <para>The Main API described in <xref linkend="sdkref_classes" /> and
-    <xref linkend="sdkref_enums" /> is mostly identical in all the supported
+    <para>The Main API described in <xref linkend="sdkref_classes"/> and
+    <xref linkend="sdkref_enums"/> is mostly identical in all the supported
     programming environments which have been briefly mentioned in the
     introduction of this book. As a result, the Main API's general concepts
-    described in <xref linkend="concepts" /> are the same whether you use the
+    described in <xref linkend="concepts"/> are the same whether you use the
     object-oriented web service (OOWS) for JAX-WS or a raw web service
     connection via, say, Perl, or whether you use C++ COM bindings.</para>
 
@@ -570,13 +573,13 @@
     <sect1 id="glue">
       <title>Using the object-oriented web service (OOWS)</title>
 
-      <para>As explained in <xref linkend="webservice-or-com" />, VirtualBox
+      <para>As explained in <xref linkend="webservice-or-com"/>, VirtualBox
       ships with client-side libraries for Java, Python and PHP that allow you
       to use the VirtualBox web service in an intuitive, object-oriented way.
       These libraries shield you from the client-side complications of managed
       object references and other implementation details that come with the
       VirtualBox web service. (If you are interested in these complications,
-      have a look at <xref linkend="raw-webservice" />).</para>
+      have a look at <xref linkend="raw-webservice"/>).</para>
 
       <para>We recommend that you start your experiments with the VirtualBox
       web service by using our object-oriented client libraries for JAX-WS, a
@@ -584,8 +587,8 @@
       interact with VirtualBox in the simplest manner possible.</para>
 
       <para>As "interfaces", "attributes" and "methods" are COM concepts,
-      please read the documentation in <xref linkend="sdkref_classes" /> and
-      <xref linkend="sdkref_enums" /> with the following notes in mind.</para>
+      please read the documentation in <xref linkend="sdkref_classes"/> and
+      <xref linkend="sdkref_enums"/> with the following notes in mind.</para>
 
       <para>The OOWS bindings attempt to map the Main API as closely as
       possible to the Java, Python and PHP languages. In other words, objects
@@ -596,7 +599,7 @@
       call a "getXXX" method, with "XXX" being the attribute name with a
       capitalized first letter. So when the Main API Reference says that
       <computeroutput>IMachine</computeroutput> has a "name" attribute (see
-      <xref linkend="IMachine__name" xreflabel="IMachine::name" />), call
+      <link linkend="IMachine__name">IMachine::name</link>), call
       <computeroutput>getName()</computeroutput> on an IMachine object to
       obtain a machine's name. Unless the attribute is marked as read-only in
       the documentation, there will also be a corresponding "set"
@@ -649,18 +652,20 @@
               <listitem>
                 <para>To start the VirtualBox web service, open a second
                 terminal and change to the directory where the VirtualBox
-                executables are located. Then type:<screen>./vboxwebsrv -v</screen></para>
+                executables are located. Then type:
+                <screen>./vboxwebsrv -v</screen></para>
 
                 <para>The web service now waits for connections and will run
                 until you press Ctrl+C in this second terminal. The -v
                 argument causes it to log all connections to the terminal.
-                (See <xref linkend="runvboxwebsrv" os="" /> for details on how
+                (See <xref linkend="runvboxwebsrv"/> for details on how
                 to run the web service.)</para>
               </listitem>
 
               <listitem>
                 <para>Back in the first terminal and still in the samples
-                directory, to start a simple client example just type:<screen>make run16</screen></para>
+                directory, to start a simple client example just type:
+                <screen>make run16</screen></para>
 
                 <para>if you're on a Java 6 system; on a Java 5 system, run
                 <computeroutput>make run15</computeroutput> instead.</para>
@@ -714,11 +719,12 @@
           objects need to be created, as can be seen in the
           <computeroutput>clienttest</computeroutput> constructor:<orderedlist>
               <listitem>
-                <para>An instance of <xref linkend="IWebsessionManager"
-                xreflabel="IWebsessionManager" />, which is an interface
-                provided by the web service to manage "web sessions" -- that
-                is, stateful connections to the web service with persistent
-                objects upon which methods can be invoked.</para>
+                <para>An instance of
+                <link linkend="IWebsessionManager">IWebsessionManager</link>,
+                which is an interface provided by the web service to manage
+                "web sessions" -- that is, stateful connections to the web
+                service with persistent objects upon which methods can be
+                invoked.</para>
 
                 <para>In the OOWS for JAX-WS, the IWebsessionManager class
                 must be constructed explicitly, and a URL must be provided in
@@ -730,22 +736,21 @@
                 <para>The port number, by default 18083, must match the port
                 number given to the
                 <computeroutput>vboxwebsrv</computeroutput> command line; see
-                <xref linkend="vboxwebsrv-ref" />.</para>
+                <xref linkend="vboxwebsrv-ref"/>.</para>
               </listitem>
 
               <listitem>
-                <para>After that, the code calls <xref
-                linkend="IWebsessionManager__logon"
-                xreflabel="IWebsessionManager::logon()" />, which is the first
-                call that actually communicates with the server. This
-                authenticates the client with the web service and returns an
-                instance of <xref linkend="IVirtualBox"
-                xreflabel="IVirtualBox" />, the most fundamental interface of
-                the VirtualBox web service, from which all other functionality
-                can be derived.</para>
+                <para>After that, the code calls
+                <link linkend="IWebsessionManager__logon">IWebsessionManager::logon()</link>,
+                which is the first call that actually communicates with the
+                server. This authenticates the client with the web service and
+                returns an instance of
+                <link linkend="IVirtualBox">IVirtualBox</link>,
+                the most fundamental interface of the VirtualBox web service,
+                from which all other functionality can be derived.</para>
 
                 <para>If logon doesn't work, please take another look at <xref
-                linkend="websrv_authenticate" />.</para>
+                linkend="websrv_authenticate"/>.</para>
               </listitem>
             </orderedlist></para>
         </sect3>
@@ -755,10 +760,10 @@
 
           <para>The current OOWS for JAX-WS has certain memory management
           related limitations. When you no longer need an object, call its
-          <xref linkend="IManagedObjectRef__release"
-          xreflabel="IManagedObjectRef::release()" /> method explicitly, which
+          <link linkend="IManagedObjectRef__release">IManagedObjectRef::release()</link>
+          method explicitly, which
           frees appropriate managed reference, as is required by the raw
-          web service; see <xref linkend="managed-object-references" /> for
+          web service; see <xref linkend="managed-object-references"/> for
           details. This limitation may be reconsidered in a future version of
           the VirtualBox SDK.</para>
         </sect3>
@@ -769,13 +774,13 @@
 
         <para>VirtualBox comes with two flavors of a Python API: one for web
         service, discussed here, and one for the COM/XPCOM API discussed in
-        <xref linkend="pycom" />. The client code is mostly similar, except
+        <xref linkend="pycom"/>. The client code is mostly similar, except
         for the initialization part, so it is up to the application developer
         to choose the appropriate technology. Moreover, a common Python glue
         layer exists, abstracting out concrete platform access details, see
-        <xref linkend="glue-python" />.</para>
+        <xref linkend="glue-python"/>.</para>
 
-        <para>As indicated in <xref linkend="webservice-or-com" />, the
+        <para>As indicated in <xref linkend="webservice-or-com"/>, the
         COM/XPCOM API gives better performance without the SOAP overhead, and
         does not require a web server to be running. On the other hand, the
         COM/XPCOM Python API requires a suitable Python bridge for your Python
@@ -784,14 +789,16 @@
             <para>On On Mac OS X only the Python versions bundled with the OS
             are officially supported. This means Python 2.3 for 10.4, Python
             2.5 for 10.5 and Python 2.5 and 2.6 for 10.6.</para>
-          </footnote>). On Windows, you can use the Main API from Python if the Win32 extensions
-          package for Python<footnote>
+          </footnote>). On Windows, you can use the Main API from Python if the
+          Win32 extensions package for Python<footnote>
             <para>See <ulink
             url="http://sourceforge.net/project/showfiles.php?group_id=78018">http://sourceforge.net/project/showfiles.php?group_id=78018</ulink>.</para>
-          </footnote> is installed. Version of Python Win32 extensions earlier than 2.16 are known to have bugs,
-          leading to issues with VirtualBox Python bindings, and also some early builds of Python 2.5 for Windows have issues with
-          reporting platform name on some Windows versions, so please make sure to use latest available Python
-          and Win32 extensions.</para>
+          </footnote> is installed. Version of Python Win32 extensions earlier
+          than 2.16 are known to have bugs, leading to issues with VirtualBox
+          Python bindings, and also some early builds of Python 2.5 for Windows
+          have issues with reporting platform name on some Windows versions, so
+          please make sure to use latest available Python and Win32
+          extensions.</para>
 
         <para>The VirtualBox OOWS for Python relies on the Python ZSI SOAP
         implementation (see <ulink
@@ -812,13 +819,15 @@
         contains the glue layer for all target platforms (i.e. XPCOM, MSCOM
         and web services).</para>
 
-        <para>To start the shell, perform the following commands: <screen>/opt/VirtualBox/vboxwebsrv -t 0
+        <para>To start the shell, perform the following commands:
+        <screen>/opt/VirtualBox/vboxwebsrv -t 0
             # start web service with object autocollection disabled
 export VBOX_PROGRAM_PATH=/opt/VirtualBox
             # your VirtualBox installation directory
 export VBOX_SDK_PATH=/home/youruser/vbox-sdk
             # where you've extracted the SDK
-./vboxshell.py -w        </screen>See <xref linkend="vboxshell" /> for more
+./vboxshell.py -w        </screen>
+        See <xref linkend="vboxshell"/> for more
         details on the shell's functionality. For you, as a VirtualBox
         application developer, the vboxshell sample could be interesting as an
         example of how to write code targeting both local and remote cases
@@ -850,9 +859,9 @@ export VBOX_SDK_PATH=/home/youruser/vbox-sdk
       previous chapter.</para>
 
       <para>Generally, when reading the documentation in <xref
-      linkend="sdkref_classes" /> and <xref linkend="sdkref_enums" />, due to
+      linkend="sdkref_classes"/> and <xref linkend="sdkref_enums"/>, due to
       the limitations of SOAP and WSDL lined out in <xref
-      linkend="rawws-conventions" />, please have the following notes in
+      linkend="rawws-conventions"/>, please have the following notes in
       mind:</para>
 
       <para><orderedlist>
@@ -863,9 +872,9 @@ export VBOX_SDK_PATH=/home/youruser/vbox-sdk
             listed in the documentation). So when the documentation says that
             the <computeroutput>IVirtualBox</computeroutput> interface
             supports the <computeroutput>createMachine()</computeroutput>
-            method (see <xref linkend="IVirtualBox__createMachine"
-            xreflabel="IVirtualBox::createMachine()" />), the web service
-            operation is
+            method (see
+            <link linkend="IVirtualBox__createMachine">IVirtualBox::createMachine()</link>),
+            the web service operation is
             <computeroutput>IVirtualBox_createMachine(...)</computeroutput>,
             and a managed object reference to an
             <computeroutput>IVirtualBox</computeroutput> object must be passed
@@ -923,7 +932,8 @@ export VBOX_SDK_PATH=/home/youruser/vbox-sdk
 
             <listitem>
               <para>Open a terminal in your working directory. Execute the
-              following command:<screen> java org.apache.axis.wsdl.WSDL2Java /path/to/vboxwebService.wsdl</screen></para>
+              following command:
+              <screen>java org.apache.axis.wsdl.WSDL2Java /path/to/vboxwebService.wsdl</screen></para>
 
               <para>The <computeroutput>vboxwebService.wsdl</computeroutput>
               file should be located in the
@@ -932,7 +942,8 @@ export VBOX_SDK_PATH=/home/youruser/vbox-sdk
 
               <para>If this fails, your Apache Axis may not be located on your
               system classpath, and you may have to adjust the CLASSPATH
-              environment variable. Something like this:<screen>export CLASSPATH="/path-to-axis-1_4/lib/*":$CLASSPATH</screen></para>
+              environment variable. Something like this:
+              <screen>export CLASSPATH="/path-to-axis-1_4/lib/*":$CLASSPATH</screen></para>
 
               <para>Use the directory where the Axis JAR files are located.
               Mind the quotes so that your shell passes the "*" character to
@@ -955,7 +966,8 @@ export VBOX_SDK_PATH=/home/youruser/vbox-sdk
 
             <listitem>
               <para>Next, compile the
-              <computeroutput>clienttest.java</computeroutput> source:<screen>javac clienttest.java </screen></para>
+              <computeroutput>clienttest.java</computeroutput>
+              source:<screen>javac clienttest.java </screen></para>
 
               <para>This should yield a "clienttest.class" file.</para>
             </listitem>
@@ -963,12 +975,13 @@ export VBOX_SDK_PATH=/home/youruser/vbox-sdk
             <listitem>
               <para>To start the VirtualBox web service, open a second
               terminal and change to the directory where the VirtualBox
-              executables are located. Then type:<screen>./vboxwebsrv -v</screen></para>
+              executables are located. Then type:
+              <screen>./vboxwebsrv -v</screen></para>
 
               <para>The web service now waits for connections and will run
               until you press Ctrl+C in this second terminal. The -v argument
               causes it to log all connections to the terminal. (See <xref
-              linkend="runvboxwebsrv" os="" /> for details on how to run the
+              linkend="runvboxwebsrv"/> for details on how to run the
               web service.)</para>
             </listitem>
 
@@ -1020,18 +1033,20 @@ export VBOX_SDK_PATH=/home/youruser/vbox-sdk
             <listitem>
               <para>To start the VirtualBox web service, open a second
               terminal and change to the directory where the VirtualBox
-              executables are located. Then type:<screen>./vboxwebsrv -v</screen></para>
+              executables are located. Then type:
+              <screen>./vboxwebsrv -v</screen></para>
 
               <para>The web service now waits for connections and will run
               until you press Ctrl+C in this second terminal. The -v argument
               causes it to log all connections to the terminal. (See <xref
-              linkend="runvboxwebsrv" os="" /> for details on how to run the
+              linkend="runvboxwebsrv"/> for details on how to run the
               web service.)</para>
             </listitem>
 
             <listitem>
               <para>In the first terminal with the Perl sample, run the
-              clienttest.pl script:<screen>perl -I ../lib clienttest.pl</screen></para>
+              clienttest.pl script:
+              <screen>perl -I ../lib clienttest.pl</screen></para>
             </listitem>
           </orderedlist></para>
       </sect2>
@@ -1042,7 +1057,7 @@ export VBOX_SDK_PATH=/home/youruser/vbox-sdk
         <para>If you use the raw web service, you need to keep a number of
         things in mind, or you will sooner or later run into issues that are
         not immediately obvious. By contrast, the object-oriented client-side
-        libraries described in <xref linkend="glue" /> take care of these
+        libraries described in <xref linkend="glue"/> take care of these
         things automatically and thus greatly simplify using the web
         service.</para>
 
@@ -1088,7 +1103,7 @@ export VBOX_SDK_PATH=/home/youruser/vbox-sdk
                 argument, representing the object upon which the underlying
                 method is invoked. (Managed object references are explained in
                 detail below; see <xref
-                linkend="managed-object-references" />.)</para>
+                linkend="managed-object-references"/>.)</para>
 
                 <para>So, when one would normally code, in the pseudo-code of
                 an object-oriented language, to invoke a method upon an
@@ -1103,13 +1118,13 @@ result = IMachine_getName(machine);</screen></para>
               <listitem>
                 <para>To make the web service stateful, and objects persistent
                 between method calls, the VirtualBox web service introduces a
-                <emphasis role="bold">session manager</emphasis> (by way of
-                the <xref linkend="IWebsessionManager"
-                xreflabel="IWebsessionManager" /> interface), which manages
-                object references. Any client wishing to interact with the web
-                service must first log on to the session manager and in turn
-                receives a managed object reference to an object that supports
-                the <xref linkend="IVirtualBox" xreflabel="IVirtualBox" />
+                <emphasis role="bold">session manager</emphasis> (by way of the
+                 <link linkend="IWebsessionManager">IWebsessionManager</link>
+                interface), which manages object references. Any client wishing
+                to interact with the web service must first log on to the
+                session manager and in turn receives a managed object reference
+                to an object that supports the
+                <link linkend="IVirtualBox">IVirtualBox</link>
                 interface (the basic interface in the Main API).</para>
               </listitem>
             </orderedlist></para>
@@ -1126,24 +1141,23 @@ result = IMachine_getName(machine);</screen></para>
           number of the VirtualBox web service (to be precise, the underlying
           Main API version number) looks like this:<orderedlist>
               <listitem>
-                <para>A client logs on to the web service by calling <xref
-                linkend="IWebsessionManager__logon"
-                xreflabel="IWebsessionManager::logon()" /> with a valid user
-                name and password. See <xref linkend="websrv_authenticate" />
+                <para>A client logs on to the web service by calling
+                <link linkend="IWebsessionManager__logon">IWebsessionManager::logon()</link>
+                with a valid user name and password. See
+                <xref linkend="websrv_authenticate"/>
                 for details about how authentication works.</para>
               </listitem>
 
               <listitem>
                 <para>On the server side,
                 <computeroutput>vboxwebsrv</computeroutput> creates a session,
-                which persists until the client calls <xref
-                linkend="IWebsessionManager__logoff"
-                xreflabel="IWebsessionManager::logoff()" /> or the session
-                times out after a configurable period of inactivity (see <xref
-                linkend="vboxwebsrv-ref" />).</para>
+                which persists until the client calls
+                <link linkend="IWebsessionManager__logoff">IWebsessionManager::logoff()</link>
+                or the session times out after a configurable period of
+                inactivity (see <xref linkend="vboxwebsrv-ref"/>).</para>
 
                 <para>For the new session, the web service creates an instance
-                of <xref linkend="IVirtualBox" xreflabel="IVirtualBox" />.
+                of <link linkend="IVirtualBox">IVirtualBox</link>.
                 This interface is the most central one in the Main API and
                 allows access to all other interfaces, either through
                 attributes or method calls. For example, IVirtualBox contains
@@ -1162,10 +1176,9 @@ oVirtualBox = webservice.IWebsessionManager_logon("user", "pass");</screen>
                 <para>(The managed object reference "oVirtualBox" is just a
                 string consisting of digits and dashes. However, it is a
                 string with a meaning and will be checked by the web service.
-                For details, see below. As hinted above, <xref
-                linkend="IWebsessionManager__logon"
-                xreflabel="IWebsessionManager::logon()" /> is the
-                <emphasis>only</emphasis> operation provided by the web
+                For details, see below. As hinted above,
+                <link linkend="IWebsessionManager__logon">IWebsessionManager::logon()</link>
+                is the <emphasis>only</emphasis> operation provided by the web
                 service which does not take a managed object reference as the
                 first argument!)</para>
               </listitem>
@@ -1173,26 +1186,26 @@ oVirtualBox = webservice.IWebsessionManager_logon("user", "pass");</screen>
               <listitem>
                 <para>The VirtualBox Main API documentation says that the
                 <computeroutput>IVirtualBox</computeroutput> interface has a
-                <xref linkend="IVirtualBox__version" xreflabel="version" />
+                <link linkend="IVirtualBox__version">version</link>
                 attribute, which is a string. For each attribute, there is a
                 "get" and a "set" method in COM, which maps to according
                 operations in the web service. So, to retrieve the "version"
                 attribute of this <computeroutput>IVirtualBox</computeroutput>
-                object, the web service client does this:<screen>string version;
+                object, the web service client does this:
+                <screen>string version;
 version = webservice.IVirtualBox_getVersion(oVirtualBox);
 
 print version;</screen></para>
 
                 <para>And it will print
-                "$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD".</para>
+                "@VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@".</para>
               </listitem>
 
               <listitem>
-                <para>The web service client calls <xref
-                linkend="IWebsessionManager__logoff"
-                xreflabel="IWebsessionManager::logoff()" /> with the
-                VirtualBox managed object reference. This will clean up all
-                allocated resources.</para>
+                <para>The web service client calls
+                <link linkend="IWebsessionManager__logoff">IWebsessionManager::logoff()</link>
+                with the VirtualBox managed object reference. This will clean
+                up all allocated resources.</para>
               </listitem>
             </orderedlist></para>
         </sect3>
@@ -1211,21 +1224,19 @@ print version;</screen></para>
           <para>Managed object references are created in two
           situations:<orderedlist>
               <listitem>
-                <para>When a client logs on, by calling <xref
-                linkend="IWebsessionManager__logon"
-                xreflabel="IWebsessionManager::logon()" />.</para>
+                <para>When a client logs on, by calling
+                <link linkend="IWebsessionManager__logon">IWebsessionManager::logon()</link>.</para>
 
                 <para>Upon logon, the websession manager creates one instance
-                of <xref linkend="IVirtualBox" xreflabel="IVirtualBox" />,
+                of <link linkend="IVirtualBox">IVirtualBox</link>,
                 which can be used for directly performing calls to its
                 methods, or used as a parameter for calling some methods of
-                <xref linkend="IWebsessionManager" xreflabel="IWebsessionManager" />.
-                Creating Main API session objects is performed using <xref
-                linkend="IWebsessionManager__getSessionObject"
-                xreflabel="IWebsessionManager::getSessionObject()" />.</para>
+                <link linkend="IWebsessionManager">IWebsessionManager</link>.
+                Creating Main API session objects is performed using
+                <link linkend="IWebsessionManager__getSessionObject">IWebsessionManager::getSessionObject()</link>.</para>
 
-                <para>(Technically, there is always only one <xref
-                linkend="IVirtualBox" xreflabel="IVirtualBox" /> object, which
+                <para>(Technically, there is always only one
+                <link linkend="IVirtualBox">IVirtualBox</link> object, which
                 is shared between all websessions and clients, as it is a COM
                 singleton. However, each session receives its own managed
                 object reference to it.)</para>
@@ -1235,9 +1246,10 @@ print version;</screen></para>
                 <para>Whenever a web service clients invokes an operation
                 whose COM implementation creates COM objects.</para>
 
-                <para>For example, <xref linkend="IVirtualBox__createMachine"
-                xreflabel="IVirtualBox::createMachine()" /> creates a new
-                instance of <xref linkend="IMachine" xreflabel="IMachine" />;
+                <para>For example,
+                <link linkend="IVirtualBox__createMachine">IVirtualBox::createMachine()</link>
+                creates a new instance of
+                <link linkend="IMachine">IMachine</link>;
                 the COM object returned by the COM method call is then wrapped
                 into a managed object reference by the web server, and this
                 reference is returned to the web service client.</para>
@@ -1254,9 +1266,9 @@ print version;</screen></para>
           the objects of another.</para>
 
           <para>Managed object references are not destroyed automatically and
-          must be released by explicitly calling <xref
-          linkend="IManagedObjectRef__release"
-          xreflabel="IManagedObjectRef::release()" />. This is important, as
+          must be released by explicitly calling
+          <link linkend="IManagedObjectRef__release">IManagedObjectRef::release()</link>.
+          This is important, as
           otherwise hundreds or thousands of managed object references (and
           corresponding COM objects, which can consume much more memory!) can
           pile up in the web service process and eventually cause it to deny
@@ -1268,13 +1280,12 @@ print version;</screen></para>
           clean up after the managed object references that are returned to
           them.</para>
 
-          <para>When a web service client calls <xref
-          linkend="IWebsessionManager__logoff"
-          xreflabel="IWebsessionManager::logoff()" />, all managed object
-          references created during the session are automatically freed. For
-          short-lived sessions that do not create a lot of objects, logging
-          off may therefore be sufficient, although it is certainly not "best
-          practice".</para>
+          <para>When a web service client calls
+          <link linkend="IWebsessionManager__logoff">IWebsessionManager::logoff()</link>,
+          all managed object references created during the session are
+          automatically freed. For short-lived sessions that do not create a
+          lot of objects, logging off may therefore be sufficient, although it
+          is certainly not "best practice".</para>
         </sect3>
 
         <sect3>
@@ -1320,8 +1331,8 @@ print version;</screen></para>
             allow for writing something like this (in pseudo-C++ code):</para>
 
             <para><screen>webServiceClass service("localhost", 18083); // server and port
-string result = service.SayHello("Peter");  // invoke remote procedure</screen>and
-            would, for these two pseudo-lines, automatically perform these
+string result = service.SayHello("Peter");  // invoke remote procedure</screen>
+            and would, for these two pseudo-lines, automatically perform these
             steps:</para>
 
             <para><orderedlist>
@@ -1383,7 +1394,7 @@ string result = service.SayHello("Peter");  // invoke remote procedure</screen>a
             support for parsing WSDL files and somehow integrating the remote
             procedure calls into the native language syntax -- for example,
             like in the Java sample shown in <xref
-            linkend="webservice-java-sample" />.</para>
+            linkend="webservice-java-sample"/>.</para>
 
             <para>For details about how programming languages support web
             services, please refer to the documentation that comes with the
@@ -1400,8 +1411,8 @@ string result = service.SayHello("Peter");  // invoke remote procedure</screen>a
               <listitem>
                 <para>For <emphasis role="bold">Java, </emphasis> there are
                 several implementations already described in this document
-                (see <xref linkend="glue-jax-ws" /> and <xref
-                linkend="webservice-java-sample" />).</para>
+                (see <xref linkend="glue-jax-ws"/> and <xref
+                linkend="webservice-java-sample"/>).</para>
               </listitem>
 
               <listitem>
@@ -1411,10 +1422,12 @@ string result = service.SayHello("Peter");  // invoke remote procedure</screen>a
                 to turn any WSDL file into a Perl package that you can import.
                 (You can also import any WSDL file "live" by having it parsed
                 every time the script runs, but that can take a while.) You
-                can then code (again, assuming the above example):<screen>my $result = servicename->sayHello("Peter");</screen></para>
+                can then code (again, assuming the above example):
+                <screen>my $result = servicename->sayHello("Peter");</screen>
+                </para>
 
                 <para>A sample that uses SOAP::Lite was described in <xref
-                linkend="raw-webservice-perl" />.</para>
+                linkend="raw-webservice-perl"/>.</para>
               </listitem>
             </orderedlist>
           </sect4>
@@ -1532,7 +1545,8 @@ progress.waitForCompletion(-1)
 mgr.closeMachineSession(session)
         </screen>
         <para>
-          Following code will print all registered machines and their log folders
+          Following code will print all registered machines and their log
+          folders
         </para>
         <screen>from vboxapi import VirtualBoxManager
 mgr = VirtualBoxManager(None, None)
@@ -1759,8 +1773,9 @@ print "Machine '%s' logs in '%s'" %(m.name, m.logFolder)
           call.</para>
 
           <para>The sample program <computeroutput>tstCAPIGlue</computeroutput>
-          can be built using the provided <computeroutput>Makefile</computeroutput>
-          and can be run without arguments.</para>
+          can be built using the provided
+          <computeroutput>Makefile</computeroutput> and can be run without
+          arguments.</para>
 
           <para>It uses the VBoxCAPIGlue library (source code is in directory
           <computeroutput>sdk/bindings/c/glue</computeroutput>, to be used in
@@ -1787,7 +1802,8 @@ print "Machine '%s' logs in '%s'" %(m.name, m.logFolder)
           to be initialized before it can be used. The
           <computeroutput>VBoxCAPI_v4_3.h</computeroutput> header provides the
           interface to the C binding, but you can alternatively and more
-          conveniently also include <computeroutput>VBoxCAPIGlue.h</computeroutput>,
+          conveniently also include
+          <computeroutput>VBoxCAPIGlue.h</computeroutput>,
           as this avoids the VirtualBox version dependent header file name and
           makes sure the global variable <code>g_pVBoxFuncs</code> contains a
           pointer to the structure which contains the helper function pointers.
@@ -1876,8 +1892,10 @@ if (!vboxclient)
           <computeroutput>set_</computeroutput> method exists. Let's apply
           these rules to get the <computeroutput>IVirtualBox</computeroutput>
           reference, an <computeroutput>ISession</computeroutput> instance
-          reference and read the <xref linkend="IVirtualBox__revision"
-          xreflabel="IVirtualBox::revision" /> attribute:<screen>rc = IVirtualBoxClient_get_VirtualBox(vboxclient, &vbox);
+          reference and read the
+          <link linkend="IVirtualBox__revision">IVirtualBox::revision</link>
+          attribute:
+          <screen>rc = IVirtualBoxClient_get_VirtualBox(vboxclient, &vbox);
 if (FAILED(rc) || !vbox)
 {
     PrintErrorInfo(argv[0], "FATAL: could not get VirtualBox reference", rc);
@@ -1901,7 +1919,8 @@ if (SUCCEEDED(rc))
           <code>_</code>as the separator).</para>
 
           <para>So far only attribute getters were illustrated, but generic
-          method calls are straightforward, too:<screen>IMachine *machine = NULL;
+          method calls are straightforward, too:
+          <screen>IMachine *machine = NULL;
 BSTR vmname = ...;
 ...
 /*
@@ -1910,10 +1929,11 @@ BSTR vmname = ...;
 rc = IVirtualBox_FindMachine(vbox, vmname, &machine);</screen></para>
 
           <para>As a more complicated example of a method invocation, let's
-          call <xref linkend="IMachine__launchVMProcess"
-          xreflabel="IMachine::launchVMProcess" /> which returns an
-          IProgress object. Note again that the method name is
-          capitalized:<screen>IProgress *progress;
+          call
+          <link linkend="IMachine__launchVMProcess">IMachine::launchVMProcess</link>
+          which returns an IProgress object. Note again that the method name is
+          capitalized:
+          <screen>IProgress *progress;
 ...
 rc = IMachine_LaunchVMProcess(
     machine,       /* this  */
@@ -1924,7 +1944,7 @@ rc = IMachine_LaunchVMProcess(
 );</screen></para>
 
           <para>All objects with their methods and attributes are documented
-          in <xref linkend="sdkref_classes" />.</para>
+          in <xref linkend="sdkref_classes"/>.</para>
         </sect3>
 
         <sect3 id="c-string-handling">
@@ -1940,7 +1960,8 @@ rc = IMachine_LaunchVMProcess(
           <computeroutput>CBSTR</computeroutput>), which is an array type,
           represented by a pointer to the start of the zero-terminated string.
           There are functions for converting between UTF-8 and UTF-16 strings
-          available through <code>g_pVBoxFuncs</code>:<screen>int (*pfnUtf16ToUtf8)(CBSTR pwszString, char **ppszString);
+          available through <code>g_pVBoxFuncs</code>:
+          <screen>int (*pfnUtf16ToUtf8)(CBSTR pwszString, char **ppszString);
 int (*pfnUtf8ToUtf16)(const char *pszString, BSTR *ppwszString);</screen></para>
 
           <para>The ownership of a string determines who is responsible for
@@ -1962,7 +1983,8 @@ int (*pfnUtf8ToUtf16)(const char *pszString, BSTR *ppwszString);</screen></para>
 
           <para>Passing arrays as input parameters to API methods is usually
           done by the following sequence, calling a hypothetical
-          <code>IArrayDemo_PassArray</code> API method:<screen>static const ULONG aElements[] = { 1, 2, 3, 4 };
+          <code>IArrayDemo_PassArray</code> API method:
+          <screen>static const ULONG aElements[] = { 1, 2, 3, 4 };
 ULONG cElements = sizeof(aElements) / sizeof(aElements[0]);
 SAFEARRAY *psa = NULL;
 psa = g_pVBoxFuncs->pfnSafeArrayCreateVector(VT_I4, 0, cElements);
@@ -1972,7 +1994,8 @@ g_pVBoxFuncs->pfnSafeArrayDestroy(psa);</screen></para>
 
           <para>Likewise, getting arrays results from output parameters is done
           using helper functions which manage memory allocations as part of
-          their other functionality:<screen>SAFEARRAY *psa = g_pVBoxFuncs->pfnSafeArrayOutParamAlloc();
+          their other functionality:
+          <screen>SAFEARRAY *psa = g_pVBoxFuncs->pfnSafeArrayOutParamAlloc();
 ULONG *pData;
 ULONG cElements;
 IArrayDemo_ReturnArray(pThis, ComSafeArrayAsOutTypeParam(psa, ULONG));
@@ -1984,7 +2007,8 @@ g_pVBoxFuncs->pfnSafeArrayDestroy(psa);</screen></para>
           manage the reference counting correctly. The following code snippet
           gets the list of VMs, and passes the first IMachine reference to
           another API function (assuming that there is at least one element
-          in the array, to simplify the example):<screen>SAFEARRAY psa = g_pVBoxFuncs->pfnSafeArrayOutParamAlloc();
+          in the array, to simplify the example):
+          <screen>SAFEARRAY psa = g_pVBoxFuncs->pfnSafeArrayOutParamAlloc();
 IMachine **machines = NULL;
 ULONG machineCnt = 0;
 ULONG i;
@@ -2039,10 +2063,11 @@ free(machines);</screen></para>
 
           <para>The actual event handler implementation is quite tedious, as
           it has to implement a complete API interface. Especially on Windows
-          it is a lot of work to implement the complicated <code>IDispatch</code>
-          interface, requiring to load COM type information and using it
-          in the <code>IDispatch</code> method implementation. Overall this is
-          quite tedious compared to passive event handling.</para>
+          it is a lot of work to implement the complicated
+          <code>IDispatch</code> interface, requiring to load COM type
+          information and using it in the <code>IDispatch</code> method
+          implementation. Overall this is quite tedious compared to passive
+          event handling.</para>
 
           <para>Passive event handling uses a similar event loop structure,
           which requires calling the following function in a loop, and
@@ -2059,15 +2084,16 @@ free(machines);</screen></para>
           if the event at hand is vetoable or not.</para>
 
           <para>The general event handling concepts are described in the API
-          specification (see <xref linkend="events" />), including how to
+          specification (see <xref linkend="events"/>), including how to
           aggregate multiple event sources for processing in one event loop.
           As mentioned, the sample illustrates the practical aspects of how to
           use both types of event handling, active and passive, from a C
           application. Additional hints are in the comments documenting
-          the helper methods in <computeroutput>VBoxCAPI_v4_3.h</computeroutput>.
-          The code complexity of active event handling (and its inherenly
-          platform/compiler specific aspects) should be motivation to use
-          passive event handling whereever possible.</para>
+          the helper methods in
+          <computeroutput>VBoxCAPI_v4_3.h</computeroutput>. The code complexity
+          of active event handling (and its inherenly platform/compiler
+          specific aspects) should be motivation to use passive event handling
+          whereever possible.</para>
         </sect3>
 
         <sect3 id="c-uninitialization">
@@ -2174,8 +2200,9 @@ program: program.o VBoxCAPICGlue.o VirtualBox_i.o
           for the VirtualBox API, making sure they are not replicated endlessly
           if the code refers to them frequently.</para>
 
-          <para>The C API client code should include <computeroutput>VBoxCAPIGlue.h</computeroutput>
-          instead of <computeroutput>VBoxXPCOMCGlue.h</computeroutput> or
+          <para>The C API client code should include
+          <computeroutput>VBoxCAPIGlue.h</computeroutput> instead of
+          <computeroutput>VBoxXPCOMCGlue.h</computeroutput> or
           <computeroutput>VBoxCAPI_v4_3.h</computeroutput>, as this makes sure
           the correct macros and internal translations are selected.</para>
 
@@ -2194,7 +2221,7 @@ program: program.o VBoxCAPICGlue.o VirtualBox_i.o
           independent interface names <code>IUnknown</code> and
           <code>IErrorInfo</code> for the first two respectively. Event queue
           handling should be replaced by using the platform independent way
-          described in <xref linkend="c-eventhandling" />.</para>
+          described in <xref linkend="c-eventhandling"/>.</para>
 
           <para>Finally adjust the string and array handling to use the new
           helpers, as these make sure the code works without changes with
@@ -2238,31 +2265,36 @@ program: program.o VBoxCAPICGlue.o VirtualBox_i.o
       <title>Obtaining basic machine information. Reading attributes</title>
 
       <para>Any program using the Main API will first need access to the
-      global VirtualBox object (see <xref linkend="IVirtualBox"
-      xreflabel="IVirtualBox" />), from which all other functionality of the
-      API is derived. With the OOWS for JAX-WS, this is returned from the
-      <xref linkend="IWebsessionManager__logon"
-      xreflabel="IWebsessionManager::logon()" /> call.</para>
+      global VirtualBox object (see
+      <link linkend="IVirtualBox">IVirtualBox</link>), from which all other
+      functionality of the API is derived. With the OOWS for JAX-WS, this is
+      returned from the
+      <link linkend="IWebsessionManager__logon">IWebsessionManager::logon()</link>
+      call.</para>
 
       <para>To enumerate virtual machines, one would look at the "machines"
-      array attribute in the VirtualBox object (see <xref
-      linkend="IVirtualBox__machines" xreflabel="IVirtualBox::machines" />).
+      array attribute in the VirtualBox object (see
+      <link linkend="IVirtualBox__machines">IVirtualBox::machines</link>).
       This array contains all virtual machines currently registered with the
-      host, each of them being an instance of <xref linkend="IMachine"
-      xreflabel="IMachine" />. From each such instance, one can query
-      additional information, such as the UUID, the name, memory, operating
-      system and more by looking at the attributes; see the attributes list in
-      <xref linkend="IMachine" xreflabel="IMachine documentation" />.</para>
+      host, each of them being an instance of
+      <link linkend="IMachine">IMachine</link>.
+      From each such instance, one can query additional information, such as
+      the UUID, the name, memory, operating system and more by looking at the
+      attributes; see the attributes list in
+      <link linkend="IMachine">IMachine</link> documentation.</para>
 
       <para>As mentioned in the preceding chapters, depending on your
       programming environment, attributes are mapped to corresponding "get"
       and (if the attribute is not read-only) "set" methods. So when the
-      documentation says that IMachine has a "<xref linkend="IMachine__name"
-      xreflabel="name" />" attribute, this means you need to code something
-      like the following to get the machine's name:<screen>IMachine machine = ...;
-String name = machine.getName();</screen>Boolean attribute getters can
-      sometimes be called <computeroutput>isAttribute()</computeroutput> due
-      to JAX-WS naming conventions.</para>
+      documentation says that IMachine has a
+      "<link linkend="IMachine__name">name</link>" attribute, this means you
+      need to code something
+      like the following to get the machine's name:
+      <screen>IMachine machine = ...;
+String name = machine.getName();</screen>
+      Boolean attribute getters can sometimes be called
+      <computeroutput>isAttribute()</computeroutput> due to JAX-WS naming
+      conventions.</para>
     </sect1>
 
     <sect1>
@@ -2287,39 +2319,37 @@ String name = machine.getName();</screen>Boolean attribute getters can
       time, or start a machine at the same time.</para>
 
       <para>These requirements are implemented in the Main API by way of
-      "sessions", in particular, the <xref linkend="ISession"
-      xreflabel="ISession" /> interface. Each process which talks to
+      "sessions", in particular, the <link linkend="ISession">ISession</link>
+      interface. Each process which talks to
       VirtualBox needs its own instance of ISession. In the web service, you
-      can request the creation of such an object by calling <xref
-      linkend="IWebsessionManager__getSessionObject"
-      xreflabel="IWebsessionManager::getSessionObject()" />. More complex
-      management tasks might need multiple instances of ISession, and each call
-      returns a new one.</para>
+      can request the creation of such an object by calling
+      <link linkend="IWebsessionManager__getSessionObject">IWebsessionManager::getSessionObject()</link>.
+      More complex management tasks might need multiple instances of ISession,
+      and each call returns a new one.</para>
 
       <para>This session object must then be used like a mutex semaphore in
       common programming environments. Before you can change machine settings,
-      you must write-lock the machine by calling <xref
-      linkend="IMachine__lockMachine" xreflabel="IMachine::lockMachine()" />
+      you must write-lock the machine by calling
+      <link linkend="IMachine__lockMachine">IMachine::lockMachine()</link>
       with your process's session object.</para>
 
-      <para>After the machine has been locked, the <xref
-      linkend="ISession__machine" xreflabel="ISession::machine" /> attribute
+      <para>After the machine has been locked, the
+      <link linkend="ISession__machine">ISession::machine</link> attribute
       contains a copy of the original IMachine object upon which the session
       was opened, but this copy is "mutable": you can invoke "set" methods on
       it.</para>
 
-      <para>When done making the changes to the machine, you must call <xref
-      linkend="IMachine__saveSettings"
-      xreflabel="IMachine::saveSettings()" />, which will copy the changes you
-      have made from your "mutable" machine back to the real machine and write
-      them out to the machine settings XML file. This will make your changes
-      permanent.</para>
+      <para>When done making the changes to the machine, you must call
+      <link linkend="IMachine__saveSettings">IMachine::saveSettings()</link>,
+      which will copy the changes you have made from your "mutable" machine
+      back to the real machine and write them out to the machine settings XML
+      file. This will make your changes permanent.</para>
 
       <para>Finally, it is important to always unlock the machine again, by
-      calling <xref linkend="ISession__unlockMachine"
-      xreflabel="ISession::unlockMachine()" />. Otherwise, when the calling
-      process end, the machine will receive the "aborted" state, which can
-      lead to loss of data.</para>
+      calling
+      <link linkend="ISession__unlockMachine">ISession::unlockMachine()</link>.
+      Otherwise, when the calling process end, the machine will receive the
+      "aborted" state, which can lead to loss of data.</para>
 
       <para>So, as an example, the sequence to change a machine's memory to
       1024 MB is something like this:<screen>IWebsessionManager mgr ...;
@@ -2337,18 +2367,18 @@ session.unlockMachine();</screen></para>
     <sect1>
       <title>Launching virtual machines</title>
 
-      <para>To launch a virtual machine, you call <xref
-      linkend="IMachine__launchVMProcess"
-      xreflabel="IMachine::launchVMProcess()" />. In doing so, the caller
-      instructs the VirtualBox engine to start a new process with the virtual
-      machine in it, since to the host, each virtual machine looks like a
-      single process, even if it has hundreds of its own processes inside.
-      (This new VM process in turn obtains a write lock on the machine, as
-      described above, to prevent conflicting changes from other processes;
-      this is why opening another session will fail while the VM is
-      running.)</para>
-
-      <para>Starting a machine looks something like this:<screen>IWebsessionManager mgr ...;
+      <para>To launch a virtual machine, you call
+      <link linkend="IMachine__launchVMProcess">IMachine::launchVMProcess()</link>.
+      In doing so, the caller instructs the VirtualBox engine to start a new
+      process with the virtual machine in it, since to the host, each virtual
+      machine looks like single process, even if it has hundreds of its own
+      processes inside. (This new VM process in turn obtains a write lock on
+      the machine, as described above, to prevent conflicting changes from
+      other processes; this is why opening another session will fail while the
+      VM is running.)</para>
+
+      <para>Starting a machine looks something like this:
+      <screen>IWebsessionManager mgr ...;
 IVirtualBox vbox = mgr.logon(user, pass);
 ...
 IMachine machine = ...;  // read-only machine
@@ -2362,8 +2392,8 @@ if (prog.getResultCode() != 0)  // check success
 
       <para>The caller's session object can then be used as a sort of remote
       control to the VM process that was launched. It contains a "console"
-      object (see <xref linkend="ISession__console"
-      xreflabel="ISession::console" />) with which the VM can be paused,
+      object (see <link linkend="ISession__console">ISession::console</link>)
+      with which the VM can be paused,
       stopped, snapshotted or other things.</para>
     </sect1>
 
@@ -2372,17 +2402,17 @@ if (prog.getResultCode() != 0)  // check success
 
       <para>In VirtualBox, "events" provide a uniform mechanism to register
       for and consume specific events. A VirtualBox client can register an
-      "event listener" (represented by the <xref linkend="IEventListener"
-      xreflabel="IEventListener" /> interface), which will then get notified
-      by the server when an event (represented by the <xref linkend="IEvent"
-      xreflabel="IEvent" /> interface) happens.</para>
+      "event listener" (represented by the
+      <link linkend="IEventListener">IEventListener</link> interface), which
+      will then get notified by the server when an event (represented by the
+      <link linkend="IEvent">IEvent</link> interface) happens.</para>
 
       <para>The IEvent interface is an abstract parent interface for all
       events that can occur in VirtualBox. The actual events that the server
-      sends out are then of one of the specific subclasses, for example <xref
-      linkend="IMachineStateChangedEvent"
-      xreflabel="IMachineStateChangedEvent" /> or <xref
-      linkend="IMediumChangedEvent" xreflabel="IMediumChangedEvent" />.</para>
+      sends out are then of one of the specific subclasses, for example
+      <link linkend="IMachineStateChangedEvent">IMachineStateChangedEvent</link>
+      or
+      <link linkend="IMediumChangedEvent">IMediumChangedEvent</link>.</para>
 
       <para>As an example, the VirtualBox GUI waits for machine events and can
       thus update its display when the machine state changes or machine
@@ -2450,10 +2480,14 @@ es.unregisterListener(listener); </screen></para>
     three COM/XPCOM/WS styles of the API.</para>
 
     <para>You can easily extend this shell with your own commands. Create a
-    subdirectory named <computeroutput>.config/VirtualBox/shexts</computeroutput>
-    below your home directory (respectively <computeroutput>.VirtualBox/shexts</computeroutput> on a Windows system and <computeroutput>Library/VirtualBox/shexts</computeroutput> on OS X) and put a Python file implementing your shell
-    extension commands in this directory. This file must contain an array
-    named <computeroutput>commands</computeroutput> containing your command
+    subdirectory named
+    <computeroutput>.config/VirtualBox/shexts</computeroutput> below your home
+    directory (respectively <computeroutput>.VirtualBox/shexts</computeroutput>
+    on a Windows system and
+    <computeroutput>Library/VirtualBox/shexts</computeroutput> on OS X) and put
+    a Python file implementing your shell extension commands in this directory.
+    This file must contain an array named
+    <computeroutput>commands</computeroutput> containing your command
     definitions: <screen>
         commands = {
         'cmd1': ['Command cmd1 help', cmd1],
@@ -2507,7 +2541,8 @@ es.unregisterListener(listener); </screen></para>
     already running. Your new command will now be available.</para>
   </chapter>
 
-  <!--$VIRTUALBOX_MAIN_API_REFERENCE-->
+  <xi:include href="SDKRef_apiref.xml" xpointer="xpointer(/book/*)"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <chapter id="hgcm">
     <title>Host-Guest Communication Manager</title>
@@ -2540,8 +2575,8 @@ es.unregisterListener(listener); </screen></para>
       guest and the host. The guest always acts as an initiator of requests. A
       request is constructed in the guest physical memory, which must be
       locked by the guest. The physical address is passed to the VMM device
-      using a 32 bit <computeroutput>out edx, eax</computeroutput>
-      instruction. The physical memory must be allocated below 4GB by 64 bit
+      using a 32-bit <computeroutput>out edx, eax</computeroutput>
+      instruction. The physical memory must be allocated below 4GB by 64-bit
       guests.</para>
 
       <para>The host parses the request header and data and queues the request
@@ -2631,7 +2666,7 @@ es.unregisterListener(listener); </screen></para>
           </table> <note>
             <itemizedlist>
               <listitem>
-                <para>All fields are 32 bit.</para>
+                <para>All fields are 32-bit.</para>
               </listitem>
 
               <listitem>
@@ -2674,7 +2709,7 @@ es.unregisterListener(listener); </screen></para>
                   <entry>VMMDevReq_HGCMCall32
                   (<computeroutput>62</computeroutput>)</entry>
 
-                  <entry>Call a HGCM function using the 32 bit
+                  <entry>Call a HGCM function using the 32-bit
                   interface.</entry>
                 </row>
 
@@ -2682,7 +2717,7 @@ es.unregisterListener(listener); </screen></para>
                   <entry>VMMDevReq_HGCMCall64
                   (<computeroutput>63</computeroutput>)</entry>
 
-                  <entry>Call a HGCM function using the 64 bit
+                  <entry>Call a HGCM function using the 64-bit
                   interface.</entry>
                 </row>
 
@@ -2769,7 +2804,7 @@ es.unregisterListener(listener); </screen></para>
                   <entry>clientId</entry>
 
                   <entry>The client identifier assigned to the connecting
-                  client by the HGCM subsystem (32 bit).</entry>
+                  client by the HGCM subsystem (32-bit).</entry>
                 </row>
               </tbody>
             </tgroup>
@@ -2857,7 +2892,7 @@ es.unregisterListener(listener); </screen></para>
                   <entry>clientId</entry>
 
                   <entry>The client identifier previously returned by the
-                  connect request (32 bit).</entry>
+                  connect request (32-bit).</entry>
                 </row>
               </tbody>
             </tgroup>
@@ -2867,8 +2902,8 @@ es.unregisterListener(listener); </screen></para>
       <sect2>
         <title>Call32 and Call64</title>
 
-        <para>Calls the HGCM service entry point (VMMDevHGCMCall) using 32 bit
-        or 64 bit addresses: <table>
+        <para>Calls the HGCM service entry point (VMMDevHGCMCall) using 32-bit
+        or 64-bit addresses: <table>
             <title>Call request</title>
 
             <tgroup cols="2">
@@ -2893,7 +2928,7 @@ es.unregisterListener(listener); </screen></para>
                   <entry>clientId</entry>
 
                   <entry>The client identifier previously returned by the
-                  connect request (32 bit).</entry>
+                  connect request (32-bit).</entry>
                 </row>
 
                 <row>
@@ -2906,7 +2941,7 @@ es.unregisterListener(listener); </screen></para>
                 <row>
                   <entry>cParms</entry>
 
-                  <entry>The number of following parameters (32 bit). This
+                  <entry>The number of following parameters (32-bit). This
                   value is 0 if the function requires no parameters.</entry>
                 </row>
 
@@ -2921,9 +2956,9 @@ es.unregisterListener(listener); </screen></para>
             </tgroup>
           </table></para>
 
-        <para>The 32 bit parameter description (HGCMFunctionParameter32)
-        consists of 32 bit type field and 8 bytes of an opaque value, so 12
-        bytes in total. The 64 bit variant (HGCMFunctionParameter64) consists
+        <para>The 32-bit parameter description (HGCMFunctionParameter32)
+        consists of 32-bit type field and 8 bytes of an opaque value, so 12
+        bytes in total. The 64-bit variant (HGCMFunctionParameter64) consists
         of the type and 12 bytes of a value, so 16 bytes in total.</para>
 
         <para><table>
@@ -2941,26 +2976,26 @@ es.unregisterListener(listener); </screen></para>
                 <row>
                   <entry>VMMDevHGCMParmType_32bit (1)</entry>
 
-                  <entry>A 32 bit value.</entry>
+                  <entry>A 32-bit value.</entry>
                 </row>
 
                 <row>
                   <entry>VMMDevHGCMParmType_64bit (2)</entry>
 
-                  <entry>A 64 bit value.</entry>
+                  <entry>A 64-bit value.</entry>
                 </row>
 
                 <row>
                   <entry>VMMDevHGCMParmType_PhysAddr (3)</entry>
 
-                  <entry>A 32 bit size followed by a 32 bit or 64 bit guest
+                  <entry>A 32-bit size followed by a 32-bit or 64-bit guest
                   physical address.</entry>
                 </row>
 
                 <row>
                   <entry>VMMDevHGCMParmType_LinAddr (4)</entry>
 
-                  <entry>A 32 bit size followed by a 32 bit or 64 bit guest
+                  <entry>A 32-bit size followed by a 32-bit or 64-bit guest
                   linear address. The buffer is used both for guest to host
                   and for host to guest data.</entry>
                 </row>
@@ -3495,7 +3530,8 @@ extern "C" DECLCALLBACK(DECLEXPORT(int)) VBoxHGCMSvcLoad (VBOXHGCMSVCFNTABLE *pt
 
     <para>Since VirtualBox 4.2 it's possible to transfer files from host to the
     Linux guests by dragging files, directories or text from the host into the
-    guest's screen. This is called <emphasis>drag'n drop (DnD)</emphasis>.</para>
+    guest's screen. This is called <emphasis>drag'n drop
+    (DnD)</emphasis>.</para>
 
     <para>In version 5.0 support for Windows guests has been added, as well as
     the ability to transfer data the other way around, that is, from the guest
@@ -3516,64 +3552,68 @@ extern "C" DECLCALLBACK(DECLEXPORT(int)) VBoxHGCMSvcLoad (VBOXHGCMSVCFNTABLE *pt
       drag'n drop operation at least two sides needs to be involved, a
       <emphasis>source</emphasis> and a <emphasis>target</emphasis>:</para>
 
-      <para>The <emphasis>source</emphasis> is the side which provides the data,
-      e.g. is the origin of data. This data can be stored within the source directly
-      or can be retrieved on-demand by the source itself. Other interfaces don't
-      care where the data from this source actually came from.</para>
+      <para>The <emphasis>source</emphasis> is the side which provides the
+      data, e.g. is the origin of data. This data can be stored within the
+      source directly or can be retrieved on-demand by the source itself. Other
+      interfaces don't care where the data from this source actually came
+      from.</para>
 
       <para>The <emphasis>target</emphasis> on the other hand is the side which
       provides the source a visual representation where the user can drop the
-      data the source offers. This representation can be a window (or just a certain
-      part of it), for example.</para>
+      data the source offers. This representation can be a window (or just a
+      certain part of it), for example.</para>
 
       <para>The source and the target have abstract interfaces called
-      <xref linkend="IDnDSource" xreflabel="IDnDSource" /> and
-      <xref linkend="IDnDTarget" xreflabel="IDnDTarget" />. VirtualBox also
+      <link linkend="IDnDSource">IDnDSource</link> and
+      <link linkend="IDnDTarget">IDnDTarget</link>. VirtualBox also
       provides implementations of both interfaces, called
-      <xref linkend="IGuestDnDSource" xreflabel="IGuestDnDSource" /> and
-      <xref linkend="IGuestDnDTarget" xreflabel="IGuestDnDTarget" />. Both
+      <link linkend="IGuestDnDSource">IGuestDnDSource</link> and
+      <link linkend="IGuestDnDTarget">IGuestDnDTarget</link>. Both
       implementations are also used in the VirtualBox Manager frontend.</para>
     </sect1>
 
     <sect1>
       <title>Supported formats</title>
 
-      <para>As the target needs to perform specific actions depending on the data
-      the source provided, the target first needs to know what type of data it
-      actually is going to retrieve. It might be that the source offers data the
-      target cannot (or intentionally does not want to) support.</para>
+      <para>As the target needs to perform specific actions depending on the
+      data the source provided, the target first needs to know what type of
+      data it actually is going to retrieve. It might be that the source offers
+      data the target cannot (or intentionally does not want to)
+      support.</para>
 
       <para>VirtualBox handles those data types by providing so-called
-      <emphasis>MIME types</emphasis> -- these MIME types were originally defined
-      in <ulink url="https://tools.ietf.org/html/rfc2046">RFC 2046</ulink> and
+      <emphasis>MIME types</emphasis> -- these MIME types were originally
+      defined in
+      <ulink url="https://tools.ietf.org/html/rfc2046">RFC 2046</ulink> and
       are also called <emphasis>Content-types</emphasis>.
-      <xref linkend="IGuestDnDSource" xreflabel="IGuestDnDSource" /> and
-      <xref linkend="IGuestDnDTarget" xreflabel="IGuestDnDTarget" /> support
+      <link linkend="IGuestDnDSource">IGuestDnDSource</link> and
+      <link linkend="IGuestDnDTarget">IGuestDnDTarget</link> support
       the following MIME types by default:<itemizedlist>
           <listitem>
-            <para><emphasis role="bold">text/uri-list</emphasis> - A list of URIs
-            (Uniform Resource Identifier, see
+            <para><emphasis role="bold">text/uri-list</emphasis> - A list of
+            URIs (Uniform Resource Identifier, see
             <ulink url="https://tools.ietf.org/html/rfc3986">RFC 3986</ulink>)
-            pointing to the file and/or directory paths already transferred from
-            the source to the target.</para>
+            pointing to the file and/or directory paths already transferred
+            from the source to the target.</para>
           </listitem>
           <listitem>
             <para><emphasis role="bold">text/plain;charset=utf-8</emphasis> and
-            <emphasis role="bold">UTF8_STRING</emphasis> - text in UTF8 format.</para>
+            <emphasis role="bold">UTF8_STRING</emphasis> - text in UTF-8
+            format.</para>
           </listitem>
           <listitem>
             <para><emphasis role="bold">text/plain, TEXT</emphasis>
-            and <emphasis role="bold">STRING</emphasis> - plain ASCII text, depending
-            on the source's active ANSI page (if any).</para>
+            and <emphasis role="bold">STRING</emphasis> - plain ASCII text,
+            depending on the source's active ANSI page (if any).</para>
           </listitem>
         </itemizedlist>
       </para>
 
-      <para>If, for whatever reason, a certain default format should not be supported
-      or a new format should be registered,
-      <xref linkend="IDnDSource" xreflabel="IDnDSource" /> and
-      <xref linkend="IDnDTarget" xreflabel="IDnDTarget" /> have methods derived from
-      <xref linkend="IDnDBase" xreflabel="IDnDBase" /> which provide adding,
+      <para>If, for whatever reason, a certain default format should not be
+      supported or a new format should be registered,
+      <link linkend="IDnDSource">IDnDSource</link> and
+      <link linkend="IDnDTarget">IDnDTarget</link> have methods derived from
+      <link linkend="IDnDBase">IDnDBase</link> which provide adding,
       removing and enumerating specific formats.
       <note><para>Registering new or removing default formats on the guest side
       currently is not implemented.</para></note></para>
@@ -3737,9 +3777,8 @@ AuthResult AUTHCALL AuthEntry(
             <computeroutput>vboxjmscom.jar</computeroutput> must be in the
             class path.</para>
 
-            <para>Start your application like this: <programlisting>
- java -cp vboxjmscom.jar;c:\jacob\jacob.jar -Djava.library.path=c:\jacob MyProgram
-              </programlisting></para>
+            <para>Start your application like this:
+            <programlisting>java -cp vboxjmscom.jar;c:\jacob\jacob.jar -Djava.library.path=c:\jacob MyProgram</programlisting></para>
           </listitem>
 
           <listitem>
@@ -3800,6 +3839,28 @@ AuthResult AUTHCALL AuthEntry(
       <computeroutput>TestVBox.java</computeroutput>, shipped with the
       SDK. It contains exception handling and error printing code, which
       is important for reliable larger scale projects.</para>
+
+      <para>It is good practice in long-running API clients to process the
+      system events every now and then in the main thread (does not work
+      in other threads). As a rule of thumb it makes sense to process them
+      every few 100msec to every few seconds). This is done by
+      calling<programlisting>
+        mgr.waitForEvents(0);
+        </programlisting>
+      This avoids that a large number of system events accumulate, which can
+      need a significant amount of memory, and as they also play a role in
+      object cleanup it helps freeing additional memory in a timely manner
+      which is used by the API implementation itself. Java's garbage collection
+      approach already needs more memory due to the delayed freeing of memory
+      used by no longer accessible objects, and not processing the system
+      events exacerbates the memory usage. The
+      <computeroutput>TestVBox.java</computeroutput> example code sprinkles
+      such lines over the code to achieve the desired effect. In multi-threaded
+      applications it can be called from the main thread periodically.
+      Sometimes it's possible to use the non-zero timeout variant of the
+      method, which then waits the specified number of milliseconds for
+      events, processing them immediately as they arrive. It achieves better
+      runtime behavior than separate sleeping/processing.</para>
     </sect1>
   </chapter>
 
@@ -3862,47 +3923,47 @@ AuthResult AUTHCALL AuthEntry(
           <computeroutput>IConsole</computeroutput> to
           <computeroutput>IMachine</computeroutput>. This straightens out the
           logical placement of methods and was necessary to resolve a
-          long-standing issue, preventing 32 bit API clients from invoking
+          long-standing issue, preventing 32-bit API clients from invoking
           those operations in the case where no VM is running.
           <itemizedlist>
-            <listitem><xref linkend="IMachine__saveState"
-                xreflabel="IMachine::saveState()" /> replaces
-              <computeroutput>IConsole::saveState()</computeroutput>
+            <listitem><para><link linkend="IMachine__saveState">IMachine::saveState()</link>
+              replaces
+              <computeroutput>IConsole::saveState()</computeroutput></para>
             </listitem>
             <listitem>
-              <xref linkend="IMachine__adoptSavedState"
-                xreflabel="IMachine::adoptSavedState()" /> replaces
-              <computeroutput>IConsole::adoptSavedState()</computeroutput>
+              <para><link linkend="IMachine__adoptSavedState">IMachine::adoptSavedState()</link>
+              replaces
+              <computeroutput>IConsole::adoptSavedState()</computeroutput></para>
             </listitem>
             <listitem>
-              <xref linkend="IMachine__discardSavedState"
-                xreflabel="IMachine::discardSavedState()" /> replaces
-              <computeroutput>IConsole::discardSavedState()</computeroutput>
+              <para><link linkend="IMachine__discardSavedState">IMachine::discardSavedState()</link>
+              replaces
+              <computeroutput>IConsole::discardSavedState()</computeroutput></para>
             </listitem>
             <listitem>
-              <xref linkend="IMachine__takeSnapshot"
-                xreflabel="IMachine::takeSnapshot()" /> replaces
-              <computeroutput>IConsole::takeSnapshot()</computeroutput>
+              <para><link linkend="IMachine__takeSnapshot">IMachine::takeSnapshot()</link>
+              replaces
+              <computeroutput>IConsole::takeSnapshot()</computeroutput></para>
             </listitem>
             <listitem>
-              <xref linkend="IMachine__deleteSnapshot"
-                xreflabel="IMachine::deleteSnapshot()" /> replaces
-              <computeroutput>IConsole::deleteSnapshot()</computeroutput>
+              <para><link linkend="IMachine__deleteSnapshot">IMachine::deleteSnapshot()</link>
+              replaces
+              <computeroutput>IConsole::deleteSnapshot()</computeroutput></para>
             </listitem>
             <listitem>
-              <xref linkend="IMachine__deleteSnapshotAndAllChildren"
-                xreflabel="IMachine::deleteSnapshotAndAllChildren()" /> replaces
-              <computeroutput>IConsole::deleteSnapshotAndAllChildren()</computeroutput>
+              <para><link linkend="IMachine__deleteSnapshotAndAllChildren">IMachine::deleteSnapshotAndAllChildren()</link>
+              replaces
+              <computeroutput>IConsole::deleteSnapshotAndAllChildren()</computeroutput></para>
             </listitem>
             <listitem>
-               <xref linkend="IMachine__deleteSnapshotRange"
-                xreflabel="IMachine::deleteSnapshotRange()" /> replaces
-               <computeroutput>IConsole::deleteSnapshotRange()</computeroutput>
+               <para><link linkend="IMachine__deleteSnapshotRange">IMachine::deleteSnapshotRange()</link>
+               replaces
+               <computeroutput>IConsole::deleteSnapshotRange()</computeroutput></para>
              </listitem>
              <listitem>
-               <xref linkend="IMachine__restoreSnapshot"
-                xreflabel="IMachine::restoreSnapshot()" /> replaces
-               <computeroutput>IConsole::restoreSnapshot()</computeroutput>
+               <para><link linkend="IMachine__restoreSnapshot">IMachine::restoreSnapshot()</link>
+               replaces
+               <computeroutput>IConsole::restoreSnapshot()</computeroutput></para>
              </listitem>
            </itemizedlist>
           Small adjustments to the parameter lists have been made to reduce
@@ -3915,28 +3976,30 @@ AuthResult AUTHCALL AuthEntry(
         <listitem>
           <para>Two new machine states have been introduced to allow proper
           distinction between saving state and taking a snapshot.
-          <xref linkend="MachineState__Saving" xreflabel="MachineState::Saving" />
+          <link linkend="MachineState__Saving">MachineState::Saving</link>
           now is used exclusively while the VM's state is being saved, without
           any overlaps with snapshot functionality. The new state
-          <xref linkend="MachineState__Snapshotting" xreflabel="MachineState::Snapshotting" />
+          <link linkend="MachineState__Snapshotting">MachineState::Snapshotting</link>
           is used when an offline snapshot is taken and likewise the new state
-          <xref linkend="MachineState__OnlineSnapshotting" xreflabel="MachineState::OnlineSnapshotting" />
+          <link linkend="MachineState__OnlineSnapshotting">MachineState::OnlineSnapshotting</link>
           is used when an online snapshot is taken.</para>
         </listitem>
 
         <listitem>
-          <para>A new event has been introduced, which signals when a snapshot has been
-          restored:
-          <xref linkend="ISnapshotRestoredEvent" xreflabel="ISnapshotRestoredEvent"/>.
+          <para>A new event has been introduced, which signals when a snapshot
+          has been restored:
+          <link linkend="ISnapshotRestoredEvent">ISnapshotRestoredEvent</link>.
           Previously the event
-          <xref linkend="ISnapshotDeletedEvent" xreflabel="ISnapshotDeletedEvent"/> was
-          signalled, which isn't logical (but could be distinguished from actual deletion
-          by the fact that the snapshot was still there).</para>
+          <link linkend="ISnapshotDeletedEvent">ISnapshotDeletedEvent</link>
+          was signalled, which isn't logical (but could be distinguished from
+          actual deletion by the fact that the snapshot was still
+          there).</para>
         </listitem>
 
         <listitem>
-          <para>The method <xref linkend="IVirtualBox__createMedium"
-          xreflabel="IVirtualBox::createMedium()" /> replaces
+          <para>The method
+          <link linkend="IVirtualBox__createMedium">IVirtualBox::createMedium()</link>
+          replaces
           <computeroutput>VirtualBox::createHardDisk()</computeroutput>.
           Adjusting existing code needs adding two parameters with
           value <computeroutput>AccessMode_ReadWrite</computeroutput>
@@ -3947,23 +4010,26 @@ AuthResult AUTHCALL AuthEntry(
         </listitem>
 
         <listitem>
-          <para>The method <xref linkend="IMachine__getStorageControllerByInstance"
-          xreflabel="IMachine::getStorageControllerByInstance()" /> now has an
-          additional parameter (first parameter), for specifying the storage
-          bus which the storage controller must be using. The method was not
-          useful before, as the instance numbers are only unique for a specfic
-          storage bus.</para>
+          <para>The method
+          <link linkend="IMachine__getStorageControllerByInstance">IMachine::getStorageControllerByInstance()</link>
+          now has an additional parameter (first parameter), for specifying the
+          storage bus which the storage controller must be using. The method
+          was not useful before, as the instance numbers are only unique for a
+          specfic storage bus.</para>
         </listitem>
 
         <listitem>
-          <para>The attribute <computeroutput>IMachine::sessionType</computeroutput>
-          has been renamed to <xref linkend="IMachine__sessionName"
-          xreflabel="IMachine::sessionName()" />. This cleans up the confusing
-          terminology (as the session type is something different).</para>
+          <para>The attribute
+          <computeroutput>IMachine::sessionType</computeroutput> has been
+          renamed to
+          <link linkend="IMachine__sessionName">IMachine::sessionName()</link>.
+          This cleans up the confusing terminology (as the session type is
+          something different).</para>
         </listitem>
 
         <listitem>
-          <para>The attribute <computeroutput>IMachine::guestPropertyNotificationPatterns</computeroutput>
+          <para>The attribute
+          <computeroutput>IMachine::guestPropertyNotificationPatterns</computeroutput>
           has been removed. In practice it was not usable because it is too
           global and didn't distinguish between API clients.</para>
         </listitem>
@@ -3971,71 +4037,80 @@ AuthResult AUTHCALL AuthEntry(
         <listitem><para>Drag'n drop APIs were changed as follows:<itemizedlist>
 
           <listitem>
-            <para>Methods for providing host to guest drag'n drop functionality,
-              such as <computeroutput>IGuest::dragHGEnter</computeroutput>,
+            <para>Methods for providing host to guest drag'n drop
+              functionality, such as
+              <computeroutput>IGuest::dragHGEnter</computeroutput>,
               <computeroutput>IGuest::dragHGMove()</computeroutput>,
               <computeroutput>IGuest::dragHGLeave()</computeroutput>,
               <computeroutput>IGuest::dragHGDrop()</computeroutput> and
               <computeroutput>IGuest::dragHGPutData()</computeroutput>,
               have been moved to an abstract base class called
-              <xref linkend="IDnDTarget" xreflabel="IDnDTarget" />. VirtualBox implements
-              this base class in the <xref linkend="IGuestDnDTarget" xreflabel="IGuestDnDTarget" />
+              <link linkend="IDnDTarget">IDnDTarget</link>.
+              VirtualBox implements this base class in the
+              <link linkend="IGuestDnDTarget">IGuestDnDTarget</link>
               interface. The implementation can be used by using the
-              <xref linkend="IGuest__dnDTarget" xreflabel="IGuest::dnDTarget()" /> method.</para>
-            <para>Methods for providing guest to host drag'n drop functionality,
-              such as <computeroutput>IGuest::dragGHPending()</computeroutput>,
+              <link linkend="IGuest__dnDTarget">IGuest::dnDTarget()</link>
+              method.</para>
+            <para>Methods for providing guest to host drag'n drop
+              functionality, such as
+              <computeroutput>IGuest::dragGHPending()</computeroutput>,
               <computeroutput>IGuest::dragGHDropped()</computeroutput> and
               <computeroutput>IGuest::dragGHGetData()</computeroutput>,
               have been moved to an abstract base class called
-              <xref linkend="IDnDSource" xreflabel="IDnDSource" />. VirtualBox implements
-              this base class in the <xref linkend="IGuestDnDSource" xreflabel="IGuestDnDSource" />
+              <link linkend="IDnDSource">IDnDSource</link>.
+              VirtualBox implements this base class in the
+              <link linkend="IGuestDnDSource">IGuestDnDSource</link>
               interface. The implementation can be used by using the
-              <xref linkend="IGuest__dnDSource" xreflabel="IGuest::dnDSource()" /> method.</para>
+              <link linkend="IGuest__dnDSource">IGuest::dnDSource()</link>
+              method.</para>
           </listitem>
 
           <listitem>
-            <para>The <computeroutput>DragAndDropAction</computeroutput> enumeration has been
-              renamed to <xref linkend="DnDAction" xreflabel="DnDAction" />.</para>
+            <para>The <computeroutput>DragAndDropAction</computeroutput>
+            enumeration has been renamed to
+            <link linkend="DnDAction">DnDAction</link>.</para>
           </listitem>
 
           <listitem>
-            <para>The <computeroutput>DragAndDropMode</computeroutput> enumeration has been
-              renamed to <xref linkend="DnDMode" xreflabel="DnDMode" />.</para>
+            <para>The <computeroutput>DragAndDropMode</computeroutput>
+            enumeration has been renamed to
+            <link linkend="DnDMode">DnDMode</link>.</para>
           </listitem>
 
           <listitem>
-            <para>The attribute <computeroutput>IMachine::dragAndDropMode</computeroutput>
-              has been renamed to <xref linkend="IMachine__dnDMode" xreflabel="IMachine::dnDMode()" />.</para>
+            <para>The attribute
+            <computeroutput>IMachine::dragAndDropMode</computeroutput>
+            has been renamed to
+            <link linkend="IMachine__dnDMode">IMachine::dnDMode()</link>.</para>
           </listitem>
 
           <listitem>
-            <para>The event <computeroutput>IDragAndDropModeChangedEvent</computeroutput>
-              has been renamed to <xref linkend="IDnDModeChangedEvent" xreflabel="IDnDModeChangedEvent" />.</para>
-          </listitem>
-
-          <listitem>
-            <para>The callback method <computeroutput>IInternalSessionControl::onDragAndDropModeChange</computeroutput>
-              has been renamed to <xref linkend="IInternalSessionControl__onDnDModeChange" xreflabel="IInternalSessionControl::onDnDModeChange()" />.</para>
+            <para>The event
+            <computeroutput>IDragAndDropModeChangedEvent</computeroutput>
+            has been renamed to
+            <link linkend="IDnDModeChangedEvent">IDnDModeChangedEvent</link>.</para>
           </listitem>
 
           </itemizedlist></para>
         </listitem>
 
-        <listitem><para>IDisplay and IFramebuffer interfaces were changed to allow IFramebuffer
-          object to reside in a separate frontend process:<itemizedlist>
+        <listitem><para>IDisplay and IFramebuffer interfaces were changed to
+          allow IFramebuffer object to reside in a separate frontend
+          process:<itemizedlist>
 
           <listitem><para>
-            IDisplay::ResizeCompleted() has been removed, because the IFramebuffer object
-            does not provide the screen memory anymore.
+            IDisplay::ResizeCompleted() has been removed, because the
+            IFramebuffer object does not provide the screen memory anymore.
           </para></listitem>
 
           <listitem><para>
-            IDisplay::SetFramebuffer() has been replaced with IDisplay::AttachFramebuffer()
-            and IDisplay::DetachFramebuffer().
+            IDisplay::SetFramebuffer() has been replaced with
+            IDisplay::AttachFramebuffer() and IDisplay::DetachFramebuffer().
           </para></listitem>
 
           <listitem><para>
-            IDisplay::GetFramebuffer() has been replaced with IDisplay::QueryFramebuffer().
+            IDisplay::GetFramebuffer() has been replaced with
+            IDisplay::QueryFramebuffer().
           </para></listitem>
 
           <listitem><para>
@@ -4045,158 +4120,208 @@ AuthResult AUTHCALL AuthEntry(
           </para></listitem>
 
           <listitem><para>
-            IDisplay::TakeScreenShot() and IDisplay::TakeScreenShotToArray() have a new parameter
-            <computeroutput>bitmapFormat</computeroutput>. As a consequence of this,
-            IDisplay::TakeScreenShotPNGToArray() has been removed.
+            IDisplay::TakeScreenShot() and IDisplay::TakeScreenShotToArray()
+            have a new parameter
+            <computeroutput>bitmapFormat</computeroutput>. As a consequence of
+            this, IDisplay::TakeScreenShotPNGToArray() has been removed.
           </para></listitem>
 
           <listitem><para>
-            IFramebuffer::RequestResize() has been replaced with IFramebuffer::NotifyChange().
+            IFramebuffer::RequestResize() has been replaced with
+            IFramebuffer::NotifyChange().
           </para></listitem>
 
           <listitem><para>
-            IFramebuffer::NotifyUpdateImage() added to support IFramebuffer objects in a different process.
+            IFramebuffer::NotifyUpdateImage() added to support IFramebuffer
+            objects in a different process.
           </para></listitem>
 
           <listitem><para>
-            IFramebuffer::Lock(), IFramebuffer::Unlock(), IFramebuffer::Address(), IFramebuffer::UsesGuestVRAM()
-            have been removed because  the IFramebuffer object does not provide the screen memory anymore.
+            IFramebuffer::Lock(), IFramebuffer::Unlock(),
+            IFramebuffer::Address(), IFramebuffer::UsesGuestVRAM() have been
+            removed because the IFramebuffer object does not provide the screen
+            memory anymore.
           </para></listitem>
 
           </itemizedlist></para>
         </listitem>
 
-        <listitem><para>IGuestSession, IGuestFile and IGuestProcess interfaces were changed as follows:
+        <listitem><para>IGuestSession, IGuestFile and IGuestProcess interfaces
+        were changed as follows:
           <itemizedlist>
             <listitem>
-              <para>Replaced IGuestSession::directoryQueryInfo and IGuestSession::fileQueryInfo with a new
-                 <xref linkend="IGuestSession__fsObjQueryInfo" xreflabel="IGuestSession::fsObjQueryInfo"/> method
-                 that works on any type of file system object.</para>
+              <para>Replaced IGuestSession::directoryQueryInfo and
+                 IGuestSession::fileQueryInfo with a new
+                 <link linkend="IGuestSession__fsObjQueryInfo">IGuestSession::fsObjQueryInfo</link>
+                 method that works on any type of file system object.</para>
             </listitem>
             <listitem>
-              <para>Replaced IGuestSession::fileRemove, IGuestSession::symlinkRemoveDirectory and
+              <para>Replaced IGuestSession::fileRemove,
+                 IGuestSession::symlinkRemoveDirectory and
                  IGuestSession::symlinkRemoveFile with a new
-                 <xref linkend="IGuestSession__fsObjRemove" xreflabel="IGuestSession::fsObjRemove"/> method that works
-                 on any type of file system object except directories. (fileRemove also worked on any type of object too,
-                 though that was not the intent of the method.)</para>
+                 <link linkend="IGuestSession__fsObjRemove">IGuestSession::fsObjRemove</link>
+                 method that works on any type of file system object except
+                 directories. (fileRemove also worked on any type of object
+                 too, though that was not the intent of the method.)</para>
             </listitem>
             <listitem>
-              <para>Replaced IGuestSession::directoryRename and IGuestSession::directoryRename with a new
-                 <xref linkend="IGuestSession__fsObjRename" xreflabel="IGuestSession::fsObjRename"/> method that works
-                 on any type of file system object. (directoryRename and fileRename may already have worked for any kind
-                 of object, but that was never the intent of the methods.)</para>
+              <para>Replaced IGuestSession::directoryRename and
+                 IGuestSession::directoryRename with a new
+                 <link linkend="IGuestSession__fsObjRename">IGuestSession::fsObjRename</link>
+                 method that works on any type of file system object.
+                 (directoryRename and fileRename may already have worked for
+                 any kind of object, but that was never the intent of the
+                 methods.)</para>
             </listitem>
             <listitem>
-              <para>Replaced the unimplemented IGuestSession::directorySetACL and IGuestSession::fileSetACL with a new
-                 <xref linkend="IGuestSession__fsObjSetACL" xreflabel="IGuestSession::fsObjSetACL"/> method that works
-                 on all type of file system object. Also added a UNIX-style mode parameter as an alternative to the ACL.</para>
+              <para>Replaced the unimplemented IGuestSession::directorySetACL
+                 and IGuestSession::fileSetACL with a new
+                 <link linkend="IGuestSession__fsObjSetACL">IGuestSession::fsObjSetACL</link>
+                 method that works on all type of file system object. Also
+                 added a UNIX-style mode parameter as an alternative to the
+                 ACL.</para>
             </listitem>
             <listitem>
-              <para>Replaced IGuestSession::fileRemove, IGuestSession::symlinkRemoveDirectory and
+              <para>Replaced IGuestSession::fileRemove,
+                 IGuestSession::symlinkRemoveDirectory and
                  IGuestSession::symlinkRemoveFile with a new
-                 <xref linkend="IGuestSession__fsObjRemove" xreflabel="IGuestSession::fsObjRemove"/> method that works
-                 on any type of file system object except directories (fileRemove also worked on any type of object,
+                 <link linkend="IGuestSession__fsObjRemove">IGuestSession::fsObjRemove</link>
+                 method that works on any type of file system object except
+                 directories (fileRemove also worked on any type of object,
                  though that was not the intent of the method.)</para>
             </listitem>
             <listitem>
-              <para>Renamed IGuestSession::copyTo to <xref linkend="IGuestSession__fileCopyToGuest"
-                 xreflabel="IGuestSession::fileCopyToGuest"/>.</para>
+              <para>Renamed IGuestSession::copyTo to
+              <link linkend="IGuestSession__fileCopyToGuest">IGuestSession::fileCopyToGuest</link>.</para>
             </listitem>
             <listitem>
-              <para>Renamed IGuestSession::copyFrom to <xref linkend="IGuestSession__fileCopyFromGuest"
-                 xreflabel="IGuestSession::fileCopyFromGuest"/>.</para>
+              <para>Renamed IGuestSession::copyFrom to
+              <link linkend="IGuestSession__fileCopyFromGuest">IGuestSession::fileCopyFromGuest</link>.</para>
             </listitem>
             <listitem>
-              <para>Renamed the CopyFileFlag enum to <xref linkend="FileCopyFlag" xreflabel="FileCopyFlag"/>.</para>
+              <para>Renamed the CopyFileFlag enum to
+              <link linkend="FileCopyFlag">FileCopyFlag</link>.</para>
             </listitem>
             <listitem>
-              <para>Renamed the IGuestSession::environment attribute to <xref linkend="IGuestSession__environmentChanges"
-                xreflabel="IGuestSession::environmentChanges"/> to better reflect what it does.</para>
+              <para>Renamed the IGuestSession::environment attribute to
+              <link linkend="IGuestSession__environmentChanges">IGuestSession::environmentChanges</link>
+              to better reflect what it does.</para>
             </listitem>
             <listitem>
-              <para>Changed the <xref linkend="IProcess__environment" xreflabel="IGuestProcess::environment"/> to
-               a stub returning E_NOTIMPL since it wasn't doing what was advertised (returned changes, not the
-               actual environment).</para>
+              <para>Changed the
+              <link linkend="IProcess__environment">IGuestProcess::environment</link>
+              to a stub returning E_NOTIMPL since it wasn't doing what was
+              advertised (returned changes, not the actual environment).</para>
             </listitem>
             <listitem>
-              <para>Renamed IGuestSession::environmentSet to <xref linkend="IGuestSession__environmentScheduleSet"
-                xreflabel="IGuestSession::environmentScheduleSet"/> to better reflect what it does.</para>
+              <para>Renamed IGuestSession::environmentSet to
+              <link linkend="IGuestSession__environmentScheduleSet">IGuestSession::environmentScheduleSet</link>
+              to better reflect what it does.</para>
             </listitem>
             <listitem>
-              <para>Renamed IGuestSession::environmentUnset to <xref linkend="IGuestSession__environmentScheduleUnset"
-                xreflabel="IGuestSession::environmentScheduleUnset"/> to better reflect what it does.</para>
+              <para>Renamed IGuestSession::environmentUnset to
+              <link linkend="IGuestSession__environmentScheduleUnset">IGuestSession::environmentScheduleUnset</link>
+              to better reflect what it does.</para>
             </listitem>
             <listitem>
-              <para>Removed IGuestSession::environmentGet it was only getting changes while giving the impression it was
-                actual environment variables, and it did not represent scheduled unset operations.</para>
+              <para>Removed IGuestSession::environmentGet it was only getting
+              changes while giving the impression it was actual environment
+              variables, and it did not represent scheduled unset
+              operations.</para>
             </listitem>
             <listitem>
-              <para>Removed IGuestSession::environmentClear as it duplicates assigning an empty array to the
-                <xref linkend="IGuestSession__environmentChanges" xreflabel="IGuestSession::environmentChanges"/> (formerly
-                known as IGuestSession::environment).</para>
+              <para>Removed IGuestSession::environmentClear as it duplicates
+              assigning an empty array to the
+              <link linkend="IGuestSession__environmentChanges">IGuestSession::environmentChanges</link>
+              (formerly known as IGuestSession::environment).</para>
             </listitem>
             <listitem>
-              <para>Changed the <xref linkend="IGuestSession__processCreate" xreflabel="IGuestSession::processCreate"/> and
-              <xref linkend="IGuestSession__processCreateEx" xreflabel="IGuestSession::processCreateEx"/> methods to accept
-              arguments starting with argument zero (argv[0]) instead of argument one (argv[1]). (Not yet implemented on the
-              guest additions side, so argv[0] will probably be ignored for a short while.)</para>
+              <para>Changed the
+              <link linkend="IGuestSession__processCreate">IGuestSession::processCreate</link>
+              and
+              <link linkend="IGuestSession__processCreateEx">IGuestSession::processCreateEx</link>
+              methods to accept arguments starting with argument zero (argv[0])
+              instead of argument one (argv[1]). (Not yet implemented on the
+              guest additions side, so argv[0] will probably be ignored for a
+              short while.)</para>
             </listitem>
 
             <listitem>
-              <para>Added a followSymlink parameter to the following methods:<itemizedlist>
-                <listitem><para><xref linkend="IGuestSession__directoryExists"
-                  xreflabel="IGuestSession::directoryExists"/></para></listitem>
-                <listitem><para><xref linkend="IGuestSession__fileExists"
-                  xreflabel="IGuestSession::fileExists"/></para></listitem>
-                <listitem><para><xref linkend="IGuestSession__fileQuerySize"
-                  xreflabel="IGuestSession::fileQuerySize"/></para></listitem>
+              <para>Added a followSymlink parameter to the following methods:
+              <itemizedlist>
+                <listitem><para><link linkend="IGuestSession__directoryExists">IGuestSession::directoryExists</link></para></listitem>
+                <listitem><para><link linkend="IGuestSession__fileExists">IGuestSession::fileExists</link></para></listitem>
+                <listitem><para><link linkend="IGuestSession__fileQuerySize">IGuestSession::fileQuerySize</link></para></listitem>
               </itemizedlist></para>
             </listitem>
             <listitem>
-              <para>The parameters to the <xref linkend="IGuestSession__fileOpen" xreflabel="IGuestSession::fileOpen"/>
-                and <xref linkend="IGuestSession__fileOpenEx" xreflabel="IGuestSession::fileOpenEx"/> methods were
-                altered:<itemizedlist>
-                <listitem><para>The openMode string parameter was replaced by the enum
-                  <xref linkend="FileAccessMode" xreflabel="FileAccessMode"/> and renamed to accessMode.</para></listitem>
-                <listitem><para>The disposition string parameter was replaced by the enum
-                  <xref linkend="FileOpenAction" xreflabel="FileOpenAction"/> and renamed to openAction.</para></listitem>
-                <listitem><para>The unimplemented sharingMode string parameter was replaced by the enum
-                  <xref linkend="FileSharingMode" xreflabel="FileSharingMode"/> (fileOpenEx only).</para></listitem>
-                <listitem><para>Added a flags parameter taking a list of <xref linkend="FileOpenExFlags"
-                  xreflabel="FileOpenExFlags"/> values (fileOpenEx only).</para></listitem>
-                <listitem><para>Removed the offset parameter (fileOpenEx only).</para></listitem>
+              <para>The parameters to the
+                <link linkend="IGuestSession__fileOpen">IGuestSession::fileOpen</link>
+                and
+                <link linkend="IGuestSession__fileOpenEx">IGuestSession::fileOpenEx</link>
+                methods were altered:<itemizedlist>
+                <listitem><para>The openMode string parameter was replaced by
+                  the enum
+                  <link linkend="FileAccessMode">FileAccessMode</link>
+                  and renamed to accessMode.</para></listitem>
+                <listitem><para>The disposition string parameter was replaced
+                  by the enum
+                  <link linkend="FileOpenAction">FileOpenAction</link>
+                  and renamed to openAction.</para></listitem>
+                <listitem><para>The unimplemented sharingMode string parameter
+                  was replaced by the enum
+                  <link linkend="FileSharingMode">FileSharingMode</link>
+                  (fileOpenEx only).</para></listitem>
+                <listitem><para>Added a flags parameter taking a list of
+                <link linkend="FileOpenExFlags">FileOpenExFlags</link> values
+                (fileOpenEx only).</para></listitem>
+                <listitem><para>Removed the offset parameter (fileOpenEx
+                only).</para></listitem>
               </itemizedlist></para>
             </listitem>
 
             <listitem>
-              <para><xref linkend="IFile__seek" xreflabel="IGuestFile::seek"/> now returns the new offset.</para>
+              <para><link linkend="IFile__seek">IGuestFile::seek</link> now
+              returns the new offset.</para>
             </listitem>
             <listitem>
-              <para>Renamed the FileSeekType enum used by <xref linkend="IFile__seek" xreflabel="IGuestFile::seek"/>
-                to <xref linkend="FileSeekOrigin" xreflabel="FileSeekOrigin"/> and added the missing End value
-                and renaming the Set to Begin.</para>
+              <para>Renamed the FileSeekType enum used by
+              <link linkend="IFile__seek">IGuestFile::seek</link>
+                to <link linkend="FileSeekOrigin">FileSeekOrigin</link> and
+                added the missing End value and renaming the Set to
+                Begin.</para>
             </listitem>
             <listitem>
-              <para>Extended the unimplemented <xref linkend="IFile__setACL" xreflabel="IGuestFile::setACL"/>
-                method with a UNIX-style mode parameter as an alternative to the ACL.</para>
+              <para>Extended the unimplemented
+                <link linkend="IFile__setACL">IGuestFile::setACL</link>
+                method with a UNIX-style mode parameter as an alternative to
+                the ACL.</para>
             </listitem>
             <listitem>
-              <para>Renamed the IFile::openMode attribute to <xref linkend="IFile__accessMode" xreflabel="IFile::accessMode"/>
-                and change the type from string to <xref linkend="FileAccessMode" xreflabel="FileAccessMode"/> to reflect
+              <para>Renamed the IFile::openMode attribute to
+                <link linkend="IFile__accessMode">IFile::accessMode</link>
+                and change the type from string to
+                <link linkend="FileAccessMode">FileAccessMode</link> to reflect
                 the changes to the fileOpen methods.</para>
             </listitem>
             <listitem>
-              <para>Renamed the IGuestFile::disposition attribute to <xref linkend="IFile__openAction"
-                xreflabel="IFile::openAction"/> and change the type from string to <xref linkend="FileOpenAction"
-                xreflabel="FileOpenAction"/> to reflect the changes to the fileOpen methods.</para>
+              <para>Renamed the IGuestFile::disposition attribute to
+              <link linkend="IFile__openAction">IFile::openAction</link> and
+              change the type from string to
+              <link linkend="FileOpenAction">FileOpenAction</link> to reflect
+              the changes to the fileOpen methods.</para>
             </listitem>
 
             <!-- Non-incompatible things worth mentioning (stubbed methods/attrs aren't worth it). -->
             <listitem>
-              <para>Added <xref linkend="IGuestSession__pathStyle" xreflabel="IGuestSession::pathStyle"/> attribute.</para>
+              <para>Added
+              <link linkend="IGuestSession__pathStyle">IGuestSession::pathStyle</link>
+              attribute.</para>
             </listitem>
             <listitem>
-              <para>Added <xref linkend="IGuestSession__fsObjExists" xreflabel="IGuestSession::fsObjExists"/> attribute.</para>
+              <para>Added
+              <link linkend="IGuestSession__fsObjExists">IGuestSession::fsObjExists</link>
+              attribute.</para>
             </listitem>
 
           </itemizedlist>
@@ -4204,13 +4329,14 @@ AuthResult AUTHCALL AuthEntry(
         </listitem>
 
         <listitem><para>
-          IConsole::GetDeviceActivity() returns information about multiple devices.
+          IConsole::GetDeviceActivity() returns information about multiple
+          devices.
         </para></listitem>
 
         <listitem><para>
           IMachine::ReadSavedThumbnailToArray() has a new parameter
-          <computeroutput>bitmapFormat</computeroutput>. As a consequence of this,
-          IMachine::ReadSavedThumbnailPNGToArray() has been removed.
+          <computeroutput>bitmapFormat</computeroutput>. As a consequence of
+          this, IMachine::ReadSavedThumbnailPNGToArray() has been removed.
         </para></listitem>
 
         <listitem><para>
@@ -4230,12 +4356,13 @@ AuthResult AUTHCALL AuthEntry(
         </para></listitem>
 
         <listitem>
-          <para>The method <xref linkend="IWebsessionManager__getSessionObject"
-          xreflabel="IWebsessionManager::getSessionObject()" /> now returns
-          a new <xref linkend="ISession" xreflabel="ISession" /> instance for
-          every invocation. This puts the behavior in line with other binding
-          styles, which never forced the equivalent of establishing another
-          connection and logging in again to get another instance.</para>
+          <para>The method
+          <link linkend="IWebsessionManager__getSessionObject">IWebsessionManager::getSessionObject()</link>
+          now returns a new <link linkend="ISession">ISession</link> instance
+          for every invocation. This puts the behavior in line with other
+          binding styles, which never forced the equivalent of establishing
+          another connection and logging in again to get another
+          instance.</para>
         </listitem>
       </itemizedlist>
     </sect1>
@@ -4246,45 +4373,46 @@ AuthResult AUTHCALL AuthEntry(
       <itemizedlist>
         <listitem>
           <para>The explicit medium locking methods
-            <xref linkend="IMedium__lockRead" xreflabel="IMedium::lockRead()" />
-            and <xref linkend="IMedium__lockWrite" xreflabel="IMedium::lockWrite()" />
+            <link linkend="IMedium__lockRead">IMedium::lockRead()</link>
+            and <link linkend="IMedium__lockWrite">IMedium::lockWrite()</link>
             have been redesigned. They return a lock token object reference
-            now, and calling the <xref linkend="IToken__abandon"
-              xreflabel="IToken::abandon()" /> method (or letting the reference
-            count to this object drop to 0) will unlock it. This eliminates
-            the rather common problem that an API client crash left behind
-            locks, and also improves the safety (API clients can't release
-            locks they didn't obtain).</para>
+            now, and calling the
+            <link linkend="IToken__abandon">IToken::abandon()</link> method (or
+            letting the reference count to this object drop to 0) will unlock
+            it. This eliminates the rather common problem that an API client
+            crash left behind locks, and also improves the safety (API clients
+            can't release locks they didn't obtain).</para>
         </listitem>
 
         <listitem>
-          <para>The parameter list of <xref linkend="IAppliance__write"
-          xreflabel="IAppliance::write()" /> has been changed slightly, to
-          allow multiple flags to be passed.</para>
+          <para>The parameter list of
+          <link linkend="IAppliance__write">IAppliance::write()</link>
+          has been changed slightly, to allow multiple flags to be
+          passed.</para>
         </listitem>
 
         <listitem>
           <para><computeroutput>IMachine::delete</computeroutput>
-          has been renamed to <xref linkend="IMachine__deleteConfig"
-          xreflabel="IMachine::deleteConfig()" />, to improve API client
-          binding compatibility.</para>
+          has been renamed to
+          <link linkend="IMachine__deleteConfig">IMachine::deleteConfig()</link>,
+          to improve API client binding compatibility.</para>
         </listitem>
 
         <listitem>
           <para><computeroutput>IMachine::export</computeroutput>
-          has been renamed to <xref linkend="IMachine__exportTo"
-          xreflabel="IMachine::exportTo()" />, to improve API client binding
-          compatibility.</para>
+          has been renamed to
+          <link linkend="IMachine__exportTo">IMachine::exportTo()</link>,
+          to improve API client binding compatibility.</para>
         </listitem>
 
         <listitem>
-          <para>For <xref linkend="IMachine__launchVMProcess"
-          xreflabel="IMachine::launchVMProcess()"/> the meaning of the
-          <computeroutput>type</computeroutput> parameter has changed slightly.
-          Empty string now means that the per-VM or global default frontend
-          is launched. Most callers of this method should use the empty string
-          now, unless they really want to override the default and launch a
-          particular frontend.</para>
+          <para>For
+          <link linkend="IMachine__launchVMProcess">IMachine::launchVMProcess()</link>
+          the meaning of the <computeroutput>type</computeroutput> parameter
+          has changed slightly. Empty string now means that the per-VM or
+          global default frontend is launched. Most callers of this method
+          should use the empty string now, unless they really want to override
+          the default and launch a particular frontend.</para>
         </listitem>
 
         <listitem>
@@ -4292,123 +4420,132 @@ AuthResult AUTHCALL AuthEntry(
 
             <listitem>
               <para>The type of attribute
-              <xref linkend="IMedium__variant" xreflabel="IMedium::variant()"/>
+              <link linkend="IMedium__variant">IMedium::variant()</link>
               changed from <computeroutput>unsigned long</computeroutput>
               to <computeroutput>safe-array MediumVariant</computeroutput>.
-              It is an array of flags instead of a set of flags which were stored inside one variable.
+              It is an array of flags instead of a set of flags which were
+              stored inside one variable.
               </para>
             </listitem>
 
             <listitem>
-              <para>The parameter list for <xref
-              linkend="IMedium__cloneTo"
-              xreflabel="IMedium::cloneTo()" /> was modified.</para>
-              The type of parameter variant was changed from unsigned long to safe-array MediumVariant.
+              <para>The parameter list for
+              <link linkend="IMedium__cloneTo">IMedium::cloneTo()</link>
+              was modified. The type of parameter variant was changed from
+              unsigned long to safe-array MediumVariant.
+              </para>
             </listitem>
 
             <listitem>
-              <para>The parameter list for <xref
-              linkend="IMedium__createBaseStorage"
-              xreflabel="IMedium::createBaseStorage()" /> was modified.</para>
-              The type of parameter variant was changed from unsigned long to safe-array MediumVariant.
+              <para>The parameter list for
+              <link linkend="IMedium__createBaseStorage">IMedium::createBaseStorage()</link>
+              was modified. The type of parameter variant was changed from
+              unsigned long to safe-array MediumVariant.
+              </para>
             </listitem>
 
             <listitem>
-              <para>The parameter list for <xref
-              linkend="IMedium__createDiffStorage"
-              xreflabel="IMedium::createDiffStorage()" /> was modified.</para>
-              The type of parameter variant was changed from unsigned long to safe-array MediumVariant.
+              <para>The parameter list for
+              <link linkend="IMedium__createDiffStorage">IMedium::createDiffStorage()</link>
+              was modified. The type of parameter variant was changed from
+              unsigned long to safe-array MediumVariant.
+              </para>
             </listitem>
 
             <listitem>
-              <para>The parameter list for <xref
-              linkend="IMedium__cloneToBase"
-              xreflabel="IMedium::cloneToBase()" /> was modified.</para>
-              The type of parameter variant was changed from unsigned long to safe-array MediumVariant.
+              <para>The parameter list for
+              <link linkend="IMedium__cloneToBase">IMedium::cloneToBase()</link>
+              was modified. The type of parameter variant was changed from
+              unsigned long to safe-array MediumVariant.
+              </para>
             </listitem>
           </itemizedlist></para>
         </listitem>
 
         <listitem>
           <para>The type of attribute
-          <xref linkend="IMediumFormat__capabilities"
-          xreflabel="IMediumFormat::capabilities()"/>
-          changed from <computeroutput>unsigned long</computeroutput>
-          to <computeroutput>safe-array MediumFormatCapabilities</computeroutput>.
-          It is an array of flags instead of a set of flags which were stored inside one variable.
+          <link linkend="IMediumFormat__capabilities">IMediumFormat::capabilities()</link>
+          changed from <computeroutput>unsigned long</computeroutput> to
+          <computeroutput>safe-array MediumFormatCapabilities</computeroutput>.
+          It is an array of flags instead of a set of flags which were stored
+          inside one variable.
           </para>
         </listitem>
 
         <listitem>
-          <para>The attribute <xref linkend="IMedium__logicalSize"
-          xreflabel="IMedium::logicalSize()" /> now returns the logical
-          size of exactly this medium object (whether it is a base or diff
-          image). The old behavior was no longer acceptable, as each image
-          can have a different capacity.</para>
+          <para>The attribute
+          <link linkend="IMedium__logicalSize">IMedium::logicalSize()</link>
+          now returns the logical size of exactly this medium object (whether
+          it is a base or diff image). The old behavior was no longer
+          acceptable, as each image can have a different capacity.</para>
         </listitem>
 
         <listitem>
-          <para>Guest control APIs - such as <xref linkend="IGuest"
-            xreflabel="IGuest" />, <xref linkend="IGuestSession"
-            xreflabel="IGuestSession" />, <xref linkend="IGuestProcess"
-            xreflabel="IGuestProcess" /> and so on - now emit own events to provide
-            clients much finer control and the ability to write own frontends for
-            guest operations. The event <xref linkend="IGuestSessionEvent"
-            xreflabel="IGuestSessionEvent" /> acts as an abstract base class
-            for all guest control events. Certain guest events contain a
-            <xref linkend="IVirtualBoxErrorInfo" xreflabel="IVirtualBoxErrorInfo" /> member
-            to provide more information in case of an error happened on the
-            guest side.</para>
+          <para>Guest control APIs - such as
+          <link linkend="IGuest">IGuest</link>,
+          <link linkend="IGuestSession">IGuestSession</link>,
+          <link linkend="IGuestProcess">IGuestProcess</link> and so on - now
+          emit own events to provide clients much finer control and the ability
+          to write own frontends for guest operations. The event
+          <link linkend="IGuestSessionEvent">IGuestSessionEvent</link> acts as
+          an abstract base class for all guest control events. Certain guest
+          events contain a
+          <link linkend="IVirtualBoxErrorInfo">IVirtualBoxErrorInfo</link>
+          member to provide more information in case of an error happened on
+          the guest side.</para>
         </listitem>
 
         <listitem>
-          <para>Guest control sessions on the guest started by <xref
-            linkend="IGuest__createSession" xreflabel="IGuest::createSession()" />
-            now are dedicated guest processes to provide more safety and performance
-            for certain operations. Also, the <xref linkend="IGuest__createSession"
-            xreflabel="IGuest::createSession()" /> call does not wait for the
-            guest session being created anymore due to the dedicated guest session
-            processes just mentioned. This also will enable webservice clients to
-            handle guest session creation more gracefully. To wait for a guest
-            session being started, use the newly added attribute <xref
-            linkend="IGuestSession__status" xreflabel="IGuestSession::status()" />
+          <para>Guest control sessions on the guest started by
+            <link linkend="IGuest__createSession">IGuest::createSession()</link>
+            now are dedicated guest processes to provide more safety and
+            performance for certain operations. Also, the
+            <link linkend="IGuest__createSession">IGuest::createSession()</link>
+            call does not wait for the guest session being created anymore due
+            to the dedicated guest session processes just mentioned. This also
+            will enable webservice clients to handle guest session creation
+            more gracefully. To wait for a guest session being started, use the
+            newly added attribute
+            <link linkend="IGuestSession__status">IGuestSession::status()</link>
             to query the current guest session status.</para>
         </listitem>
 
         <listitem>
-          <para>The <xref linkend="IGuestFile" xreflabel="IGuestFile" />
+          <para>The <link linkend="IGuestFile">IGuestFile</link>
             APIs are now implemented to provide native guest file access from
             the host.</para>
         </listitem>
 
         <listitem>
-          <para>The parameter list for <xref
-          linkend="IGuest__updateGuestAdditions"
-          xreflabel="IMedium::updateGuestAdditions()" /> was modified.</para>
-          It now supports specifying optional command line arguments for the
-          Guest Additions installer performing the actual update on the guest.
+          <para>The parameter list for
+          <link linkend="IGuest__updateGuestAdditions">IMedium::updateGuestAdditions()</link>
+          was modified. It now supports specifying optional command line
+          arguments for the Guest Additions installer performing the actual
+          update on the guest.
+          </para>
         </listitem>
 
         <listitem>
-          <para>A new event <xref linkend="IGuestUserStateChangedEvent"
-          xreflabel="IGuestUserStateChangedEvent" /> was introduced to provide
-          guest user status updates to the host via event listeners. To use this
-          event there needs to be at least the 4.3 Guest Additions installed on
-          the guest. At the moment only the states "Idle" and "InUse" of the
-          <xref linkend="GuestUserState"
-          xreflabel="GuestUserState" /> enumeration are supported on
-          Windows guests, starting at Windows 2000 SP2.</para>
+          <para>A new event
+          <link linkend="IGuestUserStateChangedEvent">IGuestUserStateChangedEvent</link>
+          was introduced to provide guest user status updates to the host via
+          event listeners. To use this event there needs to be at least the 4.3
+          Guest Additions installed on the guest. At the moment only the states
+          "Idle" and "InUse" of the
+          <link linkend="GuestUserState">GuestUserState</link> enumeration arei
+          supported on Windows guests, starting at Windows 2000 SP2.</para>
         </listitem>
 
         <listitem>
           <para>
-            The attribute <xref linkend="IGuestSession__protocolVersion"
-            xreflabel="IGuestSession::protocolVersion"/> was added to provide a
-            convenient way to lookup the guest session's protocol version it
-            uses to communicate with the installed Guest Additions on the guest.
-            Older Guest Additions will set the protocol version to 1, whereas
-            Guest Additions 4.3 will set the protocol version to 2. This might
-            change in the future as new features arise.</para>
+            The attribute
+            <link linkend="IGuestSession__protocolVersion">IGuestSession::protocolVersion</link>
+            was added to provide a convenient way to lookup the guest session's
+            protocol version it uses to communicate with the installed Guest
+            Additions on the guest. Older Guest Additions will set the protocol
+            version to 1, whereas Guest Additions 4.3 will set the protocol
+            version to 2. This might change in the future as new features
+            arise.</para>
         </listitem>
 
         <listitem>
@@ -4418,11 +4555,13 @@ AuthResult AUTHCALL AuthEntry(
 
         <listitem>
           <para>
-            The <xref linkend="IUSBController" xreflabel="IUSBController"/>
-            class is not a singleton of <xref linkend="IMachine" xreflabel="IMachine"/>
-            anymore but <xref linkend="IMachine" xreflabel="IMachine"/> contains
-            a list of USB controllers present in the VM. The USB device filter
-            handling was moved to <xref linkend="IUSBDeviceFilters" xreflabel="IUSBDeviceFilters"/>.
+            The <link linkend="IUSBController">IUSBController</link>
+            class is not a singleton of
+            <link linkend="IMachine">IMachine</link> anymore but
+            <link linkend="IMachine">IMachine</link> contains a list of USB
+            controllers present in the VM. The USB device filter handling was
+            moved to
+            <link linkend="IUSBDeviceFilters">IUSBDeviceFilters</link>.
           </para>
         </listitem>
       </itemizedlist>
@@ -4435,9 +4574,9 @@ AuthResult AUTHCALL AuthEntry(
         <listitem>
           <para>Guest control APIs for executing guest processes, working with
           guest files or directories have been moved to the newly introduced
-          <xref linkend="IGuestSession" xreflabel="IGuestSession" /> interface which
-          can be created by calling <xref linkend="IGuest__createSession"
-          xreflabel="IGuest::createSession()" />.</para>
+          <link linkend="IGuestSession">IGuestSession</link> interface which
+          can be created by calling
+          <link linkend="IGuest__createSession">IGuest::createSession()</link>.</para>
 
           <para>A guest session will act as a
           guest user's impersonation so that the guest credentials only have to
@@ -4447,102 +4586,101 @@ AuthResult AUTHCALL AuthEntry(
 
           <para>Instead of working with process or directory handles before
           version 4.2, there now are the dedicated interfaces
-          <xref linkend="IGuestProcess" xreflabel="IGuestProcess" />,
-          <xref linkend="IGuestDirectory" xreflabel="IGuestDirectory" /> and
-          <xref linkend="IGuestFile" xreflabel="IGuestFile" />. To retrieve more
+          <link linkend="IGuestProcess">IGuestProcess</link>,
+          <link linkend="IGuestDirectory">IGuestDirectory</link> and
+          <link linkend="IGuestFile">IGuestFile</link>. To retrieve more
           information of a file system object the new interface
-          <xref linkend="IGuestFsObjInfo" xreflabel="IGuestFsObjInfo" /> has been
+          <link linkend="IGuestFsObjInfo">IGuestFsObjInfo</link> has been
           introduced.</para>
 
           <para>Even though the guest control API was changed it is backwards
           compatible so that it can be used with older installed Guest
           Additions. However, to use upcoming features like process termination
-          or waiting for input / output new Guest Additions must be installed when
-          these features got implemented.</para>
+          or waiting for input / output new Guest Additions must be installed
+          when these features got implemented.</para>
 
           <para>The following limitations apply:
             <itemizedlist>
-              <listitem><para>The <xref linkend="IGuestFile" xreflabel="IGuestFile" />
+              <listitem><para>The <link linkend="IGuestFile">IGuestFile</link>
                 interface is not fully implemented yet.</para>
               </listitem>
               <listitem><para>The symbolic link APIs
-                <xref linkend="IGuestSession__symlinkCreate"
-                xreflabel="IGuestSession::symlinkCreate()" />,
-                <xref linkend="IGuestSession__symlinkExists"
-                xreflabel="IGuestSession::symlinkExists()" />,
-                <xref linkend="IGuestSession__symlinkRead"
-                xreflabel="IGuestSession::symlinkRead()" />,
+                <link linkend="IGuestSession__symlinkCreate">IGuestSession::symlinkCreate()</link>,
+                <link linkend="IGuestSession__symlinkExists">IGuestSession::symlinkExists()</link>,
+                <link linkend="IGuestSession__symlinkRead">IGuestSession::symlinkRead()</link>,
                 IGuestSession::symlinkRemoveDirectory() and
                 IGuestSession::symlinkRemoveFile() are not
                 implemented yet.</para>
               </listitem>
               <listitem><para>The directory APIs
-                <xref linkend="IGuestSession__directoryRemove"
-                xreflabel="IGuestSession::directoryRemove()" />,
-                <xref linkend="IGuestSession__directoryRemoveRecursive"
-                xreflabel="IGuestSession::directoryRemoveRecursive()" />,
+                <link linkend="IGuestSession__directoryRemove">IGuestSession::directoryRemove()</link>,
+                <link linkend="IGuestSession__directoryRemoveRecursive">IGuestSession::directoryRemoveRecursive()</link>,
                 IGuestSession::directoryRename() and
                 IGuestSession::directorySetACL() are not
                 implemented yet.</para>
               </listitem>
               <listitem><para>The temporary file creation API
-                <xref linkend="IGuestSession__fileCreateTemp"
-                xreflabel="IGuestSession::fileCreateTemp()" /> is not
-                implemented yet.</para>
+                <link linkend="IGuestSession__fileCreateTemp">IGuestSession::fileCreateTemp()</link>
+                is not implemented yet.</para>
               </listitem>
               <listitem><para>Guest process termination via
-                <xref linkend="IProcess__terminate"
-                xreflabel="IProcess::terminate()" /> is not
-                implemented yet.</para>
+                <link linkend="IProcess__terminate">IProcess::terminate()</link>
+                is not implemented yet.</para>
               </listitem>
               <listitem><para>Waiting for guest process output via
-                <xref linkend="ProcessWaitForFlag__StdOut" xreflabel="ProcessWaitForFlag::StdOut" />
-                and <xref linkend="ProcessWaitForFlag__StdErr" xreflabel="ProcessWaitForFlag::StdErr" />
-                is not implemented yet.</para><para>To wait for process output, <xref linkend="IProcess__read"
-                xreflabel="IProcess::read()" /> with appropriate flags still can be used to periodically
-                check for new output data to arrive. Note that <xref linkend="ProcessCreateFlag__WaitForStdOut"
-                xreflabel="ProcessCreateFlag::WaitForStdOut" /> and / or
-                <xref linkend="ProcessCreateFlag__WaitForStdErr" xreflabel="ProcessCreateFlag::WaitForStdErr" />
-                need to be specified when creating a guest process via <xref linkend="IGuestSession__processCreate"
-                xreflabel="IGuestSession::processCreate()" /> or <xref linkend="IGuestSession__processCreateEx"
-                xreflabel="IGuestSession::processCreateEx()" />.</para>
+                <link linkend="ProcessWaitForFlag__StdOut">ProcessWaitForFlag::StdOut</link>
+                and
+                <link linkend="ProcessWaitForFlag__StdErr">ProcessWaitForFlag::StdErr</link>
+                is not implemented yet.</para>
+                <para>To wait for process output,
+                <link linkend="IProcess__read">IProcess::read()</link> with
+                appropriate flags still can be used to periodically check for
+                new output data to arrive. Note that
+                <link linkend="ProcessCreateFlag__WaitForStdOut">ProcessCreateFlag::WaitForStdOut</link>
+                and / or
+                <link linkend="ProcessCreateFlag__WaitForStdErr">ProcessCreateFlag::WaitForStdErr</link>
+                need to be specified when creating a guest process via
+                <link linkend="IGuestSession__processCreate">IGuestSession::processCreate()</link>
+                or
+                <link linkend="IGuestSession__processCreateEx">IGuestSession::processCreateEx()</link>.</para>
               </listitem>
               <listitem>
-                <para>ACL (Access Control List) handling in general is not implemented yet.</para>
+                <para>ACL (Access Control List) handling in general is not
+                implemented yet.</para>
               </listitem>
             </itemizedlist>
           </para>
         </listitem>
 
         <listitem>
-          <para>The <xref linkend="LockType" xreflabel="LockType" />
-          enumeration now has an additional value <computeroutput>VM</computeroutput>
-          which tells <xref linkend="IMachine__lockMachine"
-          xreflabel="IMachine::lockMachine()" /> to create a full-blown
-          object structure for running a VM. This was the previous behavior
-          with <computeroutput>Write</computeroutput>, which now only creates
-          the minimal object structure to save time and resources (at the
-          moment the Console object is still created, but all sub-objects
-          such as Display, Keyboard, Mouse, Guest are not.</para>
+          <para>The <link linkend="LockType">LockType</link>
+          enumeration now has an additional value
+          <computeroutput>VM</computeroutput> which tells
+          <link linkend="IMachine__lockMachine">IMachine::lockMachine()</link>
+          to create a full-blown object structure for running a VM. This was
+          the previous behavior with <computeroutput>Write</computeroutput>,
+          which now only creates the minimal object structure to save time and
+          resources (at the moment the Console object is still created, but all
+          sub-objects such as Display, Keyboard, Mouse, Guest are not.</para>
         </listitem>
 
         <listitem>
           <para>Machines can be put in groups (actually an array of groups).
           The primary group affects the default placement of files belonging
-          to a VM. <xref linkend="IVirtualBox__createMachine"
-          xreflabel="IVirtualBox::createMachine()"/> and
-          <xref linkend="IVirtualBox__composeMachineFilename"
-          xreflabel="IVirtualBox::composeMachineFilename()"/> have been
-          adjusted accordingly, the former taking an array of groups as an
-          additional parameter and the latter taking a group as an additional
-          parameter. The create option handling has been changed for those two
-          methods, too.</para>
+          to a VM.
+          <link linkend="IVirtualBox__createMachine">IVirtualBox::createMachine()</link>
+          and
+          <link linkend="IVirtualBox__composeMachineFilename">IVirtualBox::composeMachineFilename()</link>
+          have been adjusted accordingly, the former taking an array of groups
+          as an additional parameter and the latter taking a group as an
+          additional parameter. The create option handling has been changed for
+          those two methods, too.</para>
         </listitem>
 
         <listitem>
           <para>The method IVirtualBox::findMedium() has been removed, since
-          it provides a subset of the functionality of <xref linkend="IVirtualBox__openMedium"
-          xreflabel="IVirtualBox::openMedium()" />.</para>
+          it provides a subset of the functionality of
+          <link linkend="IVirtualBox__openMedium">IVirtualBox::openMedium()</link>.</para>
         </listitem>
 
         <listitem>
@@ -4561,127 +4699,127 @@ AuthResult AUTHCALL AuthEntry(
               </row>
               <row>
                 <entry>PointingHidType</entry>
-                <entry><xref linkend="PointingHIDType" xreflabel="PointingHIDType"/></entry>
+                <entry><link linkend="PointingHIDType">PointingHIDType</link></entry>
               </row>
               <row>
                 <entry>KeyboardHidType</entry>
-                <entry><xref linkend="KeyboardHIDType" xreflabel="KeyboardHIDType"/></entry>
+                <entry><link linkend="KeyboardHIDType">KeyboardHIDType</link></entry>
               </row>
               <row>
                 <entry>IPciAddress</entry>
-                <entry><xref linkend="IPCIAddress" xreflabel="IPCIAddress"/></entry>
+                <entry><link linkend="IPCIAddress">IPCIAddress</link></entry>
               </row>
               <row>
                 <entry>IPciDeviceAttachment</entry>
-                <entry><xref linkend="IPCIDeviceAttachment" xreflabel="IPCIDeviceAttachment"/></entry>
+                <entry><link linkend="IPCIDeviceAttachment">IPCIDeviceAttachment</link></entry>
               </row>
               <row>
                 <entry>IMachine::pointingHidType</entry>
-                <entry><xref linkend="IMachine__pointingHIDType" xreflabel="IMachine::pointingHIDType"/></entry>
+                <entry><link linkend="IMachine__pointingHIDType">IMachine::pointingHIDType</link></entry>
               </row>
               <row>
                 <entry>IMachine::keyboardHidType</entry>
-                <entry><xref linkend="IMachine__keyboardHIDType" xreflabel="IMachine::keyboardHIDType"/></entry>
+                <entry><link linkend="IMachine__keyboardHIDType">IMachine::keyboardHIDType</link></entry>
               </row>
               <row>
                 <entry>IMachine::hpetEnabled</entry>
-                <entry><xref linkend="IMachine__HPETEnabled" xreflabel="IMachine::HPETEnabled"/></entry>
+                <entry><link linkend="IMachine__HPETEnabled">IMachine::HPETEnabled</link></entry>
               </row>
               <row>
                 <entry>IMachine::sessionPid</entry>
-                <entry><xref linkend="IMachine__sessionPID" xreflabel="IMachine::sessionPID"/></entry>
+                <entry><link linkend="IMachine__sessionPID">IMachine::sessionPID</link></entry>
               </row>
               <row>
                 <entry>IMachine::ioCacheEnabled</entry>
-                <entry><xref linkend="IMachine__IOCacheEnabled" xreflabel="IMachine::IOCacheEnabled"/></entry>
+                <entry><link linkend="IMachine__IOCacheEnabled">IMachine::IOCacheEnabled</link></entry>
               </row>
               <row>
                 <entry>IMachine::ioCacheSize</entry>
-                <entry><xref linkend="IMachine__IOCacheSize" xreflabel="IMachine::IOCacheSize"/></entry>
+                <entry><link linkend="IMachine__IOCacheSize">IMachine::IOCacheSize</link></entry>
               </row>
               <row>
                 <entry>IMachine::pciDeviceAssignments</entry>
-                <entry><xref linkend="IMachine__PCIDeviceAssignments" xreflabel="IMachine::PCIDeviceAssignments"/></entry>
+                <entry><link linkend="IMachine__PCIDeviceAssignments">IMachine::PCIDeviceAssignments</link></entry>
               </row>
               <row>
                 <entry>IMachine::attachHostPciDevice()</entry>
-                <entry><xref linkend="IMachine__attachHostPCIDevice" xreflabel="IMachine::attachHostPCIDevice"/></entry>
+                <entry><link linkend="IMachine__attachHostPCIDevice">IMachine::attachHostPCIDevice</link></entry>
               </row>
               <row>
                 <entry>IMachine::detachHostPciDevice()</entry>
-                <entry><xref linkend="IMachine__detachHostPCIDevice" xreflabel="IMachine::detachHostPCIDevice()"/></entry>
+                <entry><link linkend="IMachine__detachHostPCIDevice">IMachine::detachHostPCIDevice()</link></entry>
               </row>
               <row>
                 <entry>IConsole::attachedPciDevices</entry>
-                <entry><xref linkend="IConsole__attachedPCIDevices" xreflabel="IConsole::attachedPCIDevices"/></entry>
+                <entry><link linkend="IConsole__attachedPCIDevices">IConsole::attachedPCIDevices</link></entry>
               </row>
               <row>
                 <entry>IHostNetworkInterface::dhcpEnabled</entry>
-                <entry><xref linkend="IHostNetworkInterface__DHCPEnabled" xreflabel="IHostNetworkInterface::DHCPEnabled"/></entry>
+                <entry><link linkend="IHostNetworkInterface__DHCPEnabled">IHostNetworkInterface::DHCPEnabled</link></entry>
               </row>
               <row>
                 <entry>IHostNetworkInterface::enableStaticIpConfig()</entry>
-                <entry><xref linkend="IHostNetworkInterface__enableStaticIPConfig" xreflabel="IHostNetworkInterface::enableStaticIPConfig()"/></entry>
+                <entry><link linkend="IHostNetworkInterface__enableStaticIPConfig">IHostNetworkInterface::enableStaticIPConfig()</link></entry>
               </row>
               <row>
                 <entry>IHostNetworkInterface::enableStaticIpConfigV6()</entry>
-                <entry><xref linkend="IHostNetworkInterface__enableStaticIPConfigV6" xreflabel="IHostNetworkInterface::enableStaticIPConfigV6()"/></entry>
+                <entry><link linkend="IHostNetworkInterface__enableStaticIPConfigV6">IHostNetworkInterface::enableStaticIPConfigV6()</link></entry>
               </row>
               <row>
                 <entry>IHostNetworkInterface::enableDynamicIpConfig()</entry>
-                <entry><xref linkend="IHostNetworkInterface__enableDynamicIPConfig" xreflabel="IHostNetworkInterface::enableDynamicIPConfig()"/></entry>
+                <entry><link linkend="IHostNetworkInterface__enableDynamicIPConfig">IHostNetworkInterface::enableDynamicIPConfig()</link></entry>
               </row>
               <row>
                 <entry>IHostNetworkInterface::dhcpRediscover()</entry>
-                <entry><xref linkend="IHostNetworkInterface__DHCPRediscover" xreflabel="IHostNetworkInterface::DHCPRediscover()"/></entry>
+                <entry><link linkend="IHostNetworkInterface__DHCPRediscover">IHostNetworkInterface::DHCPRediscover()</link></entry>
               </row>
               <row>
                 <entry>IHost::Acceleration3DAvailable</entry>
-                <entry><xref linkend="IHost__acceleration3DAvailable" xreflabel="IHost::acceleration3DAvailable"/></entry>
+                <entry><link linkend="IHost__acceleration3DAvailable">IHost::acceleration3DAvailable</link></entry>
               </row>
               <row>
                 <entry>IGuestOSType::recommendedPae</entry>
-                <entry><xref linkend="IGuestOSType__recommendedPAE" xreflabel="IGuestOSType::recommendedPAE"/></entry>
+                <entry><link linkend="IGuestOSType__recommendedPAE">IGuestOSType::recommendedPAE</link></entry>
               </row>
               <row>
                 <entry>IGuestOSType::recommendedDvdStorageController</entry>
-                <entry><xref linkend="IGuestOSType__recommendedDVDStorageController" xreflabel="IGuestOSType::recommendedDVDStorageController"/></entry>
+                <entry><link linkend="IGuestOSType__recommendedDVDStorageController">IGuestOSType::recommendedDVDStorageController</link></entry>
               </row>
               <row>
                 <entry>IGuestOSType::recommendedDvdStorageBus</entry>
-                <entry><xref linkend="IGuestOSType__recommendedDVDStorageBus" xreflabel="IGuestOSType::recommendedDVDStorageBus"/></entry>
+                <entry><link linkend="IGuestOSType__recommendedDVDStorageBus">IGuestOSType::recommendedDVDStorageBus</link></entry>
               </row>
               <row>
                 <entry>IGuestOSType::recommendedHdStorageController</entry>
-                <entry><xref linkend="IGuestOSType__recommendedHDStorageController" xreflabel="IGuestOSType::recommendedHDStorageController"/></entry>
+                <entry><link linkend="IGuestOSType__recommendedHDStorageController">IGuestOSType::recommendedHDStorageController</link></entry>
               </row>
               <row>
                 <entry>IGuestOSType::recommendedHdStorageBus</entry>
-                <entry><xref linkend="IGuestOSType__recommendedHDStorageBus" xreflabel="IGuestOSType::recommendedHDStorageBus"/></entry>
+                <entry><link linkend="IGuestOSType__recommendedHDStorageBus">IGuestOSType::recommendedHDStorageBus</link></entry>
               </row>
               <row>
                 <entry>IGuestOSType::recommendedUsbHid</entry>
-                <entry><xref linkend="IGuestOSType__recommendedUSBHID" xreflabel="IGuestOSType::recommendedUSBHID"/></entry>
+                <entry><link linkend="IGuestOSType__recommendedUSBHID">IGuestOSType::recommendedUSBHID</link></entry>
               </row>
               <row>
                 <entry>IGuestOSType::recommendedHpet</entry>
-                <entry><xref linkend="IGuestOSType__recommendedHPET" xreflabel="IGuestOSType::recommendedHPET"/></entry>
+                <entry><link linkend="IGuestOSType__recommendedHPET">IGuestOSType::recommendedHPET</link></entry>
               </row>
               <row>
                 <entry>IGuestOSType::recommendedUsbTablet</entry>
-                <entry><xref linkend="IGuestOSType__recommendedUSBTablet" xreflabel="IGuestOSType::recommendedUSBTablet"/></entry>
+                <entry><link linkend="IGuestOSType__recommendedUSBTablet">IGuestOSType::recommendedUSBTablet</link></entry>
               </row>
               <row>
                 <entry>IGuestOSType::recommendedRtcUseUtc</entry>
-                <entry><xref linkend="IGuestOSType__recommendedRTCUseUTC" xreflabel="IGuestOSType::recommendedRTCUseUTC"/></entry>
+                <entry><link linkend="IGuestOSType__recommendedRTCUseUTC">IGuestOSType::recommendedRTCUseUTC</link></entry>
               </row>
               <row>
                 <entry>IGuestOSType::recommendedUsb</entry>
-                <entry><xref linkend="IGuestOSType__recommendedUSB" xreflabel="IGuestOSType::recommendedUSB"/></entry>
+                <entry><link linkend="IGuestOSType__recommendedUSB">IGuestOSType::recommendedUSB</link></entry>
               </row>
               <row>
                 <entry>INetworkAdapter::natDriver</entry>
-                <entry><xref linkend="INetworkAdapter__NATEngine" xreflabel="INetworkAdapter::NATEngine"/></entry>
+                <entry><link linkend="INetworkAdapter__NATEngine">INetworkAdapter::NATEngine</link></entry>
               </row>
               <row>
                 <entry>IUSBController::enabledEhci</entry>
@@ -4689,47 +4827,47 @@ AuthResult AUTHCALL AuthEntry(
               </row>
               <row>
                 <entry>INATEngine::tftpPrefix</entry>
-                <entry><xref linkend="INATEngine__TFTPPrefix" xreflabel="INATEngine::TFTPPrefix"/></entry>
+                <entry><link linkend="INATEngine__TFTPPrefix">INATEngine::TFTPPrefix</link></entry>
               </row>
               <row>
                 <entry>INATEngine::tftpBootFile</entry>
-                <entry><xref linkend="INATEngine__TFTPBootFile" xreflabel="INATEngine::TFTPBootFile"/></entry>
+                <entry><link linkend="INATEngine__TFTPBootFile">INATEngine::TFTPBootFile</link></entry>
               </row>
               <row>
                 <entry>INATEngine::tftpNextServer</entry>
-                <entry><xref linkend="INATEngine__TFTPNextServer" xreflabel="INATEngine::TFTPNextServer"/></entry>
+                <entry><link linkend="INATEngine__TFTPNextServer">INATEngine::TFTPNextServer</link></entry>
               </row>
               <row>
                 <entry>INATEngine::dnsPassDomain</entry>
-                <entry><xref linkend="INATEngine__DNSPassDomain" xreflabel="INATEngine::DNSPassDomain"/></entry>
+                <entry><link linkend="INATEngine__DNSPassDomain">INATEngine::DNSPassDomain</link></entry>
               </row>
               <row>
                 <entry>INATEngine::dnsProxy</entry>
-                <entry><xref linkend="INATEngine__DNSProxy" xreflabel="INATEngine::DNSProxy"/></entry>
+                <entry><link linkend="INATEngine__DNSProxy">INATEngine::DNSProxy</link></entry>
               </row>
               <row>
                 <entry>INATEngine::dnsUseHostResolver</entry>
-                <entry><xref linkend="INATEngine__DNSUseHostResolver" xreflabel="INATEngine::DNSUseHostResolver"/></entry>
+                <entry><link linkend="INATEngine__DNSUseHostResolver">INATEngine::DNSUseHostResolver</link></entry>
               </row>
               <row>
                 <entry>VBoxEventType::OnHostPciDevicePlug</entry>
-                <entry><xref linkend="VBoxEventType__OnHostPCIDevicePlug" xreflabel="VBoxEventType::OnHostPCIDevicePlug"/></entry>
+                <entry><link linkend="VBoxEventType__OnHostPCIDevicePlug">VBoxEventType::OnHostPCIDevicePlug</link></entry>
               </row>
               <row>
                 <entry>ICPUChangedEvent::cpu</entry>
-                <entry><xref linkend="ICPUChangedEvent__CPU" xreflabel="ICPUChangedEvent::CPU"/></entry>
+                <entry><link linkend="ICPUChangedEvent__CPU">ICPUChangedEvent::CPU</link></entry>
               </row>
               <row>
                 <entry>INATRedirectEvent::hostIp</entry>
-                <entry><xref linkend="INATRedirectEvent__hostIP" xreflabel="INATRedirectEvent::hostIP"/></entry>
+                <entry><link linkend="INATRedirectEvent__hostIP">INATRedirectEvent::hostIP</link></entry>
               </row>
               <row>
                 <entry>INATRedirectEvent::guestIp</entry>
-                <entry><xref linkend="INATRedirectEvent__guestIP" xreflabel="INATRedirectEvent::guestIP"/></entry>
+                <entry><link linkend="INATRedirectEvent__guestIP">INATRedirectEvent::guestIP</link></entry>
               </row>
               <row>
                 <entry>IHostPciDevicePlugEvent</entry>
-                <entry><xref linkend="IHostPCIDevicePlugEvent" xreflabel="IHostPCIDevicePlugEvent"/></entry>
+                <entry><link linkend="IHostPCIDevicePlugEvent">IHostPCIDevicePlugEvent</link></entry>
               </row>
             </tbody>
           </tgroup></table></para>
@@ -4742,24 +4880,26 @@ AuthResult AUTHCALL AuthEntry(
 
       <itemizedlist>
         <listitem>
-          <para>The method <xref linkend="IAppliance__importMachines"
-          xreflabel="IAppliance::importMachines()" /> has one more parameter
-          now, which allows to configure the import process in more detail.
+          <para>The method
+          <link linkend="IAppliance__importMachines">IAppliance::importMachines()</link>
+          has one more parameter now, which allows to configure the import
+          process in more detail.
           </para>
         </listitem>
 
         <listitem>
-          <para>The method <xref linkend="IVirtualBox__openMedium"
-          xreflabel="IVirtualBox::openMedium()" /> has one more parameter
-          now, which allows resolving duplicate medium UUIDs without the need
-          for external tools.</para>
+          <para>The method
+          <link linkend="IVirtualBox__openMedium">IVirtualBox::openMedium()</link>
+          has one more parameter now, which allows resolving duplicate medium
+          UUIDs without the need for external tools.</para>
         </listitem>
 
         <listitem>
-          <para>The <xref linkend="INetworkAdapter" xreflabel="INetworkAdapter"/>
+          <para>The <link linkend="INetworkAdapter">INetworkAdapter</link>
           interface has been cleaned up. The various methods to activate an
           attachment type have been replaced by the
-          <xref linkend="INetworkAdapter__attachmentType" xreflabel="INetworkAdapter::attachmentType"/> setter.</para>
+          <link linkend="INetworkAdapter__attachmentType">INetworkAdapter::attachmentType</link>
+          setter.</para>
           <para>Additionally each attachment mode now has its own attribute,
           which means that host only networks no longer share the settings with
           bridged interfaces.</para>
@@ -4771,60 +4911,71 @@ AuthResult AUTHCALL AuthEntry(
 
         <listitem>
           <para>This version introduces the guest facilities concept. A guest
-          facility either represents a module or feature the guest is running or
-          offering, which is defined by <xref linkend="AdditionsFacilityType"
-          xreflabel="AdditionsFacilityType"/>. Each facility is member of a
-          <xref linkend="AdditionsFacilityClass" xreflabel="AdditionsFacilityClass"/>
-          and has a current status indicated by <xref linkend="AdditionsFacilityStatus"
-          xreflabel="AdditionsFacilityStatus"/>, together with a timestamp (in ms) of
-          the last status update.</para>
+          facility either represents a module or feature the guest is running
+          or offering, which is defined by
+          <link linkend="AdditionsFacilityType">AdditionsFacilityType</link>.
+          Each facility is member of a
+          <link linkend="AdditionsFacilityClass">AdditionsFacilityClass</link>
+          and has a current status indicated by
+          <link linkend="AdditionsFacilityStatus">AdditionsFacilityStatus</link>,
+          together with a timestamp (in ms) of the last status update.</para>
           <para>To address the above concept, the following changes were made:
             <itemizedlist>
               <listitem>
                 <para>
-                  In the <xref linkend="IGuest" xreflabel="IGuest"/> interface, the following were removed:
+                  In the <link linkend="IGuest">IGuest</link> interface, the
+                  following were removed:
                   <itemizedlist>
                     <listitem>
-                      <para>the <computeroutput>supportsSeamless</computeroutput> attribute;</para>
+                      <para>the
+                      <computeroutput>supportsSeamless</computeroutput>
+                      attribute;</para>
                     </listitem>
                     <listitem>
-                      <para>the <computeroutput>supportsGraphics</computeroutput> attribute;</para>
+                      <para>the
+                      <computeroutput>supportsGraphics</computeroutput>
+                      attribute;</para>
                     </listitem>
                   </itemizedlist>
                 </para>
               </listitem>
               <listitem>
                 <para>
-                  The function <xref linkend="IGuest__getFacilityStatus" xreflabel="IGuest::getFacilityStatus()"/>
-                  was added. It quickly provides a facility's status without the need to get the facility
-                  collection with <xref linkend="IGuest__facilities" xreflabel="IGuest::facilities"/>.
+                  The function
+                  <link linkend="IGuest__getFacilityStatus">IGuest::getFacilityStatus()</link>
+                  was added. It quickly provides a facility's status without
+                  the need to get the facility collection with
+                  <link linkend="IGuest__facilities">IGuest::facilities</link>.
                 </para>
               </listitem>
               <listitem>
                 <para>
-                  The attribute <xref linkend="IGuest__facilities" xreflabel="IGuest::facilities"/>
-                  was added to provide an easy to access collection of all currently known guest
-                  facilities, that is, it contains all facilies where at least one status update was
-                  made since the guest was started.
+                  The attribute
+                  <link linkend="IGuest__facilities">IGuest::facilities</link>
+                  was added to provide an easy to access collection of all
+                  currently known guest facilities, that is, it contains all
+                  facilies where at least one status update was made since the
+                  guest was started.
                 </para>
               </listitem>
               <listitem>
                 <para>
-                  The interface <xref linkend="IAdditionsFacility" xreflabel="IAdditionsFacility"/>
+                  The interface
+                  <link linkend="IAdditionsFacility">IAdditionsFacility</link>
                   was added to represent a single facility returned by
-                  <xref linkend="IGuest__facilities" xreflabel="IGuest::facilities"/>.
+                  <link linkend="IGuest__facilities">IGuest::facilities</link>.
                 </para>
               </listitem>
               <listitem>
                 <para>
-                  <xref linkend="AdditionsFacilityStatus" xreflabel="AdditionsFacilityStatus"/>
+                  <link linkend="AdditionsFacilityStatus">AdditionsFacilityStatus</link>
                   was added to represent a facility's overall status.
                 </para>
               </listitem>
               <listitem>
                 <para>
-                  <xref linkend="AdditionsFacilityType" xreflabel="AdditionsFacilityType"/> and
-                  <xref linkend="AdditionsFacilityClass" xreflabel="AdditionsFacilityClass"/> were
+                  <link linkend="AdditionsFacilityType">AdditionsFacilityType</link> and
+                  <link linkend="AdditionsFacilityClass">AdditionsFacilityClass</link> were
                   added to represent the facility's type and class.
                 </para>
               </listitem>
@@ -4844,8 +4995,7 @@ AuthResult AUTHCALL AuthEntry(
           targeting both local (COM/XPCOM) and remote (SOAP) transports. Now,
           instead of <computeroutput>IWebsessionManager</computeroutput>, the
           new class <computeroutput>VirtualBoxManager</computeroutput> must be
-          used. See <xref linkend="javaapi" xreflabel="Java API chapter" />
-          for details.</para>
+          used. See <xref linkend="javaapi"/> for details.</para>
         </listitem>
 
         <listitem>
@@ -4855,9 +5005,9 @@ AuthResult AUTHCALL AuthEntry(
               <listitem>
                 <para>Replace any
                 <computeroutput>IVirtualBox::openSession(uuidMachine,
-                ...)</computeroutput> API call with the machine's <xref
-                linkend="IMachine__lockMachine"
-                xreflabel="IMachine::lockMachine()" /> call and a
+                ...)</computeroutput> API call with the machine's
+                <link linkend="IMachine__lockMachine">IMachine::lockMachine()</link>
+                call and a
                 <computeroutput>LockType.Write</computeroutput> argument. The
                 functionality is unchanged, but instead of "opening a direct
                 session on a machine" all documentation now refers to
@@ -4868,14 +5018,13 @@ AuthResult AUTHCALL AuthEntry(
               <listitem>
                 <para>Similarly, replace any
                 <computeroutput>IVirtualBox::openExistingSession(uuidMachine,
-                ...)</computeroutput> call with the machine's <xref
-                linkend="IMachine__lockMachine"
-                xreflabel="IMachine::lockMachine()" /> call and a
-                <computeroutput>LockType.Shared</computeroutput> argument.
-                Whereas it was previously impossible to connect a client
-                session to a running VM process in a race-free manner, the new
-                API will atomically either write-lock the machine for the
-                current session or establish a remote link to an existing
+                ...)</computeroutput> call with the machine's
+                <link linkend="IMachine__lockMachine">IMachine::lockMachine()</link>
+                call and a <computeroutput>LockType.Shared</computeroutput>
+                argument. Whereas it was previously impossible to connect a
+                client session to a running VM process in a race-free manner,
+                the new API will atomically either write-lock the machine for
+                the current session or establish a remote link to an existing
                 session. Existing client code which tried calling both
                 <computeroutput>openSession()</computeroutput> and
                 <computeroutput>openExistingSession()</computeroutput> can now
@@ -4885,17 +5034,15 @@ AuthResult AUTHCALL AuthEntry(
               <listitem>
                 <para>Third, replace any
                 <computeroutput>IVirtualBox::openRemoteSession(uuidMachine,
-                ...)</computeroutput> call with the machine's <xref
-                linkend="IMachine__launchVMProcess"
-                xreflabel="IMachine::launchVMProcess()" /> call. The
-                functionality is unchanged.</para>
+                ...)</computeroutput> call with the machine's
+                <link linkend="IMachine__launchVMProcess">IMachine::launchVMProcess()</link>
+                call. The functionality is unchanged.</para>
               </listitem>
 
               <listitem>
-                <para>The <xref linkend="SessionState"
-                xreflabel="SessionState" /> enum was adjusted accordingly:
-                "Open" is now "Locked", "Closed" is now "Unlocked", "Closing"
-                is now "Unlocking".</para>
+                <para>The <link linkend="SessionState">SessionState</link> enum
+                was adjusted accordingly: "Open" is now "Locked", "Closed" is
+                now "Unlocked", "Closing" is now "Unlocking".</para>
               </listitem>
             </itemizedlist></para>
         </listitem>
@@ -4910,22 +5057,21 @@ AuthResult AUTHCALL AuthEntry(
               <listitem>
                 <para>Neither
                 <computeroutput>IVirtualBox::createHardDisk()</computeroutput>
-                nor <xref linkend="IVirtualBox__openMedium"
-                xreflabel="IVirtualBox::openMedium()" /> register media
-                automatically any more.</para>
+                nor
+                <link linkend="IVirtualBox__openMedium">IVirtualBox::openMedium()</link>
+                register media automatically any more.</para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="IMachine__attachDevice"
-                xreflabel="IMachine::attachDevice()" /> and <xref
-                linkend="IMachine__mountMedium"
-                xreflabel="IMachine::mountMedium()" /> now take an IMedium
-                object instead of a UUID as an argument. It is these two calls
-                which add media to a registry now (either a machine registry
-                for machines created with VirtualBox 4.0 or later or the
-                global registry otherwise). As a consequence, if a medium is
-                opened but never attached to a machine, it is no longer added
-                to any registry any more.</para>
+                <para><link linkend="IMachine__attachDevice">IMachine::attachDevice()</link>
+                and
+                <link linkend="IMachine__mountMedium">IMachine::mountMedium()</link>
+                now take an IMedium object instead of a UUID as an argument. It
+                is these two calls which add media to a registry now (either a
+                machine registry for machines created with VirtualBox 4.0 or
+                later or the global registry otherwise). As a consequence, if a
+                medium is opened but never attached to a machine, it is no
+                longer added to any registry any more.</para>
               </listitem>
 
               <listitem>
@@ -4934,9 +5080,8 @@ AuthResult AUTHCALL AuthEntry(
                 getDVDImage(), findFloppyImage() and getFloppyImage() have all
                 been merged into IVirtualBox::findMedium(), and
                 IVirtualBox::openHardDisk(), openDVDImage() and
-                openFloppyImage() have all been merged into <xref
-                linkend="IVirtualBox__openMedium"
-                xreflabel="IVirtualBox::openMedium()" />.</para>
+                openFloppyImage() have all been merged into
+                <link linkend="IVirtualBox__openMedium">IVirtualBox::openMedium()</link>.</para>
               </listitem>
 
               <listitem>
@@ -4953,9 +5098,10 @@ AuthResult AUTHCALL AuthEntry(
               </listitem>
 
               <listitem>
-                <para>The <xref linkend="ISystemProperties__infoVDSize"
-                xreflabel="ISystemProperties::infoVDSize" /> attribute
-                replaces the <computeroutput>getMaxVDISize()</computeroutput>
+                <para>The
+                <link linkend="ISystemProperties__infoVDSize">ISystemProperties::infoVDSize</link>
+                attribute replaces the
+                <computeroutput>getMaxVDISize()</computeroutput>
                 API call; this now uses bytes instead of megabytes.</para>
               </listitem>
             </itemizedlist></para>
@@ -4964,11 +5110,11 @@ AuthResult AUTHCALL AuthEntry(
         <listitem>
           <para>Machine management APIs were enhanced as follows:<itemizedlist>
               <listitem>
-                <para><xref linkend="IVirtualBox__createMachine"
-                xreflabel="IVirtualBox::createMachine()" /> is no longer
-                restricted to creating machines in the default "Machines"
-                folder, but can now create machines at arbitrary locations.
-                For this to work, the parameter list had to be changed.</para>
+                <para><link linkend="IVirtualBox__createMachine">IVirtualBox::createMachine()</link>
+                is no longer restricted to creating machines in the default
+                "Machines" folder, but can now create machines at arbitrary
+                locations. For this to work, the parameter list had to be
+                changed.</para>
               </listitem>
 
               <listitem>
@@ -4981,18 +5127,20 @@ AuthResult AUTHCALL AuthEntry(
                 <para>To reduce code duplication and for consistency with the
                 aforementioned media APIs,
                 <computeroutput>IVirtualBox::getMachine()</computeroutput> has
-                been merged with <xref linkend="IVirtualBox__findMachine"
-                xreflabel="IVirtualBox::findMachine()" />, and
+                been merged with
+                <link linkend="IVirtualBox__findMachine">IVirtualBox::findMachine()</link>,
+                and
                 <computeroutput>IMachine::getSnapshot()</computeroutput> has
-                been merged with <xref linkend="IMachine__findSnapshot"
-                xreflabel="IMachine::findSnapshot()" />.</para>
+                been merged with
+                <link linkend="IMachine__findSnapshot">IMachine::findSnapshot()</link>.</para>
               </listitem>
 
               <listitem>
                 <para><computeroutput>IVirtualBox::unregisterMachine()</computeroutput>
-                was replaced with <xref linkend="IMachine__unregister"
-                xreflabel="IMachine::unregister()" /> with additional
-                functionality for cleaning up machine files.</para>
+                was replaced with
+                <link linkend="IMachine__unregister">IMachine::unregister()</link>
+                with additional functionality for cleaning up machine
+                files.</para>
               </listitem>
 
               <listitem>
@@ -5007,7 +5155,8 @@ AuthResult AUTHCALL AuthEntry(
 
               <listitem>
                 <para><computeroutput>IConsole::forgetSavedState</computeroutput>
-                has been renamed to <computeroutput>IConsole::discardSavedState()</computeroutput>.</para>
+                has been renamed to
+                <computeroutput>IConsole::discardSavedState()</computeroutput>.</para>
               </listitem>
             </itemizedlist></para>
         </listitem>
@@ -5016,22 +5165,22 @@ AuthResult AUTHCALL AuthEntry(
           <para>All event callbacks APIs were replaced with a new, generic
           event mechanism that can be used both locally (COM, XPCOM) and
           remotely (web services). Also, the new mechanism is usable from
-          scripting languages and a local Java. See <xref linkend="IEvent"
-          xreflabel="events" /> for details. The new concept will require
-          changes to all clients that used event callbacks.</para>
+          scripting languages and a local Java. See
+          <link linkend="IEvent">events</link> for details. The new concept
+          will require changes to all clients that used event callbacks.</para>
         </listitem>
 
         <listitem>
-          <para><computeroutput>additionsActive()</computeroutput> was
-          replaced with <xref linkend="IGuest__additionsRunLevel"
-          xreflabel="additionsRunLevel()" /> and <xref
-          linkend="IGuest__getAdditionsStatus"
-          xreflabel="getAdditionsStatus()" /> in order to support a more
-          detailed status of the current Guest Additions loading/readiness
-          state. <xref linkend="IGuest__additionsVersion"
-          xreflabel="IGuest::additionsVersion()" /> no longer returns the
-          Guest Additions interface version but the installed Guest Additions
-          version and revision in form of
+          <para><computeroutput>additionsActive()</computeroutput> was replaced
+          with
+          <link linkend="IGuest__additionsRunLevel">additionsRunLevel()</link>
+          and
+          <link linkend="IGuest__getAdditionsStatus">getAdditionsStatus()</link>
+          in order to support a more detailed status of the current Guest
+          Additions loading/readiness state.
+          <link linkend="IGuest__additionsVersion">IGuest::additionsVersion()</link>
+          no longer returns the Guest Additions interface version but the
+          installed Guest Additions version and revision in form of
           <computeroutput>3.3.0r12345</computeroutput>.</para>
         </listitem>
 
@@ -5040,22 +5189,19 @@ AuthResult AUTHCALL AuthEntry(
           APIs were extended to require an additional
           <computeroutput>automount</computeroutput> parameter: <itemizedlist>
               <listitem>
-                <para><xref linkend="IVirtualBox__createSharedFolder"
-                xreflabel="IVirtualBox::createSharedFolder()" /></para>
+                <para><link linkend="IVirtualBox__createSharedFolder">IVirtualBox::createSharedFolder()</link></para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="IMachine__createSharedFolder"
-                xreflabel="IMachine::createSharedFolder()" /></para>
+                <para><link linkend="IMachine__createSharedFolder">IMachine::createSharedFolder()</link></para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="IConsole__createSharedFolder"
-                xreflabel="IConsole::createSharedFolder()" /></para>
+                <para><link linkend="IConsole__createSharedFolder">IConsole::createSharedFolder()</link></para>
               </listitem>
             </itemizedlist> Also, a new property named
-          <computeroutput>autoMount</computeroutput> was added to the <xref
-          linkend="ISharedFolder" xreflabel="ISharedFolder" />
+          <computeroutput>autoMount</computeroutput> was added to the
+          <link linkend="ISharedFolder">ISharedFolder</link>
           interface.</para>
         </listitem>
 
@@ -5070,16 +5216,16 @@ AuthResult AUTHCALL AuthEntry(
               </listitem>
 
               <listitem>
-                <para><xref linkend="IAppliance__write"
-                xreflabel="IAppliance::write()" /> received an extra parameter
+                <para><link linkend="IAppliance__write">IAppliance::write()</link>
+                received an extra parameter
                 <computeroutput>manifest</computeroutput>, which can suppress
                 creating the manifest file on export.</para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="IVFSExplorer__entryList"
-                xreflabel="IVFSExplorer::entryList()" /> received two extra
-                parameters <computeroutput>sizes</computeroutput> and
+                <para><link linkend="IVFSExplorer__entryList">IVFSExplorer::entryList()</link>
+                received two extra parameters
+                <computeroutput>sizes</computeroutput> and
                 <computeroutput>modes</computeroutput>, which contains the
                 sizes (in bytes) and the file access modes (in octal form) of
                 the returned files.</para>
@@ -5099,31 +5245,31 @@ AuthResult AUTHCALL AuthEntry(
           interface: <itemizedlist>
               <listitem>
                 <para><computeroutput>IVRDPServer</computeroutput> has been
-                renamed to <xref linkend="IVRDEServer"
-                xreflabel="IVRDEServer" />.</para>
+                renamed to
+                <link linkend="IVRDEServer">IVRDEServer</link>.</para>
               </listitem>
 
               <listitem>
                 <para><computeroutput>IRemoteDisplayInfo</computeroutput> has
-                been renamed to <xref linkend="IVRDEServerInfo"
-                xreflabel="IVRDEServerInfo" />.</para>
+                been renamed to
+                <link linkend="IVRDEServerInfo">IVRDEServerInfo</link>.</para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="IMachine__VRDEServer"
-                xreflabel="IMachine::VRDEServer" /> replaces
+                <para><link linkend="IMachine__VRDEServer">IMachine::VRDEServer</link>
+                replaces
                 <computeroutput>VRDPServer.</computeroutput></para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="IConsole__VRDEServerInfo"
-                xreflabel="IConsole::VRDEServerInfo" /> replaces
+                <para><link linkend="IConsole__VRDEServerInfo">IConsole::VRDEServerInfo</link>
+                replaces
                 <computeroutput>RemoteDisplayInfo</computeroutput>.</para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="ISystemProperties__VRDEAuthLibrary"
-                xreflabel="ISystemProperties::VRDEAuthLibrary" /> replaces
+                <para><link linkend="ISystemProperties__VRDEAuthLibrary">ISystemProperties::VRDEAuthLibrary</link>
+                replaces
                 <computeroutput>RemoteDisplayAuthLibrary</computeroutput>.</para>
               </listitem>
 
@@ -5132,18 +5278,15 @@ AuthResult AUTHCALL AuthEntry(
                 <computeroutput>IVRDEServer</computeroutput> to support
                 generic VRDE properties: <itemizedlist>
                     <listitem>
-                      <para><xref linkend="IVRDEServer__setVRDEProperty"
-                      xreflabel="IVRDEServer::setVRDEProperty" /></para>
+                      <para><link linkend="IVRDEServer__setVRDEProperty">IVRDEServer::setVRDEProperty</link></para>
                     </listitem>
 
                     <listitem>
-                      <para><xref linkend="IVRDEServer__getVRDEProperty"
-                      xreflabel="IVRDEServer::getVRDEProperty" /></para>
+                      <para><link linkend="IVRDEServer__getVRDEProperty">IVRDEServer::getVRDEProperty</link></para>
                     </listitem>
 
                     <listitem>
-                      <para><xref linkend="IVRDEServer__VRDEProperties"
-                      xreflabel="IVRDEServer::VRDEProperties" /></para>
+                      <para><link linkend="IVRDEServer__VRDEProperties">IVRDEServer::VRDEProperties</link></para>
                     </listitem>
                   </itemizedlist></para>
 
@@ -5196,7 +5339,7 @@ AuthResult AUTHCALL AuthEntry(
           <para>The VirtualBox external authentication module interface has
           been updated and made more generic. Because of that,
           <computeroutput>VRDPAuthType</computeroutput> enumeration has been
-          renamed to <xref linkend="AuthType" xreflabel="AuthType" />.</para>
+          renamed to <link linkend="AuthType">AuthType</link>.</para>
         </listitem>
       </itemizedlist>
     </sect1>
@@ -5209,45 +5352,38 @@ AuthResult AUTHCALL AuthEntry(
           <para>The following interfaces were renamed for consistency:
           <itemizedlist>
               <listitem>
-                <para>IMachine::getCpuProperty() is now <xref
-                linkend="IMachine__getCPUProperty"
-                xreflabel="IMachine::getCPUProperty()" />;</para>
+                <para>IMachine::getCpuProperty() is now
+                <link linkend="IMachine__getCPUProperty">IMachine::getCPUProperty()</link>;</para>
               </listitem>
 
               <listitem>
-                <para>IMachine::setCpuProperty() is now <xref
-                linkend="IMachine__setCPUProperty"
-                xreflabel="IMachine::setCPUProperty()" />;</para>
+                <para>IMachine::setCpuProperty() is now
+                <link linkend="IMachine__setCPUProperty">IMachine::setCPUProperty()</link>;</para>
               </listitem>
 
               <listitem>
-                <para>IMachine::getCpuIdLeaf() is now <xref
-                linkend="IMachine__getCPUIDLeaf"
-                xreflabel="IMachine::getCPUIDLeaf()" />;</para>
+                <para>IMachine::getCpuIdLeaf() is now
+                <link linkend="IMachine__getCPUIDLeaf">IMachine::getCPUIDLeaf()</link>;</para>
               </listitem>
 
               <listitem>
-                <para>IMachine::setCpuIdLeaf() is now <xref
-                linkend="IMachine__setCPUIDLeaf"
-                xreflabel="IMachine::setCPUIDLeaf()" />;</para>
+                <para>IMachine::setCpuIdLeaf() is now
+                <link linkend="IMachine__setCPUIDLeaf">IMachine::setCPUIDLeaf()</link>;</para>
               </listitem>
 
               <listitem>
-                <para>IMachine::removeCpuIdLeaf() is now <xref
-                linkend="IMachine__removeCPUIDLeaf"
-                xreflabel="IMachine::removeCPUIDLeaf()" />;</para>
+                <para>IMachine::removeCpuIdLeaf() is now
+                <link linkend="IMachine__removeCPUIDLeaf">IMachine::removeCPUIDLeaf()</link>;</para>
               </listitem>
 
               <listitem>
-                <para>IMachine::removeAllCpuIdLeafs() is now <xref
-                linkend="IMachine__removeAllCPUIDLeaves"
-                xreflabel="IMachine::removeAllCPUIDLeaves()" />;</para>
+                <para>IMachine::removeAllCpuIdLeafs() is now
+                <link linkend="IMachine__removeAllCPUIDLeaves">IMachine::removeAllCPUIDLeaves()</link>;</para>
               </listitem>
 
               <listitem>
-                <para>the CpuPropertyType enum is now <xref
-                linkend="CPUPropertyType"
-                xreflabel="CPUPropertyType" />.</para>
+                <para>the CpuPropertyType enum is now
+                <link linkend="CPUPropertyType">CPUPropertyType</link>.</para>
               </listitem>
 
               <listitem>
@@ -5258,13 +5394,11 @@ AuthResult AUTHCALL AuthEntry(
         </listitem>
 
         <listitem>
-          <para>When creating a VM configuration with <xref
-          linkend="IVirtualBox__createMachine"
-          xreflabel="IVirtualBox::createMachine()" /> it is now possible to
-          ignore existing configuration files which would previously have
-          caused a failure. For this the
-          <computeroutput>override</computeroutput> parameter was
-          added.</para>
+          <para>When creating a VM configuration with
+          <link linkend="IVirtualBox__createMachine">IVirtualBox::createMachine()</link>
+          it is now possible to ignore existing configuration files which would
+          previously have caused a failure. For this the
+          <computeroutput>override</computeroutput> parameter was added.</para>
         </listitem>
 
         <listitem>
@@ -5278,8 +5412,8 @@ AuthResult AUTHCALL AuthEntry(
 
         <listitem>
           <para>The IoBackendType enumeration was replaced with a boolean flag
-          (see <xref linkend="IStorageController__useHostIOCache"
-          xreflabel="IStorageController::useHostIOCache" />).</para>
+          (see
+          <link linkend="IStorageController__useHostIOCache">IStorageController::useHostIOCache</link>).</para>
         </listitem>
 
         <listitem>
@@ -5291,18 +5425,15 @@ AuthResult AUTHCALL AuthEntry(
               </listitem>
 
               <listitem>
-                <para><xref linkend="IMachine__readSavedThumbnailToArray"
-                xreflabel="IMachine::readSavedThumbnailToArray()" /></para>
+                <para><link linkend="IMachine__readSavedThumbnailToArray">IMachine::readSavedThumbnailToArray()</link></para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="IMachine__querySavedScreenshotInfo"
-                xreflabel="IMachine::querySavedScreenshotPNGSize()" /></para>
+                <para><link linkend="IMachine__querySavedScreenshotInfo">IMachine::querySavedScreenshotPNGSize()</link></para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="IMachine__readSavedScreenshotToArray"
-                xreflabel="IMachine::readSavedScreenshotPNGToArray()" /></para>
+                <para><link linkend="IMachine__readSavedScreenshotToArray">IMachine::readSavedScreenshotPNGToArray()</link></para>
               </listitem>
             </itemizedlist></para>
         </listitem>
@@ -5325,17 +5456,17 @@ AuthResult AUTHCALL AuthEntry(
           introduced with version 3.1 (in particular, full flexibility with
           attaching CD/DVD drives to arbitrary controllers), we seized the
           opportunity to rework all interfaces dealing with storage media to
-          make the API more flexible as well as logical. The <xref
-          linkend="IStorageController" xreflabel="IStorageController" />,
-          <xref linkend="IMedium" xreflabel="IMedium" />, <xref
-          linkend="IMediumAttachment" xreflabel="IMediumAttachment" /> and,
-          <xref linkend="IMachine" xreflabel="IMachine" /> interfaces were
+          make the API more flexible as well as logical. The
+          <link linkend="IStorageController">IStorageController</link>,
+          <link linkend="IMedium">IMedium</link>,
+          <link linkend="IMediumAttachment">IMediumAttachment</link> and
+          <link linkend="IMachine">IMachine</link> interfaces were
           affected the most. Existing code using them to configure storage and
           media needs to be carefully checked.</para>
 
           <para>All media (hard disks, floppies and CDs/DVDs) are now
-          uniformly handled through the <xref linkend="IMedium"
-          xreflabel="IMedium" /> interface. The device-specific interfaces
+          uniformly handled through the <link linkend="IMedium">IMedium</link>
+          interface. The device-specific interfaces
           (<code>IHardDisk</code>, <code>IDVDImage</code>,
           <code>IHostDVDDrive</code>, <code>IFloppyImage</code> and
           <code>IHostFloppyDrive</code>) have been merged into IMedium; CD/DVD
@@ -5346,14 +5477,14 @@ AuthResult AUTHCALL AuthEntry(
 
           <para><code>IMachine::attachHardDisk</code> and similar methods have
           been renamed and generalized to deal with any type of drive and
-          medium. <xref linkend="IMachine__attachDevice"
-          xreflabel="IMachine::attachDevice()" /> is the API method for adding
-          any drive to a storage controller. The floppy and DVD/CD drives are
-          no longer handled specially, and that means you can have more than
-          one of them. As before, drives can only be changed while the VM is
-          powered off. Mounting (or unmounting) removable media at runtime is
-          possible with <xref linkend="IMachine__mountMedium"
-          xreflabel="IMachine::mountMedium()" />.</para>
+          medium.
+          <link linkend="IMachine__attachDevice">IMachine::attachDevice()</link>
+          is the API method for adding any drive to a storage controller. The
+          floppy and DVD/CD drives are no longer handled specially, and that
+          means you can have more than one of them. As before, drives can only
+          be changed while the VM is powered off. Mounting (or unmounting)
+          removable media at runtime is possible with
+          <link linkend="IMachine__mountMedium">IMachine::mountMedium()</link>.</para>
 
           <para>Newly created virtual machines have no storage controllers
           associated with them. Even the IDE Controller needs to be created
@@ -5371,12 +5502,11 @@ AuthResult AUTHCALL AuthEntry(
         </listitem>
 
         <listitem>
-          <para>Reading the <xref linkend="IMedium__state"
-          xreflabel="IMedium::state" /> attribute no longer
-          automatically performs an accessibility check; a new method <xref
-          linkend="IMedium__refreshState"
-          xreflabel="IMedium::refreshState()" /> does this. The attribute only
-          returns the state any more.</para>
+          <para>Reading the
+          <link linkend="IMedium__state">IMedium::state</link> attribute no
+          longer automatically performs an accessibility check; a new method
+          <link linkend="IMedium__refreshState">IMedium::refreshState()</link>
+          does this. The attribute only returns the state now.</para>
         </listitem>
 
         <listitem>
@@ -5386,7 +5516,8 @@ AuthResult AUTHCALL AuthEntry(
           <computeroutput>IConsole::deleteSnapshot()</computeroutput>.
           IConsole::discardCurrentState and
           IConsole::discardCurrentSnapshotAndState were removed; corresponding
-          new functionality is in <computeroutput>IConsole::restoreSnapshot()</computeroutput>.
+          new functionality is in
+          <computeroutput>IConsole::restoreSnapshot()</computeroutput>.
           Also, when <computeroutput>IConsole::takeSnapshot()</computeroutput>
           is called on a running virtual machine, a live snapshot will be
           created. The old behavior was to temporarily pause the virtual
@@ -5417,13 +5548,11 @@ AuthResult AUTHCALL AuthEntry(
           <para>The parameter lists for the following functions were
           modified:<itemizedlist>
               <listitem>
-                <para><xref linkend="IHost__removeHostOnlyNetworkInterface"
-                xreflabel="IHost::removeHostOnlyNetworkInterface()" /></para>
+                <para><link linkend="IHost__removeHostOnlyNetworkInterface">IHost::removeHostOnlyNetworkInterface()</link></para>
               </listitem>
 
               <listitem>
-                <para><xref linkend="IHost__removeUSBDeviceFilter"
-                xreflabel="IHost::removeUSBDeviceFilter()" /></para>
+                <para><link linkend="IHost__removeUSBDeviceFilter">IHost::removeUSBDeviceFilter()</link></para>
               </listitem>
             </itemizedlist></para>
         </listitem>
@@ -5447,7 +5576,7 @@ AuthResult AUTHCALL AuthEntry(
           inheritance has been introduced for some classes, so explicit
           casting is no longer needed to call methods from a parent class. In
           particular, IHardDisk and other classes now properly derive from
-          <xref linkend="IMedium" xreflabel="IMedium" />.</para>
+          <link linkend="IMedium">IMedium</link>.</para>
         </listitem>
 
         <listitem>
@@ -5477,8 +5606,9 @@ AuthResult AUTHCALL AuthEntry(
         </listitem>
 
         <listitem>
-          <para>The type of <xref linkend="IVirtualBoxErrorInfo__resultCode"
-          xreflabel="IVirtualBoxErrorInfo::resultCode" /> changed from
+          <para>The type of
+          <link linkend="IVirtualBoxErrorInfo__resultCode">IVirtualBoxErrorInfo::resultCode</link>
+          changed from
           <computeroutput>result</computeroutput> to
           <computeroutput>long</computeroutput>.</para>
         </listitem>
@@ -5494,16 +5624,16 @@ AuthResult AUTHCALL AuthEntry(
         </listitem>
 
         <listitem>
-          <para>The method IConsole::powerDownAsync was renamed to <xref
-          linkend="IConsole__powerDown" xreflabel="IConsole::powerDown" />,
+          <para>The method IConsole::powerDownAsync was renamed to
+          <link linkend="IConsole__powerDown">IConsole::powerDown</link>,
           and the previous method with that name was deleted. So effectively a
           parameter was added.</para>
         </listitem>
 
         <listitem>
-          <para>In the <xref linkend="IFramebuffer"
-          xreflabel="IFramebuffer" /> interface, the following were
-          removed:<itemizedlist>
+          <para>In the
+          <link linkend="IFramebuffer">IFramebuffer</link> interface, the
+          following were removed:<itemizedlist>
               <listitem>
                 <para>the <computeroutput>operationSupported</computeroutput>
                 attribute;</para>
@@ -5526,7 +5656,7 @@ AuthResult AUTHCALL AuthEntry(
         </listitem>
 
         <listitem>
-          <para>In the <xref linkend="IDisplay" xreflabel="IDisplay" />
+          <para>In the <link linkend="IDisplay">IDisplay</link>
           interface, the following were removed:<itemizedlist>
               <listitem>
                 <para>the
@@ -5639,14 +5769,13 @@ AuthResult AUTHCALL AuthEntry(
           <itemizedlist>
             <listitem>
               <para>The HostNetworkInterfaceType enum has been renamed to
-              <xref linkend="HostNetworkInterfaceMediumType"
-              xreflabel="HostNetworkInterfaceMediumType" /></para>
+              <link linkend="HostNetworkInterfaceMediumType">HostNetworkInterfaceMediumType</link></para>
             </listitem>
 
             <listitem>
               <para>The IHostNetworkInterface::type attribute has been renamed
-              to <xref linkend="IHostNetworkInterface__mediumType"
-              xreflabel="IHostNetworkInterface::mediumType" /></para>
+              to
+              <link linkend="IHostNetworkInterface__mediumType">IHostNetworkInterface::mediumType</link></para>
             </listitem>
 
             <listitem>
@@ -5656,15 +5785,14 @@ AuthResult AUTHCALL AuthEntry(
 
             <listitem>
               <para>In the IHost interface, createHostNetworkInterface() has
-              been renamed to <xref
-              linkend="IHost__createHostOnlyNetworkInterface"
-              xreflabel="createHostOnlyNetworkInterface()" /></para>
+              been renamed to
+              <link linkend="IHost__createHostOnlyNetworkInterface">createHostOnlyNetworkInterface()</link></para>
             </listitem>
 
             <listitem>
               <para>Similarly, removeHostNetworkInterface() has been renamed
-              to <xref linkend="IHost__removeHostOnlyNetworkInterface"
-              xreflabel="removeHostOnlyNetworkInterface()" /></para>
+              to
+              <link linkend="IHost__removeHostOnlyNetworkInterface">removeHostOnlyNetworkInterface()</link></para>
             </listitem>
           </itemizedlist>
         </listitem>
@@ -5706,19 +5834,18 @@ AuthResult AUTHCALL AuthEntry(
               iSCSI). The IHardDisk2::format attribute can be used to find out
               the back-end that is in use for a particular hard disk image.
               ISystemProperties::hardDiskFormats[] contains a list of all
-              back-ends supported by the system. <xref
-              linkend="ISystemProperties__defaultHardDiskFormat"
-              xreflabel="ISystemProperties::defaultHardDiskFormat" /> contains
-              the default system format.</para>
+              back-ends supported by the system.
+              <link linkend="ISystemProperties__defaultHardDiskFormat">ISystemProperties::defaultHardDiskFormat</link>
+              contains the default system format.</para>
             </listitem>
 
             <listitem>
-              <para>In addition, the new <xref linkend="IMedium"
-              xreflabel="IMedium" /> interface is a generic interface for hard
-              disk, DVD and floppy images that contains the attributes and
-              methods shared between them. It can be considered a parent class
-              of the more specific interfaces for those images, which are now
-              IHardDisk2, IDVDImage2 and IFloppyImage2.</para>
+              <para>In addition, the new
+              <link linkend="IMedium">IMedium</link> interface is a generic
+              interface for hard disk, DVD and floppy images that contains the
+              attributes and methods shared between them. It can be considered
+              a parent class of the more specific interfaces for those images,
+              which are now IHardDisk2, IDVDImage2 and IFloppyImage2.</para>
 
               <para>In each case, the "2" versions of these interfaces replace
               the earlier versions that did not have the "2" suffix.
@@ -5742,16 +5869,17 @@ AuthResult AUTHCALL AuthEntry(
         </listitem>
 
         <listitem>
-          <para><xref linkend="IGuestOSType" xreflabel="IGuestOSType" /> was
+          <para><link linkend="IGuestOSType">IGuestOSType</link> was
           extended to group operating systems into families and for 64-bit
           support.</para>
         </listitem>
 
         <listitem>
-          <para>The <xref linkend="IHostNetworkInterface"
-          xreflabel="IHostNetworkInterface" /> interface was completely
-          rewritten to account for the changes in how Host Interface
-          Networking is now implemented in VirtualBox 2.1.</para>
+          <para>The
+          <link linkend="IHostNetworkInterface">IHostNetworkInterface</link>
+          interface was completely rewritten to account for the changes in how
+          Host Interface Networking is now implemented in VirtualBox
+          2.1.</para>
         </listitem>
 
         <listitem>
@@ -5760,16 +5888,16 @@ AuthResult AUTHCALL AuthEntry(
         </listitem>
 
         <listitem>
-          <para>Added <xref linkend="IHost__getProcessorFeature"
-          xreflabel="IHost::getProcessorFeature()" /> and <xref
-          linkend="ProcessorFeature" xreflabel="ProcessorFeature" />
+          <para>Added
+          <link linkend="IHost__getProcessorFeature">IHost::getProcessorFeature()</link>
+          and <link linkend="ProcessorFeature">ProcessorFeature</link>
           enumeration.</para>
         </listitem>
 
         <listitem>
-          <para>The parameter list for <xref
-          linkend="IVirtualBox__createMachine"
-          xreflabel="IVirtualBox::createMachine()" /> was modified.</para>
+          <para>The parameter list for
+          <link linkend="IVirtualBox__createMachine">IVirtualBox::createMachine()</link>
+          was modified.</para>
         </listitem>
 
         <listitem>
@@ -5777,18 +5905,18 @@ AuthResult AUTHCALL AuthEntry(
         </listitem>
 
         <listitem>
-          <para>New attributes in IMachine: <xref
-          linkend="IMachine__accelerate3DEnabled"
-          xreflabel="accelerate3DEnabled" />, HWVirtExVPIDEnabled, 
-          <computeroutput>IMachine::guestPropertyNotificationPatterns</computeroutput>, <xref
-          linkend="IMachine__CPUCount" xreflabel="CPUCount" />.</para>
+          <para>New attributes in IMachine:
+          <link linkend="IMachine__accelerate3DEnabled">accelerate3DEnabled</link>,
+          HWVirtExVPIDEnabled, 
+          <computeroutput>IMachine::guestPropertyNotificationPatterns</computeroutput>,
+          <link linkend="IMachine__CPUCount">CPUCount</link>.</para>
         </listitem>
 
         <listitem>
-          <para>Added <xref linkend="IConsole__powerUpPaused"
-          xreflabel="IConsole::powerUpPaused()" /> and <xref
-          linkend="IConsole__getGuestEnteredACPIMode"
-          xreflabel="IConsole::getGuestEnteredACPIMode()" />.</para>
+          <para>Added
+          <link linkend="IConsole__powerUpPaused">IConsole::powerUpPaused()</link>
+          and
+          <link linkend="IConsole__getGuestEnteredACPIMode">IConsole::getGuestEnteredACPIMode()</link>.</para>
         </listitem>
 
         <listitem>
diff --git a/doc/manual/en_US/UserManual.xml b/doc/manual/en_US/UserManual.xml
index 383abc8..2942c12 100644
--- a/doc/manual/en_US/UserManual.xml
+++ b/doc/manual/en_US/UserManual.xml
@@ -3,21 +3,21 @@
   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <book>
   <bookinfo>
-    <title>$VBOX_PRODUCT<superscript>®</superscript></title>
+    <title>@VBOX_PRODUCT@<superscript>®</superscript></title>
 
     <subtitle>User Manual</subtitle>
 
     <edition>Version
-    $VBOX_VERSION_STRING</edition>
+    @VBOX_VERSION_STRING@</edition>
 
-    <corpauthor>$VBOX_VENDOR</corpauthor>
+    <corpauthor>@VBOX_VENDOR@</corpauthor>
 
     <address>http://www.virtualbox.org</address>
 
     <copyright>
-      <year>2004-$VBOX_C_YEAR</year>
+      <year>2004- at VBOX_C_YEAR@</year>
 
-      <holder>$VBOX_VENDOR</holder>
+      <holder>@VBOX_VENDOR@</holder>
     </copyright>
   </bookinfo>
 
diff --git a/doc/manual/en_US/images/clone-vm.png b/doc/manual/en_US/images/clone-vm.png
index 5b0b827..28ec8a5 100644
Binary files a/doc/manual/en_US/images/clone-vm.png and b/doc/manual/en_US/images/clone-vm.png differ
diff --git a/doc/manual/en_US/images/create-vdi-1.png b/doc/manual/en_US/images/create-vdi-1.png
index 75f7700..c38ffe0 100644
Binary files a/doc/manual/en_US/images/create-vdi-1.png and b/doc/manual/en_US/images/create-vdi-1.png differ
diff --git a/doc/manual/en_US/images/create-vm-1.png b/doc/manual/en_US/images/create-vm-1.png
index 42c9828..1fc5728 100644
Binary files a/doc/manual/en_US/images/create-vm-1.png and b/doc/manual/en_US/images/create-vm-1.png differ
diff --git a/doc/manual/en_US/images/create-vm-2.png b/doc/manual/en_US/images/create-vm-2.png
index 948ba90..25de93f 100644
Binary files a/doc/manual/en_US/images/create-vm-2.png and b/doc/manual/en_US/images/create-vm-2.png differ
diff --git a/doc/manual/en_US/images/dnd-modes.png b/doc/manual/en_US/images/dnd-modes.png
index ad5f62e..f922ca9 100644
Binary files a/doc/manual/en_US/images/dnd-modes.png and b/doc/manual/en_US/images/dnd-modes.png differ
diff --git a/doc/manual/en_US/images/ovf-import.png b/doc/manual/en_US/images/ovf-import.png
index f6671e6..fc31cab 100644
Binary files a/doc/manual/en_US/images/ovf-import.png and b/doc/manual/en_US/images/ovf-import.png differ
diff --git a/doc/manual/en_US/images/seamless.png b/doc/manual/en_US/images/seamless.png
index 502aebd..d59b706 100644
Binary files a/doc/manual/en_US/images/seamless.png and b/doc/manual/en_US/images/seamless.png differ
diff --git a/doc/manual/en_US/images/virtual-disk-manager.png b/doc/manual/en_US/images/virtual-disk-manager.png
index 8557bac..202d7d1 100644
Binary files a/doc/manual/en_US/images/virtual-disk-manager.png and b/doc/manual/en_US/images/virtual-disk-manager.png differ
diff --git a/doc/manual/en_US/images/virtual-disk-manager2.png b/doc/manual/en_US/images/virtual-disk-manager2.png
index ed34f60..11a7271 100644
Binary files a/doc/manual/en_US/images/virtual-disk-manager2.png and b/doc/manual/en_US/images/virtual-disk-manager2.png differ
diff --git a/doc/manual/en_US/images/virtualbox-main-empty.png b/doc/manual/en_US/images/virtualbox-main-empty.png
index d4ce651..fcf748f 100644
Binary files a/doc/manual/en_US/images/virtualbox-main-empty.png and b/doc/manual/en_US/images/virtualbox-main-empty.png differ
diff --git a/doc/manual/en_US/images/vm-close.png b/doc/manual/en_US/images/vm-close.png
index 166f703..359de35 100644
Binary files a/doc/manual/en_US/images/vm-close.png and b/doc/manual/en_US/images/vm-close.png differ
diff --git a/doc/manual/en_US/images/vm-groups.png b/doc/manual/en_US/images/vm-groups.png
index 5398342..5c72d4b 100644
Binary files a/doc/manual/en_US/images/vm-groups.png and b/doc/manual/en_US/images/vm-groups.png differ
diff --git a/doc/manual/en_US/images/vm-hostkey.png b/doc/manual/en_US/images/vm-hostkey.png
index 44e7875..da09d62 100644
Binary files a/doc/manual/en_US/images/vm-hostkey.png and b/doc/manual/en_US/images/vm-hostkey.png differ
diff --git a/doc/manual/en_US/images/vm-settings-harddisk.png b/doc/manual/en_US/images/vm-settings-harddisk.png
index 0b4290f..4f6a2c1 100644
Binary files a/doc/manual/en_US/images/vm-settings-harddisk.png and b/doc/manual/en_US/images/vm-settings-harddisk.png differ
diff --git a/doc/manual/en_US/images/vm-vista-running.png b/doc/manual/en_US/images/vm-vista-running.png
index bf31290..4032438 100644
Binary files a/doc/manual/en_US/images/vm-vista-running.png and b/doc/manual/en_US/images/vm-vista-running.png differ
diff --git a/doc/manual/en_US/man_VBoxManage-debugvm.xml b/doc/manual/en_US/man_VBoxManage-debugvm.xml
new file mode 100644
index 0000000..3092bea
--- /dev/null
+++ b/doc/manual/en_US/man_VBoxManage-debugvm.xml
@@ -0,0 +1,593 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    manpage, user manual, usage: VBoxManage debugvm
+
+    Copyright (C) 2006-2015 Oracle Corporation
+
+    This file is part of VirtualBox Open Source Edition (OSE), as
+    available from http://www.virtualbox.org. This file is free software;
+    you can redistribute it and/or modify it under the terms of the GNU
+    General Public License (GPL) as published by the Free Software
+    Foundation, in version 2 as it comes in the "COPYING" file of the
+    VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+    hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ -->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<refentry id="vboxmanage-debugvm" lang="en">
+
+  <refentryinfo>
+    <pubdate>$Date: 2015-06-20 22:36:01 +0200 (Sat, 20 Jun 2015) $</pubdate>
+    <title>VBoxManage debugvm</title>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>VBoxManage-debugvm</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>VBoxManage-debugvm</refname>
+    <refpurpose>introspection and guest debugging</refpurpose>
+    <refclass>Oracle VM VirtualBox</refclass>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-dumpvmcore">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">dumpvmcore</arg>
+      <arg>--filename=<replaceable>name</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-info">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">info</arg>
+      <arg choice="req"><replaceable>item</replaceable></arg>
+      <arg rep="repeat"><replaceable>args</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-injectnmi">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">injectnmi</arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-log">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">log</arg>
+      <group><arg>--release</arg><arg>--debug</arg></group>
+      <arg rep="repeat"><replaceable>group-settings</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-logdest">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">logdest</arg>
+      <group><arg>--release</arg><arg>--debug</arg></group>
+      <arg rep="repeat"><replaceable>destinations</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-logflags">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">logflags</arg>
+      <group><arg>--release</arg><arg>--debug</arg></group>
+      <arg rep="repeat"><replaceable>flags</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-osdetect">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">osdetect</arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-osinfo">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">osinfo</arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-osdmesg">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">osdmesg</arg>
+      <arg>--lines=<replaceable>lines</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-getregisters">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">getregisters</arg>
+      <arg>--cpu=<replaceable>id</replaceable></arg>
+      <arg rep="repeat"><replaceable>reg-set.reg-name</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-setregisters">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">setregisters</arg>
+      <arg>--cpu=<replaceable>id</replaceable></arg>
+      <arg rep="repeat"><replaceable>reg-set.reg-name=value</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-show">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">show</arg>
+      <group><arg>--human-readable</arg><arg>--sh-export</arg><arg>--sh-eval</arg><arg>--cmd-set</arg></group>
+      <arg rep="repeat"><replaceable>settings-item</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis id="synopsis-vboxmanage-debugvm-statistics">
+      <command>VBoxManage debugvm</command>
+      <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
+      <arg choice="plain">statistics</arg>
+      <arg>--reset</arg>
+      <arg>--descriptions</arg>
+      <arg>--pattern=<replaceable>pattern</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>Description</title>
+
+    <para>The "debugvm" commands are for experts who want to tinker with the
+      exact details of virtual machine execution.  Like the VM debugger<remark role="help-manual">
+      described in <xref linkend="ts_debugger" /></remark>, these commands are only useful if you are
+      very familiar with the details of the PC architecture and how to debug
+      software.</para>
+
+    <refsect2 id="vboxmanage-debugvm-common-options">
+      <title>Common options</title>
+      <remark role="help-scope" condition="GLOBAL"/>
+      <para>The subcommands of <command>debugvm</command> all operate on a running virtual
+      machine:</para>
+      <variablelist>
+        <varlistentry>
+          <term><replaceable>uuid|vmname</replaceable></term>
+          <listitem><para>Either the UUID or the name (case sensitive) of a VM.</para></listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-dumpvmcore">
+      <title>debugvm dumpvmcore</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Creates a system dump file of the specified VM.  This file will have
+        the standard ELF core format (with custom sections)<remark role="help-manual">; see
+        <xref linkend="ts_guest-core-format" /></remark>.
+      </para>
+      <para>
+        This corresponds to the <command>writecore</command> command in the debugger.
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><option>--filename=<replaceable>filename</replaceable></option></term>
+          <listitem><para>The name of the output file.</para></listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-info">
+      <title>debugvm info</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Displays info items relating to the VMM, device emulations and
+        associated drivers.
+      </para>
+      <para>
+        This corresponds to the <command>info</command> command in the debugger.
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><replaceable>info</replaceable></term>
+          <listitem>
+            <para>Name of the info item to display.  The special name
+            <option>help</option> will list all the available info items and
+            hints about optional arguments.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><replaceable>args</replaceable></term>
+          <listitem>
+            <para>Optional argument string for the info item handler.  Most info items
+            does not take any extra arguments.  Arguments not recognized are generally
+            ignored.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-injectnmi">
+      <title>debugvm injectnmi</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Causes a non-maskable interrupt (NMI) to be injected into the guest. This
+        might be useful for certain debugging scenarios. What happens exactly is
+        dependent on the guest operating system, but an NMI can crash the whole
+        guest operating system. Do not use unless you know what you're doing.
+      </para>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-log">
+      <title>debugvm log</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Changes the group settings for either debug (<option>--debug</option>)
+        or release (<option>--release</option>) logger of the VM process.
+      </para>
+      <para>
+        The <replaceable>group-settings</replaceable> are typically strings on the form
+        <computeroutput>em.e.f.l</computeroutput>, <computeroutput>hm=~0</computeroutput>
+        and <computeroutput>-em.f</computeroutput>.  Basic wildcards are supported for
+        group matching.  The <computeroutput>all</computeroutput> group is an alias for
+        all the groups.
+      </para>
+      <para>
+        Please do keep in mind that the group settings are applied as modifications
+        to the current ones.
+      </para>
+      <para>
+        This corresponds to the <command>log</command> command in the debugger.
+      </para>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-logdest">
+      <title>debugvm logdest</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Changes the destination settings for either debug (<option>--debug</option>)
+        or release (<option>--release</option>) logger of the VM process.  For details
+        on the destination format, the best source is src/VBox/Runtime/common/log/log.cpp.
+      </para>
+      <para>
+        The <replaceable>destinations</replaceable> is one or more mnemonics, optionally
+        prefixed by "no" to disable them.  Some of them take values after a ":" or "="
+        separator.  Multiple mnemonics can be separated by space or given as separate
+        arguments on the command line.
+      </para>
+      <para>
+        List of available destination:
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><option>file[=<replaceable>file</replaceable>], nofile</option></term>
+          <listitem><para>Specifies a log file.  It no filname is given, one will be
+              generated based on the current UTC time and VM process name and placed in
+              the current directory of the VM process.  Note that this will currently not
+              have any effect if the log file has already been opened.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>dir=<replaceable>directory</replaceable>, nodir</option></term>
+          <listitem><para>Specifies the output directory for log files.  Note that this
+              will currently not  have any effect if the log file has already been opened.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>history=<replaceable>count</replaceable>, nohistory</option></term>
+          <listitem><para>A non-zero value enables log historization, with the value
+            specifying how many old log files to keep.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>histsize=<replaceable>bytes</replaceable></option></term>
+          <listitem><para>The max size of a log file before it is historized.  Default is infinite.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>histtime=<replaceable>seconds</replaceable></option></term>
+          <listitem><para>The max age (in seconds) of a log file before it is historized.  Default is infinite.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>ringbuffer, noringbuffer</option></term>
+          <listitem><para>Only log to the log buffer until an explicit flush (e.g. via an assertion)
+              occurs.  This is fast and saves diskspace.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>stdout, nostdout</option></term>
+          <listitem><para>Write the log content to standard output.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>stdout, nostdout</option></term>
+          <listitem><para>Write the log content to standard error.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>debugger, nodebugger</option></term>
+          <listitem><para>Write the log content to the debugger, if supported by the host OS.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>com, nocom</option></term>
+          <listitem><para>Writes logging to the COM port. This is only applicable for raw-mode and ring-0 logging.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>user, nouser</option></term>
+          <listitem><para>Custom destination which has no meaning to VM processes..</para></listitem>
+        </varlistentry>
+      </variablelist>
+      <para>
+        This corresponds to the <command>logdest</command> command in the debugger.
+      </para>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-logflags">
+      <title>debugvm logflags</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Changes the flags on either debug (<option>--debug</option>) or release
+        (<option>--release</option>) logger of the VM process.  Please note that the
+        modifications are applied onto the existing changes, they are not replacing them.
+      </para>
+      <para>
+        The <replaceable>flags</replaceable> are a list of flag mnemonics, optionally
+        prefixed by a "no", "!", "~" or "-" to negate their meaning.  The "+" prefix
+        can be used to undo previous negation or use as a separator, though better use
+        whitespace or separate arguments for that.
+      </para>
+      <para>
+        List of log flag mnemonics, with their counter form where applicable
+        (asterisk indicates defaults):
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><option>enabled*, disabled</option></term>
+          <listitem><para>Enables or disables logging.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>buffered, unbuffered*</option></term>
+          <listitem><para>Enabling buffering of log output before it hits the destinations.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>writethrough(/writethru)</option></term>
+          <listitem><para>Whether to open the destination file with writethru buffering settings or not.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>flush</option></term>
+          <listitem><para>Enables flushing of the output file (to disk) after each log statement.</para></listitem>
+        </varlistentry>
+        <!-- Prefixes -->
+        <varlistentry>
+          <term><option>lockcnts</option></term>
+          <listitem><para>Prefix each log line with lock counts for the current thread.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>cpuid</option></term>
+          <listitem><para>Prefix each log line with the ID of the current CPU.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>pid</option></term>
+          <listitem><para>Prefix each log line with the current process ID.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>flagno</option></term>
+          <listitem><para>Prefix each log line with the numberic flags corresponding to the log statement.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>flag</option></term>
+          <listitem><para>Prefix each log line with the flag mnemonics corresponding to the log statement.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>groupno</option></term>
+          <listitem><para>Prefix each log line with the log group number for the log statement producing it.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>group</option></term>
+          <listitem><para>Prefix each log line with the log group name for the log statement producing it.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>tid</option></term>
+          <listitem><para>Prefix each log line with the current thread identifier.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>thread</option></term>
+          <listitem><para>Prefix each log line with the current thread name.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>time</option></term>
+          <listitem><para>Prefix each log line with the current UTC wall time.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>timeprog</option></term>
+          <listitem><para>Prefix each log line with the current monotonic time since the start of the program.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>msprog</option></term>
+          <listitem><para>Prefix each log line with the current monotonic timestamp value in milliseconds since the start of the program.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>ts</option></term>
+          <listitem><para>Prefix each log line with the current monotonic timestamp value in nanoseconds.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>tsc</option></term>
+          <listitem><para>Prefix each log line with the current CPU timestamp counter (TSC) value.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>rel, abs*</option></term>
+          <listitem><para>Selects the whether <computeroutput>ts</computeroutput> and
+              <computeroutput>tsc</computeroutput> prefixes should be displayed as relative to the
+              previous log line or as absolute time.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>hex*, dec</option></term>
+          <listitem><para>Selects the whether the <computeroutput>ts</computeroutput> and
+              <computeroutput>tsc</computeroutput> prefixes should be formatted as hexadecimal
+              or decimal.</para></listitem>
+        </varlistentry>
+
+        <!-- Suffixes and weird stuff. -->
+        <varlistentry>
+          <term><option>custom</option></term>
+          <listitem><para>Custom log prefix, has by default no meaning for VM processes.</para></listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>usecrlf, uself*</option></term>
+          <listitem><para>Output with DOS style (CRLF) or just UNIX style (LF) line endings.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>overwrite*, append</option></term>
+          <listitem><para>Overwrite the destination file or append to it.</para></listitem>
+        </varlistentry>
+      </variablelist>
+
+      <para>
+        This corresponds to the <command>logflags</command> command in the debugger.
+      </para>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-osdetect">
+      <title>debugvm osdetect</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Make the VMM's debugger facility (re)-detect the guest operating system (OS).
+        This will first load all debugger plug-ins.
+      </para>
+      <para>
+        This corresponds to the <command>detect</command> command in the debugger.
+      </para>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-osinfo">
+      <title>debugvm osinfo</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Displays information about the guest operating system (OS) previously
+        detected by the VMM's debugger facility.
+      </para>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-osdmesg">
+      <title>debugvm osdmesg</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Displays the guest OS kernel log, if detected and supported.
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><option>--lines=<replaceable>lines</replaceable></option></term>
+          <listitem><para>Number of lines of the log to display, counting from
+          the end. The default is infinite.</para></listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-getregisters">
+      <title>debugvm getregisters</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Retrieves register values for guest CPUs and emulated devices.
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><replaceable>reg-set.reg-name</replaceable></term>
+          <listitem>
+            <para>One of more registers, each having one of the following forms:</para>
+            <orderedlist>
+              <listitem><para>register-set.register-name.sub-field</para></listitem>
+              <listitem><para>register-set.register-name</para></listitem>
+              <listitem><para>cpu-register-name.sub-field</para></listitem>
+              <listitem><para>cpu-register-name</para></listitem>
+              <listitem><para>all</para></listitem>
+            </orderedlist>
+            <para>The <replaceable>all</replaceable> form will cause all registers
+              to be shown (no sub-fields).  The registers names are case-insensitive.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--cpu=<replaceable>id</replaceable></option></term>
+          <listitem><para>Selects the CPU register set when specifying just a
+            CPU register (3rd and 4th form).  The default is 0.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-setregisters">
+      <title>debugvm setregisters</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Changes register values for guest CPUs and emulated devices.
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><replaceable>reg-set.reg-name=value</replaceable></term>
+          <listitem>
+            <para>One of more register assignment, each having one of the following forms:</para>
+            <orderedlist>
+              <listitem><para>register-set.register-name.sub-field=value</para></listitem>
+              <listitem><para>register-set.register-name=value</para></listitem>
+              <listitem><para>cpu-register-name.sub-field=value</para></listitem>
+              <listitem><para>cpu-register-name=value</para></listitem>
+            </orderedlist>
+            <para>The value format should be in the same style as what
+              <command>getregisters</command> displays, with the exception that
+              both octal and decimal can be used instead of hexadecimal.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--cpu <replaceable>id</replaceable></option></term>
+          <listitem><para>Selects the CPU register set when specifying just a
+            CPU register (3rd and 4th form).  The default is 0.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-show">
+      <title>debugvm show</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Shows logging settings for the VM.
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><option>--human-readable</option></term>
+          <listitem><para>Selects human readable output.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--sh-export</option></term>
+          <listitem><para>Selects output format as bourne shell style <command>export</command> commands.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--sh-eval</option></term>
+          <listitem><para>Selects output format as bourne shell style <command>eval</command> command input.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--cmd-set</option></term>
+          <listitem><para>Selects output format as DOS style <command>SET</command> commands.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><replaceable>settings-item</replaceable></term>
+          <listitem>
+            <para>What to display. One or more of the following:</para>
+            <itemizedlist>
+              <listitem><para>logdbg-settings - debug log settings.</para></listitem>
+              <listitem><para>logrel-settings - release log settings.</para></listitem>
+              <listitem><para>log-settings - alias for both debug and release log settings.</para></listitem>
+            </itemizedlist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-statistics">
+      <title>debugvm statistics</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Displays or resets VMM statistics.
+      </para>
+      <para>
+        Retrieves register values for guest CPUs and emulated devices.
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><option>--pattern=<replaceable>pattern</replaceable></option></term>
+          <listitem><para>DOS/NT-style wildcards patterns for selecting statistics.  Multiple
+            patterns can be specified by using the '|' (pipe) character as separator.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--reset</option></term>
+          <listitem><para>Select reset instead of display mode.</para></listitem>
+        </varlistentry>
+      </variablelist>
+
+    </refsect2>
+
+  </refsect1>
+
+</refentry>
+
+
diff --git a/doc/manual/en_US/man_VBoxManage_extpack.xml b/doc/manual/en_US/man_VBoxManage-extpack.xml
similarity index 78%
rename from doc/manual/en_US/man_VBoxManage_extpack.xml
rename to doc/manual/en_US/man_VBoxManage-extpack.xml
index 880b217..adae3ef 100644
--- a/doc/manual/en_US/man_VBoxManage_extpack.xml
+++ b/doc/manual/en_US/man_VBoxManage-extpack.xml
@@ -11,17 +11,17 @@
     Foundation, in version 2 as it comes in the "COPYING" file of the
     VirtualBox OSE distribution. VirtualBox OSE is distributed in the
     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-
  -->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <refentry id="vboxmanage-extpack" lang="en">
 
   <refentryinfo>
-    <pubdate>$Date: 2015-06-01 08:41:36 +0200 (Mon, 01 Jun 2015) $</pubdate>
+    <pubdate>$Date: 2015-06-18 20:15:51 +0200 (Thu, 18 Jun 2015) $</pubdate>
     <title>VBoxManage extpack</title>
   </refentryinfo>
 
   <refmeta>
+    <refentrytitle>VBoxManage-extpack</refentrytitle>
     <manvolnum>1</manvolnum>
   </refmeta>
 
@@ -32,17 +32,17 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <cmdsynopsis><remark role="usage"/>
+    <cmdsynopsis id="synopsis-vboxmanage-extpack-install"> <!-- The 'id' is mandatory and must start with 'synopsis-'. -->
       <command>VBoxManage extpack install</command>
       <arg>--replace</arg>
       <arg choice="req"><replaceable>tarball</replaceable></arg>
     </cmdsynopsis>
-    <cmdsynopsis><remark role="usage"/>
+    <cmdsynopsis id="synopsis-vboxmanage-extpack-uninstall">
       <command>VBoxManage extpack uninstall</command>
       <arg>--force</arg>
       <arg choice="req"><replaceable>name</replaceable></arg>
     </cmdsynopsis>
-    <cmdsynopsis><remark role="usage"/>
+    <cmdsynopsis id="synopsis-vboxmanage-extpack-cleanup">
       <command>VBoxManage extpack cleanup</command>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -51,11 +51,8 @@
     <title>Description</title>
 
     <refsect2 id="vboxmanage-extpack-install">
-      <cmdsynopsis>
-        <command>VBoxManage extpack install</command>
-        <arg>--replace</arg>
-        <arg choice="req"><replaceable>tarball</replaceable></arg>
-      </cmdsynopsis>
+      <title>extpack install</title>
+      <remark role="help-copy-synopsis"/>
       <para>
         Installs a new extension pack on the system.  This command will fail if an older
         version of the same extension pack is already installed.  The
@@ -76,11 +73,8 @@
     </refsect2>
 
     <refsect2 id="vboxmanage-extpack-uninstall">
-      <cmdsynopsis>
-        <command>VBoxManage extpack uninstall</command>
-        <arg>--force</arg>
-        <arg choice="req"><replaceable>name</replaceable></arg>
-      </cmdsynopsis>
+      <title>extpack uninstall</title>
+      <remark role="help-copy-synopsis"/>
       <para>
         Uninstalls an extension pack from the system.  The subcommand will also succeed
         in the case where the specified extension pack is not present on the system.
@@ -104,21 +98,22 @@
     </refsect2>
 
     <refsect2 id="vboxmanage-extpack-cleanup">
-      <cmdsynopsis>
-        <command>VBoxManage extpack cleanup</command>
-      </cmdsynopsis>
+      <title>extpack cleanup</title>
+      <remark role="help-copy-synopsis"/>
       <para>
-        Used to remove temporariy files and directories that may have been left behind
+        Used to remove temporary files and directories that may have been left behind
         if a previous install or uninstall command failed.
       </para>
     </refsect2>
 
   </refsect1>
 
-<!-- TODO examples
-  <para>The following commands show examples how to list extension packs and
-  remove one:<screen>
-$ VBoxManage list extpacks
+  <refsect1>
+    <title>Examples</title>
+    <remark role="help-scope" condition="EXTPACK_UNINSTALL,EXTPACK"/>
+    <para>
+          How to list extension packs:
+<screen>$ VBoxManage list extpacks
 Extension Packs: 1
 Pack no. 0:   Oracle VM VirtualBox Extension Pack
 Version:      4.1.12
@@ -127,11 +122,13 @@ Edition:
 Description:  USB 2.0 Host Controller, VirtualBox RDP, PXE ROM with E1000 support.
 VRDE Module:  VBoxVRDP
 Usable:       true
-Why unusable:
-$ VBoxManage extpack uninstall "Oracle VM VirtualBox Extension Pack"
+Why unusable:</screen></para>
+
+    <para>How to remove an extension pack:
+<screen>$ VBoxManage extpack uninstall "Oracle VM VirtualBox Extension Pack"
 0%...10%...20%...30%...40%...50%...60%...70%...80%...90%...100%
 Successfully uninstalled "Oracle VM VirtualBox Extension Pack".</screen></para>
--->
+  </refsect1>
 
 </refentry>
 
diff --git a/doc/manual/en_US/user_AdvancedTopics.xml b/doc/manual/en_US/user_AdvancedTopics.xml
index d223eb4..9333a26 100644
--- a/doc/manual/en_US/user_AdvancedTopics.xml
+++ b/doc/manual/en_US/user_AdvancedTopics.xml
@@ -620,19 +620,19 @@ greeter-session=vbox-greeter</screen></para>
       <para>The VirtualBox Guest Additions come with drivers for X.Org
       versions <itemizedlist>
           <listitem>
-            X11R6.8/X11R6.9 and XFree86 version 4.3 (vboxvideo_drv_68.o and vboxmouse_drv_68.o)
+            <para>X11R6.8/X11R6.9 and XFree86 version 4.3 (vboxvideo_drv_68.o and vboxmouse_drv_68.o)</para>
           </listitem>
 
           <listitem>
-            X11R7.0 (vboxvideo_drv_70.so and vboxmouse_drv_70.so)
+            <para>X11R7.0 (vboxvideo_drv_70.so and vboxmouse_drv_70.so)</para>
           </listitem>
 
           <listitem>
-            X11R7.1 (vboxvideo_drv_71.so and vboxmouse_drv_71.so)
+            <para>X11R7.1 (vboxvideo_drv_71.so and vboxmouse_drv_71.so)</para>
           </listitem>
 
           <listitem>
-            X.Org Server versions 1.3 and later (vboxvideo_drv_13.so and vboxmouse_drv_13.so and so on).
+            <para>X.Org Server versions 1.3 and later (vboxvideo_drv_13.so and vboxmouse_drv_13.so and so on).</para>
           </listitem>
         </itemizedlist> By default these drivers can be found in the
       directory</para>
@@ -839,19 +839,19 @@ VBoxManage controlvm "VM name" unplugcpu 3</screen></para>
     <para>If the virtual machine has a PCI device attached, certain
     limitations apply: <orderedlist>
         <listitem>
-           Only PCI cards with non-shared interrupts (such as using MSI on host) are supported at the moment.
+           <para>Only PCI cards with non-shared interrupts (such as using MSI on host) are supported at the moment.</para>
         </listitem>
 
         <listitem>
-           No guest state can be reliably saved/restored (as the internal state of the PCI card could not be retrieved).
+           <para>No guest state can be reliably saved/restored (as the internal state of the PCI card could not be retrieved).</para>
         </listitem>
 
         <listitem>
-           Teleportation (live migration) doesn't work (for the same reason).
+           <para>Teleportation (live migration) doesn't work (for the same reason).</para>
         </listitem>
 
         <listitem>
-           No lazy physical memory allocation. The host will preallocate the whole RAM required for the VM on startup (as we cannot catch physical hardware accesses to the physical memory).
+           <para>No lazy physical memory allocation. The host will preallocate the whole RAM required for the VM on startup (as we cannot catch physical hardware accesses to the physical memory).</para>
         </listitem>
       </orderedlist></para>
   </sect1>
@@ -899,17 +899,17 @@ host path or identifier</screen>
             configure the emulated webcam device. The following settings are supported:
             <itemizedlist>
               <listitem>
-                <computeroutput>MaxFramerate</computeroutput> The highest rate at which video frames
+                <para><computeroutput>MaxFramerate</computeroutput> The highest rate at which video frames
                 are sent to the guest. A higher frame rate requires more CPU power. Therefore sometimes
                 it is useful to set a lower limit. Default is no limit and allow the guest to use all
-                frame rates supported by the host webcam.
+                frame rates supported by the host webcam.</para>
               </listitem>
               <listitem>
-                <computeroutput>MaxPayloadTransferSize</computeroutput> How many bytes the emulated
+                <para><computeroutput>MaxPayloadTransferSize</computeroutput> How many bytes the emulated
                 webcam can send to the guest at a time. Default value is 3060 bytes, which is used by
                 some webcams. Higher values can slightly reduce CPU load, if the guest is able to use
                 larger buffers. However, a high <computeroutput>MaxPayloadTransferSize</computeroutput>
-                might be not supported by some guests.
+                might be not supported by some guests.</para>
               </listitem>
             </itemizedlist>
           </para></listitem>
@@ -1477,9 +1477,12 @@ VBoxManage setextradata "VM name" \
     information. In case your VM is configured to use EFI firmware you need to
     replace <code>pcbios</code> by <code>efi</code> in the keys.</para>
 
-    <sect2>
-      <title>DMI BIOS information (type 0)</title>
-      <screen>VBoxManage setextradata "VM name"
+    <glosslist>
+      <glossentry>
+        <glossterm>DMI BIOS information</glossterm>
+        <glossdef>
+          <para>(type 0)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSVendor"        "BIOS Vendor"
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSVersion"       "BIOS Version"
@@ -1493,10 +1496,14 @@ VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSFirmwareMajor" 3
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBIOSFirmwareMinor" 4</screen>
-    </sect2>
-    <sect2>
-      <title>DMI system information (type 1)</title>
-      <screen>VBoxManage setextradata "VM name"
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>DMI system information</glossterm>
+        <glossdef>
+          <para>(type 1)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiSystemVendor"      "System Vendor"
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiSystemProduct"     "System Product"
@@ -1511,10 +1518,14 @@ VBoxManage setextradata "VM name"
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiSystemUuid"
                                                "9852bf98-b83c-49db-a8de-182c42c7226b"</screen>
-    </sect2>
-    <sect2>
-      <title>DMI board information (type 2)</title>
-      <screen>VBoxManage setextradata "VM name"
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>DMI board information</glossterm>
+        <glossdef>
+          <para>(type 2)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBoardVendor"       "Board Vendor"
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBoardProduct"      "Board Product"
@@ -1528,10 +1539,14 @@ VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBoardLocInChass"   "Board Location"
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiBoardBoardType"    10</screen>
-    </sect2>
-    <sect2>
-      <title>DMI system enclosure or chassis (type 3)</title>
-      <screen>VBoxManage setextradata "VM name"
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>DMI system enclosure or chassis</glossterm>
+        <glossdef>
+          <para>(type 3)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiChassisVendor"     "Chassis Vendor"
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiChassisType"       3
@@ -1541,21 +1556,32 @@ VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiChassisSerial"     "Chassis Serial"
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiChassisAssetTag"   "Chassis Tag"</screen>
-    </sect2>
-    <sect2>
-      <title>DMI processor informatiion (type 4)</title>
-      <screen>VBoxManage setextradata "VM name"
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>DMI processor information</glossterm>
+        <glossdef>
+          <para>(type 4)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiProcManufacturer"  "GenuineIntel"
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiProcVersion"       "Pentium(R) III"</screen>
-    </sect2>
-    <sect2>
-      <title>DMI OEM strings (type 11)</title>
-      <screen>VBoxManage setextradata "VM name"
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>DMI OEM strings</glossterm>
+        <glossdef>
+          <para>(type 11)</para>
+          <screen>VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiOEMVBoxVer"        "vboxVer_1.2.3"
 VBoxManage setextradata "VM name"
       "VBoxInternal/Devices/pcbios/0/Config/DmiOEMVBoxRev"        "vboxRev_12345"</screen>
-    </sect2>
+        </glossdef>
+      </glossentry>
+    </glosslist>
+
     <para>If a DMI string is not set, the default value of VirtualBox is used.
     To set an empty string use
     <computeroutput>"<EMPTY>"</computeroutput>.</para>
@@ -1663,72 +1689,72 @@ VBoxManage setextradata "VM name"
       <para>where <computeroutput>PARAMETER</computeroutput> is one of the
       following:</para>
 
-      <para><glosslist>
-          <glossentry>
-            <glossterm><computeroutput>--timesync-interval</computeroutput></glossterm>
-            <glossdef>
-              <para>Specifies the interval at which to synchronize the time
-              with the host. The default is 10000 ms (10 seconds).</para>
-            </glossdef>
-          </glossentry>
+      <glosslist>
+        <glossentry>
+          <glossterm><computeroutput>--timesync-interval</computeroutput></glossterm>
+          <glossdef>
+            <para>Specifies the interval at which to synchronize the time
+            with the host. The default is 10000 ms (10 seconds).</para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm><computeroutput>--timesync-min-adjust</computeroutput></glossterm>
-            <glossdef>
-              <para>The minimum absolute drift value measured in milliseconds
-              to make adjustments for. The default is 1000 ms on OS/2 and 100
-              ms elsewhere.</para>
-            </glossdef>
-          </glossentry>
-          <glossentry>
-            <glossterm><computeroutput>--timesync-latency-factor</computeroutput></glossterm>
-            <glossdef>
-              <para>The factor to multiply the time query latency with to
-              calculate the dynamic minimum adjust time. The default is 8
-              times, that means in detail: Measure the time it takes to
-              determine the host time (the guest has to contact the VM host
-              service which may take some time), multiply this value by 8 and
-              do an adjustment only if the time difference between host and
-              guest is bigger than this value. Don't do any time adjustment
-              otherwise.</para>
-            </glossdef>
-          </glossentry>
+        <glossentry>
+          <glossterm><computeroutput>--timesync-min-adjust</computeroutput></glossterm>
+          <glossdef>
+            <para>The minimum absolute drift value measured in milliseconds
+            to make adjustments for. The default is 1000 ms on OS/2 and 100
+            ms elsewhere.</para>
+          </glossdef>
+        </glossentry>
+        <glossentry>
+          <glossterm><computeroutput>--timesync-latency-factor</computeroutput></glossterm>
+          <glossdef>
+            <para>The factor to multiply the time query latency with to
+            calculate the dynamic minimum adjust time. The default is 8
+            times, that means in detail: Measure the time it takes to
+            determine the host time (the guest has to contact the VM host
+            service which may take some time), multiply this value by 8 and
+            do an adjustment only if the time difference between host and
+            guest is bigger than this value. Don't do any time adjustment
+            otherwise.</para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm><computeroutput>--timesync-max-latency</computeroutput></glossterm>
-            <glossdef>
-              <para>The max host timer query latency to accept. The default is
-              250 ms.</para>
-            </glossdef>
-          </glossentry>
+        <glossentry>
+          <glossterm><computeroutput>--timesync-max-latency</computeroutput></glossterm>
+          <glossdef>
+            <para>The max host timer query latency to accept. The default is
+            250 ms.</para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm><computeroutput>--timesync-set-threshold</computeroutput></glossterm>
-            <glossdef>
-              <para>The absolute drift threshold, given as milliseconds where
-              to start setting the time instead of trying to smoothly adjust
-              it. The default is 20 minutes.</para>
-            </glossdef>
-          </glossentry>
+        <glossentry>
+          <glossterm><computeroutput>--timesync-set-threshold</computeroutput></glossterm>
+          <glossdef>
+            <para>The absolute drift threshold, given as milliseconds where
+            to start setting the time instead of trying to smoothly adjust
+            it. The default is 20 minutes.</para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm><computeroutput>--timesync-set-start</computeroutput></glossterm>
-            <glossdef>
-              <para>Set the time when starting the time sync service.</para>
-            </glossdef>
-          </glossentry>
+        <glossentry>
+          <glossterm><computeroutput>--timesync-set-start</computeroutput></glossterm>
+          <glossdef>
+            <para>Set the time when starting the time sync service.</para>
+          </glossdef>
+        </glossentry>
 
-          <glossentry>
-            <glossterm><computeroutput>--timesync-set-on-restore
-            0|1</computeroutput></glossterm>
-            <glossdef>
-              <para>Set the time after the VM was restored from a saved state
-              when passing 1 as parameter (default). Disable by passing 0. In
-              the latter case, the time will be adjusted smoothly which can
-              take a long time.</para>
-            </glossdef>
-          </glossentry>
-        </glosslist></para>
+        <glossentry>
+          <glossterm><computeroutput>--timesync-set-on-restore
+          0|1</computeroutput></glossterm>
+          <glossdef>
+            <para>Set the time after the VM was restored from a saved state
+            when passing 1 as parameter (default). Disable by passing 0. In
+            the latter case, the time will be adjusted smoothly which can
+            take a long time.</para>
+          </glossdef>
+        </glossentry>
+      </glosslist>
 
       <para>All these parameters can be specified as command line parameters
       to VBoxService as well.</para>
@@ -1789,7 +1815,7 @@ VBoxManage setextradata "VM name"
         with VirtualBox 4.1 and requires Solaris 11 build 159 or above.</para>
       </footnote> A VirtualBox VNIC template is a VNIC whose name starts with
     "vboxvnic_template" (case-sensitive).</para>
- 
+
     <para>On Solaris 11 hosts<footnote><para>When Crossbow based bridged
     networking is used.</para></footnote>, a VNIC template may be used to
     specify the VLAN ID to use while bridging over a network link.</para>
@@ -1848,7 +1874,7 @@ vboxvnic_template0 nge0   1000   2:8:20:25:12:75   random              23</scree
     driver by executing the following command as root:</para>
 
     <screen>rem_drv vboxnet</screen>
-    
+
     <para>Edit the file <computeroutput>/platform/i86pc/kernel/drv/vboxnet.conf</computeroutput>
     and add a line for the new interface we want to add as shown below:</para>
 
@@ -2961,7 +2987,7 @@ VBoxManage setextradata "VM name" VBoxInternal2/CoreDumpLive 1</screen>At
         The default behavior is sometimes not desired. Therefore it can be configured:
       </para>
       <para><screen>VBoxManage setextradata "VM name" GUI/MouseCapturePolicy MODE</screen></para>
-      
+
       <para>where <computeroutput>MODE</computeroutput> is one of the
         following keywords:</para><glosslist>
         <glossentry>
@@ -3684,9 +3710,9 @@ VBoxManage setextradata "VM name" VBoxInternal/CPUM/SSE4.2 1</screen>
 
     <screen>VBoxManage setextradata "VM name" VBoxInternal/Devices/usb-ehci/LUN#0/Config/CaptureFilename "filename"</screen>
 
-    The command above enables capturing on the root hub attached to the EHCI controller.
+    <para>The command above enables capturing on the root hub attached to the EHCI controller.
     To enable it for the OHCI or XHCI controller replace <computeroutput>usb-ehci</computeroutput>
-    with <computeroutput>usb-ohci</computeroutput> or <computeroutput>usb-xhci</computeroutput> respectively.
+    with <computeroutput>usb-ohci</computeroutput> or <computeroutput>usb-xhci</computeroutput> respectively.</para>
 
   </sect1>
 
@@ -3734,7 +3760,7 @@ VBoxManage setextradata "VM name" VBoxInternal/CPUM/SSE4.2 1</screen>
       Starting with VirtualBox 5.0, it is possible to encrypt the data stored in
       hard disk images transparently for the guest. It does not depend on a specific
       image format to be used. Images which have the data encrypted are not portable
-      between VirtualBox and other virtualization software though.
+      between VirtualBox and other virtualization software.
     </para>
 
     <para>
@@ -3744,6 +3770,14 @@ VBoxManage setextradata "VM name" VBoxInternal/CPUM/SSE4.2 1</screen>
       VM startup by entering a password which was chosen when the image was encrypted.
     </para>
 
+    <para>
+      Since the DEK is stored as part of the VM configuration file, it is
+      important that it is kept safe. Losing the DEK means that the data stored
+      in the disk images is lost irrecoverably. Having complete and up to
+      date backups of all data related to the VM is the responsibility of the
+      user.
+    </para>
+
     <sect2 id="diskencryption-limitations">
       <title>Limitations</title>
 
@@ -3755,15 +3789,17 @@ VBoxManage setextradata "VM name" VBoxInternal/CPUM/SSE4.2 1</screen>
       <itemizedlist>
 
         <listitem>
-          <para>This feature is currently closed source and requires the VirtualBox extension
-            pack to be installed to work.</para>
+          <para>This feature is part of the Oracle VM VirtualBox Extension
+            Pack, which needs to be installed. Otherwise disk encryption
+            is unavailable.</para>
         </listitem>
 
         <listitem>
           <para>Since encryption works only on the stored user data,
             it is currently not possible to check for metadata integrity of the disk image.
-            Attackers might take advantage of this to remove or insert blocks of data
-            into the image or change certain metadata items such as the disk size.</para>
+            Attackers might destroy data by removing or changing blocks of data
+            in the image or change metadata items such as the disk size.
+          </para>
         </listitem>
 
         <listitem>
@@ -3776,20 +3812,22 @@ VBoxManage setextradata "VM name" VBoxInternal/CPUM/SSE4.2 1</screen>
           <para>The DEK is kept in memory while the VM is running to be able to
             decrypt data read and encrypt data written by the guest. While this should
             be obvious the user needs to be aware of this because an attacker might be able
-            to extract the key on a compromised host and get access to the data later.</para>
+            to extract the key on a compromised host and decrypt the data.</para>
         </listitem>
 
         <listitem>
-          <para>When encrypting or decrypting the images, the password is passed unencrypted
-            via the Main API from the frontend to VBoxSVC. This needs to be kept in mind,
-            especially when using third party frontends which make use of the webservice
-            where the password might be transmitted unencrypted over the network.</para>
+          <para>When encrypting or decrypting the images, the password is
+            passed in clear text via the VirtualBox API. This needs to be kept
+            in mind, especially when using third party API clients which make
+            use of the webservice where the password might be transmitted
+            over the network. The use of HTTPS is mandatory in such a case.
+          </para>
         </listitem>
 
         <listitem>
-          <para>Encrypting images with differencing images is only possible if there
-            are no branches. This limitation may be addressed in a future
-            VirtualBox version.</para>
+          <para>Encrypting images with differencing images is only possible if
+            there are no snapshots or a linear chain of snapshots. This
+            limitation may be addressed in a future VirtualBox version.</para>
         </listitem>
 
       </itemizedlist>
diff --git a/doc/manual/en_US/user_BasicConcepts.xml b/doc/manual/en_US/user_BasicConcepts.xml
index 0f3360d..6c514ae 100644
--- a/doc/manual/en_US/user_BasicConcepts.xml
+++ b/doc/manual/en_US/user_BasicConcepts.xml
@@ -420,14 +420,13 @@
               <para>For drag'n drop to work the Guest Additions need to be
               installed on the guest.</para>
 
-              <note>Drag'n drop is disabled by default. This setting can be
+              <para><note><para>Drag'n drop is disabled by default. This setting can be
               changed at any time using the "Drag'n'Drop" menu item in the
-              "Devices" menu of the virtual machine.</note>
-
-              <para>See <xref linkend="guestadd-dnd"/> for more information.</para>
+              "Devices" menu of the virtual machine.</para></note></para>
 
+              <para>See <xref linkend="guestadd-dnd"/> for more information.
               <footnote><para>Experimental support for drag and drop was added
-              with VirtualBox 4.2.</para></footnote>
+              with VirtualBox 4.2.</para></footnote></para>
             </glossdef>
           </glossentry>
 
@@ -1001,8 +1000,8 @@
     emulation of an Intel AC'97 controller, an Intel HD Audio
     controller<footnote>
         <para>Intel HD Audio support was added with VirtualBox 4.0 because
-        Windows 7 (32-bit and 64-bit versions) as well as 64-bit Windows Vista
-        do not support the Intel AC'97 controller.</para>
+        Windows 7 and later (as well as 64-bit Windows Vista) do not support
+        the Intel AC'97 controller out of the box.</para>
       </footnote> or a SoundBlaster 16 card. In any case, you can select what
     audio driver VirtualBox will use on the host.</para>
 
diff --git a/doc/manual/en_US/user_ChangeLog.xml b/doc/manual/en_US/user_ChangeLog.xml
index 71fd731..aa564d8 100644
--- a/doc/manual/en_US/user_ChangeLog.xml
+++ b/doc/manual/en_US/user_ChangeLog.xml
@@ -13,10 +13,14 @@
   An odd minor version number represents an internal development or test build.
   In addition, each build contains a revision number.</para>
 
-<!--$VIRTUALBOX_CHANGELOG_IMPL-->
+  <xi:include href="@VBOX_PATH_MANUAL_SRC@/user_ChangeLogImpl.xml" xpointer="xpointer(/chapter/*)"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  <para>With VirtualBox 3.2, changelog information for versions before 2.0 was removed in
-  order to save space. To access this information, please consult the User Manual of
-  VirtualBox version 3.1 or earlier.</para>
+  <sect1>
+    <title>Older Change log details</title>
+    <para>With VirtualBox 5.0, changelog information for versions before 4.3
+    was removed in order to save space. To access this information, please
+    consult the User Manual of VirtualBox version 4.3 or earlier.</para>
+  </sect1>
 
 </chapter>
diff --git a/doc/manual/en_US/user_Frontends.xml b/doc/manual/en_US/user_Frontends.xml
index 34bd361..55579e6 100644
--- a/doc/manual/en_US/user_Frontends.xml
+++ b/doc/manual/en_US/user_Frontends.xml
@@ -288,7 +288,7 @@
           </listitem>
 
           <listitem>
-            <para>Create a virtual hard disk for the VM (in this case, 10GB in
+            <para>Create a virtual hard disk for the VM (in this case, 10 GB in
             size):<screen>VBoxManage createhd --filename "WinXP.vdi" --size 10000</screen></para>
           </listitem>
 
@@ -581,21 +581,21 @@
             Certificate Authority (CA) Certificate. The following example shows how to
             generate a server certificate.<orderedlist>
                 <listitem>
-                Create a CA self signed certificate:
+                <para>Create a CA self signed certificate:
                 <screen>openssl req -new -x509 -days 365 -extensions v3_ca \
-  -keyout ca_key_private.pem -out ca_cert.pem</screen>
+  -keyout ca_key_private.pem -out ca_cert.pem</screen></para>
                 </listitem>
 
                 <listitem>
-                Generate a server private key and a request for signing:
+                <para>Generate a server private key and a request for signing:
                 <screen>openssl genrsa -out server_key_private.pem
-openssl req -new -key server_key_private.pem -out server_req.pem</screen>
+openssl req -new -key server_key_private.pem -out server_req.pem</screen></para>
                 </listitem>
 
                 <listitem>
-                Generate the server certificate:
+                <para>Generate the server certificate:
                 <screen>openssl x509 -req -days 365 -in server_req.pem \
-  -CA ca_cert.pem -CAkey ca_key_private.pem -set_serial 01 -out server_cert.pem</screen>
+  -CA ca_cert.pem -CAkey ca_key_private.pem -set_serial 01 -out server_cert.pem</screen></para>
                 </listitem>
             </orderedlist>
             The server must be configured to access the required files:
diff --git a/doc/manual/en_US/user_GuestAdditions.xml b/doc/manual/en_US/user_GuestAdditions.xml
index 61853a9..cdc8299 100644
--- a/doc/manual/en_US/user_GuestAdditions.xml
+++ b/doc/manual/en_US/user_GuestAdditions.xml
@@ -361,8 +361,8 @@
         certificates installed in order to prevent user intervention popus which
         will undermine a silent installation.</para>
 
-        <note>On some Windows versions like Windows 2000 and Windows XP the user intervention
-        popups mentioned above always will be displayed, even after importing the Oracle certificates.</note>
+        <note><para>On some Windows versions like Windows 2000 and Windows XP the user intervention
+        popups mentioned above always will be displayed, even after importing the Oracle certificates.</para></note>
 
         <para>Since VirtualBox 4.2 installing those CA certificates on a Windows
         guest can be done in an automated fashion using the
@@ -401,64 +401,72 @@
         <para>In the following example the needed certificates will be extracted from the VirtualBox
         Windows Guest Additions installer on the CD-ROM:</para>
 
-        <sect4>
-          <title>VeriSign Code Signing CA</title>
-          <itemizedlist>
-            <listitem>
-              <para>In the Windows Explorer, right click on VBoxWindowsAdditions-<Architecture>.exe,
-              click on "Properties"</para>
-            </listitem>
-            <listitem>
-              <para>Go to tab "Digital Signatures", choose "Oracle Corporation" and click on "Details"</para>
-            </listitem>
-            <listitem>
-              <para>In tab "General" click on "View Certificate"</para>
-            </listitem>
-            <listitem>
-              <para>In tab "Certification Path" select "VeriSign Class 3 Public Primary CA"</para>
-            </listitem>
-            <listitem>
-              <para>Click on "View Certificate"</para>
-            </listitem>
-            <listitem>
-              <para>In tab "Details" click on "Copy to File ..."</para>
-            </listitem>
-            <listitem>
-              <para>In the upcoming wizard choose "DER encoded binary X.509 (.CER)"
-              and save the certificate file to a local path, finish the wizard</para>
-            </listitem>
-            <listitem>
-              <para>Close certificate dialog for "Verisign Class 3 Code Signing
-              2010 CA"</para>
-            </listitem>
-          </itemizedlist>
-        </sect4>
-
-        <sect4>
-          <title>Oracle Corporation</title>
-          <itemizedlist>
-            <listitem>
-              <para>In the Windows Explorer, right click on VBoxWindowsAdditions-<Architecture>.exe,
-              click on "Properties"</para>
-            </listitem>
-            <listitem>
-              <para>Go to tab "Digital Signatures", choose "Oracle Corporation" and click on "Details"</para>
-            </listitem>
-            <listitem>
-              <para>In tab "General" click on "View Certificate"</para>
-            </listitem>
-            <listitem>
-              <para>In tab "Details" click on "Copy to File ..."</para>
-            </listitem>
-            <listitem>
-              <para>In the upcoming wizard choose "DER encoded binary X.509 (.CER)"
-              and save the certificate file to a local path, finish the wizard</para>
-            </listitem>
-            <listitem>
-              <para>Close certificate dialog for "Oracle Corporation"</para>
-            </listitem>
-          </itemizedlist>
-        </sect4>
+        <glosslist>
+          <glossentry>
+            <glossterm>VeriSign Code Signing CA</glossterm>
+            <glossdef>
+              <para>Open the Windows Explorer.</para>
+              <itemizedlist>
+                <listitem>
+                  <para>Right click on VBoxWindowsAdditions-<Architecture>.exe,
+                  click on "Properties"</para>
+                </listitem>
+                <listitem>
+                  <para>Go to tab "Digital Signatures", choose "Oracle Corporation" and click on "Details"</para>
+                </listitem>
+                <listitem>
+                  <para>In tab "General" click on "View Certificate"</para>
+                </listitem>
+                <listitem>
+                  <para>In tab "Certification Path" select "VeriSign Class 3 Public Primary CA"</para>
+                </listitem>
+                <listitem>
+                  <para>Click on "View Certificate"</para>
+                </listitem>
+                <listitem>
+                  <para>In tab "Details" click on "Copy to File ..."</para>
+                </listitem>
+                <listitem>
+                  <para>In the upcoming wizard choose "DER encoded binary X.509 (.CER)"
+                  and save the certificate file to a local path, finish the wizard</para>
+                </listitem>
+                <listitem>
+                  <para>Close certificate dialog for "Verisign Class 3 Code Signing
+                  2010 CA"</para>
+                </listitem>
+              </itemizedlist>
+            </glossdef>
+          </glossentry>
+
+          <glossentry>
+            <glossterm>Oracle Corporation</glossterm>
+            <glossdef>
+              <para>Open the Windows Explorer.</para>
+              <itemizedlist>
+                <listitem>
+                  <para>Right click on VBoxWindowsAdditions-<Architecture>.exe,
+                  click on "Properties"</para>
+                </listitem>
+                <listitem>
+                  <para>Go to tab "Digital Signatures", choose "Oracle Corporation" and click on "Details"</para>
+                </listitem>
+                <listitem>
+                  <para>In tab "General" click on "View Certificate"</para>
+                </listitem>
+                <listitem>
+                  <para>In tab "Details" click on "Copy to File ..."</para>
+                </listitem>
+                <listitem>
+                  <para>In the upcoming wizard choose "DER encoded binary X.509 (.CER)"
+                  and save the certificate file to a local path, finish the wizard</para>
+                </listitem>
+                <listitem>
+                  <para>Close certificate dialog for "Oracle Corporation"</para>
+                </listitem>
+              </itemizedlist>
+            </glossdef>
+          </glossentry>
+        </glosslist>
 
         <para>After exporting the two certificates above they can be imported into the
         certificate store using the <computeroutput>certutil.exe</computeroutput>
@@ -646,7 +654,7 @@
           <para><orderedlist>
               <listitem>
                 <para>In order to fully update your guest system, open a
-                terminal and run <screen>yum update</screen></para> as root.
+                terminal and run <screen>yum update</screen> as root.</para>
               </listitem>
 
               <listitem>
@@ -667,7 +675,7 @@
           <para><orderedlist>
               <listitem>
                 <para>In order to fully update your guest system, open a
-                terminal and run <screen>zypper update</screen></para> as root.
+                terminal and run <screen>zypper update</screen> as root.</para>
               </listitem>
 
               <listitem>
@@ -705,7 +713,7 @@
           <para><orderedlist>
               <listitem>
                 <para>In order to fully update your guest system, open a
-                terminal and run <screen>zypper update</screen></para> as root.
+                terminal and run <screen>zypper update</screen> as root.</para>
               </listitem>
 
               <listitem>
@@ -747,8 +755,8 @@
 
               <listitem>
                 <para>In order to fully update your guest system, open a
-                terminal and run <screen>urpmi --auto-update</screen></para>
-                as root.
+                terminal and run <screen>urpmi --auto-update</screen>
+                as root.</para>
               </listitem>
 
               <listitem>
@@ -778,7 +786,7 @@
 
               <listitem>
                 <para>In order to fully update your guest system, open a
-                terminal and run <screen>yum update</screen></para> as root.
+                terminal and run <screen>yum update</screen> as root.</para>
               </listitem>
 
               <listitem>
@@ -891,9 +899,9 @@
         them.</para>
 
         <para>Starting with version 3.1.0, you can uninstall the Additions by
-        invoking <screen>/opt/VBoxGuestAdditions-$VBOX_VERSION_STRING/uninstall.sh</screen>Please
+        invoking <screen>/opt/VBoxGuestAdditions- at VBOX_VERSION_STRING@/uninstall.sh</screen>Please
         replace
-        <computeroutput>/opt/VBoxGuestAdditions-$VBOX_VERSION_STRING</computeroutput>
+        <computeroutput>/opt/VBoxGuestAdditions- at VBOX_VERSION_STRING@</computeroutput>
         with the correct Guest Additions installation directory.</para>
       </sect3>
     </sect2>
@@ -1274,14 +1282,16 @@ $</screen>
     the moment only copying of data is supported. Moving or linking is not yet
     implemented.</para></footnote></para>
 
-    <para>When transferring data from the host to the guest OS, the host in this
-    case is the source, whereas the guest OS is the target. However, when doing
-    it the other way around, that is, transferring data from the guest OS to the
-    host, the guest OS this time became the source and the host is the target.</para>
+    <para>When transferring data from the host to the guest OS, the host in
+    this case is the source, whereas the guest OS is the target. However, when
+    doing it the other way around, that is, transferring data from the guest OS
+    to the host, the guest OS this time became the source and the host is the
+    target.</para>
 
-    <para>For security reasons drag'n drop can be configured at runtime
-    on a per-VM basis either using the "Drag'n'Drop" menu item in the "Devices" menu
-    of the virtual machine or VBoxManage: The following four modes are available:
+    <para>For security reasons drag'n drop can be configured at runtime on a
+    per-VM basis either using the "Drag'n'Drop" menu item in the "Devices" menu
+    of the virtual machine or VBoxManage: The following four modes are
+    available:</para>
 
     <para><mediaobject>
       <imageobject>
@@ -1308,7 +1318,7 @@ $</screen>
         drag'n drop operations to both directions, e.g. from the host to the guest
         and vice versa.</para>
       </listitem>
-    </itemizedlist></para>
+    </itemizedlist>
 
     <note><para>Drag'n drop support depends on the frontend being used; at the
     moment only the VirtualBox Manager frontend provides this
@@ -1448,19 +1458,22 @@ $</screen>
       displayed when the Direct3D feature is selected.
       <note><para>Unlike the current basic Direct3D support, the WDDM video
       driver installation does <emphasis role="bold">not</emphasis> require
-      the "Safe Mode".</para></note>
-      <para>The Aero theme is not enabled by default. To enable it<itemizedlist>
+      the "Safe Mode".</para></note></para>
+
+      <para>The Aero theme is not enabled by default. To enable it
+        <itemizedlist>
           <listitem>
             <para>In Windows Vista guest: right-click on the desktop, in the
             context menu select "Personalize", then select "Windows Color and Appearance"
             in the "Personalization" window, in the "Appearance Settings" dialog select
-            "Windows Aero" and press "OK"</para></listitem>
+            "Windows Aero" and press "OK"</para>
+          </listitem>
           <listitem>
             <para>In Windows 7 guest: right-click on the desktop, in the
             context menu select "Personalize" and select any Aero theme
-            in the "Personalization" window</para></listitem>
-          </itemizedlist>
-        </para>
+            in the "Personalization" window</para>
+          </listitem>
+        </itemizedlist>
       </para>
 
       <para>Technically, VirtualBox implements this by installing an
@@ -1596,8 +1609,8 @@ $</screen>
     <xref linkend="vboxmanage-guestproperty" /> for details. For example, to
     have <emphasis>all</emphasis> the available guest properties for a given
     running VM listed with their respective values, use this:<screen>$ VBoxManage guestproperty enumerate "Windows Vista III"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2005- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Name: /VirtualBox/GuestInfo/OS/Product, value: Windows Vista Business Edition,
@@ -1611,27 +1624,27 @@ Name: /VirtualBox/GuestAdd/InstallDir,
     Guest Additions, timestamp: 1229098279269739000, flags:
 Name: /VirtualBox/GuestAdd/Revision, value: 40720,
     timestamp: 1229098279345664000, flags:
-Name: /VirtualBox/GuestAdd/Version, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD,
+Name: /VirtualBox/GuestAdd/Version, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@,
     timestamp: 1229098279479515000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxControl.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxControl.exe, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279651731000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxHook.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxHook.dll, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279804835000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxDisp.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxDisp.dll, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279880611000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxMRXNP.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxMRXNP.dll, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279882618000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxService.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxService.exe, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279883195000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxTray.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxTray.exe, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279885027000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxGuest.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxGuest.sys, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279886838000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxMouse.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxMouse.sys, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279890600000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxSF.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxSF.sys, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279893056000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxVideo.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxVideo.sys, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279895767000, flags:
 Name: /VirtualBox/GuestInfo/OS/LoggedInUsers, value: 1,
     timestamp: 1229099826317660000, flags:
@@ -1654,8 +1667,8 @@ Name: /VirtualBox/GuestInfo/OS/LoggedInUsersList, value: username,
 
     <para>To query the value of a single property, use the "get" subcommand
     like this:<screen>$ VBoxManage guestproperty get "Windows Vista III" "/VirtualBox/GuestInfo/OS/Product"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2005- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Value: Windows Vista Business Edition</screen></para>
@@ -1664,8 +1677,8 @@ Value: Windows Vista Business Edition</screen></para>
     <computeroutput>VBoxControl</computeroutput>. This tool is included in the
     Guest Additions of VirtualBox 2.2 or later. When started from a Linux
     guest, this tool requires root privileges for security reasons:<screen>$ sudo VBoxControl guestproperty enumerate
-VirtualBox Guest Additions Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2009-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Guest Additions Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2009- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Name: /VirtualBox/GuestInfo/OS/Release, value: 2.6.28-18-generic,
diff --git a/doc/manual/en_US/user_Installation.xml b/doc/manual/en_US/user_Installation.xml
index c5255be..fbecbbc 100644
--- a/doc/manual/en_US/user_Installation.xml
+++ b/doc/manual/en_US/user_Installation.xml
@@ -412,7 +412,7 @@
         Ubuntu Raring system. Use <computeroutput>dpkg</computeroutput> to
         install the Debian package:</para>
 
-        <screen>sudo dpkg -i virtualbox-5.0_$VBOX_VERSION_STRING_Ubuntu_raring_i386.deb</screen>
+        <screen>sudo dpkg -i virtualbox-5.0_ at VBOX_VERSION_STRING@_Ubuntu_raring_i386.deb</screen>
 
         <para>You will be asked to accept the VirtualBox Personal Use and
         Evaluation License. Unless you answer "yes" here, the installation
@@ -736,13 +736,13 @@ virtualbox virtualbox/delete-old-modules boolean true</screen>The first line
       <computeroutput>zonename</computeroutput> command. Execute the following
       commands:</para>
 
-      <screen>gunzip -cd VirtualBox-$VBOX_VERSION_STRING-SunOS.tar.gz | tar xvf -</screen>
+      <screen>gunzip -cd VirtualBox- at VBOX_VERSION_STRING@-SunOS.tar.gz | tar xvf -</screen>
 
       <para>Starting with VirtualBox 3.1 the VirtualBox kernel package is no
       longer a separate package and has been integrated into the main package.
       Install the VirtualBox package using:</para>
 
-      <screen>pkgadd -d VirtualBox-$VBOX_VERSION_STRING-SunOS.pkg</screen>
+      <screen>pkgadd -d VirtualBox- at VBOX_VERSION_STRING@-SunOS.pkg</screen>
 
       <note>
         <para>If you are using Solaris Zones, to install VirtualBox only into
@@ -834,7 +834,7 @@ virtualbox virtualbox/delete-old-modules boolean true</screen>The first line
       <para>Extract the tar.gz package as described in the normal
       installation. Then open a root terminal session and execute:</para>
 
-      <screen>pkgadd -d VirtualBox-$VBOX_VERSION_STRING-SunOS-x86 -n -a autoresponse SUNWvbox</screen>
+      <screen>pkgadd -d VirtualBox- at VBOX_VERSION_STRING@-SunOS-x86 -n -a autoresponse SUNWvbox</screen>
 
       <para>To perform a non-interactive uninstallation, open a root terminal
       session and execute:</para>
diff --git a/doc/manual/en_US/user_Introduction.xml b/doc/manual/en_US/user_Introduction.xml
index 8aaf5e6..4cc45e3 100644
--- a/doc/manual/en_US/user_Introduction.xml
+++ b/doc/manual/en_US/user_Introduction.xml
@@ -4,7 +4,7 @@
 <chapter id="Introduction">
   <title>First steps</title>
 
-  <para>Welcome to $VBOX_PRODUCT!</para>
+  <para>Welcome to @VBOX_PRODUCT@!</para>
 
   <para>VirtualBox is a cross-platform virtualization application. What does
   that mean? For one thing, it installs on your existing Intel or AMD-based
@@ -22,7 +22,7 @@
   up to datacenter deployments and even Cloud environments.</para>
 
   <para>The following screenshot shows you how VirtualBox, installed on a Mac
-  computer, is running Windows 7 in a virtual machine window:</para>
+  computer, is running Windows 8 in a virtual machine window:</para>
 
   <para><mediaobject>
       <imageobject>
@@ -1566,8 +1566,8 @@
 
     <para>To experiment with a VM configuration, test different guest OS levels
     or to simply backup a VM, VirtualBox can create a full or a linked copy of
-    an existing VM.<footnote>Cloning support was introduced with VirtualBox
-    4.1.</footnote></para>
+    an existing VM.<footnote><para>Cloning support was introduced with VirtualBox
+    4.1.</para></footnote></para>
     
     <para>A wizard will guide you through the clone process:</para>
 
diff --git a/doc/manual/en_US/user_KnownIssues.xml b/doc/manual/en_US/user_KnownIssues.xml
index ed05db0..aff2925 100644
--- a/doc/manual/en_US/user_KnownIssues.xml
+++ b/doc/manual/en_US/user_KnownIssues.xml
@@ -11,43 +11,43 @@
             welcome. A comprehensive list of experimental features follows:</para>
         <itemizedlist>
             <listitem>
-                WDDM Direct3D video driver for Windows guests
+                <para>WDDM Direct3D video driver for Windows guests</para>
             </listitem>
             <listitem>
-                Hardware 3D acceleration support for Windows, Linux, and Solaris 
-                guests
+                <para>Hardware 3D acceleration support for Windows, Linux, and Solaris 
+                guests</para>
             </listitem>
             <listitem>
-                Hardware 2D video playback acceleration support for Windows 
-                guests
+                <para>Hardware 2D video playback acceleration support for Windows 
+                guests</para>
             </listitem>
             <listitem>
-                PCI pass-through (Linux hosts only)
+                <para>PCI pass-through (Linux hosts only)</para>
             </listitem>
             <listitem>
-                Mac OS X guests (Mac hosts only)
+                <para>Mac OS X guests (Mac hosts only)</para>
             </listitem>
             <listitem>
-                ICH9 chipset emulation
+                <para>ICH9 chipset emulation</para>
             </listitem>
             <listitem>
-                EFI firmware
+                <para>EFI firmware</para>
             </listitem>
             <listitem>
-                Host CD/DVD drive pass-through
+                <para>Host CD/DVD drive pass-through</para>
             </listitem>
             <listitem>
-                Support of iSCSI via internal networking
+                <para>Support of iSCSI via internal networking</para>
             </listitem>
             <listitem>
-                Synthetic CPU reporting
+                <para>Synthetic CPU reporting</para>
             </listitem>
         </itemizedlist>
     </sect1>
     <sect1 id="KnownProblems">
       <title>Known Issues</title>
       <para>The following section describes known problems with VirtualBox
-      $VBOX_VERSION_STRING. Unless marked otherwise, these issues are planned to
+      @VBOX_VERSION_STRING at . Unless marked otherwise, these issues are planned to
       be fixed in later releases.</para>
     
       <itemizedlist>
diff --git a/doc/manual/en_US/user_Networking.xml b/doc/manual/en_US/user_Networking.xml
index 900e1d4..de8bd47 100644
--- a/doc/manual/en_US/user_Networking.xml
+++ b/doc/manual/en_US/user_Networking.xml
@@ -712,7 +712,7 @@
     statically.<itemizedlist>
         <listitem>
           <para>In the VirtualBox graphical user interface, you can configure
-          all these items in the global settings via "File" -> "Settings"
+          all these items in the global settings via "File" -> "Preferences"
           -> "Network", which lists all host-only networks which are
           presently in use. Click on the network name and then on the "Edit"
           button to the right, and you can modify the adapter and DHCP
@@ -724,9 +724,12 @@
           dhcpserver</computeroutput> on the command line; please see <xref
           linkend="vboxmanage-dhcpserver" /> for details.</para>
         </listitem>
-      </itemizedlist></para>
-    <para><note>On Linux and Mac OS X hosts the number of host-only interfaces is
-    limited to 128. There is no such limit for Solaris and Windows hosts.</note></para>
+      </itemizedlist>
+    </para>
+
+    <para><note><para>On Linux and Mac OS X hosts the number of host-only
+    interfaces is limited to 128. There is no such limit for Solaris and
+    Windows hosts.</para></note></para>
   </sect1>
 
   <sect1 id="network_udp_tunnel">
@@ -790,12 +793,11 @@
     the host can see the network traffic which it could not in the normal
     Internal network case.</para>
 
-    <para><note>
-        On Unix-based hosts (e.g. Linux, Solaris, Mac OS X) it is not possible
-        to bind to ports below 1024 from applications that are not run by 
-        <computeroutput>root</computeroutput>. As a result, if you try to
-        configure such a source UDP port, the VM will refuse to start. 
-      </note></para>
+    <para><note><para>On Unix-based hosts (e.g. Linux, Solaris, Mac OS X) it is
+    not possible to bind to ports below 1024 from applications that are not run
+    by <computeroutput>root</computeroutput>. As a result, if you try to
+    configure such a source UDP port, the VM will refuse to
+    start.</para></note></para>
   </sect1>
 
   <sect1 id="network_vde">
@@ -936,7 +938,7 @@ VBoxManage modifyvm "VM name" --nicbandwidthgroup2 Limit</screen></para>
         </listitem>
         <listitem>
           <para>Use <emphasis>bridged</emphasis> attachment instead of
-            <emphasis>NAT</emphasis></para>;
+            <emphasis>NAT</emphasis>;</para>
         </listitem>
         <listitem>
           <para>Make sure segmentation offloading is enabled in the guest OS.
diff --git a/doc/manual/en_US/user_Security.xml b/doc/manual/en_US/user_Security.xml
index 61f0c60..a033a53 100644
--- a/doc/manual/en_US/user_Security.xml
+++ b/doc/manual/en_US/user_Security.xml
@@ -5,147 +5,141 @@
   <title>Security guide</title>
 
   <sect1>
-    <title>Overview</title>
-    <para>
+    <title>General Security Principles</title>
+
+    <para>The following principles are fundamental to using any application
+      securely.
+      <glosslist>
+        <glossentry>
+          <glossterm>Keep Software Up To Date</glossterm>
+          <glossdef>
+            <para>
+              One of the principles of good security practise is to keep all
+              software versions and patches up to date. Activate the VirtualBox
+              update notification to get notified when a new VirtualBox release
+              is available. When updating VirtualBox, do not forget to update
+              the Guest Additions. Keep the host operating system as well as the
+              guest operating system up to date.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Restrict Network Access to Critical Services</glossterm>
+          <glossdef>
+            <para>
+              Use proper means, for instance a firewall, to protect your computer
+              and your guest(s) from accesses from the outside. Choosing the proper
+              networking mode for VMs helps to separate host networking from the
+              guest and vice versa.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Follow the Principle of Least Privilege</glossterm>
+          <glossdef>
+            <para>
+              The principle of least privilege states that users should be given the
+              least amount of privilege necessary to perform their jobs. Always execute VirtualBox
+              as a regular user. We strongly discourage anyone from executing
+              VirtualBox with system privileges.
+            </para>
+            <para>
+              Choose restrictive permissions when creating configuration files,
+              for instance when creating /etc/default/virtualbox, see
+              <xref linkend="linux_install_opts"/>. Mode 0600 would be preferred.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Monitor System Activity</glossterm>
+          <glossdef>
+            <para>
+              System security builds on three pillars: good security protocols, proper
+              system configuration and system monitoring. Auditing and reviewing audit
+              records address the third requirement. Each component within a system
+              has some degree of monitoring capability. Follow audit advice in this
+              document and regularly monitor audit records.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Keep Up To Date on Latest Security Information</glossterm>
+          <glossdef>
+            <para>
+              Oracle continually improves its software and documentation. Check this
+              note note yearly for revisions.
+            </para>
+          </glossdef>
+        </glossentry>
+
+      </glosslist>
     </para>
-
-    <sect2>
-      <title>General Security Principles</title>
-
-      <para>The following principles are fundamental to using any application
-        securely.
-        <glosslist>
-          <glossentry>
-            <glossterm>Keep Software Up To Date</glossterm>
-            <glossdef>
-              <para>
-                One of the principles of good security practise is to keep all
-                software versions and patches up to date. Activate the VirtualBox
-                update notification to get notified when a new VirtualBox release
-                is available. When updating VirtualBox, do not forget to update
-                the Guest Additions. Keep the host operating system as well as the
-                guest operating system up to date.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Restrict Network Access to Critical Services</glossterm>
-            <glossdef>
-              <para>
-                Use proper means, for instance a firewall, to protect your computer
-                and your guest(s) from accesses from the outside. Choosing the proper
-                networking mode for VMs helps to separate host networking from the
-                guest and vice versa.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Follow the Principle of Least Privilege</glossterm>
-            <glossdef>
-              <para>
-                The principle of least privilege states that users should be given the
-                least amount of privilege necessary to perform their jobs. Always execute VirtualBox
-                as a regular user. We strongly discourage anyone from executing
-                VirtualBox with system privileges.
-              </para>
-              <para>
-                Choose restrictive permissions when creating configuration files,
-                for instance when creating /etc/default/virtualbox, see
-                <xref linkend="linux_install_opts"/>. Mode 0600 would be preferred.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Monitor System Activity</glossterm>
-            <glossdef>
-              <para>
-                System security builds on three pillars: good security protocols, proper
-                system configuration and system monitoring. Auditing and reviewing audit
-                records address the third requirement. Each component within a system
-                has some degree of monitoring capability. Follow audit advice in this
-                document and regularly monitor audit records.
-              </para>
-            </glossdef>
-          </glossentry>
-
-          <glossentry>
-            <glossterm>Keep Up To Date on Latest Security Information</glossterm>
-            <glossdef>
-              <para>
-                Oracle continually improves its software and documentation. Check this
-                note note yearly for revisions.
-              </para>
-            </glossdef>
-          </glossentry>
-
-        </glosslist>
-      </para>
-    </sect2>
   </sect1>
 
   <sect1>
     <title>Secure Installation and Configuration</title>
-  </sect1>
-
-  <sect2>
-    <title>Installation Overview</title>
-    <para>
-      The VirtualBox base package should be downloaded only from a trusted source,
-      for instance the official website
-      <ulink url="http://www.virtualbox.org">http://www.virtualbox.org</ulink>.
-      The integrity of the package should be verified with the provided SHA256
-      checksum which can be found on the official website.
-    </para>
-    <para>
-      General VirtualBox installation instructions for the supported hosts
-      can be found in <xref linkend="installation"/>.
-    </para>
-    <para>
-      On Windows hosts, the installer allows for disabling USB support, support
-      for bridged networking, support for host-only networking and the Python
-      language bindings, see <xref linkend="installation_windows"/>.
-      All these features are enabled by default but disabling some
-      of them could be appropriate if the corresponding functionality is not
-      required by any virtual machine. The Python language bindings are only
-      required if the VirtualBox API is to be used by external Python
-      applications. In particular USB support and support
-      for the two networking modes require the installation of Windows kernel
-      drivers on the host. Therefore disabling those selected features can
-      not only be used to restrict the user to certain functionality but
-      also to minimize the surface provided to a potential attacker.     </para>
-    <para>
-      The general case is to install the complete VirtualBox package. The
-      installation must be done with system privileges. All VirtualBox binaries
-      should be executed as a regular user and never as a privileged user.
-    </para>
-    <para>
-      The Oracle VM VirtualBox extension pack provides additional features
-      and must be downloaded and installed separately, see
-      <xref linkend="intro-installing"/>. As for the base package, the SHA256
-      checksum of the extension pack should be verified. As the installation
-      requires system privileges, VirtualBox will ask for the system
-      password during the installation of the extension pack.
-    </para>
-  </sect2>
-
-  <sect2>
-    <title>Post Installation Configuration</title>
-    <para>
-      Normally there is no post installation configuration of VirtualBox components
-      required. However, on Solaris and Linux hosts it is necessary to configure
-      the proper permissions for users executing VMs and who should be able to
-      access certain host resources. For instance, Linux users must be member of
-      the <emphasis>vboxusers</emphasis> group to be able to pass USB devices to a
-      guest. If a serial host interface should be accessed from a VM, the proper
-      permissions must be granted to the user to be able to access that device.
-      The same applies to other resources like raw partitions, DVD/CD drives
-      and sound devices.
-    </para>
-  </sect2>
 
+    <sect2>
+      <title>Installation Overview</title>
+      <para>
+        The VirtualBox base package should be downloaded only from a trusted source,
+        for instance the official website
+        <ulink url="http://www.virtualbox.org">http://www.virtualbox.org</ulink>.
+        The integrity of the package should be verified with the provided SHA256
+        checksum which can be found on the official website.
+      </para>
+      <para>
+        General VirtualBox installation instructions for the supported hosts
+        can be found in <xref linkend="installation"/>.
+      </para>
+      <para>
+        On Windows hosts, the installer allows for disabling USB support, support
+        for bridged networking, support for host-only networking and the Python
+        language bindings, see <xref linkend="installation_windows"/>.
+        All these features are enabled by default but disabling some
+        of them could be appropriate if the corresponding functionality is not
+        required by any virtual machine. The Python language bindings are only
+        required if the VirtualBox API is to be used by external Python
+        applications. In particular USB support and support
+        for the two networking modes require the installation of Windows kernel
+        drivers on the host. Therefore disabling those selected features can
+        not only be used to restrict the user to certain functionality but
+        also to minimize the surface provided to a potential attacker.     </para>
+      <para>
+        The general case is to install the complete VirtualBox package. The
+        installation must be done with system privileges. All VirtualBox binaries
+        should be executed as a regular user and never as a privileged user.
+      </para>
+      <para>
+        The Oracle VM VirtualBox extension pack provides additional features
+        and must be downloaded and installed separately, see
+        <xref linkend="intro-installing"/>. As for the base package, the SHA256
+        checksum of the extension pack should be verified. As the installation
+        requires system privileges, VirtualBox will ask for the system
+        password during the installation of the extension pack.
+      </para>
+    </sect2>
+  
+    <sect2>
+      <title>Post Installation Configuration</title>
+      <para>
+        Normally there is no post installation configuration of VirtualBox components
+        required. However, on Solaris and Linux hosts it is necessary to configure
+        the proper permissions for users executing VMs and who should be able to
+        access certain host resources. For instance, Linux users must be member of
+        the <emphasis>vboxusers</emphasis> group to be able to pass USB devices to a
+        guest. If a serial host interface should be accessed from a VM, the proper
+        permissions must be granted to the user to be able to access that device.
+        The same applies to other resources like raw partitions, DVD/CD drives
+        and sound devices.
+      </para>
+    </sect2>
+  </sect1>
+  
   <sect1>
     <title>Security Features</title>
     <para>This section outlines the specific security mechanisms offered
diff --git a/doc/manual/en_US/user_ThirdParty.xml b/doc/manual/en_US/user_ThirdParty.xml
index ab5f5a8..9c47644 100644
--- a/doc/manual/en_US/user_ThirdParty.xml
+++ b/doc/manual/en_US/user_ThirdParty.xml
@@ -3035,11 +3035,8 @@ jloup at gzip.org          madler at alumni.caltech.edu</screen>
       <para>
         Copyright 1996-2002, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg
       </para>
-      <sect4>
+      <sect3>
         <title>Introduction</title>
-      </sect4>
-      <sect4>
-        <title></title>
         <para>
           The FreeType  Project is distributed in  several archive packages;
           some of them may contain, in addition to the FreeType font engine,
@@ -3099,8 +3096,8 @@ jloup at gzip.org          madler at alumni.caltech.edu</screen>
           Please replace <year> with the value from the FreeType version you
           actually use.
         </para>
-      </sect4>
-      <sect4>
+      </sect3>
+      <sect3>
         <title>Legal Terms</title>
         <sect4>
           <title>0. Definitions</title>
@@ -3156,19 +3153,23 @@ jloup at gzip.org          madler at alumni.caltech.edu</screen>
           </para>
           <itemizedlist>
             <listitem>
+              <para>
               Redistribution of  source code  must retain this  license file
               (`FTL.TXT') unaltered; any  additions, deletions or changes to
               the original  files must be clearly  indicated in accompanying
               documentation.   The  copyright   notices  of  the  unaltered,
               original  files must  be  preserved in  all  copies of  source
               files.
+              </para>
             </listitem>
             <listitem>
+              <para>
               Redistribution in binary form must provide a  disclaimer  that
               states  that  the software is based in part of the work of the
               FreeType Team,  in  the  distribution  documentation.  We also
               encourage you to put an URL to the FreeType web page  in  your
               documentation, though this isn't mandatory.
+              </para>
             </listitem>
           </itemizedlist>
           <para>
@@ -3235,7 +3236,7 @@ jloup at gzip.org          madler at alumni.caltech.edu</screen>
             http://www.freetype.org
           </para>
         </sect4>
-      </sect4>
+      </sect3>
     </sect2>
     <sect2 id="licVPX">
       <title>VPX License</title>
diff --git a/doc/manual/en_US/user_Troubleshooting.xml b/doc/manual/en_US/user_Troubleshooting.xml
index c574f47..be35cf0 100644
--- a/doc/manual/en_US/user_Troubleshooting.xml
+++ b/doc/manual/en_US/user_Troubleshooting.xml
@@ -432,7 +432,7 @@
   -> Number of vCPUs etc.
 [ Note Header, type NT_VBOXCPU ] - one for each vCPU
 [ vCPU 1 Note Header ]
-  [ CPUMCTX - vCPU 1 dump ]
+  [ DBGFCORECPU - vCPU 1 dump ]
 [ Additional Notes + Data ] - currently unused
 [ Memory dump ]</screen></para>
 
@@ -443,7 +443,7 @@
       <para>The relevant data structures and definitions can be found in the
       VirtualBox sources under the following header files:
       <computeroutput>include/VBox/dbgfcorefmt.h</computeroutput>,
-      <computeroutput>include/VBox/cpumctx.h</computeroutput> and
+      <computeroutput>include/iprt/x86.h</computeroutput> and
       <computeroutput>src/VBox/Runtime/include/internal/ldrELFCommon.h</computeroutput>.</para>
 
       <para>The VM core file can be inspected using
@@ -891,7 +891,7 @@
         </listitem>
 
         <listitem>
-          <para>Browse into installation CD for example E:\i386 (or AMD64 for 64bit version)</para>
+          <para>Browse into the installation CD for example E:\i386 (or amd64 for the 64-bit version)</para>
         </listitem>
 
         <listitem>
@@ -939,7 +939,7 @@
         </listitem>
 
         <listitem>
-          <para>After entering into the one of the numeric folders, browse into Windows\System32 (or C:\Windows\SysWOW64 for 64 bit version) directory locate d3d8.dll and d3d9.dll and extract</para>
+          <para>After entering into the one of the numeric folders, browse into Windows\System32 (or C:\Windows\SysWOW64 for the 64-bit version) directory locate d3d8.dll and d3d9.dll and extract</para>
         </listitem>
 
         <listitem>
@@ -1468,7 +1468,7 @@ none     /proc/bus/usb     usbfs      devgid=85,devmode=664    0    0</screen>Re
       <title>Linux kernel vmalloc pool exhausted</title>
 
       <para>When running a large number of VMs with a lot of RAM on a Linux
-      system (say 20 VMs with 1GB of RAM each), additional VMs might fail to
+      system (say 20 VMs with 1 GB of RAM each), additional VMs might fail to
       start with a kernel error saying that the vmalloc pool is exhausted and
       should be extended. The error message also tells you to specify
       <computeroutput>vmalloc=256MB</computeroutput> in your kernel parameter
diff --git a/doc/manual/en_US/user_VBoxManage.xml b/doc/manual/en_US/user_VBoxManage.xml
index 037021c..958c393 100644
--- a/doc/manual/en_US/user_VBoxManage.xml
+++ b/doc/manual/en_US/user_VBoxManage.xml
@@ -15,7 +15,6 @@
     Foundation, in version 2 as it comes in the "COPYING" file of the
     VirtualBox OSE distribution. VirtualBox OSE is distributed in the
     hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-
  -->
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
@@ -95,8 +94,8 @@
           </footnote> like this:</para>
 
         <screen>$ VBoxManage createvm --name "SUSE 10.2" --register
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2005- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Virtual machine 'SUSE 10.2' is created.
@@ -158,7 +157,8 @@ Settings file: '/home/username/.config/VirtualBox/Machines/SUSE 10.2/SUSE 10.2.x
     in doubt, check the output of <computeroutput>VBoxManage</computeroutput>
     for the commands available on your particular host.</para>
 
-    <screen>$VBOX_MANAGE_OUTPUT</screen>
+    <xi:include href="../user_VBoxManage_CommandsOverview.xml" xpointer="xpointer(/sect1/*)"
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <para>Each time VBoxManage is invoked, only one command can be executed.
     However, a command might support several subcommands which then can be
@@ -320,8 +320,8 @@ Settings file: '/home/username/.config/VirtualBox/Machines/SUSE 10.2/SUSE 10.2.x
     <para>You will get information similar to the following:</para>
 
     <para><screen>$ VBoxManage showvminfo "Windows XP"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2005- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Name:            Windows XP
@@ -887,7 +887,6 @@ Statistics update:  disabled</screen></para>
             the name of the NAT network this adapter is connected to.</para>
           </listitem>
           
-          This allows you to change the address range occupied by
           <listitem>
             <para><computeroutput>--bridgeadapter<1-N>
             none|<devicename></computeroutput>: If bridged networking
@@ -2800,8 +2799,8 @@ VBoxManage setextradata SUSE10 installdate 2006.02.02</screen>
 
     <para>which would return</para>
 
-    <screen>VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+    <screen>VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2005- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Value: 2006.01.01</screen>
@@ -4253,116 +4252,6 @@ Value: 2006.01.01</screen>
       </itemizedlist></para>
   </sect1>
 
-  <sect1 id="vboxmanage-debugvm">
-    <title>VBoxManage debugvm</title>
-
-    <para>The "debugvm" commands are for experts who want to tinker with the
-    exact details of virtual machine execution. Like the VM debugger described
-    in <xref linkend="ts_debugger" />, these commands are only useful if you are
-    very familiar with the details of the PC architecture and how to debug
-    software.</para>
-
-    <para>The subcommands of "debugvm" all operate on a running virtual
-    machine. The following are available:<itemizedlist>
-        <listitem>
-          <para>With <computeroutput>dumpguestcore --filename
-          <name></computeroutput>, you can create a system dump of the
-          running VM, which will be written into the given file. This file
-          will have the standard ELF core format (with custom sections); see
-          <xref linkend="ts_guest-core-format" />.</para>
-
-          <para>This corresponds to the
-          <computeroutput>writecore</computeroutput> command in the debugger.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>The <computeroutput>info</computeroutput> command is used to
-          display info items relating to the VMM, device emulations and
-          associated drivers.  This command takes one or two arguments: the
-          name of the info item, optionally followed by a string containing
-          arguments specific to the info item.
-          The <computeroutput>help</computeroutput> info item provides a
-          listning of the available items and hints about any optional
-          arguments.</para>
-
-          <para>This corresponds to the <computeroutput>info</computeroutput>
-          command in the debugger.</para>
-        </listitem>
-
-        <listitem>
-          <para>The <computeroutput>injectnmi</computeroutput> command causes
-          a non-maskable interrupt (NMI) in the guest, which might be useful
-          for certain debugging scenarios. What happens exactly is dependent
-          on the guest operating system, but an NMI can crash the whole guest
-          operating system. Do not use unless you know what you're
-          doing.</para>
-        </listitem>
-
-        <listitem>
-          <para>The <computeroutput>osdetect</computeroutput> command makes the
-          VMM's debugger facility (re-)detection the guest operation
-          system.</para>
-
-          <para>This corresponds to the <computeroutput>detect</computeroutput>
-          command in the debugger.</para>
-        </listitem>
-
-        <listitem>
-          <para>The <computeroutput>osinfo</computeroutput> command is used to
-          display info about the operating system (OS) detected by the VMM's
-          debugger facility.</para>
-        </listitem>
-
-        <listitem>
-          <para>The <computeroutput>getregisters</computeroutput> command is
-          used to display CPU and device registers.  The command takes a list
-          of registers, each having one of the following forms:
-          <itemizedlist>
-            <listitem><computeroutput>register-set.register-name.sub-field</computeroutput></listitem>
-            <listitem><computeroutput>register-set.register-name</computeroutput></listitem>
-            <listitem><computeroutput>cpu-register-name.sub-field</computeroutput></listitem>
-            <listitem><computeroutput>cpu-register-name</computeroutput></listitem>
-            <listitem><computeroutput>all</computeroutput></listitem>
-          </itemizedlist>
-          The <computeroutput>all</computeroutput> form will cause all
-          registers to be shown (no sub-fields).  The registers names are
-          case-insensitive.  When requesting a CPU register the register set
-          can be omitted, it will be selected using the value of the
-          <computeroutput>--cpu</computeroutput> option (defaulting to 0).
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>The <computeroutput>setregisters</computeroutput> command is
-          used to change CPU and device registers.  The command takes a list
-          of register assignments, each having one of the following forms:
-          <itemizedlist>
-            <listitem><computeroutput>register-set.register-name.sub-field=value</computeroutput></listitem>
-            <listitem><computeroutput>register-set.register-name=value</computeroutput></listitem>
-            <listitem><computeroutput>cpu-register-name.sub-field=value</computeroutput></listitem>
-            <listitem><computeroutput>cpu-register-name=value</computeroutput></listitem>
-          </itemizedlist>
-          The value format should be in the same style as what
-          <computeroutput>getregisters</computeroutput> displays, with the
-          exception that both octal and decimal can be used instead of
-          hexadecimal.  The register naming and the default CPU register set
-          are handled the same way as with the
-          <computeroutput>getregisters</computeroutput> command.</para>
-        </listitem>
-
-        <listitem>
-          <para>The <computeroutput>statistics</computeroutput> command can be
-          used to display VMM statistics on the command line. The
-          <computeroutput>--reset</computeroutput> option will reset
-          statistics. The affected statistics can be filtered with the
-          <computeroutput>--pattern</computeroutput> option, which accepts
-          DOS/NT-style wildcards (<computeroutput>?</computeroutput> and
-          <computeroutput>*</computeroutput>).</para>
-        </listitem>
-      </itemizedlist></para>
-  </sect1>
-
   <sect1 id="metrics">
     <title>VBoxManage metrics</title>
 
@@ -4631,6 +4520,9 @@ Value: 2006.01.01</screen>
     network or host-only interface name.</para>
   </sect1>
 
-  <xi:include href="man_VBoxManage_extpack.xml" xpointer="element(/1)"
+  <xi:include href="user_man_VBoxManage-debugvm.xml" xpointer="element(/1)"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="user_man_VBoxManage-extpack.xml" xpointer="element(/1)"
     xmlns:xi="http://www.w3.org/2001/XInclude" />
 </chapter>
diff --git a/doc/manual/fr_FR/SDKRef.xml b/doc/manual/fr_FR/SDKRef.xml
index 40e1559..4c8a9ca 100644
--- a/doc/manual/fr_FR/SDKRef.xml
+++ b/doc/manual/fr_FR/SDKRef.xml
@@ -3,20 +3,20 @@
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <book>
   <bookinfo>
-    <title>$VBOX_PRODUCT<superscript>®</superscript></title>
+    <title>@VBOX_PRODUCT@<superscript>®</superscript></title>
 
     <subtitle>Programming Guide and Reference</subtitle>
 
-    <edition>Version $VBOX_VERSION_STRING</edition>
+    <edition>Version @VBOX_VERSION_STRING@</edition>
 
-    <corpauthor>$VBOX_VENDOR</corpauthor>
+    <corpauthor>@VBOX_VENDOR@</corpauthor>
 
     <address>http://www.virtualbox.org</address>
 
     <copyright>
-      <year>2004-$VBOX_C_YEAR</year>
+      <year>2004- at VBOX_C_YEAR@</year>
 
-      <holder>$VBOX_VENDOR</holder>
+      <holder>@VBOX_VENDOR@</holder>
     </copyright>
   </bookinfo>
 
@@ -1183,7 +1183,7 @@ version = webservice.IVirtualBox_getVersion(oVirtualBox);
 print version;</screen></para>
 
                 <para>And it will print
-                "$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD".</para>
+                "@VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@".</para>
               </listitem>
 
               <listitem>
@@ -2272,7 +2272,8 @@ es.unregisterListener(listener); </screen></para>
     already running. Your new command will now be available.</para>
   </chapter>
 
-  <!--$VIRTUALBOX_MAIN_API_REFERENCE-->
+  <xi:include href="SDKRef_apiref.xml" xpointer="xpointer(/book/*)"
+    xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <chapter id="hgcm">
     <title>Host-Guest Communication Manager</title>
diff --git a/doc/manual/fr_FR/UserManual.xml b/doc/manual/fr_FR/UserManual.xml
index da39c93..3ba8ce5 100644
--- a/doc/manual/fr_FR/UserManual.xml
+++ b/doc/manual/fr_FR/UserManual.xml
@@ -3,14 +3,14 @@
   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <book>
   <bookinfo>
-    <title>$VBOX_PRODUCT<superscript>®</superscript></title>
+    <title>@VBOX_PRODUCT@<superscript>®</superscript></title>
 
     <subtitle>Manuel de l'utilisateur</subtitle>
 
     <edition>Version
-    $VBOX_VERSION_STRING</edition>
+    @VBOX_VERSION_STRING@</edition>
 
-    <corpauthor>$VBOX_VENDOR</corpauthor>
+    <corpauthor>@VBOX_VENDOR@</corpauthor>
 
     <othercredit class="translator">
       <contrib>Traducteur</contrib>
@@ -21,9 +21,9 @@
     <address>http://www.virtualbox.org</address>
 
     <copyright>
-      <year>2004-$VBOX_C_YEAR</year>
+      <year>2004- at VBOX_C_YEAR@</year>
 
-      <holder>$VBOX_VENDOR</holder>
+      <holder>@VBOX_VENDOR@</holder>
     </copyright>
   </bookinfo>
 
diff --git a/doc/manual/fr_FR/user_GuestAdditions.xml b/doc/manual/fr_FR/user_GuestAdditions.xml
index e30f9e1..dfdfd05 100644
--- a/doc/manual/fr_FR/user_GuestAdditions.xml
+++ b/doc/manual/fr_FR/user_GuestAdditions.xml
@@ -934,9 +934,9 @@
         paramétrage des suppléments invité après les avoir installé.</para>
 
         <para>À partir de la version 3.1.0, vous pouvez désinstaller les 
-        suppléments en appelant <screen>/opt/VBoxGuestAdditions-$VBOX_VERSION_STRING/uninstall.sh</screen>Merci
+        suppléments en appelant <screen>/opt/VBoxGuestAdditions- at VBOX_VERSION_STRING@/uninstall.sh</screen>Merci
         de remplacer 
-        <computeroutput>/opt/VBoxGuestAdditions-$VBOX_VERSION_STRING</computeroutput>
+        <computeroutput>/opt/VBoxGuestAdditions- at VBOX_VERSION_STRING@</computeroutput>
         par le bon répertoire d'installation des suppléments invité.</para>
       </sect3>
     </sect2>
@@ -1646,8 +1646,8 @@ $</screen>
     pour voir <emphasis>toutes</emphasis> les propriétés invité disponible pour 
     une Vm donnée en fonction, listées avec leurs valeurs respectives, utilisez
     ceci&#xA0;:<screen>$ VBoxManage guestproperty enumerate "Windows Vista III"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2005- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Name: /VirtualBox/GuestInfo/OS/Product, value: Windows Vista Business Edition,
@@ -1661,27 +1661,27 @@ Name: /VirtualBox/GuestAdd/InstallDir,
     suppléments invité, timestamp: 1229098279269739000, flags:
 Name: /VirtualBox/GuestAdd/Revision, value: 40720,
     timestamp: 1229098279345664000, flags:
-Name: /VirtualBox/GuestAdd/Version, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD,
+Name: /VirtualBox/GuestAdd/Version, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@,
     timestamp: 1229098279479515000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxControl.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxControl.exe, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279651731000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxHook.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxHook.dll, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279804835000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxDisp.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxDisp.dll, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279880611000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxMRXNP.dll, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxMRXNP.dll, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279882618000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxService.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxService.exe, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279883195000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxTray.exe, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxTray.exe, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279885027000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxGuest.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxGuest.sys, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279886838000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxMouse.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxMouse.sys, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279890600000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxSF.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxSF.sys, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279893056000, flags:
-Name: /VirtualBox/GuestAdd/Components/VBoxVideo.sys, value: $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILDr40720,
+Name: /VirtualBox/GuestAdd/Components/VBoxVideo.sys, value: @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD at r40720,
     timestamp: 1229098279895767000, flags:
 Name: /VirtualBox/GuestInfo/OS/LoggedInUsers, value: 1,
     timestamp: 1229099826317660000, flags:
@@ -1705,8 +1705,8 @@ Name: /VirtualBox/GuestInfo/OS/LoggedInUsersList, value: username,
     <para>To query the value of a single property, use the "get" subcommand
     like this:<screen>$ VBoxManage guestproperty get "Windows Vista III"
          "/VirtualBox/GuestInfo/OS/Product"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2005- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Value: Windows Vista Business Edition</screen></para>
@@ -1716,8 +1716,8 @@ Value: Windows Vista Business Edition</screen></para>
     suppléments invité de VirtualBox 2.2 ou supérieur. S'il est lancé avec un
     invité Linux, cet outil exige les privilèges administrateur pour des raisons
     de sécurité&#xA0;:<screen>$ sudo VBoxControl guestproperty enumerate
-VirtualBox suppléments invité Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2009-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox suppléments invité Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2009- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Name: /VirtualBox/GuestInfo/OS/Release, value: 2.6.28-18-generic,
diff --git a/doc/manual/fr_FR/user_Installation.xml b/doc/manual/fr_FR/user_Installation.xml
index 3da33d7..32580e8 100644
--- a/doc/manual/fr_FR/user_Installation.xml
+++ b/doc/manual/fr_FR/user_Installation.xml
@@ -393,7 +393,7 @@
         Ubuntu Raring 32 bits. Utilisez <computeroutput>dpkg</computeroutput>
         pour installer le paquet Debian&#xA0;:</para>
 
-        <screen>sudo dpkg -i VirtualBox-4.3_$VBOX_VERSION_STRING_Ubuntu_raring_i386.deb</screen>
+        <screen>sudo dpkg -i VirtualBox-4.3_ at VBOX_VERSION_STRING@_Ubuntu_raring_i386.deb</screen>
 
         <para>On vous demandera d'accepter la licence d'utilisation Personelle
         et d'évaluation de VirtualBox. Sauf si vous répondez "oui" l'installation
@@ -719,13 +719,13 @@ virtualbox virtualbox/delete-old-modules boolean true</screen>La première ligne
       <computeroutput>zonename</computeroutput>. Exécutez les
       commandes suivantes&#xA0;:</para>
 
-      <screen>gunzip -cd VirtualBox-$VBOX_VERSION_STRING-SunOS.tar.gz | tar xvf -</screen>
+      <screen>gunzip -cd VirtualBox- at VBOX_VERSION_STRING@-SunOS.tar.gz | tar xvf -</screen>
 
       <para>À partir de VirtualBox 3.1, le paquet noyau de VirtualBox n'est plus
       distinct et il a été intégré au paquet principal.
       Installez le paquet VirtualBox en utilisant&#xA0;:</para>
 
-      <screen>pkgadd -d VirtualBox-$VBOX_VERSION_STRING-SunOS.pkg</screen>
+      <screen>pkgadd -d VirtualBox- at VBOX_VERSION_STRING@-SunOS.pkg</screen>
 
       <note>
         <para>Si vous utilisez les Espaces Solaris, pour n'installer VirtualBox
@@ -819,7 +819,7 @@ virtualbox virtualbox/delete-old-modules boolean true</screen>La première ligne
       <para>Extrayez le paquet tar.gz comme décrit dans l'installation normale.
       Puis ouvrez une session administrateur en terminal et exécutez&#xA0;:</para>
 
-      <screen>pkgadd -d VirtualBox-$VBOX_VERSION_STRING-SunOS-x86 -n -a autoresponse SUNWvbox</screen>
+      <screen>pkgadd -d VirtualBox- at VBOX_VERSION_STRING@-SunOS-x86 -n -a autoresponse SUNWvbox</screen>
 
       <para>Pour effectuer une désinstallation non interactive, ouvrez une session
       administrateur en terminal et exécutez&#xA0;:</para>
diff --git a/doc/manual/fr_FR/user_Introduction.xml b/doc/manual/fr_FR/user_Introduction.xml
index aeaefb6..e25faa1 100644
--- a/doc/manual/fr_FR/user_Introduction.xml
+++ b/doc/manual/fr_FR/user_Introduction.xml
@@ -4,7 +4,7 @@
 <chapter id="Introduction">
   <title>Premiers pas</title>
 
-  <para>Bienvenue à $VBOX_PRODUCT!</para>
+  <para>Bienvenue à @VBOX_PRODUCT@!</para>
 
   <para>VirtualBox est une application de virtualisation de plateformes croisées.
   Qu'est-ce que cela veut dire&#xA0;? D'une part, il s'installe sur vos ordinateurs
diff --git a/doc/manual/fr_FR/user_KnownIssues.xml b/doc/manual/fr_FR/user_KnownIssues.xml
index 94ddbc1..1e03b9c 100644
--- a/doc/manual/fr_FR/user_KnownIssues.xml
+++ b/doc/manual/fr_FR/user_KnownIssues.xml
@@ -47,7 +47,7 @@
     <sect1 id="KnownProblems">
       <title>Problèmes connus</title>
       <para>La section suivante décrit les problèmes connus avec VirtualBox
-      $VBOX_VERSION_STRING. Sauf autrement spécifié, il est prévu de corriger ces
+      @VBOX_VERSION_STRING at . Sauf autrement spécifié, il est prévu de corriger ces
       problèmes dans les prochaines versions.</para>
     
       <itemizedlist>
diff --git a/doc/manual/fr_FR/user_VBoxManage.xml b/doc/manual/fr_FR/user_VBoxManage.xml
index 9b7ebfe..7cea10d 100644
--- a/doc/manual/fr_FR/user_VBoxManage.xml
+++ b/doc/manual/fr_FR/user_VBoxManage.xml
@@ -78,8 +78,8 @@
           </footnote> comme ceci&#xA0;:</para>
 
         <screen>$ VBoxManage createvm --name "SUSE 10.2" --register
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2005- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Virtual machine 'SUSE 10.2' is created.
@@ -143,7 +143,8 @@ Settings file: '/home/nomutilisateur/.config/VirtualBox/Machines/SUSE 10.2/SUSE
     en cas de doute, vérifiez la sortie de <computeroutput>VBoxManage</computeroutput>
     pour voir les commandes disponibles sur votre hôte en particulier.</para>
 
-    <screen>$VBOX_MANAGE_OUTPUT</screen>
+    <xi:include href="../user_VBoxManage_CommandsOverview.xml" xpointer="xpointer(/sect1/*)"
+      xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <para>À chaque fois que vous appelez VBoxManage, une seule commande peut être
     exécutée. Toutefois, une commande peut supporter plusieurs sous-commandes
@@ -305,8 +306,8 @@ Settings file: '/home/nomutilisateur/.config/VirtualBox/Machines/SUSE 10.2/SUSE
     <para>Vous aurez des informations ressemblant à ce qui suit&#xA0;:</para>
 
     <para><screen>$ VBoxManage showvminfo "Windows XP"
-VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2005- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Name:            Windows XP
@@ -2532,8 +2533,8 @@ VBoxManage setextradata SUSE10 installdate 2006.02.02</screen>
 
     <para>qui renverrait</para>
 
-    <screen>VirtualBox Command Line Management Interface Version $VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
-(C) 2005-$VBOX_C_YEAR $VBOX_VENDOR
+    <screen>VirtualBox Command Line Management Interface Version @VBOX_VERSION_MAJOR at .@VBOX_VERSION_MINOR at .@VBOX_VERSION_BUILD@
+(C) 2005- at VBOX_C_YEAR@ @VBOX_VENDOR@
 All rights reserved.
 
 Value: 2006.01.01</screen>
diff --git a/doc/manual/user_ChangeLogImpl.xml b/doc/manual/user_ChangeLogImpl.xml
index 845bf44..56d1aff 100644
--- a/doc/manual/user_ChangeLogImpl.xml
+++ b/doc/manual/user_ChangeLogImpl.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<chapter> <!-- HACK ALERT! Seems we must have a single top level element for xi:include to work.
+                           So, we use chapter and xpointer="xpointer(/chapter/)" with xi:include. -->
   <sect1>
-    <title>Version 5.0.0 Release Candidate 1 (2015-06-01)</title>
+    <title>Version 5.0.0 Release Candidate 2 (2015-06-25)</title>
 
     <para>This is a major update. The following major new features
       were added:</para>
@@ -90,6 +92,11 @@
       </listitem>
 
       <listitem>
+        <para>VMM: debug facility now includes includes the guest CPU's
+          FPU/SSE/extended state in the core dump</para>
+      </listitem>
+
+      <listitem>
         <para>GUI: improved HID LEDs synchronization for Mac and Windows hosts.
           The physical LEDs state now restored together with the VM state.</para>
       </listitem>
@@ -153,6 +160,11 @@
       </listitem>
 
       <listitem>
+        <para>API: fixed incorrect resuming of VMs on host-resume unless they were
+          previously paused due to a host-suspend</para>
+      </listitem>
+
+      <listitem>
         <para>Main/Properties: properly drop transient guest properties when
           the VM is powered off</para>
       </listitem>
@@ -217,6 +229,169 @@
   </sect1>
 
   <sect1>
+    <title>Version 4.3.28 (2015-05-13)</title>
+
+    <para>This is a maintenance release. The following items were fixed and/or
+      added:</para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>VMM: fixed a Guru Meditation when rebooting certain guests (for
+          example Solaris doing fast reboot) by fixing the implementation for INIT IPI</para>
+      </listitem>
+
+      <listitem>
+        <para>VMM: added some information for diagnosing rare
+          <emphasis>VERR_VMX_INVALID_VMXON_PTR</emphasis> Guru Meditations (VT-x only)</para>
+      </listitem>
+
+      <listitem>
+        <para>GUI: HID LEDs sync: prevent synchronization if VM window has no focus
+          (Windows and Mac OS X hosts only)</para>
+      </listitem>
+
+      <listitem>
+        <para>GUI: fixed drag and drop moving the cursor between guest screens on
+          certain hosts</para>
+      </listitem>
+
+      <listitem>
+        <para>3D: fixed a crash on restoring the VM state on X11 hosts (bug #12737)</para>
+      </listitem>
+
+      <listitem>
+        <para>3D: fixed a crash on restoring the VM state</para>
+      </listitem>
+
+      <listitem>
+        <para>3D: fixed a crash on Linux guest shutdown (bug #12772)</para>
+      </listitem>
+
+      <listitem>
+        <para>VRDP: fixed incompatibility with rdesktop 1.8.3</para>
+      </listitem>
+
+      <listitem>
+        <para>VRDP: fixed listening for IPv6 on some systems (bug #14038)</para>
+      </listitem>
+
+      <listitem>
+        <para>Storage: don't crash if creating an asynchronous I/O context
+          fails (e.g. when starting many VMs) and show a proper error message</para>
+      </listitem>
+
+      <listitem>
+        <para>Floppy: several fixes</para>
+      </listitem>
+
+      <listitem>
+        <para>Audio: improved the behavior of the volume control for the
+          HD audio device emulation</para>
+      </listitem>
+
+      <listitem>
+        <para>USB: increase the number of supported drivers from 3 to 5
+          (Windows hosts only)</para>
+      </listitem>
+
+      <listitem>
+        <para>PS/2 keyboard: synchronize the LED state on VM restore
+          (Windows and Mac OS X hosts only)</para>
+      </listitem>
+
+      <listitem>
+        <para>NAT Network: when running multiple NAT networks with multiple VMs,
+          only stop the respective services when stopping VMs (bug #14090)</para>
+      </listitem>
+
+      <listitem>
+        <para>NAT: don't kill UDP bindings on ICMP errors (bug #13475)</para>
+      </listitem>
+
+      <listitem>
+        <para>NAT: bandwidth limit now works properly with NAT (bug #11485)</para>
+      </listitem>
+
+      <listitem>
+        <para>BIOS: fixed the returned size value of the VBE 2.0 PMI function 0Ah
+          (4.2.0 regression; bug #14096)</para>
+      </listitem>
+
+      <listitem>
+        <para>Guest Control: fixed parameter quoting in Windows guests
+          (bug #13157)</para>
+      </listitem>
+
+      <listitem>
+        <para>Webcam passthrough improvements for Linux (V4L2) hosts to support more
+          webcam models</para>
+      </listitem>
+
+      <listitem>
+        <para>API: don't fail starting a VM with <emphasis>VBOX_E_INVALID_OBJECT_STATE</emphasis>
+          under certain conditions (bug #13617)</para>
+      </listitem>
+
+      <listitem>
+        <para>API: be more verbose on <emphasis>VBOX_E_INVALID_OBJECT_STATE</emphasis>
+          if a medium is attached to a running VM (bug #13560)</para>
+      </listitem>
+
+      <listitem>
+        <para>API: fixed a bug which could result in losing certain screen resize
+          events with multi-monitor guests</para>
+      </listitem>
+
+      <listitem>
+        <para>rdesktop-vrdp: fixed path to the keymaps (bug #12066)</para>
+      </listitem>
+
+      <listitem>
+        <para>rdesktop-vrdp: switch to version 1.8.3</para>
+      </listitem>
+
+      <listitem>
+        <para>Windows hosts: more hardening fixes (e.g. bugs #14051, #14052)</para>
+      </listitem>
+
+      <listitem>
+        <para>Linux hosts: another fix for activated SMAP on Linux 3.19
+          and newer (Broadwell and later; bug #13961)</para>
+      </listitem>
+
+      <listitem>
+        <para>Linux hosts: Linux 4.1 compile fix (bug #14081)</para>
+      </listitem>
+
+      <listitem>
+        <para>Solaris hosts: fixed using of VNIC templates with Crossbow based
+          bridged networking to be compatible with vanity interface names</para>
+      </listitem>
+
+      <listitem>
+        <para>Mac OS X hosts: fixed crash during VM termination under rare
+          circumstances</para>
+      </listitem>
+
+      <listitem>
+        <para>Windows Additions/WDDM: improved video memory utilization and allow
+          more/bigger guest screens with large resolutions (including HiDPI)</para>
+      </listitem>
+
+      <listitem>
+        <para>X11 Additions: prevent flickering when updating mouse cursor</para>
+      </listitem>
+
+      <listitem>
+        <para>Solaris Additions: fixed incorrect usage of 'prtconf' while
+          installing Guest Additions (Solaris 10 only)</para>
+      </listitem>
+
+    </itemizedlist>
+  </sect1>
+
+  <sect1>
     <title>Version 4.3.26 (2015-03-16)</title>
 
     <para>This is a maintenance release. The following items were fixed and/or
@@ -2442,9985 +2617,5 @@
 
   </sect1>
 
-  <sect1>
-    <title>Version 4.2.22 (2014-01-10)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>GUI: Mac OS X host: introduced extradata option "GUI/HidLedsSync" aimed to enable
-          HID LEDs synchronization (feature disabled by default)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: Mac OS X host: fixed issue on MacBook Air/Pro hosts when GUI
-          might freeze in attempt to synchronize HID LEDs</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: always expose the DMI memory information to Windows 2012 guests
-          (bug #12017)</para>
-      </listitem>
-
-      <listitem>
-        <para>HGCM: fixed crashes under certain conditions</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fix for <emphasis>BLKCACHE_IOERR</emphasis> runtime errors under
-          rare circumstances (bug #11030)</para>
-      </listitem>
-
-      <listitem>
-        <para>AHCI: fixed a bug which resulted in Windows XP guest hangs if a
-          SATA CDROM is attached (bug #12417)</para>
-      </listitem>
-
-      <listitem>
-        <para>AHCI: fixed a Guru Meditation under certain conditions</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: if the cable was disconnected before the guest initialized
-          the device, the link status was not properly set to 'down' after the
-          initialization completed despite the fact that there was no connection</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed offset of guest 3D image elements (Mac OS X Retina
-          hosts only; bug #11021)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: many fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: support Enterprise Linux 6.5 kernels
-           (bug #12505)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed CPU hot-remove on newer Linux kernels</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed guest crashes in in Shared Folders
-          service under certain conditions</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 4.2.20 (2013-11-28)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>GUI: always report recommended resolutions for all monitors
-          (not always done since 4.2.12)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: make sure the assigned license and description are attached to
-          the exported appliance</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: the OS X hot corners were not accessible while a VirtualBox VM
-          is running (Mac OS X hosts only; bug #4139)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: don't run into an infinite loop in case the host cannot
-          access any DNS server (4.3.0 regression; bug #12300)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: don't re-connect the cable if the DNS information changes
-          and the cable was disconnected before (4.3.0 regression; bug #12225)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: properly save the <emphasis>passthrough</emphasis> flag for DVD
-          drives without an attached medium</para>
-      </listitem>
-
-      <listitem>
-        <para>Keyboard: fixed a VM crash if a VM was resumed from a saved state
-          where at least one key was pressed (bug #11289)</para>
-      </listitem>
-
-      <listitem>
-        <para>2D Video acceleration: fix crashes on presentation mode switches
-          (bug #9194)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed errors with snapshots when using QCOW or QED disk images
-          (bug #12144)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fix for newer Linux kernels not detecting a hard disk as SSD
-          when using the IDE or SATA controller (bug #12025)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed detection of CD/DVD media when switching from an empty
-          to a host drive with passthrough enabled</para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: fixed a bug which could result in lost medium attachments
-          (4.2.18 regression; bug #11750)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Clipboard: fixed potential SEGFAULT when
-          working with UTF8 and UTF16 content (Mac OS X hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed import logic for OVF appliances containing multiple
-          VMs</para>
-      </listitem>
-
-      <listitem>
-        <para>Extpack Installer: make it work if the file is located in a folder with
-          special characters</para>
-      </listitem>
-
-      <listitem>
-        <para>SDK: extended the functionality coverage for the C bindings</para>
-      </listitem>
-
-      <listitem>
-        <para>API: block the removal of the current snapshot if it has child
-           snapshots (only relevant for VMs without snapshottable hard disks,
-           their presence always prevented removal), which resulted in VM
-           config corruption</para>
-      </listitem>
-
-      <listitem>
-        <para>API: mark VM configs with snapshots but without current snapshot
-           as inaccessible, as this combination is nonsense</para>
-      </listitem>
-
-      <listitem>
-        <para>API: fixed information for some automatically generated events
-          (only with XPCOM, Windows host was not affected), which caused
-          errors when getting some of the attributes over the webservice
-          (bug #12379)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: support for Mac OS X 10.9 (Mavericks)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: properly sign the kernel extensions for
-          Mavericks hosts (bug #12256)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: use a launchd script instead of the deprecated
-          StartupItem mechanism (bug #8940)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed a bug where the VirtualBox dock icon was
-          not properly removed from the dock after a VM terminated preventing
-          Mavericks hosts from shutting (bug #12241)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: Linux 3.13 compile fix (bug #12358)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: Linux 3.12 compile fix (bug #12083)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: Linux 3.11 fix for shared folders (bugs #11946, #12128)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: compile fix for SLES11 SP3</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: correctly set umask before installing
-           (bug #12166)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: build the vboxvideo kernel module correctly on
-           OL/RHEL 6.1 guests (bug #11996)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: make 3D work on Slackware 14.1
-           (bug #12320 comments 3 and 4)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed memory leak caused by
-          <emphasis>WTSQuerySessionInformation()</emphasis>
-          on Windows 2000 guests (bug #12072)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: multimonitor resize fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 Additions/3D: fix freezes starting 3D desktop (bug #11503,
-           thank you Sam Spilsbury)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest additions/3D: fix an occasional dead-lock (bug #12319)
-           </para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.2.18 (2013-09-06)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: properly handle NMIs on Linux hosts with X2APIC
-          enabled</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed potential crashes with 64-bit guests on 32-bit hosts
-          (bug #11979)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI / seamless: properly handle mouse wheel scroll events</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI, VBoxManage: when unregistering a VM, also unregister the
-          hard disk images which are used exclusively (bug #10311)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: prevent crashes under certain conditions on X11 hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: multiscreen fixes (incorrect mouse position, flickets)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: several fixes for the Windows WDDM video driver
-          (multiscreen, seamless)</para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: made live snapshots work again (bug #9255)</para>
-      </listitem>
-
-      <listitem>
-        <para>Teleportation: made it work again (bug #9455)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: on <emphasis>snapshot take</emphasis>, <emphasis>
-            --pause</emphasis> is default and <emphasis>--live</emphasis>
-          is for doing live snapshots</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxSVC: don't crash on systems with many VLAN interfaces
-          (Solaris hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>Network: after the host resumes from suspend, disconnect and
-          reconnect the virtual network cables to force renewing the DHCP
-          leases for the guests. So far only Mac OS X hosts and Windows hosts
-          (bug #10063)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: on name server changes force a reconnect of the virtual network
-          cable to notify the guest (Mac OS X hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X installer: keep previously installed Extension Packs on
-          VirtualBox upgrade</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts / guests: Linux 3.11 fixes (bug #12001)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed a potential kernel panic caused due to
-          unexpected preemption due to logging</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: fixed an issue with USB2 devices being inaccessible
-          when plugged into USB3 ports</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: added PCI device identifier to vboxvideo.ko fixing
-          DRI initialization under certain conditions (bug #11957)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed udev detection in the init script
-          with Linux 3.x kernels</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.2.16 (2013-07-04)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>OVF/OVA: don't crash on import if no manifest is used (4.2.14 regression;
-          bug #11895)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: do not restore the current snapshot if we power-off
-          after a Guru Mediation</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed a crash when hotplugging an empty DVD drive to
-          the VM</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed a crash when a guest read from a DVD drive
-          attached to the SATA controller under certain circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>EFI: don't fail with 64-bit guests on 32-bit hosts (bug #11456)</para>
-      </listitem>
-
-      <listitem>
-        <para>Autostart: fixed VM startup on OS X</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: native Windows 8 controls</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: restore native style on Vista 32</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts / guests: Windows 8.1 adaptions (bug #11899)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: after removing VirtualBox with
-          <emphasis>VirtualBox_Uninstall.tool</emphasis>, remove it from the
-          <emphasis>pkgutil --pkgs</emphasis> list as well</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.2.14 (2013-06-21)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: another TLB invalidation fix for non-present pages</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a performance regression (4.2.8 regression;
-          bug #11674)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed a crash on shutdown</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: prevent stuck keys under certain conditions on Windows
-          hosts (bugs #2613, #6171)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed a rare crash on the guest screen resize</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: allow to change VRDP parameters (including enabling/disabling the
-          server) if the VM is paused</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed passing through devices on Mac OS X host to a VM
-          with 2 or more virtual CPUs (bug #7462)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed hang during isochronous transfer with certain
-          devices (4.1 regression; Windows hosts only; bug #11839)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: properly handle orphaned URBs (bug #11207)</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: fixed function for returning the PCI interrupt routing table
-          (fixes NetWare 6.x guests)</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: don't use the <emphasis>ENTER</emphasis> / <emphasis>LEAVE</emphasis>
-          instructions in the BIOS as these don't work in the real mode as set up by
-          certain guests (e.g. Plan 9 and QNX 4)</para>
-      </listitem>
-
-      <listitem>
-        <para>DMI: allow to configure <emphasis>DmiChassisType</emphasis>
-          (bug #11832)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed lost writes if iSCSI is used with snapshots and
-          asynchronous I/O (bug #11479)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed accessing certain VHDX images created by
-          Windows 8 (bug #11502)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed hang when creating a snapshot using Parallels
-          disk images (bug #9617)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: seamless + 3D fixes (bug #11723)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: version 4.2.12 was not able to read saved states of older
-          versions under certain conditions (bug #11718)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/Properties: don't create a guest property for non-running
-          VMs if the property does not exist and is about to be removed
-          (bug #11765)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/Properties: don't forget to make new guest properties
-          persistent after the VM was terminated (bug #11719)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/Display: don't lose seamless regions during screen resize</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/OVF: don't crash during import if the client forgot to call
-          <emphasis>Appliance::interpret()</emphasis> (bug #10845)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/OVF: don't create invalid appliances by stripping the file
-          name if the VM name is very long (bug #11814)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/OVF: don't fail if the appliance contains multiple file references
-          (bug #10689)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/Metrics: fixed Solaris file descriptor leak</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: limit depth of snapshot tree to 250 levels, as more
-          will lead to decreased performance and may trigger crashes</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed setting the parent UUID on diff images using
-          <emphasis>sethdparentuuid</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: work around for not crashing as a result of
-          automatic NUMA balancing which was introduced in Linux 3.8
-          (bug #11610)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows installer: force the installation of the public certificate
-          in background (i.e. completely prevent user interaction) if the
-          <emphasis>--silent</emphasis> command line option is specified</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed problems with partial install in the
-          unattended case</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed display glitch with the Start button
-          in seamless mode for some themes</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: Seamless mode and auto-resize fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed trying to to retrieve new auto-logon
-          credentials if current ones were not processed yet</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions installer: added the <emphasis>/with_wddm</emphasis>
-          switch to select the experimental WDDM driver by default</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed setting own timed out and aborted texts in
-          information label of the lightdm greeter</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed compilation against Linux 3.2.0 Ubuntu
-          kernels (4.2.12 regression as a side effect of the Debian kernel
-          build fix; bug #11709)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 Additions: reduced the CPU load of VBoxClient in
-          drag and drop mode</para>
-      </listitem>
-
-      <listitem>
-        <para>OS/2 Additions: made the mouse wheel work (bug #6793)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: fixed problems copying and pasting between two
-           guests on an X11 host (bug #11792)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: fixed guest process timeout / kill handling</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.2.12 (2013-04-12)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed a Guru Meditation on putting Linux guest CPU online if
-          nested paging is disabled</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: invalidate TLB entries even for non-present pages</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: Multi-screen support: fixed a crash on visual-mode change</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: Multi-screen support: disabled guest-screens should now remain
-          disabled on visual-mode change</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: Multi-screen support: handle host/guest screen plugging/unplugging
-          in different visual-modes</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: Multi-screen support: seamless mode: fixed a bug when empty seamless
-          screens were represented by full screen windows</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: Multi-screen support: each machine window in multi-screen
-          configuration should have correct menu-bar now (Mac OS X hosts)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: Multi-screen support: machine window View menu should
-          have correct content in seamless / full screen mode now (Mac OS X hosts)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: VM manager: vertical scroll-bars should be now updated on
-          content/window resize</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: VM settings: fixed crash on machine state-change event</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: don't show warnings about enabled or disabled mouse integration
-          if the VM was restored from a saved state</para>
-      </listitem>
-
-      <listitem>
-        <para>Virtio-net: properly announce that the guest has to handle
-          partial TCP checksums (bug #9380)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: Fixed incorrect alignment of VDI images causing disk size
-          changes when using snapshots (bug #11597)</para>
-      </listitem>
-
-      <listitem>
-        <para>Audio: fixed broken ALSA & PulseAudio on some Linux hosts
-          due to invalid symbol resolution (bug #11615)</para>
-      </listitem>
-
-      <listitem>
-        <para>PS/2 keyboard: re-apply keyboard repeat delay and rate
-          after a VM was restored from a saved state (bug #10933)</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: updated DMI processor information table (type 4):
-          corrected L1 & L2 cache table handles</para>
-      </listitem>
-
-      <listitem>
-        <para>Timekeeping: fix several issues which can lead to incorrect
-          time, Solaris guests sporadically showed time going briefly back
-          to Jan 1 1970</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/Metrics: disk metrics are collected properly when software
-          RAID, symbolic links or rootfs are used on Linux hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: don't stay paused after a snapshot was created
-          and the VM was running before</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: introduced <emphasis>controlvm nicpromisc</emphasis>
-          (bug #11423)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: don't crash on <emphasis>controlvm
-            guestmemoryballoon</emphasis> of the VM isn't running (bug #11639)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxHeadless: don't filter guest property events as this would
-          affect all clients (bug #11644)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest control: prevent double CR in the output generated
-          by guest commands and do NLS conversion</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts / guests: fixed build errors on Linux 3.5 and newer
-          kernels if the <emphasis>CONFIG_UIDGID_STRICT_TYPE_CHECKS</emphasis>
-          config option is enabled (bug #11664)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: handle fall-back to VESA driver on RedHat-based
-          guests if vboxvideo cannot be loaded</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: RHEL/OEL/CentOS 6.4 compile fix (bug #11586)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: Debian Linux kernel 3.2.0-4 (3.2.39) compile
-          fix (bug #11634)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: added auto-logon support for Linux guests using
-          LightDM as the display manager</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: Support for multimonitor. Dynamic enable/disable
-          of secondary virtual monitors. Support for XPDM/WDDM based guests
-          (bug #6118)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 Additions: support X.Org Server 1.14 (bug #11609)</para>
-      </listitem>
-
-     </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 4.2.10 (2013-03-05)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>GUI: fixed keyboard with XQuartz X server (bug #10664)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/Display: fixed a crash with multi-monitors under certain
-          conditions (Mac OS X hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/Properties: fixed a crash under certain conditions, for
-          example after wakeup from host hibernate (bug #11444)</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: don't lose the internal network settings if they are not
-          currently active</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: another incompatibility fix for VHD differencing images with
-          Hyper-V (bug #5990)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: don't read beyond the end of the file specified
-          with <emphasis>export --eulafile (bug #11528)</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts / guests: Linux 3.9-rc0 compile fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed two warnings in the shared folders
-          guest kernel module (bug #11390)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: don't crash VBoxService if libdbus is
-          not available (bug #8638)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed upgrading MultiMedia Redirection (MMR) support</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.2.8 (2013-02-20)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed a guest crash with a huge amount of guest RAM on
-          VT-x hosts (bug #11306)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed a layout bug in the Mac OS X clone VM dialog
-          (bug #10982)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: not all the translation tags were taken into account
-          during the language switch (bug #11342)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: the <emphasis>take guest screenshot</emphasis> dialog sometimes
-          had no keyboard input available on Windows host</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/Machine: fix the generation of a spurious event for inaccessible
-          VMs which triggered an endless event generation loop in cooperation
-          with the GUI which became unresponsive (4.2.6 regression; bug
-          #11323)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/Display: fix for an access violation under certain
-          conditions in multi-monitor configurations (bug #10539)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main/Metrics: network metrics are now collected for
-          active (up) interfaces only, the state of an interface being evaluated
-          when the associated metric is enabled via <emphasis>setupMetrics</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: reduce the time for merging snapshots under
-          certain conditions</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed data corruption after resizing a VDI image under
-          certain circumstances (bug #11344)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed non working online merging of snapshots
-          (4.2.6 regression; bug #11359)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed crash when connecting to certain QNAP iSCSI
-          targets</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed incompatibility of VHD differencing images with
-          Hyper-V (bug #5990)</para>
-      </listitem>
-
-      <listitem>
-        <para>Bridged Networking: fixed TCP pseudo header checksum computation
-          for IPv6 (bug #9380)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fix Battlefield 1942 game crashes (bug #11369)</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: really sanitise the name of VM folders and settings
-          file, the code was disabled before (bug #10549)</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: allow to change VRDE settings for saved VMs</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: don't crash during <emphasis>screenshotpng</emphasis>
-          if there is no display (bug #11363)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: work around gcc bug 55940 which might lead to wrong
-          kernel module code if gcc 4.7 is used to compile the 32-bit Linux
-          host kernel (bug #11035)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed inconsistent lock state and deadlock warnings on module
-          load and VM startup when CONFIG_PROVE_LOCKING is enabled (bug #11318)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: made "]" key work again on Japanese keyboards</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: don't crash the kernel during dtrace if the VBox
-          kernel extensions are loaded (10.6 hosts only; bug #11273)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris / Mac OS X hosts: machine CPU load metrics now report 100%
-          when all cores are fully utilized (used to be a single core)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris 11 host installer: wait for any services left over from
-           a previous installation to be terminated to avoid confusing SMF.
-           </para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: don't block signals for processes executed
-          via guest control</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: fixed a small memory leak in VBoxService
-          (bug #10970)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed shared folder issue with
-          large reads/writes on 64 bit Windows guests (bug #11115)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: Linux 3.8 compile fixes (bug #11036)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 Additions: fixed blocked SIGALRM in 3D desktop sessions
-          (bug #10987)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 Additions: fixed an unresolved reference in vboxvideo_drv
-          for X.org 6.8 guests and before (e.g. RHEL4; 4.2.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 Additions: fixed screen automatic resizing for guests with
-          X.org 1.3 or older (4.2.0 regression)</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 4.2.6 (2012-12-19)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: don't inject stale VT-x events to prevent crashes after VM reset
-          (bug #11256)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: workaround for buggy BIOSes which enable <emphasis>MONITOR</emphasis>
-          only for certain CPUs (bug #9460)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed trimming of anti-aliased text in details-view element headers
-          (4.2.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed create-settings-file-alias functionality on Mac hosts
-          (4.2.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed take-guest-screenshot functionality on Windows hosts
-          (bug #11095)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: several minor fixes, including palette fixes (bug #11191)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed Windows 2012 OS type (bug #11206)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: allow to terminate the VM even if VBoxSVC crashed</para>
-      </listitem>
-
-      <listitem>
-        <para>API: fixed cancelling of snapshots, previously this could lead
-          to inconsistent VM configs (bug #6877)</para>
-      </listitem>
-
-      <listitem>
-        <para>API: fixed identifying disk images by UUID (bug #11209)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: several fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed occasional crash with external authentication
-         (bug #11156)</para>
-      </listitem>
-
-      <listitem>
-        <para>VGA: fix for double scan text modes</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed invalid pending request count at the time of service
-          of <emphasis>DEVICE POWER</emphasis> requests (Windows hosts only;
-          bugs #10021, #11056)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB keyboard: Korean keyboard workaround (bug #11150)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed hang with QCOW images and asynchronous I/O enabled</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed hang with newer VHD images (bug #11279)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: actually write the non-rotational flag to the VM
-          settings (4.2.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Virtio-net: fixed the problem with network statistics counters
-        in Session Information dialog (GUI)</para>
-      </listitem>
-
-      <listitem>
-        <para>Metrics: introduced <emphasis>network rate</emphasis> and
-          <emphasis>disk usage</emphasis> metrics</para>
-      </listitem>
-
-      <listitem>
-        <para>Metrics: fixed a crash under certain conditions on Solaris hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: fix for El Torito</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: if the host folder of a shared folder mapping does
-          not exist, keep it active but mark it as invalid to prevent
-          inconsistent saved states (bug #11147)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed converting disks from raw images</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: show snapshot description in the VM or snapshot
-          information</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: make implicit opening of media consistent in all
-          places dealing with media</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: the iSCSI initiator name was not stored in the settings
-          file when doing <emphasis>storageattach</emphasis> (bug #11212)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: <emphasis>metrics collect</emphasis> now properly handles
-          <computeroutput>'CPU/MHz'</computeroutput> and
-          <computeroutput>'Net/*/LinkSpeed'</computeroutput> metrics</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: changing the image UUID or parent UUID as part of
-          <emphasis>storageattach</emphasis> works now in all safe cases</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: introduced <emphasis>storageattach --medium additions</emphasis>
-          as a shortcut to mount the additions image (bug #11165)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed importing OVF files cerated by recent VMware
-          products (bug #10905)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts / Bridged Networking: fixed the problem with leaking
-          connections in conntrack (bug #11178)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: added support for ConsoleKit sessions in the
-          vminfo service of VBoxService</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: don't crash during remount under certain
-          conditions (bug #11291)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux/Solaris Additions: fixed guest memory metrics collection</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: added a dependency to ensure that the user directories
-          are reachable when starting VBox services</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows host installer: integrated user-contributed translations,
-          thanks to all contributors!</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed auto-logon installation for Windows 8</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: don't fail if the shared folders host service is not
-          available</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed Guest Additions startup on Windows 2000
-          guests (bug #11253)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: auto-resize fixes for Windows 8 guests</para>
-      </listitem>
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 4.2.4 (2012-10-26)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>GUI: fixed validation warning on global settings / proxy page
-          (4.2.2 regression; bug #11089)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed crash with multiple guest screens on certain
-          conditions (Mac OS X hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxBalloonCtrl: fixed command line argument handling of
-         ballooning module</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed occasional crash during a video playback in the
-          guest (bug #11082)</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: fixed broken DMI information (4.2 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: workaround for booting from Windows 2000 floppy disks</para>
-      </listitem>
-
-      <listitem>
-        <para>EFI: fixed video mode selection loss on VM reboot (bug #10983)</para>
-      </listitem>
-
-      <listitem>
-        <para>Parallel: fixed parallel port printing failure/ paper queue empty
-          error (Windows hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed crash on alias-less DNS responses when host-resolver is used</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed hang under rare circumstances</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.2.2 (2012-10-18)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: adapted to changes in Mac OS X 10.8.2 (bug #10965)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: restored VM item tool-tip functionality (4.2 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added group item tool-tip functionality</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed handling of the .ova/.ovf file name association
-          (4.2 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: it was not possible to change any setting before the
-          first VM was created (bug #10928)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: disable grouping action if all the selected items are
-          full children list of the same group already</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added menu for runtime drag and drop option change</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: cleanup shared-clipboard menu on visual-mode change</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: make sure VM receives keyboard focus on entering full screen mode
-          on Win host (bug #11051)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: disable proxy authentication for security reasons</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: <emphasis>DrawIndexedPrimitiveUP</emphasis> implementation
-          fixes for the Windows WDDM video driver (bug #10929) </para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed a release assertion in the AHCI emulation when requests
-          where cancelled with asynchronous I/O disabled</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed a hang during VM reset under certain circumstances
-           (bug #10898)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed a crash under rare circumstances (Windows hosts only;
-          bug #10128)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: automatically use the host resolver if the host name server is
-          set to some unusual loopback value (bug #10864)</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: fixed a VirtualBox crash during intensive network transfers
-           (4.2 regression; bugs #10936, #10969, #10980)</para>
-      </listitem>
-
-      <listitem>
-        <para>ICH9: fixed PCI bridge initialization</para>
-      </listitem>
-
-      <listitem>
-        <para>USB mouse: ensure that the last mouse event doesn't get lost if no URBs
-          are available</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: certain legacy guests (e.g. Windows 95) didn't find the boot
-          device after a warm reboot</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: don't trash the palette in text modes when setting the border
-          color</para>
-      </listitem>
-
-      <listitem>
-        <para>EFI: fixed OS X guest autoboot (4.2 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed output of <emphasis>showvminfo --machinereadable</emphasis>
-          (bug #10973)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed parsing of <emphasis>storageattach --discard</emphasis>
-          (bug #11023)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed wrong output of the HPET setting in <emphasis>showvminfo</emphasis>
-          (bug #11065)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed closing the guest session after executing a
-          guest process via guest control</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxShell: adaptions to interface name changes</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions device: fixed a Guest Additions hang when a
-         machine was reset after a crash</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts / guests: Linux 3.7-rc1 fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: support X.Org Server 1.13</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed a hang when the X server was restarted with
-           old guest kernels</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed a VBoxService crash during CPU hot remove
-           (bug #10964)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed automatic screen resize
-          issue for NT4 guests</para>
-      </listitem>
-
-      <listitem>
-        <para>OS/2 Additions: fixed shutdown hang</para>
-      </listitem>
-
-      <listitem>
-        <para>OS/2 Additions: fixed mouse driver panic</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed autostart service going into maintenance mode after
-          all VMs started</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed linking the host driver with the dtrace module</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-
-    <title>Version 4.2.0 (2012-09-13)</title>
-
-    <para>This is a major update. The following major new features
-      were added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Improved Windows 8 support, in particular many 3D-related fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: VM groups (bug #288)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: expert mode for wizards</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: allow to alter some settings during runtime</para>
-      </listitem>
-
-      <listitem>
-        <para>Support for up to 36 network cards, in combination with an
-          ICH9 chipset configuration (bug #8805)</para>
-      </listitem>
-
-      <listitem>
-        <para>Resource control: added support for limiting network IO
-          bandwidth; see <xref linkend="network_bandwidth_limit" /> (bug #3653)</para>
-      </listitem>
-
-      <listitem>
-        <para>Added possibility to start VMs during system boot on Linux,
-          OS X and Solaris; see <xref linkend="autostart" /> (bug #950)</para>
-      </listitem>
-
-      <listitem>
-        <para>Added experimental support for drag and drop from the host to
-          Linux guests. Support for more guests and for guest-to-host is
-          planned. (bug #81)</para>
-      </listitem>
-
-      <listitem>
-        <para>Added support for parallel port passthrough on Windows hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>Enhanced API for controlling the guest; please see the SDK reference and API
-          documentation for more information</para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>In addition, the following items were fixed and/or added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Mac OS X hosts: sign application and installer to avoid warnings
-        on Mountain Lion</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a potential host crash triggered by shutting down a VM
-          when another VM was running (only affected 32-bit hosts and 64-bit OS X hosts,
-          4.1 regression; bug #9897)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a potential host crash under a high guest memory pressure
-          (seen with Windows 8 guests)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: improved VM context switch performance for Intel CPUs using
-          nested paging</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: added support for <emphasis>FlushByASID</emphasis> features of
-          AMD CPUs (Bulldozer and newer)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed unreal mode handling on older CPUs with VT-x
-          (gPXE, Solaris 7/8/9; bug #9941)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed MP tables fixes for I/O APIC interrupt routing relevant
-          for ancient SMP guests (e.g. old OS/2 releases)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: support recent VIA CPUs (bug #10005)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed handling of task gates if VT-x/AMD-V is disabled</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: page fusion fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: network operations manager</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: allow taking screenshots of the current VM window content (bug #5561)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: allow automatically sorting of the VM list</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: allow starting of headless VMs from the GUI</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: allow reset, shutdown and poweroff from the Manager window</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: allow to globally limit the maximum screen resolution for
-          guests</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: show the full medium part on hovering the list of recently
-          used ISO images</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: do not create additional folders when a new machine has a
-           separator character in its name (bug #6541)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: don't crash on terminate if the settings dialog is still open
-          (bug #9973)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: consider scaled DPI values when display fonts on Windows hosts
-          (bug #9864)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: if a bridged network interface cannot be found, don't
-          refuse to start the VM but allow the user to change the setting
-          immediately</para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: fixed a crash when restoring an old
-          snapshot when powering off a VM (bugs #9364, #9604, #10491)</para>
-      </listitem>
-
-      <listitem>
-        <para>Clipboard: disable the clipboard by default for new VMs
-          (see <xref linkend="security_clipboard" />). It can be enabled at
-            any time using the VM menu</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: sanitise the name of VM folders and settings file (bug #10549)</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: allow to store the iSCSI initiator secret encrypted</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: improvements for the built-in TFTP server (bugs #7385, #10286)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed memory leak when disabling the NAT engine (bug #10801)</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: 802.1q VLAN support (bug #10429)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: implemented burning of audio CDs in passthrough mode</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed audio CD passthrough for certain media players</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: implemented support for discarding unused image blocks
-          through TRIM for SATA and IDE and UNMAP for SCSI when using VDI images</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: added support for QED images</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: added support for QCOW (full support for v1 and readonly
-          support for v2 images)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: added readonly support for VHDX images</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: don't crash if a USB device is plugged or unplugged when
-          saving or loading the VM state (SMP guests only)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris additions: added support for X.org Server 1.11 and 1.12</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris additions: switched to using an in-kernel mouse driver</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: no need to recreate host-only adapters after a
-          VirtualBox update</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: updated toolchain; make the source code compatible
-          to VC 2010 and enable some security-related compiler options</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed memory leak in VBoxTray (bug #10808)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.1.18 (2012-06-06)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed <emphasis>VERR_REM_VIRTUAL_CPU_ERROR</emphasis>
-          under rare conditions after the guest has been reset (bug #5164
-        and others)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed host freezes with 64-bit guests on 32-bit Linux
-          hosts (bug #10528)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: added a workaround for rdesktop clients not properly
-          updating the screen size when minimized</para>
-      </listitem>
-
-      <listitem>
-        <para>AHCI: fixed a rare bug which can cause a guest memory corruption
-          after the guest storage controller has been reset</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: another attempt to fix crashes under rare conditions
-          (Windows hosts only; bug #10513)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: addressed issues running Leopard / Snow Leopard
-          (bug #10631)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts / Bridged Networking: fixed the problem with device driver
-          unloading on kernels 3.2.18 and newer due to an invalid reference counter
-          (bug #10624)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts / guests: Linux 3.5-rc1 fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: the guest content was sometimes not properly
-          updated (bug #9887)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: installer fix for X.org Server 1.11 and 1.12</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.1.16 (2012-05-22)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed a Guru Meditation <emphasis>VERR_ACCESS_DENIED</emphasis>
-          with certain guests (bugs #7589, #8247)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a Guru Meditation <emphasis>VERR_PAGE_TABLE_NOT_PRESENT</emphasis>
-          with Ubuntu 32-bit guests with nested paging enabled on AMD CPUs (bug #10183)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: preserve segment limits and attributes when switching to unreal mode
-          required for some legacy guests to work properly (VT-x without unrestricted guest
-          execution only; bug #9941)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a VM hang after a resume from pause / savestate with SMP
-          guests in rare cases</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: several fixes for the Windows WDDM video driver crash</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed a crash on attempt to process ICMP datagram under some
-          circumstances (bug #10527)</para>
-      </listitem>
-
-      <listitem>
-        <para>Host-only Networking: lifted the maximal number of interfaces to
-          128 on Linux and Mac OS X hosts (there is no such limitation for
-          Solaris and Windows hosts)</para>
-      </listitem>
-
-      <listitem>
-        <para>EFI: fixed wrong SEC/PEI Core entry point calculation (bug #10531)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed a display update problem (bug #10503)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: set the proper VM state if savestate failed for some
-          reason (bug #6189)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: more useful error message if a medium is inaccessible</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed <emphasis>controlvm savestate</emphasis> if the VM is already
-          paused</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: addressed issues running on Mountain Lion Preview 3
-          (bug #10267)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: Linux 3.4 compile fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed wrong help path in some rpm-based packages
-          (bug #10418)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: fixed handling of custom environment variables
-          during <computeroutput>VBoxManage guestcontrol execute</computeroutput>
-          (bug #10581)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed guest driver crash of VBoxSF in certain
-          cases (4.1.10 regression; bug #10408)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: don't load the WDDM driver if 3D support is not available
-          for Windows 8 guests to keep the guest maintainable in that case (still better
-          to miss some features than providing a blank screen)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: added support for X.org Server 1.11 and 1.12</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 4.1.14 (2012-04-13)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Network: fixed the problem with packets larger than MTU-4 when
-          PCnet or PRO/1000 was bridged to certain types of adapters on OS X hosts
-          (bug #3783)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed a segfault under rare circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed Windows WDDM video driver crash for SMP guests
-          (bugs #10200, #10331)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions, VRDP: fixed occasional corruption of vertical text</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 4.1.12 (2012-04-03)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed <emphasis>VERR_NOT_SUPPORTED</emphasis> and
-          <emphasis>VERR_RAW_MODE_INVALID_SMP</emphasis> guru meditation
-          due to an invalid reschedule to raw mode (bug #10370)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed <emphasis>PDMCritSectLeave</emphasis> guru meditation
-          under rare circumstances with SMP guests</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: proper <emphasis>Math Fault</emphasis> handling with certain
-          legacy guests (bug #9042)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed a socket leak under certain conditions</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: better sanity check against reading beyond end-of-file</para>
-      </listitem>
-
-      <listitem>
-        <para>Audio: fixed a crash in the NUL audio backend (bug #10374;
-          4.1.10 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>HGCM: fixed a crash during savestate under rare circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>Metrics: fixed an occasional crash during VM shutdown if host
-          RAM/VMM metrics are enabled</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxSVC: several locking fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: return the correct error code if
-          <emphasis>controlvm savestate</emphasis> failed (bug #10134)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: VBoxService should not crash on exit (bug #10326;
-          4.1.10 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: set the correct time stamp when a file is
-          closed (bug #6473)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: better help if the DirectX backups are not
-          properly installed</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: Linux 3.4-rc1 compile fixes</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.1.10 (2012-03-13)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>GUI: if 3D support on the host is not available for some reason,
-          do not only disable this VM setting but also uncheck the checkbox</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a potential problem causing to schedule interrupts during
-          <emphasis>SYSEXIT</emphasis> right after <emphasis>STI</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a potential guest memory corruption issue with page
-          fusion</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: adjusted the module matching algorithm for page fusion a
-           little, generally resulting in slightly more shared pages</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: host interfaces no longer have "defaults" for IP address
-          and network mask attributes</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: don't depend on a password for certain guest control operations
-          (bug #10030)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed Windows XP hosts support (4.1.8 regression;
-          bugs #10071 and #10088</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: rendering fixes for Linux hosts with NVIDIA graphics</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed saved state issues (4.1.8 regression; bug #10126)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: WDDM driver: fixed powershell_ise crashes (bug #10167),
-          make WPF-based apps work with Aero enabled, fixed additional possible WinSAT crashes</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed remote clipboard compatibility issues with some clients</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed a possible data corruption when compacting VDI or VHD
-          images with snapshots (32-bit hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: fixed crash when using incorrect credentials
-          when authenticating with a LIO target (bug #10173)</para>
-      </listitem>
-
-      <listitem>
-        <para>Serial: don't abort in host mode under rare error conditions
-          (non-Windows hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>SDK: actually ship current C bindings</para>
-      </listitem>
-
-      <listitem>
-        <para>SDK: fixed the Java glue code for JDK 1.7.0 (bug #9848)</para>
-      </listitem>
-
-      <listitem>
-        <para>SDK: added Python example</para>
-      </listitem>
-
-      <listitem>
-        <para>Metrics: make metrics collection more robust regarding blocked VMs</para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: added SSL/TLS support</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxShell: fixed Guest Additions information lookup</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris installer: fixed dependency checking while installing VirtualBox
-          in a zone</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts/guests: Linux 3.3-rc1 compile fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed debug kernel panics while opening module CTF data
-          (bug #9651)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed Python support on Lion</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: make 3D passthrough work on OL/RHEL 6.2 (bug
-           #10010)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed missing implementation when copying shared
-           folder data through kernel high memory (bug #9878)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: make sure all data is written when closing a
-          memory mapped file on a shared folder</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: added support for X.Org Server 1.12</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed guest kernel driver to load properly
-          on guest reboot (4.1.8 regression; bug #10113)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed missing 64-bit OpenGL library VBoxOGL.so
-          (bug #10151)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed VBoxService import and start for Solaris 11
-          guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: some Windows 8 adaptions</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: several fixes for shared folders (bug #9753)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest control: miscellaneous bugfixes</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.1.8 (2011-12-19)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed <emphasis>VERR_MAP_FAILED</emphasis> during savestate
-          under certain circumstances (bug #7929)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: stop updating the VM status icons when the VM is paused (bug #8368)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed wrong return code after <emphasis>startvm</emphasis>
-          (bug #9642)</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: fixed hang at launch of DOS applications generated by
-          Clipper 5.3 (note that hardware virtualization may be required)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed OS/2 boot hang when using recent USB drivers</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: increase maximum number of parallel connections making
-          connections with port forwarding more robust (bug #8471)</para>
-      </listitem>
-
-      <listitem>
-        <para>Metrics: fixed potential problem with invalid access in guest
-          metrics collection upon VM destruction</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: don't crash if a medium is ejected twice (bug #9922)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxSVC: fixed crash under rare circumstances (e.g. client crash)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed screen freeze (bug #9620)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF/OVA: fixed broken disk images on import under rare
-          circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF/OVA: better error message when importing corrupted appliances</para>
-      </listitem>
-
-      <listitem>
-        <para>VMDK/VHD: fixed a possible corruption with host cache disabled
-          when using snapshots under rare circumstances (bug #9749)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed full screen mode issues for ATI graphics (bug #9775),
-          Windows Media Player rendering for XPDM-based Direct3D support (bug #8341).
-          Multiple fixes to XPDM and WDDM - based 3D support for Windows Guests
-          and for 3D support in general</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixes for Fedoras Linux 2.6.41 (bug #9948)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts/guests: fixes for Linux 3.2 (bug #9743)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: various shared folder fixes (bugs #9856, #9862, #9917)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: various fixes for Direct3D support (un)installation, added
-          detection of missing or wrong Direct3D system files</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.1.6 (2011-11-04)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VRDP: fixed screen corruption</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: the interface stopped working after a lot of failed
-          ICMP requests (bug #9371)</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: fixed rare Windows 7 guest hangs, either at boot time
-          or when reconfiguring the network card in unusual setups (bug #6223)</para>
-      </listitem>
-
-      <listitem>
-        <para>ATA: fixed a possible crash during ATAPI passthrough with
-          certain guests</para>
-      </listitem>
-
-      <listitem>
-        <para>ATA: improved compatibility with ancient Linux kernels</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed incorrect framebuffer information after leaving
-          the full screen mode with X11 guests, this lead to a scrambled
-          preview window in the GUI for example</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed the problem with duplicate packets when
-          bridged to a wireless interface (bug #9648)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fix for 3D support on Fedora 15 (bug #9799)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: don't call <emphasis>del_timer_sync</emphasis>
-          from an interrupt context (Fedora bug report 746331)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Vista and 7 guests: more WDDM fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed kernel module compilation failure on Redhat
-           Enterprise Linux 4 (bug #9709)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: install the DRI driver correctly on Ubuntu 11.10
-          guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: added read-only mmap support for shared
-           folders</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: added directory, file mode and mask options for
-          shared folders</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: implemented faster detection of logged-in guest
-          users and stale sessions</para>
-      </listitem>
-
-      <listitem>
-        <para>X.Org Additions: fixed graphical corruption when switching to a
-           virtual terminal (bug #9490)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.1.4 (2011-10-03)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed PAE guests running on 32-bit hosts (4.0 regression;
-          bug #9458)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed <emphasis>INVALID_PARAMETER</emphasis> guru meditation
-          caused by insufficient memory conditions (4.1.0 regression; bug #9240)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed clobbered CPU registers during <emphasis>stos/lods/ins/outs</emphasis>
-          emulation under rare circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: another fix for 64-bit guests on recent AMD CPUs</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: warn the user if he uses an outdated extension pack and allow
-          to download and upgrade in that case (bug #8025)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed spurious LCtrl key events on some Windows hosts
-          (4.0.6 regression; bug #373)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: another fix for <emphasis>extpack install --replace</emphasis>
-          (bug #9308)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: allow to specify the UUID of the target image in
-          <emphasis>convertfromraw</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed a rare crash when two or more clients connect to the server
-          (bug #9503)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed a case when a client was not resized correctly
-          (bug #9242)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: make device capturing work on Windows hosts with
-          usbhub class filter drivers installed (bug #9298);
-          bugfixes for Windows host USB support</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: fixed reads crossing block boundaries (bug #8532)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMDK: fixed progress indicator when creating split VMDK
-          images</para>
-      </listitem>
-
-      <listitem>
-        <para>Floppy: fixed medium size detection for physical mediums
-          (Windows hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed VM initialization if a shared folder does
-          not exist (bug #7941)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed possible deadlock between hard disk enumeration and
-          resetting of immutable disks (bug #9549)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed not detaching of virtual storage after a snapshot
-          restore operation (bug #8296)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: always reset modified state after restoring a snapshot (bug
-          #9387)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed writing of changed VM settings to disk when using
-          snapshots (bug #8932)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed taking screen shots (e.g. the preview window) for
-          headless VMs if the Guest Additions are active</para>
-      </listitem>
-
-      <listitem>
-        <para>Virtio-net: fixed the problem with UDP packets exceeding
-          MTU (bug #9370)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed incorrect rendering and possible crashes when switching
-          to/from full screen with enabled 2D acceleration</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed compiz under ubuntu 9.10</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest control: miscellaneous small bugfixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux / Solaris hosts: don't use hard links in packages
-          (4.1.2 regression; bug #9441)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fix installation issues when installed as root
-          (bug #1578)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed packet capture issues with vboxnetX host-only
-          interfaces (bug #8076)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed incoming multicast packets for Crossbow based
-          bridged networking (bug #9532)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed starting EFI guests due to missing EFI ROM files
-          (bug #9535)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts installer: fixed <emphasis>ADDLOCAL</emphasis> usage
-          on command line (4.1.0 regression; bug #9488)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts installer: fixed dangling shortcut to the .chm
-          help file (bug #9646)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts installer: try to fix installation error 2869 which
-          appeared under certain circumstances (bug #9664)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: VBoxHeadless should never open a separate
-          console window (bug #3549)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: fixed hang while waiting for guest execution
-          output (4.1.2 regression; bug #9446)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: add support for X.Org Server 1.11 (bug #9519)
-          </para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: suppress an incorrect error message and allow
-           a shared folder to be mounted in multiple places (bug #9627)
-          </para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: start VBoxService correctly on openSUSE 12.1
-           (bug #6229)
-          </para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: properly finish the installation even if the
-          compilation of the DRM module fails (which is not fatal)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed memory leaks and panics while mounting
-          (from console) and unmounting shared folders</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed swapped mouse cursor hotspot coordinates
-          (4.1.0 regression; bug #9447)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed <emphasis>PAGE_FAULT_IN_NONPAGED_AREA</emphasis>
-          BSOD in VBoxDisp.dll when running SnippingTool (bug #9508)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: make image viewer work correctly
-          with Aero enabled (Vista and Windows 7)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed incorrect window border blurs under Aero
-          with ATI cards (Vista and Windows 7)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed incorrect rendering when moving 3D applications
-          outside guest desktop and back under Aero (Vista and Windows 7)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed guest hangs when switching back from full screen
-          text mode applications (bug #9636)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.1.2 (2011-08-15)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed 64-bit guests on AMD Fusion CPUs (bug #8824)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed handling of the <emphasis>sysenter/sysexit</emphasis>
-          machine instructions in 64-bit guests on Intel hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added linked clone support</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed error check when changing the VM controller settings
-          (4.1.0 regression; bug #9246)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed the inclusion of additional information (license,
-          vendor, ...) on OVF export</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: when taking a snapshot from the VM selector, don't do
-          a live snapshot</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed immediate crash during start on certain environments
-          due to a library version conflict</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest control execution: implemented copying single files from
-          guest to the host (directories and filters not supported yet)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest control execution: limited to serve up to 5 guest processes
-          at a time by default</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: return the correct RDP default port fixing settings
-          warnings in the GUI if the remote display was enabled at runtime (bug
-          #9368)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxSVC: made the path comparison OS independent when images are
-          registered (bug #9303)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxSVC: several fixes/performance improvements for cloning of
-          VMs</para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: fixed "Solid-State drive" flag survival on snapshot
-          creation (bug #9379)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: implemented <emphasis>copyfrom</emphasis> and
-          <emphasis>stat</emphasis> guest control tools to copy files from guest
-          to host and to check for existence of files on the guest</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed <emphasis>extpack install --replace</emphasis>
-          (bug #9308)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: allow to start multiple VMs with
-          <emphasis>startvm</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: experimental support for SATA CD/DVD hotplugging</para>
-      </listitem>
-
-      <listitem>
-        <para>Mouse support: fixed an off-by-one pointer position error
-           affecting Windows guests (bugs #7566, #9321)</para>
-       </listitem>
-
-      <listitem>
-        <para>VRDP: fixed a case when the screen was not redrawn correctly
-          (bug #9242)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: changed TCP connection establishment according to Winsock API
-          requirements (Windows hosts only; bug #8919)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed device recognition issues (bugs #9299) and
-          fixed several device capturing issues (Windows hosts; bug #9299)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed issues with remote filters being applied to local
-          USB devices</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: keep logged in user count in out-of-memory situations
-          and warn about it</para>
-      </listitem>
-
-      <listitem>
-          <para>OVA: fixed import of renamed OVA files (bug #9033)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows host: fixed icon for .VDI files (bug #9393)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed a bug preventing parallel usage of multiple host NICs
-          with Crossbow based bridged networking</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed random kernel panics on host suspend / shutdown
-          (4.1.0 regression; bug #9305)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed shared folders due to missing symbols in the vboxfs
-          module (4.0.12 / 4.1.0 regression; bug #9264)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed file truncation on a shared folder with
-          some applications (bugs #9276, #9315)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed shared folder issues with antivirus software
-          and 64 bit Windows guests (bug #9318)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Vista and 7 guests: WDDM driver fixes and performance enhancements,
-          fixed WinSAT crashes (bug #9267)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed <emphasis>llseek</emphasis> for Linux kernels
-          2.6.37 and above</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.1.0 (2011-07-19)</title>
-
-    <para>This version is a major update. The following major new features
-      were added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Support for cloning of VMs (bug #5853, see
-          <xref linkend="clone"/>): full clones can be created through the GUI
-          and VBoxManage, linked clones only through VBoxManage</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: enhanced wizard for creating new virtual disks</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: new wizard for copying virtual disks</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: keep the aspect ratio in scale mode (Windows and Mac OS X hosts
-          only; bug #7822)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: raised the memory limit for 64-bit hosts to 1TB</para>
-      </listitem>
-
-      <listitem>
-        <para>Experimental support for PCI passthrough for Linux hosts, see
-          <xref linkend="pcipassthrough"/></para>
-      </listitem>
-
-      <listitem>
-        <para>Windows guests: Experimental WDDM graphics driver, supporting
-          Windows Aero (bug #4607) and providing Direct3D support using a
-          cleaner approach (no need to install the guest drivers in Safe Mode
-          anymore)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: status of modules and features can now be
-          queried separately by the frontends</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: new network attachment mode "Generic Driver", which
-          offers an open plugin architecture for arbitrary and separately
-          distributable virtual network implementations</para>
-      </listitem>
-
-      <listitem>
-        <para>Host-only Networking: fixed host crash in kernels prior to 2.6.29
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>New Networking Mode <emphasis>UDP Tunnel</emphasis>: allows to
-        interconnect VMs running on different hosts easily and transparently,
-        see <xref linkend="networkingmodes" /></para>
-      </listitem>
-
-      <listitem>
-        <para>Experimental support for SATA hard disk hotplugging available
-          with VBoxManage</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: New Crossbow based bridged networking driver for
-          Solaris 11 build 159 and above</para>
-      </listitem>
-
-
-    </itemizedlist>
-
-    <para>In addition, the following items were fixed and/or added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: more SMP timer fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed sporadic recompiler crashes with SMP guests</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: many small fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: when restoring a snapshot, ask for taking a snapshot
-          of the current state</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added a <emphasis>View</emphasis> menu</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added a setting for the promiscuous mode policy for
-          internal networks, bridged networks and host-only networks</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added slider for setting the CPU execution cap allowing to
-          limit the amount of CPU time spent for the execution of the guest,
-          see <xref linkend="settings-processor"/></para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: the VM description is editable during the runtime of
-          a VM (bug #1551)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added proxy settings (bug #2870)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: made the number of SATA ports configurable</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: decrease time before showing the VM configuration
-          dialog</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: more convenient configuration of storage controller
-          attachments by automatically determining the port or device parameter
-          when a storage controller has only one port or device per port</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: changed syntax of the <emphasis>guestcontrol</emphasis>
-          command group, fixed various bugs, removed obsolete options</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxBalloonCtrl: new service for automatic dynamic adjustment
-          of the balloon size for running VMs</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: machine names and snapshot names are not allowed to
-          be a valid UUID</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: provide better diagnostics if a single medium is used
-          twice in a VM configuration</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: provide better diagnostics for errors in medium
-          create/merge/clone operations, and fix memory leaks in error
-          cases</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: ATA/SATA drives can be marked as non-rotational, i.e.
-          the guest OS will detect them as a SSD if supported, which can
-          improve performance</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: virtual CD/DVD images will be detached if the guest
-          ejects the medium, unless the drive is marked to handle ejects only
-          on a temporary basis</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: the medium UUID can be changed again when attaching
-          a medium for the first time, which allows using images which are
-          exact duplicates including the UUID</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed possible data corruption under certain circumstances
-          with VHD and Parallels images (bug #9150)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed unnecessary expansion when cloning differential
-          images in VDI format</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed detection code to handle empty files for VDI and
-          VMDK format</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed access to CD/DVD images beyond 4GB when using the SATA
-          controller (bug #8592)</para>
-      </listitem>
-
-      <listitem>
-        <para>Floppy: several bugs have been fixed</para>
-      </listitem>
-
-      <listitem>
-        <para>Floppy: make it possible to unmount a host floppy disk (bug #6651)</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: disk-related structures are now checksummed correctly (bug #8739)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: many fixes for the Windows USB host driver</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: reduced memory footprint</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed the problem with segmentation offloading
-          when several VMs are transmitting in parallel</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: workaround for a bug in wireshark when operating
-          directly on a capture file created by VirtualBox</para>
-      </listitem>
-
-      <listitem>
-        <para>Serial: announce the serial devices in the ACPI tables to make
-          Windows guests find the virtual hardware (bug #7411)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: support for TLS connections (see
-          <xref linkend="vrde-crypt"/>)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: support for multimonitor client configurations with MS
-          RDP clients</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed a rare screen corruption</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed <emphasis>GL_VERSION</emphasis> string for
-          different locales (bug #8916)</para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: fixed timeout handling with HTTP 1.1 keepalive, and
-          be more robust when connections fail</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxSVC: fixed regression when several clients trigger autostart
-          simultaneously</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed incorrect handling of the medium location for media
-          which are not file based (e.g. iSCSI), which resulted in confusing
-          location values in many places</para>
-      </listitem>
-
-      <listitem>
-        <para>JAX-WS client bindings: fixed resource leak</para>
-      </listitem>
-
-      <listitem>
-        <para>Sources: fixed USB 2.0 support using extension packs for non-official
-          builds</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed non-VT-x mode on Lion hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: fixed copy'n'paste in the GUI and for the VM
-          window (bug #4491)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts (64-bit only): enabled removing of all mediums when
-          removing a VM</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts (64-bit only): enabled live snapshot deletion</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: use native controls in the installer (bug #5520)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed preemption issue with Solaris 11 hosts (builds
-          166 and above)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: better control of USB device access on Solaris 11
-          hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: improved driver installation on Windows guests</para>
-      </listitem>
-
-       <listitem>
-        <para>Guest Additions: fixed high CPU usage while executing guest programs
-          from the host</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed automounting of shared folders (bug #8014)</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 4.0.14 (2011-10-13)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed 64bit guests on AMD Fusion CPUs (bug #8824)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed handling of the <emphasis>sysenter/sysexit</emphasis>
-          machine instructions in 64-bit guests on Intel hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed the inclusion of additional information (license,
-          vendor, ...) on OVF export</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: when taking a snapshot from the VM selector, don't do
-          a live snapshot</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed spurious LCtrl key events on some Windows hosts
-          (4.0.6 regression; bug #5908)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed <emphasis>extpack install --replace</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed a rare screen corruption</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: fixed rare Windows 7 guest hangs, either at boot time
-          or when reconfiguring the network card in unusual setups (bug #6223)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mouse support: fixed an off-by-one pointer position error
-           affecting Windows guests (bugs #7566, #9321)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: changed TCP connection establishment according to Winsock API
-          requirements (Windows hosts only; bug #8919)</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: fixed reads crossing block boundaries (bug #8532)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMDK: fixed progress indicator when creating split VMDK
-          images</para>
-      </listitem>
-
-      <listitem>
-        <para>Floppy: fixed medium size detection for physical mediums
-          (Windows hosts only)</para>
-      </listitem>
-      <listitem>
-        <para>VBoxSVC: made the path comparison OS independent when images are
-          registered (bug #9303)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: return the correct RDP default port fixing settings
-          warnings in the GUI if the remote display was enabled at runtime (bug #9368)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fix VM initialization if a shared folder does not exist (bug #7941)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed taking screen shots (e.g. the preview window) for
-          headless VMs if the Guest Additions are active</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed possible deadlock between hard disk enumeration and
-          the resetting of immutable disks (bug #9549)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVA: fixed import of renamed OVA files (bug #9033)</para>
-      </listitem>
-
-      <listitem>
-        <para>Virtio-net: fixed the problem with UDP packets exceeding MTU
-          (bug #9370)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed starting EFI guests due to missing EFI ROM files
-          (bug #9535)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fix installation issues when installed as root
-          (bug #1578)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed file truncation on a shared folder with
-          some applications (bugs #9276, #9315)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: suppress an incorrect error message and allow
-           a shared folder to be mounted in multiple places (bug #9627)
-          </para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: add support for X.Org Server 1.11 (bug #9519)
-          </para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed <emphasis>llseek</emphasis> for Linux kernels
-          2.6.37 and above</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: start VBoxService correctly on openSUSE 12.1
-           (bug #6229)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: properly finish the installation even if the
-          compilation of the DRM module fails (which is not fatal)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.0.12 (2011-07-15)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Mac OS X hosts: Lion fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed preemption issue with Solaris 11 hosts (builds
-          166 and above)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: more convenient configuration of storage controller
-          attachments by automatically determining the port or device parameter
-          when a storage controller has only one port or device per port (bug #9188)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed possible data corruption under certain circumstances
-          with VHD and Parallels images (bug #9150)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed access to CD/DVD images beyond 4GB when using the SATA
-          controller (bug #8592)</para>
-      </listitem>
-
-      <listitem>
-        <para>Floppy: make it possible to unmount a host floppy disk (bug #6651)</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed the problem with segmentation offloading
-          when several VMs were transmitting at once</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed <emphasis>GL_VERSION</emphasis> string for
-          different locales (bug #8916)</para>
-      </listitem>
-
-      <listitem>
-        <para>Sources: fixed USB 2.0 support using extension packs for non-official
-          builds</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed automounting of shared folders (bug #8014)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-  <sect1>
-    <title>Version 4.0.10 (2011-06-22)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>GUI: fixed disappearing settings widgets on KDE hosts (bug #6809)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed hang under rare circumstances with flat VMDK images</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: a saved VM could not be restored under certain circumstances
-          after the host kernel was updated (bug #8983)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: refuse to create a medium with an invalid variant
-          (for example Split2G with VDI; bug #7227)</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: pause the VM if a request times out</para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: none of the hard disk attachments must be attached to
-          another VM in normal mode when creating a snapshot</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed occasional VM hangs with SMP guests (bug #4580)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: proper device detection on RHEL/OEL/CentOS 5 guests
-          (partial fix for bug #8978)</para>
-      </listitem>
-
-      <listitem>
-        <para>ACPI: force the ACPI timer to return monotonic values for improve behavior
-          with SMP Linux guests (bug #8511 and others)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed screen corruption under rare circumstances (bug #8977)</para>
-      </listitem>
-
-      <listitem>
-        <para>rdesktop-vrdp: updated to version 1.7.0</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: under rare circumstances some data at the end of a VMDK
-          file was not written during export</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: Lion fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: GNOME 3 fix</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed VT-x detection on Linux 3.0 hosts (bug #9071)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed Python 2.7 bindings in the universal Linux
-          binaries</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: fixed leak of thread and process handles</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed bug when determining the extended version
-          of the Guest Additions (4.0.8 regression; bug #8948)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed installation to 64-bit Solaris 10u9 guests
-          (4.0.8 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: RHEL6.1/OL6.1 compile fix</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed a memory leak during <computeroutput>VBoxManage
-            guestcontrol execute</computeroutput> (bug #9068)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.0.8 (2011-05-16)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed incompatibility with recent Mac OS X
-          versions in 64-bit mode (bug #8474)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed incompatibility with hosts with more
-          than 16 cores (bug #8389)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed painting corruptions on a second monitor in
-          64-bit mode (bug #7606)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: restored functionality to set an empty host key to disallow any
-          host key combination (4.0.6 regression; bug #8793)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: more expressive error messages for USB proxy permission
-          problems (mainly Linux hosts; bug #8823)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: added <computeroutput>controlvm screenshotpng</computeroutput>
-          subcommand for saving the screenshot of a running VM in PNG format</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxHeadless: fixed potential crash during shutdown
-          (Windows hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: built-in services use the correct Ethernet addresses in
-          Ethernet header and in ARP requests</para>
-      </listitem>
-
-      <listitem>
-        <para>Host-only networking: fixed adapter reference counting</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: fixed rare guest crashes with Linux SMP guests (bug #8755)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed guest disk corruption under rare circumstances
-          (only relevant for guests with more than 2GB RAM; bug #8826)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed data corruption after a snapshot was taken with
-          asynchronous I/O enabled (bug #8498)</para>
-      </listitem>
-
-      <listitem>
-        <para>Floppy: several improvement</para>
-      </listitem>
-
-      <listitem>
-        <para>HPET: another fix for time jumps (bug #8707)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: use correct permissions when creating /dev/vboxusb
-          (Linux hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: removed assumption that string descriptors are null-terminated
-          (Windows hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed a potential crash when resizing the guest
-          window</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed GNOME 3 rendering under Ubuntu 11.04 and
-          Fedora 15</para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: fixed another bug which could lose entries in the media
-          registry when restoring a snapshot (bug #8363)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: don't stop mounting the other valid folders if one
-          host folder is inaccessible (4.0.6 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: check whether gcc and make are installed before
-          building kernel modules (bug #8795)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: added support for X.Org Server 1.10</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: fixed inappropriate Guest Additions update
-          notification when using vendor-specific version suffixes (bug #8844)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 4.0.6 (2011-04-21)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed incorrect handling of ballooned pages when restoring
-          a VMM from a saved state</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: don't crash on hosts with more than 64 cores / hyperthreads;
-          implemented support for up to 256 host cores (except Windows hosts; bug #8489)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation for PAE guests running on hosts without PAE
-          (bug #8006)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed slow Linux guests with raw mode and recent guest kernels
-          (bug #8726)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: support host key combinations (bug #979)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed progress indicator (bug #7814)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: show the mouse pointer while the VM is paused if the USB
-          tablet mouse emulation is used (bug #6799)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: adapt the snapshot folder as well when renaming a VM
-          (bug #8469)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: persistently remember the last folders of the disk/DVD/floppy
-          selectors</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: never allow to start a VM with USB-2.0 activated if the
-          proper extension pack is missing (bug #8182)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed hang/crash when opening a file dialog in an non-existing
-          folder (bug #8673)</para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: fixed a bug which could lose entries in the media
-          registry when restoring a snapshot (bug #8363)</para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: allow snapshots to be stored in the VM directory</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed a crash if a VM was forced to terminate
-          (Windows hosts only; bug #7133)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed memory leak (4.0 regression; bug #7966)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed access to iSCSI targets over internal network</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed reading from disks with more than one snapshot for
-          VHD and VMDK images with disabled host cache (bug #8408)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed a possible hang during VM suspend after an
-          I/O error occurred</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed a possible hang during VM suspend / reset
-          (bug #8276, #8294)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: automatically create a diff image when attaching a
-          streamOptimized VMDK image to a VM</para>
-      </listitem>
-
-      <listitem>
-        <para>ATA/SATA: fixed automounting of virtual CD/DVD mediums with recent
-          Linux distributions by correctly reporting the current profile as 'none'
-          if no medium is present</para>
-      </listitem>
-
-      <listitem>
-        <para>Buslogic: fixed emulation for certain guests (e.g. jRockit VE)</para>
-      </listitem>
-
-      <listitem>
-        <para>Host-Only Networking: fixed interface creation failure on Windows
-          hosts (4.0.4 regression; bug #8362)</para>
-      </listitem>
-
-      <listitem>
-        <para>Host-Only & Bridged & Internal Networking: fix for processing
-          promiscuous mode requests by VMs, defaulting to switch behaviour</para>
-      </listitem>
-
-      <listitem>
-        <para>Host-Only Networking: fixed connectivity issue after resuming the
-          host from sleep (bug #3625)</para>
-      </listitem>
-
-      <listitem>
-        <para>Bridged Networking: support for interface bonding on Mac OS X hosts (bug #8731)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed processing of ARP announcements for guests with static
-          assigned IPs (bug #8609)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: backward compatibility with VRDPAuth external authentication
-          library (bug #8063)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: don't fail to start a VM if a path is not absolute,
-          for example when importing an OVF from a different host (bug #7941)</para>
-      </listitem>
-
-      <listitem>
-        <para>Audio: fixed crash under certain conditions (bug #8527)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed a crash when plugging certain USB devices (bug #8699)</para>
-      </listitem>
-
-      <listitem>
-        <para>HPET: fixed time jumps when reading the counter (bug #8707)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF/OVA: automatically adjust disk paths if the VM name is
-          changed on import</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF/OVA: fix export to slow medias</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF/OVA: automatically repair inconsistent appliances with
-          multiple disks (bug #8253)</para>
-      </listitem>
-
-      <listitem>
-        <para>rdesktop-vrdp: fixed an assertion triggered under certain conditions
-          (bug #8593)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: fixed occasional hangs during VM shutdown because
-          sometimes COM was not properly uninitialized</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: prevent the mouse from leaving the VM window while
-          captured</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: keep aspect ratio while resizing in scale mode
-          (shift for old behaviour) (part of bug #7822)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 hosts: fixed Yen key support (bug #8438)
-          </para>
-      </listitem>
-
-      <listitem>
-        <para>X11 hosts: fixed a regression which caused Host+F1 to pop up
-          help instead of sending Ctrl+Alt+F1</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts / Linux Additions: mangle IPRT symbols to allow installing
-          VirtualBox inside a VM while the Guest Additions are active (bug #5686)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts / Linux guests: workaround for a bug in GLIBC older than
-          version 1.11 leading to crashes under certain conditions (signed/unsigned
-          problem with memchr on 64-bit machines)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed a deadlock in event semaphores that could lead
-          to unkillable VM processes</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed Sysprep parameter handling</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed spontaneous guest reboots under certain
-          circumstances (4.0.2 regression; bugs #8406, #8429)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: added auto logon support for locked workstations
-          on legacy Windows versions</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed driver bugcheck error when handling PnP
-          messages (4.0 regression; bug #8367)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed memory leak in VBoxVideo</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 Additions: added support for X.Org Server 1.10 final</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: Linux kernel 2.6.39-rc1 fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: improved auto-run support (bug #5509)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fix mouse support on SUSE 11 SP 1 guests
-          (bug #7946)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: added support for X.Org Server 1.9</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: various bugfixes for guest control execution</para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: use own log file, with log rotation to limit size</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 4.0.4 (2011-02-17)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed recompiler crashes under certain conditions
-          (bugs #8255, #8319 and further)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed running 64-bit guests on 32-bit host with nested paging
-          enabled on AMD CPUs (4.0 regression; bug #7938)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed timing issues / hangs for certain guests using the
-          programmable interval timer (bugs #8033 and #8062)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: large page and monitoring fixes for live snapshots
-          (bugs #7910, #8059, #8125)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed error message when trying to exceed the maximum
-          number of host network interfaces</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed saving of changes to the metadata of an existing
-          snapshot (bug #8145)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed rare crash on X11 hosts (bug #8131)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: when selecting a shared folder, start the file dialog in
-          the users home directory (bug #8017)</para>
-      </listitem>
-
-      <listitem>
-        <para>ExtPack: enforce the correct permissions which might be restricted
-          by umask when creating directories (non-Windows hosts only; bug #7878)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxSDL: fixed crash when starting by specifying the VM UUID
-          (4.0 regression; bug #8342)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: allow savestate even if the VM is already paused</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed <emphasis>modifyvm --synthcpu</emphasis>
-          (bug #6577)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed hang when doing <emphasis>guestcontrol execute
-            --wait-for exit</emphasis> and displaying process status on exit
-          (bug #8235)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: decreased CPU load during <emphasis>guestcontrol execute
-            --wait-for exit/stdout</emphasis> while waiting for the guest process
-          to terminate (bug #7872)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed <emphasis>list hostdvds/hostfloppies</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed <emphasis>storageattach</emphasis> for host
-          DVD drives and host floppy drives</para>
-      </listitem>
-
-      <listitem>
-        <para>Metrics: introduced <emphasis>RAM/VMM</emphasis> base metric</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: improved sanity check when taking a VM screen shot
-          (bug #7966)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed a crash under rare circumstances if a VM failed to start</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed attaching of immutable disk images (bug #8105)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed a crash at VM shutdown (bug #6443)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed incorrect handling of cross-referenced medium
-          attachments (bug #8129)</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: fixed truncating of big integer values (4.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: properly store the ICH9 chipset type (bug #8123)</para>
-      </listitem>
-
-      <listitem>
-        <para>Host-Only & Bridged Networking: fixed VBox DHCP server startup issue
-          for Windows hosts (4.0 regression; bug #7905)</para>
-      </listitem>
-
-      <listitem>
-        <para>Host-Only Networking: re-create vboxnetX interfaces after
-          vboxnetadp.ko module reload on Linux and Darwin (bugs #5934, #6341)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed an mbuf leak under rare circumstances (bug #7459)</para>
-      </listitem>
-
-      <listitem>
-        <para>ACPI: don't allow the guest to enter S4 by default and don't
-          announce S1 and S4 in the ACPI tables if disabled (bug #8008)</para>
-      </listitem>
-
-      <listitem>
-        <para>Graphics card: made re-enabling disabled screens work correctly
-           to prevent problems when X11 guests enter screen saving mode
-           (bug #8122)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed write errors with snapshots if the host cache is
-          disabled (4.0 regression; bug #8221)</para>
-      </listitem>
-
-      <listitem>
-        <para>ATA/SATA: fixed reset handling after ACPI suspend/resume</para>
-      </listitem>
-
-      <listitem>
-        <para>BusLogic: fixed hang with SMP VMs</para>
-      </listitem>
-
-      <listitem>
-        <para>Serial: another attempt to prevent lost characters during transmission
-          (bug #1548)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts/guests: Linux 2.6.38-rc1 compile fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed VBoxSVC crash when listing host interfaces
-          without default gateway (64-bit hosts only; bug #7955)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris/Darwin hosts: fixed VM CPU execution cap</para>
-      </listitem>
-
-      <listitem>
-        <para>X.Org guests: fixed a crash on X server restart
-           (bug #8231)</para>
-      </listitem>
-
-      <listitem>
-        <para>X.Org guests: support X.Org Server 1.10 pre-release and Ubuntu
-           11.04 Alpha</para>
-      </listitem>
-
-      <listitem>
-        <para>X.Org guests: Add EDID emulation in the graphics driver to
-          prevent GNOME settings daemon changing the mode on login</para>
-      </listitem>
-
-      <listitem>
-        <para>X.Org guests: never send graphics modes to the host that older
-           VirtualBox versions can't handle</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed a memory leak in the shared folders code if
-          a host link is not readable (bug #8185)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed handling of Security Attention Sequence (SAS)
-          with VBoxGINA</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 4.0.2 (2011-01-18)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>GUI: don't crash if a removable host drive referenced from the VM
-          settings vanished</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed a crash when using the KDE4 Oxygen theme and clicked
-          on the settings button (4.0 regression; bug #7875)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: properly warn if the machine folder cannot be
-          created (bug #8031)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: several fixes for multimonitor X11 guests</para>
-      </listitem>
-
-      <listitem>
-        <para>ExtPack: don't make the installer helper application suid root
-          (Linux .deb/.rpm packages only)</para>
-      </listitem>
-
-      <listitem>
-        <para>ExtPack: improved user experience on Vista / Windows 7 when installing
-          an extension pack</para>
-      </listitem>
-
-      <listitem>
-        <para>ExtPack: fixed issue with non-ascii characters in the path name
-          during installing an extension pack (bug #9717)</para>
-      </listitem>
-
-      <listitem>
-        <para>ExtPack: fixed SELinux issues on 32-bit Linux hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: Host-only interface creation and removal is now
-          supported for all platforms except Solaris (bug #7741)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed segmentation fault when removing non-existent
-          host-only interface</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed possible crashes with VMDK/VHD images with snapshots
-          and asynchronous I/O (4.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: don't eject the physical medium if a DVD/CDROM/floppy drive is
-          detached from a VM (bug #5825)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: be more robust when a faulty guest sends ATA commands to an
-          ATAPI device (bug #6597)</para>
-      </listitem>
-
-      <listitem>
-        <para>Parallels: fixed deletion of the image during suspend, pause or
-          power off (4.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Bridged networking: fixed host kernel panic when bridging
-          to devices with no TX queue (4.0 regression; Linux hosts only; bug #7908)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: port-forwarding rule registration respects protocol parameter (bug #8094)</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: fixed PXE boot issues with WDS (bug #6330)</para>
-      </listitem>
-
-      <listitem>
-        <para>Virtio-net: fixed the issue with TX performance in some Linux
-          guests</para>
-      </listitem>
-
-      <listitem>
-        <para>ICH9: fixed VM crash (software virtualization only; bug #7885)</para>
-      </listitem>
-
-      <listitem>
-        <para>VGA: fixed VESA screen issue (4.0 regression; bug #7986)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed parameter parsing when creating symbolic
-          links, fixes 32-bit/64-bit bitness issue (bug #818)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed crash under rare circumstances due to an invalid
-          logging string (4.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: improve error information propagation for errors preventing
-          a VM start</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed problems with snapshots and non-ASCII characters in
-          machine paths (bug #8024)</para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: now listens to localhost by default as documented
-          (bug #6067)</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: do not fail loading machine settings if removeable drive attachment (host drive or image)
-          cannot be found; with 4.0 this is much more likely when machines are moved from one host to another</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: fixed issue that changing a snapshot name or description was
-          not saved to machine XML</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF/OVA: fixed import of files created by other OVF tools (bug
-         #7983)</para>
-      </listitem>
-
-      <listitem>
-        <para>rdesktop-vrdp: fix a crash during USB device enumeration (bug
-         #7981)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed a crash during USB device enumeration</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: try a bit harder to allocate memory (bug #8035; 4.0
-          regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: fixed parsing of parameters for guest control in
-          VBoxService (4.0 regression; bug #8010)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Guest Additions: automatic logon on Windows Vista/Windows 7 now supports
-          unlocking previously locked workstations</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 4.0.0 (2010-12-22)</title>
-
-    <para>This version is a major update. The following major new features
-      were added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Reorganization of VirtualBox into a base package and Extension Packs; see <xref linkend="intro-installing" /></para>
-      </listitem>
-
-      <listitem>
-        <para>New settings/disk file layout for VM portability; see <xref linkend="vboxconfigdata" /></para>
-      </listitem>
-
-      <listitem>
-        <para>Major rework of the GUI (now called "VirtualBox Manager"):
-          <itemizedlist>
-            <listitem>
-              <para>Redesigned user interface with guest window preview (also for screenshots)</para>
-            </listitem>
-
-            <listitem>
-              <para>New "scale" display mode with scaled guest display; see <xref linkend="intro-resize-window" /></para>
-            </listitem>
-
-            <listitem>
-              <para>Support for creating and starting <computeroutput>.vbox</computeroutput> desktop shortcuts (bug #1889)</para>
-            </listitem>
-
-            <listitem>
-              <para>The VM list is now sortable</para>
-            </listitem>
-
-            <listitem>
-              <para>Machines can now be deleted easily without a trace including snapshots and saved
-                states, and optionally including attached
-                disk images (bug #5511; also, <computeroutput>VBoxManage unregistervm --delete</computeroutput>
-                can do the same now)</para>
-            </listitem>
-
-            <listitem>
-              <para>Built-in creation of desktop file shortcuts to start VMs on double click (bug #2322)</para>
-            </listitem>
-
-          </itemizedlist>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: support more than 1.5/2 GB guest RAM on 32-bit hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>New virtual hardware:
-          <itemizedlist>
-            <listitem>
-              <para>Intel ICH9 chipset with three PCI buses, PCI Express and Message Signaled Interrupts (MSI);
-                see <xref linkend="settings-motherboard" /></para>
-            </listitem>
-
-            <listitem>
-              <para>Intel HD Audio, for better support of modern guest operating systems
-                (e.g. 64-bit Windows; bug #2785)</para>
-            </listitem>
-          </itemizedlist>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>Improvements to OVF support (see <xref linkend="ovf" />):
-          <itemizedlist>
-            <listitem>
-              <para>Open Virtualization Format Archive (OVA) support</para>
-            </listitem>
-
-            <listitem>
-              <para>Significant performance improvements during export and import
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>Creation of the manifest file on export is optional
-                now</para>
-            </listitem>
-
-            <listitem>
-              <para>Imported disks can have formats other than VMDK</para>
-            </listitem>
-
-          </itemizedlist>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>Resource control: added support for limiting a VM's CPU time and IO
-          bandwidth; see <xref linkend="storage-bandwidth-limit" /></para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: support asynchronous I/O for iSCSI, VMDK, VHD and
-        Parallels images</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: support for resizing VDI and VHD images; see <xref linkend="vboxmanage-modifyvdi" /></para>
-      </listitem>
-
-     <listitem>
-        <para>Guest Additions: support for multiple virtual screens in Linux
-           and Solaris guests using X.Org server 1.3 and later</para>
-      </listitem>
-
-      <listitem>
-        <para>Language bindings: uniform Java bindings for both local
-          (COM/XPCOM) and remote (SOAP) invocation APIs</para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>In addition, the following items were fixed and/or added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: Enable large page support by default on 64-bit hosts
-              (applies to nested paging only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation when running Minix (VT-x only; bug #6557)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed crash under certain circumstances (Linux hosts only,
-          non VT-x/AMD-V mode only; bugs #4529 and #7819)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: add configuration dialog for port forwarding in NAT mode
-          (bug #1657)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: show the guest window content on save and restore</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: certain GUI warnings don't stop the VM output anymore</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed black full screen minitoolbar on KDE4 hosts
-          (Linux hosts only; bug #5449)</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: implemented multi-sector reading to speed up booting of certain
-          guests (e.g. Solaris)</para>
-      </listitem>
-
-      <listitem>
-        <para>Bridged networking: improved throughput by filtering out outgoing
-          packets intended for the host before they reach the physical network
-          (Linux hosts only; bug #7792)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: allow use of <emphasis>CR_SYSTEM_GL_PATH</emphasis>
-          again (bug #6864)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed various clipping/visibility issues (bugs #5659,
-          #5794, #5848, #6018, #6187, #6570)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: guest application stack corruption when using
-          glGetVertexAttrib[ifd]v (bug #7395)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed OpenGL support for libMesa 7.9</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed Unity/Compiz crashes on natty</para>
-      </listitem>
-
-      <listitem>
-        <para>2D Video acceleration: multimonitor support</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed rare crash in multimonitor configuration</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: support for upstream audio</para>
-      </listitem>
-
-      <listitem>
-        <para>Display: fixed occasional guest resize crash</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: port forwarding rules can be applied at runtime</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: allow to attach CD/DVD-ROM drives including passthrough
-          (bug #7058)</para>
-      </listitem>
-
-      <listitem>
-        <para>Floppy: support readonly image files, taking this as the
-          criteria for making the medium readonly (bug #5651)</para>
-      </listitem>
-
-      <listitem>
-        <para>Audio: fixed memory corruption during playback under rare
-          circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>Audio: the DirectSound backend now allows VMs to be audible when
-            another DirectSound application is active, including another VM (bug
-            #5578)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>EFI: support for SATA disks and CDROMs</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: reduce the stack usage of the VESA BIOS function
-          <emphasis>#4F01</emphasis> (Quake fix)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF/OVA: fixed export of VMs with iSCSI disks</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: Apple DMG image support for the virtual CD/DVD (bug
-          #6760)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux host USB support: introduced a less invasive way of
-           accessing raw USB devices (bugs #1093, #5345, #7759)</para>
-       </listitem>
-
-       <listitem>
-         <para>Linux hosts: support recent Linux kernels with
-           <emphasis>CONFIG_DEBUG_SET_MODULE_RONX</emphasis> set</para>
-       </listitem>
-
-      <listitem>
-        <para>Guest Additions: Shared Folders now can be marked as being auto-mounted
-          on Windows, Linux and Solaris guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: Shared Folders now support symbolic links (bug #818)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: combined 32-bit and 64-bit additions into one
-          file</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: automatic logon on Windows Vista/Windows 7 is now able
-          to handle renamed user accounts; added various bugfixes</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.2.12 (2010-11-30)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed rare host crash when running 64-bit guests on 32-bit
-           hosts (bug #7577)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed host reboots under rare circumstances due to NMIs
-          triggered by active performance counters (Linux hosts in
-          non-VT-x/AMD-V mode only; bug #4529)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed out of memory guru meditation for large memory guests (bug #7586)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a guru meditation related to large pages</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: use new VT-x feature to keep the guest from hogging the CPU</para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: implemented deleting the last remaining snapshot while
-           the VM is running</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: perform the checks for exceeding the size limit of the host file
-          system and for broken asynchronous I/O on older Linux kernels with ext4 / xfs
-          file systems not only when starting the VM from scratch but also when
-          starting from a saved state</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed memory leak (3.2.0 regression; bugs #6918, #7353)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed Linux NFS root issue (bugs #7299)</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed VM reset handling in e1000</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed rare crash in multimonitor configuration</para>
-      </listitem>
-
-      <listitem>
-        <para>Display: fixed occasional guest resize crash</para>
-      </listitem>
-
-      <listitem>
-        <para>Mouse: don't send relative mouse events together with absolute
-          mouse events (3.2.10 regression; bug #7571)</para>
-      </listitem>
-
-      <listitem>
-        <para>Keyboard: fixes for the USB keyboard emulation;
-          fixes for Korean keyboards</para>
-      </listitem>
-
-      <listitem>
-        <para>Serial: don't hang if the host device would block during
-          open (bugs #5756, #5380)</para>
-      </listitem>
-
-      <listitem>
-        <para>Serial: fixed modem status lines (Linux hosts only; bug #812)</para>
-      </listitem>
-
-      <listitem>
-        <para>Graphics: Horizontal resolutions are no longer restricted to a
-            multiple of 8 pixels (bug #2047; requires Guest Additions update).
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed a crash with older Linux kernels and non-ASCII characters
-          in device strings (Linux hosts only; bug #6983, #7158, #7733; version
-          3.2.8 contained an incomplete fix)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed a crash under rare circumstances (bug #7409; Windows hosts
-          only)</para>
-      </listitem>
-
-      <listitem>
-        <para>"iSCSI: respond to NOP-In requests from the target immediately to avoid
-          being disconnected if the guest is idle</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed a crash under certain circumstances (bug #7659)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed crashes for GLUT based apps (bug #6848)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: added missing GLX 1.3 functionality (bugs #7652, #7195)</para>
-      </listitem>
-
-      <listitem>
-        <para>2D Video acceleration: fixed potential deadlock when saving the VM
-          state (bug #4124)</para>
-      </listitem>
-
-       <listitem>
-         <para>Windows hosts: another fix for BSODs under certain circumstances in
-           VBoxNetFlt.sys (bug #7601)</para>
-       </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed host USB DVD drive detection</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed swapped keys for certain ISO keyboard types
-          (bug #2996)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: added link state handling for TAP devices needed for proper
-          operation with bridged networking on kernels 2.6.36 and above (bug #7649)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts/guests: Linux 2.6.37 fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: properly compile the vboxvideo module if DKMS
-          is not installed (bug #7572)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed a memory leak when accessing non-existing
-          files on a Shared Folders (bug #7705)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: skip none-mapped user accounts when enumerating
-          user accounts for VM information</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.2.10 (2010-10-08)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: V8086 mode fix for legacy DOS/Windows guests with EMM386
-          (3.2.8 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: stability fix (bug #7342)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a Guru meditation related to large pages (bug #7300)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed support for large pages on Linux hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a Guru meditation for large memory 64-bit guests on 32-bit
-          hosts with nested paging (bug #7544)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: performance improvements for VMs with more than
-          2GB RAM (bug #6928)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed host key handling if the host key is set to Left Alt
-          (Linux/Solaris hosts only; 3.2.0 regression; bug #6758)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: the VM can be minimized from the mini toolbar
-          (bug #4952)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: handle Ctrl+Break properly on X11 hosts (3.2.0 regression;
-          bug #6122)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed the case where the user aborted the media selector
-          for selecting the boot hard disk from the VM wizard</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added a check for Linux kernels 2.6.36 or later which are known
-          to have the asynchronous I/O bug on ext4 / xfs file systems fixed
-          (Linux hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>OpenSolaris guests: use SATA controller by default</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed I/O errors in the guest after compacting VDI
-          images (3.2.6 regression; bug #7294)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: automatically repair base disk images with non-zero
-          parent UUID which made them inaccessible (bug #7289)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed corrupted images if a merge operation was
-          canceled</para>
-      </listitem>
-
-      <listitem>
-        <para>IDE: added ATAPI passthrough support for audio CDs</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed a potential hang during boot of recent Solaris guests</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: handle out of disk space and similar conditions better</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: fixed sporadic hangs when closing the connection</para>
-      </listitem>
-
-      <listitem>
-        <para>VGA: fixed missing redraw with multiple screens under certain
-          circumstances (bug #7291)</para>
-      </listitem>
-
-      <listitem>
-        <para>VGA: several small fixes for legacy VGA graphics modes</para>
-      </listitem>
-
-      <listitem>
-        <para>Bridged networking: fixed occasional host freeze during VM shutdown
-          (Linux hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: don't check for the existence of the TFTP prefix when delivering
-          a file via bootp (bug #7384)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed resolving of names at the host resolver (bug #7138)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: under rare conditions the NAT engine consumed 100% CPU load
-          (non-Windows hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed memory leak under certain circumstances (bug #5966)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed missing redraws with Windows guests under certain
-          circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: properly discard blocking outstanding bulk URBs, fixes some
-          printers</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: Blackberry fix (bug #6465)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxHeadless: fixed event queue processing problems which led to
-          hangs if the VM could not be started successfully</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: don't crash if parameters with invalid characters
-          are passed (bug #7388)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: <computeroutput>clonehd</computeroutput>: fixed a
-          bug where the command aborted with an error message under rare
-          circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>metrics</computeroutput>: made it work
-          for directly started VMs again (3.2.8 regression; bug #7482)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: report <emphasis>GLX_ARB_get_proc_address</emphasis>
-          as supported extension</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: guest application stack corruption when using
-          <emphasis>glGetVertexAttrib[ifd]v</emphasis> (bug #7395)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed broken 3D support when switching to
-          full screen / seamless modes (bug #7314)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed 32bit OpenGL apps under 64bit Windows XP/Vista (bug #7066)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed bug when exporting a VM with multiple attached disks
-          (bug #7366)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed slow export for certain filesystems (bug #3719)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: disabled manifest (.mf file) support; manifests are no
-          longer verified on import nor written on export</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared clipboard/Windows: improved the reliability of the shared
-          clipboard on Windows hosts and guest (partial fix to bug #5266)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: don't show an empty directory if filenames with an
-          invalid encoding exist on the host (bug #7349)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: return the proper error code when trying
-          to list files for a non-existing wildcard (bug #7004)</para>
-      </listitem>
-
-      <listitem>
-        <para>Audio: fixed guest memory corruption when capturing from the
-          NULL audio backend (bug #6911)</para>
-      </listitem>
-
-      <listitem>
-        <para>Audio: improved playback quality (less choppy)</para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: avoid unnecessary creation of idle threads</para>
-      </listitem>
-
-      <listitem>
-        <para>Additions: fixed bug in the guest execution feature when passing
-          more than one environment variable</para>
-      </listitem>
-
-      <listitem>
-        <para>Additions: refresh all guest properties written by VBoxService
-          after the VM was restored from a saved state</para>
-      </listitem>
-
-      <listitem>
-        <para>Additions: fixed a <emphasis>division by zero</emphasis> crash of
-          VBoxService under certain circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>Additions: immediately resynchronize the guest time with the host
-          time after the VM was restored from a saved state (bug #4018)</para>
-      </listitem>
-
-      <listitem>
-        <para>Additions/Windows: fixed <emphasis>LsaEnumerate</emphasis> error when
-          enumerating logged in users</para>
-       </listitem>
-
-      <listitem>
-        <para>Additions/X.Org: support X.Org Server 1.9 (bug #7306)</para>
-      </listitem>
-
-      <listitem>
-        <para>Additions/X.Org: don't crash VBoxClient during reboot</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed host DVD drive enumeration on Solaris 10</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: added a custom core dumper to procure more data
-          in the event of a VM crash</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris guests: fixed user idle detection</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris guests: fixed a possible panic in Shared Folders when using
-          the wrong user or group IDs (bug #7295)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris guests: fixed Shared Folders from truncating files to 2GB on
-          32-bit guests (bug #7324)</para>
-       </listitem>
-
-       <listitem>
-         <para>Windows hosts: fixed a BSOD under certain circumstances in VBoxNetFlt.sys
-           (bug #7448)</para>
-       </listitem>
-
-      <listitem>
-        <para>Linux hosts/guests: Linux 2.6.36 fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts/guests: DKMS fixes (bug #5817)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed missing dock menu entries (bug #7392)</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.2.8 (2010-08-05)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: properly terminate the VM with an error if the guest is trying
-          to switch to the PAE mode but PAE is disabled in the VM settings</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: switch to native file dialogs (Windows hosts only; bug #5459)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: don't use native file dialogs on KDE hosts (Linux hosts only;
-          bug #6809)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed <emphasis>GL_EXT_texture_sRGB</emphasis> support</para>
-      </listitem>
-
-      <listitem>
-        <para>PXE: fixed ZENworks PXE boot regression</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed slower export and larger images under certain
-          circumstances (3.2.6 regression; bug #7073)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: properly signal an interrupt if the port suspend status
-          changes</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: respect the remote-only filter</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: avoid VM hang when changing the configuration of
-          certain devices (Windows hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fix a crash with older Linux kernels and non-ASCII characters
-          in device strings (Linux hosts only; bug #6983)</para>
-      </listitem>
-
-      <listitem>
-        <para>PageFusion: fixed conflict with the guest execution feature</para>
-      </listitem>
-
-      <listitem>
-        <para>PageFusion: fixed stability issues with a large number of VMs</para>
-      </listitem>
-
-      <listitem>
-        <para>PageFusion: fixed host crashes with guest SMP and Win64 guests </para>
-      </listitem>
-
-      <listitem>
-        <para>Memory ballooning: fixed problems restoring VMs with pre-allocation enabled</para>
-      </listitem>
-
-      <listitem>
-        <para>Bridged networking: fixed performance issue with GRO enabled on
-          bridged device (bug #7059)</para>
-      </listitem>
-
-      <listitem>
-        <para>Hostonly networking: fixed performance issue (3.2.6 regression; bug #7081)</para>
-      </listitem>
-
-      <listitem>
-        <para>Hard disks: fix auto-reset of immutable disk at VM startup
-          (bug #6832)</para>
-      </listitem>
-
-      <listitem>
-        <para>BusLogic: several fixes for Windows NT/2000 and SCO OpenServer
-          guests</para>
-      </listitem>
-
-      <listitem>
-        <para>LsiLogic: fixed I/O errors under rare circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>Sharing disks: support for attaching one disk to several VMs
-          without external tools and tricks</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: several fixes and performance enhancements
-          for Solaris guests (bugs #4154 and #6512)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Installer: added support for remote installations</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Properties API: correctly support enumerating the properties
-          of a running VM with an empty "patterns" field (bug #7171)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest properties: properly delete transient properties on
-          shutdown</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP video redirection performance improvements and stability
-          fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: silently fix host audio driver when reading machine XML
-        settings files or OVF written by VirtualBox on a different host OS, for
-        example convert DirectSound to PulseAudio (bug #7209)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: properly store the NAT network setting in XML
-          settings file version 1.10 and later (bug #6176)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: handle differencing images with parent UUID correctly
-          in subcommand <emphasis>openmedium disk</emphasis> (bug #6751)</para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: enabled HTTP keepalive for much better performance
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: added timestamps to logging output</para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: treat 8-bit strings as UTF-8 not ASCII</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 Additions: fix for Xorg 6.8 guests (e.g. RHEL4)</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.2.6 (2010-06-25)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed host crash when running 64-bit guests on 32-bit hosts
-              with certain Intel CPUs (VT-x only; bug #6166) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: allow 64-bit SMP guests on 32-bit hosts (VT-x and AMD-V only;
-              does not apply to Mac OS X, which already supports it) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed Guru mediation if guests with more than 2GB are booted
-          with VT-x/AMD-V disabled (bug #5740)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed TR limit trashing (VT-x and 64-bit host only; bug #7052)</para>
-      </listitem>
-
-      <listitem>
-        <para>Page Fusion: several bug fixes for SMP guests (including bug #6964) </para>
-      </listitem>
-
-      <listitem>
-        <para>Teleportation: several fixes and improvements</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X server guests: compatibility fix</para>
-      </listitem>
-
-      <listitem>
-        <para>EFI: fixed memory detection for guests with 2GB or more RAM
-          assigned</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added a workaround for a Linux kernel bug which affecting
-          asynchronous I/O on ext4 / xfs file systems (Linux hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added setting for multiple VRDP connections; useful if
-          multiple screens are enabled</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: another fix for the keyboard capturing bug under metacity (bug #6727)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed quit dialog when used in seamless or full screen mode
-          (Mac OS X hosts only; bug #6938)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: handle the extra key on the Brazilian keyboard on X11 hosts
-           again (bug #7022).
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>2D Video acceleration: fixed crashes when leaving the full screen mode
-          (bug #6768)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed <emphasis>storageattach</emphasis> error handling
-          (bug #6927)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed <emphasis>dhcpserver add</emphasis> (3.2.0 regression;
-          bug #7031)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed hang with images located on filesystems which
-          don't support asynchronous I/O (bug #6905)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed raw disks on Windows hosts (3.2.0 regression;
-          bug #6987)</para>
-      </listitem>
-
-      <listitem>
-        <para>LsiLogic: fixed hang with older Linux guests</para>
-      </listitem>
-
-      <listitem>
-        <para>BusLogic: fixed hang during I/O</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: set initial number of ports to 1 as some guests can't handle
-          30 ports (e.g. CentOS 4 and FreeBSD; bug #6984)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: performance improvement</para>
-      </listitem>
-
-      <listitem>
-        <para>SCSI: fixed error when using the full format option during Windows
-          installation (bug #5101)</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: fixed authentication (bug #4031)</para>
-      </listitem>
-
-      <listitem>
-        <para>Host-only/bridged networking: fixed excessive host kernel warnings
-          under certain circumstances (Linux hosts only; 3.2.0 regression;
-          bug #6872)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed potential memory leaks</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: increased the size of the memory pool for 16K Jumbo frames
-          (performance tweak)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: allow to link/unlink the network cable even if the VM
-          is currently paused</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: disconnect cable was not properly handled if the NIC
-          was not yet initialized by the guest</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: export performance optimization</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: upgraded OS type definitions to CIM 2.25.0 so that Windows 7
-          and other OSes are now tagged correctly on export</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: the setting for disabling the host I/O cache was sometimes
-          not properly saved</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: save machine state into XML correctly even when snapshot
-          folder has been changed to a non-default location (bug #5656)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: allow the guest to disable an EHCI port</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: find a valid language ID before querying strings (bug #7034)</para>
-      </listitem>
-
-      <listitem>
-        <para>POSIX hosts: fixed several memory leaks (3.2.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed VDI access problem under certain circumstances
-          (IDE/SATA; 3.2.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed VM fails to start on 32-bit hosts (3.2.0 regression; bug #6899)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts (32-bit): increase guest RAM limit if the host
-              kernel allows for more virtual address space</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: re-read a directory after a file was removed
-          (bug #5251)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: install the DRI driver in the right location on
-           ArchLinux guests (bug #6937)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 Additions: fixed spurious mouse movement events (bug #4260)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed guest execution feature</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: automatic logon on Windows Vista/Windows 7 is now able
-          to handle renamed and principal user accounts; added various bugfixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: improved command line parsing of the installer</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed driver verifier bugcheck in VBoxMouse (bug #6453)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed OpenGL support for 32bit applications under 64bit Windows guests</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 3.2.4 (2010-06-07)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>GUI: fixed superfluous resize-event on powering-on VM for X11
-          (improvement for the 3.2.2 fix)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed keyboard capturing bug under metacity (bug #6727)</para>
-      </listitem>
-
-      <listitem>
-        <para>Host-only/bridged networking: fixed guest-to-guest communication
-          over wireless (3.2.0 regression; bug #6855)</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed a potential guest disk corruption with
-          growing images (3.2.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Page Fusion: fixed shared module detection for Win64 guests</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: allow use of <emphasis>CR_SYSTEM_GL_PATH</emphasis>
-          again (bug #6864)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed a host assertion for some multi-threaded guest
-          applications (bug #5236)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed host crashes with nVIDIA drivers on WDDM startup</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed import of OVFs with a VM description (annotation)
-          (3.2.2 regression; bug #6914)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed issues with secondary monitors (bug #6759)</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.2.2 (2010-06-02)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed rare invalid guest state guru meditation (VT-x only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed poor performance with nested paging and unrestricted
-          guest execution (VT-x only; bug #6716)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed occasional guru meditation during Windows 7 bootup (bug #6728)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: keep the status for remote control in sync with the actual
-          state</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: don't exit after a successful refresh of an invalid VM configuration</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed keyboard capturing bug under metacity (bug #6727)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed crash during VM termination if a modal dialog is open</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: default controllers names of New VM Wizard are synchronized with VM settings</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed superfluous resize-event on powering-on VM for X11</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed regression - missed USB item's tool-tip of USB devices menu</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: Activate VM window on mouse-hovering for multi-monitor VMs</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxSDL/Linux hosts: automated keyboard type detection (bug #5764)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed crash during VM suspend under rare circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed crash during VM reset after a snapshot was taken</para>
-      </listitem>
-
-      <listitem>
-        <para>Storage: fixed sporadic hang of SMP guests using SATA or
-            LSI Logic SCSI and asynchronous I/O</para>
-      </listitem>
-
-      <listitem>
-        <para>Virtio-net: fix for guests with more than about 4GB RAM
-          (bug #6784)</para>
-      </listitem>
-
-      <listitem>
-        <para>Page Fusion: fixed VBoxService crash with enabled Page Fusion on Win64 guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Page Fusion: added kernel module sharing</para>
-      </listitem>
-
-      <listitem>
-        <para>HGCM: fixed memory leak which showed up if the Guest Additions were
-          accessing a non-existing HGCM service</para>
-      </listitem>
-
-      <listitem>
-        <para>Teleportation: several fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Floppy: don't disable the host I/O cache by default</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed 3.1 regression with certain devices (e.g. iPhone); Windows
-              host only</para>
-      </listitem>
-
-      <listitem>
-        <para>Serial: updated the guest device emulation to 16550A and reduced the
-          probability for losing bytes during transmission (bug #1548)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: re-fetch the name server parameters from the host on guest DHCP
-          requests to handle host network switches more gracefully (bug #3847)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed parsing of IPv4 addresses in CIDR notation (bug #6797)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: limit the number of name servers passed to the guest to four
-          (non-Windows hosts only; bug #4098)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed DNS transaction ID mismatch (bug #6833)</para>
-      </listitem>
-
-      <listitem>
-        <para>VDE: fixed changing the attachment during runtime</para>
-      </listitem>
-
-      <listitem>
-        <para>Bridged networking: fixed memory leak in the Bridged Networking
-            driver for Windows hosts (bug #6824)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fix for NT4 guests (bug #6748)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: re-introduced system preparation feature</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux guests: enable PAE for RedHat guests by default</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux guests: fix support for disabling mouse integration
-          (bug #6714)</para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: fixed a rare crash when calling IGuest methods from the web service</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed wrong hard disk UUIDs on export (bug #6802)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed 3.2.0 regression importing legacy OVF 0.9 files</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed OpenGL support for 64bit applications on windows guests</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed various host crashes (bugs #2954, #5713, #6443)</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.2.0 (2010-05-18)</title>
-
-    <para>This version is a major update. The following major new features
-      were added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Following the acquisition of Sun Microsystems by Oracle Corporation,
-        the product is now called "Oracle VM VirtualBox" and all references
-        were changed without impacting compatibility</para>
-      </listitem>
-
-      <listitem>
-        <para>Experimental support for Mac OS X Server guests (see <xref linkend="intro-macosxguests" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>Memory ballooning to dynamically in- or decrease the
-          amount of RAM used by a VM (64-bit hosts only) (see <xref linkend="guestadd-balloon" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>Page Fusion automatically de-duplicates RAM when running similar VMs thereby
-        increasing capacity. Currently supported for Windows guests on 64-bit hosts
-        (see <xref linkend="guestadd-pagefusion" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>CPU hot-plugging for Linux (hot-add and hot-remove)
-          and certain Windows guests (hot-add only) (see <xref linkend="cpuhotplug" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>New Hypervisor features: with both VT-x/AMD-V on 64-bit hosts, using large pages can improve performance
-          (see <xref linkend="nestedpaging"/>);
-          also, on VT-x, unrestricted guest execution is now supported (if nested paging
-          is enabled with VT-x, real mode and protected mode without paging code runs faster,
-          which mainly speeds up guest OS booting)</para>
-      </listitem>
-
-      <listitem>
-        <para>Support for deleting snapshots while the VM is running</para>
-      </listitem>
-
-      <listitem>
-        <para>Support for multi-monitor guest setups in the GUI for Windows
-          guests (see <xref linkend="settings-display" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB tablet/keyboard emulation for improved user experience
-          if no Guest Additions are available (see <xref linkend="settings-motherboard" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>LsiLogic SAS controller emulation (see <xref linkend="harddiskcontrollers" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP video acceleration (see <xref linkend="vrde-videochannel"/>)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT engine configuration via API and VBoxManage</para>
-      </listitem>
-
-      <listitem>
-        <para>Use of host I/O cache is now configurable (see <xref linkend="iocaching" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: added support for executing guest applications
-        from the host system (replaces the automatic system preparation feature; see
-        <xref linkend="guestadd-guestcontrol" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: enhanced OVF support with custom namespace to preserve settings
-        that are not part of the base OVF standard</para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>In addition, the following items were fixed and/or added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed Windows 2000 guest crash when configured with a large
-            amount of RAM (bug #5800) </para>
-      </listitem>
-
-      <listitem>
-        <para>Linux/Solaris guests: PAM module for automatic logons added</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: guess the OS type from the OS name when creating a new
-          VM</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added VM setting for passing the time in UTC instead of
-          passing the local host time to the guest (bug #1310)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed seamless mode on secondary monitors (bugs #1322 and
-          #1669)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: offer to download the user manual in the OSE version (bug
-          #6442)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: allow to set an empty host key to disallow any host key
-          combination (bug #684)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: allow to restrict the possible actions when shutting down
-          the VM from the GUI</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: allow to start a VM even if a virtual DVD or floppy
-          medium is not accessible</para>
-      </listitem>
-
-      <listitem>
-        <para>Settings: be more robust when saving the XML settings files</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X: rewrite of the CoreAudio driver and added support for
-          audio input (bug #5869)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X: external VRDP authentication module support (bug
-          #3106)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X: moved the realtime dock preview settings to the VM
-          settings (no global option anymore). Use the dock menu to configure
-          it</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X: added the VM menu to the dock menu</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed corrupted surface rendering (bug #5695)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed VM crashes when using
-          <emphasis>ARB_IMAGING</emphasis> (bug #6014)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed assertion when guest applications uses several
-          windows with single OpenGL context (bug #4598)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: added GL_ARB_pixel_buffer_object support</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: added OpenGL 2.1 support</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed Final frame of Compiz animation not updated to the
-          screen (Mac OS X only) (bug #4653)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed blank screen after loading snapshot of VM with enabled Compiz</para>
-      </listitem>
-
-      <listitem>
-        <para>Added support for <emphasis>Virtual Distributed Ethernet</emphasis> (VDE)
-          (Linux hosts only; see <xref linkend="networkingmodes" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>Added support for virtual high precision event timer (HPET)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed mapping between two IDE channels in OVF and the one IDE controller
-          in VirtualBox</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fix VMDK format string identifiers and sort XML elements from rasd: namespace
-        alphabetically as prescribed by standard</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxShell: interactive Python shell extended to be fully functional TUI for
-          VirtualBox</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: support Fedora 13 (bug #6370)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed overly strict checks when creating a raw partition
-          VMDK (bugs #688, #4438)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 3.1.8 (2010-05-10)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed crash with the OpenSUSE 11.3 milestone kernel during
-           early boot (software virtualization only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed invalid state during teleportation</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed OS/2 guest crash with nested paging enabled</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed massive display performance loss (AMD-V with nested paging
-             only) </para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed off-by-one bug when passing absolute mouse coordinates
-          to the guest (3.1.6 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: show the real version of the Guest Additions, not the
-          interface version</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: when adding a DVD or floppy slot in the VM mass storage
-          settings dialog, don't attach a random medium but just leave the
-          slot empty</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added <computeroutput>--seamless</computeroutput> and
-          <computeroutput>--fullscreen</computeroutput> command line switches
-          (bug #4220)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed a SEGFAULT under rare circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>2D Video acceleration: fixed display issues when working with
-        non 32-bit modes (bugs #6094 & #6208)</para>
-      </listitem>
-
-      <listitem>
-        <para>LsiLogic: fixed detection of hard disks attached to port 0 when
-          using the drivers from LSI</para>
-      </listitem>
-
-      <listitem>
-        <para>ATA: fixed sporadic crash with Linux guests when having a hard
-          disk and DVD drive on the same channel (bug #6079)</para>
-      </listitem>
-
-      <listitem>
-        <para>Network: allow to start a VM even if not all network adapters are
-        attached</para>
-      </listitem>
-
-      <listitem>
-        <para>Network: promiscuous mode support for e1000 and paravirtualized
-        adapters (bug #6519)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed ICMP latency (non-Windows hosts only; bug #6427)</para>
-      </listitem>
-
-      <listitem>
-        <para>SCSI: fixed guest crashes under certain circumstances when
-          booting from SCSI devices</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed several bugs in cloning of images (one of them
-          is bug #6408)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed <emphasis>modifyvm --natnet default</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed a kernel panic when bridged networking might
-          fail to initialize</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed priority tagged VLAN packets in bridged networking</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed issue with copying read-only files
-          (Linux guests only; bug #4890)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: renamed the guest kernel module from <emphasis>vboxvfs</emphasis>
-          to <emphasis>vboxsf</emphasis> to make it load on demand by the Linux kernel.
-          Fixes mounting from /etc/fstab in Ubuntu 10.04</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed setuid file permissions (Solaris guests only)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed deleting directories recursively
-          (Solaris guests only; bug #6513)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: support seamless and dynamic resizing on certain
-          older X11 guests (bug #5840)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed OpenGL library dependencies
-          (bug #6435)</para>
-      </listitem>
-
-      <listitem>
-        <para>Keyboard/Mouse emulation: fixed handling of simultaneous
-          mouse/keyboard events under certain circumstances (bug #5375)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mouse emulation: never switch straight back from Explorer to
-           IntelliMouse mode as it confuses the FreeBSD mouse driver
-           (bug #6488)</para>
-      </listitem>
-
-      <listitem>
-        <para>SDK: fixed memory leak in
-          <emphasis>IDisplay::takeScreenShotSlow()</emphasis> (bug #6549)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed Final frame of Compiz animation not updated to the
-          screen (Mac OS X only) (bug #4653)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: allow to bind to localhost only on Mac OS X (bug
-          #5227)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: add host USB support for Ubuntu 10.04 and other
-           hosts without the hal daemon or usbfs (bug #6343)</para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: more structs and array fixes in PHP bindings</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: make the bridged networking driver notify dll
-           be correctly unregistred on uninstall (bug #5780)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 3.1.6 (2010-03-25)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Linux hosts: fixed timing issue on hosts with Linux kernels
-          2.6.31 or later with certain CPUs (asynchronous timer mode; bug #6250)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: properly handle host suspend/resume events on
-          Linux kernels 2.6.30 or later (bug #5562)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed VBoxSVC crash while enumerating the host network
-          interfaces under certain circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: fixed image corruption after snapshot merge under certain
-          circumstances (bug #6023)</para>
-      </listitem>
-
-      <listitem>
-        <para>Snapshots: fixed crash with VBoxHeadless / OSE</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed reference counting guru meditation (bug #4940)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: improved guest SMP stability</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed VT-x hardware debug issues (bugs #477 & #5792)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed <emphasis>PGMDynMapHCPage</emphasis> guru meditation
-          (Mac OS X; VT-x only; bug #6095)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed <emphasis>pgmPoolTrackFlushGCPhysPTInt</emphasis> guru meditations
-          (Mac OS X; VT-x only; bugs #6095 & #6125)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed host crash when running PAE guests in VT-X
-          mode (Mac OS X only; bug #5771)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fix displaying of error message (bug #4345)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fix inability to enter seamless mode (bugs #6185, #6188)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed assertion and flickering when guest application uses several
-          windows with a single OpenGL context (bug #4598)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed host crashes when using
-          <emphasis>GL_EXT_compiled_vertex_array</emphasis> and array element
-          calls (bug #6165)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed runtime linker errors with OpenGL guest libs
-          (bug #5297)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed OpenGL extension viewer crash on startup
-          (bug #4962)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed a 3.1.4 regression on Windows hosts where graceful
-          connection termination was broken (bug #6237)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: alternative network setting was not stored persistent
-          (bug #6176)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed memory corruption during ICMP traffic under
-          certain circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>Network: allow to switch the host interface or the internal
-          network while a VM is running (bug #5781)</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: fix for images with a block size different than 2MB</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed filtered device attach regression (bug #6251)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed crash in OHCI under rare circumstances
-          (bug #3571)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed hang under rare circumstances when attaching USB
-          devices</para>
-      </listitem>
-
-      <listitem>
-        <para>ACPI: prevent guest freezes when accessing /proc/acpi for
-          determining the state of the host battery and the AC adapter
-          (Linux hosts only; bug #2836)</para>
-      </listitem>
-
-      <listitem>
-        <para>PulseAudio: fixed guest freezes under certain conditions
-          (3.1.4 regression; bug #6224)</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: increased space for DMI strings</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: fixed interrupt routing problem for certain configurations
-          (I/O-APIC enabled, ACPI not used; bug #6098)</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: be more robust when handling the <emphasis>INQUIRY</emphasis>
-          response</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: be more robust when handling sense data</para>
-      </listitem>
-
-      <listitem>
-        <para>BusLogic: fixed FreeBSD guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: vboxwebsrv is now multithreaded</para>
-      </listitem>
-
-       <listitem>
-        <para>Web service: fixed handling of structs and arrays in PHP bindings</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Installer: fixed netmask to stay persistent across reboots for
-          Host-only interface (bug #4590)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux installer: removed external dependency to libpng12.so (bug #6243)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed superfluous kernel logging (bug #6181)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed hang when starting the X server in Fedora12
-          guests and in guests with Linux 2.6.33 or later (bug #6198)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: support Mandriva speedboot runlevel (bug #5484)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed SELinux security context of mount.vboxsf (bug #6362)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: support Ubuntu 10.04 (bug #5737)</para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: update PHP bindings to fix problems with enums and collections</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 3.1.4 (2010-02-12)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: SMP stability fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation in certain rare cases (bug #5968)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: activate NXE for PAE enabled guests (VT-x and AMD-V on 32 bits
-           hosts only; bug #3578)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: added workaround for broken BIOSes that make VirtualBox think
-          AMD-V is in use (for details see bug #5639)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed rare host reboot when restoring a saved state
-          (bug #3945)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed incompatibility with 2.6.32 Linux kernels
-            (software virtualization only; bug #6100)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: turn on nested paging by default for new VMs (if available; VT-x
-            and AMD-V only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: turn on VPID by default for new VMs (if available; VT-x only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: perform strict CPUID compatibility checks when
-            teleporting; to get the old behavior set
-            "VBoxInternal/CPUM/StrictCpuIdChecks" to 0</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed VM crash with certain 16 bits Windows applications (software
-             virtualization only; bug #5399) </para>
-      </listitem>
-
-      <listitem>
-       <para>Snapshots: fixed a 3.1 regression that broke deletion of snapshots when
-            a machine had immutable or writethrough storage attached (bug #5727)</para>
-      </listitem>
-
-      <listitem>
-        <para>Saved state: fixed <emphasis>VERR_SSM_LOADED_TOO_MUCH</emphasis>
-          error when loading <emphasis>DisplayScreenshot</emphasis>(bug #6162)</para>
-      </listitem>
-
-     <listitem>
-       <para>VBoxManage: add <emphasis>restorecurrent</emphasis> operation to
-         snapshots command</para>
-      </listitem>
-
-     <listitem>
-       <para>VBoxManage: fixed broken snapshot lookup by name (bug #6070</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed the broken "Reload" button that reloads the machine
-          XML when a machine is inaccessible</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed guest full screen mode after reboot (bug #5372)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: handle Ctrl+Break properly on X11 hosts (bug #6122)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed status LEDs for storage devices</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: workaround for disabling the seamless mode on KDE hosts
-          (KWin bug)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed SELinux warning saying VBoxOGL.so requires text
-          relocation (bug #5690)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed Corrupted surface rendering (bug #5695)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: free textures on guest application termination (bug #5206)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed <emphasis>ubigraph_server</emphasis> crashes (bug #4674)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixes for 64-bit Solaris guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Seamless: disable seamless mode when guest changes screen
-          resolution (bug #5655)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed high CPU load under certain circumstances (Windows hosts only;
-          bug #5787)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed handling of the <emphasis>broadcast</emphasis> flag in
-          DHCP requests</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed rare crash due to an assertion in the ICMP code
-          (bug #3217)</para>
-      </listitem>
-
-      <listitem>
-        <para>Virtio-net: don't crash when ports accessed beyond the valid
-          range (bug #5923)</para>
-      </listitem>
-
-      <listitem>
-        <para>LsiLogic: fix for Windows 7 guests</para>
-      </listitem>
-
-      <listitem>
-        <para>ATA: fix for guru meditation when installing Solaris 8 guests (bug #5972)</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: fixed an incompatibility with Virtual PC (bug #5990)</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: update the footer backup after setting a new UUID (bug #5004)</para>
-      </listitem>
-
-      <listitem>
-        <para>Host DVD: really fixed loading "passthrough" setting from configuration
-         file (bug #5681)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed resolving of symlink target on Linux
-          (3.1.2 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed <emphasis>VERR_NET_ADDRESS_IN_USE</emphasis>
-          error when restarting a VM (3.1 regression; bug #5902)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed crash on Mac OS X when 3D is enabled (3.1
-          regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>PulseAudio: fixed recording (bug #4302)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed a shutdown blue screen (Windows hosts only; bug #5885)</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: fixed attribute during text scroll (bug #3407)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fix strange error messages on disk import errors</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: do not require write access to the .ovf file during import
-          (3.1 regression; bug #5762)</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: fix taking snapshots of a running VM (bug #5849)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: several USB fixes (including support for Apple iPod; bug #5873)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris installer: fixed USB module removal and Solaris 10 "id" binary incompatibility</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: fixed wrong guest time adjustment if the guest
-          clock is ahead (3.1 regression; non-Windows guests only)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed shared folders for Linux 2.6.32 guests (bug #5891)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: make the mouse driver work on Debian 5.0.3 guests
-           again (3.1.2 regression; bug #5832)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed malfunctioning VBoxService that broke time-sync (bug #5872)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed uninstallation issues on 64-bit guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed some sysprep execution issues</para>
-      </listitem>
-
-      <listitem>
-        <para>X.Org Additions: never reject the saved video mode as invalid
-           (bug #5731)</para>
-      </listitem>
-
-      <listitem>
-        <para>XFree86 Additions: accept video mode hints for the initial mode
-           again</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.1.2 (2009-12-17)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed SMP stability regression</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed USB related host crashes on 64 bits Windows hosts (bug #5237)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: wrong default HWVirtExExclusive value for new VMs (bug #5664)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: DVD passthrough setting was lost (bug #5681)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: iSCSI disks do not support adding a comment (bug #4460)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: added missing <emphasis>--cpus</emphasis> and
-          <emphasis>--memory</emphasis> options to OVF <emphasis>--import</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed VBox URL in update dialog for German and Dutch languages</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: NLS updates</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed export of non standard storage controller names (bug #5643)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: several USB fixes (including support for Apple iPhone)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: several fixes for the 3D support</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: re-enabled CMD+Key combinations, even if the
-          Host-Key isn't CMD (bug #5684)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed to fast scrolling if the mouse wheel is
-          used inside the guest (bug #5672)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: dock & menubar don't disappear in
-          full screen when the VM is not running on the primary display (bug
-          #1762)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: added an option for enabling "Auto show Dock &
-          Menubar in full screen" (bug #5636)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows host installer: fixed starting VBox with wrong privileges
-          right after installation (bug #4162)</para>
-      </listitem>
-
-      <listitem>
-        <para>Host interface and host-only networking: prevent driver from unloading
-            while a VM is still active (Windows host only)</para>
-      </listitem>
-
-      <listitem>
-        <para>Host-only networking: fixed host-only interface creation (Windows host only) (bug #5708)</para>
-      </listitem>
-
-      <listitem>
-        <para>Virtio-net: don't crash without an attached network</para>
-      </listitem>
-
-      <listitem>
-        <para>Virtio-net: fixed the issue with intermittent network in VM with
-        several virtual CPU cores</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed port-forwarding regressions (bug #5666)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed crash under certain conditions (bug #5427)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed resolving of names containing a slash or underscore
-          when using the host resolver DNS proxy (bug #5698)</para>
-      </listitem>
-
-      <listitem>
-        <para>ATA: fixed sporadic crash when resuming after a VM was forcefully
-        paused (e.g. due to iSCSI target being unavailable)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed raw vmdk disks (bug #5724)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux guests: increased the default memory for Redhat and Fedora
-           guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed installation on RHEL 3.9 guests
-           and on some 64bit guests</para>
-       </listitem>
-
-       <listitem>
-         <para>Linux Additions: prevent SELinux warnings concerning
-           text relocations in VBoxOGL.so (bug #5690)</para>
-       </listitem>
-
-       <listitem>
-         <para>X11 guests: fixed mouse support for some Xorg 1.4 guests
-           (openSUSE 11.0)</para>
-       </listitem>
-
-       <listitem>
-         <para>X11 guests: fixed xorg.conf modification for some older Xorg
-           releases (openSUSE 11.1)</para>
-       </listitem>
-
-      <listitem>
-        <para>Windows guests: fixed some VBoxService shutdown issues</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows guests: fixed VBoxVideo spinlock issues on NT4</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Guest Additions: fixed uninstallation issues of NT4</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed resolving of symlink target (bug #5631)</para>
-      </listitem>
-
-      <listitem>
-        <para>2D Video acceleration: delay loading of OpenGL dlls for Windows hosts to avoid
-            GUI crashes on misconfigured systems</para>
-      </listitem>
-
-      <listitem>
-        <para>2D Video acceleration: fixed issues with video picture not displayed on playback</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.1.0 (2009-11-30)</title>
-
-    <para>This version is a major update. The following major new features
-      were added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Teleportation (aka live migration); migrate a live VM session
-              from one host to another (see <xref linkend="teleporting" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>VM states can now be restored from arbitrary snapshots instead of only
-          the last one, and new snapshots can be taken from other snapshots as well
-          ("branched snapshots"; see <xref linkend="snapshots" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>2D video acceleration for Windows guests; use the host video
-              hardware for overlay stretching and color conversion
-              (see <xref linkend="guestadd-2d" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>More flexible storage attachments: CD/DVD drives can be attached to
-        arbitrary storage controllers, and there can be more than one such drive
-        (<xref linkend="storage" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>The network attachment type can be changed while a VM is
-          running</para>
-      </listitem>
-
-      <listitem>
-        <para>Complete rewrite of experimental USB support for OpenSolaris hosts
-          making use of the latest USB enhancements in Solaris Nevada 124 and higher</para>
-      </listitem>
-
-      <listitem>
-        <para>Significant performance improvements for PAE and AMD64 guests
-              (VT-x and AMD-V only; normal (non-nested) paging) </para>
-      </listitem>
-
-      <listitem>
-        <para>Experimental support for EFI (Extensible Firmware Interface;
-          see <xref linkend="efi" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>Support for paravirtualized network adapters (virtio-net;
-          see <xref linkend="nichardware" />)</para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>In addition, the following items were fixed and/or added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: guest SMP fixes for certain rare cases</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: snapshots include a screenshot</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: locked storage media can be unmounted by force</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: the log window grabbed all key events from other GUI windows
-          (bug #5291)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: allow to disable USB filters (bug #5426)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: improved memory slider in the VM settings</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: major performance improvement in VBO processing</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: added <emphasis>GL_EXT_framebuffer_object</emphasis>,
-          <emphasis>GL_EXT_compiled_vertex_array</emphasis> support</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed crashes in FarCry, SecondLife, Call of Duty,
-          Unreal Tournament, Eve Online (bugs #2801, #2791)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed graphics corruption in World of Warcraft (bug #2816)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed Final frame of Compiz animation not updated to the screen (bug #4653)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed incorrect rendering of non ARGB textures under compiz</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: support iSCSI targets with more than 2TiB capacity</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed occasional VRDP server crash (bug #5424)</para>
-      </listitem>
-
-      <listitem>
-        <para>Network: fixed the E1000 emulation for QNX
-          (and probably other) guests (bug #3206)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: added host resolver DNS proxy
-          (see <xref linkend="nat_host_resolver_proxy" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMDK: fixed incorrectly rejected big images split into 2G pieces
-         (bug #5523, #2787)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMDK: fixed compatibility issue with fixed or raw disk VMDK files
-          (bug #2723)</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: fixed incompatibility with Hyper-V</para>
-      </listitem>
-
-      <listitem>
-        <para>Support for Parallels version 2 disk image (HDD) files;
-          see <xref linkend="vdidetails" /></para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: create manifest files on export and verify the content of an
-          optional manifest file on import</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed memory setting during import (bug #4188)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mouse device: now five buttons are passed to the guest
-          (bug #3773)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxHeadless: fixed loss of saved state when VM fails to start</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxSDL: fixed crash during shutdown (Windows hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 based hosts: allow the user to specify their own scan code
-          layout (bug #2302)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: don't auto show the menu and dock in full screen
-          (bug #4866)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts (64 bit): don't interpret mouse wheel events as
-          left click (bug #5049)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed a VM abort during shutdown under
-          certain conditions</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: combined the kernel interface package into the VirtualBox main package</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: support for OpenSolaris Boomer architecture (with OSS audio backend)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: VBOXSVR is visible in Network folder (Windows guests, bug #4842)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: performance improvements (Windows guests, bug #1728)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows, Linux and Solaris Additions: added balloon tip notifier if VirtualBox host version
-          was updated and Additions are out of date</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris guests: fixed keyboard emulation (bug #1589)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed <emphasis>as_pagelock()</emphasis> failed errors affecting guest
-          properties (bug #5337)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: added automatic logon support for Windows Vista and Windows 7</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: improved file version lookup for guest OS information</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed runtime OS detection on Windows 7 for session information</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed crash in seamless mode (contributed by Huihong Luo)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: added support for uninstalling the Linux Guest
-          Additions (bug #4039)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux guest shared folders: allow mounting a shared folder if a
-           file of the same name as the folder exists in the current directory
-           (bug #928)</para>
-      </listitem>
-
-      <listitem>
-        <para>SDK: added object-oriented web service bindings for PHP5</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.0.12 (2009-11-10)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: reduced IO-APIC overhead for 32 bits Windows NT/2000/XP/2003
-             guests; requires 64 bits support (VT-x only; bug #4392) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed double timer interrupt delivery on old Linux kernels
-          using IO-APIC (caused guest time to run at double speed; bug #3135)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: re-initizalize VT-x and AMD-V after host suspend or hibernate; some BIOSes
-              forget this (Windows hosts only; bug #5421)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed loading of saved state when RAM preallocation is
-          enabled</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: ignore unknown shutdown codes instead of causing a guru
-          meditation (bug #5389)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: never start a VM on a single click into the selector window
-          (bug #2676)</para>
-      </listitem>
-
-      <listitem>
-        <para>Serial: reduce the probability of lost bytes if the host end
-          is connected to a raw file</para>
-      </listitem>
-
-      <listitem>
-        <para>VMDK: fixed handling of split image variants and fix a 3.0.10 regression
-        (bug #5355)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed occasional VRDP server crash</para>
-      </listitem>
-
-      <listitem>
-        <para>Network: even if the virtual network cable was disconnected, some
-          guests were able to send / receive packets (E1000; bug #5366)</para>
-      </listitem>
-
-      <listitem>
-        <para>Network: even if the virtual network cable was disconnected, the
-          PCNet card received some spurious packets which might confuse the
-          guest (bug #4496)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed changing case of file names (bug #2520)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed crash in seamless mode (contributed by Huihong Luo)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed writing to files opened in
-          <emphasis>O_APPEND</emphasis> mode (bug #3805)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed regression in Guest Additions driver which
-          among other things caused lost guest property updates and
-          periodic error messages being written to the system log</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.0.10 (2009-10-29)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: guest SMP stability fixes </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation with nested paging and SMP guests (bug #5222) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: changed VT-x/AMD-V usage to detect other active hypervisors;
-           necessary for e.g. Windows 7 XP compatibility mode
-           (Windows & Mac OS X hosts only; bug #4239) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: guru meditation during SCO OpenServer installation and reboot
-          (VT-x only; bug #5164)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed accessed bit handling in certain cases (bug #5248)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed VPID flushing (VT-x only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed broken nested paging for 64 bits guests on 32 bits hosts (AMD-V only; bug #5285)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed loading of old saved states/snapshots (bug #3984)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed memory leaks (bug #5084)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts (Snow Leopard): fixed redraw problem in a dual
-           screen setup (bug #4942)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: installer updates for Windows 7</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: out of memory handled incorrectly (bug #5241)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: the previous fix for #5077 broke the DVD host support
-          on Solaris 10 (VBox 3.0.8 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed module compilation against Linux 2.6.32rc4 and later</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: fixed possible guest OS kernel memory
-          exhaustion</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: fixed stability issues with SMP guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed color depth issue with low resolution hosts,
-          netbooks, etc. (bug #4935)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed NO_MORE_FILES error when saving to shared
-          folders (bug #4106)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed subdirectory creation on shared
-          folders (bug #4299)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: <emphasis>sendfile()</emphasis> returned
-          <emphasis>-EOVERFLOW</emphasis> when executed on a shared folder
-          (bug #2921)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed incorrect disk usage value (non-Windows
-          hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux installer: register the module sources at DKMS even if the
-          package provides proper modules for the current running kernel</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: removed invalid OpenGL assertion (bug #5158)</para>
-      </listitem>
-
-      <listitem>
-        <para>Network: fixed the Am79C973 PCNet emulation for QNX
-          (and probably other) guests (bug #3206)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMDK: fix handling of split image variants</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: do not delay updating the footer when expanding the image to prevent
-           image inconsistency </para>
-       </listitem>
-
-       <listitem>
-         <para>USB: stability fix for some USB 2.0 devices</para>
-       </listitem>
-
-       <listitem>
-         <para>GUI: added a search index to the .chm help file</para>
-       </listitem>
-
-       <listitem>
-         <para>GUI/Windows hosts: fixed CapsLock handling on French keyboards
-           (bug #2025)</para>
-       </listitem>
-
-       <listitem>
-         <para>Shared clipboard/X11 hosts: fixed a crash when clipboard
-           initialisation failed (bug #4987)</para>
-       </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.0.8 (2009-10-02)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed 64 bits guest on 32 bits host regression in 3.0.6
-          (VT-x only; bug #4947)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a recompiler triple fault guru meditation (VT-x &
-              AMD-V only; bug #5058) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed hang after guest state restore (AMD-V, 32 bits Windows
-              guest and IO-APIC enabled only; bug #5059) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed paging issue with OS/2 guests </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation in rare cases (2.0 regression;
-           software virtualization only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed release assertion during state restore when using the
-          Sound Blaster 16 emulation (bug #5042) </para>
-      </listitem>
-
-      <listitem>
-        <para>Security: fixed vulnerability that allowed to execute commands
-          with root privileges</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed runtime assertion in semaphore implementation
-          which was triggered under certain conditions (bug #616)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: change the default USB access mode on certain
-          distributions (bugs #3394 and #4291)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: on hardened Gentoo, the VBoxSVC daemon crashed by
-          opening the VM network settings (bug #3732)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts, Solaris hosts: pass the XAUTHORITY variable along the
-          DISPLAY variable when starting a VM from VBoxManage or from the VM
-          selector (bug #5063)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: use sysfs to enumerate host drives if hal is not
-           available</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed a bug which would hang the host sporadically as
-          interrupts were not re-enabled every time</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed a kernel panic with bridged and host-only
-          networking (bug #4775)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed incorrectly persistent CD/DVD-ROMs when
-          changing them (bug #5077)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11-based hosts: support additional function keys on Sun keyboards
-          (bug #4907)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts (Snow Leopard): fixed problem starting headless
-          VMs without a graphical session (bug #5002)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed problem listing host-only adapter names
-          with trailing garbage (attached VMs won't start)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: now work with Vista 64-bit Home editions (bug #3865)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed screen corruption with ZoomText Magnifier</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed NPGetUniversalName failure (bug #4853)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed Windows NT regression (bug #4946)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed VBoxService not running if no Shared Folders
-          are installed</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: implemented <emphasis>ftrunctate</emphasis>
-          (bug #4771)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: start VM even if configured VRDP port is in use</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: the PCnet network device stopped receiving under
-          rare conditions (bug #4870)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: implemented <computeroutput>controlvm vrdpport</computeroutput>
-          command</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: fixed issue with NetApp targets (bug #5072)</para>
-      </listitem>
-
-      <listitem>
-        <para>SCSI: add support for virtual disks larger than 2TB </para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed potential crash when unplugging USB2 devices
-          (bug #5089)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: IPSEC did not properly work with Linux guests (bug #4801)</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.0.6 (2009-09-09)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed IO-APIC overhead for 32 bits Windows NT, 2000, XP and 2003 guests
-          (AMD-V only; bug #4392)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a Guru meditation under certain circumstances when enabling
-          a disabled device (bug #4510)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed a Guru meditation when booting certain Arch Linux guests
-                   (software virtualization only; bug #2149)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed hangs with 64 bits Solaris & OpenSolaris
-          guests (bug #2258)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed decreasing <emphasis>rdtsc</emphasis> values
-          (AMD-V & VT-x only; bug #2869)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: small Solaris/OpenSolaris performance improvements (VT-x only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: <emphasis>cpuid</emphasis> change to correct reported virtual CPU ID in Linux </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: NetBSD 5.0.1 CD hangs during boot (VT-x only; bug #3947) </para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: worked around an issue that caused the host to hang (bug #4486)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed a rare host system deadlock when using bridged networking</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed a potential host system deadlock when CPUs were
-          onlined or offlined</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts installer: added missing dependency for UTF-8 package (bug #4899)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: don't crash on Linux PAE kernels < 2.6.11 (in particular
-          RHEL/CentOS 4); disable VT-x on Linux kernels < 2.6.13 (bug #1842)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux/Solaris hosts: correctly detect keyboards with fewer keys
-          than usual (bug #4799)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: prevent password dialogs in 32 bits Snow Leopard</para>
-      </listitem>
-
-      <listitem>
-        <para>Python WS: fixed issue with certain enumerations constants having
-          wrong values in Python web services bindings</para>
-      </listitem>
-
-      <listitem>
-        <para>Python API: several threading and platform issues fixed</para>
-      </listitem>
-
-      <listitem>
-        <para>Python shell: added <emphasis>exportVM</emphasis> command</para>
-      </listitem>
-
-      <listitem>
-        <para>Python shell: various improvements and bugfixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Python shell: corrected detection of home directory in remote case</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed XML comment handling that could lead to parser errors</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed a rare parsing problem with port numbers of USB device
-          filters in machine settings XML</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: restrict guest RAM size to 1.5 GB (32 bits Windows hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: fixed possible hang during guest reboot (bug #3792)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed rare crash when removing the last disk from the media manager (bug #4795)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed <computeroutput>guestproperty</computeroutput>
-          for Mac OS X hosts (bug #3806)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed setting guest properties with
-          <emphasis>--flags</emphasis> or <emphasis>-flags</emphasis></para>
-      </listitem>
-
-      <listitem>
-        <para>Web service: fixed a severe memory leak, at least on platforms using XPCOM</para>
-      </listitem>
-
-      <listitem>
-        <para>Serial: fixed host mode (Solaris, Linux and Mac OS X hosts; bug #4672)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: Remote USB Protocol version 3</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed hangs and BSODs introduced with 3.0.4 (bugs #4695, #4739, #4710)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed a bug which prevented Windows 7 from detecting more than one hard disk</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA/SCSI: fixed rare random guest crashes and hangs </para>
-      </listitem>
-
-      <listitem>
-        <para>SCSI: fixed problem with Fedora 11 refusing to boot after kernel update</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: fix logging out when the target has dropped the connection,
-          fix negotiation of parameters, fix command resend when the connection
-          was dropped, fix processing SCSI status for targets which do not use
-          phase collapse</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: fixed a bug that caused the OS/2 boot manager to fail
-          (2.1.0 regression; bug #3911)</para>
-      </listitem>
-
-      <listitem>
-        <para>PulseAudio: don't hang during VM termination if the connection
-          to the server was unexpectedly terminated (bug #3100)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mouse: fixed weird mouse behaviour with SMP (Solaris) guests (bug #4538)</para>
-      </listitem>
-
-      <listitem>
-        <para>HostOnly Network: fixed failure in
-          <emphasis>CreateHostOnlyNetworkInterface()</emphasis> on Linux (no GUID)</para>
-      </listitem>
-
-      <listitem>
-        <para>HostOnly Network: fixed wrong DHCP server startup while hostonly
-          interface bringup on Linux</para>
-      </listitem>
-
-      <listitem>
-        <para>HostOnly Network: fixed incorrect factory and default MAC address on Solaris</para>
-      </listitem>
-
-      <listitem>
-        <para>HostOnly Network: fixed the problem with listing host-only
-          interfaces on Mac OS X when all physical interfaces are down (bugs
-          #4698, #4790)</para>
-      </listitem>
-
-      <listitem>
-        <para>DHCP: fixed a bug in the DHCP server where it allocated one IP address
-          less than the configured range</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: fixed receiving of multicast packets</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: fixed up/down link notification after resuming a VM</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed Ethernet address corruptions (bug #4839)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed hangs, dropped packets and retransmission problems (bug #4343)</para>
-      </listitem>
-
-      <listitem>
-        <para>Bridged networking: fixed packet queue issue which might cause
-          DRIVER_POWER_STATE_FAILURE BSOD for Windows hosts (bug #4821)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed a bug in VBoxGINA which prevented selecting
-          the right domain when logging in the first time</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows host installer: should now also work on unicode systems
-          (like Korean, bug #3707)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows host installer: check for sufficient disk space</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared clipboard: do not send zero-terminated text to X11 guests
-           and hosts (bug #4712)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared clipboard: use a less CPU intensive way of checking for
-           new data on X11 guests and hosts (bug #4092)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: do not hide the host mouse cursor when restoring
-          a saved state (bug #4700)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows guests: fixed issues with the display of the mouse
-          cursor image (bugs #2603, #2660 and #4817)</para>
-      </listitem>
-
-      <listitem>
-        <para>SUSE 11 guests: fixed Guest Additions installation (bug #4506)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: support Fedora 12 Alpha guests (bugs #4731, #4733 and #4734)</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.0.4 (2009-08-04)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: 64 bits guest stability fixes (AMD-V only; bugs #3923 & #3666)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: SMP stability fixes (AMD-V only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: SMP performance improvement (esp. for Solaris guests)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: eliminated several bugs which could lead to a host reboot</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed OS/2 ACP2 boot floppy hang (VT-x only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: small performance improvement for OpenSolaris guests (AMD-V only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed CentOS/Xen reboot (software virtualization only; bug #4509)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed hangs / BSOD during Windows XP installation (bug #4342)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: mark the ports as non hotpluggable (bug #3920)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fix deadlocks and context/window tracking for
-          multithreaded applications (bug #3922)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fix memory leaks when terminating OpenGL guest applications</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fix crash in Call of Duty</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: using two or more NAT adapters in one VM was broken (3.0.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed network communication corruptions (bugs #4499, #4540, #4591, #4604)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed passive ftp access to host server (bug #4427)</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: fixed cloning to/from iSCSI disks</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed path separator handling for the OVF export on
-          Windows (bug #4354)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: the mini toolbar was only shown on the first host display
-          (bug #4654)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added a VM option to display the mini toolbar on top</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: don't crash when adding plus configuring host-only network
-          interfaces</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed selection of a drive root directory as a shared folder host path
-          in VirtualBox (Windows host only)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed a bug that may have rendered USB device filter settings
-          inactive (3.0.2 regression; bug #4668)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: report the Guest Additions version to the guest
-          properties (bug #3415)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fix creation of VMDK files giving raw partition access
-          (bug #1461)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: improved support for Snow Leopard </para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed problems leading to wrong colors or
-          transparency in host windows with some graphics drivers (bug #3095)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: hardware detection fallbacks if the hal service
-          fails to find any DVD drives</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux and Solaris hosts: Work around color handling problems in
-          Qt (bug #4353)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed memory leaks in host-only networking</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Installer: fixed incorrect netmask for Host-only interface (bug #4590)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Installer: added package dependency for Python and Python-devel (bug #4570)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 guests: prevent windows from being skipped in
-          seamless mode KDE guests (bugs #1681 and #3574)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 guests: fixed screen corruption in X11 guests when large
-           amounts of video RAM were allocated (bug #4430)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 guests: some fixes when switching  between host and
-          guest-drawn mouse pointers</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 guests: fixed an issue which caused seamless mode to stop
-          working as it should (the main issue listed in bug #2238)</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-  <sect1>
-    <title>Version 3.0.2 (2009-07-10)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed network regressions (guest hangs during network IO) (bug #4343)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: guest SMP performance improvements</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed hangs and poor performance with Kaspersky Internet Security
-          (VT-x/AMD-V only; bug #1778)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed crashes when executing certain Linux guests (software
-          virtualization only; bugs #2696 & #3868)</para>
-      </listitem>
-
-      <listitem>
-        <para>ACPI: fixed Windows 2000 kernel hangs with IO-APIC enabled (bug #4348)</para>
-      </listitem>
-
-      <listitem>
-        <para>APIC: fixed high idle load for certain Linux guests (3.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>BIOS: properly handle Ctrl-Alt-Del in real mode</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: fixed configuration parsing (bug #4236)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fix potential confusion when exporting networks</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: compatibility fix (bug #4452)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: accept ovf:/disk/ specifiers with a single slash in addition to ovf://disk/ (bug #4452) </para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed crashes under certain circumstances (bug #4330)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed dynamic linking on Solaris/OpenSolaris guests (bug #4399)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed incorrect context/window tracking for multithreaded apps</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed loading from saved state (bug #1595)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: host file permissions set to 0400 with Windows
-          guest (bug #4381)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 host and guest clipboard: fixed a number of issues, including bug #4380 and #4344</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 Additions: fixed some issues with seamless windows in X11 guests (bug #3727)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: added VBoxServiceNT for NT4 guests
-         (for time synchronization and guest properties)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed version lookup</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Installer: support Pardus Linux</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: workaround for buggy graphics drivers showing a
-          black VM window on recent distributions (bug #4335)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed typo in kernel module startup script (bug #4388)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: several installer fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed a preemption issue causing VMs to never start on Solaris 10 (bug #4328)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris guests: fixed mouse integration for OpenSolaris 2009.06 (bug #4365) </para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: fixed high CPU usage after resuming the host (bug #2978)</para>
-      </listitem>
-
-      <listitem>
-        <para>Fixed a settings file conversion bug which sometimes caused hardware acceleration to be enabled for virtual machines that had no explicit configuration in the XML</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 3.0.0 (2009-06-30)</title>
-
-    <para>This version is a major update. The following major new features
-      were added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Guest SMP with up to 32 virtual CPUs (VT-x and AMD-V only; see <xref linkend="settings-processor" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows guests: ability to use Direct3D 8/9 applications / games
-          (experimental; see <xref linkend="guestadd-3d" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>Support for OpenGL 2.0 for Windows, Linux and Solaris guests</para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>In addition, the following items were fixed and/or added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Solaris hosts: allow suspend/resume on the host when a VM is running (bug #3826)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: loosen the restriction for contiguous physical memory under
-          certain conditions</para>
-      </listitem>
-
-      <listitem>
-          <para>Mac OS X hosts: fixed guest PAE</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: kernel module compile fixes for 2.6.31 (bug #4264)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed occasional guru meditation when loading a saved state (VT-x only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: eliminated IO-APIC overhead with 32 bits guests (VT-x only, some Intel CPUs don't support
-              this feature (most do); bug #638)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed 64 bits CentOS guest hangs during early boot (AMD-V only; bug #3927)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: performance improvements for certain PAE guests (e.g. Linux 2.6.29+ kernels) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: some Windows guests detected a completely wrong CPU frequency (bug #2227)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed hanging and unkillable VM processes (bug #4040)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed random infrequent guest crashes due XMM state corruption (Win64 hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: performance improvements for network I/O (VT-x/AMD-V only)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added mini toolbar for full screen and seamless mode (Thanks to Huihong Luo)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: redesigned settings dialogs</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: allow to create/remove more than one host-only network adapters
-          (non Windows hosts)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: display estimated time for long running operations (e.g. OVF import/export)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed rare hangs when open the OVF import/export wizards (bug #4157)</para>
-      </listitem>
-
-      <listitem>
-          <para>3D support: fixed VM crashes for client applications using incorrect OpenGL states</para>
-      </listitem>
-
-      <listitem>
-          <para>3D support: fixed memory corruption when querying for supported texture compression formats</para>
-      </listitem>
-
-      <listitem>
-          <para>3D support: fixed incorrect rendering of glDrawRangeElements</para>
-      </listitem>
-
-      <listitem>
-          <para>3D support: fixed memory leak when using VBOs</para>
-      </listitem>
-
-      <listitem>
-          <para>3D support: fixed glew library detection</para>
-      </listitem>
-
-      <listitem>
-          <para>3D support: fixed random textures corruption</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: support Windows 7 RDP client</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed another problem with TX checksum offloading
-          with Linux kernels up to version 2.6.18</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed "open ports on virtual router 10.0.2.2 - 513, 514" (forum)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: allow to configure socket and internal parameters</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: allow to bind sockets to specific interface</para>
-      </listitem>
-
-      <listitem>
-        <para>PXE boot: significant performance increase (VT-x/AMD-V only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: properly write empty sectors when cloning of VHD images (bug #4080)</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: fixed crash when discarding snapshots of a VHD image</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: fixed access beyond the block bitmap which could lead to arbitrary crashes</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed incorrect partition table processing when
-          creating VMDK files giving raw partition access (bug #3510)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: support cloning to existing image file</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: several OVF 1.0 compatibility fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed exporting of disk images when multiple virtual machines are exported at once</para>
-      </listitem>
-
-      <listitem>
-        <para>Virtual mouse device: eliminated micro-movements of the
-          virtual mouse which were confusing some applications (bug #3782)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: sometimes a file was created using the wrong permissions
-          (2.2.0 regression; bug #3785)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: allow to change file attributes from Linux guests and use the
-          correct file mode when creating files</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: some content was incorrectly written under certain
-          conditions (bug #1187)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed incorrect file timestamps, when using Windows guest
-           on a Linux host (bug #3404)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 clipboard: fix duplicate end of lines (bug #4270)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 guests: a number of shared clipboard fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux guests: Guest Additions support for SUSE Linux
-        Enterprise Desktop 11</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux guests: new daemon vboxadd-service to handle time synchronization and
-         guest property lookup</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux guests: implemented guest properties (OS info, logged in users,
-          basic network information)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows host installer: VirtualBox Python API can now be installed automatically
-          (requires Python and Win32 Extensions installed)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: Support for high-speed isochronous endpoints has been
-            added. In addition, read-ahead buffering is performed for input
-            endpoints (currently Linux hosts only). This should allow additional
-            devices to work, notably webcams (bug #242)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed error handling for some USB dongles</para>
-      </listitem>
-
-      <listitem>
-          <para>Web service: fixed inability to handle NULL pointers for object arguments, which
-          are valid values for a lot of APIs, in both the raw and the object-oriented
-          web service</para>
-      </listitem>
-
-       <listitem>
-          <para>Web service: object-oriented bindings for JAX-WS did not exhibit interface
-          inheritance correctly, fixed</para>
-      </listitem>
-
-        <listitem>
-          <para>Web service: added support for IDisplay and IGuest interfaces, which were previously
-          unavailable</para>
-      </listitem>
-
-       <listitem>
-          <para>Registration dialog uses Sun Online accounts now</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 2.2.4 (2009-05-29)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Windows Installer: fixed a potential hang during
-          installation</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Installer: fixed several problems (bug #3892)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: make it work with Solaris build 114 or
-          later (bug #3981)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed a bug serial port character handling found during
-          loopback (bug #3120)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: adapted vboxdrv.sh to the latest changes in
-          <computeroutput>VBoxManage list runningvms</computeroutput>
-          (bug #4034)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: fixed a crash caused by host-only/bridged
-          networking</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: fixed access to host DVD with passthrough
-          disabled (bug #4077)</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: fixed problems with KDE 4 not recognizing mouse
-          clicks</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed incorrect 8-bit guest color depth in
-          Windows 7 guests</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: warn if VT-x/AMD-V could not be enabled for guests
-          that require this setting (bug #4055)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed occasional crash due to insufficient memory</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed hanging 64 bits Solaris guests</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: restore from a saved state occasionally failed
-          (bugs #3984 and #2742)</para>
-      </listitem>
-
-      <listitem>
-        <para>Clipboard: fixed a deadlock while shutting down the shared
-          clipboard on X11 hosts (bug #4020)</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed potential hang during import</para>
-      </listitem>
-
-      <listitem>
-        <para>OVF: fixed potential crashes during import/export on Win64 hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>modifyhd --compact</computeroutput>:
-          fixed bug which could lead to crashes and image corruption
-          (bug #3864)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>metrics collect</computeroutput>:
-          now flushes the output stream</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: made <computeroutput>VBoxManage internalcommands
-            sethduuid</computeroutput> work for .vhd files (bug #3443)</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: some .vhd files could not be cloned (bug #4080)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: improvement of TCP connection establishment (bug #2987)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed order of DNS servers in DHCP lease (bug #4091)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed DHCP lease for multiple name servers (bug #3692)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed a potential segfault if the host lost its connectivity
-          (bug #3964)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: deny access to parent directories on Windows
-          hosts (bug #4090)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: make rm/rmdir work with Solaris guests on Windows
-          hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed the problem with blocked receiving thread when
-          a broadcast packet arrives too early to be handled by uninitialized
-          e1000 adapter</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed the problem that caused host freezes/crashes
-          when using bridged mode with host's interface having RX checksum
-          offloading on (bug #3926 and related). Fixes problems with TX
-          offloading as well (bug #3870)</para>
-      </listitem>
-
-      <listitem>
-        <para>PXE boot: Added support for PRO/1000 MT Server adapter</para>
-      </listitem>
-
-      <listitem>
-        <para>Python bindings: fixed keyword conflict</para>
-      </listitem>
-
-      <listitem>
-        <para>SCSI: fixed occasional crashes on Win64</para>
-      </listitem>
-
-      <listitem>
-        <para>Serial: allow to redirect the serial port to a raw
-          file (bug #1023)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed a rare incorrect screen update</para>
-      </listitem>
-
-      <listitem>
-        <para>VMDK: fixed creating snapshots</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 2.2.2 (2009-04-27)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Host and guest clipboard: fixed a number of issues affecting
-          hosts and guests running the X window system</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: make sure the virtual mouse autodetection works
-          on first reboot after installing the Additions on X.Org server 1.5
-          and later</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: properly report process identity number of
-          running services</para>
-      </listitem>
-
-      <listitem>
-        <para>Guest Additions: clean up properly if the X Window server
-          terminates</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed installation path for OpenGL libraries
-          in some 64-bit guests (bug #3693)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed installation to work when X.Org is not
-          installed on the guest</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: fixed a bug that could panic the guest when
-          unmounting a busy shared folder</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed mouse pointer integration of some
-          Windows guests (2.2.0 regression; bug #3734)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed installation on Windows Server 2008 Core
-          (bug #2628)</para>
-      </listitem>
-
-      <listitem>
-        <para>Main: do not try to use older versions of D-Bus (Linux
-          hosts only, bug #3732)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed out-of-memory conditions on Windows hosts
-          (bug #3657)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed occasional hangs when attaching USB
-          devices during VM startup (2.2.0 regression; bugs #3787)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation related to memory management (software
-              virtualization only)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>Virtual disks: fix possible data corruption when writing to diff
-          images, incorrect detection of redundant writes</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: reworked network settings dialog</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: properly show the detailed settings dialog of NAT
-          networks (bug #3702)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: HostKey could not be changed (2.2.0 regression;
-          bug #3689)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed memory textfield size (Windows hosts only;
-          bug #3679)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed crash when selecting a shared folder path (Windows hosts only;
-          bugs #3694, #3751, #3756)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>modifyhd --compact</computeroutput>:
-          implemented again for VDI files, and now supports relative paths
-          (bug #2180, #2833)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>snapshot discard</computeroutput>:
-          made it work again (2.1.0 regression; bug #3714)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: on some Windows hosts, the guest didn't receive a DHCP
-          lease (bug #3655)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed release assertion during <emphasis>poll()</emphasis>
-          (bug #3667)</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed a deadlock caused by the PCnet network device
-          emulation (2.2.0 regression; bug #3676)</para>
-      </listitem>
-
-      <listitem>
-        <para>Clipboard: fixed random crashes (X11 hosts only, bug #3723)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed incorrect permissions for Solaris guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed wrong file sizes with Solaris guests</para>
-      </listitem>
-
-      <listitem>
-        <para>CBindings: fixed possible memory leak while releasing the IVirtualBox and ISession Objects</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed host-only network interface incompatibility with nwam/dhcpagent (bug #3754)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows installer: fixed several install and uninstall issues (bugs #3659, #3686, #1730, #3711, #3373, #3382, #3701, #3685, #3710)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: preliminary support for Snow Leopard</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 2.2.0 (2009-04-08)</title>
-
-    <para>This version is a major update. The following major new features
-      were added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>OVF (Open Virtualization Format) appliance import and export (see <xref linkend="ovf" />) </para>
-      </listitem>
-
-      <listitem>
-        <para>Host-only networking mode (see <xref linkend="network_hostonly" />) </para>
-      </listitem>
-
-      <listitem>
-        <para>Hypervisor optimizations with significant performance gains for high context switching rates</para>
-      </listitem>
-
-      <listitem>
-        <para>Raised the memory limit for VMs on 64-bit hosts to 16GB</para>
-      </listitem>
-
-      <listitem>
-        <para>VT-x/AMD-V are enabled by default for newly created virtual machines</para>
-      </listitem>
-
-      <listitem>
-        <para>USB (OHCI & EHCI) is enabled by default for newly created virtual machines (Qt GUI only)</para>
-      </listitem>
-
-      <listitem>
-        <para>Experimental USB support for OpenSolaris hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders for Solaris and OpenSolaris guests</para>
-      </listitem>
-
-      <listitem>
-        <para>OpenGL 3D acceleration for Linux and Solaris guests (see <xref linkend="guestadd-3d" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>Added C API in addition to C++, Java, Python and Web Services</para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>In addition, the following items were fixed and/or added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: FreeBSD guest related fix for V86 flags (bug #2342) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation when booting an AsteriskNow Linux VM (bug #2342) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed PGMPOOLKIND_FREE guru meditation (bugs #3356, #3431) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed Windows XP boot hang (guest PAE + nested paging only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: allow mixing of VT-x/AMD-V and software virtualization </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed extremely slow safe mode booting in e.g. Windows 2008 (VT-x/AMD-V only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: significant speedup of certain GRUB boot loaders (e.g. Solaris) (VT-x/AMD-V only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: real-mode IOPL fix for DOS guests (VT-x only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed VT-x detection with certain BIOSes that enable VT-x,
-             but don't set the lock bit in MSR_IA32_FEATURE_CONTROL </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed hibernation issues on Windows XP hosts (VT-x only; bug #1794) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: properly emulate <emphasis>RDMSR</emphasis> from the
-           TSC MSR, should fix some NetBSD guests</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: emulate <emphasis>RDPMC</emphasis>; fixes Windows guests crashes
-              when using the Kaspersky virus scanner (bug #1778) </para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed truncated downloads (FTP) (bug #3257)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: blocked UDP packets caused a crash (bug #3426)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: allow to configure the <emphasis>next server</emphasis>
-          and the <emphasis>boot file</emphasis> via VBoxManage (bug #2759)</para>
-      </listitem>
-
-      <listitem>
-        <para>IDE: fixed hard disk upgrade from XML-1.2 settings (bug #1518)</para>
-      </listitem>
-
-      <listitem>
-        <para>Hard disk: support more VMDK file variants (including fixed-size
-        ESX server images)</para>
-      </listitem>
-
-      <listitem>
-        <para>Hard disks: refuse to start the VM if a disk image is not
-          writable</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: further reduced host CPU utilization for OHCI and
-            EHCI; the "VBoxInternal/Devices/usb-ohci/0/Config/FrameRate" CFG key
-            is no longer necessary and no longer supported</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed BSOD on the host with certain USB devices
-          (Windows hosts only; bug #1654)</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: properly handle cable disconnects (bug #3421)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed hangs when VRDP server is enabled or disabled in runtime</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: respect umask settings on Linux, Mac OS X and Solaris
-        hosts when creating files</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 guests: prevented setting the locale in vboxmouse, as
-           this caused problems with Turkish locales (bug #3563)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 guests: show the guest mouse pointer at the right position
-          if the virtual desktop is larger than the guest resolution (bug
-          #2306)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed typo when detecting Xorg 1.6
-          (bug #3555)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris guests: added xpg4/xcu4 dependency to the Guest Additions
-          installer (bug #3524)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows guests: bind the VBoxMouse.sys filter driver to the
-          correct guest pointing device (bug #1324)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: fixed BSOD when starting a VM with enabled host
-          interface (bug #3414)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: do proper reference counting to prevent unloading
-          the vboxnetflt module as long as this code is in use (bug #3104)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: do not leave zombies of VBoxSysInfo.sh
-          (bug #3586)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux installers: fixes for Slackware, Arch Linux and Linux
-          from Scratch systems</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows installers: combined installer executable which contains
-        both (32- and 64-bit) architectures</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: less cryptic command-line error messages</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>list vms</computeroutput> commands now
-          default to compact format</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>controlvm dvdattach</computeroutput>
-          did not work if the image was attached before</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: allow creation of all supported disk image variants</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>showvminfo</computeroutput>:
-          don't spam the release log if the Guest Additions don't support
-          statistics information (bug #3457)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: big command line processing cleanup, the legacy
-        single-dash options are deprecated and will be removed in the
-        next major release, so switch to the new options now</para>
-      </listitem>
-
-      <listitem>
-        <para>Hard disks: improved immutable disk support to auto-reset diff file at
-        VM startup (related to bug #2772)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: enable the audio adapter by default for new VMs</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: warn if VT-x/AMD-V is not operational when starting a 64-bit guest</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: deactivate 64-bit guest support when the host CPU does not support VT-x/AMD-V</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: removed floppy icon from the status bar</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: show build revision in about dialog</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed sticky status bar text</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: improved error dialogs</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fail with an appropriate error message when trying to boot
-          a read-only disk image (bug #1745)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI/Mac OS X: fixed disabled close button</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI/Windows: re-enabled support for copy and paste (Windows hosts 2.0
-          regression; bug #2065)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: added OpenGL select/feedback support (bug #2920)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: close OpenGL subsystem for terminated guest applications (bug #3243)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed VM hangs when starting guests with 3D acceleration enabled (bug #3437)</para>
-      </listitem>
-
-      <listitem>
-        <para>PXE: fixed boot hangs when hardware virtualization is used (bug
-            #2536)</para>
-      </listitem>
-
-      <listitem>
-        <para>LsiLogic: fixed problems with Solaris guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Main API: close machine settings XML file when unregistering machine
-          (bug #3548)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 2.1.4 (2009-02-16)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Windows hosts: fixed host crashes/hangs on certain 32 bits Windows systems
-              when running Linux guests (bugs #1606, #2269, #2763)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: fixed network component BSOD issue (bugs #3168, #2916)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: fixed installation issues (bugs #2517, #1730, #3130)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed occasional kernel oopses (bug #2556)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed module dependency for shipped modules
-          (bug #3115)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: moved the udev rules for USB forward so that they
-          don't override existing system rules (bug #3143)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed the issue with guest not being able to
-          communicate with each other when attached via TAP interfaces
-          (bug #3215)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: give up probing for USB gracefully if DBus or hal
-          are not available (bug #3136)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed warnings in installer when SELinux was
-          disabled (bug #3098)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: VirtualBox sometimes failed to start if it had
-          been started using sudo previously (bug #3270)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed high CPU load while running many guests
-          in parallel</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed inability to start more than 128 VMs</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed performance regression for Windows guests (bug #3172) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: ignore CPU stepping when restoring a saved state/snapshot</para>
-      </listitem>
-
-      <listitem>
-        <para>REM: fixed inability to use gdb to debug programs in Linux guests with
-           software virtualization (bug #3245)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed dead key handling on Solaris hosts (bug #3256)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: in the shutdown dialog, disable the action <emphasis>send the
-            shutdown signal</emphasis> if the guest is currently not using ACPI</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: suppress additional key release events sent by X11 hosts
-          when keys are auto-repeated (bug #1296)</para>
-      </listitem>
-
-      <listitem>
-        <para>API: restore case insensitive OS type name lookup (bug #3087)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxHeadless: really don't start X11 services (clipboard service,
-          3D acceleration; Solaris & Darwin hosts only; bug #3199)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed occasional crashes when the guest is doing
-          traceroute (non-Windows hosts; bug #3200)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed crashes under high load (bug #3110)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed truncated downloads (Windows hosts only, bug #3257)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: don't intercept TFTP packages with a destination address
-          different from the builtin TFTP server (bug #3112)</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: several fixes for USB passthrough on Linux hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: reduced host CPU utilization if EHCI is active</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed VRDP server black screen after a client reconnect (bug #1989)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: modified rdesktop client (rdesktop-vrdp) now uses NumLock state
-          synchronization (bug #3253)</para>
-      </listitem>
-
-      <listitem>
-        <para>LsiLogic: make FreeBSD guests work (bug #3174)</para>
-      </listitem>
-
-      <listitem>
-        <para>ATA: fixed deadlock when pausing VM due to problems with the
-          virtual disk (e.g. disk full, iSCSI target unavailable)</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: fixed possible crash when pausing the VM</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: added missing GL_MAX_TEXTURE_COORDS_ARB (bug #3246)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed <emphasis>ERROR (e0000101)</emphasis>
-          error during installation (bug #1923)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed Windows Explorer hang when browsing shared folders
-          with 64 bit guests (bug #2225)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed guest screen distortions during a video mode change</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed the <emphasis>Network drive not connected</emphasis>
-          message for mapped shared folders drives after the guest startup (bug #3157)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed occasional file corruption when writing files
-          in <emphasis>O_APPEND</emphasis> mode to a shared folder (bug #2844)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: the mouse driver was not properly set up
-          on X.Org release candidates (bug #3212)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed installer to work with openSUSE 11.1
-          (bug #3213)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: disable dynamic resizing if the X server is
-          configured for fixed resolutions</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux/Solaris Additions: handle virtual resolutions properly which are
-          larger than the actual guest resolution (bug #3096)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 2.1.2 (2009-01-21)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>USB: Linux host support fixes (bug #3136)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation for PAE guests on non-PAE hosts (AMD-V)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation on Mac OS X hosts when using VT-x</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: allow running up to 1023 VMs on 64-bit hosts (used to be 127)</para>
-      </listitem>
-
-       <listitem>
-        <para>VMM: several FreeBSD guest related fixes (bugs #2342, #2341, #2761) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation when installing Suse Enterprise Server 10U2 (VT-x only; bug #3039)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation when booting Novell NetWare 4.11 (VT-x only; bug #2898) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed VERR_ADDRESS_TOO_BIG error on some Mac OS X systems when starting a VM </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: clear MSR_K6_EFER_SVME after probing for AMD-V (bug #3058) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation during Windows 7 boot with more than 2 GB guest RAM (VT-x, nested paging only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed hang during OS/2 MCP2 boot (AMD-V and VT-x only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed loop during OpenBSD 4.0 boot (VT-x only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed random crashes related to FPU/XMM with 64 bits guests on 32 bits hosts </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed occasional XMM state corruption with 64 bits guests </para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: raised the RAM limit for new VMs to 75% of the host memory</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: added Windows 7 as operating system type</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxSDL: fixed <computeroutput>-fixed fixedmode</computeroutput> parameter
-          (bug #3067)</para>
-      </listitem>
-
-      <listitem>
-        <para>Clipboard: stability fixes (Linux and Solaris hosts only,
-          bug #2675 and #3003)</para>
-      </listitem>
-
-      <listitem>
-        <para>3D support: fixed VM crashes for certain guest applications
-          (bugs #2781, #2797, #2972, #3089)</para>
-      </listitem>
-
-      <listitem>
-        <para>LsiLogic: improved support for Windows guests (still experimental)</para>
-      </listitem>
-
-      <listitem>
-        <para>VGA: fixed a 2.1.0 regression where guest screen resize
-          events were not properly handled (bug #2783)</para>
-      </listitem>
-
-      <listitem>
-        <para>VGA: significant performance improvements when using VT-x/AMD-V
-        on Mac OS X hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>VGA: better handling for VRAM offset changes (fixes GRUB2 and Dos DOOM display issues)</para>
-      </listitem>
-
-      <listitem>
-        <para>VGA: custom VESA modes with invalid widths are now rounded up
-          to correct ones (bug #2895)</para>
-      </listitem>
-
-      <listitem>
-        <para>IDE: fixed ATAPI passthrough support (Linux hosts only; bug #2795)</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed kernel panics due to NULL pointer dereference
-          in Linux kernels < 2.6.20 (Linux hosts only; bug #2827)</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed intermittent BSODs when using the new host
-          interface (Windows hosts only; bugs #2832, #2937, #2929)</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed several issues with displaying hostif NICs
-          in the GUI (Windows hosts only; bugs 2814, #2842)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed the issue with displaying hostif NICs
-          without assigned IP addresses (Linux hosts only; bug #2780)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed the issue with sent packets coming back to
-          internal network when using hostif (Linux hosts only; bug #3056).
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed port forwarding (Windows hosts only; bug #2808)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed booting from the builtin TFTP server (bug #1959)</para>
-      </listitem>
-
-      <listitem>
-        <para>NAT: fixed occasional crashes (bug #2709)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: vendor product data (VPD) is now configurable</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: raw disk partitions were not recognized
-          (2.1.0 regression; Windows host only, bug #2778)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed timeouts in the guest when using raw VMDK files
-          (Linux host only, bug #2796)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: huge speed up during certain I/O operations like
-          formatting a drive</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA/IDE: fixed possible crash/errors during VM shutdown</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed loading of <computeroutput>libpam.so.1</computeroutput>
-          from the host (Solaris hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed RDP client disconnects</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed VRDP server misbehavior after a broken client connection</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>showvminfo</computeroutput>:
-          fixed assertion for running VMs (bug #2773)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>convertfromraw</computeroutput>: added
-          parameter checking and made it default to creating VDI files;
-          fixed and documented format parameter (bug #2776)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>clonehd</computeroutput>: fixed
-          garbled output image when creating VDI files (bug #2813)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage <computeroutput>guestproperty</computeroutput>: fixed
-          property enumeration (incorrect parameters/exception)</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: fixed error when attaching certain container files
-        (bug #2768)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: added support for serial ports (bug #1849)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fix for Japanese keyboards (bug #2847)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: 32-bit and 64-bit versions now available as a
-          single, unified package</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: don't depend on <computeroutput>libcap1</computeroutput>
-          anymore (bug #2859)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: kernel module compile fixes for 2.6.29-rc1</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: don't drop any capability if the VM was started
-          by root (2.1.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: save the state of running or paused VMs when the
-          host machine's battery reaches critical level</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: improved window resizing of the VM window</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: added GUI option to disable the dock icon realtime
-          preview in the GUI to decrease the host CPU load when the guest is
-          doing 3D</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: polished realtime preview dock icon</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed guest property and logging OS type
-          detection for Windows 2008 and Windows 7 Beta</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: added support for Windows 7 Beta (bugs #2995, #3015)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed Windows 2000 guest freeze when accessing
-          files on shared folders (bug #2764)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed CTRL-ALT-DEL handling when using VBoxGINA</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions Installer: added /extract switch to only extract
-          (not install) the files to a directory (can be specified with /D=path)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux installer and Additions: added support for the Linux
-          From Scratch distribution (bug #1587) and recent Gentoo versions
-          (bug #2938)</para>
-      </listitem>
-
-      <listitem>
-        <para>Additions: added experimental support for X.Org Server 1.6 RC on
-          Linux guests</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed bug which prevented to properly set
-          <computeroutput>fmode</computeroutput> on mapped shared folders
-          (bug #1776)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed appending of files on shared folders
-          (bug #1612)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: ignore <computeroutput>noauto</computeroutput>
-          option when mounting a shared folder (bug #2498)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed a driver issue preventing X11 from
-          compiling keymaps (bug #2793 and #2905)</para>
-      </listitem>
-
-      <listitem>
-        <para>X11 Additions: workaround in the mouse driver for a server
-          crash when the driver is loaded manually (bug #2397)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 2.1.0 (2008-12-17)</title>
-
-    <para>This version is a major update. The following major new features
-      were added:</para>
-
-    <itemizedlist>
-      <listitem>
-         <para>Support for hardware virtualization (VT-x and AMD-V) on Mac OS X hosts</para>
-      </listitem>
-
-      <listitem>
-        <para>Support for 64-bit guests on 32-bit host operating systems (experimental; see <xref linkend="intro-64bitguests" />)</para>
-      </listitem>
-
-      <listitem>
-       <para>Added support for Intel Nehalem virtualization enhancements (EPT and VPID; see <xref linkend="hwvirt" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>Experimental 3D acceleration via OpenGL (see <xref linkend="guestadd-3d" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>Experimental LsiLogic and BusLogic SCSI controllers (see <xref linkend="harddiskcontrollers" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>Full VMDK/VHD support including snapshots (see <xref linkend="vdidetails" />)</para>
-      </listitem>
-
-      <listitem>
-        <para>New NAT engine with significantly better performance, reliability and ICMP echo
-          (ping) support (bugs #1046, #2438, #2223, #1247)</para>
-      </listitem>
-
-      <listitem>
-        <para>New Host Interface Networking implementations for Windows and
-          Linux hosts with easier setup (replaces TUN/TAP on Linux and manual bridging on Windows)</para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>In addition, the following items were fixed and/or added:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>VMM: significant performance improvements for VT-x (real mode execution) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: support for hardware breakpoints (VT-x and AMD-V only; bug #477)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: VGA performance improvements for VT-x and AMD-V </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: Solaris and OpenSolaris guest performance improvements for AMD-V (Barcelona family CPUs only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation while running the Dr. Web virus scanner
-          (software virtualization only; bug #1439)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: deactivate VT-x and AMD-V when the host machine goes into suspend mode; reactivate
-          when the host machine resumes (Windows, Mac OS X & Linux hosts; bug #1660)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guest hangs when restoring VT-x or AMD-V saved states/snapshots </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation when executing a one byte debug
-          instruction (VT-x only; bug #2617)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed guru meditation for PAE guests on non-PAE hosts (VT-x) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: disallow mixing of software and hardware virtualization execution in general (bug #2404)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed black screen when booting OS/2 1.x (AMD-V only) </para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: pause running VMs when the host machine goes into suspend mode (Windows & Mac OS X hosts)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: resume previously paused VMs when the host machine resumes after suspend (Windows & Mac OS X hosts)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: save the state of running or paused VMs when the host machine's
-          battery reaches critical level (Windows hosts)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: properly restore the position of the selector window when running on
-          the compiz window manager</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: properly restore the VM in seamless mode (2.0 regression)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: warn user about non optimal memory settings</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: structure operating system list according to family and version for improved usability</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: predefined settings for QNX guests</para>
-      </listitem>
-
-      <listitem>
-        <para>IDE: improved ATAPI passthrough support</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: added support for up to 8 Ethernet adapters per VM</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed issue where a VM could lose connectivity after a reboot</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: allow snapshot/diff creation using local VDI file</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: improved interoperability with iSCSI targets</para>
-      </listitem>
-
-      <listitem>
-        <para>Graphics: fixed handling of a guest video memory which is not a power
-          of two (bug #2724)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed bug which prevented setting up the serial port
-        for direct device access</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: added support for VMDK and VHD image creation</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: added support for image conversion (VDI/VMDK/VHD/RAW)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: added IPv6 support between host and guest when using host interface networking</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: added ACPI host power status reporting</para>
-      </listitem>
-
-      <listitem>
-        <para>API: redesigned storage model with better generalization</para>
-      </listitem>
-
-      <listitem>
-        <para>API: allow attaching a hard disk to more than one VM at a time</para>
-      </listitem>
-
-      <listitem>
-        <para>API: added methods to return network configuration information of the host system</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: performance and stability fixes for Windows guests (Microsoft Office Applications)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 2.0.8 (2009-03-10)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed guest hangs when restoring VT-x or AMD-V saved
-          states/snapshots</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed memory allocation issues which can cause VM start
-          failures with VERR_PGM_MAPPING_CONFLICT error</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed host crashes/hangs on certain 32 bits Windows systems
-          when running Linux guests (bugs #1606, #2269, #2763)</para>
-      </listitem>
-
-      <listitem>
-        <para>XPCOM/Main: fixed synchronization bug caused by SYSV semaphore key
-          collisions</para>
-      </listitem>
-
-      <listitem>
-        <para>ATA: fixed deadlock when pausing VM due to problems with the
-          virtual disk (e.g. disk full, iSCSI target unavailable)</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: fixed possible crash when pausing the VM</para>
-      </listitem>
-
-      <listitem>
-        <para>iSCSI: fix PDU validity checking and detect final PDU
-          reliably</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxHeadless: really don't start X11 services (clipboard service,
-          3D acceleration; Solaris & Darwin hosts only; bug #3199)</para>
-      </listitem>
-
-      <listitem>
-        <para>Networking: fixed issue where a VM could lose connectivity after
-          a reboot</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed occasional kernel oopses (bug #2556)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed high CPU load while running many guests
-          in parallel</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed inability to start more than 128 VMs</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris/Web services: fixed SMF script to set home directory
-          correctly</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed occasional file corruption when writing files
-          in <emphasis>O_APPEND</emphasis> mode to a shared folder (bug #2844)</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 2.0.6 (2008-11-21)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed Guru meditation when running 64 bits Windows guests
-          (bug #2220)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed Solaris 10U6 boot hangs (VT-x and AMD-V) bug #2565)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed Solaris 10U6 reboot hangs (AMD-V only; bug #2565)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: the host key was sometimes not properly displayed (Windows
-          hosts only, bug #1996)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: the keyboard focus was lost after minimizing and restoring
-          the VM window via the Windows taskbar (bugs #784)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: properly show SATA disks when showing the VM information
-          (bug #2624)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed access if the buffer size is not sector-aligned
-          (bug #2024)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: improved performance</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed snapshot function with ports>1 (bug #2510)</para>
-      </listitem>
-
-      <listitem>
-        <para>E1000: fixed crash under rare circumstances</para>
-      </listitem>
-
-      <listitem>
-        <para>USB: fixed support for iPhone and Nokia devices (Linux host:
-          bugs #470 & #491)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows host installer: added proper handling of open VirtualBox
-          applications when updating the installation</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows host installer: fixed default installation directory on
-          64-bit on new installations (bug #2501)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux/Solaris/Darwin hosts: verify permissions
-          in <computeroutput>/tmp/vbox-$USER-ipc</computeroutput></para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed assertion on high network load (AMD64 hosts,
-          fix for Linux distributions with glibc 2.6 and newer (bug #616)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: don't crash during shutdown with serial ports
-          connected to a host device</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed incompatibility between IPSEC and host interface networking</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed a rare race condition while powering off VMs with host interface networking</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed VBoxSDL on Solaris 10 by shipping the required SDL library (bug #2475)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed logged in users reporting via guest properties
-          when using native RDP connections</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed Vista crashes when accessing shared
-          folders under certain circumstances (bug #2461)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed shared folders access with MS-Office
-          (bug #2591)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed compilation of vboxvfs.ko for 64-bit
-          guests (bug #2550)</para>
-      </listitem>
-
-      <listitem>
-        <para>SDK: added JAX-WS port caching to speedup connections</para>
-      </listitem>
-
-    </itemizedlist>
-  </sect1>
-
-  <sect1>
-    <title>Version 2.0.4 (2008-10-24)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>VMM: better error reporting for VT-x failures</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: don't overflow the release log with PATM messages (bug #1775)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed save state restore in real mode (software virtualization only)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: work around a Qt bug on Mac OS X (bug #2321)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: properly install the Qt4 accessible plugin (bug #629)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: error message when starting a VM with a VMDK connected to a SATA port (bug #2182)</para>
-      </listitem>
-
-      <listitem>
-        <para>SATA: fixed Guru mediation when booting OpenSolaris/64; most
-          likely applies to other guests as well (bug #2292)</para>
-      </listitem>
-
-      <listitem>
-        <para>Network: don't crash when changing the adapter link state if no
-          host driver is attached (bug #2333)</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: fixed bug which prevents booting from VHD images bigger than 4GB (bug #2085)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed a repaint problem when the guest resolution was not
-          equal to the client resolution</para>
-      </listitem>
-
-      <listitem>
-        <para>Clipboard: don't crash when host service initialization takes
-          longer than expected (Linux hosts only; bug #2001)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: VBoxSVC.exe crash (bug #2212)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: VBoxSVC.exe memory leak due to a Windows WMI memory leak (Vista only) (bug #2242)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows hosts: VBoxSVC.exe delays GUI startup</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: handle jiffies counter overflow (VM stuck after 300
-          seconds of host uptime; bug #2247)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed host or guest side networking going stale while using host interface
-           networking (bug #2474)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: added support for using unplumbed network interfaces and Crossbow Virtual
-          Network Interfaces (VNICs) with host interface networking</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: reworked threading model improves performance for host interface networking</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed crash when accessing deep directory structures in a shared folder</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: improved shared folder name resolving (bug #1728)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed Windows 2000 shutdown crash (bug #2254)</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: fixed error code for
-          <computeroutput>MoveFile()</computeroutput> if the target exists (bug #2350)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed <computeroutput>seek()</computeroutput>
-          for files bigger than 2GB (bug #2379)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: support Ubuntu 8.10</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: clipboard fixes (bug #2015)</para>
-      </listitem>
-
-      <listitem>
-        <para>Web services: improved documentation and fixed example (bug #1642)</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 2.0.2 (2008-09-12)</title>
-
-    <para>This is a maintenance release. The following items were fixed and/or
-      added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: fixed inability to run more than one VM in parallel (AMD-V on
-              CPUs with erratum 170 only; bug #2167)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: VT-x stability fixes (bug #2179 and others)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed Linux 2.6.26+ kernel crashes (used by Ubuntu 8.10 Alpha,
-          Fedora 10 Alpha; bug #1875) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed 64 bits Linux 2.6.26 kernel crashes (Debian) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed Vista (32 bits) guest crash during boot when PAE and
-          NX are enabled (applied to 64 bits hosts with VT-x enabled only) </para>
-      </listitem>
-
-      <listitem>
-        <para>VMM: fixed OS/2 guest crashes during boot (AMD-V; bug #2132) </para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed crash when trying to release an inaccessible image in
-          the virtual disk manager</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed invalid error message for a changed snapshot path even
-          if that path wasn't changed (bug #2064)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed crash when creating a new hard disk image (bug #2060)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed crash when adding a hard disk in the VM settings (bug #2081)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed a bug where VirtualBox isn't working with the new
-          QGtkStyle plugin (bug #2066)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed VM close dialog in seamless mode (Mac OS X hosts only;
-          bug #2067)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: fixed standard menu entries for NLS versions (Mac OS X hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: disable the VT-x/AMD-V setting when it's not supported by
-          the CPU (or on Mac OS X hosts) </para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed crash during
-          <computeroutput>internalcommands createrawvmdk</computeroutput>
-          (bug #2184)</para>
-      </listitem>
-
-      <listitem>
-        <para>VBoxManage: fixed output of
-          <computeroutput>snapshot showvminfo</computeroutput> (bug #698)</para>
-      </listitem>
-
-        <listitem>
-          <para>Guest properties: added information about guest network interfaces
-            (Windows guests only)</para>
-        </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed regression that caused Windows guest crashes</para>
-      </listitem>
-
-      <listitem>
-        <para>API: fixed number of installed CPUs (Solaris hosts only)</para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: allow a client to reconnect to an existing session on the VRDP server by dropping the existing connection
-          (configurable and disabled by default; only relevant when multiconnection mode is disabled) </para>
-      </listitem>
-
-      <listitem>
-        <para>VRDP: fixed an image repaint problem</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: fixed bug in vboxdrv.ko that could corrupt kernel
-            memory and panic the kernel (bug #2078)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>Linux hosts: compile fixes for kernel module on Linux 2.6.27</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: added Python support</para>
-      </listitem>
-
-      <listitem>
-        <para>Additions: fixed a possible hang in HGCM communication after
-          a VM reboot</para>
-      </listitem>
-
-      <listitem>
-        <para>Windows Additions: added support for Windows XP 64 bits (bug #2117)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: deactivate dynamic resizing on Linux guests with
-        buggy X servers</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: support Ubuntu 8.10 guests and Fedora 9 guests
-         (dynamic resizing disabled for the latter)</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: added installer check for the system architecture</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: fixed Xorg modules path for some Linux distributions
-          (bug #2128)</para>
-      </listitem>
-
-      <listitem>
-        <para>VMDK: be more liberal with ambiguous parts of the format
-        specification and accept more format variants (bug #2062)</para>
-      </listitem>
-
-      <listitem>
-        <para>VHD: fixed a bug in the VHD backend which resulted in reading
-          the wrong data (bug #2085)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed kernel panic on certain machines when
-          starting VMs with host interface networking (bug #2183)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed inability to access NFS shares on the
-          host when host interface networking was enabled</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: installer now detects and reports when
-          installing under the wrong architecture</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris hosts: fixed security hardening that prevented
-          starting VMs from non-global zones even as root (bug #1948)</para>
-      </listitem>
-
-      <listitem>
-        <para>Solaris Additions: combined the 32 bit and 64 bit Additions
-          installer into a single package</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X hosts: experimental support for attaching a real serial
-          port to the guest
-        </para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
-
-  <sect1>
-    <title>Version 2.0.0 (2008-09-04)</title>
-
-    <para>This version is a major update. The following major new features
-      were added:<itemizedlist>
-
-        <listitem>
-          <para>64 bits guest support (64 bits host only) </para>
-        </listitem>
-
-        <listitem>
-          <para>New native Leopard user interface on Mac OS X hosts</para>
-        </listitem>
-
-        <listitem>
-          <para>The GUI was converted from Qt3 to Qt4 with many visual improvements</para>
-        </listitem>
-
-        <listitem>
-          <para>New-version notifier</para>
-        </listitem>
-
-        <listitem>
-          <para>Guest property information interface</para>
-        </listitem>
-
-        <listitem>
-          <para>Host Interface Networking on Mac OS X hosts</para>
-        </listitem>
-
-        <listitem>
-          <para>New Host Interface Networking on Solaris hosts</para>
-        </listitem>
-
-        <listitem>
-          <para>Support for Nested Paging on modern AMD CPUs (major performance gain)</para>
-        </listitem>
-
-        <listitem>
-          <para>Framework for collecting performance and resource usage data (metrics)</para>
-        </listitem>
-
-        <listitem>
-          <para>Added SATA asynchronous IO (NCQ: Native Command Queuing) when accessing raw
-          disks/partitions (major performance gain)</para>
-        </listitem>
-
-       <listitem>
-          <para>Clipboard integration for OS/2 Guests</para>
-        </listitem>
-
-        <listitem>
-          <para>Created separate SDK component featuring a new Python programming interface on Linux and Solaris hosts</para>
-        </listitem>
-
-        <listitem>
-          <para>Support for VHD disk images</para>
-        </listitem>
-
-    </itemizedlist></para>
-
-    <para>In addition, the following items were fixed and/or added:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>VMM: VT-x fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>AHCI: improved performance</para>
-      </listitem>
-
-      <listitem>
-        <para>GUI: keyboard fixes</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux installer: properly uninstall the package even if
-          unregistering the DKMS module fails</para>
-      </listitem>
-
-      <listitem>
-        <para>Linux Additions: the guest screen resolution is properly
-          restored</para>
-      </listitem>
-
-      <listitem>
-        <para>Network: added support for jumbo frames (> 1536 bytes)</para>
-      </listitem>
-
-      <listitem>
-        <para>Shared Folders: fixed guest crash with Windows Media Player 11</para>
-      </listitem>
-
-      <listitem>
-        <para>Mac OS X: Ctrl+Left mouse click doesn't simulate a right mouse click in the guest anymore. Use Hostkey+Left for a right mouse click emulation. (bug #1766)</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect1>
+</chapter>
 
diff --git a/doc/manual/xidl2docbook.xsl b/doc/manual/xidl2docbook.xsl
index 839b19d..bcf1929 100644
--- a/doc/manual/xidl2docbook.xsl
+++ b/doc/manual/xidl2docbook.xsl
@@ -5,7 +5,7 @@
         XSLT stylesheet that generates docbook from
         VirtualBox.xidl.
 
-    Copyright (C) 2006-2012 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
@@ -30,6 +30,14 @@
 
   <xsl:strip-space elements="*"/>
 
+ <!-- - - - - - - - - - - - - - - - - - - - - - -
+  Keys for more efficiently looking up of types.
+ - - - - - - - - - - - - - - - - - - - - - - -->
+
+<xsl:key name="G_keyEnumsByName"        match="//enum[@name]"       use="@name"/>
+<xsl:key name="G_keyInterfacesByName"   match="//interface[@name]"  use="@name"/>
+<xsl:key name="G_keyResultsByName"      match="//result[@name]"     use="@name"/>
+
 <!-- - - - - - - - - - - - - - - - - - - - - - -
   global XSLT variables
  - - - - - - - - - - - - - - - - - - - - - - -->
@@ -52,23 +60,21 @@
   <xsl:choose>
     <xsl:when test="$type">
       <xsl:choose>
-        <xsl:when test="//interface[@name=$type]">
-          <xref>
-            <xsl:attribute name="apiref">yes</xsl:attribute>
+        <xsl:when test="count(key('G_keyInterfacesByName',$type)) > 0">
+          <link>
             <xsl:attribute name="linkend">
               <xsl:value-of select="translate($type, ':', '_')" />
             </xsl:attribute>
             <xsl:value-of select="$type" />
-          </xref>
+          </link>
         </xsl:when>
-        <xsl:when test="//enum[@name=$type]">
-          <xref>
-            <xsl:attribute name="apiref">yes</xsl:attribute>
+        <xsl:when test="count(key('G_keyEnumsByName',$type)) > 0">
+          <link>
             <xsl:attribute name="linkend">
               <xsl:value-of select="translate($type, ':', '_')" />
             </xsl:attribute>
             <xsl:value-of select="$type" />
-          </xref>
+          </link>
         </xsl:when>
         <xsl:otherwise>
           <xsl:value-of select="$type" />
@@ -95,6 +101,7 @@
  - - - - - - - - - - - - - - - - - - - - - - -->
 
 <xsl:template match="/idl">
+ <book> <!-- Need a single top-level element for xi:include, we'll skip it using xpointer. -->
   <chapter id="sdkref_classes">
     <title>Classes (interfaces)</title>
     <xsl:for-each select="//interface">
@@ -121,29 +128,28 @@
 
           <xsl:choose>
             <xsl:when test="$wsmap='suppress'">
-              <note>
+              <para><note><para>
                 This interface is not supported in the web service.
-              </note>
+              </para></note></para>
             </xsl:when>
             <xsl:when test="$wsmap='struct'">
-              <note>With the web service, this interface is mapped to a structure. Attributes that return this interface will not return an object, but a complete structure
-              containing the attributes listed below as structure members.</note>
+              <para><note><para>With the web service, this interface is mapped to a structure. Attributes that return this interface will not return an object, but a complete structure
+              containing the attributes listed below as structure members.</para></note></para>
             </xsl:when>
             <xsl:when test="$wsonly='yes'">
-              <note>This interface is supported in the web service only, not in COM/XPCOM.</note>
+              <para><note><para>This interface is supported in the web service only, not in COM/XPCOM.</para></note></para>
             </xsl:when>
           </xsl:choose>
 
           <xsl:if test="$reportExtends">
-            <note>
+            <para><note><para>
                 This interface extends
-                <xref>
-                  <xsl:attribute name="apiref">yes</xsl:attribute>
+                <link>
                   <xsl:attribute name="linkend"><xsl:value-of select="$extends" /></xsl:attribute>
                   <xsl:value-of select="$extends" />
-                </xref>
+                </link>
                 and therefore supports all its methods and attributes as well.
-            </note>
+            </para></note></para>
           </xsl:if>
 
           <xsl:apply-templates select="desc" />
@@ -180,9 +186,9 @@
                     </xsl:if>
                   </programlisting>
                   <xsl:if test="( ($attrtype=($G_setSuppressedInterfaces/@name)) )">
-                    <note>
+                    <para><note><para>
                       This attribute is not supported in the web service.
-                    </note>
+                    </para></note></para>
                   </xsl:if>
                   <xsl:apply-templates select="desc" />
                 </sect3>
@@ -208,9 +214,9 @@
                   </title>
                   <xsl:if test="   (param[@type=($G_setSuppressedInterfaces/@name)])
                                 or (param[@mod='ptr'])" >
-                    <note>
+                    <para><note><para>
                       This method is not supported in the web service.
-                    </note>
+                    </para></note></para>
                   </xsl:if>
                   <!-- make a set of all parameters with in and out direction -->
                   <xsl:variable name="paramsinout" select="param[@dir='in' or @dir='out']" />
@@ -255,9 +261,10 @@
                             <xsl:value-of select="@name" />
                           </glossterm>
                           <glossdef>
-                            <para>
-                              <xsl:apply-templates select="desc" />
-                            </para>
+                            <xsl:if test="not(desc)">
+                              <para/>
+                            </xsl:if>
+                            <xsl:apply-templates select="desc" />
                           </glossdef>
                         </glossentry>
                       </xsl:for-each>
@@ -319,6 +326,9 @@
                 <xsl:value-of select="@name" />
               </glossterm>
               <glossdef>
+                <xsl:if test="not(desc)">
+                  <para/>
+                </xsl:if>
                 <xsl:apply-templates select="desc" />
               </glossdef>
             </glossentry>
@@ -327,7 +337,7 @@
       </sect1>
     </xsl:for-each>
   </chapter>
-
+ </book>
 </xsl:template>
 
 <!-- - - - - - - - - - - - - - - - - - - - - - -
@@ -397,7 +407,11 @@
  - - - - - - - - - - - - - - - - - - - - - - -->
 
 <xsl:template match="desc">
+  <!-- todo: wrapping the entire content in a single para is actually not
+       entirely correct, as it contains empty lines denoting new paragraphs -->
+  <para>
   <xsl:apply-templates />
+  </para>
 </xsl:template>
 
 <xsl:template name="getCurrentInterface">
@@ -410,8 +424,7 @@
 
 <!-- <link to="DeviceType::HardDisk"/> -->
 <xsl:template match="link">
-  <xref>
-    <xsl:attribute name="apiref">yes</xsl:attribute>
+  <link>
     <xsl:variable name="tmp" select="@to" />
     <xsl:variable name="enumNameFromCombinedName">
         <xsl:value-of select="substring-before($tmp, '_')" />
@@ -420,11 +433,11 @@
         <xsl:value-of select="substring-after($tmp, '_')" />
     </xsl:variable>
     <xsl:choose>
-      <xsl:when test="//interface[@name=$tmp] or //enum[@name=$tmp]"><!-- link to interface only -->
+      <xsl:when test="count(key('G_keyInterfacesByName',$tmp)) > 0 or count(key('G_keyEnumsByName',$tmp)) > 0"><!-- link to interface only -->
         <xsl:attribute name="linkend"><xsl:value-of select="@to" /></xsl:attribute>
         <xsl:value-of select="$tmp" />
       </xsl:when>
-      <xsl:when test="//enum[@name=$enumNameFromCombinedName]">
+      <xsl:when test="count(key('G_keyEnumsByName',$enumNameFromCombinedName)) > 0">
         <xsl:attribute name="linkend">
           <xsl:value-of select="concat($enumNameFromCombinedName, '__', $enumValueFromCombinedName)" />
         </xsl:attribute>
@@ -459,19 +472,16 @@
         <xsl:variable name="autotextsuffix">
           <xsl:choose>
             <!-- if link points to a method, append "()" -->
-            <xsl:when test="//interface[@name=$if]/method[@name=$member]">
+            <xsl:when test="key('G_keyInterfacesByName',$if)/method[@name=$member]">
               <xsl:value-of select="'()'" />
             </xsl:when>
             <!-- if link points to a safearray attribute, append "[]" -->
-            <xsl:when test="//interface[@name=$if]/attribute[@name=$member]/@safearray = 'yes'">
+            <xsl:when test="key('G_keyInterfacesByName',$if)/attribute[@name=$member]/@safearray = 'yes'">
               <xsl:value-of select="'[]'" />
             </xsl:when>
-            <xsl:when test="//interface[@name=$if]/attribute[@name=$member]">
-            </xsl:when>
-            <xsl:when test="//enum[@name=$if]/const[@name=$member]">
-            </xsl:when>
-            <xsl:when test="//result[@name=$tmp]">
-            </xsl:when>
+            <xsl:when test="key('G_keyInterfacesByName',$if)/attribute[@name=$member]"/>
+            <xsl:when test="key('G_keyEnumsByName',$if)/const[@name=$member]"/>
+            <xsl:when test="count(key('G_keyResultsByName',$tmp)) > 0"/>
             <xsl:otherwise>
               <xsl:message terminate="yes">
                 <xsl:value-of select="concat('Invalid link pointing to "', $tmp, '"')" />
@@ -492,7 +502,7 @@
         </xsl:choose>
       </xsl:otherwise>
     </xsl:choose>
-  </xref>
+  </link>
 </xsl:template>
 
 <!-- - - - - - - - - - - - - - - - - - - - - - -
@@ -501,9 +511,9 @@
 
 <xsl:template match="note">
   <xsl:if test="not(@internal='yes')">
-    <note>
+    <note><para>
       <xsl:apply-templates />
-    </note>
+    </para></note>
   </xsl:if>
 </xsl:template>
 
@@ -544,7 +554,9 @@
 
 <xsl:template match="li">
   <listitem>
-    <xsl:apply-templates />
+    <para>
+      <xsl:apply-templates />
+    </para>
   </listitem>
 </xsl:template>
 
diff --git a/include/Makefile.kmk b/include/Makefile.kmk
index 17cf0aa..006e6e3 100644
--- a/include/Makefile.kmk
+++ b/include/Makefile.kmk
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/ExtPack/ExtPack.h b/include/VBox/ExtPack/ExtPack.h
index 66fe2b0..eee2da5 100644
--- a/include/VBox/ExtPack/ExtPack.h
+++ b/include/VBox/ExtPack/ExtPack.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/GuestHost/SharedClipboard.h b/include/VBox/GuestHost/SharedClipboard.h
index c6c39f5..2f638b0 100644
--- a/include/VBox/GuestHost/SharedClipboard.h
+++ b/include/VBox/GuestHost/SharedClipboard.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/GuestHost/clipboard-helper.h b/include/VBox/GuestHost/clipboard-helper.h
index 70d1653..8023be1 100644
--- a/include/VBox/GuestHost/clipboard-helper.h
+++ b/include/VBox/GuestHost/clipboard-helper.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HGSMI/HGSMIChSetup.h b/include/VBox/HGSMI/HGSMIChSetup.h
index 3f4bcbd..47f4c86 100644
--- a/include/VBox/HGSMI/HGSMIChSetup.h
+++ b/include/VBox/HGSMI/HGSMIChSetup.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HGSMI/HGSMIChannels.h b/include/VBox/HGSMI/HGSMIChannels.h
index cde3430..56fc7dc 100644
--- a/include/VBox/HGSMI/HGSMIChannels.h
+++ b/include/VBox/HGSMI/HGSMIChannels.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HGSMI/HGSMIDefs.h b/include/VBox/HGSMI/HGSMIDefs.h
index a3f7d19..a81b1b7 100644
--- a/include/VBox/HGSMI/HGSMIDefs.h
+++ b/include/VBox/HGSMI/HGSMIDefs.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HGSMI/HGSMIMemAlloc.h b/include/VBox/HGSMI/HGSMIMemAlloc.h
index d973e36..3796321 100644
--- a/include/VBox/HGSMI/HGSMIMemAlloc.h
+++ b/include/VBox/HGSMI/HGSMIMemAlloc.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/Hardware/VBoxVideoVBE.h b/include/VBox/Hardware/VBoxVideoVBE.h
index 97e1c58..c44da28 100644
--- a/include/VBox/Hardware/VBoxVideoVBE.h
+++ b/include/VBox/Hardware/VBoxVideoVBE.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HostServices/GuestControlSvc.h b/include/VBox/HostServices/GuestControlSvc.h
index 37c24f6..eee473c 100644
--- a/include/VBox/HostServices/GuestControlSvc.h
+++ b/include/VBox/HostServices/GuestControlSvc.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HostServices/GuestPropertySvc.h b/include/VBox/HostServices/GuestPropertySvc.h
index baa54c8..6baf43f 100644
--- a/include/VBox/HostServices/GuestPropertySvc.h
+++ b/include/VBox/HostServices/GuestPropertySvc.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HostServices/Service.h b/include/VBox/HostServices/Service.h
index 6ac7385..737266b 100644
--- a/include/VBox/HostServices/Service.h
+++ b/include/VBox/HostServices/Service.h
@@ -197,7 +197,7 @@ private:
                         }
                     }
 
-                    if (paParmsSrc[i].u.pointer.size) 
+                    if (paParmsSrc[i].u.pointer.size)
                     {
                         if (   paParmsDst[i].u.pointer.addr
                             && paParmsDst[i].u.pointer.size)
@@ -206,7 +206,7 @@ private:
                                    paParmsSrc[i].u.pointer.addr,
                                    RT_MIN(paParmsDst[i].u.pointer.size, paParmsSrc[i].u.pointer.size));
                         }
-                        else 
+                        else
                             rc = VERR_INVALID_POINTER;
                     }
                     break;
diff --git a/include/VBox/HostServices/VBoxClipboardExt.h b/include/VBox/HostServices/VBoxClipboardExt.h
index b9d52db..cdc7e04 100644
--- a/include/VBox/HostServices/VBoxClipboardExt.h
+++ b/include/VBox/HostServices/VBoxClipboardExt.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HostServices/VBoxClipboardSvc.h b/include/VBox/HostServices/VBoxClipboardSvc.h
index d8240e6..485a0c4 100644
--- a/include/VBox/HostServices/VBoxClipboardSvc.h
+++ b/include/VBox/HostServices/VBoxClipboardSvc.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HostServices/VBoxCrOpenGLSvc.h b/include/VBox/HostServices/VBoxCrOpenGLSvc.h
index 4edc460..8d90e0f 100644
--- a/include/VBox/HostServices/VBoxCrOpenGLSvc.h
+++ b/include/VBox/HostServices/VBoxCrOpenGLSvc.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HostServices/VBoxHostChannel.h b/include/VBox/HostServices/VBoxHostChannel.h
index bf3c143..c85e831 100644
--- a/include/VBox/HostServices/VBoxHostChannel.h
+++ b/include/VBox/HostServices/VBoxHostChannel.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HostServices/VBoxOGLOp.h b/include/VBox/HostServices/VBoxOGLOp.h
index 02c8028..8938b42 100644
--- a/include/VBox/HostServices/VBoxOGLOp.h
+++ b/include/VBox/HostServices/VBoxOGLOp.h
@@ -4,7 +4,7 @@
 
 /*
  *
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/HostServices/VBoxOpenGLSvc.h b/include/VBox/HostServices/VBoxOpenGLSvc.h
index be31f04..1472a23 100644
--- a/include/VBox/HostServices/VBoxOpenGLSvc.h
+++ b/include/VBox/HostServices/VBoxOpenGLSvc.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/RemoteDesktop/VRDE.h b/include/VBox/RemoteDesktop/VRDE.h
index 7fd78c1..3445562 100644
--- a/include/VBox/RemoteDesktop/VRDE.h
+++ b/include/VBox/RemoteDesktop/VRDE.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/RemoteDesktop/VRDEImage.h b/include/VBox/RemoteDesktop/VRDEImage.h
index 951852d..eb4a9cb 100644
--- a/include/VBox/RemoteDesktop/VRDEImage.h
+++ b/include/VBox/RemoteDesktop/VRDEImage.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/RemoteDesktop/VRDEInput.h b/include/VBox/RemoteDesktop/VRDEInput.h
index 093591e..7a88dde 100644
--- a/include/VBox/RemoteDesktop/VRDEInput.h
+++ b/include/VBox/RemoteDesktop/VRDEInput.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/RemoteDesktop/VRDEMousePtr.h b/include/VBox/RemoteDesktop/VRDEMousePtr.h
index 5bed85c..278428a 100644
--- a/include/VBox/RemoteDesktop/VRDEMousePtr.h
+++ b/include/VBox/RemoteDesktop/VRDEMousePtr.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/RemoteDesktop/VRDEOrders.h b/include/VBox/RemoteDesktop/VRDEOrders.h
index 35a6514..af4804f 100644
--- a/include/VBox/RemoteDesktop/VRDEOrders.h
+++ b/include/VBox/RemoteDesktop/VRDEOrders.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/RemoteDesktop/VRDESCard.h b/include/VBox/RemoteDesktop/VRDESCard.h
index 4d915d6..26b1829 100644
--- a/include/VBox/RemoteDesktop/VRDESCard.h
+++ b/include/VBox/RemoteDesktop/VRDESCard.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/RemoteDesktop/VRDETSMF.h b/include/VBox/RemoteDesktop/VRDETSMF.h
index 2758924..13e01f4 100644
--- a/include/VBox/RemoteDesktop/VRDETSMF.h
+++ b/include/VBox/RemoteDesktop/VRDETSMF.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/RemoteDesktop/VRDEVideoIn.h b/include/VBox/RemoteDesktop/VRDEVideoIn.h
index 0ff12f5..7bf257e 100644
--- a/include/VBox/RemoteDesktop/VRDEVideoIn.h
+++ b/include/VBox/RemoteDesktop/VRDEVideoIn.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/SUPDrvMangling.h b/include/VBox/SUPDrvMangling.h
index 58b0896..b092b33 100644
--- a/include/VBox/SUPDrvMangling.h
+++ b/include/VBox/SUPDrvMangling.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VBoxAuth.h b/include/VBox/VBoxAuth.h
index 34dcd06..5713692 100644
--- a/include/VBox/VBoxAuth.h
+++ b/include/VBox/VBoxAuth.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VBoxCocoa.h b/include/VBox/VBoxCocoa.h
index f31520c..c28aecc 100644
--- a/include/VBox/VBoxCocoa.h
+++ b/include/VBox/VBoxCocoa.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VBoxCrHgsmi.h b/include/VBox/VBoxCrHgsmi.h
index 1c4f34c..518842b 100644
--- a/include/VBox/VBoxCrHgsmi.h
+++ b/include/VBox/VBoxCrHgsmi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VBoxDrvCfg-win.h b/include/VBox/VBoxDrvCfg-win.h
index abca190..6e60372 100644
--- a/include/VBox/VBoxDrvCfg-win.h
+++ b/include/VBox/VBoxDrvCfg-win.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VBoxGL2D.h b/include/VBox/VBoxGL2D.h
index a29c272..d1fab66 100644
--- a/include/VBox/VBoxGL2D.h
+++ b/include/VBox/VBoxGL2D.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VBoxGuest2.h b/include/VBox/VBoxGuest2.h
index 05344c3..5abe726 100644
--- a/include/VBox/VBoxGuest2.h
+++ b/include/VBox/VBoxGuest2.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VBoxGuestMangling.h b/include/VBox/VBoxGuestMangling.h
index 350c1ba..8f3563e 100644
--- a/include/VBox/VBoxGuestMangling.h
+++ b/include/VBox/VBoxGuestMangling.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VBoxNetCfg-win.h b/include/VBox/VBoxNetCfg-win.h
index 5b35d3c..bbd1d4c 100644
--- a/include/VBox/VBoxNetCfg-win.h
+++ b/include/VBox/VBoxNetCfg-win.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetCmn-win.h b/include/VBox/VBoxNetCmn-win.h
similarity index 94%
rename from src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetCmn-win.h
rename to include/VBox/VBoxNetCmn-win.h
index eacebfa..bd8ddc0 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetCmn-win.h
+++ b/include/VBox/VBoxNetCmn-win.h
@@ -3,7 +3,7 @@
  * VBoxNetCmn-win.h - NDIS6 Networking Driver Common Definitions, Windows-specific code.
  */
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -12,6 +12,15 @@
  * Foundation, in version 2 as it comes in the "COPYING" file of the
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
  */
 
 DECLHIDDEN(void) vboxNetCmnWinDumpOidRequest(const char *pcszFunction, PNDIS_OID_REQUEST pRequest)
diff --git a/include/VBox/VBoxTpG.h b/include/VBox/VBoxTpG.h
index de55d19..48f8774 100644
--- a/include/VBox/VBoxTpG.h
+++ b/include/VBox/VBoxTpG.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VBoxUhgsmi.h b/include/VBox/VBoxUhgsmi.h
index eed8345..7e874f3 100644
--- a/include/VBox/VBoxUhgsmi.h
+++ b/include/VBox/VBoxUhgsmi.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VBoxVideo.h b/include/VBox/VBoxVideo.h
index b4e09c3..1dc15dd 100644
--- a/include/VBox/VBoxVideo.h
+++ b/include/VBox/VBoxVideo.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1173,7 +1173,7 @@ typedef struct VBVAMODEHINT
 /** Report the rectangle relative to which absolute pointer events should be
  *  expressed.  This information remains valid until the next VBVA resize event
  *  for any screen, at which time it is reset to the bounding rectangle of all
- *  virtual screens and must be re-set. 
+ *  virtual screens and must be re-set.
  *  @see VBVA_REPORT_INPUT_MAPPING. */
 typedef struct VBVAREPORTINPUTMAPPING
 {
diff --git a/include/VBox/VBoxVideo3D.h b/include/VBox/VBoxVideo3D.h
index c662e5e..8df2ae2 100644
--- a/include/VBox/VBoxVideo3D.h
+++ b/include/VBox/VBoxVideo3D.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VBoxVideoGuest.h b/include/VBox/VBoxVideoGuest.h
index 997eb47..ea318d8 100644
--- a/include/VBox/VBoxVideoGuest.h
+++ b/include/VBox/VBoxVideoGuest.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -248,6 +248,8 @@ RTDECL(int)      VBoxHGSMISendHostCtxInfo(PHGSMIGUESTCOMMANDCONTEXT pCtx,
                                           uint32_t cbHostArea);
 RTDECL(int)      VBoxQueryConfHGSMI(PHGSMIGUESTCOMMANDCONTEXT pCtx,
                                     uint32_t u32Index, uint32_t *pulValue);
+RTDECL(int)      VBoxQueryConfHGSMIDef(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                       uint32_t u32Index, uint32_t u32DefValue, uint32_t *pulValue);
 RTDECL(int)      VBoxHGSMIUpdatePointerShape(PHGSMIGUESTCOMMANDCONTEXT pCtx,
                                              uint32_t fFlags,
                                              uint32_t cHotX,
diff --git a/include/VBox/VBoxVideoHost3D.h b/include/VBox/VBoxVideoHost3D.h
index 0c9d2c9..4d056d9 100644
--- a/include/VBox/VBoxVideoHost3D.h
+++ b/include/VBox/VBoxVideoHost3D.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VDEPlug.h b/include/VBox/VDEPlug.h
index 1766492..fc7c8d6 100644
--- a/include/VBox/VDEPlug.h
+++ b/include/VBox/VDEPlug.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VDEPlugSymDefs.h b/include/VBox/VDEPlugSymDefs.h
index fd11a8c..15bea6d 100644
--- a/include/VBox/VDEPlugSymDefs.h
+++ b/include/VBox/VDEPlugSymDefs.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VMMDev.h b/include/VBox/VMMDev.h
index 7e62ce8..70c9aca 100644
--- a/include/VBox/VMMDev.h
+++ b/include/VBox/VMMDev.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/VMMDev2.h b/include/VBox/VMMDev2.h
index c8709f7..fc1b06a 100644
--- a/include/VBox/VMMDev2.h
+++ b/include/VBox/VMMDev2.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/apic.h b/include/VBox/apic.h
index 6f0bca5..c5bfb86 100644
--- a/include/VBox/apic.h
+++ b/include/VBox/apic.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/asmdefs.mac b/include/VBox/asmdefs.mac
index b877e63..a37c403 100644
--- a/include/VBox/asmdefs.mac
+++ b/include/VBox/asmdefs.mac
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2011 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/bioslogo.h b/include/VBox/bioslogo.h
index 1c5fd04..ccd1f87 100644
--- a/include/VBox/bioslogo.h
+++ b/include/VBox/bioslogo.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/cdefs.h b/include/VBox/cdefs.h
index 0744b76..db7006a 100644
--- a/include/VBox/cdefs.h
+++ b/include/VBox/cdefs.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/AutoLock.h b/include/VBox/com/AutoLock.h
index 12eecca..61b35de 100644
--- a/include/VBox/com/AutoLock.h
+++ b/include/VBox/com/AutoLock.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/ErrorInfo.h b/include/VBox/com/ErrorInfo.h
index 9ccf5cf..ead288d 100644
--- a/include/VBox/com/ErrorInfo.h
+++ b/include/VBox/com/ErrorInfo.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/EventQueue.h b/include/VBox/com/EventQueue.h
index 2f6587c..8a2dce5 100644
--- a/include/VBox/com/EventQueue.h
+++ b/include/VBox/com/EventQueue.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/Guid.h b/include/VBox/com/Guid.h
index fcf91f9..1136e99 100644
--- a/include/VBox/com/Guid.h
+++ b/include/VBox/com/Guid.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/MultiResult.h b/include/VBox/com/MultiResult.h
index e894646..f7053aa 100644
--- a/include/VBox/com/MultiResult.h
+++ b/include/VBox/com/MultiResult.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/NativeEventQueue.h b/include/VBox/com/NativeEventQueue.h
index 96a872f..2f91ab4 100644
--- a/include/VBox/com/NativeEventQueue.h
+++ b/include/VBox/com/NativeEventQueue.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/VirtualBox.h b/include/VBox/com/VirtualBox.h
index 288ed8f..2cd9c88 100644
--- a/include/VBox/com/VirtualBox.h
+++ b/include/VBox/com/VirtualBox.h
@@ -13,7 +13,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/array.h b/include/VBox/com/array.h
index f70b66e..b0da627 100644
--- a/include/VBox/com/array.h
+++ b/include/VBox/com/array.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/assert.h b/include/VBox/com/assert.h
index 900ce13..db52480 100644
--- a/include/VBox/com/assert.h
+++ b/include/VBox/com/assert.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/com.h b/include/VBox/com/com.h
index 9250268..e287c73 100644
--- a/include/VBox/com/com.h
+++ b/include/VBox/com/com.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2005-2012 Oracle Corporation
+ * Copyright (C) 2005-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/defs.h b/include/VBox/com/defs.h
index 65db793..8deebe3 100644
--- a/include/VBox/com/defs.h
+++ b/include/VBox/com/defs.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/errorprint.h b/include/VBox/com/errorprint.h
index 43c1185..43ed0ed 100644
--- a/include/VBox/com/errorprint.h
+++ b/include/VBox/com/errorprint.h
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/list.h b/include/VBox/com/list.h
index 5ecf4f1..7d84406 100644
--- a/include/VBox/com/list.h
+++ b/include/VBox/com/list.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/listeners.h b/include/VBox/com/listeners.h
index 6a55e4c..09d8fce 100644
--- a/include/VBox/com/listeners.h
+++ b/include/VBox/com/listeners.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/mtlist.h b/include/VBox/com/mtlist.h
index 16b8e8c..ed6c302 100644
--- a/include/VBox/com/mtlist.h
+++ b/include/VBox/com/mtlist.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/ptr.h b/include/VBox/com/ptr.h
index f7d8ac5..d435051 100644
--- a/include/VBox/com/ptr.h
+++ b/include/VBox/com/ptr.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/com/string.h b/include/VBox/com/string.h
index 65786d4..d435fa6 100644
--- a/include/VBox/com/string.h
+++ b/include/VBox/com/string.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/dbggui.h b/include/VBox/dbggui.h
index 214dc1e..b6142dc 100644
--- a/include/VBox/dbggui.h
+++ b/include/VBox/dbggui.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/dbus-calls.h b/include/VBox/dbus-calls.h
index 084ef9a..e793849 100644
--- a/include/VBox/dbus-calls.h
+++ b/include/VBox/dbus-calls.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/dbus.h b/include/VBox/dbus.h
index 87f2295..b1ce6d8 100644
--- a/include/VBox/dbus.h
+++ b/include/VBox/dbus.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/dis.h b/include/VBox/dis.h
index 48a9235..d56c3e5 100644
--- a/include/VBox/dis.h
+++ b/include/VBox/dis.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/err.h b/include/VBox/err.h
index 235239d..a30895f 100644
--- a/include/VBox/err.h
+++ b/include/VBox/err.h
@@ -88,6 +88,8 @@
 #define VERR_NOT_SUP_IN_RAW_MODE            (-1021)
 /** Invalid CPU index. */
 #define VERR_INVALID_CPU_INDEX              (-1022)
+/** This VirtualBox build does not support raw-mode. */
+#define VERR_RAW_MODE_NOT_SUPPORTED         (-1023)
 /** @} */
 
 
@@ -2293,16 +2295,28 @@
 /** Internal status code for indicating that a selector isn't valid (LAR, LSL,
  *  VERR, VERW).  This is not used outside the instruction implementations. */
 #define VINF_IEM_SELECTOR_NOT_OK                    (5305)
-/** This particular aspect of the instruction is not yet implemented by IEM. */
-#define VERR_IEM_ASPECT_NOT_IMPLEMENTED             (-5391)
-/** Internal processing error \#1 in the IEM code.. */
-#define VERR_IEM_IPE_1                              (-5392)
-/** Internal processing error \#2 in the IEM code.. */
-#define VERR_IEM_IPE_2                              (-5393)
-/** Internal processing error \#3 in the IEM code.. */
-#define VERR_IEM_IPE_3                              (-5394)
 /** Restart the current instruction. For testing only. */
-#define VERR_IEM_RESTART_INSTRUCTION                (-5395)
+#define VERR_IEM_RESTART_INSTRUCTION                (-5389)
+/** This particular aspect of the instruction is not yet implemented by IEM. */
+#define VERR_IEM_ASPECT_NOT_IMPLEMENTED             (-5390)
+/** Internal processing error \#1 in the IEM code. */
+#define VERR_IEM_IPE_1                              (-5391)
+/** Internal processing error \#2 in the IEM code. */
+#define VERR_IEM_IPE_2                              (-5392)
+/** Internal processing error \#3 in the IEM code. */
+#define VERR_IEM_IPE_3                              (-5393)
+/** Internal processing error \#4 in the IEM code. */
+#define VERR_IEM_IPE_4                              (-5394)
+/** Internal processing error \#5 in the IEM code. */
+#define VERR_IEM_IPE_5                              (-5395)
+/** Internal processing error \#6 in the IEM code. */
+#define VERR_IEM_IPE_6                              (-5396)
+/** Internal processing error \#7 in the IEM code. */
+#define VERR_IEM_IPE_7                              (-5397)
+/** Internal processing error \#8 in the IEM code. */
+#define VERR_IEM_IPE_8                              (-5398)
+/** Internal processing error \#9 in the IEM code. */
+#define VERR_IEM_IPE_9                              (-5399)
 /** @} */
 
 
diff --git a/include/VBox/err.mac b/include/VBox/err.mac
index c2cde49..78f2272 100644
--- a/include/VBox/err.mac
+++ b/include/VBox/err.mac
@@ -21,6 +21,7 @@
 %define VERR_SERVICE_DISABLED    (-1020)
 %define VERR_NOT_SUP_IN_RAW_MODE    (-1021)
 %define VERR_INVALID_CPU_INDEX    (-1022)
+%define VERR_RAW_MODE_NOT_SUPPORTED    (-1023)
 %define VINF_EM_FIRST    1100
 %define VINF_EM_TERMINATE    1100
 %define VINF_EM_DBG_HYPER_STEPPED    1101
@@ -223,8 +224,12 @@
 %define VERR_CPUM_MSR_BAD_CPUMCPU_OFFSET    (-1757)
 %define VINF_CPUM_R3_MSR_READ    (1758)
 %define VINF_CPUM_R3_MSR_WRITE    (1759)
-%define VERR_TOO_MANY_CPUID_LEAVES    (1760)
-%define VERR_CPUM_INVALID_CONFIG_VALUE    (1761)
+%define VERR_TOO_MANY_CPUID_LEAVES    (-1760)
+%define VERR_CPUM_INVALID_CONFIG_VALUE    (-1761)
+%define VERR_CPUM_INCOMPATIBLE_XSAVE_COMP_MASK    (-1762)
+%define VERR_CPUM_INVALID_XSAVE_COMP_MASK    (-1763)
+%define VERR_CPUM_INVALID_XSAVE_HDR    (-1764)
+%define VERR_CPUM_INVALID_XCR0    (-1765)
 %define VERR_SSM_UNIT_EXISTS    (-1800)
 %define VERR_SSM_UNIT_NOT_FOUND    (-1801)
 %define VERR_SSM_UNIT_NOT_OWNER    (-1802)
@@ -770,6 +775,11 @@
 %define VERR_SVM_UNEXPECTED_PATCH_TYPE    (-4058)
 %define VERR_SVM_INVALID_GUEST_STATE    (-4059)
 %define VERR_SVM_UNKNOWN_EXIT    (-4060)
+%define VERR_SVM_IPE_1    (-4061)
+%define VERR_SVM_IPE_2    (-4062)
+%define VERR_SVM_IPE_3    (-4063)
+%define VERR_SVM_IPE_4    (-4064)
+%define VERR_SVM_IPE_5    (-4065)
 %define VERR_HM_UNKNOWN_CPU    (-4100)
 %define VERR_HM_NO_CPUID    (-4101)
 %define VERR_HM_SUSPEND_PENDING    (-4102)
@@ -841,11 +851,17 @@
 %define VERR_IEM_INVALID_EFF_SEG    (-5303)
 %define VERR_IEM_INVALID_INSTR_LENGTH    (-5304)
 %define VINF_IEM_SELECTOR_NOT_OK    (5305)
-%define VERR_IEM_ASPECT_NOT_IMPLEMENTED    (-5391)
-%define VERR_IEM_IPE_1    (-5392)
-%define VERR_IEM_IPE_2    (-5393)
-%define VERR_IEM_IPE_3    (-5394)
-%define VERR_IEM_RESTART_INSTRUCTION    (-5395)
+%define VERR_IEM_RESTART_INSTRUCTION    (-5389)
+%define VERR_IEM_ASPECT_NOT_IMPLEMENTED    (-5390)
+%define VERR_IEM_IPE_1    (-5391)
+%define VERR_IEM_IPE_2    (-5392)
+%define VERR_IEM_IPE_3    (-5393)
+%define VERR_IEM_IPE_4    (-5394)
+%define VERR_IEM_IPE_5    (-5395)
+%define VERR_IEM_IPE_6    (-5396)
+%define VERR_IEM_IPE_7    (-5397)
+%define VERR_IEM_IPE_8    (-5398)
+%define VERR_IEM_IPE_9    (-5399)
 %define VERR_DBGC_QUIT    (-5400)
 %define VWRN_DBGC_CMD_PENDING    5401
 %define VWRN_DBGC_ALREADY_REGISTERED    5402
@@ -975,4 +991,5 @@
 %define VERR_GIM_HYPERCALL_ACCESS_DENIED    (-6311)
 %define VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR    (-6400)
 %define VERR_MAIN_CONFIG_CONSTRUCTOR_IPE    (-6401)
+%define VERR_GSTDND_GUEST_ERROR    (-6500)
 %include "iprt/err.mac"
diff --git a/include/VBox/err.sed b/include/VBox/err.sed
index 52bb362..6b34d23 100644
--- a/include/VBox/err.sed
+++ b/include/VBox/err.sed
@@ -3,7 +3,7 @@
 # SED script for converting VBox/err.h to .mac.
 #
 
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/hgcmsvc.h b/include/VBox/hgcmsvc.h
index b3412ac..df3e6d0 100644
--- a/include/VBox/hgcmsvc.h
+++ b/include/VBox/hgcmsvc.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/intnet.h b/include/VBox/intnet.h
index 19d398b..b91dad6 100644
--- a/include/VBox/intnet.h
+++ b/include/VBox/intnet.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/intnetinline.h b/include/VBox/intnetinline.h
index 1d268e6..3faab22 100644
--- a/include/VBox/intnetinline.h
+++ b/include/VBox/intnetinline.h
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/log.h b/include/VBox/log.h
index 70b8bfe..c9978cd 100644
--- a/include/VBox/log.h
+++ b/include/VBox/log.h
@@ -153,6 +153,8 @@ typedef enum LOGGROUP
     LOG_GROUP_DEV_VMM_STDERR,
     /** VMSVGA Device group. */
     LOG_GROUP_DEV_VMSVGA,
+    /** USB xHCI Device group. */
+    LOG_GROUP_DEV_XHCI,
     /** Disassembler group. */
     LOG_GROUP_DIS,
     /** Generic driver group. */
@@ -827,6 +829,7 @@ typedef enum LOGGROUP
     "DEV_VMM_BACKDOOR", \
     "DEV_VMM_STDERR", \
     "DEV_VMSVGA",   \
+    "DEV_XHCI",     \
     "DIS",          \
     "DRV",          \
     "DRV_ACPI",     \
diff --git a/include/VBox/msi.h b/include/VBox/msi.h
index 7bfc422..6f32fa7 100644
--- a/include/VBox/msi.h
+++ b/include/VBox/msi.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/nasm.mac b/include/VBox/nasm.mac
index a8010a6..1c7c561 100644
--- a/include/VBox/nasm.mac
+++ b/include/VBox/nasm.mac
@@ -5,7 +5,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/ostypes.h b/include/VBox/ostypes.h
index 426300f..de0245f 100644
--- a/include/VBox/ostypes.h
+++ b/include/VBox/ostypes.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/pci.h b/include/VBox/pci.h
index 4c6b5fd..c3c3aa2 100644
--- a/include/VBox/pci.h
+++ b/include/VBox/pci.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/rawpci.h b/include/VBox/rawpci.h
index 02fdd1a..dec8f37 100644
--- a/include/VBox/rawpci.h
+++ b/include/VBox/rawpci.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/refentry.h b/include/VBox/refentry.h
new file mode 100644
index 0000000..183f6f1
--- /dev/null
+++ b/include/VBox/refentry.h
@@ -0,0 +1,107 @@
+/** @file
+ * VirtualBox - manpage/refentry C extracts for built-in help.
+ */
+
+/*
+ * Copyright (C) 2015 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
+ */
+
+#ifndef ___VBox_refentry_h
+#define ___VBox_refentry_h
+
+#include <iprt/types.h>
+
+/** @defgroup grp_refentry Help generated from refentry/manpage.
+ *
+ * The refentry/manpage docbook source in doc/manual/en_US/man_* is processed by
+ * doc/manual/docbook-refentry-to-C-help.xsl and turned a set of the structures
+ * defined here.
+ *
+ * @{
+ */
+
+/** The non-breaking space character.
+ * @remarks We could've used U+00A0, but it is easier both to encode and to
+ *          search and replace a single ASCII character. */
+#define REFENTRY_NBSP               '\b'
+
+/** @name REFENTRYSTR_SCOPE_XXX - Common string scoping and flags.
+ * @{ */
+/** Same scope as previous string table entry, flags are reset and can be
+ *  ORed in. */
+#define REFENTRYSTR_SCOPE_SAME      UINT64_C(0)
+/** Global scope. */
+#define REFENTRYSTR_SCOPE_GLOBAL    UINT64_C(0x00ffffffffffffff)
+/** Scope mask. */
+#define REFENTRYSTR_SCOPE_MASK      UINT64_C(0x00ffffffffffffff)
+/** Flags mask. */
+#define REFENTRYSTR_FLAGS_MASK      UINT64_C(0xff00000000000000)
+/** Command synopsis, special hanging indent rules applies. */
+#define REFENTRYSTR_FLAGS_SYNOPSIS  RT_BIT_64(63)
+/** @} */
+
+/** String table entry for a re.   */
+typedef struct REFENTRYSTR
+{
+    /** The scope of the string.  There are two predefined scopes,
+     *  REFENTRYSTR_SCOPE_SAME and REFENTRYSTR_SCOPE_GLOBAL.  The rest are
+     *  reference entry specific. */
+    uint64_t        fScope;
+    /** The string.  Non-breaking space is represented by the char
+     * REFENTRY_NBSP defines, just in case the string needs wrapping.  There is
+     * no trailing newline, that's implicit. */
+    const char     *psz;
+} REFENTRYSTR;
+/** Pointer to a read-only string table entry. */
+typedef const REFENTRYSTR *PCREFENTRYSTR;
+
+typedef struct REFENTRYSTRTAB
+{
+    /** Number of strings. */
+    uint16_t        cStrings;
+    /** Reserved for future use. */
+    uint16_t        fReserved;
+    /** Pointer to the string table. */
+    PCREFENTRYSTR   paStrings;
+} REFENTRYSTRTAB;
+/** Pointer to a read-only string table. */
+typedef REFENTRYSTRTAB const *PCREFENTRYSTRTAB;
+
+/**
+ * Help extracted from a docbook refentry document.
+ */
+typedef struct REFENTRY
+{
+    /** Internal reference entry identifier.  */
+    int64_t        idInternal;
+    /** Usage synopsis. */
+    REFENTRYSTRTAB Synopsis;
+    /** Full help. */
+    REFENTRYSTRTAB Help;
+    /** Brief command description. */
+    const char    *pszBrief;
+} REFENTRY;
+/** Pointer to a read-only refentry help extract structure. */
+typedef REFENTRY const *PCREFENTRY;
+
+/** @} */
+
+#endif
+
diff --git a/include/VBox/scsi.h b/include/VBox/scsi.h
index c0ab641..87d5790 100644
--- a/include/VBox/scsi.h
+++ b/include/VBox/scsi.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/settings.h b/include/VBox/settings.h
index cfcea0b..038b651 100644
--- a/include/VBox/settings.h
+++ b/include/VBox/settings.h
@@ -328,8 +328,8 @@ typedef std::list<MachineRegistryEntry> MachinesRegistry;
 struct DhcpOptValue
 {
     enum Encoding {
-	LEGACY = DhcpOptEncoding_Legacy,
-	HEX = DhcpOptEncoding_Hex
+        LEGACY = DhcpOptEncoding_Legacy,
+        HEX = DhcpOptEncoding_Hex
     };
 
     com::Utf8Str text;
@@ -695,6 +695,7 @@ struct AudioAdapter
     AudioAdapter()
         : fEnabled(true),
           controllerType(AudioControllerType_AC97),
+          codecType(AudioCodecType_STAC9700),
           driverType(AudioDriverType_Null)
     {}
 
@@ -703,6 +704,7 @@ struct AudioAdapter
         return     (this == &a)
                 || (    (fEnabled        == a.fEnabled)
                      && (controllerType  == a.controllerType)
+                     && (codecType       == a.codecType)
                      && (driverType      == a.driverType)
                      && (properties      == a.properties)
                    );
@@ -710,6 +712,7 @@ struct AudioAdapter
 
     bool                    fEnabled;
     AudioControllerType_T   controllerType;
+    AudioCodecType_T        codecType;
     AudioDriverType_T       driverType;
     settings::StringsMap properties;
 };
@@ -1054,11 +1057,7 @@ struct StorageController
           ulPortCount(2),
           ulInstance(0),
           fUseHostIOCache(true),
-          fBootable(true),
-          lIDE0MasterEmulationPort(0),
-          lIDE0SlaveEmulationPort(0),
-          lIDE1MasterEmulationPort(0),
-          lIDE1SlaveEmulationPort(0)
+          fBootable(true)
     {}
 
     bool operator==(const StorageController &s) const;
diff --git a/include/VBox/shflsvc.h b/include/VBox/shflsvc.h
index be7fde1..cc02678 100644
--- a/include/VBox/shflsvc.h
+++ b/include/VBox/shflsvc.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/sup.h b/include/VBox/sup.h
index d4b781d..136e3f2 100644
--- a/include/VBox/sup.h
+++ b/include/VBox/sup.h
@@ -771,13 +771,6 @@ typedef SUPR0SERVICEREQHDR *PSUPR0SERVICEREQHDR;
 #define SUPR0SERVICEREQHDR_MAGIC    UINT32_C(0x19640416)
 
 
-/** Event semaphore handle. Ring-0 / ring-3. */
-typedef R0PTRTYPE(struct SUPSEMEVENTHANDLE *) SUPSEMEVENT;
-/** Pointer to an event semaphore handle. */
-typedef SUPSEMEVENT *PSUPSEMEVENT;
-/** Nil event semaphore handle. */
-#define NIL_SUPSEMEVENT         ((SUPSEMEVENT)0)
-
 /**
  * Creates a single release event semaphore.
  *
@@ -862,13 +855,6 @@ SUPDECL(int) SUPSemEventWaitNsRelIntr(PSUPDRVSESSION pSession, SUPSEMEVENT hEven
 SUPDECL(uint32_t) SUPSemEventGetResolution(PSUPDRVSESSION pSession);
 
 
-/** Multiple release event semaphore handle. Ring-0 / ring-3. */
-typedef R0PTRTYPE(struct SUPSEMEVENTMULTIHANDLE *)  SUPSEMEVENTMULTI;
-/** Pointer to an multiple release event semaphore handle. */
-typedef SUPSEMEVENTMULTI                           *PSUPSEMEVENTMULTI;
-/** Nil multiple release event semaphore handle. */
-#define NIL_SUPSEMEVENTMULTI                        ((SUPSEMEVENTMULTI)0)
-
 /**
  * Creates a multiple release event semaphore.
  *
diff --git a/include/VBox/types.h b/include/VBox/types.h
index cef783c..9778b44 100644
--- a/include/VBox/types.h
+++ b/include/VBox/types.h
@@ -57,7 +57,22 @@
 /** Pointer to per support driver session data.
  * (The data is a R0 entity and private to the the R0 SUP part. All
  * other should consider this a sort of handle.) */
-typedef R0PTRTYPE(struct SUPDRVSESSION *) PSUPDRVSESSION;
+typedef R0PTRTYPE(struct SUPDRVSESSION *)           PSUPDRVSESSION;
+
+/** Event semaphore handle. Ring-0 / ring-3. */
+typedef R0PTRTYPE(struct SUPSEMEVENTHANDLE *)       SUPSEMEVENT;
+/** Pointer to an event semaphore handle. */
+typedef SUPSEMEVENT                                *PSUPSEMEVENT;
+/** Nil event semaphore handle. */
+#define NIL_SUPSEMEVENT                             ((SUPSEMEVENT)0)
+
+/** Multiple release event semaphore handle. Ring-0 / ring-3. */
+typedef R0PTRTYPE(struct SUPSEMEVENTMULTIHANDLE *)  SUPSEMEVENTMULTI;
+/** Pointer to an multiple release event semaphore handle. */
+typedef SUPSEMEVENTMULTI                           *PSUPSEMEVENTMULTI;
+/** Nil multiple release event semaphore handle. */
+#define NIL_SUPSEMEVENTMULTI                        ((SUPSEMEVENTMULTI)0)
+
 
 /** Pointer to a VM. */
 typedef struct VM                  *PVM;
diff --git a/include/VBox/usb.h b/include/VBox/usb.h
index ea6de6a..4a34cb1 100644
--- a/include/VBox/usb.h
+++ b/include/VBox/usb.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/usbfilter.h b/include/VBox/usbfilter.h
index 45c3151..cc0181e 100644
--- a/include/VBox/usbfilter.h
+++ b/include/VBox/usbfilter.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/usblib-darwin.h b/include/VBox/usblib-darwin.h
index d46a9e2..b841f70 100644
--- a/include/VBox/usblib-darwin.h
+++ b/include/VBox/usblib-darwin.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/usblib-solaris.h b/include/VBox/usblib-solaris.h
index 053c326..32ca6ff 100644
--- a/include/VBox/usblib-solaris.h
+++ b/include/VBox/usblib-solaris.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/usblib-win.h b/include/VBox/usblib-win.h
index 193bde7..3c7eb30 100644
--- a/include/VBox/usblib-win.h
+++ b/include/VBox/usblib-win.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/usblib.h b/include/VBox/usblib.h
index 5d00af6..2a079ea 100644
--- a/include/VBox/usblib.h
+++ b/include/VBox/usblib.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vd-cache-backend.h b/include/VBox/vd-cache-backend.h
index 9fba716..ec52fd3 100644
--- a/include/VBox/vd-cache-backend.h
+++ b/include/VBox/vd-cache-backend.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vd-filter-backend.h b/include/VBox/vd-filter-backend.h
index b2021c5..dc055cd 100644
--- a/include/VBox/vd-filter-backend.h
+++ b/include/VBox/vd-filter-backend.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vd-ifs-internal.h b/include/VBox/vd-ifs-internal.h
index 63b5b9c..6e772eb 100644
--- a/include/VBox/vd-ifs-internal.h
+++ b/include/VBox/vd-ifs-internal.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vd-plugin.h b/include/VBox/vd-plugin.h
index fdd29d3..db855bc 100644
--- a/include/VBox/vd-plugin.h
+++ b/include/VBox/vd-plugin.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vd.h b/include/VBox/vd.h
index 52828b8..642390b 100644
--- a/include/VBox/vd.h
+++ b/include/VBox/vd.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vddbg.h b/include/VBox/vddbg.h
index b68d01a..ad8920e 100644
--- a/include/VBox/vddbg.h
+++ b/include/VBox/vddbg.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/cpumctx-v1_6.h b/include/VBox/vmm/cpumctx-v1_6.h
index dbc5935..721890b 100644
--- a/include/VBox/vmm/cpumctx-v1_6.h
+++ b/include/VBox/vmm/cpumctx-v1_6.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/cpumdis.h b/include/VBox/vmm/cpumdis.h
index dab556a..752080c 100644
--- a/include/VBox/vmm/cpumdis.h
+++ b/include/VBox/vmm/cpumdis.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/dbgf.h b/include/VBox/vmm/dbgf.h
index e7e7ec7..e90c0b2 100644
--- a/include/VBox/vmm/dbgf.h
+++ b/include/VBox/vmm/dbgf.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/dbgfcorefmt.h b/include/VBox/vmm/dbgfcorefmt.h
index 28f6aec..2f68ee3 100644
--- a/include/VBox/vmm/dbgfcorefmt.h
+++ b/include/VBox/vmm/dbgfcorefmt.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -38,7 +38,8 @@ RT_C_DECLS_BEGIN
  * @ingroup grp_dbgf
  *
  * @todo Add description of the core file format and how the structures in this
- *       file relate to it.  Point to CPUMCTX in cpum.h for the CPU state.
+ *       file relate to it.  Point to X86XSAVEAREA in x86.h for the CPU's
+ *       FPU/SSE/AVX/XXX state.
  * @todo Add the note names.
  *
  * @{
@@ -47,7 +48,98 @@ RT_C_DECLS_BEGIN
 /** DBGCORECOREDESCRIPTOR::u32Magic. */
 #define DBGFCORE_MAGIC          UINT32_C(0xc01ac0de)
 /** DBGCORECOREDESCRIPTOR::u32FmtVersion. */
-#define DBGFCORE_FMT_VERSION    UINT32_C(0x00010000)
+#define DBGFCORE_FMT_VERSION    UINT32_C(0x00010002)
+
+/**
+ * An x86 segment selector.
+ */
+typedef struct DBGFCORESEL
+{
+    uint64_t        uBase;
+    uint32_t        uLimit;
+    uint32_t        uAttr;
+    uint16_t        uSel;
+    uint16_t        uReserved0;
+    uint32_t        uReserved1;
+} VBOXX86SEL;
+AssertCompileSizeAlignment(DBGFCORESEL, 8);
+
+/**
+ * A gdtr/ldtr descriptor.
+ */
+typedef struct DBGFCOREXDTR
+{
+    uint64_t        uAddr;
+    uint32_t        cb;
+    uint32_t        uReserved0;
+} DBGFXDTR;
+AssertCompileSizeAlignment(DBGFCORESEL, 8);
+
+/**
+ * A simpler to parse CPU dump than CPUMCTX.
+ *
+ * Please bump DBGFCORE_FMT_VERSION by 1 if you make any changes to this
+ * structure.
+ */
+typedef struct DBGFCORECPU
+{
+    uint64_t            rax;
+    uint64_t            rbx;
+    uint64_t            rcx;
+    uint64_t            rdx;
+    uint64_t            rsi;
+    uint64_t            rdi;
+    uint64_t            r8;
+    uint64_t            r9;
+    uint64_t            r10;
+    uint64_t            r11;
+    uint64_t            r12;
+    uint64_t            r13;
+    uint64_t            r14;
+    uint64_t            r15;
+    uint64_t            rip;
+    uint64_t            rsp;
+    uint64_t            rbp;
+    DBGFCORESEL         cs;
+    DBGFCORESEL         ds;
+    DBGFCORESEL         es;
+    DBGFCORESEL         fs;
+    DBGFCORESEL         gs;
+    DBGFCORESEL         ss;
+    uint64_t            cr0;
+    uint64_t            cr2;
+    uint64_t            cr3;
+    uint64_t            cr4;
+    uint64_t            dr[8];
+    DBGFCOREXDTR        gdtr;
+    DBGFCOREXDTR        idtr;
+    VBOXX86SEL          ldtr;
+    VBOXX86SEL          tr;
+    union
+    {
+        uint64_t        cs;
+        uint64_t        eip;
+        uint64_t        esp;
+    } sysenter;
+    uint64_t            msrEFER;
+    uint64_t            msrSTAR;
+    uint64_t            msrPAT;
+    uint64_t            msrLSTAR;
+    uint64_t            msrCSTAR;
+    uint64_t            msrSFMASK;
+    uint64_t            msrKernelGSBase;
+    uint64_t            msrApicBase;
+    uint64_t            aXcr[2];
+    X86XSAVEAREA        ext;
+} DBGFCORECPU;
+/** Pointer to a DBGF-core CPU. */
+typedef DBGFCORECPU *PDBGFCORECPU;
+/** Pointer to the const DBGF-core CPU. */
+typedef const DBGFCORECPU *PCDBGFCORECPU;
+AssertCompileMemberAlignment(DBGFCORECPU, cr0,     8);
+AssertCompileMemberAlignment(DBGFCORECPU, msrEFER, 8);
+AssertCompileMemberAlignment(DBGFCORECPU, ext,     8);
+AssertCompileSizeAlignment(DBGFCORECPU, 8);
 
 /**
  * The DBGF Core descriptor.
diff --git a/include/VBox/vmm/dbgfsel.h b/include/VBox/vmm/dbgfsel.h
index 2be4ee8..2e86e8a 100644
--- a/include/VBox/vmm/dbgfsel.h
+++ b/include/VBox/vmm/dbgfsel.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/dbgftrace.h b/include/VBox/vmm/dbgftrace.h
index df9b15d..b19ba25 100644
--- a/include/VBox/vmm/dbgftrace.h
+++ b/include/VBox/vmm/dbgftrace.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/gvmm.h b/include/VBox/vmm/gvmm.h
index eb86f9b..4e6b4f3 100644
--- a/include/VBox/vmm/gvmm.h
+++ b/include/VBox/vmm/gvmm.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/hm.h b/include/VBox/vmm/hm.h
index 6275bbb..2963696 100644
--- a/include/VBox/vmm/hm.h
+++ b/include/VBox/vmm/hm.h
@@ -174,8 +174,10 @@ VMMR0_INT_DECL(int)             HMR0Term(void);
 VMMR0_INT_DECL(int)             HMR0InitVM(PVM pVM);
 VMMR0_INT_DECL(int)             HMR0TermVM(PVM pVM);
 VMMR0_INT_DECL(int)             HMR0EnableAllCpus(PVM pVM);
+# ifdef VBOX_WITH_RAW_MODE
 VMMR0_INT_DECL(int)             HMR0EnterSwitcher(PVM pVM, VMMSWITCHER enmSwitcher, bool *pfVTxDisabled);
 VMMR0_INT_DECL(void)            HMR0LeaveSwitcher(PVM pVM, bool fVTxDisabled);
+# endif
 
 VMMR0_INT_DECL(void)            HMR0SavePendingIOPortWrite(PVMCPU pVCpu, RTGCPTR GCPtrRip, RTGCPTR GCPtrRipNext,
                                                            unsigned uPort, unsigned uAndVal, unsigned cbSize);
diff --git a/include/VBox/vmm/hm_vmx.h b/include/VBox/vmm/hm_vmx.h
index b583a5e..0d2da98 100644
--- a/include/VBox/vmm/hm_vmx.h
+++ b/include/VBox/vmm/hm_vmx.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/hm_vmx.mac b/include/VBox/vmm/hm_vmx.mac
index 4829425..03beb6a 100644
--- a/include/VBox/vmm/hm_vmx.mac
+++ b/include/VBox/vmm/hm_vmx.mac
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/iem.h b/include/VBox/vmm/iem.h
index 3a5f249..1f4005f 100644
--- a/include/VBox/vmm/iem.h
+++ b/include/VBox/vmm/iem.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -93,8 +93,8 @@ VMM_INT_DECL(void)   IEMNotifyMMIORead(PVM pVM, RTGCPHYS GCPhys, size_t cbValue)
 VMM_INT_DECL(void)   IEMNotifyMMIOWrite(PVM pVM, RTGCPHYS GCPhys, uint32_t u32Value, size_t cbValue);
 VMM_INT_DECL(void)   IEMNotifyIOPortRead(PVM pVM, RTIOPORT Port, size_t cbValue);
 VMM_INT_DECL(void)   IEMNotifyIOPortWrite(PVM pVM, RTIOPORT Port, uint32_t u32Value, size_t cbValue);
-VMM_INT_DECL(void)   IEMNotifyIOPortReadString(PVM pVM, RTIOPORT Port, RTGCPTR GCPtrDst, RTGCUINTREG cTransfers, size_t cbValue);
-VMM_INT_DECL(void)   IEMNotifyIOPortWriteString(PVM pVM, RTIOPORT Port, RTGCPTR GCPtrSrc, RTGCUINTREG cTransfers, size_t cbValue);
+VMM_INT_DECL(void)   IEMNotifyIOPortReadString(PVM pVM, RTIOPORT Port, void *pvDst, RTGCUINTREG cTransfers, size_t cbValue);
+VMM_INT_DECL(void)   IEMNotifyIOPortWriteString(PVM pVM, RTIOPORT Port, void const *pvSrc, RTGCUINTREG cTransfers, size_t cbValue);
 #endif
 
 
@@ -104,6 +104,7 @@ VMM_INT_DECL(void)   IEMNotifyIOPortWriteString(PVM pVM, RTIOPORT Port, RTGCPTR
 VMMR3DECL(int)      IEMR3Init(PVM pVM);
 VMMR3DECL(int)      IEMR3Term(PVM pVM);
 VMMR3DECL(void)     IEMR3Relocate(PVM pVM);
+VMMR3_INT_DECL(VBOXSTRICTRC) IEMR3DoPendingAction(PVMCPU pVCpu, VBOXSTRICTRC rcStrict);
 /** @} */
 
 /** @} */
diff --git a/include/VBox/vmm/iom.h b/include/VBox/vmm/iom.h
index 61b3a2e..9bc6300 100644
--- a/include/VBox/vmm/iom.h
+++ b/include/VBox/vmm/iom.h
@@ -163,7 +163,7 @@ RT_C_DECLS_BEGIN
  * @param   cb          Number of bytes read.
  * @remarks Caller enters the device critical section.
  */
-typedef DECLCALLBACK(int) FNIOMIOPORTIN(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb);
+typedef DECLCALLBACK(int) FNIOMIOPORTIN(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb);
 /** Pointer to a FNIOMIOPORTIN(). */
 typedef FNIOMIOPORTIN *PFNIOMIOPORTIN;
 
@@ -176,12 +176,14 @@ typedef FNIOMIOPORTIN *PFNIOMIOPORTIN;
  * @param   pDevIns     The device instance.
  * @param   pvUser      User argument.
  * @param   uPort       Port number used for the IN operation.
- * @param   pGCPtrDst   Pointer to the destination buffer (GC, incremented appropriately).
- * @param   pcTransfers Pointer to the number of transfer units to read, on return remaining transfer units.
+ * @param   pbDst       Pointer to the destination buffer.
+ * @param   pcTransfers Pointer to the number of transfer units to read, on
+ *                      return remaining transfer units.
  * @param   cb          Size of the transfer unit (1, 2 or 4 bytes).
  * @remarks Caller enters the device critical section.
  */
-typedef DECLCALLBACK(int) FNIOMIOPORTINSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrDst, PRTGCUINTREG pcTransfers, unsigned cb);
+typedef DECLCALLBACK(int) FNIOMIOPORTINSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint8_t *pbDst,
+                                              uint32_t *pcTransfers, unsigned cb);
 /** Pointer to a FNIOMIOPORTINSTRING(). */
 typedef FNIOMIOPORTINSTRING *PFNIOMIOPORTINSTRING;
 
@@ -197,7 +199,7 @@ typedef FNIOMIOPORTINSTRING *PFNIOMIOPORTINSTRING;
  * @param   cb          The value size in bytes.
  * @remarks Caller enters the device critical section.
  */
-typedef DECLCALLBACK(int) FNIOMIOPORTOUT(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
+typedef DECLCALLBACK(int) FNIOMIOPORTOUT(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb);
 /** Pointer to a FNIOMIOPORTOUT(). */
 typedef FNIOMIOPORTOUT *PFNIOMIOPORTOUT;
 
@@ -209,12 +211,14 @@ typedef FNIOMIOPORTOUT *PFNIOMIOPORTOUT;
  * @param   pDevIns     The device instance.
  * @param   pvUser      User argument.
  * @param   uPort       Port number used for the OUT operation.
- * @param   pGCPtrSrc   Pointer to the source buffer (GC, incremented appropriately).
- * @param   pcTransfers Pointer to the number of transfer units to write, on return remaining transfer units.
+ * @param   pbSrc       Pointer to the source buffer.
+ * @param   pcTransfers Pointer to the number of transfer units to write, on
+ *                      return remaining transfer units.
  * @param   cb          Size of the transfer unit (1, 2 or 4 bytes).
  * @remarks Caller enters the device critical section.
  */
-typedef DECLCALLBACK(int) FNIOMIOPORTOUTSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrSrc, PRTGCUINTREG pcTransfers, unsigned cb);
+typedef DECLCALLBACK(int) FNIOMIOPORTOUTSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, const uint8_t *pbSrc,
+                                               uint32_t *pcTransfers, unsigned cb);
 /** Pointer to a FNIOMIOPORTOUTSTRING(). */
 typedef FNIOMIOPORTOUTSTRING *PFNIOMIOPORTOUTSTRING;
 
@@ -270,8 +274,10 @@ typedef FNIOMMMIOFILL *PFNIOMMMIOFILL;
 
 VMMDECL(VBOXSTRICTRC)   IOMIOPortRead(PVM pVM, PVMCPU pVCpu, RTIOPORT Port, uint32_t *pu32Value, size_t cbValue);
 VMMDECL(VBOXSTRICTRC)   IOMIOPortWrite(PVM pVM, PVMCPU pVCpu, RTIOPORT Port, uint32_t u32Value, size_t cbValue);
-VMMDECL(VBOXSTRICTRC)   IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port, PRTGCPTR pGCPtrDst, PRTGCUINTREG pcTransfers, unsigned cb);
-VMMDECL(VBOXSTRICTRC)   IOMIOPortWriteString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port, PRTGCPTR pGCPtrSrc, PRTGCUINTREG pcTransfers, unsigned cb);
+VMM_INT_DECL(VBOXSTRICTRC) IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port, void *pvDst,
+                                               uint32_t *pcTransfers, unsigned cb);
+VMM_INT_DECL(VBOXSTRICTRC) IOMIOPortWriteString(PVM pVM, PVMCPU pVCpu, RTIOPORT uPort, void const *pvSrc,
+                                                uint32_t *pcTransfers, unsigned cb);
 VMMDECL(VBOXSTRICTRC)   IOMInterpretINSEx(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, DISCPUMODE enmAddrMode, uint32_t cbTransfer);
 VMMDECL(VBOXSTRICTRC)   IOMInterpretOUTSEx(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix, DISCPUMODE enmAddrMode, uint32_t cbTransfer);
 VMMDECL(VBOXSTRICTRC)   IOMMMIORead(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, uint32_t *pu32Value, size_t cbValue);
diff --git a/include/VBox/vmm/mm.h b/include/VBox/vmm/mm.h
index d7117a0..14b8960 100644
--- a/include/VBox/vmm/mm.h
+++ b/include/VBox/vmm/mm.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdm.h b/include/VBox/vmm/pdm.h
index 527d3d1..87cd2ad 100644
--- a/include/VBox/vmm/pdm.h
+++ b/include/VBox/vmm/pdm.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmasynccompletion.h b/include/VBox/vmm/pdmasynccompletion.h
index 7428594..bbf1d39 100644
--- a/include/VBox/vmm/pdmasynccompletion.h
+++ b/include/VBox/vmm/pdmasynccompletion.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmasynctask.h b/include/VBox/vmm/pdmasynctask.h
index 65fdd24..7f0cd03 100644
--- a/include/VBox/vmm/pdmasynctask.h
+++ b/include/VBox/vmm/pdmasynctask.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmblkcache.h b/include/VBox/vmm/pdmblkcache.h
index 14d85f6..d5c9470 100644
--- a/include/VBox/vmm/pdmblkcache.h
+++ b/include/VBox/vmm/pdmblkcache.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmcardreaderinfs.h b/include/VBox/vmm/pdmcardreaderinfs.h
index 7cb3ca7..ba4f543 100644
--- a/include/VBox/vmm/pdmcardreaderinfs.h
+++ b/include/VBox/vmm/pdmcardreaderinfs.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmcommon.h b/include/VBox/vmm/pdmcommon.h
index d62210a..abfe7da 100644
--- a/include/VBox/vmm/pdmcommon.h
+++ b/include/VBox/vmm/pdmcommon.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmcritsect.h b/include/VBox/vmm/pdmcritsect.h
index 0895b52..ad209c4 100644
--- a/include/VBox/vmm/pdmcritsect.h
+++ b/include/VBox/vmm/pdmcritsect.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -62,8 +62,10 @@ VMMR3DECL(int)      PDMR3CritSectInit(PVM pVM, PPDMCRITSECT pCritSect, RT_SRC_PO
 VMMR3DECL(int)      PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallRing3);
 VMMR3DECL(bool)     PDMR3CritSectYield(PPDMCRITSECT pCritSect);
 VMMR3DECL(const char *) PDMR3CritSectName(PCPDMCRITSECT pCritSect);
-VMMR3DECL(int)      PDMR3CritSectScheduleExitEvent(PPDMCRITSECT pCritSect, RTSEMEVENT EventToSignal);
 VMMR3DECL(int)      PDMR3CritSectDelete(PPDMCRITSECT pCritSect);
+#if defined(IN_RING0) || defined(IN_RING3)
+VMMDECL(int)        PDMHCCritSectScheduleExitEvent(PPDMCRITSECT pCritSect, SUPSEMEVENT hEventToSignal);
+#endif
 
 VMMDECL(int)        PDMCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy);
 VMMDECL(int)        PDMCritSectEnterDebug(PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL);
diff --git a/include/VBox/vmm/pdmcritsectrw.h b/include/VBox/vmm/pdmcritsectrw.h
index 9c92201..61d38cd 100644
--- a/include/VBox/vmm/pdmcritsectrw.h
+++ b/include/VBox/vmm/pdmcritsectrw.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmdev.h b/include/VBox/vmm/pdmdev.h
index f1cbdc7..c6d7fce 100644
--- a/include/VBox/vmm/pdmdev.h
+++ b/include/VBox/vmm/pdmdev.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmdrv.h b/include/VBox/vmm/pdmdrv.h
index 12cbfcc..222c3ec 100644
--- a/include/VBox/vmm/pdmdrv.h
+++ b/include/VBox/vmm/pdmdrv.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmifs.h b/include/VBox/vmm/pdmifs.h
index 764f4b4..88b4ffa 100644
--- a/include/VBox/vmm/pdmifs.h
+++ b/include/VBox/vmm/pdmifs.h
@@ -3148,6 +3148,18 @@ typedef struct PDMISCSIPORT
 /** PDMISCSIPORT interface ID. */
 #define PDMISCSIPORT_IID                        "05d9fc3b-e38c-4b30-8344-a323feebcfe5"
 
+/**
+ * LUN type.
+ */
+typedef enum PDMSCSILUNTYPE
+{
+    PDMSCSILUNTYPE_INVALID = 0,
+    PDMSCSILUNTYPE_SBC,         /** Hard disk (SBC) */
+    PDMSCSILUNTYPE_MMC,         /** CD/DVD drive (MMC) */
+    PDMSCSILUNTYPE_SSC,         /** Tape drive (SSC) */
+    PDMSCSILUNTYPE_32BIT_HACK = 0x7fffffff
+} PDMSCSILUNTYPE, *PPDMSCSILUNTYPE;
+
 
 /** Pointer to a SCSI connector interface. */
 typedef struct PDMISCSICONNECTOR *PPDMISCSICONNECTOR;
@@ -3167,6 +3179,16 @@ typedef struct PDMISCSICONNECTOR
      */
      DECLR3CALLBACKMEMBER(int, pfnSCSIRequestSend, (PPDMISCSICONNECTOR pInterface, PPDMSCSIREQUEST pSCSIRequest));
 
+    /**
+     * Queries the type of the attached LUN.
+     *
+     * @returns VBox status code.
+     * @param   pInterface      Pointer to this interface.
+     * @param   iLUN            The logical unit number.
+     * @param   pSCSIRequest    Pointer to the LUN to be returned.
+     */
+     DECLR3CALLBACKMEMBER(int, pfnQueryLUNType, (PPDMISCSICONNECTOR pInterface, uint32_t iLun, PPDMSCSILUNTYPE pLUNType));
+
 } PDMISCSICONNECTOR;
 /** PDMISCSICONNECTOR interface ID. */
 #define PDMISCSICONNECTOR_IID                   "94465fbd-a2f2-447e-88c9-7366421bfbfe"
diff --git a/include/VBox/vmm/pdmins.h b/include/VBox/vmm/pdmins.h
index 2375f3c..7ff8d3f 100644
--- a/include/VBox/vmm/pdmins.h
+++ b/include/VBox/vmm/pdmins.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmnetifs.h b/include/VBox/vmm/pdmnetifs.h
index b87ce6c..264f30d 100644
--- a/include/VBox/vmm/pdmnetifs.h
+++ b/include/VBox/vmm/pdmnetifs.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmnetinline.h b/include/VBox/vmm/pdmnetinline.h
index e60e9f6..a4509c3 100644
--- a/include/VBox/vmm/pdmnetinline.h
+++ b/include/VBox/vmm/pdmnetinline.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmnetshaper.h b/include/VBox/vmm/pdmnetshaper.h
index d361056..7259abf 100644
--- a/include/VBox/vmm/pdmnetshaper.h
+++ b/include/VBox/vmm/pdmnetshaper.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmnvram.h b/include/VBox/vmm/pdmnvram.h
index 03967df..77818c0 100644
--- a/include/VBox/vmm/pdmnvram.h
+++ b/include/VBox/vmm/pdmnvram.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmpci.h b/include/VBox/vmm/pdmpci.h
index 16d925f..9359cfa 100644
--- a/include/VBox/vmm/pdmpci.h
+++ b/include/VBox/vmm/pdmpci.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmqueue.h b/include/VBox/vmm/pdmqueue.h
index bcce9c1..88dcfa5 100644
--- a/include/VBox/vmm/pdmqueue.h
+++ b/include/VBox/vmm/pdmqueue.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmsrv.h b/include/VBox/vmm/pdmsrv.h
index 9876622..02f3398 100644
--- a/include/VBox/vmm/pdmsrv.h
+++ b/include/VBox/vmm/pdmsrv.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmthread.h b/include/VBox/vmm/pdmthread.h
index 044620c..1513c59 100644
--- a/include/VBox/vmm/pdmthread.h
+++ b/include/VBox/vmm/pdmthread.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pdmusb.h b/include/VBox/vmm/pdmusb.h
index 46b04e9..d757727 100644
--- a/include/VBox/vmm/pdmusb.h
+++ b/include/VBox/vmm/pdmusb.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -117,9 +117,8 @@ typedef const PDMUSBDESCCACHE *PCPDMUSBDESCCACHE;
  * @{ */
 /** A high-speed capable USB 2.0 device (also required to support full-speed). */
 #define PDM_USBREG_HIGHSPEED_CAPABLE        RT_BIT(0)
-/** Indicates that the device is fully emulated and is not used to pass through
- * a host device. */
-#define PDM_USBREG_EMULATED_DEVICE          RT_BIT(1)
+/** Indicates that the device implements the saved state handlers. */
+#define PDM_USBREG_SAVED_STATE_SUPPORTED    RT_BIT(1)
 /** A SuperSpeed USB 3.0 device. */
 #define PDM_USBREG_SUPERSPEED_CAPABLE       RT_BIT(2)
 /** @} */
diff --git a/include/VBox/vmm/pdmwebcaminfs.h b/include/VBox/vmm/pdmwebcaminfs.h
index 40b0161..78d337a 100644
--- a/include/VBox/vmm/pdmwebcaminfs.h
+++ b/include/VBox/vmm/pdmwebcaminfs.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/pgm.h b/include/VBox/vmm/pgm.h
index 3329268..bcab354 100644
--- a/include/VBox/vmm/pgm.h
+++ b/include/VBox/vmm/pgm.h
@@ -367,7 +367,6 @@ typedef enum PGMMODE
       || (enmProt) == PGMROMPROT_READ_ROM_WRITE_RAM )
 
 
-
 VMMDECL(bool)           PGMIsLockOwner(PVM pVM);
 
 VMMDECL(int)            PGMRegisterStringFormatTypes(void);
@@ -439,7 +438,7 @@ VMMDECL(uint32_t)   PGMHandlerPhysicalTypeRelease(PVM pVM, PGMPHYSHANDLERTYPE hT
 VMMDECL(uint32_t)   PGMHandlerPhysicalTypeRetain(PVM pVM, PGMPHYSHANDLERTYPE hType);
 
 VMMDECL(int)        PGMHandlerPhysicalRegister(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast, PGMPHYSHANDLERTYPE hType,
-                                               RTR3PTR pvUserR3, RTR0PTR pvUserR0, RTRCPTR pvUserRC, 
+                                               RTR3PTR pvUserR3, RTR0PTR pvUserR0, RTRCPTR pvUserRC,
                                                R3PTRTYPE(const char *) pszDesc);
 VMMDECL(int)        PGMHandlerPhysicalModify(PVM pVM, RTGCPHYS GCPhysCurrent, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast);
 VMMDECL(int)        PGMHandlerPhysicalDeregister(PVM pVM, RTGCPHYS GCPhys);
@@ -460,9 +459,56 @@ typedef uint32_t PGMVIRTHANDLERTYPE;
 typedef PGMVIRTHANDLERTYPE *PPGMVIRTHANDLERTYPE;
 /** NIL value for PGM virtual access handler type handle. */
 #define NIL_PGMVIRTHANDLERTYPE  UINT32_MAX
+#ifdef VBOX_WITH_RAW_MODE
 VMM_INT_DECL(uint32_t) PGMHandlerVirtualTypeRelease(PVM pVM, PGMVIRTHANDLERTYPE hType);
 VMM_INT_DECL(uint32_t) PGMHandlerVirtualTypeRetain(PVM pVM, PGMVIRTHANDLERTYPE hType);
 VMM_INT_DECL(bool)     PGMHandlerVirtualIsRegistered(PVM pVM, RTGCPTR GCPtr);
+#endif
+
+
+/**
+ * Page type.
+ *
+ * @remarks This enum has to fit in a 3-bit field (see PGMPAGE::u3Type).
+ * @remarks This is used in the saved state, so changes to it requires bumping
+ *          the saved state version.
+ * @todo    So, convert to \#defines!
+ */
+typedef enum PGMPAGETYPE
+{
+    /** The usual invalid zero entry. */
+    PGMPAGETYPE_INVALID = 0,
+    /** RAM page. (RWX) */
+    PGMPAGETYPE_RAM,
+    /** MMIO2 page. (RWX) */
+    PGMPAGETYPE_MMIO2,
+    /** MMIO2 page aliased over an MMIO page. (RWX)
+     * See PGMHandlerPhysicalPageAlias(). */
+    PGMPAGETYPE_MMIO2_ALIAS_MMIO,
+    /** Special page aliased over an MMIO page. (RWX)
+     * See PGMHandlerPhysicalPageAliasHC(), but this is generally only used for
+     * VT-x's APIC access page at the moment.  Treated as MMIO by everyone except
+     * the shadow paging code. */
+    PGMPAGETYPE_SPECIAL_ALIAS_MMIO,
+    /** Shadowed ROM. (RWX) */
+    PGMPAGETYPE_ROM_SHADOW,
+    /** ROM page. (R-X) */
+    PGMPAGETYPE_ROM,
+    /** MMIO page. (---) */
+    PGMPAGETYPE_MMIO,
+    /** End of valid entries. */
+    PGMPAGETYPE_END
+} PGMPAGETYPE;
+AssertCompile(PGMPAGETYPE_END == 8);
+
+VMM_INT_DECL(PGMPAGETYPE) PGMPhysGetPageType(PVM pVM, RTGCPHYS GCPhys);
+
+VMM_INT_DECL(int)   PGMPhysGCPhys2HCPhys(PVM pVM, RTGCPHYS GCPhys, PRTHCPHYS pHCPhys);
+VMM_INT_DECL(int)   PGMPhysGCPtr2HCPhys(PVMCPU pVCpu, RTGCPTR GCPtr, PRTHCPHYS pHCPhys);
+VMM_INT_DECL(int)   PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock);
+VMM_INT_DECL(int)   PGMPhysGCPhys2CCPtrReadOnly(PVM pVM, RTGCPHYS GCPhys, void const **ppv, PPGMPAGEMAPLOCK pLock);
+VMM_INT_DECL(int)   PGMPhysGCPtr2CCPtr(PVMCPU pVCpu, RTGCPTR GCPtr, void **ppv, PPGMPAGEMAPLOCK pLock);
+VMM_INT_DECL(int)   PGMPhysGCPtr2CCPtrReadOnly(PVMCPU pVCpu, RTGCPTR GCPtr, void const **ppv, PPGMPAGEMAPLOCK pLock);
 
 VMMDECL(bool)       PGMPhysIsA20Enabled(PVMCPU pVCpu);
 VMMDECL(bool)       PGMPhysIsGCPhysValid(PVM pVM, RTGCPHYS GCPhys);
@@ -480,7 +526,10 @@ VMMDECL(void)       PGMPhysReleasePageMappingLock(PVM pVM, PPGMPAGEMAPLOCK pLock
  */
 #ifdef IN_RING3
 # define PGM_PHYS_RW_IS_SUCCESS(a_rcStrict) \
-    (   (a_rcStrict) == VINF_SUCCESS )
+    (   (a_rcStrict) == VINF_SUCCESS \
+     || (a_rcStrict) == VINF_EM_DBG_STOP \
+     || (a_rcStrict) == VINF_EM_DBG_BREAKPOINT \
+    )
 #elif defined(IN_RING0)
 # define PGM_PHYS_RW_IS_SUCCESS(a_rcStrict) \
     (   (a_rcStrict) == VINF_SUCCESS \
@@ -488,6 +537,8 @@ VMMDECL(void)       PGMPhysReleasePageMappingLock(PVM pVM, PPGMPAGEMAPLOCK pLock
      || (a_rcStrict) == VINF_EM_SUSPEND \
      || (a_rcStrict) == VINF_EM_RESET \
      || (a_rcStrict) == VINF_EM_HALT \
+     || (a_rcStrict) == VINF_EM_DBG_STOP \
+     || (a_rcStrict) == VINF_EM_DBG_BREAKPOINT \
     )
 #elif defined(IN_RC)
 # define PGM_PHYS_RW_IS_SUCCESS(a_rcStrict) \
@@ -498,6 +549,8 @@ VMMDECL(void)       PGMPhysReleasePageMappingLock(PVM pVM, PPGMPAGEMAPLOCK pLock
      || (a_rcStrict) == VINF_EM_HALT \
      || (a_rcStrict) == VINF_SELM_SYNC_GDT \
      || (a_rcStrict) == VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT \
+     || (a_rcStrict) == VINF_EM_DBG_STOP \
+     || (a_rcStrict) == VINF_EM_DBG_BREAKPOINT \
     )
 #endif
 /** @def PGM_PHYS_RW_DO_UPDATE_STRICT_RC
@@ -631,6 +684,7 @@ VMMR3_INT_DECL(int) PGMR3InitCompleted(PVM pVM, VMINITCOMPLETED enmWhat);
 VMMR3DECL(void)     PGMR3Relocate(PVM pVM, RTGCINTPTR offDelta);
 VMMR3DECL(void)     PGMR3ResetCpu(PVM pVM, PVMCPU pVCpu);
 VMMR3_INT_DECL(void)    PGMR3Reset(PVM pVM);
+VMMR3_INT_DECL(void)    PGMR3ResetNoMorePhysWritesFlag(PVM pVM);
 VMMR3_INT_DECL(void)    PGMR3MemSetup(PVM pVM, bool fReset);
 VMMR3DECL(int)      PGMR3Term(PVM pVM);
 VMMR3DECL(int)      PGMR3LockCall(PVM pVM);
@@ -701,6 +755,7 @@ VMMR3DECL(int)      PGMR3HandlerPhysicalTypeRegister(PVM pVM, PGMPHYSHANDLERKIND
                                                      const char *pszModRC, const char *pszHandlerRC, const char *pszPfHandlerRC,
                                                      const char *pszDesc,
                                                      PPGMPHYSHANDLERTYPE phType);
+#ifdef VBOX_WITH_RAW_MODE
 VMMR3_INT_DECL(int) PGMR3HandlerVirtualTypeRegisterEx(PVM pVM, PGMVIRTHANDLERKIND enmKind, bool fRelocUserRC,
                                                       PFNPGMR3VIRTINVALIDATE pfnInvalidateR3,
                                                       PFNPGMVIRTHANDLER pfnHandlerR3,
@@ -716,6 +771,7 @@ VMMR3_INT_DECL(int) PGMR3HandlerVirtualRegister(PVM pVM, PVMCPU pVCpu, PGMVIRTHA
                                                 RTGCPTR GCPtrLast, void *pvUserR3, RTRCPTR pvUserRC, const char *pszDesc);
 VMMR3_INT_DECL(int) PGMHandlerVirtualChangeType(PVM pVM, RTGCPTR GCPtr, PGMVIRTHANDLERTYPE hNewType);
 VMMR3_INT_DECL(int) PGMHandlerVirtualDeregister(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, bool fHypervisor);
+#endif
 VMMR3DECL(int)      PGMR3PoolGrow(PVM pVM);
 
 VMMR3DECL(int)      PGMR3PhysTlbGCPhys2Ptr(PVM pVM, RTGCPHYS GCPhys, bool fWritable, void **ppv);
diff --git a/include/VBox/vmm/ssm.h b/include/VBox/vmm/ssm.h
index 5d7dda9..3ac7ef8 100644
--- a/include/VBox/vmm/ssm.h
+++ b/include/VBox/vmm/ssm.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/stam.h b/include/VBox/vmm/stam.h
index dd24fa4..67f9e40 100644
--- a/include/VBox/vmm/stam.h
+++ b/include/VBox/vmm/stam.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/stam.mac b/include/VBox/vmm/stam.mac
index 5e0fd65..4d4e37a 100644
--- a/include/VBox/vmm/stam.mac
+++ b/include/VBox/vmm/stam.mac
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/trpm.mac b/include/VBox/vmm/trpm.mac
index 534039e..474875e 100644
--- a/include/VBox/vmm/trpm.mac
+++ b/include/VBox/vmm/trpm.mac
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/uvm.h b/include/VBox/vmm/uvm.h
index b846734..4aca1c9 100644
--- a/include/VBox/vmm/uvm.h
+++ b/include/VBox/vmm/uvm.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/vm.h b/include/VBox/vmm/vm.h
index b4047dc..daeac5c 100644
--- a/include/VBox/vmm/vm.h
+++ b/include/VBox/vmm/vm.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -282,9 +282,9 @@ typedef struct VMCPU
 /** @} */
 
 
-/** The name of the Guest Context VMM Core module. */
-#define VMMRC_MAIN_MODULE_NAME          "VMMGC.gc"
-/** The name of the Ring 0 Context VMM Core module. */
+/** The name of the raw-mode context VMM Core module. */
+#define VMMRC_MAIN_MODULE_NAME          "VMMRC.rc"
+/** The name of the ring-0 context VMM Core module. */
 #define VMMR0_MAIN_MODULE_NAME          "VMMR0.r0"
 
 /**
@@ -372,6 +372,10 @@ typedef struct VMCPU
 #define VMCPU_FF_PDM_CRITSECT               RT_BIT_32(5)
 /** This action forces the VCPU out of the halted state. */
 #define VMCPU_FF_UNHALT                     RT_BIT_32(6)
+/** Pending IEM action (bit number). */
+#define VMCPU_FF_IEM_BIT                    7
+/** Pending IEM action (mask). */
+#define VMCPU_FF_IEM                        RT_BIT_32(VMCPU_FF_IEM_BIT)
 /** This action forces the VM to service pending requests from other
  * thread or requests which must be executed in another context. */
 #define VMCPU_FF_REQUEST                    RT_BIT_32(9)
@@ -456,7 +460,7 @@ typedef struct VMCPU
 #define VM_FF_HIGH_PRIORITY_POST_MASK           (VM_FF_PGM_NO_MEMORY)
 /** High priority post-execution actions. */
 #define VMCPU_FF_HIGH_PRIORITY_POST_MASK        (  VMCPU_FF_PDM_CRITSECT | VM_WHEN_RAW_MODE(VMCPU_FF_CSAM_PENDING_ACTION, 0) \
-                                                 | VMCPU_FF_HM_UPDATE_CR3 | VMCPU_FF_HM_UPDATE_PAE_PDPES)
+                                                 | VMCPU_FF_HM_UPDATE_CR3 | VMCPU_FF_HM_UPDATE_PAE_PDPES | VMCPU_FF_IEM)
 
 /** Normal priority VM post-execution actions. */
 #define VM_FF_NORMAL_PRIORITY_POST_MASK         (  VM_FF_CHECK_VM_STATE | VM_FF_DBGF | VM_FF_RESET \
@@ -477,7 +481,7 @@ typedef struct VMCPU
 #define VM_FF_HM_TO_R3_MASK                     (  VM_FF_TM_VIRTUAL_SYNC | VM_FF_PGM_NEED_HANDY_PAGES | VM_FF_PGM_NO_MEMORY \
                                                  | VM_FF_PDM_QUEUES | VM_FF_EMT_RENDEZVOUS)
 /** VMCPU Flags that cause the HM loops to go back to ring-3. */
-#define VMCPU_FF_HM_TO_R3_MASK                  (VMCPU_FF_TO_R3 | VMCPU_FF_TIMER | VMCPU_FF_PDM_CRITSECT)
+#define VMCPU_FF_HM_TO_R3_MASK                  (VMCPU_FF_TO_R3 | VMCPU_FF_TIMER | VMCPU_FF_PDM_CRITSECT | VMCPU_FF_IEM)
 
 /** High priority ring-0 VM pre HM-mode execution mask. */
 #define VM_FF_HP_R0_PRE_HM_MASK                 (VM_FF_HM_TO_R3_MASK | VM_FF_REQUEST | VM_FF_PGM_POOL_FLUSH_PENDING | VM_FF_PDM_DMA)
@@ -1181,8 +1185,8 @@ typedef struct VM
 RT_C_DECLS_BEGIN
 
 /** The VM structure.
- * This is imported from the VMMGCBuiltin module, i.e. it's a one
- * of those magic globals which we should avoid using.
+ * This is imported from the VMMRCBuiltin module, i.e. it's a one of those magic
+ * globals which we should avoid using.
  */
 extern DECLIMPORT(VM)   g_VM;
 
diff --git a/include/VBox/vmm/vm.mac b/include/VBox/vmm/vm.mac
index e8662d4..4476b7b 100644
--- a/include/VBox/vmm/vm.mac
+++ b/include/VBox/vmm/vm.mac
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2014 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/vmapi.h b/include/VBox/vmm/vmapi.h
index 7f5d1ba..9cbc880 100644
--- a/include/VBox/vmm/vmapi.h
+++ b/include/VBox/vmm/vmapi.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vmm/vmm.h b/include/VBox/vmm/vmm.h
index 20ccd04..fa8bc63 100644
--- a/include/VBox/vmm/vmm.h
+++ b/include/VBox/vmm/vmm.h
@@ -534,9 +534,9 @@ VMMR0_INT_DECL(bool) VMMR0IsLogFlushDisabled(PVMCPU pVCpu);
 /** @defgroup grp_vmm_rc    The VMM Raw-Mode Context API
  * @{
  */
-VMMRCDECL(int)      VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...);
-VMMRCDECL(void)     VMMGCGuestToHost(PVM pVM, int rc);
-VMMRCDECL(void)     VMMGCLogFlushIfFull(PVM pVM);
+VMMRCDECL(int)      VMMRCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...);
+VMMRCDECL(void)     VMMRCGuestToHost(PVM pVM, int rc);
+VMMRCDECL(void)     VMMRCLogFlushIfFull(PVM pVM);
 /** @} */
 #endif /* IN_RC */
 
diff --git a/include/VBox/vrdpusb.h b/include/VBox/vrdpusb.h
index 34ff468..166f62d 100644
--- a/include/VBox/vrdpusb.h
+++ b/include/VBox/vrdpusb.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/VBox/vscsi.h b/include/VBox/vscsi.h
index 96249d2..e69158d 100644
--- a/include/VBox/vscsi.h
+++ b/include/VBox/vscsi.h
@@ -233,15 +233,15 @@ VBOXDDU_DECL(int) VSCSIDeviceLunDetach(VSCSIDEVICE hVScsiDevice, uint32_t iLun,
                                        PVSCSILUN phVScsiLun);
 
 /**
- * Return the SCSI LUN handle.
+ * Query the SCSI LUN type.
  *
  * @returns VBox status code.
  * @param   hVScsiDevice    The SCSI device handle.
  * @param   iLun            The LUN number to get.
- * @param   phVScsiLun      Where to store the LUN handle.
+ * @param   pEnmLunType     Where to store the LUN type.
  */
-VBOXDDU_DECL(int) VSCSIDeviceLunGet(VSCSIDEVICE hVScsiDevice, uint32_t iLun,
-                                    PVSCSILUN phVScsiLun);
+VBOXDDU_DECL(int) VSCSIDeviceLunQueryType(VSCSIDEVICE hVScsiDevice, uint32_t iLun,
+                                          PVSCSILUNTYPE pEnmLunType);
 
 /**
  * Enqueue a request to the SCSI device.
diff --git a/include/VBox/vusb.h b/include/VBox/vusb.h
index 4442265..88e9b22 100644
--- a/include/VBox/vusb.h
+++ b/include/VBox/vusb.h
@@ -882,13 +882,13 @@ typedef struct VUSBIDEVICE
     DECLR3CALLBACKMEMBER(VUSBDEVICESTATE, pfnGetState,(PVUSBIDEVICE pInterface));
 
     /**
-     * Returns whether the device is completely emulated.
+     * Returns whether the device implements the saved state handlers
+     * and doesn't need to get detached.
      *
-     * @returns true if the device is fully emulated and doesn't pass through
-     *          a host device, false otherwise.
+     * @returns true if the device supports saving the state, false otherwise.
      * @param   pInterface      Pointer to the device interface structure.
      */
-    DECLR3CALLBACKMEMBER(bool, pfnIsEmulated,(PVUSBIDEVICE pInterface));
+    DECLR3CALLBACKMEMBER(bool, pfnIsSavedStateSupported,(PVUSBIDEVICE pInterface));
 
     /**
      * Get the speed the device is operating at.
@@ -968,15 +968,11 @@ DECLINLINE(VUSBDEVICESTATE) VUSBIDevGetState(PVUSBIDEVICE pInterface)
 }
 
 /**
- * Returns whether the device is completely emulated.
- *
- * @returns true if the device is fully emulated and doesn't pass through
- *          a host device, false otherwise.
- * @param   pInterface      Pointer to the device interface structure.
+ * @copydoc VUSBIDEVICE::pfnIsSaveStateSupported
  */
-DECLINLINE(bool) VUSBIDevIsEmulated(PVUSBIDEVICE pInterface)
+DECLINLINE(bool) VUSBIDevIsSavedStateSupported(PVUSBIDEVICE pInterface)
 {
-    return pInterface->pfnIsEmulated(pInterface);
+    return pInterface->pfnIsSavedStateSupported(pInterface);
 }
 #endif /* IN_RING3 */
 
@@ -1091,6 +1087,10 @@ typedef struct VUSBURB
     uint32_t        u32Magic;
     /** The USR state. */
     VUSBURBSTATE    enmState;
+    /** Flag whether the URB is about to be completed,
+     * either by the I/O thread or the cancellation worker.
+     */
+    volatile bool   fCompleting;
     /** URB description, can be null. intended for logging. */
     char           *pszDesc;
 
diff --git a/include/iprt/aiomgr.h b/include/iprt/aiomgr.h
index 651d29e..c391071 100644
--- a/include/iprt/aiomgr.h
+++ b/include/iprt/aiomgr.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/alloc.h b/include/iprt/alloc.h
index 783c189..05a2964 100644
--- a/include/iprt/alloc.h
+++ b/include/iprt/alloc.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/asm-amd64-x86.h b/include/iprt/asm-amd64-x86.h
index 5d172b6..b3a5e12 100644
--- a/include/iprt/asm-amd64-x86.h
+++ b/include/iprt/asm-amd64-x86.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/asm-math.h b/include/iprt/asm-math.h
index a83e9f0..6de8e96 100644
--- a/include/iprt/asm-math.h
+++ b/include/iprt/asm-math.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/asm.h b/include/iprt/asm.h
index ee49f21..cc7ea3e 100644
--- a/include/iprt/asm.h
+++ b/include/iprt/asm.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/asmdefs.mac b/include/iprt/asmdefs.mac
index 56c440a..bc458e6 100644
--- a/include/iprt/asmdefs.mac
+++ b/include/iprt/asmdefs.mac
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/asn1-generator-asn1-decoder.h b/include/iprt/asn1-generator-asn1-decoder.h
index b22eb8b..da9661b 100644
--- a/include/iprt/asn1-generator-asn1-decoder.h
+++ b/include/iprt/asn1-generator-asn1-decoder.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/asn1-generator-core.h b/include/iprt/asn1-generator-core.h
index 62fe20a..d81f754 100644
--- a/include/iprt/asn1-generator-core.h
+++ b/include/iprt/asn1-generator-core.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/asn1-generator-init.h b/include/iprt/asn1-generator-init.h
index 4dbb0bc..4bfdeed 100644
--- a/include/iprt/asn1-generator-init.h
+++ b/include/iprt/asn1-generator-init.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/asn1-generator-internal-header.h b/include/iprt/asn1-generator-internal-header.h
index 0d47dfe..e4589d0 100644
--- a/include/iprt/asn1-generator-internal-header.h
+++ b/include/iprt/asn1-generator-internal-header.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/asn1-generator-pass.h b/include/iprt/asn1-generator-pass.h
index b032b75..caf87dd 100644
--- a/include/iprt/asn1-generator-pass.h
+++ b/include/iprt/asn1-generator-pass.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/asn1-generator-sanity.h b/include/iprt/asn1-generator-sanity.h
index 4b36a29..f0a1f83 100644
--- a/include/iprt/asn1-generator-sanity.h
+++ b/include/iprt/asn1-generator-sanity.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/asn1.h b/include/iprt/asn1.h
index 987e3a2..c50d705 100644
--- a/include/iprt/asn1.h
+++ b/include/iprt/asn1.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/assert.h b/include/iprt/assert.h
index 981402c..031a327 100644
--- a/include/iprt/assert.h
+++ b/include/iprt/assert.h
@@ -502,7 +502,7 @@ RT_C_DECLS_END
         { /* likely */ } \
         else \
         { \
-            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
             RTAssertPanic(); \
         } \
     } while (0)
@@ -524,7 +524,7 @@ RT_C_DECLS_END
         { /* likely */ } \
         else \
         { \
-            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
             RTAssertPanic(); \
             stmt; \
         } \
@@ -556,7 +556,7 @@ RT_C_DECLS_END
         { /* likely */ } \
         else \
         { \
-            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
             RTAssertPanic(); \
             return (rc); \
         } \
@@ -621,7 +621,7 @@ RT_C_DECLS_END
         { /* likely */ } \
         else \
         { \
-            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
             RTAssertPanic(); \
             return; \
         } \
@@ -738,7 +738,7 @@ RT_C_DECLS_END
         { /* likely */ } \
         else \
         { \
-            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
             RTAssertMsg2Weak a; \
             RTAssertPanic(); \
         } \
@@ -797,7 +797,7 @@ RT_C_DECLS_END
         { /* likely */ } \
         else \
         { \
-            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
             RTAssertMsg2Weak a; \
             RTAssertPanic(); \
             return (rc); \
@@ -866,7 +866,7 @@ RT_C_DECLS_END
         { /* likely */ } \
         else \
         { \
-            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+            RTAssertMsg1Weak(#expr, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
             RTAssertMsg2Weak a; \
             RTAssertPanic(); \
             return; \
@@ -983,7 +983,7 @@ RT_C_DECLS_END
 #ifdef RT_STRICT
 # define AssertFailed()  \
     do { \
-        RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+        RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
         RTAssertPanic(); \
     } while (0)
 #else
@@ -1120,7 +1120,7 @@ RT_C_DECLS_END
 #ifdef RT_STRICT
 # define AssertMsgFailed(a)  \
     do { \
-        RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+        RTAssertMsg1Weak((const char *)0, __LINE__, __FILE__, RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
         RTAssertMsg2Weak a; \
         RTAssertPanic(); \
     } while (0)
diff --git a/include/iprt/base64.h b/include/iprt/base64.h
index 00cd035..58644cd 100644
--- a/include/iprt/base64.h
+++ b/include/iprt/base64.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/bignum.h b/include/iprt/bignum.h
index 29e159d..0733067 100644
--- a/include/iprt/bignum.h
+++ b/include/iprt/bignum.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/buildconfig.h b/include/iprt/buildconfig.h
index 8853fb8..c43157a 100644
--- a/include/iprt/buildconfig.h
+++ b/include/iprt/buildconfig.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cdefs.h b/include/iprt/cdefs.h
index 5bea523..e99d44f 100644
--- a/include/iprt/cdefs.h
+++ b/include/iprt/cdefs.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cidr.h b/include/iprt/cidr.h
index 8e56453..1709cf6 100644
--- a/include/iprt/cidr.h
+++ b/include/iprt/cidr.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/circbuf.h b/include/iprt/circbuf.h
index 99f0d82..c689c7a 100644
--- a/include/iprt/circbuf.h
+++ b/include/iprt/circbuf.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/condvar.h b/include/iprt/condvar.h
index 98e5e2d..d416ad5 100644
--- a/include/iprt/condvar.h
+++ b/include/iprt/condvar.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/coredumper.h b/include/iprt/coredumper.h
index 6c748bb..b115be4 100644
--- a/include/iprt/coredumper.h
+++ b/include/iprt/coredumper.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cpp/autores.h b/include/iprt/cpp/autores.h
index 0edad23..1cf6783 100644
--- a/include/iprt/cpp/autores.h
+++ b/include/iprt/cpp/autores.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cpp/exception.h b/include/iprt/cpp/exception.h
index 4fcbfb7..4f94c5a 100644
--- a/include/iprt/cpp/exception.h
+++ b/include/iprt/cpp/exception.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cpp/list.h b/include/iprt/cpp/list.h
index b0da2d7..2a1f2af 100644
--- a/include/iprt/cpp/list.h
+++ b/include/iprt/cpp/list.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cpp/lock.h b/include/iprt/cpp/lock.h
index 1ea6c3c..319127d 100644
--- a/include/iprt/cpp/lock.h
+++ b/include/iprt/cpp/lock.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cpp/mem.h b/include/iprt/cpp/mem.h
index 66f6ab9..1e70ecf 100644
--- a/include/iprt/cpp/mem.h
+++ b/include/iprt/cpp/mem.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cpp/meta.h b/include/iprt/cpp/meta.h
index 81249d2..bdb0a86 100644
--- a/include/iprt/cpp/meta.h
+++ b/include/iprt/cpp/meta.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cpp/ministring.h b/include/iprt/cpp/ministring.h
index 606cd9d..df479ea 100644
--- a/include/iprt/cpp/ministring.h
+++ b/include/iprt/cpp/ministring.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2007-2014 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cpp/mtlist.h b/include/iprt/cpp/mtlist.h
index de13464..e512141 100644
--- a/include/iprt/cpp/mtlist.h
+++ b/include/iprt/cpp/mtlist.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cpp/xml.h b/include/iprt/cpp/xml.h
index d45ce74..8bc102e 100644
--- a/include/iprt/cpp/xml.h
+++ b/include/iprt/cpp/xml.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/cpuset.h b/include/iprt/cpuset.h
index 4c0803c..e79256e 100644
--- a/include/iprt/cpuset.h
+++ b/include/iprt/cpuset.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/crc.h b/include/iprt/crc.h
index deb7936..5b5a708 100644
--- a/include/iprt/crc.h
+++ b/include/iprt/crc.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/critsect.h b/include/iprt/critsect.h
index 5d93959..c7a0c22 100644
--- a/include/iprt/critsect.h
+++ b/include/iprt/critsect.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -210,7 +210,7 @@ RTDECL(int) RTCritSectTryEnter(PRTCRITSECT pCritSect);
  */
 RTDECL(int) RTCritSectTryEnterDebug(PRTCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL);
 
-#ifdef IN_RING3 /* Crazy APIs: ring-3 only. */
+# ifdef IN_RING3 /* Crazy APIs: ring-3 only. */
 
 /**
  * Enter multiple critical sections.
@@ -251,7 +251,7 @@ RTDECL(int) RTCritSectEnterMultiple(size_t cCritSects, PRTCRITSECT *papCritSects
  */
 RTDECL(int) RTCritSectEnterMultipleDebug(size_t cCritSects, PRTCRITSECT *papCritSects, RTUINTPTR uId, RT_SRC_POS_DECL);
 
-#endif /* IN_RING3 */
+# endif /* IN_RING3 */
 
 /**
  * Leave a critical section.
diff --git a/include/iprt/crypto/digest.h b/include/iprt/crypto/digest.h
index 374196b..b3ea5c3 100644
--- a/include/iprt/crypto/digest.h
+++ b/include/iprt/crypto/digest.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/crypto/pem.h b/include/iprt/crypto/pem.h
index 616ffad..b1350ad 100644
--- a/include/iprt/crypto/pem.h
+++ b/include/iprt/crypto/pem.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/crypto/pkcs7.h b/include/iprt/crypto/pkcs7.h
index bffb6c5..a6b88cf 100644
--- a/include/iprt/crypto/pkcs7.h
+++ b/include/iprt/crypto/pkcs7.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/crypto/pkix.h b/include/iprt/crypto/pkix.h
index d2714e2..80cfeea 100644
--- a/include/iprt/crypto/pkix.h
+++ b/include/iprt/crypto/pkix.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/crypto/rsa.h b/include/iprt/crypto/rsa.h
index 543294e..8b13de9 100644
--- a/include/iprt/crypto/rsa.h
+++ b/include/iprt/crypto/rsa.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/crypto/spc.h b/include/iprt/crypto/spc.h
index d521145..7cca0f2 100644
--- a/include/iprt/crypto/spc.h
+++ b/include/iprt/crypto/spc.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/crypto/store.h b/include/iprt/crypto/store.h
index 7c10a16..b974285 100644
--- a/include/iprt/crypto/store.h
+++ b/include/iprt/crypto/store.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/crypto/taf.h b/include/iprt/crypto/taf.h
index 99c27e1..d975754 100644
--- a/include/iprt/crypto/taf.h
+++ b/include/iprt/crypto/taf.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/crypto/tsp.h b/include/iprt/crypto/tsp.h
index 636a89a..128bf43 100644
--- a/include/iprt/crypto/tsp.h
+++ b/include/iprt/crypto/tsp.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/crypto/x509.h b/include/iprt/crypto/x509.h
index eb1957d..68a5a88 100644
--- a/include/iprt/crypto/x509.h
+++ b/include/iprt/crypto/x509.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/ctype.h b/include/iprt/ctype.h
index e97b00d..dcf1ac6 100644
--- a/include/iprt/ctype.h
+++ b/include/iprt/ctype.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/dbg.h b/include/iprt/dbg.h
index 5bdce4f..23f68c8 100644
--- a/include/iprt/dbg.h
+++ b/include/iprt/dbg.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/dir.h b/include/iprt/dir.h
index b866c5c..73aa559 100644
--- a/include/iprt/dir.h
+++ b/include/iprt/dir.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/dvm.h b/include/iprt/dvm.h
index 4501856..d17ad90 100644
--- a/include/iprt/dvm.h
+++ b/include/iprt/dvm.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/env.h b/include/iprt/env.h
index abb424d..5bd23a9 100644
--- a/include/iprt/env.h
+++ b/include/iprt/env.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/err.mac b/include/iprt/err.mac
index ab5fc9c..76f14e3 100644
--- a/include/iprt/err.mac
+++ b/include/iprt/err.mac
@@ -406,6 +406,9 @@
 %define VERR_ENV_VAR_NOT_FOUND    (-750)
 %define VINF_ENV_VAR_NOT_FOUND    (750)
 %define VWRN_ENV_NOT_FULLY_TRANSLATED    (751)
+%define VERR_ENV_INVALID_VAR_NAME    (-752)
+%define VINF_ENV_VAR_UNSET    (753)
+%define VERR_ENV_VAR_UNSET    (-753)
 %define VERR_CPU_OFFLINE    (-800)
 %define VERR_CPU_NOT_FOUND    (-801)
 %define VERR_NOT_ALL_CPUS_SHOWED    (-802)
diff --git a/include/iprt/err.sed b/include/iprt/err.sed
index 89cfeaf..bce2a9f 100644
--- a/include/iprt/err.sed
+++ b/include/iprt/err.sed
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/errno.h b/include/iprt/errno.h
index ee57065..98dde9c 100644
--- a/include/iprt/errno.h
+++ b/include/iprt/errno.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/file.h b/include/iprt/file.h
index 351a994..b2e9df5 100644
--- a/include/iprt/file.h
+++ b/include/iprt/file.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/filesystem.h b/include/iprt/filesystem.h
index 46b15e7..2fef661 100644
--- a/include/iprt/filesystem.h
+++ b/include/iprt/filesystem.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/formats/asn1.h b/include/iprt/formats/asn1.h
index 2e0ef4b..2893422 100644
--- a/include/iprt/formats/asn1.h
+++ b/include/iprt/formats/asn1.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/formats/codeview.h b/include/iprt/formats/codeview.h
index b40e8f6..405fc46 100644
--- a/include/iprt/formats/codeview.h
+++ b/include/iprt/formats/codeview.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/formats/hfs.h b/include/iprt/formats/hfs.h
index 77d31b6..7788877 100644
--- a/include/iprt/formats/hfs.h
+++ b/include/iprt/formats/hfs.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/formats/mach-o.h b/include/iprt/formats/mach-o.h
index 6f51c8d..2af083d 100644
--- a/include/iprt/formats/mach-o.h
+++ b/include/iprt/formats/mach-o.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/formats/mz.mac b/include/iprt/formats/mz.mac
index bdcd45f..1006a26 100644
--- a/include/iprt/formats/mz.mac
+++ b/include/iprt/formats/mz.mac
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/formats/pe.mac b/include/iprt/formats/pe.mac
index 0d23ef5..1aefea3 100644
--- a/include/iprt/formats/pe.mac
+++ b/include/iprt/formats/pe.mac
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/formats/xar.h b/include/iprt/formats/xar.h
index 5cb1eaa..666cd5f 100644
--- a/include/iprt/formats/xar.h
+++ b/include/iprt/formats/xar.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/fs.h b/include/iprt/fs.h
index 3055bf4..7b720be 100644
--- a/include/iprt/fs.h
+++ b/include/iprt/fs.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/getopt.h b/include/iprt/getopt.h
index 4bc4f89..ea9ccfb 100644
--- a/include/iprt/getopt.h
+++ b/include/iprt/getopt.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/handle.h b/include/iprt/handle.h
index 2d06db1..f11b722 100644
--- a/include/iprt/handle.h
+++ b/include/iprt/handle.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/handletable.h b/include/iprt/handletable.h
index c26f787..7f13a1e 100644
--- a/include/iprt/handletable.h
+++ b/include/iprt/handletable.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/heap.h b/include/iprt/heap.h
index 4151fac..a4ebcdc 100644
--- a/include/iprt/heap.h
+++ b/include/iprt/heap.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/http.h b/include/iprt/http.h
index 4dcb10a..ca7cc5b 100644
--- a/include/iprt/http.h
+++ b/include/iprt/http.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/initterm.h b/include/iprt/initterm.h
index 47d1823..e87e1f2 100644
--- a/include/iprt/initterm.h
+++ b/include/iprt/initterm.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/isofs.h b/include/iprt/isofs.h
index e6f3356..118ba9f 100644
--- a/include/iprt/isofs.h
+++ b/include/iprt/isofs.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/ldr.h b/include/iprt/ldr.h
index 525f1b3..5e8edc9 100644
--- a/include/iprt/ldr.h
+++ b/include/iprt/ldr.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -278,14 +278,18 @@ RTDECL(int) RTLdrLoadEx(const char *pszFilename, PRTLDRMOD phLdrMod, uint32_t fF
  * @{ */
 /** Symbols defined in this library are not made available to resolve
  * references in subsequently loaded libraries (default). */
-#define RTLDRLOAD_FLAGS_LOCAL       UINT32_C(0)
+#define RTLDRLOAD_FLAGS_LOCAL                   UINT32_C(0)
 /** Symbols defined in this library will be made available for symbol
  * resolution of subsequently loaded libraries. */
-#define RTLDRLOAD_FLAGS_GLOBAL      RT_BIT_32(0)
+#define RTLDRLOAD_FLAGS_GLOBAL                  RT_BIT_32(0)
 /** Do not unload the library upon RTLdrClose. (For system libs.) */
-#define RTLDRLOAD_FLAGS_NO_UNLOAD   RT_BIT_32(1)
+#define RTLDRLOAD_FLAGS_NO_UNLOAD               RT_BIT_32(1)
+/** Windows/NT: Search the DLL load directory for imported DLLs - W7,
+ *  Vista, and W2K8 requires KB2533623 to be installed to support this; not
+ *  supported on XP, W2K3 or earlier.  Ignored on other platforms. */
+#define RTLDRLOAD_FLAGS_NT_SEARCH_DLL_LOAD_DIR  RT_BIT_32(2)
 /** The mask of valid flag bits. */
-#define RTLDRLOAD_FLAGS_VALID_MASK  UINT32_C(0x00000003)
+#define RTLDRLOAD_FLAGS_VALID_MASK              UINT32_C(0x00000007)
 /** @} */
 
 /**
diff --git a/include/iprt/ldrlazy.h b/include/iprt/ldrlazy.h
index addfa36..1150cb2 100644
--- a/include/iprt/ldrlazy.h
+++ b/include/iprt/ldrlazy.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/linux/sysfs.h b/include/iprt/linux/sysfs.h
index 631ad22..aad946d 100644
--- a/include/iprt/linux/sysfs.h
+++ b/include/iprt/linux/sysfs.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/list.h b/include/iprt/list.h
index 5ad9d68..283f703 100644
--- a/include/iprt/list.h
+++ b/include/iprt/list.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/localipc.h b/include/iprt/localipc.h
index 60ee139..f5e8ce8 100644
--- a/include/iprt/localipc.h
+++ b/include/iprt/localipc.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/lockvalidator.h b/include/iprt/lockvalidator.h
index b088b1e..9bb784d 100644
--- a/include/iprt/lockvalidator.h
+++ b/include/iprt/lockvalidator.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/log.h b/include/iprt/log.h
index 1cf20fe..afa1bad 100644
--- a/include/iprt/log.h
+++ b/include/iprt/log.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -731,7 +731,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define LogFunc(a)   _LogIt(RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define LogFunc(a)   _LogIt(RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define LogFunc(a)   do { Log((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log(a); } while (0)
 #endif
@@ -745,7 +745,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define Log2Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_2, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define Log2Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_2, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define Log2Func(a)  do { Log2((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log2(a); } while (0)
 #endif
@@ -759,7 +759,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define Log3Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_3, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define Log3Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_3, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define Log3Func(a)  do { Log3((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log3(a); } while (0)
 #endif
@@ -773,7 +773,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define Log4Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_4, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define Log4Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_4, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define Log4Func(a)  do { Log4((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log4(a); } while (0)
 #endif
@@ -787,7 +787,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define Log5Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_5, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define Log5Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_5, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define Log5Func(a)  do { Log5((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log5(a); } while (0)
 #endif
@@ -801,7 +801,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define Log6Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_6, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define Log6Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_6, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define Log6Func(a)  do { Log6((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log6(a); } while (0)
 #endif
@@ -815,7 +815,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define Log7Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_7, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define Log7Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_7, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define Log7Func(a)  do { Log7((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log7(a); } while (0)
 #endif
@@ -829,7 +829,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define Log8Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_8, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define Log8Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_8, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define Log8Func(a)  do { Log8((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log8(a); } while (0)
 #endif
@@ -843,7 +843,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define Log9Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_9, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define Log9Func(a)  _LogIt(RTLOGGRPFLAGS_LEVEL_9, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define Log9Func(a)  do { Log9((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log9(a); } while (0)
 #endif
@@ -857,7 +857,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define Log10Func(a) _LogIt(RTLOGGRPFLAGS_LEVEL_10, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define Log10Func(a) _LogIt(RTLOGGRPFLAGS_LEVEL_10, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define Log10Func(a) do { Log10((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log10(a); } while (0)
 #endif
@@ -871,7 +871,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define Log11Func(a) _LogIt(RTLOGGRPFLAGS_LEVEL_11, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define Log11Func(a) _LogIt(RTLOGGRPFLAGS_LEVEL_11, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define Log11Func(a) do { Log11((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log11(a); } while (0)
 #endif
@@ -885,7 +885,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  * @param   a   Log message in format <tt>("string\n" [, args])</tt>.
  */
 #ifdef LOG_USE_C99
-# define Log12Func(a) _LogIt(RTLOGGRPFLAGS_LEVEL_12, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+# define Log12Func(a) _LogIt(RTLOGGRPFLAGS_LEVEL_12, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define Log12Func(a) do { Log12((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); Log12(a); } while (0)
 #endif
@@ -900,7 +900,7 @@ RTDECL(void) RTLogPrintfEx(void *pvInstance, unsigned fFlags, unsigned iGroup, c
  */
 #ifdef LOG_USE_C99
 # define LogFlowFunc(a) \
-    _LogIt(RTLOGGRPFLAGS_FLOW, LOG_GROUP, LOG_FN_FMT ": %M", __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
+    _LogIt(RTLOGGRPFLAGS_FLOW, LOG_GROUP, LOG_FN_FMT ": %M", RT_GCC_EXTENSION __PRETTY_FUNCTION__, _LogRemoveParentheseis a )
 #else
 # define LogFlowFunc(a) \
     do { LogFlow((LOG_FN_FMT ": ", __PRETTY_FUNCTION__)); LogFlow(a); } while (0)
diff --git a/include/iprt/mangling.h b/include/iprt/mangling.h
index d76d4a5..a448709 100644
--- a/include/iprt/mangling.h
+++ b/include/iprt/mangling.h
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/manifest.h b/include/iprt/manifest.h
index f7a1517..33f21aa 100644
--- a/include/iprt/manifest.h
+++ b/include/iprt/manifest.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/md2.h b/include/iprt/md2.h
index 6ba2c22..29e87e5 100644
--- a/include/iprt/md2.h
+++ b/include/iprt/md2.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/md5.h b/include/iprt/md5.h
index 3bfd91d..f632ec5 100644
--- a/include/iprt/md5.h
+++ b/include/iprt/md5.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/mem.h b/include/iprt/mem.h
index 21dcfe9..c5fd037 100644
--- a/include/iprt/mem.h
+++ b/include/iprt/mem.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/memcache.h b/include/iprt/memcache.h
index 6cf8c2a..a8dc4eb 100644
--- a/include/iprt/memcache.h
+++ b/include/iprt/memcache.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/memobj.h b/include/iprt/memobj.h
index b449838..0d8c801 100644
--- a/include/iprt/memobj.h
+++ b/include/iprt/memobj.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/mempool.h b/include/iprt/mempool.h
index 2294334..da66c8f 100644
--- a/include/iprt/mempool.h
+++ b/include/iprt/mempool.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/memsafer.h b/include/iprt/memsafer.h
index 59dd256..d361a30 100644
--- a/include/iprt/memsafer.h
+++ b/include/iprt/memsafer.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/memtracker.h b/include/iprt/memtracker.h
index ca22fec..6657b6b 100644
--- a/include/iprt/memtracker.h
+++ b/include/iprt/memtracker.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/message.h b/include/iprt/message.h
index 1d78f17..ab51dbd 100644
--- a/include/iprt/message.h
+++ b/include/iprt/message.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/mp.h b/include/iprt/mp.h
index 53a0e39..43072da 100644
--- a/include/iprt/mp.h
+++ b/include/iprt/mp.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/net.h b/include/iprt/net.h
index 97f6795..676a19a 100644
--- a/include/iprt/net.h
+++ b/include/iprt/net.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/amd64/fenv.h b/include/iprt/nocrt/amd64/fenv.h
index 0daf3e2..98b5a1a 100644
--- a/include/iprt/nocrt/amd64/fenv.h
+++ b/include/iprt/nocrt/amd64/fenv.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/amd64/math.h b/include/iprt/nocrt/amd64/math.h
index 762ac4f..0a6f618 100644
--- a/include/iprt/nocrt/amd64/math.h
+++ b/include/iprt/nocrt/amd64/math.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/compiler/compiler.h b/include/iprt/nocrt/compiler/compiler.h
index 77523d3..5bc4efc 100644
--- a/include/iprt/nocrt/compiler/compiler.h
+++ b/include/iprt/nocrt/compiler/compiler.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/compiler/gcc.h b/include/iprt/nocrt/compiler/gcc.h
index 9aeb3ce..745e1a0 100644
--- a/include/iprt/nocrt/compiler/gcc.h
+++ b/include/iprt/nocrt/compiler/gcc.h
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/compiler/msc.h b/include/iprt/nocrt/compiler/msc.h
index 6ee0003..2fa7517 100644
--- a/include/iprt/nocrt/compiler/msc.h
+++ b/include/iprt/nocrt/compiler/msc.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/fenv.h b/include/iprt/nocrt/fenv.h
index 710a6ee..43528f0 100644
--- a/include/iprt/nocrt/fenv.h
+++ b/include/iprt/nocrt/fenv.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/inttypes.h b/include/iprt/nocrt/inttypes.h
index b86ec08..d4afc35 100644
--- a/include/iprt/nocrt/inttypes.h
+++ b/include/iprt/nocrt/inttypes.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/limits.h b/include/iprt/nocrt/limits.h
index 2b377d1..9760dda 100644
--- a/include/iprt/nocrt/limits.h
+++ b/include/iprt/nocrt/limits.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/math.h b/include/iprt/nocrt/math.h
index 568f17c..1f47b10 100644
--- a/include/iprt/nocrt/math.h
+++ b/include/iprt/nocrt/math.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/setjmp.h b/include/iprt/nocrt/setjmp.h
index 9f61a95..596c524 100644
--- a/include/iprt/nocrt/setjmp.h
+++ b/include/iprt/nocrt/setjmp.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/stdarg.h b/include/iprt/nocrt/stdarg.h
index 3e52e0c..6ba94cc 100644
--- a/include/iprt/nocrt/stdarg.h
+++ b/include/iprt/nocrt/stdarg.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/stddef.h b/include/iprt/nocrt/stddef.h
index 372f597..8c87984 100644
--- a/include/iprt/nocrt/stddef.h
+++ b/include/iprt/nocrt/stddef.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/stdlib.h b/include/iprt/nocrt/stdlib.h
index 7332ac2..0928e0a 100644
--- a/include/iprt/nocrt/stdlib.h
+++ b/include/iprt/nocrt/stdlib.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/string.h b/include/iprt/nocrt/string.h
index 2ebee9b..0028cba 100644
--- a/include/iprt/nocrt/string.h
+++ b/include/iprt/nocrt/string.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/x86/fenv.h b/include/iprt/nocrt/x86/fenv.h
index 8dc2c90..9afef70 100644
--- a/include/iprt/nocrt/x86/fenv.h
+++ b/include/iprt/nocrt/x86/fenv.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nocrt/x86/math.h b/include/iprt/nocrt/x86/math.h
index 6ed0337..7c0cffe 100644
--- a/include/iprt/nocrt/x86/math.h
+++ b/include/iprt/nocrt/x86/math.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nt/nt-and-windows.h b/include/iprt/nt/nt-and-windows.h
index f4901a4..490c022 100644
--- a/include/iprt/nt/nt-and-windows.h
+++ b/include/iprt/nt/nt-and-windows.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/nt/nt.h b/include/iprt/nt/nt.h
index 26b14aa..2629fd5 100644
--- a/include/iprt/nt/nt.h
+++ b/include/iprt/nt/nt.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/once.h b/include/iprt/once.h
index 63ee6f7..81dcb7f 100644
--- a/include/iprt/once.h
+++ b/include/iprt/once.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/param.h b/include/iprt/param.h
index 5e80074..6b1bcdf 100644
--- a/include/iprt/param.h
+++ b/include/iprt/param.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/path.h b/include/iprt/path.h
index 7e42754..b27ec5a 100644
--- a/include/iprt/path.h
+++ b/include/iprt/path.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/pipe.h b/include/iprt/pipe.h
index ec9f891..b99fa5d 100644
--- a/include/iprt/pipe.h
+++ b/include/iprt/pipe.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/poll.h b/include/iprt/poll.h
index 33da9c3..d048f8f 100644
--- a/include/iprt/poll.h
+++ b/include/iprt/poll.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/power.h b/include/iprt/power.h
index 4994273..67bfd14 100644
--- a/include/iprt/power.h
+++ b/include/iprt/power.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/process.h b/include/iprt/process.h
index f9124e7..b02d702 100644
--- a/include/iprt/process.h
+++ b/include/iprt/process.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/rand.h b/include/iprt/rand.h
index 3a58c5d..eb69c7b 100644
--- a/include/iprt/rand.h
+++ b/include/iprt/rand.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/req.h b/include/iprt/req.h
index ea5abb6..4af2ab9 100644
--- a/include/iprt/req.h
+++ b/include/iprt/req.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/runtime-loader.h b/include/iprt/runtime-loader.h
index 58d6bc6..ccbc5b2 100644
--- a/include/iprt/runtime-loader.h
+++ b/include/iprt/runtime-loader.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/runtime.h b/include/iprt/runtime.h
index eb1a4ae..0c63162 100644
--- a/include/iprt/runtime.h
+++ b/include/iprt/runtime.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/s3.h b/include/iprt/s3.h
index 3d448b0..9057837 100644
--- a/include/iprt/s3.h
+++ b/include/iprt/s3.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/semaphore.h b/include/iprt/semaphore.h
index 23e59db..85dbb99 100644
--- a/include/iprt/semaphore.h
+++ b/include/iprt/semaphore.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/sg.h b/include/iprt/sg.h
index d7083bb..ae2bc2a 100644
--- a/include/iprt/sg.h
+++ b/include/iprt/sg.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/sha.h b/include/iprt/sha.h
index a6c7391..6b01358 100644
--- a/include/iprt/sha.h
+++ b/include/iprt/sha.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/solaris/kmoddeps.mac b/include/iprt/solaris/kmoddeps.mac
index 6b8a400..5464a29 100644
--- a/include/iprt/solaris/kmoddeps.mac
+++ b/include/iprt/solaris/kmoddeps.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2012 Oracle Corporation
+; Copyright (C) 2012-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/sort.h b/include/iprt/sort.h
index b9f9e1f..5c6727f 100644
--- a/include/iprt/sort.h
+++ b/include/iprt/sort.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/spinlock.h b/include/iprt/spinlock.h
index 6c48e2d..ebc3627 100644
--- a/include/iprt/spinlock.h
+++ b/include/iprt/spinlock.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/stdarg.h b/include/iprt/stdarg.h
index 4b93fb0..6386e0d 100644
--- a/include/iprt/stdarg.h
+++ b/include/iprt/stdarg.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/stdint.h b/include/iprt/stdint.h
index ae94d66..c93e197 100644
--- a/include/iprt/stdint.h
+++ b/include/iprt/stdint.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/strcache.h b/include/iprt/strcache.h
index 65cfd48..c67632b 100644
--- a/include/iprt/strcache.h
+++ b/include/iprt/strcache.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/stream.h b/include/iprt/stream.h
index fce84c2..3dc1b77 100644
--- a/include/iprt/stream.h
+++ b/include/iprt/stream.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/string.h b/include/iprt/string.h
index 55ed7a7..d1ebbb0 100644
--- a/include/iprt/string.h
+++ b/include/iprt/string.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/symlink.h b/include/iprt/symlink.h
index 2d1e618..5631d8c 100644
--- a/include/iprt/symlink.h
+++ b/include/iprt/symlink.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/system.h b/include/iprt/system.h
index a86c937..d759117 100644
--- a/include/iprt/system.h
+++ b/include/iprt/system.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/table.h b/include/iprt/table.h
index 6746b96..eb8bf86 100644
--- a/include/iprt/table.h
+++ b/include/iprt/table.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/tar.h b/include/iprt/tar.h
index 1884cb8..245b56d 100644
--- a/include/iprt/tar.h
+++ b/include/iprt/tar.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/test.h b/include/iprt/test.h
index b84d1b6..4e8b044 100644
--- a/include/iprt/test.h
+++ b/include/iprt/test.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/thread.h b/include/iprt/thread.h
index fac023c..9bb1e61 100644
--- a/include/iprt/thread.h
+++ b/include/iprt/thread.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/timer.h b/include/iprt/timer.h
index 01126dc..106a645 100644
--- a/include/iprt/timer.h
+++ b/include/iprt/timer.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/trace.h b/include/iprt/trace.h
index 263c715..6c63ef5 100644
--- a/include/iprt/trace.h
+++ b/include/iprt/trace.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/types.h b/include/iprt/types.h
index 125f824..e8ee359 100644
--- a/include/iprt/types.h
+++ b/include/iprt/types.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/udp.h b/include/iprt/udp.h
index 543d73d..90368ab 100644
--- a/include/iprt/udp.h
+++ b/include/iprt/udp.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/uni.h b/include/iprt/uni.h
index 0ffdc63..e788473 100644
--- a/include/iprt/uni.h
+++ b/include/iprt/uni.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/uuid.h b/include/iprt/uuid.h
index 1a9c975..1e08719 100644
--- a/include/iprt/uuid.h
+++ b/include/iprt/uuid.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/vector.h b/include/iprt/vector.h
index 797fe19..c84eb3c 100644
--- a/include/iprt/vector.h
+++ b/include/iprt/vector.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/vfs.h b/include/iprt/vfs.h
index b58c67c..62e1233 100644
--- a/include/iprt/vfs.h
+++ b/include/iprt/vfs.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/vfslowlevel.h b/include/iprt/vfslowlevel.h
index 8a13945..acaf9f0 100644
--- a/include/iprt/vfslowlevel.h
+++ b/include/iprt/vfslowlevel.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/win/lazy-dbghelp.h b/include/iprt/win/lazy-dbghelp.h
index 6232e90..fe81720 100644
--- a/include/iprt/win/lazy-dbghelp.h
+++ b/include/iprt/win/lazy-dbghelp.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/x509-branch-collision.h b/include/iprt/x509-branch-collision.h
index 7651529..20adef9 100644
--- a/include/iprt/x509-branch-collision.h
+++ b/include/iprt/x509-branch-collision.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/x86.h b/include/iprt/x86.h
index ac67262..9de4a72 100644
--- a/include/iprt/x86.h
+++ b/include/iprt/x86.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -2743,7 +2743,12 @@ AssertCompileSize(X86XSAVELWP, 128);
 #endif
 
 
-
+/**
+ * x86 FPU/SSE/AVX/XXXX state.
+ *
+ * Please bump DBGFCORE_FMT_VERSION by 1 in dbgfcorefmt.h if you make any
+ * changes to this structure.
+ */
 typedef struct X86XSAVEAREA
 {
     /** The x87 and SSE region (or legacy region if you like).  */
diff --git a/include/iprt/x86.mac b/include/iprt/x86.mac
index 4580c32..27e2109 100644
--- a/include/iprt/x86.mac
+++ b/include/iprt/x86.mac
@@ -246,6 +246,7 @@
 %define X86_CR4_OSXSAVE                     RT_BIT(18)
 %define X86_CR4_SMEP                        RT_BIT(20)
 %define X86_CR4_SMAP                        RT_BIT(21)
+%define X86_CR4_PKE                         RT_BIT(22)
 %define X86_DR6_B0                          RT_BIT(0)
 %define X86_DR6_B1                          RT_BIT(1)
 %define X86_DR6_B2                          RT_BIT(2)
@@ -690,15 +691,26 @@
 %endif
 %ifndef VBOX_FOR_DTRACE_LIB
 %endif
-%define XSAVE_C_X87         RT_BIT_64(0)
-%define XSAVE_C_SSE         RT_BIT_64(1)
-%define XSAVE_C_YMM         RT_BIT_64(2)
-%define XSAVE_C_BNDREGS     RT_BIT_64(3)
-%define XSAVE_C_BNDCSR      RT_BIT_64(4)
-%define XSAVE_C_OPMASK      RT_BIT_64(5)
-%define XSAVE_C_ZMM_HI256   RT_BIT_64(6)
-%define XSAVE_C_ZMM_16HI    RT_BIT_64(7)
-%define XSAVE_C_LWP         RT_BIT_64(62)
+%define XSAVE_C_X87_BIT         0
+%define XSAVE_C_X87             RT_BIT_64(XSAVE_C_X87_BIT)
+%define XSAVE_C_SSE_BIT         1
+%define XSAVE_C_SSE             RT_BIT_64(XSAVE_C_SSE_BIT)
+%define XSAVE_C_YMM_BIT         2
+%define XSAVE_C_YMM             RT_BIT_64(XSAVE_C_YMM_BIT)
+%define XSAVE_C_BNDREGS_BIT     3
+%define XSAVE_C_BNDREGS         RT_BIT_64(XSAVE_C_BNDREGS_BIT)
+%define XSAVE_C_BNDCSR_BIT      4
+%define XSAVE_C_BNDCSR          RT_BIT_64(XSAVE_C_BNDCSR_BIT)
+%define XSAVE_C_OPMASK_BIT      5
+%define XSAVE_C_OPMASK          RT_BIT_64(XSAVE_C_OPMASK_BIT)
+%define XSAVE_C_ZMM_HI256_BIT   6
+%define XSAVE_C_ZMM_HI256       RT_BIT_64(XSAVE_C_ZMM_HI256_BIT)
+%define XSAVE_C_ZMM_16HI_BIT    7
+%define XSAVE_C_ZMM_16HI        RT_BIT_64(XSAVE_C_ZMM_16HI_BIT)
+%define XSAVE_C_PKRU_BIT        9
+%define XSAVE_C_PKRU            RT_BIT_64(XSAVE_C_PKRU_BIT)
+%define XSAVE_C_LWP_BIT         62
+%define XSAVE_C_LWP             RT_BIT_64(XSAVE_C_LWP_BIT)
 %ifndef VBOX_FOR_DTRACE_LIB
 %endif
 %define X86DESCATTR_TYPE            0x0000000f
@@ -825,6 +837,7 @@
 %define X86_TRAP_PF_US              RT_BIT(2)
 %define X86_TRAP_PF_RSVD            RT_BIT(3)
 %define X86_TRAP_PF_ID              RT_BIT(4)
+%define X86_TRAP_PF_PK              RT_BIT(5)
 %ifndef VBOX_FOR_DTRACE_LIB
 %else
 %endif
diff --git a/include/iprt/x86extra.mac b/include/iprt/x86extra.mac
index edae0dc..287a821 100644
--- a/include/iprt/x86extra.mac
+++ b/include/iprt/x86extra.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2012-2013 Oracle Corporation
+; Copyright (C) 2012-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/zero.h b/include/iprt/zero.h
index e743b39..457588e 100644
--- a/include/iprt/zero.h
+++ b/include/iprt/zero.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/include/iprt/zip.h b/include/iprt/zip.h
index 375f536..2633a67 100644
--- a/include/iprt/zip.h
+++ b/include/iprt/zip.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/Makefile.kmk b/src/Makefile.kmk
index 97ff704..eaecabe 100644
--- a/src/Makefile.kmk
+++ b/src/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/Makefile.kmk b/src/VBox/Additions/Makefile.kmk
index 3bd893c..3e45e65 100644
--- a/src/VBox/Additions/Makefile.kmk
+++ b/src/VBox/Additions/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/Makefile.kmk b/src/VBox/Additions/common/Makefile.kmk
index 9468c9b..8d0bec3 100644
--- a/src/VBox/Additions/common/Makefile.kmk
+++ b/src/VBox/Additions/common/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxControl/Makefile.kmk b/src/VBox/Additions/common/VBoxControl/Makefile.kmk
index e2de0e2..ab874cc 100644
--- a/src/VBox/Additions/common/VBoxControl/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxControl/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp
index 707b1da..dc86989 100644
--- a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp
+++ b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControl.rc b/src/VBox/Additions/common/VBoxControl/VBoxControl.rc
index 0dd2366..176e235 100644
--- a/src/VBox/Additions/common/VBoxControl/VBoxControl.rc
+++ b/src/VBox/Additions/common/VBoxControl/VBoxControl.rc
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk
index a1f5903..a51e5ca 100644
--- a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp
index adc3e2e..be6cf66 100644
--- a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp
+++ b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
index 36eb364..cfa0275 100644
--- a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def
index 15c0491..5454a45 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2010 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c
index f34435a..c02c965 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c
@@ -835,6 +835,7 @@ static int VBoxGuestSolarisAddIRQ(dev_info_t *pDip)
                             /* Remove allocated IRQs, too bad we can free only one handle at a time. */
                             for (int k = 0; k < g_cIntrAllocated; k++)
                                 ddi_intr_free(g_pIntr[k]);
+                            g_cIntrAllocated = 0;
                         }
                         else
                             LogRel((DEVICE_NAME "::AddIRQ: failed to allocated IRQs. count=%d\n", IntrCount));
@@ -877,6 +878,7 @@ static void VBoxGuestSolarisRemoveIRQ(dev_info_t *pDip)
                 ddi_intr_free(g_pIntr[i]);
         }
     }
+    g_cIntrAllocated = 0;
     RTMemFree(g_pIntr);
     mutex_destroy(&g_IrqMtx);
 }
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf
index 1e2c814..3abd533 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf
@@ -1,7 +1,7 @@
 #
 # OpenSolaris Guest Driver Configuration
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
index 71006ec..630eee4 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
@@ -3641,8 +3641,6 @@ bool VbgdCommonISR(PVBOXGUESTDEVEXT pDevExt)
         if (RT_SUCCESS(pReq->header.rc))
         {
             uint32_t        fEvents = pReq->events;
-            PVBOXGUESTWAIT  pWait;
-            PVBOXGUESTWAIT  pSafe;
 
             Log3(("VbgdCommonISR: acknowledge events succeeded %#RX32\n", fEvents));
 
@@ -3665,6 +3663,8 @@ bool VbgdCommonISR(PVBOXGUESTDEVEXT pDevExt)
              */
             if (fEvents & VMMDEV_EVENT_HGCM)
             {
+                PVBOXGUESTWAIT pWait;
+                PVBOXGUESTWAIT pSafe;
                 RTListForEachSafe(&pDevExt->HGCMWaitList, pWait, pSafe, VBOXGUESTWAIT, ListNode)
                 {
                     if (pWait->pHGCMReq->fu32Flags & VBOX_HGCM_REQ_DONE)
diff --git a/src/VBox/Additions/common/VBoxGuest/linux/dkms.conf b/src/VBox/Additions/common/VBoxGuest/linux/dkms.conf
index d78cece..b1f5f92 100644
--- a/src/VBox/Additions/common/VBoxGuest/linux/dkms.conf
+++ b/src/VBox/Additions/common/VBoxGuest/linux/dkms.conf
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuest/solaris/deps.asm b/src/VBox/Additions/common/VBoxGuest/solaris/deps.asm
index e807455..080460d 100644
--- a/src/VBox/Additions/common/VBoxGuest/solaris/deps.asm
+++ b/src/VBox/Additions/common/VBoxGuest/solaris/deps.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2012 Oracle Corporation
+; Copyright (C) 2012-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.inf b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.inf
index 04932fc..798084c 100644
--- a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.inf
+++ b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.inf
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc
index 80c4d0b..c19af3d 100644
--- a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc
+++ b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.rc
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestInst.cpp b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestInst.cpp
index 3f76ef9..97b6b38 100644
--- a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestInst.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestInst.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp b/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp
index 0d7eade..cc9b3bb 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp b/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp
index c434c85..fad53ff 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp b/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp
index 7521f88..61893ac 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/Init.cpp b/src/VBox/Additions/common/VBoxGuestLib/Init.cpp
index 7a9ada0..ec899da 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/Init.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/Init.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
index ae0a3c9..b790aad 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/Mouse.cpp b/src/VBox/Additions/common/VBoxGuestLib/Mouse.cpp
index e6bca47..85f260e 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/Mouse.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/Mouse.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp b/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp
index 414e6b8..6261791 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp
index 188c8e0..6e5e20a 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h
index 844b014..fede8b0 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h
+++ b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h b/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h
index e519af8..fe9b01a 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h
index 42bc6c1..62f752b 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h
index 7e7f6c4..db2a5cd 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp
index 4115eb4..26f1d9c 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.h b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.h
index 2136293..d221681 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.h
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c
index a4e44bd..aa0883d 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h
index 1ba1bcd..824eac5 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp
index da2f12f..a7fd3f0 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp
index ef95590..0063620 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAutoLogon.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAutoLogon.cpp
index 5623dc9..a5aa4fb 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAutoLogon.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAutoLogon.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp
index cd4279b..d2f319d 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp
index 5e51e27..c8ff48c 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp
index 8ef0006..acad143 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCoreDump.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp
index 5635483..8bc82d4 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCpuHotPlug.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp
index 7809a42..6e6f386 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp
index e982b1f..3a90243 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp
index f2d84f7..62a0eac 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp
@@ -346,40 +346,40 @@ static int vbglR3DnDHGProcessSendFileHdrMessage(PVBGLR3GUESTDNDCMDCTX  pCtx,
     return rc;
 }
 
-static int vbglR3DnDHGProcessURIMessages(PVBGLR3GUESTDNDCMDCTX  pCtx,
-                                         uint32_t              *puScreenId,
-                                         char                  *pszFormat,
-                                         uint32_t               cbFormat,
-                                         uint32_t              *pcbFormatRecv,
-                                         void                 **ppvData,
-                                         uint32_t               cbData,
-                                         size_t                *pcbDataRecv)
+static int vbglR3DnDHGProcessURIMessages(PVBGLR3GUESTDNDCMDCTX   pCtx,
+                                         void                  **ppvData,
+                                         uint32_t                cbData,
+                                         size_t                 *pcbDataRecv)
 {
     AssertPtrReturn(pCtx,        VERR_INVALID_POINTER);
     AssertPtrReturn(ppvData,     VERR_INVALID_POINTER);
     AssertPtrReturn(cbData,      VERR_INVALID_PARAMETER);
     AssertPtrReturn(pcbDataRecv, VERR_INVALID_POINTER);
 
-    void    *pvData        = *ppvData;
-    uint32_t cbDataRecv    = 0;
-    uint64_t cbDataToRead  = *pcbDataRecv;
-    uint64_t cbDataWritten = 0;
-
-    int rc = VINF_SUCCESS;
-
-    /* Allocate temp buffer. */
-    uint32_t cbTmpData = _64K; /** @todo Make this configurable? */
-    void *pvTmpData = RTMemAlloc(cbTmpData);
-    if (!pvTmpData)
+    /*
+     * Allocate chunk buffer.
+     */
+    uint32_t cbChunkMax = _64K; /** @todo Make this configurable? */
+    void *pvChunk = RTMemAlloc(cbChunkMax);
+    if (!pvChunk)
         return VERR_NO_MEMORY;
+    uint32_t cbChunkRead = 0;
+
+    uint64_t cbFileSize    = 0; /* Total file size (in bytes). */
+    uint64_t cbFileWritten = 0; /* Written bytes. */
 
-    /* Create and query the (unique) drop target directory in the user's temporary directory. */
+    /*
+     * Create and query the (unique) drop target directory in the user's temporary directory.
+     */
     DNDDIRDROPPEDFILES dirDroppedFiles;
     const char *pszDropDir;
-    rc = DnDDirDroppedFilesCreateAndOpenTemp(&dirDroppedFiles);
+    int rc = DnDDirDroppedFilesCreateAndOpenTemp(&dirDroppedFiles);
     if (RT_SUCCESS(rc))
         pszDropDir = DnDDirDroppedFilesGetDirAbs(&dirDroppedFiles);
 
+    /*
+     * Enter the main loop of retieving files + directories.
+     */
     DnDURIList lstURI;
     DnDURIObject objFile(DnDURIObject::File);
 
@@ -426,21 +426,31 @@ static int vbglR3DnDHGProcessURIMessages(PVBGLR3GUESTDNDCMDCTX  pCtx,
                 case DragAndDropSvc::HOST_DND_HG_SND_FILE_DATA:
                 {
                     if (uNextMsg == DragAndDropSvc::HOST_DND_HG_SND_FILE_HDR)
+                    {
                         rc = vbglR3DnDHGProcessSendFileHdrMessage(pCtx,
                                                                   szPathName,
                                                                   sizeof(szPathName),
                                                                   &fFlags,
                                                                   &fMode,
-                                                                  &cbDataToRead);
+                                                                  &cbFileSize);
+                        LogFlowFunc(("HOST_DND_HG_SND_FILE_HDR szPathName=%s, fFlags=0x%x, fMode=0x%x, cbFileSize=%RU64, rc=%Rrc\n",
+                                     szPathName, fFlags, fMode, cbFileSize, rc));
+                    }
                     else
+                    {
                         rc = vbglR3DnDHGProcessSendFileMessage(pCtx,
                                                                szPathName,
                                                                sizeof(szPathName),
                                                                &cbPathName,
-                                                               pvTmpData,
-                                                               cbTmpData,
-                                                               &cbDataRecv,
+                                                               pvChunk,
+                                                               cbChunkMax,
+                                                               &cbChunkRead,
                                                                &fMode);
+                        LogFlowFunc(("HOST_DND_HG_SND_FILE_DATA "
+                                     "szPathName=%s, cbPathName=%RU32, cbChunkRead=%RU32, fMode=0x%x, rc=%Rrc\n",
+                                     szPathName, cbPathName, cbChunkRead, fMode, rc));
+                    }
+
                     if (   RT_SUCCESS(rc)
                         && (   uNextMsg == DragAndDropSvc::HOST_DND_HG_SND_FILE_HDR
                              /* Protocol v1 always sends the file name, so try opening every time. */
@@ -450,8 +460,8 @@ static int vbglR3DnDHGProcessURIMessages(PVBGLR3GUESTDNDCMDCTX  pCtx,
                         char *pszPathAbs = RTPathJoinA(pszDropDir, szPathName);
                         if (pszPathAbs)
                         {
-                            LogFlowFunc(("Opening pszPathName=%s, cbPathName=%RU32, fMode=0x%x, cbSize=%RU64\n",
-                                         szPathName, cbPathName, fMode, cbDataToRead));
+                            LogFlowFunc(("Opening pszPathName=%s, cbPathName=%RU32, fMode=0x%x, cbFileSize=%zu\n",
+                                         szPathName, cbPathName, fMode, cbFileSize));
 
                             uint64_t fOpen = RTFILE_O_WRITE | RTFILE_O_DENY_ALL;
                             if (pCtx->uProtocol <= 1)
@@ -462,7 +472,6 @@ static int vbglR3DnDHGProcessURIMessages(PVBGLR3GUESTDNDCMDCTX  pCtx,
                             /* Is there already a file open, e.g. in transfer? */
                             if (!objFile.IsOpen())
                             {
-
                                 RTCString strPathAbs(pszPathAbs);
                                 rc = objFile.OpenEx(strPathAbs, DnDURIObject::File, DnDURIObject::Target, fOpen,
                                                     (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR);
@@ -471,10 +480,10 @@ static int vbglR3DnDHGProcessURIMessages(PVBGLR3GUESTDNDCMDCTX  pCtx,
                                     rc = DnDDirDroppedAddFile(&dirDroppedFiles, strPathAbs.c_str());
                                     if (RT_SUCCESS(rc))
                                     {
-                                        cbDataWritten = 0;
+                                        cbFileWritten = 0;
 
                                         if (pCtx->uProtocol >= 2) /* Set the expected file size. */
-                                            objFile.SetSize(cbDataToRead);
+                                            objFile.SetSize(cbFileSize);
                                     }
                                 }
                             }
@@ -492,8 +501,8 @@ static int vbglR3DnDHGProcessURIMessages(PVBGLR3GUESTDNDCMDCTX  pCtx,
                     {
                         bool fClose = false;
 
-                        uint32_t cbWritten;
-                        rc = objFile.Write(pvTmpData, cbDataRecv, &cbWritten);
+                        uint32_t cbChunkWritten;
+                        rc = objFile.Write(pvChunk, cbChunkRead, &cbChunkWritten);
                         if (RT_SUCCESS(rc))
                         {
                             if (pCtx->uProtocol >= 2)
@@ -504,8 +513,8 @@ static int vbglR3DnDHGProcessURIMessages(PVBGLR3GUESTDNDCMDCTX  pCtx,
                             else
                                 fClose = true; /* Always close the file after each chunk. */
 
-                            cbDataWritten += cbWritten;
-                            Assert(cbDataWritten <= cbDataToRead);
+                            cbFileWritten += cbChunkWritten;
+                            Assert(cbFileWritten <= cbFileSize);
                         }
 
                         if (fClose)
@@ -524,65 +533,12 @@ static int vbglR3DnDHGProcessURIMessages(PVBGLR3GUESTDNDCMDCTX  pCtx,
                     break;
                 }
                 default:
+                {
                     LogFlowFunc(("Message %RU32 not supported\n", uNextMsg));
                     rc = VERR_NOT_SUPPORTED;
                     break;
-            }
-
-#if 0 /* Not used yet. */
-            if (pCtx->uProtocol >= XXX)
-            {
-                /*
-                 * Send the progress back to the host.
-                 */
-                uint32_t uStatus;
-                int guestRc;
-                uint8_t uPercent;
-                switch (rc)
-                {
-                    case VINF_SUCCESS:
-                    {
-                        if (!cbData)
-                            cbData = 1;
-                        uPercent = cbDataWritten * 100 / (cbDataToRead ? cbDataToRead : 1);
-                        uStatus  = uPercent >= 100 ?
-                                   DragAndDropSvc::DND_PROGRESS_COMPLETE : DragAndDropSvc::DND_PROGRESS_RUNNING;
-                        guestRc  = VINF_SUCCESS;
-                        break;
-                    }
-
-                    case VERR_CANCELLED:
-                    {
-                        uStatus  = DragAndDropSvc::DND_PROGRESS_CANCELLED;
-                        uPercent = 100;
-                        guestRc  = VINF_SUCCESS;
-                        break;
-                    }
-
-                    default:
-                    {
-                        uStatus  = DragAndDropSvc::DND_PROGRESS_ERROR;
-                        uPercent = 100;
-                        guestRc  = rc;
-                        break;
-                    }
-                }
-
-                int rc2 = VbglR3DnDHGSetProgress(pCtx, uStatus, uPercent, guestRc);
-                LogFlowFunc(("cbDataWritten=%RU64 / cbDataToRead=%RU64 => %RU8%% (uStatus=%ld, %Rrc), rc=%Rrc\n", cbDataWritten, cbDataToRead,
-                              uPercent, uStatus, guestRc, rc2));
-                if (RT_SUCCESS(rc))
-                    rc = rc2;
-
-                /* All data transferred? */
-                if (   RT_SUCCESS(rc)
-                    && uPercent == 100)
-                {
-                    rc = VINF_EOF;
-                    break;
                 }
             }
-#endif
         }
 
         if (RT_FAILURE(rc))
@@ -596,8 +552,9 @@ static int vbglR3DnDHGProcessURIMessages(PVBGLR3GUESTDNDCMDCTX  pCtx,
     if (rc == VERR_NO_DATA)
         rc = VINF_SUCCESS;
 
-    if (pvTmpData)
-        RTMemFree(pvTmpData);
+    /* Delete chunk buffer again. */
+    if (pvChunk)
+        RTMemFree(pvChunk);
 
     /* Cleanup on failure or if the user has canceled the operation or
      * something else went wrong. */
@@ -609,25 +566,39 @@ static int vbglR3DnDHGProcessURIMessages(PVBGLR3GUESTDNDCMDCTX  pCtx,
     else
     {
         /*
-         * Patch the old drop data with the new drop directory, so the drop target can find the files.
+         * Now we need to transform the URI list which came from the host into
+         * an URI list which also has the final "Dropped Files" directory as a prefix
+         * for each URI entry.
+         *
+         * So patch the old drop data with the new drop directory to let the drop
+         * target on the guest can find the files later.
          */
-        rc = lstURI.RootFromURIData(pvData, cbDataToRead, 0 /* fFlags */);
+        void  *pvURIData = *ppvData;
+        size_t cbURIData = *pcbDataRecv;
+
+        rc = lstURI.RootFromURIData(pvURIData, cbURIData, 0 /* fFlags */);
         if (RT_SUCCESS(rc))
         {
             /* Cleanup the old data and write the new data back to the event. */
-            RTMemFree(pvData);
+            RTMemFree(pvURIData);
 
             RTCString strData = lstURI.RootToString(pszDropDir);
-            LogFlowFunc(("cbDataToRead: %zu -> %zu\n", cbDataToRead, strData.length() + 1));
+            Assert(!strData.isEmpty());
+            LogFlowFunc(("New URI list now has %zu bytes (formerly %RU32 bytes)\n", strData.length() + 1, cbURIData));
 
-            pvData       = RTStrDupN(strData.c_str(), strData.length());
-            cbDataToRead = strData.length() + 1;
+            pvURIData = RTStrDupN(strData.c_str(), strData.length());
+            if (pvURIData)
+            {
+                cbURIData = strData.length() + 1;
+            }
+            else
+                rc = VERR_NO_MEMORY;
         }
 
         if (RT_SUCCESS(rc))
         {
-            *ppvData     = pvData;
-            *pcbDataRecv = cbDataToRead;
+            *ppvData     = pvURIData;
+            *pcbDataRecv = cbURIData;
         }
 
         /** @todo Compare the URI list with the dirs/files we really transferred. */
@@ -848,10 +819,6 @@ static int vbglR3DnDHGProcessSendDataMessage(PVBGLR3GUESTDNDCMDCTX pCtx,
         if (DnDMIMEHasFileURLs(pszFormat, *pcbFormatRecv))
         {
             rc = vbglR3DnDHGProcessURIMessages(pCtx,
-                                               puScreenId,
-                                               pszFormat,
-                                               cbFormat,
-                                               pcbFormatRecv,
                                                ppvData,
                                                cbData,
                                                pcbDataRecv);
@@ -1302,13 +1269,6 @@ static int vbglR3DnDGHSendFile(PVBGLR3GUESTDNDCMDCTX pCtx, DnDURIObject &obj)
     AssertPtrReturn(pCtx,                             VERR_INVALID_POINTER);
     AssertReturn(obj.GetType() == DnDURIObject::File, VERR_INVALID_PARAMETER);
 
-    uint32_t cbBuf = _64K; /** @todo Make this configurable? */
-    void *pvBuf = RTMemAlloc(cbBuf); /** @todo Make this buffer part of PVBGLR3GUESTDNDCMDCTX? */
-    if (!pvBuf)
-        return VERR_NO_MEMORY;
-
-    RTCString strPath = obj.GetDestPath();
-
     int rc = obj.Open(DnDURIObject::Source, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
     if (RT_FAILURE(rc))
     {
@@ -1316,6 +1276,13 @@ static int vbglR3DnDGHSendFile(PVBGLR3GUESTDNDCMDCTX pCtx, DnDURIObject &obj)
         return rc;
     }
 
+    uint32_t cbBuf = _64K;           /** @todo Make this configurable? */
+    void *pvBuf = RTMemAlloc(cbBuf); /** @todo Make this buffer part of PVBGLR3GUESTDNDCMDCTX? */
+    if (!pvBuf)
+        return VERR_NO_MEMORY;
+
+    RTCString strPath = obj.GetDestPath();
+
     LogFlowFunc(("strFile=%s (%zu), cbSize=%RU64, fMode=0x%x\n", strPath.c_str(), strPath.length(), obj.GetSize(), obj.GetMode()));
     LogFlowFunc(("uProtocol=%RU32, uClientID=%RU32\n", pCtx->uProtocol, pCtx->uClientID));
 
@@ -1328,12 +1295,12 @@ static int vbglR3DnDGHSendFile(PVBGLR3GUESTDNDCMDCTX pCtx, DnDURIObject &obj)
         MsgHdr.hdr.u32Function = DragAndDropSvc::GUEST_DND_GH_SND_FILE_HDR;
         MsgHdr.hdr.cParms      = 6;
 
-        MsgHdr.uContext.SetUInt32(0); /* Context ID; unused at the moment. */
+        MsgHdr.uContext.SetUInt32(0);                                                    /* Context ID; unused at the moment. */
         MsgHdr.pvName.SetPtr((void *)strPath.c_str(), (uint32_t)(strPath.length() + 1));
         MsgHdr.cbName.SetUInt32((uint32_t)(strPath.length() + 1));
-        MsgHdr.uFlags.SetUInt32(0);   /* Flags; unused at the moment. */
-        MsgHdr.fMode.SetUInt32(obj.GetMode());
-        MsgHdr.cbTotal.SetUInt64(obj.GetSize());
+        MsgHdr.uFlags.SetUInt32(0);                                                      /* Flags; unused at the moment. */
+        MsgHdr.fMode.SetUInt32(obj.GetMode());                                           /* File mode */
+        MsgHdr.cbTotal.SetUInt64(obj.GetSize());                                         /* File size (in bytes). */
 
         rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(MsgHdr)), &MsgHdr, sizeof(MsgHdr));
         if (RT_SUCCESS(rc))
@@ -1469,7 +1436,7 @@ static int vbglR3DnDGHProcessURIMessages(PVBGLR3GUESTDNDCMDCTX pCtx,
         Assert(strRootDest.isNotEmpty());
 
         void *pvToSend = (void *)strRootDest.c_str();
-        uint32_t cbToSend = (uint32_t)strRootDest.length() + 1;
+        uint32_t cbToSend = (uint32_t)strRootDest.length() + 1; /* Include string termination. */
 
         rc = vbglR3DnDGHSendDataInternal(pCtx, pvToSend, cbToSend,
                                          /* Include total bytes of all file paths,
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp
index f1d9014..fa994f2 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibEvent.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp
index a5e1650..81a0f32 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp
index 2bd554c..41f0a5d 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp
index 16572b5..5cf00d6 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestUser.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestUser.cpp
index 56b9578..95f4d00 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestUser.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestUser.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostChannel.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostChannel.cpp
index 35ee6b5..8d0c38f 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostChannel.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostChannel.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp
index e253838..57e2dee 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp
index 01aacd4..01a37ad 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibLog.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp
index a534c79..8b6c35d 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp
index f0bb28d..789c697 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp
index 52e39ab..638df50 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp
index bbe05de..b583df1 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp
index 60b47a0..eb3abfa 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp
index 2516220..946c32f 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp
index 289181a..ca708a2 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibStat.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp
index 13830af..bef286b 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp
index dbdc3ba..36e808e 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp b/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp
index ad629dd..0b532f1 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp b/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp
index 4e93f6a..a0c4126 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/Makefile.kmk b/src/VBox/Additions/common/VBoxService/Makefile.kmk
index 996f63a..1db9544 100644
--- a/src/VBox/Additions/common/VBoxService/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxService/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2007-2013 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxService-os2.def b/src/VBox/Additions/common/VBoxService/VBoxService-os2.def
index aed84c6..7606735 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxService-os2.def
+++ b/src/VBox/Additions/common/VBoxService/VBoxService-os2.def
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2010 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp b/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp
index eb970fa..00553a3 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxService-win.rc b/src/VBox/Additions/common/VBoxService/VBoxService-win.rc
index db18d7c..fdd38c4 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxService-win.rc
+++ b/src/VBox/Additions/common/VBoxService/VBoxService-win.rc
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxService.cpp b/src/VBox/Additions/common/VBoxService/VBoxService.cpp
index 6a8f3d8..a2b536d 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2014 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -856,7 +856,7 @@ int main(int argc, char **argv)
      */
     if (   argc == 2
         && !RTStrICmp(argv[1], "pagefusion"))
-        return VBoxServicePageSharingInitFork();
+        return VBoxServicePageSharingWorkerChild();
 #endif
 
 #ifdef VBOX_WITH_GUEST_CONTROL
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
index 1834b79..9a7720b 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp
index 26b030e..e5d6721 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp
index 3f88642..01baa0b 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp
index 3848ce6..d6e6c8f 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h b/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h
index 7afe7cb..1fcdc58 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp
index 2c00c3a..f8d90d9 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp
index 384c103..5658ea1 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp
index f0a7d1e..e74908e 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h b/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h
index 5055d7f..31b67db 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -211,7 +211,7 @@ extern int                      VBoxServiceWinGetComponentVersions(uint32_t uiCl
 extern uint32_t                 VBoxServiceBalloonQueryPages(uint32_t cbPage);
 #endif
 #if defined(VBOXSERVICE_PAGE_SHARING)
-extern RTEXITCODE               VBoxServicePageSharingInitFork(void);
+extern RTEXITCODE               VBoxServicePageSharingWorkerChild(void);
 #endif
 extern int                      VBoxServiceVMInfoSignal(void);
 
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp b/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp
index 3ec167c..3e53395 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -333,7 +333,7 @@ void VBoxServicePageSharingInspectModules(DWORD dwProcessId, PAVLPVNODECORE *ppN
  * with other VMs.
  *
  */
-void VBoxServicePageSharingInspectGuest()
+static void VBoxServicePageSharingInspectGuest(void)
 {
     HANDLE hSnapshot;
     PAVLPVNODECORE pNewTree = NULL;
@@ -513,14 +513,14 @@ static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE
 
 
 #elif TARGET_NT4
-void VBoxServicePageSharingInspectGuest()
+static void VBoxServicePageSharingInspectGuest(void)
 {
     /* not implemented */
 }
 #else
-void VBoxServicePageSharingInspectGuest()
+static void VBoxServicePageSharingInspectGuest(void)
 {
-    /* @todo other platforms */
+    /** @todo other platforms */
 }
 #endif
 
@@ -620,7 +620,7 @@ DECLCALLBACK(int) VBoxServicePageSharingWorker(bool volatile *pfShutdown)
 #ifdef RT_OS_WINDOWS
 
 /**
- * This gets control when VBoxService is launched with -pagefusionfork by
+ * This gets control when VBoxService is launched with "pagefusion" by
  * VBoxServicePageSharingWorkerProcess().
  *
  * @returns RTEXITCODE_SUCCESS.
@@ -628,7 +628,7 @@ DECLCALLBACK(int) VBoxServicePageSharingWorker(bool volatile *pfShutdown)
  * @remarks It won't normally return since the parent drops the shutdown hint
  *          via RTProcTerminate().
  */
-RTEXITCODE VBoxServicePageSharingInitFork(void)
+RTEXITCODE VBoxServicePageSharingWorkerChild(void)
 {
     VBoxServiceVerbose(3, "VBoxServicePageSharingInitFork\n");
 
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp
index 1e691c9..48e6ace 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.h b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.h
index eb3ac64..833462e 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.h
+++ b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h b/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h
index 60296c5..3a6210c 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp
index 38a51fc..7f1e4f6 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -213,56 +213,69 @@ static void VBoxServiceVMStatsReport(void)
         return;
 
     /* Unfortunately GetSystemTimes is XP SP1 and up only, so we need to use the semi-undocumented NtQuerySystemInformation */
+    bool fCpuInfoAvail = false;
     NTSTATUS rc = gCtx.pfnNtQuerySystemInformation(SystemProcessorPerformanceInformation, pProcInfo, cbStruct, &cbReturned);
     if (    !rc
         &&  cbReturned == cbStruct)
     {
-        if (gCtx.au64LastCpuLoad_Kernel == 0)
+        for (uint32_t i = 0; i < systemInfo.dwNumberOfProcessors; i++)
         {
-            /* first time */
-            gCtx.au64LastCpuLoad_Idle[0]    = pProcInfo->IdleTime.QuadPart;
-            gCtx.au64LastCpuLoad_Kernel[0]  = pProcInfo->KernelTime.QuadPart;
-            gCtx.au64LastCpuLoad_User[0]    = pProcInfo->UserTime.QuadPart;
+            if (i >= VMM_MAX_CPU_COUNT)
+            {
+                VBoxServiceVerbose(3, "VBoxStatsReportStatistics: skipping information for CPU%u\n", i);
+                continue;
+            }
 
-            Sleep(250);
+            if (gCtx.au64LastCpuLoad_Kernel[i] == 0)
+            {
+                /* first time */
+                gCtx.au64LastCpuLoad_Idle[i]    = pProcInfo[i].IdleTime.QuadPart;
+                gCtx.au64LastCpuLoad_Kernel[i]  = pProcInfo[i].KernelTime.QuadPart;
+                gCtx.au64LastCpuLoad_User[i]    = pProcInfo[i].UserTime.QuadPart;
 
-            rc = gCtx.pfnNtQuerySystemInformation(SystemProcessorPerformanceInformation, pProcInfo, cbStruct, &cbReturned);
-            Assert(!rc);
-        }
+                Sleep(250);
 
-        uint64_t deltaIdle    = (pProcInfo->IdleTime.QuadPart   - gCtx.au64LastCpuLoad_Idle[0]);
-        uint64_t deltaKernel  = (pProcInfo->KernelTime.QuadPart - gCtx.au64LastCpuLoad_Kernel[0]);
-        uint64_t deltaUser    = (pProcInfo->UserTime.QuadPart   - gCtx.au64LastCpuLoad_User[0]);
-        deltaKernel          -= deltaIdle;  /* idle time is added to kernel time */
-        uint64_t ullTotalTime = deltaIdle + deltaKernel + deltaUser;
-        if (ullTotalTime == 0) /* Prevent division through zero. */
-            ullTotalTime = 1;
+                rc = gCtx.pfnNtQuerySystemInformation(SystemProcessorPerformanceInformation, pProcInfo, cbStruct, &cbReturned);
+                Assert(!rc);
+            }
+
+            uint64_t deltaIdle    = (pProcInfo[i].IdleTime.QuadPart   - gCtx.au64LastCpuLoad_Idle[i]);
+            uint64_t deltaKernel  = (pProcInfo[i].KernelTime.QuadPart - gCtx.au64LastCpuLoad_Kernel[i]);
+            uint64_t deltaUser    = (pProcInfo[i].UserTime.QuadPart   - gCtx.au64LastCpuLoad_User[i]);
+            deltaKernel          -= deltaIdle;  /* idle time is added to kernel time */
+            uint64_t ullTotalTime = deltaIdle + deltaKernel + deltaUser;
+            if (ullTotalTime == 0) /* Prevent division through zero. */
+                ullTotalTime = 1;
 
-        req.guestStats.u32CpuLoad_Idle      = (uint32_t)(deltaIdle  * 100 / ullTotalTime);
-        req.guestStats.u32CpuLoad_Kernel    = (uint32_t)(deltaKernel* 100 / ullTotalTime);
-        req.guestStats.u32CpuLoad_User      = (uint32_t)(deltaUser  * 100 / ullTotalTime);
+            req.guestStats.u32CpuLoad_Idle      = (uint32_t)(deltaIdle  * 100 / ullTotalTime);
+            req.guestStats.u32CpuLoad_Kernel    = (uint32_t)(deltaKernel* 100 / ullTotalTime);
+            req.guestStats.u32CpuLoad_User      = (uint32_t)(deltaUser  * 100 / ullTotalTime);
 
-        req.guestStats.u32StatCaps |= VBOX_GUEST_STAT_CPU_LOAD_IDLE | VBOX_GUEST_STAT_CPU_LOAD_KERNEL | VBOX_GUEST_STAT_CPU_LOAD_USER;
+            req.guestStats.u32StatCaps |= VBOX_GUEST_STAT_CPU_LOAD_IDLE | VBOX_GUEST_STAT_CPU_LOAD_KERNEL | VBOX_GUEST_STAT_CPU_LOAD_USER;
+            req.guestStats.u32CpuId = i;
+            rc = VbglR3StatReport(&req);
+            if (RT_SUCCESS(rc))
+                VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics (CPU %u) reported successfully!\n", i);
+            else
+                VBoxServiceVerbose(3, "VBoxStatsReportStatistics: DeviceIoControl (stats report) failed with %d\n", GetLastError());
 
-        gCtx.au64LastCpuLoad_Idle[0]   = pProcInfo->IdleTime.QuadPart;
-        gCtx.au64LastCpuLoad_Kernel[0] = pProcInfo->KernelTime.QuadPart;
-        gCtx.au64LastCpuLoad_User[0]   = pProcInfo->UserTime.QuadPart;
-        /** @todo SMP: report details for each CPU?  */
+            gCtx.au64LastCpuLoad_Idle[i]   = pProcInfo[i].IdleTime.QuadPart;
+            gCtx.au64LastCpuLoad_Kernel[i] = pProcInfo[i].KernelTime.QuadPart;
+            gCtx.au64LastCpuLoad_User[i]   = pProcInfo[i].UserTime.QuadPart;
+        }
     }
+    RTMemFree(pProcInfo);
 
-    for (uint32_t i = 0; i < systemInfo.dwNumberOfProcessors; i++)
+    if (!fCpuInfoAvail)
     {
-        req.guestStats.u32CpuId = i;
-
+        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: CPU info not available!\n");
         rc = VbglR3StatReport(&req);
         if (RT_SUCCESS(rc))
-            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics (CPU %u) reported successfully!\n", i);
+            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics reported successfully!\n");
         else
-            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: DeviceIoControl (stats report) failed with %d\n", GetLastError());
+            VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
     }
 
-    RTMemFree(pProcInfo);
-
 #elif defined(RT_OS_LINUX)
     VMMDevReportGuestStats req;
     RT_ZERO(req);
@@ -529,38 +542,43 @@ static void VBoxServiceVMStatsReport(void)
                 if (rc == -1)
                     break;
 
-                uint64_t u64Idle   = StatCPU.cpu_sysinfo.cpu[CPU_IDLE];
-                uint64_t u64User   = StatCPU.cpu_sysinfo.cpu[CPU_USER];
-                uint64_t u64System = StatCPU.cpu_sysinfo.cpu[CPU_KERNEL];
+                if (cCPUs >= VMM_MAX_CPU_COUNT)
+                    VBoxServiceVerbose(3, "VBoxStatsReportStatistics: skipping information for CPU%u\n", cCPUs);
+                else
+                {
+                    uint64_t u64Idle   = StatCPU.cpu_sysinfo.cpu[CPU_IDLE];
+                    uint64_t u64User   = StatCPU.cpu_sysinfo.cpu[CPU_USER];
+                    uint64_t u64System = StatCPU.cpu_sysinfo.cpu[CPU_KERNEL];
 
-                uint64_t u64DeltaIdle   = u64Idle   - gCtx.au64LastCpuLoad_Idle[cCPUs];
-                uint64_t u64DeltaSystem = u64System - gCtx.au64LastCpuLoad_Kernel[cCPUs];
-                uint64_t u64DeltaUser   = u64User   - gCtx.au64LastCpuLoad_User[cCPUs];
+                    uint64_t u64DeltaIdle   = u64Idle   - gCtx.au64LastCpuLoad_Idle[cCPUs];
+                    uint64_t u64DeltaSystem = u64System - gCtx.au64LastCpuLoad_Kernel[cCPUs];
+                    uint64_t u64DeltaUser   = u64User   - gCtx.au64LastCpuLoad_User[cCPUs];
 
-                uint64_t u64DeltaAll    = u64DeltaIdle + u64DeltaSystem + u64DeltaUser;
-                if (u64DeltaAll == 0) /* Prevent division through zero. */
-                    u64DeltaAll = 1;
+                    uint64_t u64DeltaAll    = u64DeltaIdle + u64DeltaSystem + u64DeltaUser;
+                    if (u64DeltaAll == 0) /* Prevent division through zero. */
+                        u64DeltaAll = 1;
 
-                gCtx.au64LastCpuLoad_Idle[cCPUs]   = u64Idle;
-                gCtx.au64LastCpuLoad_Kernel[cCPUs] = u64System;
-                gCtx.au64LastCpuLoad_User[cCPUs]   = u64User;
+                    gCtx.au64LastCpuLoad_Idle[cCPUs]   = u64Idle;
+                    gCtx.au64LastCpuLoad_Kernel[cCPUs] = u64System;
+                    gCtx.au64LastCpuLoad_User[cCPUs]   = u64User;
 
-                req.guestStats.u32CpuId = cCPUs;
-                req.guestStats.u32CpuLoad_Idle   = (uint32_t)(u64DeltaIdle   * 100 / u64DeltaAll);
-                req.guestStats.u32CpuLoad_Kernel = (uint32_t)(u64DeltaSystem * 100 / u64DeltaAll);
-                req.guestStats.u32CpuLoad_User   = (uint32_t)(u64DeltaUser   * 100 / u64DeltaAll);
+                    req.guestStats.u32CpuId = cCPUs;
+                    req.guestStats.u32CpuLoad_Idle   = (uint32_t)(u64DeltaIdle   * 100 / u64DeltaAll);
+                    req.guestStats.u32CpuLoad_Kernel = (uint32_t)(u64DeltaSystem * 100 / u64DeltaAll);
+                    req.guestStats.u32CpuLoad_User   = (uint32_t)(u64DeltaUser   * 100 / u64DeltaAll);
 
-                req.guestStats.u32StatCaps |= VBOX_GUEST_STAT_CPU_LOAD_IDLE
-                                           |  VBOX_GUEST_STAT_CPU_LOAD_KERNEL
-                                           |  VBOX_GUEST_STAT_CPU_LOAD_USER;
-                fCpuInfoAvail = true;
+                    req.guestStats.u32StatCaps |= VBOX_GUEST_STAT_CPU_LOAD_IDLE
+                                               |  VBOX_GUEST_STAT_CPU_LOAD_KERNEL
+                                               |  VBOX_GUEST_STAT_CPU_LOAD_USER;
+                    fCpuInfoAvail = true;
 
-                rc = VbglR3StatReport(&req);
-                if (RT_SUCCESS(rc))
-                    VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics (CPU %u) reported successfully!\n", cCPUs);
-                else
-                    VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
-                cCPUs++;
+                    rc = VbglR3StatReport(&req);
+                    if (RT_SUCCESS(rc))
+                        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: new statistics (CPU %u) reported successfully!\n", cCPUs);
+                    else
+                        VBoxServiceVerbose(3, "VBoxStatsReportStatistics: stats report failed with rc=%Rrc\n", rc);
+                    cCPUs++;
+                }
             }
         }
 
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp
index 5c9ba83..27137dd 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp
index b8506f5..e2234b6 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp
index 9302a84..e7980da 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h
index 69ea9a9..aab0528 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp
index b0dbc2d..eb17f5b 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp
index f49043f..d29f872 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.h b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.h
index 38984fa..286c6b6 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.h
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk b/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk
index 9e9ee29..9b7f4d8 100644
--- a/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxService/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp b/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp
index 29f2ff8..f7e92f3 100644
--- a/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp
+++ b/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp b/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp
index c44e0da..a353853 100644
--- a/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp
+++ b/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -491,10 +491,11 @@ static int testQueryConf(PHGSMIGUESTCOMMANDCONTEXT pCtx)
  * @param  pCtx      the context containing the heap used
  * @param  u32Index  the index of the parameter to query,
  *                   @see VBVACONF32::u32Index
+ * @param  u32DefValue defaut value
  * @param  pulValue  where to store the value of the parameter on success
  */
-RTDECL(int) VBoxQueryConfHGSMI(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                               uint32_t u32Index, uint32_t *pulValue)
+RTDECL(int) VBoxQueryConfHGSMIDef(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                  uint32_t u32Index, uint32_t u32DefValue, uint32_t *pulValue)
 {
     int rc = VINF_SUCCESS;
     VBVACONF32 *p;
@@ -511,7 +512,7 @@ RTDECL(int) VBoxQueryConfHGSMI(PHGSMIGUESTCOMMANDCONTEXT pCtx,
     {
         /* Prepare data to be sent to the host. */
         p->u32Index = u32Index;
-        p->u32Value = UINT32_MAX;
+        p->u32Value = u32DefValue;
         rc = VBoxHGSMIBufferSubmit(pCtx, p);
         if (RT_SUCCESS(rc))
         {
@@ -527,6 +528,11 @@ RTDECL(int) VBoxQueryConfHGSMI(PHGSMIGUESTCOMMANDCONTEXT pCtx,
     return rc;
 }
 
+RTDECL(int) VBoxQueryConfHGSMI(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                               uint32_t u32Index, uint32_t *pulValue)
+{
+    return VBoxQueryConfHGSMIDef(pCtx, u32Index, UINT32_MAX, pulValue);
+}
 
 /**
  * Pass the host a new mouse pointer shape via an HGSMI command.
@@ -603,7 +609,7 @@ RTDECL(int)  VBoxHGSMIUpdatePointerShape(PHGSMIGUESTCOMMANDCONTEXT pCtx,
 }
 
 
-/** 
+/**
  * Report the guest cursor position.  The host may wish to use this information
  * to re-position its own cursor (though this is currently unlikely).  The
  * current host cursor position is returned.
diff --git a/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp b/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
index 0a318c2..70a4b01 100644
--- a/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
+++ b/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@
 #include <iprt/log.h>
 
 #ifndef VBOX_GUESTR3XF86MOD
-# include <string.h>
+# include <iprt/string.h>
 #endif
 
 /**
@@ -283,7 +283,7 @@ RTDECL(void) VBoxHGSMIProcessDisplayInfo(PHGSMIGUESTCOMMANDCONTEXT pCtx,
 /** Report the rectangle relative to which absolute pointer events should be
  *  expressed.  This information remains valid until the next VBVA resize event
  *  for any screen, at which time it is reset to the bounding rectangle of all
- *  virtual screens. 
+ *  virtual screens.
  * @param  pCtx      The context containing the heap to use.
  * @param  cOriginX  Upper left X co-ordinate relative to the first screen.
  * @param  cOriginY  Upper left Y co-ordinate relative to the first screen.
@@ -372,7 +372,7 @@ RTDECL(int) VBoxHGSMIGetModeHints(PHGSMIGUESTCOMMANDCONTEXT pCtx,
 RTDECL(uint16_t) VBoxHGSMIGetScreenFlags(PHGSMIGUESTCOMMANDCONTEXT pCtx)
 {
     uint32_t u32Flags = 0;
-    int rc = VBoxQueryConfHGSMI(pCtx, VBOX_VBVA_CONF32_SCREEN_FLAGS, &u32Flags);
+    int rc = VBoxQueryConfHGSMIDef(pCtx, VBOX_VBVA_CONF32_SCREEN_FLAGS, 0, &u32Flags);
     LogFunc(("u32Flags = 0x%x rc %Rrc\n", u32Flags, rc));
     if (RT_FAILURE(rc))
         u32Flags = 0;
diff --git a/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp b/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp
index f041176..5e2c89b 100644
--- a/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp
+++ b/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/DD_glc.py b/src/VBox/Additions/common/crOpenGL/DD_glc.py
index 8059661..caf02fa 100644
--- a/src/VBox/Additions/common/crOpenGL/DD_glc.py
+++ b/src/VBox/Additions/common/crOpenGL/DD_glc.py
@@ -4,7 +4,7 @@ print """
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/DD_glh.py b/src/VBox/Additions/common/crOpenGL/DD_glh.py
index 9e81b6b..5fd889a 100644
--- a/src/VBox/Additions/common/crOpenGL/DD_glh.py
+++ b/src/VBox/Additions/common/crOpenGL/DD_glh.py
@@ -4,7 +4,7 @@ print """
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/Linux_i386_glxapi_exports.py b/src/VBox/Additions/common/crOpenGL/Linux_i386_glxapi_exports.py
index 65c4660..04937c7 100755
--- a/src/VBox/Additions/common/crOpenGL/Linux_i386_glxapi_exports.py
+++ b/src/VBox/Additions/common/crOpenGL/Linux_i386_glxapi_exports.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2009-2012 Oracle Corporation
+Copyright (C) 2009-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
index 2359eb0..e03b8a1 100644
--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports.py b/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports.py
index 7fc6cdd..243475b 100755
--- a/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports.py
+++ b/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2009-2012 Oracle Corporation
+Copyright (C) 2009-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports_dri.py b/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports_dri.py
index 2690343..af0960d 100755
--- a/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports_dri.py
+++ b/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports_dri.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2009-2012 Oracle Corporation
+Copyright (C) 2009-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/SunOS_i386_glxapi_exports.py b/src/VBox/Additions/common/crOpenGL/SunOS_i386_glxapi_exports.py
index e835ecb..76d67b8 100755
--- a/src/VBox/Additions/common/crOpenGL/SunOS_i386_glxapi_exports.py
+++ b/src/VBox/Additions/common/crOpenGL/SunOS_i386_glxapi_exports.py
@@ -1,5 +1,5 @@
 """
-Copyright (C) 2009-2012 Oracle Corporation
+Copyright (C) 2009-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc b/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc
index 2f00b00..53971f4 100644
--- a/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc
+++ b/src/VBox/Additions/common/crOpenGL/VBoxCROGL.rc
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/VBoxICDList.h b/src/VBox/Additions/common/crOpenGL/VBoxICDList.h
index cc43c1c..d138e59 100644
--- a/src/VBox/Additions/common/crOpenGL/VBoxICDList.h
+++ b/src/VBox/Additions/common/crOpenGL/VBoxICDList.h
@@ -2,7 +2,7 @@
  *
  * VirtualBox Windows NT/2000/XP guest OpenGL ICD
  *
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/cr_gl.py b/src/VBox/Additions/common/crOpenGL/cr_gl.py
index 93dcc95..2381155 100644
--- a/src/VBox/Additions/common/crOpenGL/cr_gl.py
+++ b/src/VBox/Additions/common/crOpenGL/cr_gl.py
@@ -4,7 +4,7 @@ print """
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/dri_drv.c b/src/VBox/Additions/common/crOpenGL/dri_drv.c
index 37f501e..0efc3d1 100644
--- a/src/VBox/Additions/common/crOpenGL/dri_drv.c
+++ b/src/VBox/Additions/common/crOpenGL/dri_drv.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/dri_drv.h b/src/VBox/Additions/common/crOpenGL/dri_drv.h
index 7c5807d..1ef583c 100644
--- a/src/VBox/Additions/common/crOpenGL/dri_drv.h
+++ b/src/VBox/Additions/common/crOpenGL/dri_drv.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/dri_glx.h b/src/VBox/Additions/common/crOpenGL/dri_glx.h
index 5ff2956..a182425 100644
--- a/src/VBox/Additions/common/crOpenGL/dri_glx.h
+++ b/src/VBox/Additions/common/crOpenGL/dri_glx.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
index f6793da..bd186c7 100644
--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.h b/src/VBox/Additions/common/crOpenGL/fakedri_drv.h
index acbc711..e8871d5 100644
--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.h
+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h b/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h
index a8551de..a5fb075 100644
--- a/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h
+++ b/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h b/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h
index 6c449f8..853449c 100644
--- a/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h
+++ b/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c b/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c
index 2dc757a..a68ab53 100644
--- a/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c
+++ b/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/glx_c_exports.c b/src/VBox/Additions/common/crOpenGL/glx_c_exports.c
index 183c021..175b859 100644
--- a/src/VBox/Additions/common/crOpenGL/glx_c_exports.c
+++ b/src/VBox/Additions/common/crOpenGL/glx_c_exports.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/glx_proto.h b/src/VBox/Additions/common/crOpenGL/glx_proto.h
index 6108474..0b829ce 100644
--- a/src/VBox/Additions/common/crOpenGL/glx_proto.h
+++ b/src/VBox/Additions/common/crOpenGL/glx_proto.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/icd_drv.c b/src/VBox/Additions/common/crOpenGL/icd_drv.c
index 32039c7..2f66a6b 100644
--- a/src/VBox/Additions/common/crOpenGL/icd_drv.c
+++ b/src/VBox/Additions/common/crOpenGL/icd_drv.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/icd_drv.h b/src/VBox/Additions/common/crOpenGL/icd_drv.h
index 46c0b56..c4f161b 100644
--- a/src/VBox/Additions/common/crOpenGL/icd_drv.h
+++ b/src/VBox/Additions/common/crOpenGL/icd_drv.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c
index ed555c4..3931f94 100644
--- a/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c
+++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c
index 6b3271d..6850f85 100644
--- a/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c
+++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c
index aacf9ef..aa9863b 100644
--- a/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c
+++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c
index fca7fe6..eb30cd5 100644
--- a/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c
+++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc b/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc
index ebe6296..d447829 100644
--- a/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc
+++ b/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu.rc
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/pam/Makefile.kmk b/src/VBox/Additions/common/pam/Makefile.kmk
index a6dd4df..e5a5352 100644
--- a/src/VBox/Additions/common/pam/Makefile.kmk
+++ b/src/VBox/Additions/common/pam/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2011-2012 Oracle Corporation
+# Copyright (C) 2011-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/pam/pam_vbox.cpp b/src/VBox/Additions/common/pam/pam_vbox.cpp
index 4852f03..5774ea9 100644
--- a/src/VBox/Additions/common/pam/pam_vbox.cpp
+++ b/src/VBox/Additions/common/pam/pam_vbox.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/testcase/Makefile.kmk b/src/VBox/Additions/common/testcase/Makefile.kmk
index 3da1887..df542b8 100644
--- a/src/VBox/Additions/common/testcase/Makefile.kmk
+++ b/src/VBox/Additions/common/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/common/testcase/tstPageFusion.cpp b/src/VBox/Additions/common/testcase/tstPageFusion.cpp
index 74a010f..80965d9 100644
--- a/src/VBox/Additions/common/testcase/tstPageFusion.cpp
+++ b/src/VBox/Additions/common/testcase/tstPageFusion.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/darwin/Installer/Makefile.kmk b/src/VBox/Additions/darwin/Installer/Makefile.kmk
index 0a89705..5dbfc7e 100644
--- a/src/VBox/Additions/darwin/Installer/Makefile.kmk
+++ b/src/VBox/Additions/darwin/Installer/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/darwin/Makefile.kmk b/src/VBox/Additions/darwin/Makefile.kmk
index 2e7c911..889f6b5 100644
--- a/src/VBox/Additions/darwin/Makefile.kmk
+++ b/src/VBox/Additions/darwin/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2013 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/darwin/VBoxClient/Makefile.kmk b/src/VBox/Additions/darwin/VBoxClient/Makefile.kmk
index 3db87ee..da4b5cc 100644
--- a/src/VBox/Additions/darwin/VBoxClient/Makefile.kmk
+++ b/src/VBox/Additions/darwin/VBoxClient/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/freebsd/Makefile.kmk b/src/VBox/Additions/freebsd/Makefile.kmk
index 76fb49e..e1699f4 100644
--- a/src/VBox/Additions/freebsd/Makefile.kmk
+++ b/src/VBox/Additions/freebsd/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/freebsd/drm/Makefile.kmk b/src/VBox/Additions/freebsd/drm/Makefile.kmk
index 2dab5a3..5b2cacb 100644
--- a/src/VBox/Additions/freebsd/drm/Makefile.kmk
+++ b/src/VBox/Additions/freebsd/drm/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
index 78d7f5a..2791e48 100644
--- a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
+++ b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/haiku/Makefile.kmk b/src/VBox/Additions/haiku/Makefile.kmk
index 1b282de..4892c22 100644
--- a/src/VBox/Additions/haiku/Makefile.kmk
+++ b/src/VBox/Additions/haiku/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/haiku/SharedFolders/Makefile.kmk b/src/VBox/Additions/haiku/SharedFolders/Makefile.kmk
index 5f5b4eb..ad29553 100644
--- a/src/VBox/Additions/haiku/SharedFolders/Makefile.kmk
+++ b/src/VBox/Additions/haiku/SharedFolders/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/haiku/VBoxMouse/Makefile.kmk b/src/VBox/Additions/haiku/VBoxMouse/Makefile.kmk
index b206923..278a398 100644
--- a/src/VBox/Additions/haiku/VBoxMouse/Makefile.kmk
+++ b/src/VBox/Additions/haiku/VBoxMouse/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk b/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk
index 1ef1842..39d297e 100644
--- a/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk
+++ b/src/VBox/Additions/haiku/VBoxTray/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/haiku/VBoxVideo/Makefile.kmk b/src/VBox/Additions/haiku/VBoxVideo/Makefile.kmk
index 7466c3a..5c5c39a 100644
--- a/src/VBox/Additions/haiku/VBoxVideo/Makefile.kmk
+++ b/src/VBox/Additions/haiku/VBoxVideo/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/haiku/VBoxVideo/accelerant/Makefile.kmk b/src/VBox/Additions/haiku/VBoxVideo/accelerant/Makefile.kmk
index 3264f29..792b33e 100644
--- a/src/VBox/Additions/haiku/VBoxVideo/accelerant/Makefile.kmk
+++ b/src/VBox/Additions/haiku/VBoxVideo/accelerant/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/haiku/VBoxVideo/driver/Makefile.kmk b/src/VBox/Additions/haiku/VBoxVideo/driver/Makefile.kmk
index f596389..0991b06 100644
--- a/src/VBox/Additions/haiku/VBoxVideo/driver/Makefile.kmk
+++ b/src/VBox/Additions/haiku/VBoxVideo/driver/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/linux/Makefile.kmk b/src/VBox/Additions/linux/Makefile.kmk
index ab642cf..fb4e19a 100644
--- a/src/VBox/Additions/linux/Makefile.kmk
+++ b/src/VBox/Additions/linux/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/linux/drm/Makefile.kmk b/src/VBox/Additions/linux/drm/Makefile.kmk
index f6d6801..2a4fcd8 100644
--- a/src/VBox/Additions/linux/drm/Makefile.kmk
+++ b/src/VBox/Additions/linux/drm/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h b/src/VBox/Additions/linux/drm/vbox_drv.h
index ab1791c..332a5fd 100644
--- a/src/VBox/Additions/linux/drm/vbox_drv.h
+++ b/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -48,12 +48,12 @@
 #ifndef __VBOX_DRV_H__
 #define __VBOX_DRV_H__
 
+#include "the-linux-kernel.h"
+
 #include <VBox/VBoxVideoGuest.h>
 
 #include <iprt/log.h>
 
-#include "the-linux-kernel.h"
-
 #include <drm/drmP.h>
 #include <drm/drm_fb_helper.h>
 
@@ -63,6 +63,10 @@
 #include <drm/ttm/ttm_memory.h>
 #include <drm/ttm/ttm_module.h>
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+# include <drm/drm_gem.h>
+#endif
+
 /* #include "vboxvideo.h" */
 
 #include "product-generated.h"
@@ -205,7 +209,11 @@ struct vbox_bo
     struct ttm_placement placement;
     struct ttm_bo_kmap_obj kmap;
     struct drm_gem_object gem;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
     u32 placements[3];
+#else
+    struct ttm_place placements[3];
+#endif
     int pin_count;
 };
 #define gem_to_vbox_bo(gobj) container_of((gobj), struct vbox_bo, gem)
diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c
index 1b998f0..4fef87f 100644
--- a/src/VBox/Additions/linux/drm/vbox_fb.c
+++ b/src/VBox/Additions/linux/drm/vbox_fb.c
@@ -445,7 +445,11 @@ int vbox_fbdev_init(struct drm_device *dev)
         return -ENOMEM;
 
     vbox->fbdev = afbdev;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
     afbdev->helper.funcs = &vbox_fb_helper_funcs;
+#else
+    drm_fb_helper_prepare(dev, &afbdev->helper, &vbox_fb_helper_funcs);
+#endif
     ret = drm_fb_helper_init(dev, &afbdev->helper, vbox->cCrtcs, vbox->cCrtcs);
     if (ret)
     {
diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c b/src/VBox/Additions/linux/drm/vbox_mode.c
index ec0ae54..79df250 100644
--- a/src/VBox/Additions/linux/drm/vbox_mode.c
+++ b/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -53,6 +53,9 @@
 
 #include <linux/export.h>
 #include <drm/drm_crtc_helper.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+# include <drm/drm_plane_helper.h>
+#endif
 
 static int vbox_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv,
                             uint32_t handle, uint32_t width, uint32_t height,
@@ -442,7 +445,11 @@ static void vbox_connector_destroy(struct drm_connector *pConnector)
     LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, pConnector));
     pVBoxConnector = to_vbox_connector(pConnector);
     device_remove_file(pConnector->dev->dev, &pVBoxConnector->deviceAttribute);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
     drm_sysfs_connector_remove(pConnector);
+#else
+    drm_connector_unregister(pConnector);
+#endif
     drm_connector_cleanup(pConnector);
     kfree(pConnector);
 }
@@ -536,7 +543,11 @@ int vbox_connector_init(struct drm_device *pDev, unsigned cScreen,
     pConnector->interlace_allowed = 0;
     pConnector->doublescan_allowed = 0;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
     drm_sysfs_connector_add(pConnector);
+#else
+    drm_connector_register(pConnector);
+#endif
 
     /* The connector supports hot-plug detection: we promise to call
      * "drm_helper_hpd_irq_event" when hot-plugging occurs. */
diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c b/src/VBox/Additions/linux/drm/vbox_ttm.c
index 3f04f20..3056048 100644
--- a/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -48,6 +48,12 @@
 #include "vbox_drv.h"
 #include <ttm/ttm_page_alloc.h>
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
+# define PLACEMENT_FLAGS(placement) (placement)
+#else
+# define PLACEMENT_FLAGS(placement) (placement).flags
+#endif
+
 static inline struct vbox_private *
 vbox_bdev(struct ttm_bo_device *bd)
 {
@@ -344,18 +350,30 @@ void vbox_mm_fini(struct vbox_private *vbox)
 void vbox_ttm_placement(struct vbox_bo *bo, int domain)
 {
     u32 c = 0;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
     bo->placement.fpfn = 0;
     bo->placement.lpfn = 0;
+#else
+    unsigned i;
+#endif
+
     bo->placement.placement = bo->placements;
     bo->placement.busy_placement = bo->placements;
     if (domain & TTM_PL_FLAG_VRAM)
-        bo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
+        PLACEMENT_FLAGS(bo->placements[c++]) = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
     if (domain & TTM_PL_FLAG_SYSTEM)
-        bo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
+        PLACEMENT_FLAGS(bo->placements[c++]) = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
     if (!c)
-        bo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
+        PLACEMENT_FLAGS(bo->placements[c++]) = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
     bo->placement.num_placement = c;
     bo->placement.num_busy_placement = c;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+    for (i = 0; i < c; ++i)
+    {
+        bo->placements[i].fpfn = 0;
+        bo->placements[i].lpfn = 0;
+    }
+#endif
 }
 
 int vbox_bo_reserve(struct vbox_bo *bo, bool no_wait)
@@ -409,6 +427,9 @@ int vbox_bo_create(struct drm_device *dev, int size, int align,
     ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
               ttm_bo_type_device, &vboxbo->placement,
               align >> PAGE_SHIFT, false, NULL, acc_size,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+              NULL,
+#endif
               NULL, vbox_bo_ttm_destroy);
     if (ret)
         return ret;
@@ -436,7 +457,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
 
     vbox_ttm_placement(bo, pl_flag);
     for (i = 0; i < bo->placement.num_placement; i++)
-        bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
+        PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
     ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
     if (ret)
         return ret;
@@ -460,7 +481,7 @@ int vbox_bo_unpin(struct vbox_bo *bo)
         return 0;
 
     for (i = 0; i < bo->placement.num_placement ; i++)
-        bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT;
+        PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
     ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
     if (ret)
         return ret;
@@ -488,7 +509,7 @@ int vbox_bo_push_sysram(struct vbox_bo *bo)
 
     vbox_ttm_placement(bo, TTM_PL_FLAG_SYSTEM);
     for (i = 0; i < bo->placement.num_placement ; i++)
-        bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
+        PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
 
     ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
     if (ret)
@@ -505,7 +526,7 @@ int vbox_mmap(struct file *filp, struct vm_area_struct *vma)
     struct vbox_private *vbox;
 
     if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
-        return drm_mmap(filp, vma);
+        return -EINVAL;
 
     file_priv = filp->private_data;
     vbox = file_priv->minor->dev->dev_private;
diff --git a/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk b/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk
index 79c96d8..adb9e09 100644
--- a/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk
+++ b/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/linux/lightdm-greeter/liblightdm-gobject-1.5.0/Makefile.kmk b/src/VBox/Additions/linux/lightdm-greeter/liblightdm-gobject-1.5.0/Makefile.kmk
index 76c0396..8120a0c 100644
--- a/src/VBox/Additions/linux/lightdm-greeter/liblightdm-gobject-1.5.0/Makefile.kmk
+++ b/src/VBox/Additions/linux/lightdm-greeter/liblightdm-gobject-1.5.0/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/linux/sharedfolders/Makefile.kmk b/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
index 61688a8..deaf206 100644
--- a/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
+++ b/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/solaris/DRM/Makefile.kmk b/src/VBox/Additions/solaris/DRM/Makefile.kmk
index 4ddd2a4..a716f9b 100644
--- a/src/VBox/Additions/solaris/DRM/Makefile.kmk
+++ b/src/VBox/Additions/solaris/DRM/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/solaris/Installer/vboxdevlink.sed b/src/VBox/Additions/solaris/Installer/vboxdevlink.sed
index 9e2d8d1..82cbedf 100644
--- a/src/VBox/Additions/solaris/Installer/vboxdevlink.sed
+++ b/src/VBox/Additions/solaris/Installer/vboxdevlink.sed
@@ -2,7 +2,7 @@
 !install
 /name=vboxguest/d
 $i\
-type=ddi_pseudo;name=vboxguest	\\D
+type=ddi_pseudo;name=vboxguest  \\D
 
 !remove
 /name=vboxguest/d
diff --git a/src/VBox/Additions/solaris/Makefile.kmk b/src/VBox/Additions/solaris/Makefile.kmk
index b7f8adf..654df0f 100644
--- a/src/VBox/Additions/solaris/Makefile.kmk
+++ b/src/VBox/Additions/solaris/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/solaris/Mouse/Makefile.kmk b/src/VBox/Additions/solaris/Mouse/Makefile.kmk
index 82f6957..162ac25 100644
--- a/src/VBox/Additions/solaris/Mouse/Makefile.kmk
+++ b/src/VBox/Additions/solaris/Mouse/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
index 066e577..3168c0c 100644
--- a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
+++ b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/solaris/Virtio/Makefile.kmk b/src/VBox/Additions/solaris/Virtio/Makefile.kmk
index cb7a3c4..99465a3 100644
--- a/src/VBox/Additions/solaris/Virtio/Makefile.kmk
+++ b/src/VBox/Additions/solaris/Virtio/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
index 4413783..9da8992 100644
--- a/src/VBox/Additions/x11/Makefile.kmk
+++ b/src/VBox/Additions/x11/Makefile.kmk
@@ -3,7 +3,7 @@
 # Sub-Makefile for the X11 Guest Additions.
 #
 
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
index d9bfb02..ca5eb7c 100644
--- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
+++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/x11/VBoxClient/display.cpp b/src/VBox/Additions/x11/VBoxClient/display.cpp
index cf0176d..41a8670 100644
--- a/src/VBox/Additions/x11/VBoxClient/display.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/display.cpp
@@ -219,10 +219,9 @@ static void updateMouseCapabilities(struct DISPLAYSTATE *pState)
 {
     uint32_t fFeatures = 0;
     int rc;
-    unsigned i;
 
     rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
-    
+
     if (rc != VINF_SUCCESS)
         VBClFatalError(("Failed to get mouse status, rc=%Rrc\n", rc));
     XChangeProperty(pState->pDisplay, DefaultRootWindow(pState->pDisplay),
@@ -236,9 +235,8 @@ static void updateMouseCapabilities(struct DISPLAYSTATE *pState)
  */
 static void runDisplay(struct DISPLAYSTATE *pState)
 {
-    int status, rc;
+    int rc;
     unsigned i, cScreensTracked;
-    char szCommand[256];
 
     LogRelFlowFunc(("\n"));
     rc = VbglR3VideoModeGetHighestSavedScreen(&cScreensTracked);
diff --git a/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp b/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp
index c593f5f..48435bf 100644
--- a/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp
@@ -947,7 +947,7 @@ int DragInstance::onX11SelectionRequest(const XEvent &e)
             /* Anything else. */
             else
             {
-                LogFlowThisFunc(("Refusing unknown command of wnd=%#x ('%s')\n", e.xselectionrequest.requestor, 
+                LogFlowThisFunc(("Refusing unknown command of wnd=%#x ('%s')\n", e.xselectionrequest.requestor,
                                  propName.value ? (const char *)propName.value : "<No name>"));
 
                 /* We don't understand this request message and therefore answer with an
diff --git a/src/VBox/Additions/x11/VBoxClient/main.cpp b/src/VBox/Additions/x11/VBoxClient/main.cpp
index 9825bc8..88c81e9 100644
--- a/src/VBox/Additions/x11/VBoxClient/main.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/main.cpp
@@ -276,7 +276,7 @@ int main(int argc, char *argv[])
 {
     bool fDaemonise = true, fRespawn = true;
     int rc;
-    const char *pcszFileName, *pcszStage;
+    const char *pcszFileName;
 
     /* Initialise our runtime before all else. */
     rc = RTR3InitExe(argc, &argv, 0);
diff --git a/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp b/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp
index b9c995e..f38b9a6 100644
--- a/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp
+++ b/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp
@@ -119,7 +119,6 @@ int vboxClientXLibErrorHandler(Display *pDisplay, XErrorEvent *pError)
 int main( int argc, char **argv)
 {
     int rc = VINF_SUCCESS;
-    char ach[2];
 
     RTR3InitExe(argc, &argv, 0);
     RTPrintf("VirtualBox guest additions X11 seamless mode testcase\n");
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
index e53ea79..56cd03b 100644
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
index 14ce667..f3f5dae 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Additions/x11/vboxvideo/getmode.c b/src/VBox/Additions/x11/vboxvideo/getmode.c
index 6cd16df..2706fed 100644
--- a/src/VBox/Additions/x11/vboxvideo/getmode.c
+++ b/src/VBox/Additions/x11/vboxvideo/getmode.c
@@ -131,9 +131,9 @@ void vboxAddModes(ScrnInfoPtr pScrn)
     /* Add two dynamic mode entries.  When we receive a new size hint we will
      * update whichever of these is not current. */
     pMode = vboxAddEmptyScreenMode(pScrn);
-    vboxFillDisplayMode(pScrn, pMode, NULL, 1024, 768);
+    vboxFillDisplayMode(pScrn, pMode, NULL, 800, 600);
     pMode = vboxAddEmptyScreenMode(pScrn);
-    vboxFillDisplayMode(pScrn, pMode, NULL, 1024, 768);
+    vboxFillDisplayMode(pScrn, pMode, NULL, 800, 600);
     /* Add any modes specified by the user.  We assume here that the mode names
      * reflect the mode sizes. */
     for (i = 0; pScrn->display->modes && pScrn->display->modes[i]; i++)
@@ -151,13 +151,12 @@ void vboxAddModes(ScrnInfoPtr pScrn)
 void VBoxInitialiseSizeHints(ScrnInfoPtr pScrn)
 {
     VBOXPtr pVBox = VBOXGetRec(pScrn);
-    DisplayModePtr pMode;
     unsigned i;
 
     for (i = 0; i < pVBox->cScreens; ++i)
     {
-        pVBox->pScreens[i].aPreferredSize.cx = 1024;
-        pVBox->pScreens[i].aPreferredSize.cy = 768;
+        pVBox->pScreens[i].aPreferredSize.cx = 800;
+        pVBox->pScreens[i].aPreferredSize.cy = 600;
         pVBox->pScreens[i].afConnected       = true;
     }
     /* Set up the first mode correctly to match the requested initial mode. */
@@ -203,7 +202,6 @@ void vbvxReadSizesAndCursorIntegrationFromProperties(ScrnInfoPtr pScrn, bool *pf
     VBOXPtr pVBox = VBOXGetRec(pScrn);
     size_t cPropertyElements, cDummy;
     int32_t *paModeHints,  *pfCursorCapabilities;
-    int rc;
     unsigned i;
     bool fChanged;
     bool fNeedUpdate = false;
diff --git a/src/VBox/Additions/x11/vboxvideo/helpers.c b/src/VBox/Additions/x11/vboxvideo/helpers.c
index 762d3de..1328ad2 100644
--- a/src/VBox/Additions/x11/vboxvideo/helpers.c
+++ b/src/VBox/Additions/x11/vboxvideo/helpers.c
@@ -79,7 +79,6 @@ int vbvxGetIntegerPropery(ScrnInfoPtr pScrn, char *pszName, size_t *pcData, int3
 void vbvxSetIntegerPropery(ScrnInfoPtr pScrn, char *pszName, size_t cData, int32_t *paData, Bool fSendEvent)
 {
     Atom property_name;
-    int i;
 
     property_name = MakeAtom(pszName, strlen(pszName), TRUE);
     VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName));
diff --git a/src/VBox/Additions/x11/vboxvideo/pointer.c b/src/VBox/Additions/x11/vboxvideo/pointer.c
index 59905f6..f9fe82b 100644
--- a/src/VBox/Additions/x11/vboxvideo/pointer.c
+++ b/src/VBox/Additions/x11/vboxvideo/pointer.c
@@ -228,7 +228,7 @@ vbox_realize_cursor(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
     unsigned char *c, *p, *pm, *ps, *m;
     size_t sizeRequest, sizeRgba, sizeMask, srcPitch, dstPitch;
     CARD32 fc, bc, *cp;
-    int rc, scrnIndex = infoPtr->pScrn->scrnIndex;
+    int scrnIndex = infoPtr->pScrn->scrnIndex;
     struct vboxCursorImage *pImage;
 
     pVBox = infoPtr->pScrn->driverPrivate;
@@ -359,7 +359,6 @@ static void
 vbox_load_cursor_argb(ScrnInfoPtr pScrn, CursorPtr pCurs)
 {
     VBOXPtr pVBox;
-    VMMDevReqMousePointer *reqp;
     CursorBitsPtr bitsp;
     unsigned short w, h;
     unsigned short cx, cy;
@@ -370,7 +369,6 @@ vbox_load_cursor_argb(ScrnInfoPtr pScrn, CursorPtr pCurs)
     int scrnIndex;
     uint32_t fFlags =   VBOX_MOUSE_POINTER_VISIBLE | VBOX_MOUSE_POINTER_SHAPE
                       | VBOX_MOUSE_POINTER_ALPHA;
-    int rc;
 
     pVBox = pScrn->driverPrivate;
     bitsp = pCurs->bits;
diff --git a/src/VBox/Additions/x11/vboxvideo/vboxvideo.c b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
index fedfc43..e34c9f5 100644
--- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
@@ -263,7 +263,6 @@ static Bool adjustScreenPixmap(ScrnInfoPtr pScrn, int width, int height)
     int adjustedWidth = pScrn->bitsPerPixel == 16 ? (width + 1) & ~1 : width;
     int cbLine = adjustedWidth * pScrn->bitsPerPixel / 8;
     PixmapPtr pPixmap;
-    int rc;
 
     TRACE_LOG("width=%d, height=%d\n", width, height);
     VBVXASSERT(width >= 0 && height >= 0, ("Invalid negative width (%d) or height (%d)\n", width, height));
@@ -558,14 +557,13 @@ static DisplayModePtr vbox_output_add_mode(VBOXPtr pVBox, DisplayModePtr *pModes
 static DisplayModePtr
 vbox_output_get_modes (xf86OutputPtr output)
 {
-    unsigned i, cIndex = 0;
+    unsigned cIndex = 0;
     DisplayModePtr pModes = NULL, pMode;
     ScrnInfoPtr pScrn = output->scrn;
     VBOXPtr pVBox = VBOXGetRec(pScrn);
 
     TRACE_ENTRY();
-    uint32_t x, y, iScreen;
-    iScreen = (uintptr_t)output->driver_private;
+    uint32_t iScreen = (uintptr_t)output->driver_private;
     pMode = vbox_output_add_mode(pVBox, &pModes, NULL,
                                  RT_CLAMP(pVBox->pScreens[iScreen].aPreferredSize.cx, VBOX_VIDEO_MIN_SIZE, VBOX_VIDEO_MAX_VIRTUAL),
                                  RT_CLAMP(pVBox->pScreens[iScreen].aPreferredSize.cy, VBOX_VIDEO_MIN_SIZE, VBOX_VIDEO_MAX_VIRTUAL),
@@ -823,7 +821,6 @@ VBOXPreInit(ScrnInfoPtr pScrn, int flags)
     VBOXPtr pVBox;
     Gamma gzeros = {0.0, 0.0, 0.0};
     rgb rzeros = {0, 0, 0};
-    unsigned DispiId;
 
     TRACE_ENTRY();
     /* Are we really starting the server, or is this just a dummy run? */
@@ -1075,6 +1072,8 @@ static void setVirtualSizeRandR12(ScrnInfoPtr pScrn, bool fScreenInitTime)
             TRACE_LOG("cx=%u, cy=%u\n", cx, cy);
             xf86ScrnToScreen(pScrn)->width = cx;
             xf86ScrnToScreen(pScrn)->height = cy;
+            xf86ScrnToScreen(pScrn)->mmWidth = cx * 254 / 960;
+            xf86ScrnToScreen(pScrn)->mmHeight = cy * 254 / 960;
             adjustScreenPixmap(pScrn, cx, cy);
             vbvxSetSolarisMouseRange(cx, cy);
         }
@@ -1201,7 +1200,6 @@ static Bool VBOXScreenInit(ScreenPtr pScreen, int argc, char **argv)
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     VBOXPtr pVBox = VBOXGetRec(pScrn);
     VisualPtr visual;
-    unsigned flags;
 
     TRACE_ENTRY();
 
@@ -1499,7 +1497,6 @@ static Bool VBOXCloseScreen(ScreenPtr pScreen)
 
 static Bool VBOXSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
 {
-    VBOXPtr pVBox;
     Bool rc = TRUE;
 
     TRACE_LOG("HDisplay=%d, VDisplay=%d\n", pMode->HDisplay, pMode->VDisplay);
diff --git a/src/VBox/Additions/x11/vboxvideo/vboxvideo.h b/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
index 9f265e4..f93092b 100644
--- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
+++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
@@ -65,17 +65,17 @@
 
 #define TRACE_ENTRY() \
 do { \
-    vbvxMsg(__PRETTY_FUNCTION__); \
+    vbvxMsg(RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
     vbvxMsg(": entering\n"); \
 } while(0)
 #define TRACE_EXIT() \
 do { \
-    vbvxMsg(__PRETTY_FUNCTION__); \
+    vbvxMsg(RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
     vbvxMsg(": leaving\n"); \
 } while(0)
 #define TRACE_LOG(...) \
 do { \
-    vbvxMsg("%s: ", __PRETTY_FUNCTION__); \
+    vbvxMsg("%s: ", RT_GCC_EXTENSION __PRETTY_FUNCTION__); \
     vbvxMsg(__VA_ARGS__); \
 } while(0)
 # define TRACE_LINE() do \
diff --git a/src/VBox/Additions/x11/vboxvideo/vbva.c b/src/VBox/Additions/x11/vboxvideo/vbva.c
index 5ed517f..f3a1360 100644
--- a/src/VBox/Additions/x11/vboxvideo/vbva.c
+++ b/src/VBox/Additions/x11/vboxvideo/vbva.c
@@ -239,7 +239,6 @@ vboxEnableVbva(ScrnInfoPtr pScrn)
 void
 vboxDisableVbva(ScrnInfoPtr pScrn)
 {
-    int rc;
     unsigned i;
     VBOXPtr pVBox = pScrn->driverPrivate;
 
diff --git a/src/VBox/Additions/x11/x11stubs/Makefile.kmk b/src/VBox/Additions/x11/x11stubs/Makefile.kmk
index d7c4d86..605ae55 100644
--- a/src/VBox/Additions/x11/x11stubs/Makefile.kmk
+++ b/src/VBox/Additions/x11/x11stubs/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGCBuiltInSymbols.cpp b/src/VBox/Debugger/DBGCBuiltInSymbols.cpp
index dbe5db7..d40ab94 100644
--- a/src/VBox/Debugger/DBGCBuiltInSymbols.cpp
+++ b/src/VBox/Debugger/DBGCBuiltInSymbols.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGCCmdHlp.cpp b/src/VBox/Debugger/DBGCCmdHlp.cpp
index 8e924ab..eb0e8f6 100644
--- a/src/VBox/Debugger/DBGCCmdHlp.cpp
+++ b/src/VBox/Debugger/DBGCCmdHlp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGCCmdWorkers.cpp b/src/VBox/Debugger/DBGCCmdWorkers.cpp
index a450efc..c9f7a8c 100644
--- a/src/VBox/Debugger/DBGCCmdWorkers.cpp
+++ b/src/VBox/Debugger/DBGCCmdWorkers.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGCEmulateCodeView.cpp b/src/VBox/Debugger/DBGCEmulateCodeView.cpp
index 6268c93..7cdabe2 100644
--- a/src/VBox/Debugger/DBGCEmulateCodeView.cpp
+++ b/src/VBox/Debugger/DBGCEmulateCodeView.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGCEval.cpp b/src/VBox/Debugger/DBGCEval.cpp
index 4bd0740..39152f6 100644
--- a/src/VBox/Debugger/DBGCEval.cpp
+++ b/src/VBox/Debugger/DBGCEval.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGCFunctions.cpp b/src/VBox/Debugger/DBGCFunctions.cpp
index 62a6fb3..ef500cf 100644
--- a/src/VBox/Debugger/DBGCFunctions.cpp
+++ b/src/VBox/Debugger/DBGCFunctions.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGCGdbRemoteStub.cpp b/src/VBox/Debugger/DBGCGdbRemoteStub.cpp
index a48d1d1..17f02fa 100644
--- a/src/VBox/Debugger/DBGCGdbRemoteStub.cpp
+++ b/src/VBox/Debugger/DBGCGdbRemoteStub.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGCOps.cpp b/src/VBox/Debugger/DBGCOps.cpp
index 6abe515..a1578b7 100644
--- a/src/VBox/Debugger/DBGCOps.cpp
+++ b/src/VBox/Debugger/DBGCOps.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGCTcp.cpp b/src/VBox/Debugger/DBGCTcp.cpp
index 6e18e40..dc0abd6 100644
--- a/src/VBox/Debugger/DBGCTcp.cpp
+++ b/src/VBox/Debugger/DBGCTcp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGConsole.cpp b/src/VBox/Debugger/DBGConsole.cpp
index aa17721..74af99a 100644
--- a/src/VBox/Debugger/DBGConsole.cpp
+++ b/src/VBox/Debugger/DBGConsole.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -582,7 +582,7 @@ static const char *dbgcGetEventCtx(DBGFEVENTCTX enmCtx)
     {
         case DBGFEVENTCTX_RAW:      return "raw";
         case DBGFEVENTCTX_REM:      return "rem";
-        case DBGFEVENTCTX_HM:   return "hwaccl";
+        case DBGFEVENTCTX_HM:       return "hwaccl";
         case DBGFEVENTCTX_HYPER:    return "hyper";
         case DBGFEVENTCTX_OTHER:    return "other";
 
diff --git a/src/VBox/Debugger/DBGPlugInCommonELF.cpp b/src/VBox/Debugger/DBGPlugInCommonELF.cpp
index 7b27b7d..2c0bc64 100644
--- a/src/VBox/Debugger/DBGPlugInCommonELF.cpp
+++ b/src/VBox/Debugger/DBGPlugInCommonELF.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGPlugInCommonELF.h b/src/VBox/Debugger/DBGPlugInCommonELF.h
index 0ef190c..4ae6ec1 100644
--- a/src/VBox/Debugger/DBGPlugInCommonELF.h
+++ b/src/VBox/Debugger/DBGPlugInCommonELF.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGPlugInCommonELFTmpl.cpp.h b/src/VBox/Debugger/DBGPlugInCommonELFTmpl.cpp.h
index 31c8f7a..3079c46 100644
--- a/src/VBox/Debugger/DBGPlugInCommonELFTmpl.cpp.h
+++ b/src/VBox/Debugger/DBGPlugInCommonELFTmpl.cpp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGPlugInDarwin.cpp b/src/VBox/Debugger/DBGPlugInDarwin.cpp
index f454568..3543dbd 100644
--- a/src/VBox/Debugger/DBGPlugInDarwin.cpp
+++ b/src/VBox/Debugger/DBGPlugInDarwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGPlugInLinux.cpp b/src/VBox/Debugger/DBGPlugInLinux.cpp
index 4bcd4d8..299c44b 100644
--- a/src/VBox/Debugger/DBGPlugInLinux.cpp
+++ b/src/VBox/Debugger/DBGPlugInLinux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGPlugInOS2.cpp b/src/VBox/Debugger/DBGPlugInOS2.cpp
index 1fe576e..dd1bc70 100644
--- a/src/VBox/Debugger/DBGPlugInOS2.cpp
+++ b/src/VBox/Debugger/DBGPlugInOS2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGPlugInSolaris.cpp b/src/VBox/Debugger/DBGPlugInSolaris.cpp
index c8fa67f..89f97f9 100644
--- a/src/VBox/Debugger/DBGPlugInSolaris.cpp
+++ b/src/VBox/Debugger/DBGPlugInSolaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGPlugInWinNt.cpp b/src/VBox/Debugger/DBGPlugInWinNt.cpp
index be61017..88ef1b8 100644
--- a/src/VBox/Debugger/DBGPlugInWinNt.cpp
+++ b/src/VBox/Debugger/DBGPlugInWinNt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/DBGPlugIns.h b/src/VBox/Debugger/DBGPlugIns.h
index f467d28..61bc972 100644
--- a/src/VBox/Debugger/DBGPlugIns.h
+++ b/src/VBox/Debugger/DBGPlugIns.h
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/Makefile.kmk b/src/VBox/Debugger/Makefile.kmk
index c41d165..f12559f 100644
--- a/src/VBox/Debugger/Makefile.kmk
+++ b/src/VBox/Debugger/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/VBoxDbg.cpp b/src/VBox/Debugger/VBoxDbg.cpp
index 351d604..3600884 100644
--- a/src/VBox/Debugger/VBoxDbg.cpp
+++ b/src/VBox/Debugger/VBoxDbg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/VBoxDbgBase.cpp b/src/VBox/Debugger/VBoxDbgBase.cpp
index b7038c9..2538abc 100644
--- a/src/VBox/Debugger/VBoxDbgBase.cpp
+++ b/src/VBox/Debugger/VBoxDbgBase.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/VBoxDbgBase.h b/src/VBox/Debugger/VBoxDbgBase.h
index 1b8e30d..9f22899 100644
--- a/src/VBox/Debugger/VBoxDbgBase.h
+++ b/src/VBox/Debugger/VBoxDbgBase.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/VBoxDbgConsole.cpp b/src/VBox/Debugger/VBoxDbgConsole.cpp
index 9df624e..0dfcd0f 100644
--- a/src/VBox/Debugger/VBoxDbgConsole.cpp
+++ b/src/VBox/Debugger/VBoxDbgConsole.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/VBoxDbgConsole.h b/src/VBox/Debugger/VBoxDbgConsole.h
index 97826c8..9915605 100644
--- a/src/VBox/Debugger/VBoxDbgConsole.h
+++ b/src/VBox/Debugger/VBoxDbgConsole.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/VBoxDbgDisas.h b/src/VBox/Debugger/VBoxDbgDisas.h
index bbd706f..aa8cd54 100644
--- a/src/VBox/Debugger/VBoxDbgDisas.h
+++ b/src/VBox/Debugger/VBoxDbgDisas.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/VBoxDbgGui.cpp b/src/VBox/Debugger/VBoxDbgGui.cpp
index 9cf91bf..c0db886 100644
--- a/src/VBox/Debugger/VBoxDbgGui.cpp
+++ b/src/VBox/Debugger/VBoxDbgGui.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/VBoxDbgGui.h b/src/VBox/Debugger/VBoxDbgGui.h
index c0727e4..c202a20 100644
--- a/src/VBox/Debugger/VBoxDbgGui.h
+++ b/src/VBox/Debugger/VBoxDbgGui.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/VBoxDbgStatsQt4.cpp b/src/VBox/Debugger/VBoxDbgStatsQt4.cpp
index a13733b..19302e0 100644
--- a/src/VBox/Debugger/VBoxDbgStatsQt4.cpp
+++ b/src/VBox/Debugger/VBoxDbgStatsQt4.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/VBoxDbgStatsQt4.h b/src/VBox/Debugger/VBoxDbgStatsQt4.h
index 822c2fe..cbbb863 100644
--- a/src/VBox/Debugger/VBoxDbgStatsQt4.h
+++ b/src/VBox/Debugger/VBoxDbgStatsQt4.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/testcase/tstDBGCParser.cpp b/src/VBox/Debugger/testcase/tstDBGCParser.cpp
index 5c1b884..664935d 100644
--- a/src/VBox/Debugger/testcase/tstDBGCParser.cpp
+++ b/src/VBox/Debugger/testcase/tstDBGCParser.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/testcase/tstDBGCStubs.cpp b/src/VBox/Debugger/testcase/tstDBGCStubs.cpp
index 9b46b68..82a7384 100644
--- a/src/VBox/Debugger/testcase/tstDBGCStubs.cpp
+++ b/src/VBox/Debugger/testcase/tstDBGCStubs.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Debugger/testcase/tstVBoxDbg.cpp b/src/VBox/Debugger/testcase/tstVBoxDbg.cpp
index 5d72c8d..4c7843e 100644
--- a/src/VBox/Debugger/testcase/tstVBoxDbg.cpp
+++ b/src/VBox/Debugger/testcase/tstVBoxDbg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Audio/DevIchAc97.cpp b/src/VBox/Devices/Audio/DevIchAc97.cpp
index bb55efe..6fc56d5 100644
--- a/src/VBox/Devices/Audio/DevIchAc97.cpp
+++ b/src/VBox/Devices/Audio/DevIchAc97.cpp
@@ -2075,18 +2075,18 @@ static DECLCALLBACK(int) ichac97Construct(PPDMDEVINS pDevIns, int iInstance, PCF
     /*
      * Validations.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "Type\0"))
+    if (!CFGMR3AreValuesValid(pCfg, "Codec\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("Invalid configuration for the AC'97 device"));
 
     /*
-     * Determine the chip type.
+     * Determine the codec model.
      */
-    char szType[20];
-    int rc = CFGMR3QueryStringDef(pCfg, "Type", &szType[0], sizeof(szType), "STAC9700");
+    char szCodec[20];
+    int rc = CFGMR3QueryStringDef(pCfg, "Codec", &szCodec[0], sizeof(szCodec), "STAC9700");
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
-                                N_("AC'97 configuration error: Querying \"Type\" as string failed"));
+                                N_("AC'97 configuration error: Querying \"Codec\" as string failed"));
 
     /*
      * The AD1980 codec (with corresponding PCI subsystem vendor ID) is whitelisted
@@ -2094,15 +2094,15 @@ static DECLCALLBACK(int) ichac97Construct(PPDMDEVINS pDevIns, int iInstance, PCF
      * 48 kHz rate, which is exactly what we need.
      */
     bool fChipAD1980 = false;
-    if (!strcmp(szType, "STAC9700"))
+    if (!strcmp(szCodec, "STAC9700"))
         fChipAD1980 = false;
-    else if (!strcmp(szType, "AD1980"))
+    else if (!strcmp(szCodec, "AD1980"))
         fChipAD1980 = true;
     else
     {
         return PDMDevHlpVMSetError(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES, RT_SRC_POS,
-                                   N_("AC'97 configuration error: The \"Type\" value \"%s\" is unsupported"),
-                                   szType);
+                                   N_("AC'97 configuration error: The \"Codec\" value \"%s\" is unsupported"),
+                                   szCodec);
     }
 
     /*
diff --git a/src/VBox/Devices/Audio/DevIchHda.cpp b/src/VBox/Devices/Audio/DevIchHda.cpp
index dcef0eb..d3f378a 100644
--- a/src/VBox/Devices/Audio/DevIchHda.cpp
+++ b/src/VBox/Devices/Audio/DevIchHda.cpp
@@ -3897,7 +3897,7 @@ const PDMDEVREG g_DeviceICH6_HDA =
     /* szName */
     "hda",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Audio/DevIchHdaCodec.cpp b/src/VBox/Devices/Audio/DevIchHdaCodec.cpp
index e0c6b0b..10ed37b 100644
--- a/src/VBox/Devices/Audio/DevIchHdaCodec.cpp
+++ b/src/VBox/Devices/Audio/DevIchHdaCodec.cpp
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Audio/DevIchHdaCodec.h b/src/VBox/Devices/Audio/DevIchHdaCodec.h
index 6dc4d1c..0fcccb5 100644
--- a/src/VBox/Devices/Audio/DevIchHdaCodec.h
+++ b/src/VBox/Devices/Audio/DevIchHdaCodec.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Audio/DevSB16.cpp b/src/VBox/Devices/Audio/DevSB16.cpp
index 321cdea..ccef8dc 100644
--- a/src/VBox/Devices/Audio/DevSB16.cpp
+++ b/src/VBox/Devices/Audio/DevSB16.cpp
@@ -1334,6 +1334,15 @@ static inline void sb16ConvVolumeR(PSB16STATE pThis, unsigned reg, uint8_t val)
     pThis->mixer_regs[reg] = (pThis->mixer_regs[reg] & 0xf0) | (val >> 4);
 }
 
+/* Convert SB Pro to SB16 mixer volume (left + right). */
+static inline void sb16ConvVolumeOldToNew(PSB16STATE pThis, unsigned reg, uint8_t val)
+{
+    /* Left channel. */
+    pThis->mixer_regs[reg + 0] = (val & 0xf0) | RT_BIT(3);
+    /* Right channel (the register immediately following). */
+    pThis->mixer_regs[reg + 1] = (val << 4)   | RT_BIT(3);
+}
+
 static IO_WRITE_PROTO(mixer_write_datab)
 {
     PSB16STATE  pThis = (PSB16STATE)opaque;
@@ -1352,36 +1361,26 @@ static IO_WRITE_PROTO(mixer_write_datab)
             fUpdateStream = true;
             break;
 
-        case 0x04:
-            /* Translate from old style stream volume (L/R). */
-            pThis->mixer_regs[0x32] = (val & 0xf0) >> 3;
-            pThis->mixer_regs[0x33] = (val & 0x0f) << 1;
+        case 0x04:  /* Translate from old style voice volume (L/R). */
+            sb16ConvVolumeOldToNew(pThis, 0x32, val);
             fUpdateStream = true;
             break;
 
-        case 0x22:
-            /* Translate from old style master volume (L/R). */
-            pThis->mixer_regs[0x30] = (val & 0xf0) >> 3;
-            pThis->mixer_regs[0x31] = (val & 0x0f) << 1;
+        case 0x22:  /* Translate from old style master volume (L/R). */
+            sb16ConvVolumeOldToNew(pThis, 0x30, val);
             fUpdateMaster = true;
             break;
 
-        case 0x26:
-            /* Translate from old style MIDI volume (L/R). */
-            pThis->mixer_regs[0x34] = (val & 0xf0) >> 3;
-            pThis->mixer_regs[0x35] = (val & 0x0f) << 1;
+        case 0x26:  /* Translate from old style MIDI volume (L/R). */
+            sb16ConvVolumeOldToNew(pThis, 0x34, val);
             break;
 
-        case 0x28:
-            /* Translate from old style CD volume (L/R). */
-            pThis->mixer_regs[0x36] = (val & 0xf0) >> 3;
-            pThis->mixer_regs[0x37] = (val & 0x0f) << 1;
+        case 0x28:  /* Translate from old style CD volume (L/R). */
+            sb16ConvVolumeOldToNew(pThis, 0x36, val);
             break;
 
-        case 0x2E:
-            /* Translate from old style line volume (L/R). */
-            pThis->mixer_regs[0x38] = (val & 0xf0) >> 3;
-            pThis->mixer_regs[0x39] = (val & 0x0f) << 1;
+        case 0x2E:  /* Translate from old style line volume (L/R). */
+            sb16ConvVolumeOldToNew(pThis, 0x38, val);
             break;
 
         case 0x30:  /* Translate to old style master volume (L). */
diff --git a/src/VBox/Devices/Audio/DrvAudio.cpp b/src/VBox/Devices/Audio/DrvAudio.cpp
index 7cc6d7b..d5543b7 100644
--- a/src/VBox/Devices/Audio/DrvAudio.cpp
+++ b/src/VBox/Devices/Audio/DrvAudio.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Audio/DrvAudio.h b/src/VBox/Devices/Audio/DrvAudio.h
index fa30217..0be9ed1 100644
--- a/src/VBox/Devices/Audio/DrvAudio.h
+++ b/src/VBox/Devices/Audio/DrvAudio.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Audio/DrvAudioCommon.cpp b/src/VBox/Devices/Audio/DrvAudioCommon.cpp
index 4878378..ed2ef12 100644
--- a/src/VBox/Devices/Audio/DrvAudioCommon.cpp
+++ b/src/VBox/Devices/Audio/DrvAudioCommon.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp b/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp
index c75d7e3..5f1dc0f 100644
--- a/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp
+++ b/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp
@@ -59,8 +59,6 @@ RT_C_DECLS_END
 #include "AudioMixBuffer.h"
 
 #include "VBoxDD.h"
-#include "vl_vbox.h"
-
 
 
 #ifdef LOG_GROUP
diff --git a/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp b/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp
index 1804230..2efe5ea 100644
--- a/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp
+++ b/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp
@@ -17,12 +17,13 @@
 #include "DrvAudio.h"
 #include "AudioMixBuffer.h"
 
+#include "VBoxDD.h"
+
 #include <iprt/asm.h>
 #include <iprt/cdefs.h>
 #include <iprt/circbuf.h>
 #include <iprt/mem.h>
 
-#include "vl_vbox.h"
 #include <iprt/uuid.h>
 
 #include <CoreAudio/CoreAudio.h>
diff --git a/src/VBox/Devices/Audio/DrvHostNullAudio.cpp b/src/VBox/Devices/Audio/DrvHostNullAudio.cpp
index 6a0ccd5..b5ddf5a 100644
--- a/src/VBox/Devices/Audio/DrvHostNullAudio.cpp
+++ b/src/VBox/Devices/Audio/DrvHostNullAudio.cpp
@@ -44,7 +44,6 @@
 #include "AudioMixBuffer.h"
 
 #include "VBoxDD.h"
-#include "vl_vbox.h"
 
 #include <iprt/alloc.h>
 #include <iprt/uuid.h> /* For PDMIBASE_2_PDMDRV. */
diff --git a/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp b/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
index 28494db..9eaedeb 100644
--- a/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
+++ b/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
@@ -19,7 +19,6 @@
 #include "AudioMixBuffer.h"
 
 #include "VBoxDD.h"
-#include "vl_vbox.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp b/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp
index 69243a5..27408d8 100644
--- a/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp
+++ b/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp
@@ -32,11 +32,12 @@ RT_C_DECLS_BEGIN
 RT_C_DECLS_END
 
 #include <pulse/pulseaudio.h>
-#include "vl_vbox.h"
 
 #include "DrvAudio.h"
 #include "AudioMixBuffer.h"
 
+#include "VBoxDD.h"
+
 #ifdef LOG_GROUP
 # undef LOG_GROUP
 #endif
@@ -1155,7 +1156,7 @@ static DECLCALLBACK(int) drvHostPulseAudioConstruct(PPDMDRVINS pDrvIns, PCFGMNOD
 
     PDRVHOSTPULSEAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTPULSEAUDIO);
     LogRel(("Audio: Initializing PulseAudio driver\n"));
-    
+
     CFGMR3QueryStringAlloc(pCfg, "StreamName", &pThis->pszStreamName);
 
     pThis->pDrvIns                   = pDrvIns;
diff --git a/src/VBox/Devices/Audio/alsa_mangling.h b/src/VBox/Devices/Audio/alsa_mangling.h
index 647721f..fde5840 100644
--- a/src/VBox/Devices/Audio/alsa_mangling.h
+++ b/src/VBox/Devices/Audio/alsa_mangling.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Audio/alsa_stubs.c b/src/VBox/Devices/Audio/alsa_stubs.c
index b2928bf..d9bd316 100644
--- a/src/VBox/Devices/Audio/alsa_stubs.c
+++ b/src/VBox/Devices/Audio/alsa_stubs.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Audio/alsa_stubs.h b/src/VBox/Devices/Audio/alsa_stubs.h
index bfb650a..889add3 100644
--- a/src/VBox/Devices/Audio/alsa_stubs.h
+++ b/src/VBox/Devices/Audio/alsa_stubs.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Audio/pulse_mangling.h b/src/VBox/Devices/Audio/pulse_mangling.h
index 57ba2ed..8b02ef3 100644
--- a/src/VBox/Devices/Audio/pulse_mangling.h
+++ b/src/VBox/Devices/Audio/pulse_mangling.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Audio/pulse_stubs.c b/src/VBox/Devices/Audio/pulse_stubs.c
index 028f190..5786108 100644
--- a/src/VBox/Devices/Audio/pulse_stubs.c
+++ b/src/VBox/Devices/Audio/pulse_stubs.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Audio/pulse_stubs.h b/src/VBox/Devices/Audio/pulse_stubs.h
index 8262ed8..af393d3 100644
--- a/src/VBox/Devices/Audio/pulse_stubs.h
+++ b/src/VBox/Devices/Audio/pulse_stubs.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp b/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp
index 952fbf5..c0b04eb 100644
--- a/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp
+++ b/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/BiosCommonCode/Makefile.kmk b/src/VBox/Devices/BiosCommonCode/Makefile.kmk
index 514580b..0c45471 100644
--- a/src/VBox/Devices/BiosCommonCode/Makefile.kmk
+++ b/src/VBox/Devices/BiosCommonCode/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/BiosCommonCode/support.asm b/src/VBox/Devices/BiosCommonCode/support.asm
index dbd8928..879866f 100644
--- a/src/VBox/Devices/BiosCommonCode/support.asm
+++ b/src/VBox/Devices/BiosCommonCode/support.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2012 Oracle Corporation
+; Copyright (C) 2012-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Bus/DevPCI.cpp b/src/VBox/Devices/Bus/DevPCI.cpp
index d038295..50578b2 100644
--- a/src/VBox/Devices/Bus/DevPCI.cpp
+++ b/src/VBox/Devices/Bus/DevPCI.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -2253,7 +2253,7 @@ const PDMDEVREG g_DevicePCI =
     /* szName */
     "pci",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
@@ -2613,7 +2613,7 @@ const PDMDEVREG g_DevicePCIBridge =
     /* szName */
     "pcibridge",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Bus/DevPciIch9.cpp b/src/VBox/Devices/Bus/DevPciIch9.cpp
index 87ebbdd..34529d8 100644
--- a/src/VBox/Devices/Bus/DevPciIch9.cpp
+++ b/src/VBox/Devices/Bus/DevPciIch9.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -2944,7 +2944,7 @@ const PDMDEVREG g_DevicePciIch9 =
     /* szName */
     "ich9pci",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
@@ -3000,7 +3000,7 @@ const PDMDEVREG g_DevicePciIch9Bridge =
     /* szName */
     "ich9pcibridge",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Bus/MsiCommon.cpp b/src/VBox/Devices/Bus/MsiCommon.cpp
index 6c8ab09..9bac706 100644
--- a/src/VBox/Devices/Bus/MsiCommon.cpp
+++ b/src/VBox/Devices/Bus/MsiCommon.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Bus/MsiCommon.h b/src/VBox/Devices/Bus/MsiCommon.h
index 73ddda4..6a0efaa 100644
--- a/src/VBox/Devices/Bus/MsiCommon.h
+++ b/src/VBox/Devices/Bus/MsiCommon.h
@@ -3,7 +3,7 @@
  * Header for MSI/MSI-X support routines.
  */
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Bus/MsixCommon.cpp b/src/VBox/Devices/Bus/MsixCommon.cpp
index abe169b..ab6f620 100644
--- a/src/VBox/Devices/Bus/MsixCommon.cpp
+++ b/src/VBox/Devices/Bus/MsixCommon.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Bus/PCIInternal.h b/src/VBox/Devices/Bus/PCIInternal.h
index edb32c9..eba6a8a 100644
--- a/src/VBox/Devices/Bus/PCIInternal.h
+++ b/src/VBox/Devices/Bus/PCIInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Bus/SrvPciRawR0.cpp b/src/VBox/Devices/Bus/SrvPciRawR0.cpp
index 4835bd4..e1baf01 100644
--- a/src/VBox/Devices/Bus/SrvPciRawR0.cpp
+++ b/src/VBox/Devices/Bus/SrvPciRawR0.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Config.kmk b/src/VBox/Devices/Config.kmk
index 621320e..44c4891 100644
--- a/src/VBox/Devices/Config.kmk
+++ b/src/VBox/Devices/Config.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/DevEFI.cpp b/src/VBox/Devices/EFI/DevEFI.cpp
index 55e5179..52feabd 100644
--- a/src/VBox/Devices/EFI/DevEFI.cpp
+++ b/src/VBox/Devices/EFI/DevEFI.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/DevEFI.h b/src/VBox/Devices/EFI/DevEFI.h
index dafb614..4a5cd82 100644
--- a/src/VBox/Devices/EFI/DevEFI.h
+++ b/src/VBox/Devices/EFI/DevEFI.h
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/DevSmc.cpp b/src/VBox/Devices/EFI/DevSmc.cpp
index fb29ec4..74b2eaa 100644
--- a/src/VBox/Devices/EFI/DevSmc.cpp
+++ b/src/VBox/Devices/EFI/DevSmc.cpp
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1472,7 +1472,7 @@ const PDMDEVREG g_DeviceSmc =
     /* szName */
     "smc",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Makefile.kmk
index 93f4bb3..ff4f39f 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/BootSectImage/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/BootSectImage/Makefile.kmk
index be4830d..555dcb7 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/BootSectImage/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/BootSectImage/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Common/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Common/Makefile.kmk
index 9de1b80..8518118 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Common/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Common/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/EfiLdrImage/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/EfiLdrImage/Makefile.kmk
index 4525798..1aa62c9 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/EfiLdrImage/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/EfiLdrImage/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/EfiRom/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/EfiRom/Makefile.kmk
index 689f1c0..236691b 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/EfiRom/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/EfiRom/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenCrc32/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenCrc32/Makefile.kmk
index e7b7e3f..45e3083 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenCrc32/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenCrc32/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFfs/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFfs/Makefile.kmk
index 0f50299..be2e727 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFfs/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFfs/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFv/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFv/Makefile.kmk
index 2e07a55..ee5a0ee 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFv/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFv/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFw/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFw/Makefile.kmk
index 351de10..3b86dee 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFw/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenFw/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenPage/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenPage/Makefile.kmk
index 247b18b..053f13a 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenPage/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenPage/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenSec/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenSec/Makefile.kmk
index 7911475..f907564 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenSec/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenSec/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenVtf/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenVtf/Makefile.kmk
index eaed51f..c86bfaf 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenVtf/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GenVtf/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GnuGenBootSector/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GnuGenBootSector/Makefile.kmk
index c7651da..0ae8b5d 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GnuGenBootSector/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/GnuGenBootSector/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/LzmaCompress/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/LzmaCompress/Makefile.kmk
index 4f33114..83e8899 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/LzmaCompress/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/LzmaCompress/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Makefile.kmk
index 27960a4..42280e5 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Split/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Split/Makefile.kmk
index 753827e..1460285 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Split/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/Split/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/TianoCompress/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/TianoCompress/Makefile.kmk
index af9a15d..12919c3 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/TianoCompress/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/TianoCompress/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VfrCompile/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VfrCompile/Makefile.kmk
index e5fb35d..6124cf3 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VfrCompile/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VfrCompile/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/Makefile.kmk
index fbf7b12..22a5a88 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/C/VolInfo/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/Makefile.kmk
index 5659c0e..3742cfb 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Source/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/BaseTools/Source/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/Config.kmk b/src/VBox/Devices/EFI/Firmware/Config.kmk
index d5cfcbe..c62f09e 100644
--- a/src/VBox/Devices/EFI/Firmware/Config.kmk
+++ b/src/VBox/Devices/EFI/Firmware/Config.kmk
@@ -7,7 +7,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/Makefile.kmk b/src/VBox/Devices/EFI/Firmware/Makefile.kmk
index ac451db..c59ef7f 100644
--- a/src/VBox/Devices/EFI/Firmware/Makefile.kmk
+++ b/src/VBox/Devices/EFI/Firmware/Makefile.kmk
@@ -7,7 +7,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/AcpiPlatformDxe/AcpiPlatform.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/AcpiPlatformDxe/AcpiPlatform.c
index 266e844..e158117 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/AcpiPlatformDxe/AcpiPlatform.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/AcpiPlatformDxe/AcpiPlatform.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
index 648f9f8..7fdb589 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012-2013 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/IndustryStandard/VBoxFatImage.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/IndustryStandard/VBoxFatImage.h
index e3193f8..7b737bf 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/IndustryStandard/VBoxFatImage.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/IndustryStandard/VBoxFatImage.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxDebugLib.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxDebugLib.h
index 7af7425..4ff5334 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxDebugLib.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxDebugLib.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxMemLayout.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxMemLayout.h
index 5f6f11b..539e734 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxMemLayout.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxMemLayout.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxPkg.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxPkg.h
index f7984b7..a227235 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxPkg.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Include/VBoxPkg.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/AcpiTimerLib/AcpiTimerLib.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/AcpiTimerLib/AcpiTimerLib.c
index 6219d86..c905cdf 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/AcpiTimerLib/AcpiTimerLib.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/AcpiTimerLib/AcpiTimerLib.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/AcpiTimerLib/AcpiTimerLib.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/AcpiTimerLib/AcpiTimerLib.inf
index d85b73b..a66f7a9 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/AcpiTimerLib/AcpiTimerLib.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/AcpiTimerLib/AcpiTimerLib.inf
@@ -5,7 +5,7 @@
 
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.c
index d563154..9da890f 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.inf
index 1ab8828..626f39c 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugAgentLib/VBoxDebugAgentLib.inf
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c
index daf5a7d..00b20a3 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf
index bdecc87..7bb99d3 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf
@@ -5,7 +5,7 @@
 
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintChar.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintChar.c
index 52237ce..2aea3f1 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintChar.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintChar.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintGuid.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintGuid.c
index 9239602..4144fec 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintGuid.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintGuid.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHex.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHex.c
index df37f09..011520b 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHex.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHex.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHexDump.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHexDump.c
index 8e187b1..359f260 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHexDump.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintHexDump.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c
index e2e2042..adc5b0c 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.c
index 04cb603..334a71a 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.c
@@ -5,7 +5,7 @@
 
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf
index b14025d..01a738f 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2011 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.c
index 1eab1a5..30625f0 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.inf
index d8cf9eb..cdee7e9 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffExtraActionLib/VBoxPeCoffExtraActionLib.inf
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c
index 45fc935..c29ceaf 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoffLibInternals.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoffLibInternals.h
index 3b43726..485ef5b 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoffLibInternals.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoffLibInternals.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/PeCoffLoaderEx.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/PeCoffLoaderEx.c
index db10b78..24d0a3c 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/PeCoffLoaderEx.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/PeCoffLoaderEx.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
index 1a4174c..d014799 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxPeCoffLib/VBoxPeCoffLib.inf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Apple.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Apple.c
index 9518037..bb5d96c 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Apple.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Apple.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/ComponentName.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/ComponentName.c
index 58629b4..0a271c7 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/ComponentName.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/ComponentName.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/ElTorito.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/ElTorito.c
index 58d329c..ff62211 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/ElTorito.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/ElTorito.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Gpt.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Gpt.c
index 4542032..2d9fbad 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Gpt.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Gpt.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Mbr.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Mbr.c
index 6ffaf4c..5506789 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Mbr.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Mbr.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Partition.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Partition.c
index 8759353..670e1c0 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Partition.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Partition.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Partition.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Partition.h
index 26f9b18..a9b5f99 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Partition.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Partition.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/PartitionDxe.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/PartitionDxe.inf
index 3953d02..a74fb87 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/PartitionDxe.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/PartitionDxe.inf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Cmos.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Cmos.c
index 045037f..b23900f 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Cmos.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Cmos.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Cmos.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Cmos.h
index 0c15d65..48b905e 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Cmos.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Cmos.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Fv.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Fv.c
index 9ad4ce3..0bbb79b 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Fv.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Fv.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/MemDetect.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/MemDetect.c
index 6cbf0d0..ab3dda4 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/MemDetect.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/MemDetect.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Platform.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Platform.c
index 87848ce..46f053b 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Platform.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Platform.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Platform.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Platform.h
index 4320b56..1bf29ed 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Platform.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/Platform.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/PlatformPei.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/PlatformPei.inf
index a42ac0f..bc6389b 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/PlatformPei.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/PlatformPei/PlatformPei.inf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/Console.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/Console.c
index de60dc5..b1b9a14 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/Console.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/Console.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/ConsoleControl.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/ConsoleControl.h
index 17a74bb..d53a217 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/ConsoleControl.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/ConsoleControl.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/Cpu.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/Cpu.c
index ddd3ed4..1cbb2d0 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/Cpu.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/Cpu.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c
index 85adfc1..ac254b0 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
index 0999832..c26c55a 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsole.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsole.c
index e98500b..b8ce4ea 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsole.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsole.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsole.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsole.h
index f37283f..ad50ab4 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsole.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsole.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsoleDxe.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsoleDxe.inf
index 796ca35..cb46a3d 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsoleDxe.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxConsoleDxe/VBoxConsoleDxe.inf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2010 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFsDxe.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFsDxe.c
index 7803f59..87ac999 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFsDxe.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFsDxe.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFsDxe.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFsDxe.inf
index 8068fb7..c82d046 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFsDxe.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFsDxe.inf
@@ -8,7 +8,7 @@
 #
 
 #
-# Copyright (C) 2010 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFswParam.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFswParam.h
index 84f900b..ccca971 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFswParam.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFswParam.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxHfs.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxHfs.inf
index 8692a8a..53c4f6b 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxHfs.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxHfs.inf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf
index 4d191f6..0638afc 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf
@@ -3,7 +3,7 @@
 # VBox ISO9660 FS driver
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_base.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_base.h
index e11ec20..4678c98 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_base.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_base.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_core.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_core.h
index c11f9ee..beb092d 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_core.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_core.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.c
index 544ef94..8241bab 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.h
index 7b0bb74..b317a20 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi_base.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi_base.h
index f8a8f25..ae0f46b 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi_base.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi_base.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi_lib.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi_lib.c
index 2e89787..b8f4398 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi_lib.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi_lib.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.c
index 21129af..3d1b133 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.c
@@ -12,7 +12,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.h
index 842cd48..2e0b3e0 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_hfs.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_iso9660.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_iso9660.c
index 4ed70d2..97a98c9 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_iso9660.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_iso9660.c
@@ -14,7 +14,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_lib.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_lib.c
index 96f1b7e..e7c471b 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_lib.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_lib.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_strfunc.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_strfunc.h
index cf80e7a..dd92b27 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_strfunc.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_strfunc.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/BootService.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/BootService.c
index 42f4438..d111997 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/BootService.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/BootService.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/RunTime.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/RunTime.c
index 8b50105..48f6aae 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/RunTime.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/RunTime.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptor.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptor.c
index 31bbe43..c1dc902 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptor.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptor.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptor.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptor.h
index b2a0891..1d7e7d9 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptor.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptor.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptorDxe.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptorDxe.inf
index 58a2f37..b7ba95c 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptorDxe.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/VBoxInterceptorDxe.inf
@@ -4,7 +4,7 @@
 
 
 #
-# Copyright (C) 2009-2010 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/boot_service_table.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/boot_service_table.h
index b72576d..5407eb4 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/boot_service_table.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/boot_service_table.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/interceptor.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/interceptor.h
index 6693bfa..ae3e101 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/interceptor.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/interceptor.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/print_types.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/print_types.h
index ae84719..524c9ff 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/print_types.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/print_types.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/runtime_service_table.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/runtime_service_table.h
index a613115..b790d3b 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/runtime_service_table.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxInterceptorDxe/runtime_service_table.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicry.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicry.c
index 7cf0eed..6d2b4a2 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicry.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicry.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicry.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicry.h
index fabea86..b2b8df7 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicry.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicry.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicryDxe.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicryDxe.inf
index 8b98651..224f441 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicryDxe.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/VBoxMimicryDxe.inf
@@ -4,7 +4,7 @@
 
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/mimic_tbl.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/mimic_tbl.h
index f37e344..f1dae60 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/mimic_tbl.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMimicryDxe/mimic_tbl.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMisc/Makefile b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMisc/Makefile
index 140dff3..e9119bf 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMisc/Makefile
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMisc/Makefile
@@ -4,7 +4,7 @@
 #/
 #
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMisc/efi-app/Readme.txt b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMisc/efi-app/Readme.txt
index 04e6880..39c71e8 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMisc/efi-app/Readme.txt
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxMisc/efi-app/Readme.txt
@@ -4,7 +4,7 @@
 
 
 #
-# Copyright (C) 2009-2010 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxPkg.dec b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxPkg.dec
index 3ddf4ab..1596785 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxPkg.dec
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxPkg.dec
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2013 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/LegacyBiosMpTable.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/LegacyBiosMpTable.h
index 30b94ea..445bace 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/LegacyBiosMpTable.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/LegacyBiosMpTable.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/TableConversion.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/TableConversion.c
index 1fb7d6f..a342887 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/TableConversion.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/TableConversion.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/VBoxSysTables.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/VBoxSysTables.c
index 551dcfc..d8004b7 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/VBoxSysTables.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/VBoxSysTables.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/VBoxSysTables.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/VBoxSysTables.inf
index f853324..ae5c361 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/VBoxSysTables.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxSysTables/VBoxSysTables.inf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/EmuVariable.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/EmuVariable.c
index 8646a21..2e3429d 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/EmuVariable.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/EmuVariable.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/InitVariable.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/InitVariable.c
index 4b4d6d0..f1392ba 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/InitVariable.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/InitVariable.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/VBoxVariableRuntimeDxe.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/VBoxVariableRuntimeDxe.inf
index cf81076..9c9bb8e 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/VBoxVariableRuntimeDxe.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/VBoxVariableRuntimeDxe.inf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/Variable.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/Variable.h
index aff8a70..0e5a637 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/Variable.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/Variable.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/ComponentName.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/ComponentName.c
index f98137b..98a3470 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/ComponentName.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/ComponentName.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/DriverSupportedEfiVersion.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/DriverSupportedEfiVersion.c
index 299cbce..bc006c0 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/DriverSupportedEfiVersion.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/DriverSupportedEfiVersion.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/Edid.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/Edid.c
index c3bee3a..133d985 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/Edid.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/Edid.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVga.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVga.c
index 82bb167..af33d89 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVga.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVga.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVga.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVga.h
index aa51cbf..67e8556 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVga.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVga.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaDxe.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaDxe.inf
index cc53b76..130f865 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaDxe.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaDxe.inf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaGraphicsOutput.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaGraphicsOutput.c
index f4db97a..a36fa62 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaGraphicsOutput.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaGraphicsOutput.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.c
index 2ca1723..afdc90a 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.h b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.h
index 63c5f46..11b0078 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.h
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaI2c.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaUgaDraw.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaUgaDraw.c
index dd44fda..2cfb3f8 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaUgaDraw.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaDxe/VBoxVgaUgaDraw.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.c b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.c
index 8f6e9e1..7d79a6d 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.c
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.c
@@ -5,7 +5,7 @@
 
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.inf b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.inf
index f9e559e..5e01466 100644
--- a/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.inf
+++ b/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.inf
@@ -5,7 +5,7 @@
 
 
 #
-# Copyright (C) 2009-2010 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd
index 9c1178a..71f1898 100644
Binary files a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd and b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd differ
diff --git a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd
index be17d03..876e924 100644
Binary files a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd and b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd differ
diff --git a/src/VBox/Devices/EFI/VBoxSmcUtil-darwin.cpp b/src/VBox/Devices/EFI/VBoxSmcUtil-darwin.cpp
index 57db794..e27a243 100644
--- a/src/VBox/Devices/EFI/VBoxSmcUtil-darwin.cpp
+++ b/src/VBox/Devices/EFI/VBoxSmcUtil-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/GIMDev/GIMDev.cpp b/src/VBox/Devices/GIMDev/GIMDev.cpp
index e2725df..9fa612a 100644
--- a/src/VBox/Devices/GIMDev/GIMDev.cpp
+++ b/src/VBox/Devices/GIMDev/GIMDev.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -177,7 +177,7 @@ const PDMDEVREG g_DeviceGIMDev =
     /* szName */
     "GIMDev",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Graphics/BIOS/Makefile.kmk b/src/VBox/Devices/Graphics/BIOS/Makefile.kmk
index 9a5d677..58b8bb5 100644
--- a/src/VBox/Devices/Graphics/BIOS/Makefile.kmk
+++ b/src/VBox/Devices/Graphics/BIOS/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.asm b/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.asm
index 582755e..ec0d69d 100644
--- a/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.asm
+++ b/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.asm
@@ -6769,7 +6769,7 @@ vesa_pm_end:                                 ; 0xc4514 LB 0x1
 
 section _DATA progbits vstart=0x4600 align=1 ; size=0x3726 class=DATA group=DGROUP
 _msg_vga_init:                               ; 0xc4600 LB 0x32
-    db  'Oracle VM VirtualBox Version 5.0.0_RC1 VGA BIOS', 00dh, 00ah, 000h
+    db  'Oracle VM VirtualBox Version 5.0.0_RC2 VGA BIOS', 00dh, 00ah, 000h
 _vga_modes:                                  ; 0xc4632 LB 0x80
     db  000h, 000h, 000h, 004h, 000h, 0b8h, 0ffh, 002h, 001h, 000h, 000h, 004h, 000h, 0b8h, 0ffh, 002h
     db  002h, 000h, 000h, 004h, 000h, 0b8h, 0ffh, 002h, 003h, 000h, 000h, 004h, 000h, 0b8h, 0ffh, 002h
@@ -7664,7 +7664,7 @@ _vbebios_vendor_name:                        ; 0xc7c77 LB 0x13
 _vbebios_product_name:                       ; 0xc7c8a LB 0x21
     db  'Oracle VM VirtualBox VBE Adapter', 000h
 _vbebios_product_revision:                   ; 0xc7cab LB 0x27
-    db  'Oracle VM VirtualBox Version 5.0.0_RC1', 000h
+    db  'Oracle VM VirtualBox Version 5.0.0_RC2', 000h
 _vbebios_info_string:                        ; 0xc7cd2 LB 0x2b
     db  'VirtualBox VBE Display Adapter enabled', 00dh, 00ah, 00dh, 00ah, 000h
 _no_vbebios_info_string:                     ; 0xc7cfd LB 0x29
@@ -7720,4 +7720,4 @@ section CONST2 progbits vstart=0x7d26 align=1 ; size=0x0 class=DATA group=DGROUP
     db  000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
     db  000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
     db  000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h
-    db  000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 0b0h
+    db  000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 0aeh
diff --git a/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.md5sum b/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.md5sum
index 65f24c4..8cef6b9 100644
--- a/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.md5sum
+++ b/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.md5sum
@@ -1 +1 @@
-79aa7f26cbeefa911963f24f19c1d0f9 *VBoxVgaBios.rom
+e508f7f4f6f5b90ae4c1cac2ae6b4ccc *VBoxVgaBios.rom
diff --git a/src/VBox/Devices/Graphics/BIOS/inlines.h b/src/VBox/Devices/Graphics/BIOS/inlines.h
index 4b3fe3d..6a13760 100644
--- a/src/VBox/Devices/Graphics/BIOS/inlines.h
+++ b/src/VBox/Devices/Graphics/BIOS/inlines.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp
index 517b145..d6ef063 100644
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp
@@ -11,7 +11,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -2393,7 +2393,7 @@ static DECLCALLBACK(int) vmsvgaFIFOLoop(PPDMDEVINS pDevIns, PPDMTHREAD pThread)
          * Quit if pending external command or changes in the thread state.
          */
         bool fDone = false;
-        while (   !(fDone = pFIFO[SVGA_FIFO_NEXT_CMD] == offCurrentCmd)
+        while (   !(fDone = (pFIFO[SVGA_FIFO_NEXT_CMD] == offCurrentCmd))
                && pThread->enmState == PDMTHREADSTATE_RUNNING)
         {
             uint32_t cbPayload = 0;
@@ -3571,7 +3571,7 @@ DECLCALLBACK(int) vmsvgaR3IORegionMap(PPCIDEVICE pPciDev, int iRegion, RTGCPHYS
             if (RT_SUCCESS(rc))
             {
                 rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns), GCPhysAddress, GCPhysAddress + (VMSVGA_FIFO_SIZE - 1),
-                                                pThis->svga.hFifoAccessHandlerType, pThis, NIL_RTR0PTR, NIL_RTRCPTR, 
+                                                pThis->svga.hFifoAccessHandlerType, pThis, NIL_RTR0PTR, NIL_RTRCPTR,
                                                 "VMSVGA FIFO");
                 AssertRC(rc);
             }
@@ -3598,6 +3598,47 @@ DECLCALLBACK(int) vmsvgaR3IORegionMap(PPCIDEVICE pPciDev, int iRegion, RTGCPHYS
 
 
 /**
+ * @callback_method_impl{FNDBGFHANDLERDEV}
+ */
+static DECLCALLBACK(void) vmsvgaInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    PVGASTATE    pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
+    PVMSVGASTATE pSVGAState = (PVMSVGASTATE)pThis->svga.pSVGAState;
+
+    pHlp->pfnPrintf(pHlp, "Extension enabled:  %RTbool\n", pThis->svga.fEnabled);
+    pHlp->pfnPrintf(pHlp, "Configured:         %RTbool\n", pThis->svga.fConfigured);
+    pHlp->pfnPrintf(pHlp, "Base I/O port:      %#x\n", pThis->svga.BasePort);
+    pHlp->pfnPrintf(pHlp, "Host windows ID:    %#RX64\n", pThis->svga.u64HostWindowId);
+    pHlp->pfnPrintf(pHlp, "FIFO address:       %RGp\n", pThis->svga.GCPhysFIFO);
+    pHlp->pfnPrintf(pHlp, "FIFO size:          %u (%#x)\n", pThis->svga.cbFIFO, pThis->svga.cbFIFO);
+    pHlp->pfnPrintf(pHlp, "FIFO external cmd:  %#x\n", pThis->svga.u8FIFOExtCommand);
+    pHlp->pfnPrintf(pHlp, "Busy:               %#x\n", pThis->svga.fBusy);
+    pHlp->pfnPrintf(pHlp, "Traces:             %RTbool (effective: %RTbool)\n", pThis->svga.fTraces, pThis->svga.fVRAMTracking);
+    pHlp->pfnPrintf(pHlp, "Guest ID:           %#x (%d)\n", pThis->svga.u32GuestId, pThis->svga.u32GuestId);
+    pHlp->pfnPrintf(pHlp, "IRQ status:         %#x\n", pThis->svga.u32IrqStatus);
+    pHlp->pfnPrintf(pHlp, "IRQ mask:           %#x\n", pThis->svga.u32IrqMask);
+    pHlp->pfnPrintf(pHlp, "Pitch lock:         %#x\n", pThis->svga.u32PitchLock);
+    pHlp->pfnPrintf(pHlp, "Current GMR ID:     %#x\n", pThis->svga.u32CurrentGMRId);
+    pHlp->pfnPrintf(pHlp, "Capabilites reg:    %#x\n", pThis->svga.u32RegCaps);
+    pHlp->pfnPrintf(pHlp, "Index reg:          %#x\n", pThis->svga.u32IndexReg);
+    pHlp->pfnPrintf(pHlp, "Action flags:       %#x\n", pThis->svga.u32ActionFlags);
+    pHlp->pfnPrintf(pHlp, "Max display size:   %ux%u\n", pThis->svga.u32MaxWidth, pThis->svga.u32MaxHeight);
+    pHlp->pfnPrintf(pHlp, "Display size:       %ux%u %ubpp\n", pThis->svga.uWidth, pThis->svga.uHeight, pThis->svga.uBpp);
+    pHlp->pfnPrintf(pHlp, "Scanline:           %u (%#x)\n", pThis->svga.cbScanline, pThis->svga.cbScanline);
+    pHlp->pfnPrintf(pHlp, "Viewport position:  %ux%u\n", pThis->svga.viewport.x, pThis->svga.viewport.y);
+    pHlp->pfnPrintf(pHlp, "Viewport size:      %ux%u\n", pThis->svga.viewport.cx, pThis->svga.viewport.cy);
+
+    pHlp->pfnPrintf(pHlp, "Cursor active:      %RTbool\n", pSVGAState->Cursor.fActive);
+    pHlp->pfnPrintf(pHlp, "Cursor hotspot:     %ux%u\n", pSVGAState->Cursor.xHotspot, pSVGAState->Cursor.yHotspot);
+    pHlp->pfnPrintf(pHlp, "Cursor size:        %ux%u\n", pSVGAState->Cursor.width, pSVGAState->Cursor.height);
+    pHlp->pfnPrintf(pHlp, "Cursor byte size:   %u (%#x)\n", pSVGAState->Cursor.cbData, pSVGAState->Cursor.cbData);
+
+    pHlp->pfnPrintf(pHlp, "3D enabled:         %RTbool\n", pThis->svga.f3DEnabled);
+
+}
+
+
+/**
  * @copydoc FNSSMDEVLOADEXEC
  */
 int vmsvgaLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
@@ -4015,6 +4056,11 @@ int vmsvgaInit(PPDMDEVINS pDevIns)
     STAM_REL_REG(pVM, &pSVGAState->StatFifoTodoWoken,   STAMTYPE_COUNTER, "/Devices/VMSVGA/FifoTodoWoken",  STAMUNIT_OCCURENCES, "Number of times we discovered pending work after being woken up.");
     STAM_REL_REG(pVM, &pSVGAState->StatFifoStalls,      STAMTYPE_PROFILE, "/Devices/VMSVGA/FifoStalls",  STAMUNIT_TICKS_PER_CALL, "Profiling of FIFO stalls (waiting for guest to finish copying data).");
 
+    /*
+     * Info handlers.
+     */
+    PDMDevHlpDBGFInfoRegister(pDevIns, "vmsvga", "Basic VMSVGA device state details", vmsvgaInfo);
+
     return VINF_SUCCESS;
 }
 
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA.h b/src/VBox/Devices/Graphics/DevVGA-SVGA.h
index b720a25..365c7aa 100644
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA.h
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA.h
@@ -2,7 +2,7 @@
  * VMware SVGA device
  */
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.h b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.h
index a48f022..03fe1c3 100644
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.h
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m
index f7fe389..b02ce40 100644
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-cocoa.m
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -35,8 +35,8 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
 /** @def USE_NSOPENGLVIEW
- * Define this to experiment with using NSOpenGLView instead 
- * of NSView.  There are transparency issues with the former, 
+ * Define this to experiment with using NSOpenGLView instead
+ * of NSView.  There are transparency issues with the former,
  * so for the time being we're using the latter.  */
 #if 0
 #define USE_NSOPENGLVIEW
@@ -53,7 +53,7 @@
 {
 @public
     /* in */
-    NativeNSViewRef             pParentView; 
+    NativeNSViewRef             pParentView;
     uint32_t                    cx;
     uint32_t                    cy;
     NativeNSOpenGLContextRef    pSharedCtx;
@@ -69,7 +69,7 @@
 /**
  * The overlay view.
  */
- at interface VMSVGA3DOverlayView 
+ at interface VMSVGA3DOverlayView
 #ifdef USE_NSOPENGLVIEW
     : NSOpenGLView
 #else
@@ -89,7 +89,7 @@
     /* Position/Size tracking */
     NSPoint          m_Pos;
     NSSize           m_Size;
-    
+
     /** This is necessary for clipping on the root window */
     NSRect           m_RootRect;
 }
@@ -109,7 +109,7 @@
 - (void)prepareOpenGL;
 
 #endif
-/* Overridden: */    
+/* Overridden: */
 - (void)viewDidMoveToWindow;
 - (void)viewDidMoveToSuperview;
 - (void)resizeWithOldSuperviewSize:(NSSize)oldBoundsSize;
@@ -128,7 +128,7 @@
 
 + (void)createViewAndContext:(VMSVGA3DCreateViewAndContext *)pParams
 {
-    LogFlow(("OvlWin createViewAndContext:\n"));
+    LogFlow(("OvlView createViewAndContext:\n"));
 
     /*
      * Create a pixel format.
@@ -166,8 +166,8 @@
         if (pView)
         {
             /*
-             * If we have no shared GL context, we use the one that NSOpenGLView create. Otherwise, 
-             * we replace it.  (If we don't call openGLContext, it won't yet have been instantiated, 
+             * If we have no shared GL context, we use the one that NSOpenGLView create. Otherwise,
+             * we replace it.  (If we don't call openGLContext, it won't yet have been instantiated,
              * so there is no unecessary contexts created here when pSharedCtx != NULL.)
              */
             NSOpenGLContext *pCtx;
@@ -189,7 +189,7 @@
             }
             if (pCtx)
             {
-                /* 
+                /*
                  * Attach the view to the parent.
                  */
                 [pParams->pParentView addSubview:pView];
@@ -216,7 +216,7 @@
                 [pCtx retain]; //??
 
                 [pFmt release];
-                LogFlow(("OvlWin createViewAndContext: returns successfully\n"));
+                LogFlow(("OvlView createViewAndContext: returns successfully\n"));
                 return;
             }
             [pView release];
@@ -226,20 +226,20 @@
     else
         AssertFailed();
 
-    LogFlow(("OvlWin createViewAndContext: returns failure\n"));
+    LogFlow(("OvlView createViewAndContext: returns failure\n"));
     return;
 }
 
 - (id)initWithFrameAndFormat:(NSRect) frame parentView:(NSView*)pParentView pixelFormat:(NSOpenGLPixelFormat *)pFmt
 {
-    LogFlow(("OvlWin(%p) initWithFrameAndFormat:\n", (void *)self));
+    LogFlow(("OvlView(%p) initWithFrameAndFormat:\n", (void *)self));
 
     m_pParentView    = pParentView;
     /* Make some reasonable defaults */
     m_Pos            = NSZeroPoint;
     m_Size           = frame.size;
     m_RootRect       = NSMakeRect(0, 0, m_Size.width, m_Size.height);
-    
+
 #ifdef USE_NSOPENGLVIEW
     self = [super initWithFrame:frame pixelFormat:pFmt];
 #else
@@ -249,13 +249,13 @@
     {
         self.autoresizingMask = NSViewMinXMargin | NSViewMaxXMargin | NSViewMinYMargin | NSViewMaxYMargin;
     }
-    LogFlow(("OvlWin(%p) initWithFrameAndFormat: returns %p\n", (void *)self, (void *)self));
+    LogFlow(("OvlView(%p) initWithFrameAndFormat: returns %p\n", (void *)self, (void *)self));
     return self;
 }
 
 - (void)dealloc
 {
-    LogFlow(("OvlWin(%p) dealloc:\n", (void *)self));
+    LogFlow(("OvlView(%p) dealloc:\n", (void *)self));
 
 #ifdef USE_NSOPENGLVIEW
     [[self openGLContext] clearDrawable];
@@ -270,27 +270,27 @@
 
     [super dealloc];
 
-    LogFlow(("OvlWin(%p) dealloc: returns\n", (void *)self));
+    LogFlow(("OvlView(%p) dealloc: returns\n", (void *)self));
 }
 
 
 - (void)setPos:(NSPoint)pos
 {
-    Log(("OvlWin(%p) setPos: (%d,%d)\n", (void *)self, (int)pos.x, (int)pos.y));
+    Log(("OvlView(%p) setPos: (%d,%d)\n", (void *)self, (int)pos.x, (int)pos.y));
 
     m_Pos = pos;
     [self vboxReshape];
 
-    LogFlow(("OvlWin(%p) setPos: returns\n", (void *)self));
+    LogFlow(("OvlView(%p) setPos: returns\n", (void *)self));
 }
 
 
 - (void)setSize:(NSSize)size
 {
-    Log(("OvlWin(%p) setSize: (%d,%d):\n", (void *)self, (int)size.width, (int)size.height));
+    Log(("OvlView(%p) setSize: (%d,%d):\n", (void *)self, (int)size.width, (int)size.height));
     m_Size = size;
     [self vboxReshape];
-    LogFlow(("OvlWin(%p) setSize: returns\n", (void *)self));
+    LogFlow(("OvlView(%p) setSize: returns\n", (void *)self));
 }
 
 
@@ -298,10 +298,10 @@
 {
 #if 1 /* experiment */
     if ([NSThread isMainThread])
-        Log(("OvlWin(%p) vboxClearBuffers: skip, main thread\n", (void *)self));
+        Log(("OvlView(%p) vboxClearBuffers: skip, main thread\n", (void *)self));
     else
     {
-        Log(("OvlWin(%p) vboxClearBuffers: clears\n", (void *)self));
+        Log(("OvlView(%p) vboxClearBuffers: clears\n", (void *)self));
         NSOpenGLContext *pSavedCtx = [self makeCurrentGLContext];
 
         GLint iOldDrawBuf = GL_BACK;
@@ -320,10 +320,10 @@
 
 - (void)vboxReshape
 {
-    LogFlow(("OvlWin(%p) vboxReshape:\n", (void *)self));
+    LogFlow(("OvlView(%p) vboxReshape:\n", (void *)self));
 
     /*
-     * Not doing any complicate stuff here yet, hoping that we'll get correctly 
+     * Not doing any complicate stuff here yet, hoping that we'll get correctly
      * resized when the parent view changes...
      */
 
@@ -335,14 +335,14 @@
 
     [self vboxClearBuffers];
 
-    LogFlow(("OvlWin(%p) vboxReshape: returns\n", (void *)self));
+    LogFlow(("OvlView(%p) vboxReshape: returns\n", (void *)self));
 }
 
 
-/** 
- * Changes to the OpenGL context associated with the view. 
- * @returns Previous OpenGL context. 
- */ 
+/**
+ * Changes to the OpenGL context associated with the view.
+ * @returns Previous OpenGL context.
+ */
 - (NSOpenGLContext *)makeCurrentGLContext
 {
     NSOpenGLContext *pSavedCtx = [NSOpenGLContext currentContext];
@@ -358,9 +358,9 @@
 
 
 /**
- * Restores the previous OpenGL context after 
- * makeCurrentGLContext. 
- *  
+ * Restores the previous OpenGL context after
+ * makeCurrentGLContext.
+ *
  * @param pSavedCtx     The makeCurrentGLContext return value.
  */
 - (void)restoreSavedGLContext:(NSOpenGLContext *)pSavedCtx
@@ -414,7 +414,7 @@
 }
 #endif /* USE_NSOPENGLVIEW */
 
-/* 
+/*
  * Overridden NSOpenGLView / NSView methods:
  */
 
@@ -434,7 +434,7 @@
 
 -(void)resizeWithOldSuperviewSize:(NSSize)oldBoundsSize
 {
-    LogFlow(("OvlView(%p) resizeWithOldSuperviewSize: %d,%d -> %d,%d\n", (void *)self, 
+    LogFlow(("OvlView(%p) resizeWithOldSuperviewSize: %d,%d -> %d,%d\n", (void *)self,
              (int)oldBoundsSize.width, (int)oldBoundsSize.height, (int)[self bounds].size.width, (int)[self bounds].size.height));
     [super resizeWithOldSuperviewSize:oldBoundsSize];
     [self vboxReshape];
@@ -473,7 +473,7 @@ VMSVGA3DCOCOA_DECL(bool) vmsvga3dCocoaCreateViewAndContext(NativeNSViewRef *ppVi
                                                            NativeNSViewRef pParentView, uint32_t cx, uint32_t cy,
                                                            NativeNSOpenGLContextRef pSharedCtx, bool fOtherProfile)
 {
-    LogFlow(("vmsvga3dCocoaCreateViewAndContext: pParentView=%d size=%d,%d pSharedCtx=%p fOtherProfile=%RTbool\n", 
+    LogFlow(("vmsvga3dCocoaCreateViewAndContext: pParentView=%d size=%d,%d pSharedCtx=%p fOtherProfile=%RTbool\n",
              (void *)pParentView, cx, cy, (void *)pSharedCtx, fOtherProfile));
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
     vmsvga3dCocoaServiceRunLoop();
@@ -518,7 +518,7 @@ VMSVGA3DCOCOA_DECL(void) vmsvga3dCocoaDestroyViewAndContext(NativeNSViewRef pVie
     [pView release];
 
     /* The OpenGL context. */
-    Log(("vmsvga3dCocoaDestroyViewAndContext: ctx  %p ref count=%d\n", (void *)pCtx, [pView retainCount]));
+    Log(("vmsvga3dCocoaDestroyViewAndContext: ctx  %p ref count=%d\n", (void *)pCtx, [pCtx retainCount]));
     [pCtx release];
 
     [pPool release];
@@ -570,7 +570,7 @@ void vmsvga3dCocoaViewMakeCurrentContext(NativeNSViewRef pView, NativeNSOpenGLCo
         [pCtx makeCurrentContext];
     }
     else
-    	[NSOpenGLContext clearCurrentContext];
+        [NSOpenGLContext clearCurrentContext];
 
     [pPool release];
     LogFlow(("vmsvga3dCocoaSwapBuffers: returns\n"));
@@ -598,7 +598,7 @@ void vmsvga3dCocoaSwapBuffers(NativeNSViewRef pView, NativeNSOpenGLContextRef pC
     [pCtx flushBuffer];
     //[pView setNeedsDisplay:YES];
     vmsvga3dCocoaServiceRunLoop();
-    
+
     [pPool release];
     LogFlow(("vmsvga3dCocoaSwapBuffers: returns\n"));
 }
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
index 5e7c3a3..697a811 100644
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
@@ -2942,14 +2942,14 @@ int vmsvga3dSurfaceCopy(PVGASTATE pThis, SVGA3dSurfaceImageId dest, SVGA3dSurfac
         srcBox.z = pBox[i].srcz;
         srcBox.w = pBox[i].w;
         srcBox.h = pBox[i].h;
-        srcBox.d = pBox[i].z;
+        srcBox.d = pBox[i].z; /* XXX what about pBox[i].d? */
 
         destBox.x = pBox[i].x;
         destBox.y = pBox[i].y;
         destBox.z = pBox[i].z;
         destBox.w = pBox[i].w;
         destBox.h = pBox[i].h;
-        destBox.z = pBox[i].z;
+        destBox.z = pBox[i].z; /* XXX initializing destBox.z again? What about pBox[i].d and destBox.d? */
 
         rc = vmsvga3dSurfaceStretchBlt(pThis, dest, destBox, src, srcBox, SVGA3D_STRETCH_BLT_LINEAR);
         AssertRCReturn(rc, rc);
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp
index 902f4b2..c963e69 100644
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.h b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.h
index b42881e..1cf1ab0 100644
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.h
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.h
@@ -3,7 +3,7 @@
  * VMware SVGA device -- 3D part
  */
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp
index 9a67e1d..1253d8f 100644
--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -3319,6 +3319,7 @@ int vmsvga3dChangeMode(PVGASTATE pThis)
 
             Log(("vmsvga3dChangeMode: Resize window %x of context %d to (%d,%d)\n", pContext->hwnd, pContext->id, cs.cx, cs.cy));
 
+            AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
             hr = pContext->pDevice->GetViewport(&viewportOrg);
             AssertMsgReturn(hr == D3D_OK, ("vmsvga3dChangeMode: GetViewport failed with %x\n", hr), VERR_INTERNAL_ERROR);
 
diff --git a/src/VBox/Devices/Graphics/DevVGA.cpp b/src/VBox/Devices/Graphics/DevVGA.cpp
index 198ee4b..9c3b119 100644
--- a/src/VBox/Devices/Graphics/DevVGA.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -4183,10 +4183,9 @@ static DECLCALLBACK(void) vgaInfoState(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, c
     pHlp->pfnPrintf(pHlp, "display refresh interval: %u ms\n", pThis->cMilliesRefreshInterval);
 
 #ifdef VBOX_WITH_VMSVGA
-    if (pThis->svga.fEnabled) {
+    if (pThis->svga.fEnabled)
         pHlp->pfnPrintf(pHlp, pThis->svga.f3DEnabled ? "VMSVGA 3D enabled: %ux%ux%u\n" : "VMSVGA enabled: %ux%ux%u",
                         pThis->svga.uWidth, pThis->svga.uHeight, pThis->svga.uBpp);
-    }
 #endif
 }
 
@@ -6216,8 +6215,8 @@ static DECLCALLBACK(int)   vgaR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
      */
     rc = PGMR3HandlerPhysicalTypeRegister(pVM, PGMPHYSHANDLERKIND_WRITE,
                                           vgaLFBAccessHandler,
-                                          g_DeviceVga.szR0Mod, NULL, "vgaLbfAccessPfHandler",
-                                          g_DeviceVga.szRCMod, NULL, "vgaLbfAccessPfHandler",
+                                          g_DeviceVga.szR0Mod, "vgaLFBAccessHandler", "vgaLbfAccessPfHandler",
+                                          g_DeviceVga.szRCMod, "vgaLFBAccessHandler", "vgaLbfAccessPfHandler",
                                           "VGA LFB", &pThis->hLfbAccessHandlerType);
     AssertRCReturn(rc, rc);
 
@@ -6772,13 +6771,16 @@ static DECLCALLBACK(int)   vgaR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"ShowBootMenu\" as integer failed"));
 
-#if defined(DEBUG) && !defined(DEBUG_sunlover)
+#if defined(DEBUG) && !defined(DEBUG_sunlover) && !defined(DEBUG_michael)
     /* Disable the logo abd menu if all default settings. */
     if (   LogoHdr.fu8FadeIn
         && LogoHdr.fu8FadeOut
         && LogoHdr.u16LogoMillies == 0
         && LogoHdr.fu8ShowBootMenu == 2)
-        LogoHdr.fu8FadeIn = LogoHdr.fu8FadeOut = LogoHdr.fu8ShowBootMenu = 0;
+    {
+        LogoHdr.fu8FadeIn = LogoHdr.fu8FadeOut = 0;
+        LogoHdr.u16LogoMillies = 500;
+    }
 #endif
 
     /* Delay the logo a little bit */
@@ -6961,7 +6963,7 @@ const PDMDEVREG g_DeviceVga =
     /* szName */
     "vga",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Graphics/DevVGA.h b/src/VBox/Devices/Graphics/DevVGA.h
index a5b5811..623b6f9 100644
--- a/src/VBox/Devices/Graphics/DevVGA.h
+++ b/src/VBox/Devices/Graphics/DevVGA.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/DevVGAModes.h b/src/VBox/Devices/Graphics/DevVGAModes.h
index 5edcbb8..0ea162c 100644
--- a/src/VBox/Devices/Graphics/DevVGAModes.h
+++ b/src/VBox/Devices/Graphics/DevVGAModes.h
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/DevVGASavedState.h b/src/VBox/Devices/Graphics/DevVGASavedState.h
index 183d223..1d6b56e 100644
--- a/src/VBox/Devices/Graphics/DevVGASavedState.h
+++ b/src/VBox/Devices/Graphics/DevVGASavedState.h
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/DevVGATmpl.h b/src/VBox/Devices/Graphics/DevVGATmpl.h
index 16d7ff9..86d3a03 100644
--- a/src/VBox/Devices/Graphics/DevVGATmpl.h
+++ b/src/VBox/Devices/Graphics/DevVGATmpl.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp b/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp
index 53492f4..b955adf 100644
--- a/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp
@@ -109,7 +109,7 @@ static void vbvaDataCleanup(VBVADATA *pVBVAData)
     {
         RT_ZERO(pVBVAData->guest.pVBVA->hostFlags);
     }
-    
+
     RTMemFree(pVBVAData->partialRecord.pu8);
 
     RT_ZERO(*pVBVAData);
@@ -527,7 +527,7 @@ static int vbvaFlush(PVGASTATE pVGAState, VBVACONTEXT *pCtx)
     if (RT_FAILURE(rc))
     {
         /* Turn off VBVA processing. */
-        LogRel(("VBVA: disabling\n", rc));
+        LogRel(("VBVA: Disabling\n", rc));
         for (uScreenId = 0; uScreenId < pCtx->cViews; uScreenId++)
         {
             VBVADATA *pVBVAData = &pCtx->aViews[uScreenId].vbva;
@@ -839,12 +839,12 @@ static void dumpctx(const VBVACONTEXT *pCtx)
               pView->screen.u16Flags));
 
         Log(("                  VBVA o 0x%x p %p\n",
-              pView->u32VBVAOffset,
+              pView->vbva.u32VBVAOffset,
               pView->vbva.guest.pVBVA));
 
         Log(("                  PR cb 0x%x p %p\n",
-              pView->partialRecord.cb,
-              pView->partialRecord.pu8));
+              pView->vbva.partialRecord.cb,
+              pView->vbva.partialRecord.pu8));
     }
 
     dumpMouseShapeInfo(&pCtx->mouseShapeInfo);
diff --git a/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp b/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp
index 655a542..3a73629 100644
--- a/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp
+++ b/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/HGSMI/SHGSMIHost.cpp b/src/VBox/Devices/Graphics/HGSMI/SHGSMIHost.cpp
index a7cfe82..b17946f 100644
--- a/src/VBox/Devices/Graphics/HGSMI/SHGSMIHost.cpp
+++ b/src/VBox/Devices/Graphics/HGSMI/SHGSMIHost.cpp
@@ -1,6 +1,6 @@
 /* $Id: SHGSMIHost.cpp $ */
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/HGSMI/SHGSMIHost.h b/src/VBox/Devices/Graphics/HGSMI/SHGSMIHost.h
index 492d897..e414f94 100644
--- a/src/VBox/Devices/Graphics/HGSMI/SHGSMIHost.h
+++ b/src/VBox/Devices/Graphics/HGSMI/SHGSMIHost.h
@@ -1,6 +1,6 @@
 /* $Id: SHGSMIHost.h $ */
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/VBoxSVGA3D.def b/src/VBox/Devices/Graphics/VBoxSVGA3D.def
index 310c7dd..e709519 100644
--- a/src/VBox/Devices/Graphics/VBoxSVGA3D.def
+++ b/src/VBox/Devices/Graphics/VBoxSVGA3D.def
@@ -16,7 +16,7 @@
 ;
 
 LIBRARY VBoxSVGA3D
-EXPORTS 
+EXPORTS
     ShaderInitLib
     ShaderDestroyLib
     ShaderContextCreate
diff --git a/src/VBox/Devices/Graphics/VBoxSVGA3DObjC.def b/src/VBox/Devices/Graphics/VBoxSVGA3DObjC.def
index 9141c42..f2d6fee 100644
--- a/src/VBox/Devices/Graphics/VBoxSVGA3DObjC.def
+++ b/src/VBox/Devices/Graphics/VBoxSVGA3DObjC.def
@@ -16,12 +16,12 @@
 ;
 
 LIBRARY VBoxSVGA3DObjC
-EXPORTS 
+EXPORTS
     vmsvga3dCocoaServiceRunLoop
     vmsvga3dCocoaCreateViewAndContext
-    vmsvga3dCocoaDestroyViewAndContext             
-    vmsvga3dCocoaViewSetPosition            
-    vmsvga3dCocoaViewSetSize                
-    vmsvga3dCocoaViewMakeCurrentContext     
-    vmsvga3dCocoaSwapBuffers                
+    vmsvga3dCocoaDestroyViewAndContext
+    vmsvga3dCocoaViewSetPosition
+    vmsvga3dCocoaViewSetSize
+    vmsvga3dCocoaViewMakeCurrentContext
+    vmsvga3dCocoaSwapBuffers
 
diff --git a/src/VBox/Devices/Graphics/shaderlib/utils.c b/src/VBox/Devices/Graphics/shaderlib/utils.c
index 08ca4ae..20fa935 100644
--- a/src/VBox/Devices/Graphics/shaderlib/utils.c
+++ b/src/VBox/Devices/Graphics/shaderlib/utils.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/shaderlib/vboxext.h b/src/VBox/Devices/Graphics/shaderlib/vboxext.h
index ce27843..2a52b1b 100644
--- a/src/VBox/Devices/Graphics/shaderlib/vboxext.h
+++ b/src/VBox/Devices/Graphics/shaderlib/vboxext.h
@@ -3,7 +3,7 @@
  *
  * VBox extension to Wine D3D
  *
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxDbgGl.c b/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxDbgGl.c
index dd6e1a5..6bbec7c 100644
--- a/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxDbgGl.c
+++ b/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxDbgGl.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxDbgGl.h b/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxDbgGl.h
index db52616..27c949a 100644
--- a/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxDbgGl.h
+++ b/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxDbgGl.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxWineEx.h b/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxWineEx.h
index c2283b5..038dd1d 100644
--- a/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxWineEx.h
+++ b/src/VBox/Devices/Graphics/shaderlib/wine/vbox/VBoxWineEx.h
@@ -2,7 +2,7 @@
  *
  * VBox extension to Wine D3D
  *
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/shaderlib/winoverride.h b/src/VBox/Devices/Graphics/shaderlib/winoverride.h
index c555dbc..01d39aa 100644
--- a/src/VBox/Devices/Graphics/shaderlib/winoverride.h
+++ b/src/VBox/Devices/Graphics/shaderlib/winoverride.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Graphics/testcase/dump-vmwgfx.c b/src/VBox/Devices/Graphics/testcase/dump-vmwgfx.c
index cbd04a7..e432f3f 100644
--- a/src/VBox/Devices/Graphics/testcase/dump-vmwgfx.c
+++ b/src/VBox/Devices/Graphics/testcase/dump-vmwgfx.c
@@ -79,7 +79,7 @@ struct SVGA3dCapsRecord
 {
     /* Skipped if DRM_VMW_PARAM_MAX_MOB_MEMORY is read. */
     struct SVGA3dCapsRecordHeader header;
-    uint32_t data[1];    
+    uint32_t data[1];
 };
 
 struct drm_vmw_getparam_arg
@@ -340,7 +340,7 @@ static int QueryParam(int fd, uint32_t uParam, const char *pszParam)
         }
     }
     else
-        printf("%32s: failed: rc=%d errno=%d (%s)\n", pszParam, rc, errno, strerror(errno));    
+        printf("%32s: failed: rc=%d errno=%d (%s)\n", pszParam, rc, errno, strerror(errno));
     return rc;
 }
 
@@ -595,7 +595,7 @@ int main(int argc, char **argv)
     const char *pszDev = "/dev/dri/card0";
     if (argc == 2)
         pszDev = argv[1];
-    
+
     int fd = open(pszDev, O_RDWR);
     if (fd != -1)
     {
@@ -606,7 +606,7 @@ int main(int argc, char **argv)
          * Parameters.
          */
         rcExit = Dump3DParameters(fd, rcExit);
-    
+
         /*
          * 3D capabilities.
          */
@@ -624,6 +624,6 @@ int main(int argc, char **argv)
         fprintf(stderr, "error opening '%s': %d\n", pszDev, errno);
         rcExit = 1;
     }
-    
+
     return rcExit;
 }
diff --git a/src/VBox/Devices/Input/DevPS2.cpp b/src/VBox/Devices/Input/DevPS2.cpp
index 4e0d415..b135a17 100644
--- a/src/VBox/Devices/Input/DevPS2.cpp
+++ b/src/VBox/Devices/Input/DevPS2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1811,7 +1811,7 @@ const PDMDEVREG g_DevicePS2KeyboardMouse =
     /* szName */
     "pckbd",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Input/DrvKeyboardQueue.cpp b/src/VBox/Devices/Input/DrvKeyboardQueue.cpp
index 48027a1..09a415d 100644
--- a/src/VBox/Devices/Input/DrvKeyboardQueue.cpp
+++ b/src/VBox/Devices/Input/DrvKeyboardQueue.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Input/DrvMouseQueue.cpp b/src/VBox/Devices/Input/DrvMouseQueue.cpp
index 1528dd2..d091b2e 100644
--- a/src/VBox/Devices/Input/DrvMouseQueue.cpp
+++ b/src/VBox/Devices/Input/DrvMouseQueue.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Input/PS2Dev.h b/src/VBox/Devices/Input/PS2Dev.h
index 09a960c..ff6386a 100644
--- a/src/VBox/Devices/Input/PS2Dev.h
+++ b/src/VBox/Devices/Input/PS2Dev.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Input/PS2K.cpp b/src/VBox/Devices/Input/PS2K.cpp
index 08ea32d..80650ad 100644
--- a/src/VBox/Devices/Input/PS2K.cpp
+++ b/src/VBox/Devices/Input/PS2K.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Input/PS2M.cpp b/src/VBox/Devices/Input/PS2M.cpp
index c49a25b..4451cdf 100644
--- a/src/VBox/Devices/Input/PS2M.cpp
+++ b/src/VBox/Devices/Input/PS2M.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Input/UsbKbd.cpp b/src/VBox/Devices/Input/UsbKbd.cpp
index e280844..fbbafd9 100644
--- a/src/VBox/Devices/Input/UsbKbd.cpp
+++ b/src/VBox/Devices/Input/UsbKbd.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Input/UsbMouse.cpp b/src/VBox/Devices/Input/UsbMouse.cpp
index f8ff79a..30d1854 100644
--- a/src/VBox/Devices/Input/UsbMouse.cpp
+++ b/src/VBox/Devices/Input/UsbMouse.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Input/testcase/Makefile.kmk b/src/VBox/Devices/Input/testcase/Makefile.kmk
index 48e5939..7dbdae6 100644
--- a/src/VBox/Devices/Input/testcase/Makefile.kmk
+++ b/src/VBox/Devices/Input/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Input/testcase/tstUsbMouse.cpp b/src/VBox/Devices/Input/testcase/tstUsbMouse.cpp
index 2feb99e..543dcee 100644
--- a/src/VBox/Devices/Input/testcase/tstUsbMouse.cpp
+++ b/src/VBox/Devices/Input/testcase/tstUsbMouse.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk
index c809d3c..3386800 100644
--- a/src/VBox/Devices/Makefile.kmk
+++ b/src/VBox/Devices/Makefile.kmk
@@ -46,7 +46,7 @@ if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almost to the end of the file.
  DLLS      += VBoxDDU VBoxDD VBoxDD2
  SYSMODS   += VBoxDDR0 VBoxDD2R0
  ifdef VBOX_WITH_RAW_MODE
-  SYSMODS   += VBoxDDGC VBoxDD2GC
+  SYSMODS   += VBoxDDRC VBoxDD2RC
  endif
 
 
@@ -609,9 +609,6 @@ if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almost to the end of the file.
   VBOX_SLIRP_SOURCES +=  	Network/slirp/resolv_conf_parser.c
  endif
 
- ifdef VBOX_WITH_SLIRP_BSD_SBUF
-  VBOX_SLIRP_SOURCES += Network/slirp/bsd/kern/subr_sbuf.c
- endif
  VBOX_SLIRP_BSD_ARCH = $(subst x86,i386,$(KBUILD_TARGET_ARCH))
  VBOX_SLIRP_BSD_SOURCES += \
  	Network/slirp/bsd/kern/kern_mbuf.c \
@@ -638,7 +635,6 @@ if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almost to the end of the file.
  VBoxDD_SOURCES += $(VBOX_SLIRP_SOURCES)
  define def_vbox_slirp_cflags
    $(file)_DEFS += \
-       $(if $(VBOX_WITH_SLIRP_BSD_SBUF),VBOX_WITH_SLIRP_BSD_SBUF,) \
        $(if $(VBOX_WITH_SLIRP_MEMORY_CHECK),RTMEM_WRAP_TO_EF_APIS,) \
        $(if $(VBOX_WITH_DEBUG_NAT_SOCKETS),VBOX_WITH_DEBUG_NAT_SOCKETS,)	\
        $(if $(VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER),VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER,)	\
@@ -841,15 +837,15 @@ if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almost to the end of the file.
 
  ifdef VBOX_WITH_RAW_MODE
   #
-  # VBoxDDGC (sysmod)
+  # VBoxDDRC (sysmod)
   #
-  VBoxDDGC_TEMPLATE       = VBoxRc
+  VBoxDDRC_TEMPLATE       = VBoxRc
   ifeq ($(KBUILD_TARGET_ARCH),x86)
-   VBoxDDGC_DEFS.darwin   = VBOX_WITH_2X_4GB_ADDR_SPACE
+   VBoxDDRC_DEFS.darwin   = VBOX_WITH_2X_4GB_ADDR_SPACE
   endif
-  VBoxDDGC_DEFS           = $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,)
-  VBoxDDGC_INCS           = build
-  VBoxDDGC_SOURCES        = \
+  VBoxDDRC_DEFS           = $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,)
+  VBoxDDRC_INCS           = build
+  VBoxDDRC_SOURCES        = \
  	Audio/DevIchHda.cpp \
   	Bus/DevPCI.cpp \
  	Bus/DevPciIch9.cpp \
@@ -872,100 +868,100 @@ if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almost to the end of the file.
  	VMMDev/VMMDevTesting.cpp
 
   ifdef VBOX_WITH_E1000
-   VBoxDDGC_DEFS        += VBOX_WITH_E1000
-   VBoxDDGC_SOURCES     += \
+   VBoxDDRC_DEFS        += VBOX_WITH_E1000
+   VBoxDDRC_SOURCES     += \
   	Network/DevE1000.cpp \
   	Network/DevE1000Phy.cpp
   endif
 
   ifdef VBOX_WITH_VIRTIO
-   VBoxDDGC_DEFS        += VBOX_WITH_VIRTIO
-   VBoxDDGC_SOURCES     += \
+   VBoxDDRC_DEFS        += VBOX_WITH_VIRTIO
+   VBoxDDRC_SOURCES     += \
   	VirtIO/Virtio.cpp \
   	Network/DevVirtioNet.cpp
   endif
 
   ifdef VBOX_WITH_HGSMI
-   VBoxDDGC_DEFS        += VBOX_WITH_HGSMI
+   VBoxDDRC_DEFS        += VBOX_WITH_HGSMI
   endif
   ifdef VBOX_WITH_WDDM
-   VBoxDDGC_DEFS        += VBOX_WITH_WDDM
+   VBoxDDRC_DEFS        += VBOX_WITH_WDDM
   endif
   ifdef VBOX_WITH_VDMA
-   VBoxDDGC_DEFS        += VBOX_WITH_VDMA
+   VBoxDDRC_DEFS        += VBOX_WITH_VDMA
   endif
   ifdef VBOX_WITH_CRHGSMI
-   VBoxDDGC_DEFS        += VBOX_WITH_CRHGSMI
+   VBoxDDRC_DEFS        += VBOX_WITH_CRHGSMI
   endif
   ifdef VBOXWDDM_WITH_VBVA
-   VBoxDDGC_DEFS        += VBOXWDDM_WITH_VBVA
+   VBoxDDRC_DEFS        += VBOXWDDM_WITH_VBVA
   endif
   ifdef VBOX_WITH_VMSVGA
-   VBoxDDGC_DEFS         += VBOX_WITH_VMSVGA
-   VBoxDDGC_SOURCES      += \
+   VBoxDDRC_DEFS         += VBOX_WITH_VMSVGA
+   VBoxDDRC_SOURCES      += \
  	Graphics/DevVGA-SVGA.cpp
   endif
   ifdef VBOX_WITH_VMSVGA3D
-   VBoxDDGC_DEFS         += VBOX_WITH_VMSVGA3D
+   VBoxDDRC_DEFS         += VBOX_WITH_VMSVGA3D
   endif
   ifdef VBOX_VDMA_WITH_WATCHDOG
-   VBoxDDGC_DEFS        += VBOX_VDMA_WITH_WATCHDOG
+   VBoxDDRC_DEFS        += VBOX_VDMA_WITH_WATCHDOG
   endif
 
   ifdef VBOX_WITH_VUSB
-   VBoxDDGC_DEFS        += VBOX_WITH_VUSB
-   VBoxDDGC_SOURCES     += \
+   VBoxDDRC_DEFS        += VBOX_WITH_VUSB
+   VBoxDDRC_SOURCES     += \
  	USB/DevOHCI.cpp
   endif
 
   ifdef VBOX_WITH_USB
-   VBoxDDGC_DEFS        += VBOX_WITH_USB
+   VBoxDDRC_DEFS        += VBOX_WITH_USB
    if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-    VBoxDDGC_DEFS       += VBOX_WITH_EHCI_IMPL
-    VBoxDDGC_SOURCES    += \
+    VBoxDDRC_DEFS       += VBOX_WITH_EHCI_IMPL
+    VBoxDDRC_SOURCES    += \
   	USB/DevEHCI.cpp
    endif
    if defined(VBOX_WITH_XHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-    VBoxDDGC_DEFS       += VBOX_WITH_XHCI_IMPL
-    VBoxDDGC_SOURCES    += \
+    VBoxDDRC_DEFS       += VBOX_WITH_XHCI_IMPL
+    VBoxDDRC_SOURCES    += \
   	USB/DevXHCI.cpp
    endif
   endif
 
   ifdef VBOX_WITH_VIDEOHWACCEL
-   VBoxDDGC_DEFS        += VBOX_WITH_VIDEOHWACCEL
+   VBoxDDRC_DEFS        += VBOX_WITH_VIDEOHWACCEL
   endif
 
   ifdef VBOX_WITH_AHCI
-  VBoxDDGC_DEFS         += VBOX_WITH_AHCI IN_AHCI_GC
-  VBoxDDGC_SOURCES      += \
+  VBoxDDRC_DEFS         += VBOX_WITH_AHCI IN_AHCI_GC
+  VBoxDDRC_SOURCES      += \
   	Storage/DevAHCI.cpp
   endif
 
   ifdef VBOX_WITH_BUSLOGIC
-  VBoxDDGC_DEFS         += VBOX_WITH_BUSLOGIC
-  VBoxDDGC_SOURCES      += \
+  VBoxDDRC_DEFS         += VBOX_WITH_BUSLOGIC
+  VBoxDDRC_SOURCES      += \
   	Storage/DevBusLogic.cpp
   endif
 
   ifdef VBOX_WITH_LSILOGIC
-  VBoxDDGC_DEFS         += VBOX_WITH_LSILOGIC
-  VBoxDDGC_SOURCES      += \
+  VBoxDDRC_DEFS         += VBOX_WITH_LSILOGIC
+  VBoxDDRC_SOURCES      += \
   	Storage/DevLsiLogicSCSI.cpp
   endif
 
   ifdef VBOX_WITH_NEW_PS2M
-  VBoxDDGC_DEFS         += VBOX_WITH_NEW_PS2M
+  VBoxDDRC_DEFS         += VBOX_WITH_NEW_PS2M
   endif
 
   if1of ($(VBOX_LDR_FMT32), pe lx)
-  VBoxDDGC_LIBS           = \
+  VBoxDDRC_LIBS           = \
   	$(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
   	$(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
   endif
  endif # VBOX_WITH_RAW_MODE
 
- $(call VBOX_SET_VER_INFO_RC,VBoxDDGC,VirtualBox VMM Devices and Drivers$(COMMA) raw-mode) # last!
+ $(call VBOX_SET_VER_INFO_RC,VBoxDDRC,VirtualBox VMM Devices and Drivers$(COMMA) raw-mode) # last!
 
 
  #
@@ -1149,19 +1145,19 @@ if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almost to the end of the file.
 
  ifdef VBOX_WITH_RAW_MODE
   #
-  # VBoxDD2GC (LGPL sysmod)
+  # VBoxDD2RC (LGPL sysmod)
   #
-  VBoxDD2GC_TEMPLATE       = VBoxRc
-  VBoxDD2GC_INCS           = build
-  VBoxDD2GC_SOURCES        = \
+  VBoxDD2RC_TEMPLATE       = VBoxRc
+  VBoxDD2RC_INCS           = build
+  VBoxDD2RC_SOURCES        = \
   	PC/DevAPIC.cpp \
   	PC/DevIoApic.cpp
   if1of ($(VBOX_LDR_FMT32), pe lx)
-   VBoxDD2GC_LIBS          = \
+   VBoxDD2RC_LIBS          = \
    	$(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
    	$(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
   endif
-  $(call VBOX_SET_VER_INFO_RC,VBoxDD2GC,VirtualBox VMM Devices and Drivers 2$(COMMA) raw-mode)
+  $(call VBOX_SET_VER_INFO_RC,VBoxDD2RC,VirtualBox VMM Devices and Drivers 2$(COMMA) raw-mode)
  endif
 
 
diff --git a/src/VBox/Devices/Misc/VirtualKD.cpp b/src/VBox/Devices/Misc/VirtualKD.cpp
index e14092e..3b05e24 100644
--- a/src/VBox/Devices/Misc/VirtualKD.cpp
+++ b/src/VBox/Devices/Misc/VirtualKD.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DevE1000.cpp b/src/VBox/Devices/Network/DevE1000.cpp
index d9fb47b..9039769 100644
--- a/src/VBox/Devices/Network/DevE1000.cpp
+++ b/src/VBox/Devices/Network/DevE1000.cpp
@@ -14,7 +14,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -7831,7 +7831,7 @@ const PDMDEVREG g_DeviceE1000 =
     "e1000",
     /* Name of guest context module (no path).
      * Only evalutated if PDM_DEVREG_FLAGS_RC is set. */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* Name of ring-0 module (no path).
      * Only evalutated if PDM_DEVREG_FLAGS_RC is set. */
     "VBoxDDR0.r0",
diff --git a/src/VBox/Devices/Network/DevE1000Phy.cpp b/src/VBox/Devices/Network/DevE1000Phy.cpp
index f1f2237..8b09b14 100644
--- a/src/VBox/Devices/Network/DevE1000Phy.cpp
+++ b/src/VBox/Devices/Network/DevE1000Phy.cpp
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DevE1000Phy.h b/src/VBox/Devices/Network/DevE1000Phy.h
index 12aa31c..149031c 100644
--- a/src/VBox/Devices/Network/DevE1000Phy.h
+++ b/src/VBox/Devices/Network/DevE1000Phy.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DevEEPROM.cpp b/src/VBox/Devices/Network/DevEEPROM.cpp
index 8946d05..04202e2 100644
--- a/src/VBox/Devices/Network/DevEEPROM.cpp
+++ b/src/VBox/Devices/Network/DevEEPROM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DevEEPROM.h b/src/VBox/Devices/Network/DevEEPROM.h
index f2218a2..918e5bf 100644
--- a/src/VBox/Devices/Network/DevEEPROM.h
+++ b/src/VBox/Devices/Network/DevEEPROM.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DevINIP.cpp b/src/VBox/Devices/Network/DevINIP.cpp
index 1604015..9792ddc 100644
--- a/src/VBox/Devices/Network/DevINIP.cpp
+++ b/src/VBox/Devices/Network/DevINIP.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DevPCNet.cpp b/src/VBox/Devices/Network/DevPCNet.cpp
index 96503d3..b36bf6c 100644
--- a/src/VBox/Devices/Network/DevPCNet.cpp
+++ b/src/VBox/Devices/Network/DevPCNet.cpp
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -5187,7 +5187,7 @@ const PDMDEVREG g_DevicePCNet =
     "pcnet",
     /* szRCMod */
 #ifdef PCNET_GC_ENABLED
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     "VBoxDDR0.r0",
 #else
     "",
diff --git a/src/VBox/Devices/Network/DevVirtioNet.cpp b/src/VBox/Devices/Network/DevVirtioNet.cpp
index 729ae65..54653bf 100644
--- a/src/VBox/Devices/Network/DevVirtioNet.cpp
+++ b/src/VBox/Devices/Network/DevVirtioNet.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -2142,7 +2142,7 @@ const PDMDEVREG g_DeviceVirtioNet =
     "virtio-net",
     /* Name of guest context module (no path).
      * Only evalutated if PDM_DEVREG_FLAGS_RC is set. */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* Name of ring-0 module (no path).
      * Only evalutated if PDM_DEVREG_FLAGS_RC is set. */
     "VBoxDDR0.r0",
diff --git a/src/VBox/Devices/Network/DrvDedicatedNic.cpp b/src/VBox/Devices/Network/DrvDedicatedNic.cpp
index d720956..7f5064e 100644
--- a/src/VBox/Devices/Network/DrvDedicatedNic.cpp
+++ b/src/VBox/Devices/Network/DrvDedicatedNic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DrvIntNet.cpp b/src/VBox/Devices/Network/DrvIntNet.cpp
index d85afd3..32bf43f 100644
--- a/src/VBox/Devices/Network/DrvIntNet.cpp
+++ b/src/VBox/Devices/Network/DrvIntNet.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1860,7 +1860,7 @@ const PDMDRVREG g_DrvIntNet =
     /* szName */
     "IntNet",
     /* szRCMod */
-    "VBoxDDGC.rc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Network/DrvNAT.cpp b/src/VBox/Devices/Network/DrvNAT.cpp
index 46a9f81..6b3f33e 100644
--- a/src/VBox/Devices/Network/DrvNAT.cpp
+++ b/src/VBox/Devices/Network/DrvNAT.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DrvNetShaper.cpp b/src/VBox/Devices/Network/DrvNetShaper.cpp
index edff4c1..1db0881 100644
--- a/src/VBox/Devices/Network/DrvNetShaper.cpp
+++ b/src/VBox/Devices/Network/DrvNetShaper.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DrvNetSniffer.cpp b/src/VBox/Devices/Network/DrvNetSniffer.cpp
index 029463b..4f26982 100644
--- a/src/VBox/Devices/Network/DrvNetSniffer.cpp
+++ b/src/VBox/Devices/Network/DrvNetSniffer.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DrvTAP.cpp b/src/VBox/Devices/Network/DrvTAP.cpp
index ce83a40..ff753c0 100644
--- a/src/VBox/Devices/Network/DrvTAP.cpp
+++ b/src/VBox/Devices/Network/DrvTAP.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DrvUDPTunnel.cpp b/src/VBox/Devices/Network/DrvUDPTunnel.cpp
index ee6f8cf..896387f 100644
--- a/src/VBox/Devices/Network/DrvUDPTunnel.cpp
+++ b/src/VBox/Devices/Network/DrvUDPTunnel.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/DrvVDE.cpp b/src/VBox/Devices/Network/DrvVDE.cpp
index af0a36d..a3d3f9b 100644
--- a/src/VBox/Devices/Network/DrvVDE.cpp
+++ b/src/VBox/Devices/Network/DrvVDE.cpp
@@ -5,7 +5,7 @@
 
 /*
  * Contributed by Renzo Davoli. VirtualSquare. University of Bologna, 2010
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/Pcap.cpp b/src/VBox/Devices/Network/Pcap.cpp
index 80025e1..e283939 100644
--- a/src/VBox/Devices/Network/Pcap.cpp
+++ b/src/VBox/Devices/Network/Pcap.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/Pcap.h b/src/VBox/Devices/Network/Pcap.h
index 6b79759..6b4d8c1 100644
--- a/src/VBox/Devices/Network/Pcap.h
+++ b/src/VBox/Devices/Network/Pcap.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/SrvIntNetR0.cpp b/src/VBox/Devices/Network/SrvIntNetR0.cpp
index e8968d3..678b776 100644
--- a/src/VBox/Devices/Network/SrvIntNetR0.cpp
+++ b/src/VBox/Devices/Network/SrvIntNetR0.cpp
@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1259,7 +1259,7 @@ DECLINLINE(PINTNETIF) intnetR0NetworkAddrCacheLookupIf(PINTNETNETWORK pNetwork,
 /**
  * Look up specified address in the network's blacklist.
  *
- * @param pNetwork      The network. 
+ * @param pNetwork      The network.
  * @param enmType       The address type.
  * @param pAddr         The address.
  */
@@ -1288,7 +1288,7 @@ static bool intnetR0NetworkBlacklistLookup(PINTNETNETWORK pNetwork,
 /**
  * Deletes specified address from network's blacklist.
  *
- * @param pNetwork      The network. 
+ * @param pNetwork      The network.
  * @param enmType       The address type.
  * @param pAddr         The address.
  */
@@ -1321,7 +1321,7 @@ static void intnetR0NetworkBlacklistDelete(PINTNETNETWORK pNetwork,
 /**
  * Adds specified address from network's blacklist.
  *
- * @param pNetwork      The network. 
+ * @param pNetwork      The network.
  * @param enmType       The address type.
  * @param pAddr         The address.
  */
@@ -1347,7 +1347,7 @@ static void intnetR0NetworkBlacklistAdd(PINTNETNETWORK pNetwork,
     if (pCache->cEntries >= pCache->cEntriesAlloc)
     {
         /* shift */
-        memmove(pCache->pbEntries, pCache->pbEntries + pCache->cbEntry, 
+        memmove(pCache->pbEntries, pCache->pbEntries + pCache->cbEntry,
                 pCache->cbEntry * (pCache->cEntries - 1));
         --pCache->cEntries;
     }
@@ -1404,7 +1404,7 @@ static void intnetR0IfAddrCacheAddIt(PINTNETIF pIf, INTNETADDRTYPE enmAddrType,
                 Log(("%s: spoofing attempt for %RTnaipv6\n",
                      __FUNCTION__, &pAddr->IPv6));
                 break;
-            default: 
+            default:
                 Log(("%s: spoofing attempt for %.*Rhxs (type %d)\n",
                      __FUNCTION__, cbAddr, pAddr, enmAddrType));
                 break;
diff --git a/src/VBox/Devices/Network/VDEPlug.cpp b/src/VBox/Devices/Network/VDEPlug.cpp
index 2c83d08..a7c6554 100644
--- a/src/VBox/Devices/Network/VDEPlug.cpp
+++ b/src/VBox/Devices/Network/VDEPlug.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/lwip-new/Makefile.kmk b/src/VBox/Devices/Network/lwip-new/Makefile.kmk
index 0a8bee5..34fdfe3 100644
--- a/src/VBox/Devices/Network/lwip-new/Makefile.kmk
+++ b/src/VBox/Devices/Network/lwip-new/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/lwip-new/src/core/ipv4/icmp.c b/src/VBox/Devices/Network/lwip-new/src/core/ipv4/icmp.c
index 85e67eb..d87eb25 100644
--- a/src/VBox/Devices/Network/lwip-new/src/core/ipv4/icmp.c
+++ b/src/VBox/Devices/Network/lwip-new/src/core/ipv4/icmp.c
@@ -205,7 +205,7 @@ icmp_input(struct pbuf *p, struct netif *inp)
     ICMPH_TYPE_SET(iecho, ICMP_ER);
 #if CHECKSUM_GEN_ICMP
     /* adjust the checksum */
-    if (iecho->chksum >= PP_HTONS(0xffffU - (ICMP_ECHO << 8))) {
+    if (iecho->chksum > PP_HTONS(0xffffU - (ICMP_ECHO << 8))) {
       iecho->chksum += PP_HTONS(ICMP_ECHO << 8) + 1;
     } else {
       iecho->chksum += PP_HTONS(ICMP_ECHO << 8);
diff --git a/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp b/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp
index d75c6b6..b8c3225 100644
--- a/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp
+++ b/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.h b/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.h
index da9e687..a5f583e 100644
--- a/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.h
+++ b/src/VBox/Devices/Network/lwip-new/vbox/VBoxLwipCore.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c b/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c
index 42e3fef..fbf48f6 100644
--- a/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c
+++ b/src/VBox/Devices/Network/lwip-new/vbox/sys_arch.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh b/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh
index 32bbad1..a9e35c3 100755
--- a/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh
+++ b/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009-2010 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/scripts/VBoxPortForwarding.py b/src/VBox/Devices/Network/scripts/VBoxPortForwarding.py
index be4edf2..5134391 100755
--- a/src/VBox/Devices/Network/scripts/VBoxPortForwarding.py
+++ b/src/VBox/Devices/Network/scripts/VBoxPortForwarding.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 """
-Copyright (C) 2009-2012 Oracle Corporation
+Copyright (C) 2009-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/bootp.c b/src/VBox/Devices/Network/slirp/bootp.c
index 7f567e5..afcde78 100644
--- a/src/VBox/Devices/Network/slirp/bootp.c
+++ b/src/VBox/Devices/Network/slirp/bootp.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/bootp.h b/src/VBox/Devices/Network/slirp/bootp.h
index 1ffa3a5..f4121e0 100644
--- a/src/VBox/Devices/Network/slirp/bootp.h
+++ b/src/VBox/Devices/Network/slirp/bootp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/cksum.c b/src/VBox/Devices/Network/slirp/cksum.c
index 8e2cbd7..0b40569 100644
--- a/src/VBox/Devices/Network/slirp/cksum.c
+++ b/src/VBox/Devices/Network/slirp/cksum.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/counters.h b/src/VBox/Devices/Network/slirp/counters.h
index 14f353b..131d2b6 100644
--- a/src/VBox/Devices/Network/slirp/counters.h
+++ b/src/VBox/Devices/Network/slirp/counters.h
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/ctl.h b/src/VBox/Devices/Network/slirp/ctl.h
index f3fb231..0fc6c1a 100644
--- a/src/VBox/Devices/Network/slirp/ctl.h
+++ b/src/VBox/Devices/Network/slirp/ctl.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/debug.c b/src/VBox/Devices/Network/slirp/debug.c
index 0a78ba0..51d96a8 100644
--- a/src/VBox/Devices/Network/slirp/debug.c
+++ b/src/VBox/Devices/Network/slirp/debug.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/debug.h b/src/VBox/Devices/Network/slirp/debug.h
index 8cedf5e..0c137fc 100644
--- a/src/VBox/Devices/Network/slirp/debug.h
+++ b/src/VBox/Devices/Network/slirp/debug.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.c b/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.c
index e3dc28e..9ed5937 100644
--- a/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.c
+++ b/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.c
@@ -1,7 +1,7 @@
 /* $Id: dnsproxy.c $ */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/ext.h b/src/VBox/Devices/Network/slirp/ext.h
index 3248f55..dd0f692 100644
--- a/src/VBox/Devices/Network/slirp/ext.h
+++ b/src/VBox/Devices/Network/slirp/ext.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/icmp_var.h b/src/VBox/Devices/Network/slirp/icmp_var.h
index 829182b..540104c 100644
--- a/src/VBox/Devices/Network/slirp/icmp_var.h
+++ b/src/VBox/Devices/Network/slirp/icmp_var.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/if.h b/src/VBox/Devices/Network/slirp/if.h
index 08cb4ea..181fc94 100644
--- a/src/VBox/Devices/Network/slirp/if.h
+++ b/src/VBox/Devices/Network/slirp/if.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/ip.h b/src/VBox/Devices/Network/slirp/ip.h
index 1d18802..38dbebc 100644
--- a/src/VBox/Devices/Network/slirp/ip.h
+++ b/src/VBox/Devices/Network/slirp/ip.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/ip_icmp.c b/src/VBox/Devices/Network/slirp/ip_icmp.c
index b9bafd5..0669ee7 100644
--- a/src/VBox/Devices/Network/slirp/ip_icmp.c
+++ b/src/VBox/Devices/Network/slirp/ip_icmp.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/ip_icmp.h b/src/VBox/Devices/Network/slirp/ip_icmp.h
index 6922b77..c6c7e07 100644
--- a/src/VBox/Devices/Network/slirp/ip_icmp.h
+++ b/src/VBox/Devices/Network/slirp/ip_icmp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/ip_icmpwin.c b/src/VBox/Devices/Network/slirp/ip_icmpwin.c
index 5657735..8e6e520 100644
--- a/src/VBox/Devices/Network/slirp/ip_icmpwin.c
+++ b/src/VBox/Devices/Network/slirp/ip_icmpwin.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/ip_input.c b/src/VBox/Devices/Network/slirp/ip_input.c
index 00579d4..3a99801 100644
--- a/src/VBox/Devices/Network/slirp/ip_input.c
+++ b/src/VBox/Devices/Network/slirp/ip_input.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/ip_output.c b/src/VBox/Devices/Network/slirp/ip_output.c
index 65ae5bf..1576319 100644
--- a/src/VBox/Devices/Network/slirp/ip_output.c
+++ b/src/VBox/Devices/Network/slirp/ip_output.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/libalias/alias.c b/src/VBox/Devices/Network/slirp/libalias/alias.c
index 243a284..0b2100a 100644
--- a/src/VBox/Devices/Network/slirp/libalias/alias.c
+++ b/src/VBox/Devices/Network/slirp/libalias/alias.c
@@ -149,11 +149,12 @@ __FBSDID("$FreeBSD: src/sys/netinet/libalias/alias.c,v 1.58.2.1.4.1 2009/04/15 0
 # include "alias_local.h"
 # include "alias_mod.h"
 
-#define return(x)                                                           \
-do {                                                                        \
-    Log2(("NAT:ALIAS: %s:%d return(%s:%d)\n", __FUNCTION__, __LINE__, #x,(x)));    \
-    return x;                                                               \
-}while(0)
+#define return(x)                                             \
+do {                                                          \
+    Log2(("NAT:ALIAS: %s:%d return(%s:%d)\n",                 \
+          RT_GCC_EXTENSION __FUNCTION__, __LINE__, #x,(x)));  \
+    return x;                                                 \
+} while(0)
 #endif /* VBOX */
 static __inline int
 twowords(void *p)
diff --git a/src/VBox/Devices/Network/slirp/libalias/alias_dns.c b/src/VBox/Devices/Network/slirp/libalias/alias_dns.c
index eb213f9..46c95aa 100644
--- a/src/VBox/Devices/Network/slirp/libalias/alias_dns.c
+++ b/src/VBox/Devices/Network/slirp/libalias/alias_dns.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -84,7 +84,7 @@ fingerprint(struct libalias *la, struct ip *pIp, struct alias_data *ah)
         return -1;
 
     Log(("NAT:%s: ah(dport: %hd, sport: %hd) oaddr:%RTnaipv4 aaddr:%RTnaipv4\n",
-        __FUNCTION__, ntohs(*ah->dport), ntohs(*ah->sport),
+        RT_GCC_EXTENSION __FUNCTION__, ntohs(*ah->dport), ntohs(*ah->sport),
         ah->oaddr, ah->aaddr));
 
     if (   (ntohs(*ah->dport) == DNS_CONTROL_PORT_NUMBER
diff --git a/src/VBox/Devices/Network/slirp/libslirp.h b/src/VBox/Devices/Network/slirp/libslirp.h
index 03cb5ae..50be8ed 100644
--- a/src/VBox/Devices/Network/slirp/libslirp.h
+++ b/src/VBox/Devices/Network/slirp/libslirp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/main.h b/src/VBox/Devices/Network/slirp/main.h
index 52f2924..5960844 100644
--- a/src/VBox/Devices/Network/slirp/main.h
+++ b/src/VBox/Devices/Network/slirp/main.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/misc.c b/src/VBox/Devices/Network/slirp/misc.c
index 5071427..3126050 100644
--- a/src/VBox/Devices/Network/slirp/misc.c
+++ b/src/VBox/Devices/Network/slirp/misc.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/misc.h b/src/VBox/Devices/Network/slirp/misc.h
index 940df28..1d3a2e0 100644
--- a/src/VBox/Devices/Network/slirp/misc.h
+++ b/src/VBox/Devices/Network/slirp/misc.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/queue.h b/src/VBox/Devices/Network/slirp/queue.h
index 5d7f0cc..8f56d96 100644
--- a/src/VBox/Devices/Network/slirp/queue.h
+++ b/src/VBox/Devices/Network/slirp/queue.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/resolv_conf_parser.c b/src/VBox/Devices/Network/slirp/resolv_conf_parser.c
index 91c71e0..f7f23a5 100644
--- a/src/VBox/Devices/Network/slirp/resolv_conf_parser.c
+++ b/src/VBox/Devices/Network/slirp/resolv_conf_parser.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/resolv_conf_parser.h b/src/VBox/Devices/Network/slirp/resolv_conf_parser.h
index cfb1086..6cb1d59 100644
--- a/src/VBox/Devices/Network/slirp/resolv_conf_parser.h
+++ b/src/VBox/Devices/Network/slirp/resolv_conf_parser.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/sbuf.c b/src/VBox/Devices/Network/slirp/sbuf.c
index 7801836..4e6dee3 100644
--- a/src/VBox/Devices/Network/slirp/sbuf.c
+++ b/src/VBox/Devices/Network/slirp/sbuf.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/sbuf.h b/src/VBox/Devices/Network/slirp/sbuf.h
index ed1dc7a..ab61d7a 100644
--- a/src/VBox/Devices/Network/slirp/sbuf.h
+++ b/src/VBox/Devices/Network/slirp/sbuf.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/slirp.c b/src/VBox/Devices/Network/slirp/slirp.c
index dcd8782..9f6f763 100644
--- a/src/VBox/Devices/Network/slirp/slirp.c
+++ b/src/VBox/Devices/Network/slirp/slirp.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/slirp.h b/src/VBox/Devices/Network/slirp/slirp.h
index c2ddcfa..7c7db80 100644
--- a/src/VBox/Devices/Network/slirp/slirp.h
+++ b/src/VBox/Devices/Network/slirp/slirp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/slirp_config.h b/src/VBox/Devices/Network/slirp/slirp_config.h
index 481bc87..aa958d1 100644
--- a/src/VBox/Devices/Network/slirp/slirp_config.h
+++ b/src/VBox/Devices/Network/slirp/slirp_config.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/slirp_dns.c b/src/VBox/Devices/Network/slirp/slirp_dns.c
index 626a1d4..d52ebcb 100644
--- a/src/VBox/Devices/Network/slirp/slirp_dns.c
+++ b/src/VBox/Devices/Network/slirp/slirp_dns.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/slirp_dns.h b/src/VBox/Devices/Network/slirp/slirp_dns.h
index f66bef7..2471d2b 100644
--- a/src/VBox/Devices/Network/slirp/slirp_dns.h
+++ b/src/VBox/Devices/Network/slirp/slirp_dns.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/slirp_state.h b/src/VBox/Devices/Network/slirp/slirp_state.h
index 20abf65..5844325 100644
--- a/src/VBox/Devices/Network/slirp/slirp_state.h
+++ b/src/VBox/Devices/Network/slirp/slirp_state.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -433,7 +433,7 @@ typedef struct NATState
          (so) = (sonext))                                                \
     {                                                                    \
         (sonext) = (so)->so_next;                                        \
-         Log5(("%s:%d Processing so:%R[natsock]\n", __FUNCTION__, __LINE__, (so)));
+         Log5(("%s:%d Processing so:%R[natsock]\n", RT_GCC_EXTENSION __FUNCTION__, __LINE__, (so)));
 # define CONTINUE(label) continue
 # define CONTINUE_NO_UNLOCK(label) continue
 # define LOOP_LABEL(label, so, sonext) /* empty*/
diff --git a/src/VBox/Devices/Network/slirp/socket.c b/src/VBox/Devices/Network/slirp/socket.c
index a383442..8ef1c51 100644
--- a/src/VBox/Devices/Network/slirp/socket.c
+++ b/src/VBox/Devices/Network/slirp/socket.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -253,7 +253,7 @@ soread(PNATState pData, struct socket *so)
     QSOCKET_UNLOCK(tcb);
 
     LogFlow(("soread: so = %R[natsock]\n", so));
-    Log2(("%s: so = %R[natsock] so->so_snd = %R[sbuf]\n", __PRETTY_FUNCTION__, so, sb));
+    Log2(("%s: so = %R[natsock] so->so_snd = %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, so, sb));
 
     /*
      * No need to check if there's enough room to read.
@@ -320,8 +320,8 @@ soread(PNATState pData, struct socket *so)
 #else
     nn = recv(so->s, iov[0].iov_base, iov[0].iov_len, (so->so_tcpcb->t_force? MSG_OOB:0));
 #endif
-    Log2(("%s: read(1) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
-    Log2(("%s: so = %R[natsock] so->so_snd = %R[sbuf]\n", __PRETTY_FUNCTION__, so, sb));
+    Log2(("%s: read(1) nn = %d bytes\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn));
+    Log2(("%s: so = %R[natsock] so->so_snd = %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, so, sb));
     if (nn <= 0)
     {
         /*
@@ -335,7 +335,7 @@ soread(PNATState pData, struct socket *so)
         unsigned long pending = 0;
         status = ioctlsocket(so->s, FIONREAD, &pending);
         if (status < 0)
-            Log(("NAT:%s: error in WSAIoctl: %d\n", __PRETTY_FUNCTION__, errno));
+            Log(("NAT:%s: error in WSAIoctl: %d\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, errno));
         if (nn == 0 && (pending != 0))
         {
             SOCKET_UNLOCK(so);
@@ -357,7 +357,7 @@ soread(PNATState pData, struct socket *so)
                                                  || sototcpcb(so)->t_template.ti_dst.s_addr == INADDR_ANY)));
             /* nn == 0 means peer has performed an orderly shutdown */
             Log2(("%s: disconnected, nn = %d, errno = %d (%s)\n",
-                  __PRETTY_FUNCTION__, nn, errno, strerror(errno)));
+                  RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn, errno, strerror(errno)));
             sofcantrcvmore(so);
             if (!fUninitiolizedTemplate)
                 tcp_sockclosed(pData, sototcpcb(so));
@@ -406,17 +406,17 @@ soread(PNATState pData, struct socket *so)
         );
     }
 
-    Log2(("%s: read(2) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
+    Log2(("%s: read(2) nn = %d bytes\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn));
 #endif
 
     /* Update fields */
     sb->sb_cc += nn;
     sb->sb_wptr += nn;
-    Log2(("%s: update so_snd (readed nn = %d) %R[sbuf]\n", __PRETTY_FUNCTION__, nn, sb));
+    Log2(("%s: update so_snd (readed nn = %d) %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn, sb));
     if (sb->sb_wptr >= (sb->sb_data + sb->sb_datalen))
     {
         sb->sb_wptr -= sb->sb_datalen;
-        Log2(("%s: alter sb_wptr  so_snd = %R[sbuf]\n", __PRETTY_FUNCTION__, sb));
+        Log2(("%s: alter sb_wptr  so_snd = %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, sb));
     }
     STAM_PROFILE_STOP(&pData->StatIOread, a);
     SOCKET_UNLOCK(so);
@@ -542,7 +542,7 @@ sowrite(PNATState pData, struct socket *so)
     STAM_COUNTER_RESET(&pData->StatIOWrite_rest);
     STAM_COUNTER_RESET(&pData->StatIOWrite_rest_bytes);
     LogFlowFunc(("so = %R[natsock]\n", so));
-    Log2(("%s: so = %R[natsock] so->so_rcv = %R[sbuf]\n", __PRETTY_FUNCTION__, so, sb));
+    Log2(("%s: so = %R[natsock] so->so_rcv = %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, so, sb));
     QSOCKET_LOCK(tcb);
     SOCKET_LOCK(so);
     QSOCKET_UNLOCK(tcb);
@@ -611,7 +611,7 @@ sowrite(PNATState pData, struct socket *so)
 #else
     nn = send(so->s, iov[0].iov_base, iov[0].iov_len, 0);
 #endif
-    Log2(("%s: wrote(1) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
+    Log2(("%s: wrote(1) nn = %d bytes\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn));
     /* This should never happen, but people tell me it does *shrug* */
     if (   nn < 0
         && soIgnorableErrorCode(errno))
@@ -624,7 +624,7 @@ sowrite(PNATState pData, struct socket *so)
     if (nn < 0 || (nn == 0 && iov[0].iov_len > 0))
     {
         Log2(("%s: disconnected, so->so_state = %x, errno = %d\n",
-              __PRETTY_FUNCTION__, so->so_state, errno));
+              RT_GCC_EXTENSION __PRETTY_FUNCTION__, so->so_state, errno));
         sofcantsendmore(so);
         tcp_sockclosed(pData, sototcpcb(so));
         SOCKET_UNLOCK(so);
@@ -647,17 +647,17 @@ sowrite(PNATState pData, struct socket *so)
             }
         });
     }
-    Log2(("%s: wrote(2) nn = %d bytes\n", __PRETTY_FUNCTION__, nn));
+    Log2(("%s: wrote(2) nn = %d bytes\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn));
 #endif
 
     /* Update sbuf */
     sb->sb_cc -= nn;
     sb->sb_rptr += nn;
-    Log2(("%s: update so_rcv (written nn = %d) %R[sbuf]\n", __PRETTY_FUNCTION__, nn, sb));
+    Log2(("%s: update so_rcv (written nn = %d) %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn, sb));
     if (sb->sb_rptr >= (sb->sb_data + sb->sb_datalen))
     {
         sb->sb_rptr -= sb->sb_datalen;
-        Log2(("%s: alter sb_rptr of so_rcv %R[sbuf]\n", __PRETTY_FUNCTION__, sb));
+        Log2(("%s: alter sb_rptr of so_rcv %R[sbuf]\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, sb));
     }
 
     /*
diff --git a/src/VBox/Devices/Network/slirp/socket.h b/src/VBox/Devices/Network/slirp/socket.h
index 3fda35a..3608dff 100644
--- a/src/VBox/Devices/Network/slirp/socket.h
+++ b/src/VBox/Devices/Network/slirp/socket.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/tcp.h b/src/VBox/Devices/Network/slirp/tcp.h
index 71fb70d..40bdd5d 100644
--- a/src/VBox/Devices/Network/slirp/tcp.h
+++ b/src/VBox/Devices/Network/slirp/tcp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/tcp_input.c b/src/VBox/Devices/Network/slirp/tcp_input.c
index 8468fa1..b7168ff 100644
--- a/src/VBox/Devices/Network/slirp/tcp_input.c
+++ b/src/VBox/Devices/Network/slirp/tcp_input.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/tcp_output.c b/src/VBox/Devices/Network/slirp/tcp_output.c
index 9b052f3..c2da476 100644
--- a/src/VBox/Devices/Network/slirp/tcp_output.c
+++ b/src/VBox/Devices/Network/slirp/tcp_output.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/tcp_subr.c b/src/VBox/Devices/Network/slirp/tcp_subr.c
index 0769a5f..96d88e9 100644
--- a/src/VBox/Devices/Network/slirp/tcp_subr.c
+++ b/src/VBox/Devices/Network/slirp/tcp_subr.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/tcp_timer.c b/src/VBox/Devices/Network/slirp/tcp_timer.c
index 90a2ccd..b706e88 100644
--- a/src/VBox/Devices/Network/slirp/tcp_timer.c
+++ b/src/VBox/Devices/Network/slirp/tcp_timer.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/tcp_timer.h b/src/VBox/Devices/Network/slirp/tcp_timer.h
index dd0a33a..b643ba4 100644
--- a/src/VBox/Devices/Network/slirp/tcp_timer.h
+++ b/src/VBox/Devices/Network/slirp/tcp_timer.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/tcp_var.h b/src/VBox/Devices/Network/slirp/tcp_var.h
index 5c24ad1..198d06f 100644
--- a/src/VBox/Devices/Network/slirp/tcp_var.h
+++ b/src/VBox/Devices/Network/slirp/tcp_var.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/tcpip.h b/src/VBox/Devices/Network/slirp/tcpip.h
index e9b8e16..8d305f7 100644
--- a/src/VBox/Devices/Network/slirp/tcpip.h
+++ b/src/VBox/Devices/Network/slirp/tcpip.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/tftp.c b/src/VBox/Devices/Network/slirp/tftp.c
index 2e3ef8e..ee5470c 100644
--- a/src/VBox/Devices/Network/slirp/tftp.c
+++ b/src/VBox/Devices/Network/slirp/tftp.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/tftp.h b/src/VBox/Devices/Network/slirp/tftp.h
index e3460b2..e8190ad 100644
--- a/src/VBox/Devices/Network/slirp/tftp.h
+++ b/src/VBox/Devices/Network/slirp/tftp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/udp.c b/src/VBox/Devices/Network/slirp/udp.c
index 18037dd..aedc925 100644
--- a/src/VBox/Devices/Network/slirp/udp.c
+++ b/src/VBox/Devices/Network/slirp/udp.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/udp.h b/src/VBox/Devices/Network/slirp/udp.h
index e9aa69d..3a8dc43 100644
--- a/src/VBox/Devices/Network/slirp/udp.h
+++ b/src/VBox/Devices/Network/slirp/udp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/slirp/zone.h b/src/VBox/Devices/Network/slirp/zone.h
index 089f041..cc1926f 100644
--- a/src/VBox/Devices/Network/slirp/zone.h
+++ b/src/VBox/Devices/Network/slirp/zone.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/testcase/tstDevEEPROM.cpp b/src/VBox/Devices/Network/testcase/tstDevEEPROM.cpp
index ebec4d9..bf7ed9c 100644
--- a/src/VBox/Devices/Network/testcase/tstDevEEPROM.cpp
+++ b/src/VBox/Devices/Network/testcase/tstDevEEPROM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/testcase/tstDevPhy.cpp b/src/VBox/Devices/Network/testcase/tstDevPhy.cpp
index b6393be..ad2f795 100644
--- a/src/VBox/Devices/Network/testcase/tstDevPhy.cpp
+++ b/src/VBox/Devices/Network/testcase/tstDevPhy.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp b/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp
index 4381cb2..9c2d5d2 100644
--- a/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp
+++ b/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -806,7 +806,7 @@ extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
                 return 1;
 
             case 'V':
-                RTPrintf("$Revision: 94786 $\n");
+                RTPrintf("$Revision: 100876 $\n");
                 return 0;
 
             default:
diff --git a/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp b/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp
index 8a69f1b..9424647 100644
--- a/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp
+++ b/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp b/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp
index 926bfc5..1565847 100644
--- a/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp
+++ b/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/Makefile.kmk b/src/VBox/Devices/PC/BIOS/Makefile.kmk
index f013d1d..fa9cb6f 100644
--- a/src/VBox/Devices/PC/BIOS/Makefile.kmk
+++ b/src/VBox/Devices/PC/BIOS/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm b/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm
index 5a453d5..8b9b985 100644
--- a/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm
+++ b/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm
@@ -10,7 +10,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2004-2014 Oracle Corporation
+;  Copyright (C) 2004-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -24,7 +24,7 @@
 ; Source file: bios.c
 ;
 ;  
-;  Copyright (C) 2006-2012 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -66,7 +66,7 @@
 ; Source file: print.c
 ;
 ;  
-;  Copyright (C) 2006-2011 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -108,7 +108,7 @@
 ; Source file: ata.c
 ;
 ;  
-;  Copyright (C) 2006-2012 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -150,7 +150,7 @@
 ; Source file: floppy.c
 ;
 ;  
-;  Copyright (C) 2006-2012 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -196,7 +196,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2011-2013 Oracle Corporation
+;  Copyright (C) 2011-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -210,7 +210,7 @@
 ; Source file: eltorito.c
 ;
 ;  
-;  Copyright (C) 2006-2013 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -252,7 +252,7 @@
 ; Source file: boot.c
 ;
 ;  
-;  Copyright (C) 2006-2012 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -294,7 +294,7 @@
 ; Source file: keyboard.c
 ;
 ;  
-;  Copyright (C) 2006-2012 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -336,7 +336,7 @@
 ; Source file: disk.c
 ;
 ;  
-;  Copyright (C) 2006-2012 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -378,7 +378,7 @@
 ; Source file: serial.c
 ;
 ;  
-;  Copyright (C) 2006-2012 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -420,7 +420,7 @@
 ; Source file: system.c
 ;
 ;  
-;  Copyright (C) 2006-2013 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -466,7 +466,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2013 Oracle Corporation
+;  Copyright (C) 2013-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -480,7 +480,7 @@
 ; Source file: timepci.c
 ;
 ;  
-;  Copyright (C) 2006-2012 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -522,7 +522,7 @@
 ; Source file: ps2mouse.c
 ;
 ;  
-;  Copyright (C) 2006-2011 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -564,7 +564,7 @@
 ; Source file: parallel.c
 ;
 ;  
-;  Copyright (C) 2006-2012 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -610,7 +610,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2004-2012 Oracle Corporation
+;  Copyright (C) 2004-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -628,7 +628,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2004-2012 Oracle Corporation
+;  Copyright (C) 2004-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -646,7 +646,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2011-2012 Oracle Corporation
+;  Copyright (C) 2011-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -664,7 +664,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2004-2012 Oracle Corporation
+;  Copyright (C) 2004-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -682,7 +682,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2004-2012 Oracle Corporation
+;  Copyright (C) 2004-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -699,7 +699,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2011 Oracle Corporation
+;  Copyright (C) 2011-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -716,7 +716,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2011 Oracle Corporation
+;  Copyright (C) 2011-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -734,7 +734,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2012 Oracle Corporation
+;  Copyright (C) 2012-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -749,7 +749,7 @@
 ; Source file: pcibio32.asm
 ;
 ;  
-;  Copyright (C) 2006-2012 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -765,7 +765,7 @@
 ; Source file: apm_pm.asm
 ;
 ;  
-;  Copyright (C) 2006-2012 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -784,7 +784,7 @@
 ; Source file: orgs.asm
 ;
 ;  
-;  Copyright (C) 2006-2011 Oracle Corporation
+;  Copyright (C) 2006-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -831,7 +831,7 @@
 ;  
 ;  
 ;  
-;  Copyright (C) 2004-2012 Oracle Corporation
+;  Copyright (C) 2004-2015 Oracle Corporation
 ;  
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -983,7 +983,7 @@ section CONST progbits vstart=0xb0 align=1 ; size=0xce0 class=DATA group=DGROUP
 
 section CONST2 progbits vstart=0xd90 align=1 ; size=0x3fe class=DATA group=DGROUP
 _bios_cvs_version_string:                    ; 0xf0d90 LB 0x16
-    db  'VirtualBox 5.0.0_RC1', 000h, 000h
+    db  'VirtualBox 5.0.0_RC2', 000h, 000h
 _bios_prefix_string:                         ; 0xf0da6 LB 0x8
     db  'BIOS: ', 000h, 000h
 _isotag:                                     ; 0xf0dae LB 0x6
@@ -16348,4 +16348,4 @@ dummy_iret:                                  ; 0xfff53 LB 0x9d
     db  'XM'
 cpu_reset:                                   ; 0xffff0 LB 0x10
     jmp far 0f000h:0e05bh                     ; ea 5b e0 00 f0
-    db  030h, 036h, 02fh, 032h, 033h, 02fh, 039h, 039h, 000h, 0fch, 04eh
+    db  030h, 036h, 02fh, 032h, 033h, 02fh, 039h, 039h, 000h, 0fch, 04dh
diff --git a/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.md5sum b/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.md5sum
index f6e0391..093ec36 100644
--- a/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.md5sum
+++ b/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.md5sum
@@ -1 +1 @@
-611e37055be16cf9eaf8b6359f3fd8a6 *VBoxPcBios.rom
+beb4fae868345c4f95fe481666af4a6f *VBoxPcBios.rom
diff --git a/src/VBox/Devices/PC/BIOS/ahci.c b/src/VBox/Devices/PC/BIOS/ahci.c
index b0af223..fd638c9 100644
--- a/src/VBox/Devices/PC/BIOS/ahci.c
+++ b/src/VBox/Devices/PC/BIOS/ahci.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/apm.c b/src/VBox/Devices/PC/BIOS/apm.c
index 717ea96..5103521 100644
--- a/src/VBox/Devices/PC/BIOS/apm.c
+++ b/src/VBox/Devices/PC/BIOS/apm.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2004-2012 Oracle Corporation
+ * Copyright (C) 2004-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/apm_pm.asm b/src/VBox/Devices/PC/BIOS/apm_pm.asm
index cd625ba..ff8b9b5 100644
--- a/src/VBox/Devices/PC/BIOS/apm_pm.asm
+++ b/src/VBox/Devices/PC/BIOS/apm_pm.asm
@@ -1,5 +1,5 @@
 ;;
-;; Copyright (C) 2006-2012 Oracle Corporation
+;; Copyright (C) 2006-2015 Oracle Corporation
 ;;
 ;; This file is part of VirtualBox Open Source Edition (OSE), as
 ;; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/ata.c b/src/VBox/Devices/PC/BIOS/ata.c
index 84a17f7..45b79e9 100644
--- a/src/VBox/Devices/PC/BIOS/ata.c
+++ b/src/VBox/Devices/PC/BIOS/ata.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/ata.h b/src/VBox/Devices/PC/BIOS/ata.h
index 75b9edf..e5cebab 100644
--- a/src/VBox/Devices/PC/BIOS/ata.h
+++ b/src/VBox/Devices/PC/BIOS/ata.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/bios.c b/src/VBox/Devices/PC/BIOS/bios.c
index 66bf8dd..6a940eb 100644
--- a/src/VBox/Devices/PC/BIOS/bios.c
+++ b/src/VBox/Devices/PC/BIOS/bios.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/biosint.h b/src/VBox/Devices/PC/BIOS/biosint.h
index 164cbdb..f68625b 100644
--- a/src/VBox/Devices/PC/BIOS/biosint.h
+++ b/src/VBox/Devices/PC/BIOS/biosint.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/boot.c b/src/VBox/Devices/PC/BIOS/boot.c
index 00aea7c..b3ed205 100644
--- a/src/VBox/Devices/PC/BIOS/boot.c
+++ b/src/VBox/Devices/PC/BIOS/boot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/disk.c b/src/VBox/Devices/PC/BIOS/disk.c
index 4a541ab..355a976 100644
--- a/src/VBox/Devices/PC/BIOS/disk.c
+++ b/src/VBox/Devices/PC/BIOS/disk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/ebda.h b/src/VBox/Devices/PC/BIOS/ebda.h
index adc0ea7..dd9352d 100644
--- a/src/VBox/Devices/PC/BIOS/ebda.h
+++ b/src/VBox/Devices/PC/BIOS/ebda.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/eltorito.c b/src/VBox/Devices/PC/BIOS/eltorito.c
index c33c95a..85c8d44 100644
--- a/src/VBox/Devices/PC/BIOS/eltorito.c
+++ b/src/VBox/Devices/PC/BIOS/eltorito.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/floppy.c b/src/VBox/Devices/PC/BIOS/floppy.c
index 7951c88..c0184c2 100644
--- a/src/VBox/Devices/PC/BIOS/floppy.c
+++ b/src/VBox/Devices/PC/BIOS/floppy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1115,8 +1115,8 @@ void BIOSCALL int13_diskette_function(disk_regs_t r)
         drive = GET_ELDL();
 
         // Format type (AL)
-        // 00 - NOT USED    
-        // 01 - DISKETTE 360K IN 360K DRIVE    
+        // 00 - NOT USED
+        // 01 - DISKETTE 360K IN 360K DRIVE
         // 02 - DISKETTE 360K IN 1.2M DRIVE
         // 03 - DISKETTE 1.2M IN 1.2M DRIVE
         // 04 - DISKETTE 720K IN 720K DRIVE
@@ -1130,7 +1130,7 @@ void BIOSCALL int13_diskette_function(disk_regs_t r)
             SET_CF();
             return;
         }
-    
+
         // see if drive exists
         if (floppy_drive_exists(drive) == 0) {
             SET_AH(0x80); // not responding/time out
@@ -1215,7 +1215,7 @@ void BIOSCALL int13_diskette_function(disk_regs_t r)
             if (floppy_media_sense(drive) == 0) {
                 SET_AH(0x0C); // drive/media type unknown
                 set_diskette_ret_status(0x0C);
-                SET_CF(); 
+                SET_CF();
                 return;
             }
         }
@@ -1226,7 +1226,7 @@ void BIOSCALL int13_diskette_function(disk_regs_t r)
             drive_type >>= 4;
         else
             drive_type &= 0x0f;
-     
+
         // Get current drive state. Set 'base_address' to media status offset address
         base_address = (drive) ? 0x0091 : 0x0090;
         media_state = read_byte(0x0040, base_address);
@@ -1241,7 +1241,7 @@ void BIOSCALL int13_diskette_function(disk_regs_t r)
 
             break;
         case 2: // 1.2MB, 5.25"
-            if (track == 39 && num_sectors == 9) {          // 360K disk in 1.2M drive 
+            if (track == 39 && num_sectors == 9) {          // 360K disk in 1.2M drive
                 media_state |= 0x70; // 0111 0000 (media type established, double stepping, 300 kbps)
             } else if (track == 79 && num_sectors == 15) {  // 1.2M disk in 1.2M drive
                 media_state |= 0x10; // 0001 0000 (media type established, 500 kbps)
@@ -1251,7 +1251,7 @@ void BIOSCALL int13_diskette_function(disk_regs_t r)
             if (track == 79 && num_sectors == 9)
                 media_state |= 0x90; // 1001 0000 (media type established, 250 kbps)
 
-			break;
+                        break;
         case 4: // 1.44MB, 3.5"
             if (track == 79) {
                 if (num_sectors == 9) {          // 720K disk in 1.44M drive
@@ -1259,7 +1259,7 @@ void BIOSCALL int13_diskette_function(disk_regs_t r)
                 } else if (num_sectors == 18) {  // 1.44M disk in 1.44M drive
                     media_state |= 0x10; // 0001 0000 (media type established, 500 kbps)
                 }
-            } 
+            }
             break;
         case 5: // 2.88MB, 3.5"
             if (track == 79) {
@@ -1282,14 +1282,14 @@ void BIOSCALL int13_diskette_function(disk_regs_t r)
             // for current drive type - or drive type is unknown!
             SET_AH(0x0C);
             set_diskette_ret_status(0x0C);
-            SET_CF(); 
+            SET_CF();
             return;
         }
 
         // Update media status
         write_byte(0x0040, base_address, media_state);
 
-        // set es & di to point to 11 byte diskette param table in ROM 
+        // set es & di to point to 11 byte diskette param table in ROM
         ES = 0xF000;    // @todo: any way to make this relocatable?
         DI = get_floppy_dpt(drive_type);
 
diff --git a/src/VBox/Devices/PC/BIOS/floppyt.c b/src/VBox/Devices/PC/BIOS/floppyt.c
index d9bdb82..9539985 100644
--- a/src/VBox/Devices/PC/BIOS/floppyt.c
+++ b/src/VBox/Devices/PC/BIOS/floppyt.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/inlines.h b/src/VBox/Devices/PC/BIOS/inlines.h
index fcaa8de..2a7b4f9 100644
--- a/src/VBox/Devices/PC/BIOS/inlines.h
+++ b/src/VBox/Devices/PC/BIOS/inlines.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/invop.c b/src/VBox/Devices/PC/BIOS/invop.c
index bdebf54..98dac91 100644
--- a/src/VBox/Devices/PC/BIOS/invop.c
+++ b/src/VBox/Devices/PC/BIOS/invop.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/keyboard.c b/src/VBox/Devices/PC/BIOS/keyboard.c
index 2e669fa..a530a50 100644
--- a/src/VBox/Devices/PC/BIOS/keyboard.c
+++ b/src/VBox/Devices/PC/BIOS/keyboard.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/logo.c b/src/VBox/Devices/PC/BIOS/logo.c
index 1fd30bc..cf597a9 100644
--- a/src/VBox/Devices/PC/BIOS/logo.c
+++ b/src/VBox/Devices/PC/BIOS/logo.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2004-2012 Oracle Corporation
+ * Copyright (C) 2004-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/orgs.asm b/src/VBox/Devices/PC/BIOS/orgs.asm
index 913b235..6498b8b 100644
--- a/src/VBox/Devices/PC/BIOS/orgs.asm
+++ b/src/VBox/Devices/PC/BIOS/orgs.asm
@@ -1,5 +1,5 @@
 ;;
-;; Copyright (C) 2006-2011 Oracle Corporation
+;; Copyright (C) 2006-2015 Oracle Corporation
 ;;
 ;; This file is part of VirtualBox Open Source Edition (OSE), as
 ;; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/parallel.c b/src/VBox/Devices/PC/BIOS/parallel.c
index 87f88ff..b59071b 100644
--- a/src/VBox/Devices/PC/BIOS/parallel.c
+++ b/src/VBox/Devices/PC/BIOS/parallel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/pci32.c b/src/VBox/Devices/PC/BIOS/pci32.c
index 86f9c24..418a810 100644
--- a/src/VBox/Devices/PC/BIOS/pci32.c
+++ b/src/VBox/Devices/PC/BIOS/pci32.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2004-2012 Oracle Corporation
+ * Copyright (C) 2004-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/pcibio32.asm b/src/VBox/Devices/PC/BIOS/pcibio32.asm
index 8c7bcc7..61cc3b2 100644
--- a/src/VBox/Devices/PC/BIOS/pcibio32.asm
+++ b/src/VBox/Devices/PC/BIOS/pcibio32.asm
@@ -1,5 +1,5 @@
 ;;
-;; Copyright (C) 2006-2012 Oracle Corporation
+;; Copyright (C) 2006-2015 Oracle Corporation
 ;;
 ;; This file is part of VirtualBox Open Source Edition (OSE), as
 ;; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/pcibios.c b/src/VBox/Devices/PC/BIOS/pcibios.c
index 4cc4911..4e2d592 100644
--- a/src/VBox/Devices/PC/BIOS/pcibios.c
+++ b/src/VBox/Devices/PC/BIOS/pcibios.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2004-2012 Oracle Corporation
+ * Copyright (C) 2004-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/pcibios.inc b/src/VBox/Devices/PC/BIOS/pcibios.inc
index 7cb445e..71361da 100644
--- a/src/VBox/Devices/PC/BIOS/pcibios.inc
+++ b/src/VBox/Devices/PC/BIOS/pcibios.inc
@@ -1,5 +1,5 @@
 ;;
-;; Copyright (C) 2006-2011 Oracle Corporation
+;; Copyright (C) 2006-2015 Oracle Corporation
 ;;
 ;; This file is part of VirtualBox Open Source Edition (OSE), as
 ;; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/pciutil.c b/src/VBox/Devices/PC/BIOS/pciutil.c
index 7135fde..318a43d 100644
--- a/src/VBox/Devices/PC/BIOS/pciutil.c
+++ b/src/VBox/Devices/PC/BIOS/pciutil.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/pciutil.h b/src/VBox/Devices/PC/BIOS/pciutil.h
index 6f60071..8867592 100644
--- a/src/VBox/Devices/PC/BIOS/pciutil.h
+++ b/src/VBox/Devices/PC/BIOS/pciutil.h
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/pirq.inc b/src/VBox/Devices/PC/BIOS/pirq.inc
index 1817e62..679af4e 100644
--- a/src/VBox/Devices/PC/BIOS/pirq.inc
+++ b/src/VBox/Devices/PC/BIOS/pirq.inc
@@ -1,5 +1,5 @@
 ;;
-;; Copyright (C) 2006-2011 Oracle Corporation
+;; Copyright (C) 2006-2015 Oracle Corporation
 ;;
 ;; This file is part of VirtualBox Open Source Edition (OSE), as
 ;; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/pmode.inc b/src/VBox/Devices/PC/BIOS/pmode.inc
index 981d98e..f570af9 100644
--- a/src/VBox/Devices/PC/BIOS/pmode.inc
+++ b/src/VBox/Devices/PC/BIOS/pmode.inc
@@ -3,7 +3,7 @@
 ;;
 
 ;;
-;; Copyright (C) 2004-2011 Oracle Corporation
+;; Copyright (C) 2004-2015 Oracle Corporation
 ;;
 ;; This file is part of VirtualBox Open Source Edition (OSE), as
 ;; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/pmsetup.inc b/src/VBox/Devices/PC/BIOS/pmsetup.inc
index 5f7eb4f..f60749d 100644
--- a/src/VBox/Devices/PC/BIOS/pmsetup.inc
+++ b/src/VBox/Devices/PC/BIOS/pmsetup.inc
@@ -3,7 +3,7 @@
 ;;
 
 ;;
-;; Copyright (C) 2004-2011 Oracle Corporation
+;; Copyright (C) 2004-2015 Oracle Corporation
 ;;
 ;; This file is part of VirtualBox Open Source Edition (OSE), as
 ;; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/post.c b/src/VBox/Devices/PC/BIOS/post.c
index ae54f83..138642d 100644
--- a/src/VBox/Devices/PC/BIOS/post.c
+++ b/src/VBox/Devices/PC/BIOS/post.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2004-2014 Oracle Corporation
+ * Copyright (C) 2004-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/print.c b/src/VBox/Devices/PC/BIOS/print.c
index e8a82d9..af5e85f 100644
--- a/src/VBox/Devices/PC/BIOS/print.c
+++ b/src/VBox/Devices/PC/BIOS/print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/ps2mouse.c b/src/VBox/Devices/PC/BIOS/ps2mouse.c
index 6468a25..cf2eec3 100644
--- a/src/VBox/Devices/PC/BIOS/ps2mouse.c
+++ b/src/VBox/Devices/PC/BIOS/ps2mouse.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/scsi.c b/src/VBox/Devices/PC/BIOS/scsi.c
index 44aea7e..36393de 100644
--- a/src/VBox/Devices/PC/BIOS/scsi.c
+++ b/src/VBox/Devices/PC/BIOS/scsi.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2004-2012 Oracle Corporation
+ * Copyright (C) 2004-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/serial.c b/src/VBox/Devices/PC/BIOS/serial.c
index f2e901d..449181e 100644
--- a/src/VBox/Devices/PC/BIOS/serial.c
+++ b/src/VBox/Devices/PC/BIOS/serial.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/smidmi.inc b/src/VBox/Devices/PC/BIOS/smidmi.inc
index aa7fd13..0fb4c7b 100644
--- a/src/VBox/Devices/PC/BIOS/smidmi.inc
+++ b/src/VBox/Devices/PC/BIOS/smidmi.inc
@@ -1,5 +1,5 @@
 ;;
-;; Copyright (C) 2006-2011 Oracle Corporation
+;; Copyright (C) 2006-2015 Oracle Corporation
 ;;
 ;; This file is part of VirtualBox Open Source Edition (OSE), as
 ;; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/system.c b/src/VBox/Devices/PC/BIOS/system.c
index 449683a..f10ab8f 100644
--- a/src/VBox/Devices/PC/BIOS/system.c
+++ b/src/VBox/Devices/PC/BIOS/system.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/timepci.c b/src/VBox/Devices/PC/BIOS/timepci.c
index 29bbc31..8bdcc50 100644
--- a/src/VBox/Devices/PC/BIOS/timepci.c
+++ b/src/VBox/Devices/PC/BIOS/timepci.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/BIOS/vds.c b/src/VBox/Devices/PC/BIOS/vds.c
index a45365b..c874523 100644
--- a/src/VBox/Devices/PC/BIOS/vds.c
+++ b/src/VBox/Devices/PC/BIOS/vds.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/DevACPI.cpp b/src/VBox/Devices/PC/DevACPI.cpp
index d1fef5f..fbc56ee 100644
--- a/src/VBox/Devices/PC/DevACPI.cpp
+++ b/src/VBox/Devices/PC/DevACPI.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -3478,7 +3478,7 @@ const PDMDEVREG g_DeviceACPI =
     /* szName */
     "acpi",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/PC/DevAPIC.cpp b/src/VBox/Devices/PC/DevAPIC.cpp
index ae0ebcf..3a46ebd 100644
--- a/src/VBox/Devices/PC/DevAPIC.cpp
+++ b/src/VBox/Devices/PC/DevAPIC.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -2467,7 +2467,7 @@ const PDMDEVREG g_DeviceAPIC =
     /* szName */
     "apic",
     /* szRCMod */
-    "VBoxDD2GC.gc",
+    "VBoxDD2RC.rc",
     /* szR0Mod */
     "VBoxDD2R0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/PC/DevApic.h b/src/VBox/Devices/PC/DevApic.h
index 0b01b43..624c22c 100644
--- a/src/VBox/Devices/PC/DevApic.h
+++ b/src/VBox/Devices/PC/DevApic.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/DevDMA.cpp b/src/VBox/Devices/PC/DevDMA.cpp
index 2ba0c96..b6a2c2b 100644
--- a/src/VBox/Devices/PC/DevDMA.cpp
+++ b/src/VBox/Devices/PC/DevDMA.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/DevFwCommon.cpp b/src/VBox/Devices/PC/DevFwCommon.cpp
index add123b..d7ff9f8 100644
--- a/src/VBox/Devices/PC/DevFwCommon.cpp
+++ b/src/VBox/Devices/PC/DevFwCommon.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/DevFwCommon.h b/src/VBox/Devices/PC/DevFwCommon.h
index 2a7ae9d..90320d2 100644
--- a/src/VBox/Devices/PC/DevFwCommon.h
+++ b/src/VBox/Devices/PC/DevFwCommon.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/DevHPET.cpp b/src/VBox/Devices/PC/DevHPET.cpp
index 99b3478..1baade1 100644
--- a/src/VBox/Devices/PC/DevHPET.cpp
+++ b/src/VBox/Devices/PC/DevHPET.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1439,7 +1439,7 @@ const PDMDEVREG g_DeviceHPET =
     /* szName */
     "hpet",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/PC/DevIoApic.cpp b/src/VBox/Devices/PC/DevIoApic.cpp
index 3c1d620..555d968 100644
--- a/src/VBox/Devices/PC/DevIoApic.cpp
+++ b/src/VBox/Devices/PC/DevIoApic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -865,7 +865,7 @@ const PDMDEVREG g_DeviceIOAPIC =
     /* szName */
     "ioapic",
     /* szRCMod */
-    "VBoxDD2GC.gc",
+    "VBoxDD2RC.rc",
     /* szR0Mod */
     "VBoxDD2R0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/PC/DevLPC.cpp b/src/VBox/Devices/PC/DevLPC.cpp
index d802c41..d75ef7f 100644
--- a/src/VBox/Devices/PC/DevLPC.cpp
+++ b/src/VBox/Devices/PC/DevLPC.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -341,7 +341,7 @@ const PDMDEVREG g_DeviceLPC =
     /* szName */
     "lpc",
     /* szRCMod */
-    "VBoxDD2GC.gc",
+    "VBoxDD2RC.rc",
     /* szR0Mod */
     "VBoxDD2R0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/PC/DevPIC.cpp b/src/VBox/Devices/PC/DevPIC.cpp
index 10fe2a0..ce10401 100644
--- a/src/VBox/Devices/PC/DevPIC.cpp
+++ b/src/VBox/Devices/PC/DevPIC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1086,7 +1086,7 @@ const PDMDEVREG g_DeviceI8259 =
     /* szName */
     "i8259",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/PC/DevPcArch.cpp b/src/VBox/Devices/PC/DevPcArch.cpp
index c9af251..531268b 100644
--- a/src/VBox/Devices/PC/DevPcArch.cpp
+++ b/src/VBox/Devices/PC/DevPcArch.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/DevPcBios.cpp b/src/VBox/Devices/PC/DevPcBios.cpp
index 8df29cc..29b4c4c 100644
--- a/src/VBox/Devices/PC/DevPcBios.cpp
+++ b/src/VBox/Devices/PC/DevPcBios.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/DevPcBios.h b/src/VBox/Devices/PC/DevPcBios.h
index 063e846..81c51a5 100644
--- a/src/VBox/Devices/PC/DevPcBios.h
+++ b/src/VBox/Devices/PC/DevPcBios.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/DevPit-i8254.cpp b/src/VBox/Devices/PC/DevPit-i8254.cpp
index 6f4a329..ea9c0a5 100644
--- a/src/VBox/Devices/PC/DevPit-i8254.cpp
+++ b/src/VBox/Devices/PC/DevPit-i8254.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1300,7 +1300,7 @@ const PDMDEVREG g_DeviceI8254 =
     /* szName */
     "i8254",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/PC/DevRTC.cpp b/src/VBox/Devices/PC/DevRTC.cpp
index 231d474..6e798fc 100644
--- a/src/VBox/Devices/PC/DevRTC.cpp
+++ b/src/VBox/Devices/PC/DevRTC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1253,7 +1253,7 @@ const PDMDEVREG g_DeviceMC146818 =
     /* szName */
     "mc146818",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/PC/DrvACPI.cpp b/src/VBox/Devices/PC/DrvACPI.cpp
index d338f57..d08e29d 100644
--- a/src/VBox/Devices/PC/DrvACPI.cpp
+++ b/src/VBox/Devices/PC/DrvACPI.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/DrvAcpiCpu.cpp b/src/VBox/Devices/PC/DrvAcpiCpu.cpp
index 92e428f..ccf6e79 100644
--- a/src/VBox/Devices/PC/DrvAcpiCpu.cpp
+++ b/src/VBox/Devices/PC/DrvAcpiCpu.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/ipxe/Makefile.kmk b/src/VBox/Devices/PC/ipxe/Makefile.kmk
index 91fb8b2..d050bb6 100644
--- a/src/VBox/Devices/PC/ipxe/Makefile.kmk
+++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl b/src/VBox/Devices/PC/vbox-cpuhotplug.dsl
index 5c60c5b..996a3d3 100644
--- a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl
+++ b/src/VBox/Devices/PC/vbox-cpuhotplug.dsl
@@ -3,7 +3,7 @@
 //
 // VirtualBox ACPI
 //
-// Copyright (C) 2006-2010 Oracle Corporation
+// Copyright (C) 2006-2015 Oracle Corporation
 //
 // This file is part of VirtualBox Open Source Edition (OSE), as
 // available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/vbox-standard.dsl b/src/VBox/Devices/PC/vbox-standard.dsl
index 5361132..b1c9958 100644
--- a/src/VBox/Devices/PC/vbox-standard.dsl
+++ b/src/VBox/Devices/PC/vbox-standard.dsl
@@ -3,7 +3,7 @@
 //
 // VirtualBox ACPI
 //
-// Copyright (C) 2006-2010 Oracle Corporation
+// Copyright (C) 2006-2015 Oracle Corporation
 //
 // This file is part of VirtualBox Open Source Edition (OSE), as
 // available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/PC/vbox.dsl b/src/VBox/Devices/PC/vbox.dsl
index 2f73dff..28cc65c 100644
--- a/src/VBox/Devices/PC/vbox.dsl
+++ b/src/VBox/Devices/PC/vbox.dsl
@@ -3,7 +3,7 @@
 //
 // VirtualBox ACPI
 //
-// Copyright (C) 2006-2011 Oracle Corporation
+// Copyright (C) 2006-2015 Oracle Corporation
 //
 // This file is part of VirtualBox Open Source Edition (OSE), as
 // available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Parallel/DevParallel.cpp b/src/VBox/Devices/Parallel/DevParallel.cpp
index 6e03ecf..c315caf 100644
--- a/src/VBox/Devices/Parallel/DevParallel.cpp
+++ b/src/VBox/Devices/Parallel/DevParallel.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -799,7 +799,7 @@ const PDMDEVREG g_DeviceParallelPort =
     /* szName */
     "parallel",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Parallel/DrvHostParallel.cpp b/src/VBox/Devices/Parallel/DrvHostParallel.cpp
index 60e19c5..1859cd0 100644
--- a/src/VBox/Devices/Parallel/DrvHostParallel.cpp
+++ b/src/VBox/Devices/Parallel/DrvHostParallel.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Samples/DrvStorageFilter.cpp b/src/VBox/Devices/Samples/DrvStorageFilter.cpp
index 648b4ba..6c4d49b 100644
--- a/src/VBox/Devices/Samples/DrvStorageFilter.cpp
+++ b/src/VBox/Devices/Samples/DrvStorageFilter.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Samples/Makefile.kmk b/src/VBox/Devices/Samples/Makefile.kmk
index a3146c6..bbc2272 100644
--- a/src/VBox/Devices/Samples/Makefile.kmk
+++ b/src/VBox/Devices/Samples/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Samples/VBoxSampleDevice.cpp b/src/VBox/Devices/Samples/VBoxSampleDevice.cpp
index 9c2e96a..8bc5bcf 100644
--- a/src/VBox/Devices/Samples/VBoxSampleDevice.cpp
+++ b/src/VBox/Devices/Samples/VBoxSampleDevice.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Serial/DevSerial.cpp b/src/VBox/Devices/Serial/DevSerial.cpp
index 338c53a..689b328 100644
--- a/src/VBox/Devices/Serial/DevSerial.cpp
+++ b/src/VBox/Devices/Serial/DevSerial.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1392,7 +1392,7 @@ const PDMDEVREG g_DeviceSerialPort =
     /* szName */
     "serial",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Serial/DrvChar.cpp b/src/VBox/Devices/Serial/DrvChar.cpp
index a0d1b79..8186a01 100644
--- a/src/VBox/Devices/Serial/DrvChar.cpp
+++ b/src/VBox/Devices/Serial/DrvChar.cpp
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Serial/DrvHostSerial.cpp b/src/VBox/Devices/Serial/DrvHostSerial.cpp
index 0c44fad..2e2d5ca 100644
--- a/src/VBox/Devices/Serial/DrvHostSerial.cpp
+++ b/src/VBox/Devices/Serial/DrvHostSerial.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Serial/DrvNamedPipe.cpp b/src/VBox/Devices/Serial/DrvNamedPipe.cpp
index be9bebe..5b09f75 100644
--- a/src/VBox/Devices/Serial/DrvNamedPipe.cpp
+++ b/src/VBox/Devices/Serial/DrvNamedPipe.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Serial/DrvRawFile.cpp b/src/VBox/Devices/Serial/DrvRawFile.cpp
index 0a9de20..2ac8751 100644
--- a/src/VBox/Devices/Serial/DrvRawFile.cpp
+++ b/src/VBox/Devices/Serial/DrvRawFile.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/ATAPIPassthrough.cpp b/src/VBox/Devices/Storage/ATAPIPassthrough.cpp
index 82d3ce8..d81c3f7 100644
--- a/src/VBox/Devices/Storage/ATAPIPassthrough.cpp
+++ b/src/VBox/Devices/Storage/ATAPIPassthrough.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/ATAPIPassthrough.h b/src/VBox/Devices/Storage/ATAPIPassthrough.h
index 0ccaf62..76ba2de 100644
--- a/src/VBox/Devices/Storage/ATAPIPassthrough.h
+++ b/src/VBox/Devices/Storage/ATAPIPassthrough.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/Debug.cpp b/src/VBox/Devices/Storage/Debug.cpp
index 1fb479e..b51e3a3 100644
--- a/src/VBox/Devices/Storage/Debug.cpp
+++ b/src/VBox/Devices/Storage/Debug.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/DevAHCI.cpp b/src/VBox/Devices/Storage/DevAHCI.cpp
index 06c2b3b..11154e5 100644
--- a/src/VBox/Devices/Storage/DevAHCI.cpp
+++ b/src/VBox/Devices/Storage/DevAHCI.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -6936,11 +6936,6 @@ static DECLCALLBACK(int) ahciAsyncIOLoop(PPDMDEVINS pDevIns, PPDMTHREAD pThread)
                 bool fContinue = ahciR3CmdPrepare(pAhciPort, &Req);
                 if (fContinue)
                     fReqCanceled = ahciTransferComplete(pAhciPort, &Req, VERR_NO_MEMORY);
-                else
-                {
-                    ASMAtomicWriteNullPtr(&pAhciPort->aActiveTasks[pAhciReq->uTag]);
-                    ahciR3ReqFree(pAhciPort, pAhciReq);
-                }
             }
 
             /*
@@ -8612,7 +8607,7 @@ static DECLCALLBACK(int) ahciR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFG
         {
             pAhciPort->pDrvBase = NULL;
             rc = VINF_SUCCESS;
-            LogRel(("%s: no driver attached\n", szName));
+            LogRel(("AHCI: %s: No driver attached\n", szName));
         }
         else
             return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
@@ -8660,7 +8655,7 @@ const PDMDEVREG g_DeviceAHCI =
     /* szName */
     "ahci",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Storage/DevATA.cpp b/src/VBox/Devices/Storage/DevATA.cpp
index c47ccf4..2173101 100644
--- a/src/VBox/Devices/Storage/DevATA.cpp
+++ b/src/VBox/Devices/Storage/DevATA.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -15,6 +15,7 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
 
+
 /*******************************************************************************
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
@@ -35,6 +36,7 @@
 #define ATA_SAVED_STATE_VERSION_WITHOUT_EVENT_STATUS    17
 /** @} */
 
+
 /*******************************************************************************
 *   Header Files                                                               *
 *******************************************************************************/
@@ -55,6 +57,7 @@
 #include <VBox/vmm/mm.h>
 #include <VBox/vmm/pgm.h>
 
+#include <VBox/sup.h>
 #include <VBox/scsi.h>
 
 #include "PIIX3ATABmDma.h"
@@ -62,6 +65,7 @@
 #include "ATAPIPassthrough.h"
 #include "VBoxDD.h"
 
+
 /*******************************************************************************
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
@@ -422,7 +426,9 @@ typedef struct ATACONTROLLER
     /** The async I/O thread handle. NIL_RTTHREAD if no thread. */
     RTTHREAD            AsyncIOThread;
     /** The event semaphore the thread is waiting on for requests. */
-    RTSEMEVENT          AsyncIOSem;
+    SUPSEMEVENT         hAsyncIOSem;
+    /** The support driver session handle. */
+    PSUPDRVSESSION      pSupDrvSession;
     /** The request queue for the AIO thread. One element is always unused. */
     ATARequest          aAsyncIORequests[4];
     /** The position at which to insert a new request for the AIO thread. */
@@ -434,8 +440,8 @@ typedef struct ATACONTROLLER
     uint8_t             Alignment3[1]; /**< Explicit padding of the 1 byte gap. */
     /** Magic delay before triggering interrupts in DMA mode. */
     uint32_t            DelayIRQMillies;
-    /** The mutex protecting the request queue. */
-    RTSEMMUTEX          AsyncIORequestMutex;
+    /** The lock protecting the request queue. */
+    PDMCRITSECT         AsyncIORequestLock;
     /** The event semaphore the thread is waiting on during suspended I/O. */
     RTSEMEVENT          SuspendIOSem;
 #if 0 /*HC_ARCH_BITS == 32*/
@@ -489,8 +495,8 @@ typedef struct PCIATAState
     R3PTRTYPE(PPDMILEDCONNECTORS)   pLedsConnector;
     /** Status LUN: Media Notify. */
     R3PTRTYPE(PPDMIMEDIANOTIFY)     pMediaNotify;
-    /** Flag whether GC is enabled. */
-    bool                fGCEnabled;
+    /** Flag whether RC is enabled. */
+    bool                fRCEnabled;
     /** Flag whether R0 is enabled. */
     bool                fR0Enabled;
     /** Flag indicating chipset being emulated. */
@@ -518,10 +524,15 @@ typedef struct PCIATAState
  *  Internal Functions                                                         *
  ******************************************************************************/
 RT_C_DECLS_BEGIN
-PDMBOTHCBDECL(int) ataIOPortWrite1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
-PDMBOTHCBDECL(int) ataIOPortRead1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *u32, unsigned cb);
-PDMBOTHCBDECL(int) ataIOPortWriteStr1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrSrc, PRTGCUINTREG pcTransfer, unsigned cb);
-PDMBOTHCBDECL(int) ataIOPortReadStr1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrDst, PRTGCUINTREG pcTransfer, unsigned cb);
+
+PDMBOTHCBDECL(int) ataIOPortWrite1Data(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
+PDMBOTHCBDECL(int) ataIOPortRead1Data(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *u32, unsigned cb);
+PDMBOTHCBDECL(int) ataIOPortWriteStr1Data(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint8_t const *pbSrc,
+                                          uint32_t *pcTransfers, unsigned cb);
+PDMBOTHCBDECL(int) ataIOPortReadStr1Data(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint8_t *pbDst,
+                                         uint32_t *pcTransfers, unsigned cb);
+PDMBOTHCBDECL(int) ataIOPortWrite1Other(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
+PDMBOTHCBDECL(int) ataIOPortRead1Other(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *u32, unsigned cb);
 PDMBOTHCBDECL(int) ataIOPortWrite2(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
 PDMBOTHCBDECL(int) ataIOPortRead2(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *u32, unsigned cb);
 PDMBOTHCBDECL(int) ataBMDMAIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
@@ -568,40 +579,42 @@ DECLINLINE(void) ataUnsetStatus(ATADevState *s, uint8_t stat)
     }
 }
 
-#ifdef IN_RING3
+#if defined(IN_RING3) || defined(IN_RING0)
 
+# ifdef IN_RING3
 typedef void (*PBeginTransferFunc)(ATADevState *);
 typedef bool (*PSourceSinkFunc)(ATADevState *);
 
-static void ataReadWriteSectorsBT(ATADevState *);
-static void ataPacketBT(ATADevState *);
-static void atapiCmdBT(ATADevState *);
-static void atapiPassthroughCmdBT(ATADevState *);
-
-static bool ataIdentifySS(ATADevState *);
-static bool ataFlushSS(ATADevState *);
-static bool ataReadSectorsSS(ATADevState *);
-static bool ataWriteSectorsSS(ATADevState *);
-static bool ataExecuteDeviceDiagnosticSS(ATADevState *);
-static bool ataTrimSS(ATADevState *);
-static bool ataPacketSS(ATADevState *);
-static bool atapiGetConfigurationSS(ATADevState *);
-static bool atapiGetEventStatusNotificationSS(ATADevState *);
-static bool atapiIdentifySS(ATADevState *);
-static bool atapiInquirySS(ATADevState *);
-static bool atapiMechanismStatusSS(ATADevState *);
-static bool atapiModeSenseErrorRecoverySS(ATADevState *);
-static bool atapiModeSenseCDStatusSS(ATADevState *);
-static bool atapiReadSS(ATADevState *);
-static bool atapiReadCapacitySS(ATADevState *);
-static bool atapiReadDiscInformationSS(ATADevState *);
-static bool atapiReadTOCNormalSS(ATADevState *);
-static bool atapiReadTOCMultiSS(ATADevState *);
-static bool atapiReadTOCRawSS(ATADevState *);
-static bool atapiReadTrackInformationSS(ATADevState *);
-static bool atapiRequestSenseSS(ATADevState *);
-static bool atapiPassthroughSS(ATADevState *);
-static bool atapiReadDVDStructureSS(ATADevState *);
+static void ataR3ReadWriteSectorsBT(ATADevState *);
+static void ataR3PacketBT(ATADevState *);
+static void atapiR3CmdBT(ATADevState *);
+static void atapiR3PassthroughCmdBT(ATADevState *);
+
+static bool ataR3IdentifySS(ATADevState *);
+static bool ataR3FlushSS(ATADevState *);
+static bool ataR3ReadSectorsSS(ATADevState *);
+static bool ataR3WriteSectorsSS(ATADevState *);
+static bool ataR3ExecuteDeviceDiagnosticSS(ATADevState *);
+static bool ataR3TrimSS(ATADevState *);
+static bool ataR3PacketSS(ATADevState *);
+static bool atapiR3GetConfigurationSS(ATADevState *);
+static bool atapiR3GetEventStatusNotificationSS(ATADevState *);
+static bool atapiR3IdentifySS(ATADevState *);
+static bool atapiR3InquirySS(ATADevState *);
+static bool atapiR3MechanismStatusSS(ATADevState *);
+static bool atapiR3ModeSenseErrorRecoverySS(ATADevState *);
+static bool atapiR3ModeSenseCDStatusSS(ATADevState *);
+static bool atapiR3ReadSS(ATADevState *);
+static bool atapiR3ReadCapacitySS(ATADevState *);
+static bool atapiR3ReadDiscInformationSS(ATADevState *);
+static bool atapiR3ReadTOCNormalSS(ATADevState *);
+static bool atapiR3ReadTOCMultiSS(ATADevState *);
+static bool atapiR3ReadTOCRawSS(ATADevState *);
+static bool atapiR3ReadTrackInformationSS(ATADevState *);
+static bool atapiR3RequestSenseSS(ATADevState *);
+static bool atapiR3PassthroughSS(ATADevState *);
+static bool atapiR3ReadDVDStructureSS(ATADevState *);
+# endif /* IN_RING3 */
 
 /**
  * Begin of transfer function indexes for g_apfnBeginTransFuncs.
@@ -616,6 +629,7 @@ typedef enum ATAFNBT
     ATAFN_BT_MAX
 } ATAFNBT;
 
+# ifdef IN_RING3
 /**
  * Array of end transfer functions, the index is ATAFNET.
  * Make sure ATAFNET and this array match!
@@ -623,11 +637,12 @@ typedef enum ATAFNBT
 static const PBeginTransferFunc g_apfnBeginTransFuncs[ATAFN_BT_MAX] =
 {
     NULL,
-    ataReadWriteSectorsBT,
-    ataPacketBT,
-    atapiCmdBT,
-    atapiPassthroughCmdBT,
+    ataR3ReadWriteSectorsBT,
+    ataR3PacketBT,
+    atapiR3CmdBT,
+    atapiR3PassthroughCmdBT,
 };
+# endif /* IN_RING3 */
 
 /**
  * Source/sink function indexes for g_apfnSourceSinkFuncs.
@@ -662,6 +677,7 @@ typedef enum ATAFNSS
     ATAFN_SS_MAX
 } ATAFNSS;
 
+# ifdef IN_RING3
 /**
  * Array of source/sink functions, the index is ATAFNSS.
  * Make sure ATAFNSS and this array match!
@@ -669,31 +685,32 @@ typedef enum ATAFNSS
 static const PSourceSinkFunc g_apfnSourceSinkFuncs[ATAFN_SS_MAX] =
 {
     NULL,
-    ataIdentifySS,
-    ataFlushSS,
-    ataReadSectorsSS,
-    ataWriteSectorsSS,
-    ataExecuteDeviceDiagnosticSS,
-    ataTrimSS,
-    ataPacketSS,
-    atapiGetConfigurationSS,
-    atapiGetEventStatusNotificationSS,
-    atapiIdentifySS,
-    atapiInquirySS,
-    atapiMechanismStatusSS,
-    atapiModeSenseErrorRecoverySS,
-    atapiModeSenseCDStatusSS,
-    atapiReadSS,
-    atapiReadCapacitySS,
-    atapiReadDiscInformationSS,
-    atapiReadTOCNormalSS,
-    atapiReadTOCMultiSS,
-    atapiReadTOCRawSS,
-    atapiReadTrackInformationSS,
-    atapiRequestSenseSS,
-    atapiPassthroughSS,
-    atapiReadDVDStructureSS
+    ataR3IdentifySS,
+    ataR3FlushSS,
+    ataR3ReadSectorsSS,
+    ataR3WriteSectorsSS,
+    ataR3ExecuteDeviceDiagnosticSS,
+    ataR3TrimSS,
+    ataR3PacketSS,
+    atapiR3GetConfigurationSS,
+    atapiR3GetEventStatusNotificationSS,
+    atapiR3IdentifySS,
+    atapiR3InquirySS,
+    atapiR3MechanismStatusSS,
+    atapiR3ModeSenseErrorRecoverySS,
+    atapiR3ModeSenseCDStatusSS,
+    atapiR3ReadSS,
+    atapiR3ReadCapacitySS,
+    atapiR3ReadDiscInformationSS,
+    atapiR3ReadTOCNormalSS,
+    atapiR3ReadTOCMultiSS,
+    atapiR3ReadTOCRawSS,
+    atapiR3ReadTrackInformationSS,
+    atapiR3RequestSenseSS,
+    atapiR3PassthroughSS,
+    atapiR3ReadDVDStructureSS
 };
+# endif /* IN_RING3 */
 
 
 static const ATARequest g_ataDMARequest    = { ATA_AIO_DMA,            { { 0, 0, 0, 0, 0 } } };
@@ -701,52 +718,56 @@ static const ATARequest g_ataPIORequest    = { ATA_AIO_PIO,            { { 0, 0,
 static const ATARequest g_ataResetARequest = { ATA_AIO_RESET_ASSERTED, { { 0, 0, 0, 0, 0 } } };
 static const ATARequest g_ataResetCRequest = { ATA_AIO_RESET_CLEARED,  { { 0, 0, 0, 0, 0 } } };
 
-static void ataAsyncIOClearRequests(PATACONTROLLER pCtl)
+# ifdef IN_RING3
+static void ataR3AsyncIOClearRequests(PATACONTROLLER pCtl)
 {
-    int rc;
-
-    rc = RTSemMutexRequest(pCtl->AsyncIORequestMutex, RT_INDEFINITE_WAIT);
+    int rc = PDMCritSectEnter(&pCtl->AsyncIORequestLock, VINF_SUCCESS);
     AssertRC(rc);
+
     pCtl->AsyncIOReqHead = 0;
     pCtl->AsyncIOReqTail = 0;
-    rc = RTSemMutexRelease(pCtl->AsyncIORequestMutex);
+
+    rc = PDMCritSectLeave(&pCtl->AsyncIORequestLock);
     AssertRC(rc);
 }
+# endif /* IN_RING3 */
 
-
-static void ataAsyncIOPutRequest(PATACONTROLLER pCtl, const ATARequest *pReq)
+static void ataHCAsyncIOPutRequest(PATACONTROLLER pCtl, const ATARequest *pReq)
 {
-    int rc;
-
-    rc = RTSemMutexRequest(pCtl->AsyncIORequestMutex, RT_INDEFINITE_WAIT);
+    int rc = PDMCritSectEnter(&pCtl->AsyncIORequestLock, VINF_SUCCESS);
     AssertRC(rc);
+
     Assert((pCtl->AsyncIOReqHead + 1) % RT_ELEMENTS(pCtl->aAsyncIORequests) != pCtl->AsyncIOReqTail);
     memcpy(&pCtl->aAsyncIORequests[pCtl->AsyncIOReqHead], pReq, sizeof(*pReq));
     pCtl->AsyncIOReqHead++;
     pCtl->AsyncIOReqHead %= RT_ELEMENTS(pCtl->aAsyncIORequests);
-    rc = RTSemMutexRelease(pCtl->AsyncIORequestMutex);
+
+    rc = PDMCritSectLeave(&pCtl->AsyncIORequestLock);
     AssertRC(rc);
-    rc = PDMR3CritSectScheduleExitEvent(&pCtl->lock, pCtl->AsyncIOSem);
+
+    rc = PDMHCCritSectScheduleExitEvent(&pCtl->lock, pCtl->hAsyncIOSem);
     if (RT_FAILURE(rc))
     {
-        rc = RTSemEventSignal(pCtl->AsyncIOSem);
+        rc = SUPSemEventSignal(pCtl->pSupDrvSession, pCtl->hAsyncIOSem);
         AssertRC(rc);
     }
 }
 
+# ifdef IN_RING3
 
-static const ATARequest *ataAsyncIOGetCurrentRequest(PATACONTROLLER pCtl)
+static const ATARequest *ataR3AsyncIOGetCurrentRequest(PATACONTROLLER pCtl)
 {
-    int rc;
     const ATARequest *pReq;
 
-    rc = RTSemMutexRequest(pCtl->AsyncIORequestMutex, RT_INDEFINITE_WAIT);
+    int rc = PDMCritSectEnter(&pCtl->AsyncIORequestLock, VINF_SUCCESS);
     AssertRC(rc);
+
     if (pCtl->AsyncIOReqHead != pCtl->AsyncIOReqTail)
         pReq = &pCtl->aAsyncIORequests[pCtl->AsyncIOReqTail];
     else
         pReq = NULL;
-    rc = RTSemMutexRelease(pCtl->AsyncIORequestMutex);
+
+    rc = PDMCritSectLeave(&pCtl->AsyncIORequestLock);
     AssertRC(rc);
     return pReq;
 }
@@ -760,18 +781,18 @@ static const ATARequest *ataAsyncIOGetCurrentRequest(PATACONTROLLER pCtl)
  * @param pCtl      Controller for which to remove the request.
  * @param ReqType   Type of the request to remove.
  */
-static void ataAsyncIORemoveCurrentRequest(PATACONTROLLER pCtl, ATAAIO ReqType)
+static void ataR3AsyncIORemoveCurrentRequest(PATACONTROLLER pCtl, ATAAIO ReqType)
 {
-    int rc;
-
-    rc = RTSemMutexRequest(pCtl->AsyncIORequestMutex, RT_INDEFINITE_WAIT);
+    int rc = PDMCritSectEnter(&pCtl->AsyncIORequestLock, VINF_SUCCESS);
     AssertRC(rc);
+
     if (pCtl->AsyncIOReqHead != pCtl->AsyncIOReqTail && pCtl->aAsyncIORequests[pCtl->AsyncIOReqTail].ReqType == ReqType)
     {
         pCtl->AsyncIOReqTail++;
         pCtl->AsyncIOReqTail %= RT_ELEMENTS(pCtl->aAsyncIORequests);
     }
-    rc = RTSemMutexRelease(pCtl->AsyncIORequestMutex);
+
+    rc = PDMCritSectLeave(&pCtl->AsyncIORequestLock);
     AssertRC(rc);
 }
 
@@ -783,15 +804,13 @@ static void ataAsyncIORemoveCurrentRequest(PATACONTROLLER pCtl, ATAAIO ReqType)
  *
  * @param pCtl      Controller for which to dump the queue.
  */
-static void ataAsyncIODumpRequests(PATACONTROLLER pCtl)
+static void ataR3AsyncIODumpRequests(PATACONTROLLER pCtl)
 {
-    int rc;
-    uint8_t curr;
-
-    rc = RTSemMutexRequest(pCtl->AsyncIORequestMutex, RT_INDEFINITE_WAIT);
+    int rc = PDMCritSectEnter(&pCtl->AsyncIORequestLock, VINF_SUCCESS);
     AssertRC(rc);
+
     LogRel(("PIIX3 ATA: Ctl#%d: request queue dump (topmost is current):\n", ATACONTROLLER_IDX(pCtl)));
-    curr = pCtl->AsyncIOReqTail;
+    uint8_t curr = pCtl->AsyncIOReqTail;
     do
     {
         if (curr == pCtl->AsyncIOReqHead)
@@ -821,7 +840,8 @@ static void ataAsyncIODumpRequests(PATACONTROLLER pCtl)
         }
         curr = (curr + 1) % RT_ELEMENTS(pCtl->aAsyncIORequests);
     } while (curr != pCtl->AsyncIOReqTail);
-    rc = RTSemMutexRelease(pCtl->AsyncIORequestMutex);
+
+    rc = PDMCritSectLeave(&pCtl->AsyncIORequestLock);
     AssertRC(rc);
 }
 
@@ -833,19 +853,18 @@ static void ataAsyncIODumpRequests(PATACONTROLLER pCtl)
  * @param pCtl      Controller for which to check the queue.
  * @param fStrict   If set then the controller is checked to be idle.
  */
-static bool ataAsyncIOIsIdle(PATACONTROLLER pCtl, bool fStrict)
+static bool ataR3AsyncIOIsIdle(PATACONTROLLER pCtl, bool fStrict)
 {
-    int rc;
-    bool fIdle;
-
-    rc = RTSemMutexRequest(pCtl->AsyncIORequestMutex, RT_INDEFINITE_WAIT);
+    int rc = PDMCritSectEnter(&pCtl->AsyncIORequestLock, VINF_SUCCESS);
     AssertRC(rc);
-    fIdle = pCtl->fRedoIdle;
+
+    bool fIdle = pCtl->fRedoIdle;
     if (!fIdle)
         fIdle = (pCtl->AsyncIOReqHead == pCtl->AsyncIOReqTail);
     if (fStrict)
         fIdle &= (pCtl->uAsyncIOState == ATA_AIO_NEW);
-    rc = RTSemMutexRelease(pCtl->AsyncIORequestMutex);
+
+    rc = PDMCritSectLeave(&pCtl->AsyncIORequestLock);
     AssertRC(rc);
     return fIdle;
 }
@@ -861,7 +880,8 @@ static bool ataAsyncIOIsIdle(PATACONTROLLER pCtl, bool fStrict)
  * @param   iSourceSink         Index of SourceSink callback.
  * @param   fChainedTransfer    Whether this is a transfer that is part of the previous command/transfer.
  */
-static void ataStartTransfer(ATADevState *s, uint32_t cbTotalTransfer, uint8_t uTxDir, ATAFNBT iBeginTransfer, ATAFNSS iSourceSink, bool fChainedTransfer)
+static void ataR3StartTransfer(ATADevState *s, uint32_t cbTotalTransfer, uint8_t uTxDir, ATAFNBT iBeginTransfer,
+                               ATAFNSS iSourceSink, bool fChainedTransfer)
 {
     PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
     ATARequest Req;
@@ -878,7 +898,7 @@ static void ataStartTransfer(ATADevState *s, uint32_t cbTotalTransfer, uint8_t u
     /* If the controller is already doing something else right now, ignore
      * the command that is being submitted. Some broken guests issue commands
      * twice (e.g. the Linux kernel that comes with Acronis True Image 8). */
-    if (!fChainedTransfer && !ataAsyncIOIsIdle(pCtl, true /*fStrict*/))
+    if (!fChainedTransfer && !ataR3AsyncIOIsIdle(pCtl, true /*fStrict*/))
     {
         Log(("%s: Ctl#%d: ignored command %#04x, controller state %d\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl), s->uATARegCommand, pCtl->uAsyncIOState));
         LogRel(("PIIX3 IDE: guest issued command %#04x while controller busy\n", s->uATARegCommand));
@@ -901,7 +921,7 @@ static void ataStartTransfer(ATADevState *s, uint32_t cbTotalTransfer, uint8_t u
      * Kick the worker thread into action.
      */
     Log2(("%s: Ctl#%d: message to async I/O thread, new request\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl)));
-    ataAsyncIOPutRequest(pCtl, &Req);
+    ataHCAsyncIOPutRequest(pCtl, &Req);
 }
 
 
@@ -911,7 +931,7 @@ static void ataStartTransfer(ATADevState *s, uint32_t cbTotalTransfer, uint8_t u
  * @param   s           Pointer to the ATA device state data.
  * @param   fResetDrive Whether to reset the drive or just abort a command.
  */
-static void ataAbortCurrentCommand(ATADevState *s, bool fResetDrive)
+static void ataR3AbortCurrentCommand(ATADevState *s, bool fResetDrive)
 {
     PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
     ATARequest Req;
@@ -930,11 +950,11 @@ static void ataAbortCurrentCommand(ATADevState *s, bool fResetDrive)
     Req.u.a.fResetDrive = fResetDrive;
     ataSetStatus(s, ATA_STAT_BUSY);
     Log2(("%s: Ctl#%d: message to async I/O thread, abort command on LUN#%d\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl), s->iLUN));
-    ataAsyncIOPutRequest(pCtl, &Req);
+    ataHCAsyncIOPutRequest(pCtl, &Req);
 }
+# endif /* IN_RING3 */
 
-
-static void ataSetIRQ(ATADevState *s)
+static void ataHCSetIRQ(ATADevState *s)
 {
     PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
     PPDMDEVINS pDevIns = ATADEVSTATE_2_DEVINS(s);
@@ -960,7 +980,7 @@ static void ataSetIRQ(ATADevState *s)
     s->fIrqPending = true;
 }
 
-#endif /* IN_RING3 */
+#endif /* IN_RING0 || IN_RING3 */
 
 static void ataUnsetIRQ(ATADevState *s)
 {
@@ -982,9 +1002,9 @@ static void ataUnsetIRQ(ATADevState *s)
     s->fIrqPending = false;
 }
 
-#ifdef IN_RING3
+#if defined(IN_RING0) || defined(IN_RING3)
 
-static void ataPIOTransferStart(ATADevState *s, uint32_t start, uint32_t size)
+static void ataHCPIOTransferStart(ATADevState *s, uint32_t start, uint32_t size)
 {
     Log2(("%s: LUN#%d start %d size %d\n", __FUNCTION__, s->iLUN, start, size));
     s->iIOBufferPIODataStart = start;
@@ -994,14 +1014,14 @@ static void ataPIOTransferStart(ATADevState *s, uint32_t start, uint32_t size)
 }
 
 
-static void ataPIOTransferStop(ATADevState *s)
+static void ataHCPIOTransferStop(ATADevState *s)
 {
     Log2(("%s: LUN#%d\n", __FUNCTION__, s->iLUN));
     if (s->fATAPITransfer)
     {
         s->uATARegNSector = (s->uATARegNSector & ~7) | ATAPI_INT_REASON_IO | ATAPI_INT_REASON_CD;
         Log2(("%s: interrupt reason %#04x\n", __FUNCTION__, s->uATARegNSector));
-        ataSetIRQ(s);
+        ataHCSetIRQ(s);
         s->fATAPITransfer = false;
     }
     s->cbTotalTransfer = 0;
@@ -1013,7 +1033,7 @@ static void ataPIOTransferStop(ATADevState *s)
 }
 
 
-static void ataPIOTransferLimitATAPI(ATADevState *s)
+static void ataHCPIOTransferLimitATAPI(ATADevState *s)
 {
     uint32_t cbLimit, cbTransfer;
 
@@ -1037,8 +1057,9 @@ static void ataPIOTransferLimitATAPI(ATADevState *s)
     s->cbElementaryTransfer = cbTransfer;
 }
 
+# ifdef IN_RING3
 
-static uint32_t ataGetNSectors(ATADevState *s)
+static uint32_t ataR3GetNSectors(ATADevState *s)
 {
     /* 0 means either 256 (LBA28) or 65536 (LBA48) sectors. */
     if (s->fLBA48)
@@ -1058,7 +1079,7 @@ static uint32_t ataGetNSectors(ATADevState *s)
 }
 
 
-static void ataPadString(uint8_t *pbDst, const char *pbSrc, uint32_t cbSize)
+static void ataR3PadString(uint8_t *pbDst, const char *pbSrc, uint32_t cbSize)
 {
     for (uint32_t i = 0; i < cbSize; i++)
     {
@@ -1070,7 +1091,7 @@ static void ataPadString(uint8_t *pbDst, const char *pbSrc, uint32_t cbSize)
 }
 
 
-static void ataSCSIPadStr(uint8_t *pbDst, const char *pbSrc, uint32_t cbSize)
+static void ataR3SCSIPadStr(uint8_t *pbDst, const char *pbSrc, uint32_t cbSize)
 {
     for (uint32_t i = 0; i < cbSize; i++)
     {
@@ -1166,14 +1187,14 @@ DECLINLINE(int) atapiCmpMSF(const uint8_t *pbMSF1, const uint8_t *pbMSF2)
     return iRes;
 }
 
-static void ataCmdOK(ATADevState *s, uint8_t status)
+static void ataR3CmdOK(ATADevState *s, uint8_t status)
 {
     s->uATARegError = 0; /* Not needed by ATA spec, but cannot hurt. */
     ataSetStatusValue(s, ATA_STAT_READY | status);
 }
 
 
-static void ataCmdError(ATADevState *s, uint8_t uErrorCode)
+static void ataR3CmdError(ATADevState *s, uint8_t uErrorCode)
 {
     Log(("%s: code=%#x\n", __FUNCTION__, uErrorCode));
     Assert(uErrorCode);
@@ -1188,7 +1209,7 @@ static void ataCmdError(ATADevState *s, uint8_t uErrorCode)
     s->iSourceSink = ATAFN_SS_NULL;
 }
 
-static uint32_t ataChecksum(void* ptr, size_t count)
+static uint32_t ataR3Checksum(void* ptr, size_t count)
 {
     uint8_t u8Sum = 0xa5, *p = (uint8_t*)ptr;
     size_t i;
@@ -1201,7 +1222,7 @@ static uint32_t ataChecksum(void* ptr, size_t count)
     return (uint8_t)-(int32_t)u8Sum;
 }
 
-static bool ataIdentifySS(ATADevState *s)
+static bool ataR3IdentifySS(ATADevState *s)
 {
     uint16_t *p;
 
@@ -1216,15 +1237,15 @@ static bool ataIdentifySS(ATADevState *s)
     /* Block size; obsolete, but required for the BIOS. */
     p[5] = RT_H2LE_U16(s->cbSector);
     p[6] = RT_H2LE_U16(s->PCHSGeometry.cSectors);
-    ataPadString((uint8_t *)(p + 10), s->szSerialNumber, ATA_SERIAL_NUMBER_LENGTH); /* serial number */
+    ataR3PadString((uint8_t *)(p + 10), s->szSerialNumber, ATA_SERIAL_NUMBER_LENGTH); /* serial number */
     p[20] = RT_H2LE_U16(3); /* XXX: retired, cache type */
     p[21] = RT_H2LE_U16(512); /* XXX: retired, cache size in sectors */
     p[22] = RT_H2LE_U16(0); /* ECC bytes per sector */
-    ataPadString((uint8_t *)(p + 23), s->szFirmwareRevision, ATA_FIRMWARE_REVISION_LENGTH); /* firmware version */
-    ataPadString((uint8_t *)(p + 27), s->szModelNumber, ATA_MODEL_NUMBER_LENGTH); /* model */
-#if ATA_MAX_MULT_SECTORS > 1
+    ataR3PadString((uint8_t *)(p + 23), s->szFirmwareRevision, ATA_FIRMWARE_REVISION_LENGTH); /* firmware version */
+    ataR3PadString((uint8_t *)(p + 27), s->szModelNumber, ATA_MODEL_NUMBER_LENGTH); /* model */
+# if ATA_MAX_MULT_SECTORS > 1
     p[47] = RT_H2LE_U16(0x8000 | ATA_MAX_MULT_SECTORS);
-#endif
+# endif
     p[48] = RT_H2LE_U16(1); /* dword I/O, used by the BIOS */
     p[49] = RT_H2LE_U16(1 << 11 | 1 << 9 | 1 << 8); /* DMA and LBA supported */
     p[50] = RT_H2LE_U16(1 << 14); /* No drive specific standby timer minimum */
@@ -1306,15 +1327,15 @@ static bool ataIdentifySS(ATADevState *s)
         p[169] = RT_H2LE_U16(1); /* DATA SET MANAGEMENT command supported. */
     if (s->fNonRotational)
         p[217] = RT_H2LE_U16(1); /* Non-rotational medium */
-    uint32_t uCsum = ataChecksum(p, 510);
+    uint32_t uCsum = ataR3Checksum(p, 510);
     p[255] = RT_H2LE_U16(0xa5 | (uCsum << 8)); /* Integrity word */
     s->iSourceSink = ATAFN_SS_NULL;
-    ataCmdOK(s, ATA_STAT_SEEK);
+    ataR3CmdOK(s, ATA_STAT_SEEK);
     return false;
 }
 
 
-static bool ataFlushSS(ATADevState *s)
+static bool ataR3FlushSS(ATADevState *s)
 {
     PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
     int rc;
@@ -1332,11 +1353,11 @@ static bool ataFlushSS(ATADevState *s)
     STAM_PROFILE_START(&pCtl->StatLockWait, a);
     PDMCritSectEnter(&pCtl->lock, VINF_SUCCESS);
     STAM_PROFILE_STOP(&pCtl->StatLockWait, a);
-    ataCmdOK(s, 0);
+    ataR3CmdOK(s, 0);
     return false;
 }
 
-static bool atapiIdentifySS(ATADevState *s)
+static bool atapiR3IdentifySS(ATADevState *s)
 {
     uint16_t *p;
 
@@ -1347,11 +1368,11 @@ static bool atapiIdentifySS(ATADevState *s)
     memset(p, 0, 512);
     /* Removable CDROM, 3ms response, 12 byte packets */
     p[0] = RT_H2LE_U16(2 << 14 | 5 << 8 | 1 << 7 | 0 << 5 | 0 << 0);
-    ataPadString((uint8_t *)(p + 10), s->szSerialNumber, ATA_SERIAL_NUMBER_LENGTH); /* serial number */
+    ataR3PadString((uint8_t *)(p + 10), s->szSerialNumber, ATA_SERIAL_NUMBER_LENGTH); /* serial number */
     p[20] = RT_H2LE_U16(3); /* XXX: retired, cache type */
     p[21] = RT_H2LE_U16(512); /* XXX: retired, cache size in sectors */
-    ataPadString((uint8_t *)(p + 23), s->szFirmwareRevision, ATA_FIRMWARE_REVISION_LENGTH); /* firmware version */
-    ataPadString((uint8_t *)(p + 27), s->szModelNumber, ATA_MODEL_NUMBER_LENGTH); /* model */
+    ataR3PadString((uint8_t *)(p + 23), s->szFirmwareRevision, ATA_FIRMWARE_REVISION_LENGTH); /* firmware version */
+    ataR3PadString((uint8_t *)(p + 27), s->szModelNumber, ATA_MODEL_NUMBER_LENGTH); /* model */
     p[49] = RT_H2LE_U16(1 << 11 | 1 << 9 | 1 << 8); /* DMA and LBA supported */
     p[50] = RT_H2LE_U16(1 << 14);  /* No drive specific standby timer minimum */
     p[51] = RT_H2LE_U16(240); /* PIO transfer cycle */
@@ -1389,16 +1410,16 @@ static bool atapiIdentifySS(ATADevState *s)
      * and overflow shall be ignored.
      * The sum of all 512 bytes is zero when the checksum is correct.
      */
-    uint32_t uCsum = ataChecksum(p, 510);
+    uint32_t uCsum = ataR3Checksum(p, 510);
     p[255] = RT_H2LE_U16(0xa5 | (uCsum << 8)); /* Integrity word */
 
     s->iSourceSink = ATAFN_SS_NULL;
-    ataCmdOK(s, ATA_STAT_SEEK);
+    ataR3CmdOK(s, ATA_STAT_SEEK);
     return false;
 }
 
 
-static void ataSetSignature(ATADevState *s)
+static void ataR3SetSignature(ATADevState *s)
 {
     s->uATARegSelect &= 0xf0; /* clear head */
     /* put signature */
@@ -1422,7 +1443,7 @@ static void ataSetSignature(ATADevState *s)
 }
 
 
-static uint64_t ataGetSector(ATADevState *s)
+static uint64_t ataR3GetSector(ATADevState *s)
 {
     uint64_t iLBA;
     if (s->uATARegSelect & 0x40)
@@ -1455,7 +1476,7 @@ static uint64_t ataGetSector(ATADevState *s)
     return iLBA;
 }
 
-static void ataSetSector(ATADevState *s, uint64_t iLBA)
+static void ataR3SetSector(ATADevState *s, uint64_t iLBA)
 {
     uint32_t cyl, r;
     if (s->uATARegSelect & 0x40)
@@ -1493,7 +1514,7 @@ static void ataSetSector(ATADevState *s, uint64_t iLBA)
 }
 
 
-static void ataWarningDiskFull(PPDMDEVINS pDevIns)
+static void ataR3WarningDiskFull(PPDMDEVINS pDevIns)
 {
     int rc;
     LogRel(("PIIX3 ATA: Host disk full\n"));
@@ -1502,7 +1523,7 @@ static void ataWarningDiskFull(PPDMDEVINS pDevIns)
     AssertRC(rc);
 }
 
-static void ataWarningFileTooBig(PPDMDEVINS pDevIns)
+static void ataR3WarningFileTooBig(PPDMDEVINS pDevIns)
 {
     int rc;
     LogRel(("PIIX3 ATA: File too big\n"));
@@ -1511,7 +1532,7 @@ static void ataWarningFileTooBig(PPDMDEVINS pDevIns)
     AssertRC(rc);
 }
 
-static void ataWarningISCSI(PPDMDEVINS pDevIns)
+static void ataR3WarningISCSI(PPDMDEVINS pDevIns)
 {
     int rc;
     LogRel(("PIIX3 ATA: iSCSI target unavailable\n"));
@@ -1520,20 +1541,20 @@ static void ataWarningISCSI(PPDMDEVINS pDevIns)
     AssertRC(rc);
 }
 
-static bool ataIsRedoSetWarning(ATADevState *s, int rc)
+static bool ataR3IsRedoSetWarning(ATADevState *s, int rc)
 {
     PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
     Assert(!PDMCritSectIsOwner(&pCtl->lock));
     if (rc == VERR_DISK_FULL)
     {
         pCtl->fRedoIdle = true;
-        ataWarningDiskFull(ATADEVSTATE_2_DEVINS(s));
+        ataR3WarningDiskFull(ATADEVSTATE_2_DEVINS(s));
         return true;
     }
     if (rc == VERR_FILE_TOO_BIG)
     {
         pCtl->fRedoIdle = true;
-        ataWarningFileTooBig(ATADEVSTATE_2_DEVINS(s));
+        ataR3WarningFileTooBig(ATADEVSTATE_2_DEVINS(s));
         return true;
     }
     if (rc == VERR_BROKEN_PIPE || rc == VERR_NET_CONNECTION_REFUSED)
@@ -1541,7 +1562,7 @@ static bool ataIsRedoSetWarning(ATADevState *s, int rc)
         pCtl->fRedoIdle = true;
         /* iSCSI connection abort (first error) or failure to reestablish
          * connection (second error). Pause VM. On resume we'll retry. */
-        ataWarningISCSI(ATADEVSTATE_2_DEVINS(s));
+        ataR3WarningISCSI(ATADEVSTATE_2_DEVINS(s));
         return true;
     }
     if (rc == VERR_VD_DEK_MISSING)
@@ -1555,8 +1576,8 @@ static bool ataIsRedoSetWarning(ATADevState *s, int rc)
 }
 
 
-static int ataReadSectors(ATADevState *s, uint64_t u64Sector, void *pvBuf,
-                          uint32_t cSectors, bool *pfRedo)
+static int ataR3ReadSectors(ATADevState *s, uint64_t u64Sector, void *pvBuf,
+                            uint32_t cSectors, bool *pfRedo)
 {
     PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
     int rc;
@@ -1568,7 +1589,7 @@ static int ataReadSectors(ATADevState *s, uint64_t u64Sector, void *pvBuf,
     rc = s->pDrvBlock->pfnRead(s->pDrvBlock, u64Sector * s->cbSector, pvBuf, cSectors * s->cbSector);
     s->Led.Actual.s.fReading = 0;
     STAM_PROFILE_ADV_STOP(&s->StatReads, r);
-    Log4(("ataReadSectors: rc=%Rrc cSectors=%#x u64Sector=%llu\n%.*Rhxd\n",
+    Log4(("ataR3ReadSectors: rc=%Rrc cSectors=%#x u64Sector=%llu\n%.*Rhxd\n",
           rc, cSectors, u64Sector, cSectors * s->cbSector, pvBuf));
 
     STAM_REL_COUNTER_ADD(&s->StatBytesRead, cSectors * s->cbSector);
@@ -1576,7 +1597,7 @@ static int ataReadSectors(ATADevState *s, uint64_t u64Sector, void *pvBuf,
     if (RT_SUCCESS(rc))
         *pfRedo = false;
     else
-        *pfRedo = ataIsRedoSetWarning(s, rc);
+        *pfRedo = ataR3IsRedoSetWarning(s, rc);
 
     STAM_PROFILE_START(&pCtl->StatLockWait, a);
     PDMCritSectEnter(&pCtl->lock, VINF_SUCCESS);
@@ -1585,8 +1606,8 @@ static int ataReadSectors(ATADevState *s, uint64_t u64Sector, void *pvBuf,
 }
 
 
-static int ataWriteSectors(ATADevState *s, uint64_t u64Sector,
-                           const void *pvBuf, uint32_t cSectors, bool *pfRedo)
+static int ataR3WriteSectors(ATADevState *s, uint64_t u64Sector,
+                             const void *pvBuf, uint32_t cSectors, bool *pfRedo)
 {
     PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
     int rc;
@@ -1595,18 +1616,18 @@ static int ataWriteSectors(ATADevState *s, uint64_t u64Sector,
 
     STAM_PROFILE_ADV_START(&s->StatWrites, w);
     s->Led.Asserted.s.fWriting = s->Led.Actual.s.fWriting = 1;
-#ifdef VBOX_INSTRUMENT_DMA_WRITES
+# ifdef VBOX_INSTRUMENT_DMA_WRITES
     if (s->fDMA)
         STAM_PROFILE_ADV_START(&s->StatInstrVDWrites, vw);
-#endif
+# endif
     rc = s->pDrvBlock->pfnWrite(s->pDrvBlock, u64Sector * s->cbSector, pvBuf, cSectors * s->cbSector);
-#ifdef VBOX_INSTRUMENT_DMA_WRITES
+# ifdef VBOX_INSTRUMENT_DMA_WRITES
     if (s->fDMA)
         STAM_PROFILE_ADV_STOP(&s->StatInstrVDWrites, vw);
-#endif
+# endif
     s->Led.Actual.s.fWriting = 0;
     STAM_PROFILE_ADV_STOP(&s->StatWrites, w);
-    Log4(("ataWriteSectors: rc=%Rrc cSectors=%#x u64Sector=%llu\n%.*Rhxd\n",
+    Log4(("ataR3WriteSectors: rc=%Rrc cSectors=%#x u64Sector=%llu\n%.*Rhxd\n",
           rc, cSectors, u64Sector, cSectors * s->cbSector, pvBuf));
 
     STAM_REL_COUNTER_ADD(&s->StatBytesWritten, cSectors * s->cbSector);
@@ -1614,7 +1635,7 @@ static int ataWriteSectors(ATADevState *s, uint64_t u64Sector,
     if (RT_SUCCESS(rc))
         *pfRedo = false;
     else
-        *pfRedo = ataIsRedoSetWarning(s, rc);
+        *pfRedo = ataR3IsRedoSetWarning(s, rc);
 
     STAM_PROFILE_START(&pCtl->StatLockWait, a);
     PDMCritSectEnter(&pCtl->lock, VINF_SUCCESS);
@@ -1623,7 +1644,7 @@ static int ataWriteSectors(ATADevState *s, uint64_t u64Sector,
 }
 
 
-static void ataReadWriteSectorsBT(ATADevState *s)
+static void ataR3ReadWriteSectorsBT(ATADevState *s)
 {
     uint32_t cSectors;
 
@@ -1633,11 +1654,11 @@ static void ataReadWriteSectorsBT(ATADevState *s)
     else
         s->cbElementaryTransfer = cSectors * s->cbSector;
     if (s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE)
-        ataCmdOK(s, 0);
+        ataR3CmdOK(s, 0);
 }
 
 
-static bool ataReadSectorsSS(ATADevState *s)
+static bool ataR3ReadSectorsSS(ATADevState *s)
 {
     int rc;
     uint32_t cSectors;
@@ -1646,15 +1667,15 @@ static bool ataReadSectorsSS(ATADevState *s)
 
     cSectors = s->cbElementaryTransfer / s->cbSector;
     Assert(cSectors);
-    iLBA = ataGetSector(s);
+    iLBA = ataR3GetSector(s);
     Log(("%s: %d sectors at LBA %d\n", __FUNCTION__, cSectors, iLBA));
-    rc = ataReadSectors(s, iLBA, s->CTX_SUFF(pbIOBuffer), cSectors, &fRedo);
+    rc = ataR3ReadSectors(s, iLBA, s->CTX_SUFF(pbIOBuffer), cSectors, &fRedo);
     if (RT_SUCCESS(rc))
     {
-        ataSetSector(s, iLBA + cSectors);
+        ataR3SetSector(s, iLBA + cSectors);
         if (s->cbElementaryTransfer == s->cbTotalTransfer)
             s->iSourceSink = ATAFN_SS_NULL;
-        ataCmdOK(s, ATA_STAT_SEEK);
+        ataR3CmdOK(s, ATA_STAT_SEEK);
     }
     else
     {
@@ -1669,13 +1690,13 @@ static bool ataReadSectorsSS(ATADevState *s)
          * because the request was aborted.
          */
         if (rc != VERR_INTERRUPTED)
-            ataCmdError(s, ID_ERR);
+            ataR3CmdError(s, ID_ERR);
     }
     return false;
 }
 
 
-static bool ataWriteSectorsSS(ATADevState *s)
+static bool ataR3WriteSectorsSS(ATADevState *s)
 {
     int rc;
     uint32_t cSectors;
@@ -1684,15 +1705,15 @@ static bool ataWriteSectorsSS(ATADevState *s)
 
     cSectors = s->cbElementaryTransfer / s->cbSector;
     Assert(cSectors);
-    iLBA = ataGetSector(s);
+    iLBA = ataR3GetSector(s);
     Log(("%s: %d sectors at LBA %d\n", __FUNCTION__, cSectors, iLBA));
-    rc = ataWriteSectors(s, iLBA, s->CTX_SUFF(pbIOBuffer), cSectors, &fRedo);
+    rc = ataR3WriteSectors(s, iLBA, s->CTX_SUFF(pbIOBuffer), cSectors, &fRedo);
     if (RT_SUCCESS(rc))
     {
-        ataSetSector(s, iLBA + cSectors);
+        ataR3SetSector(s, iLBA + cSectors);
         if (!s->cbTotalTransfer)
             s->iSourceSink = ATAFN_SS_NULL;
-        ataCmdOK(s, ATA_STAT_SEEK);
+        ataR3CmdOK(s, ATA_STAT_SEEK);
     }
     else
     {
@@ -1707,13 +1728,13 @@ static bool ataWriteSectorsSS(ATADevState *s)
          * because the request was aborted.
          */
         if (rc != VERR_INTERRUPTED)
-            ataCmdError(s, ID_ERR);
+            ataR3CmdError(s, ID_ERR);
     }
     return false;
 }
 
 
-static void atapiCmdOK(ATADevState *s)
+static void atapiR3CmdOK(ATADevState *s)
 {
     s->uATARegError = 0;
     ataSetStatusValue(s, ATA_STAT_READY);
@@ -1728,7 +1749,7 @@ static void atapiCmdOK(ATADevState *s)
 }
 
 
-static void atapiCmdError(ATADevState *s, const uint8_t *pabATAPISense, size_t cbATAPISense)
+static void atapiR3CmdError(ATADevState *s, const uint8_t *pabATAPISense, size_t cbATAPISense)
 {
     Log(("%s: sense=%#x (%s) asc=%#x ascq=%#x (%s)\n", __FUNCTION__, pabATAPISense[2] & 0x0f, SCSISenseText(pabATAPISense[2] & 0x0f),
              pabATAPISense[12], pabATAPISense[13], SCSISenseExtText(pabATAPISense[12], pabATAPISense[13])));
@@ -1750,8 +1771,8 @@ static void atapiCmdError(ATADevState *s, const uint8_t *pabATAPISense, size_t c
 
 
 /** @todo deprecated function - doesn't provide enough info. Replace by direct
- * calls to atapiCmdError()  with full data. */
-static void atapiCmdErrorSimple(ATADevState *s, uint8_t uATAPISenseKey, uint8_t uATAPIASC)
+ * calls to atapiR3CmdError()  with full data. */
+static void atapiR3CmdErrorSimple(ATADevState *s, uint8_t uATAPISenseKey, uint8_t uATAPIASC)
 {
     uint8_t abATAPISense[ATAPI_SENSE_SIZE];
     memset(abATAPISense, '\0', sizeof(abATAPISense));
@@ -1759,28 +1780,28 @@ static void atapiCmdErrorSimple(ATADevState *s, uint8_t uATAPISenseKey, uint8_t
     abATAPISense[2] = uATAPISenseKey & 0x0f;
     abATAPISense[7] = 10;
     abATAPISense[12] = uATAPIASC;
-    atapiCmdError(s, abATAPISense, sizeof(abATAPISense));
+    atapiR3CmdError(s, abATAPISense, sizeof(abATAPISense));
 }
 
 
-static void atapiCmdBT(ATADevState *s)
+static void atapiR3CmdBT(ATADevState *s)
 {
     s->fATAPITransfer = true;
     s->cbElementaryTransfer = s->cbTotalTransfer;
     s->cbAtapiPassthroughTransfer = s->cbTotalTransfer;
     s->cbPIOTransferLimit = s->uATARegLCyl | (s->uATARegHCyl << 8);
     if (s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE)
-        atapiCmdOK(s);
+        atapiR3CmdOK(s);
 }
 
 
-static void atapiPassthroughCmdBT(ATADevState *s)
+static void atapiR3PassthroughCmdBT(ATADevState *s)
 {
-    /* @todo implement an algorithm for correctly determining the read and
+    /** @todo implement an algorithm for correctly determining the read and
      * write sector size without sending additional commands to the drive.
      * This should be doable by saving processing the configuration requests
      * and replies. */
-#if 0
+# if 0
     if (s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE)
     {
         uint8_t cmd = s->aATAPICmd[0];
@@ -1806,7 +1827,7 @@ static void atapiPassthroughCmdBT(ATADevState *s)
             rc = s->pDrvBlock->pfnSendCmd(s->pDrvBlock, aModeSenseCmd, PDMBLOCKTXDIR_FROM_DEVICE, aModeSenseResult, &cbTransfer, &uDummySense, 500);
             if (RT_FAILURE(rc))
             {
-                atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_NONE);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_NONE);
                 return;
             }
             /* Select sector size based on the current data block type. */
@@ -1847,12 +1868,11 @@ static void atapiPassthroughCmdBT(ATADevState *s)
                 s->uTxDir = PDMBLOCKTXDIR_NONE;
         }
     }
-#endif
-    atapiCmdBT(s);
+# endif
+    atapiR3CmdBT(s);
 }
 
-
-static bool atapiReadSS(ATADevState *s)
+static bool atapiR3ReadSS(ATADevState *s)
 {
     PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
     int rc = VINF_SUCCESS;
@@ -1924,7 +1944,7 @@ static bool atapiReadSS(ATADevState *s)
         s->cbElementaryTransfer = cbTransfer;
         if (cbTransfer >= s->cbTotalTransfer)
             s->iSourceSink = ATAFN_SS_NULL;
-        atapiCmdOK(s);
+        atapiR3CmdOK(s);
         s->iATAPILBA += cSectors;
     }
     else
@@ -1937,7 +1957,7 @@ static bool atapiReadSS(ATADevState *s)
          * because the request was aborted.
          */
         if (rc != VERR_INTERRUPTED)
-            atapiCmdErrorSimple(s, SCSI_SENSE_MEDIUM_ERROR, SCSI_ASC_READ_ERROR);
+            atapiR3CmdErrorSimple(s, SCSI_SENSE_MEDIUM_ERROR, SCSI_ASC_READ_ERROR);
     }
     return false;
 }
@@ -1945,12 +1965,12 @@ static bool atapiReadSS(ATADevState *s)
 /**
  * Sets the given media track type.
  */
-static uint32_t ataMediumTypeSet(ATADevState *s, uint32_t MediaTrackType)
+static uint32_t ataR3MediumTypeSet(ATADevState *s, uint32_t MediaTrackType)
 {
     return ASMAtomicXchgU32(&s->MediaTrackType, MediaTrackType);
 }
 
-static bool atapiPassthroughSS(ATADevState *s)
+static bool atapiR3PassthroughSS(ATADevState *s)
 {
     PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
     int rc = VINF_SUCCESS;
@@ -1981,7 +2001,7 @@ static bool atapiPassthroughSS(ATADevState *s)
 
     PDMCritSectLeave(&pCtl->lock);
 
-#if defined(LOG_ENABLED)
+# if defined(LOG_ENABLED)
     char szBuf[1024];
 
     memset(szBuf, 0, sizeof(szBuf));
@@ -2008,7 +2028,7 @@ static bool atapiPassthroughSS(ATADevState *s)
     }
 
     Log2(("%s\n", szBuf));
-#endif
+# endif
 
     if (pProf) { STAM_PROFILE_ADV_START(pProf, b); }
     if (   cbTransfer > SCSI_MAX_BUFFER_SIZE
@@ -2051,7 +2071,7 @@ static bool atapiPassthroughSS(ATADevState *s)
                 AssertMsgFailed(("Don't know how to split command %#04x\n", s->aATAPICmd[0]));
                 if (s->cErrors++ < MAX_LOG_REL_ERRORS)
                     LogRel(("PIIX3 ATA: LUN#%d: CD-ROM passthrough split error\n", s->iLUN));
-                atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
                 {
                 STAM_PROFILE_START(&pCtl->StatLockWait, a);
                 PDMCritSectEnter(&pCtl->lock, VINF_SUCCESS);
@@ -2126,7 +2146,7 @@ static bool atapiPassthroughSS(ATADevState *s)
                     AssertMsgFailed(("Don't know how to split command %#04x\n", s->aATAPICmd[0]));
                     if (s->cErrors++ < MAX_LOG_REL_ERRORS)
                         LogRel(("PIIX3 ATA: LUN#%d: CD-ROM passthrough split error\n", s->iLUN));
-                    atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
+                    atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
                     return false;
             }
         }
@@ -2189,10 +2209,10 @@ static bool atapiPassthroughSS(ATADevState *s)
              * Reply with the same amount of data as the real drive
              * but only if the command wasn't split.
              */
-#if 0   //@todo: This destroys commands where cbTotalTransfer > cbIOBuffer
+# if 0  /// @todo This destroys commands where cbTotalTransfer > cbIOBuffer
             if (s->cbElementaryTransfer < s->cbIOBuffer)
                 s->cbTotalTransfer = cbTransfer;
-#endif
+# endif
 
             if (   s->aATAPICmd[0] == SCSI_INQUIRY
                 && s->fOverwriteInquiry)
@@ -2201,9 +2221,9 @@ static bool atapiPassthroughSS(ATADevState *s)
                  * Motivation: changing the VM configuration should be as
                  *             invisible as possible to the guest. */
                 Log3(("ATAPI PT inquiry data before (%d): %.*Rhxs\n", cbTransfer, cbTransfer, s->CTX_SUFF(pbIOBuffer)));
-                ataSCSIPadStr(s->CTX_SUFF(pbIOBuffer) + 8, "VBOX", 8);
-                ataSCSIPadStr(s->CTX_SUFF(pbIOBuffer) + 16, "CD-ROM", 16);
-                ataSCSIPadStr(s->CTX_SUFF(pbIOBuffer) + 32, "1.0", 4);
+                ataR3SCSIPadStr(s->CTX_SUFF(pbIOBuffer) + 8, "VBOX", 8);
+                ataR3SCSIPadStr(s->CTX_SUFF(pbIOBuffer) + 16, "CD-ROM", 16);
+                ataR3SCSIPadStr(s->CTX_SUFF(pbIOBuffer) + 32, "1.0", 4);
             }
 
             if (cbTransfer)
@@ -2217,7 +2237,7 @@ static bool atapiPassthroughSS(ATADevState *s)
         if (cbTransfer >= s->cbAtapiPassthroughTransfer)
         {
             s->iSourceSink = ATAFN_SS_NULL;
-            atapiCmdOK(s);
+            atapiR3CmdOK(s);
         }
     }
     else
@@ -2239,13 +2259,13 @@ static bool atapiPassthroughSS(ATADevState *s)
                             s->iLUN, u8Cmd, abATAPISense[2] & 0x0f, abATAPISense[12], abATAPISense[13], rc));
             } while (0);
         }
-        atapiCmdError(s, abATAPISense, sizeof(abATAPISense));
+        atapiR3CmdError(s, abATAPISense, sizeof(abATAPISense));
     }
     return false;
 }
 
-/** @todo: Revise ASAP. */
-static bool atapiReadDVDStructureSS(ATADevState *s)
+/** @todo Revise ASAP. */
+static bool atapiR3ReadDVDStructureSS(ATADevState *s)
 {
     uint8_t *buf = s->CTX_SUFF(pbIOBuffer);
     int media = s->aATAPICmd[1];
@@ -2376,7 +2396,7 @@ static bool atapiReadDVDStructureSS(ATADevState *s)
                 if (uASC < 0)
                 {
                     s->iSourceSink = ATAFN_SS_NULL;
-                    atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, -uASC);
+                    atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, -uASC);
                     return false;
                 }
                 break;
@@ -2392,27 +2412,27 @@ static bool atapiReadDVDStructureSS(ATADevState *s)
         case 0xc0: /* TODO: Write protection status */
         default:
             s->iSourceSink = ATAFN_SS_NULL;
-            atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST,
+            atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST,
                                 SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
             return false;
     }
 
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
-static bool atapiReadSectors(ATADevState *s, uint32_t iATAPILBA, uint32_t cSectors, uint32_t cbSector)
+static bool atapiR3ReadSectors(ATADevState *s, uint32_t iATAPILBA, uint32_t cSectors, uint32_t cbSector)
 {
     Assert(cSectors > 0);
     s->iATAPILBA = iATAPILBA;
     s->cbATAPISector = cbSector;
-    ataStartTransfer(s, cSectors * cbSector, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ, true);
+    ataR3StartTransfer(s, cSectors * cbSector, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ, true);
     return false;
 }
 
 
-static bool atapiReadCapacitySS(ATADevState *s)
+static bool atapiR3ReadCapacitySS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
 
@@ -2421,12 +2441,12 @@ static bool atapiReadCapacitySS(ATADevState *s)
     ataH2BE_U32(pbBuf, s->cTotalSectors - 1);
     ataH2BE_U32(pbBuf + 4, 2048);
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static bool atapiReadDiscInformationSS(ATADevState *s)
+static bool atapiR3ReadDiscInformationSS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
 
@@ -2447,12 +2467,12 @@ static bool atapiReadDiscInformationSS(ATADevState *s)
     ataH2BE_U32(pbBuf + 16, 0x00ffffff); /* last session lead-in start time is not available */
     ataH2BE_U32(pbBuf + 20, 0x00ffffff); /* last possible start time for lead-out is not available */
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static bool atapiReadTrackInformationSS(ATADevState *s)
+static bool atapiR3ReadTrackInformationSS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
 
@@ -2461,7 +2481,7 @@ static bool atapiReadTrackInformationSS(ATADevState *s)
     /* Accept address/number type of 1 only, and only track 1 exists. */
     if ((s->aATAPICmd[1] & 0x03) != 1 || ataBE2H_U32(&s->aATAPICmd[2]) != 1)
     {
-        atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
+        atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
         return false;
     }
     memset(pbBuf, '\0', 36);
@@ -2476,11 +2496,11 @@ static bool atapiReadTrackInformationSS(ATADevState *s)
     pbBuf[32] = 0; /* track number (MSB) */
     pbBuf[33] = 0; /* session number (MSB) */
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
-static uint32_t atapiGetConfigurationFillFeatureListProfiles(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiR3GetConfigurationFillFeatureListProfiles(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 3*4)
         return 0;
@@ -2498,7 +2518,7 @@ static uint32_t atapiGetConfigurationFillFeatureListProfiles(ATADevState *s, uin
     return 3*4; /* Header + 2 profiles entries */
 }
 
-static uint32_t atapiGetConfigurationFillFeatureCore(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiR3GetConfigurationFillFeatureCore(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 12)
         return 0;
@@ -2513,7 +2533,7 @@ static uint32_t atapiGetConfigurationFillFeatureCore(ATADevState *s, uint8_t *pb
     return 12;
 }
 
-static uint32_t atapiGetConfigurationFillFeatureMorphing(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiR3GetConfigurationFillFeatureMorphing(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 8)
         return 0;
@@ -2527,7 +2547,7 @@ static uint32_t atapiGetConfigurationFillFeatureMorphing(ATADevState *s, uint8_t
     return 8;
 }
 
-static uint32_t atapiGetConfigurationFillFeatureRemovableMedium(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiR3GetConfigurationFillFeatureRemovableMedium(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 8)
         return 0;
@@ -2542,7 +2562,7 @@ static uint32_t atapiGetConfigurationFillFeatureRemovableMedium(ATADevState *s,
     return 8;
 }
 
-static uint32_t atapiGetConfigurationFillFeatureRandomReadable(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiR3GetConfigurationFillFeatureRandomReadable (ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 12)
         return 0;
@@ -2558,7 +2578,7 @@ static uint32_t atapiGetConfigurationFillFeatureRandomReadable(ATADevState *s, u
     return 12;
 }
 
-static uint32_t atapiGetConfigurationFillFeatureCDRead(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiR3GetConfigurationFillFeatureCDRead(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 8)
         return 0;
@@ -2572,7 +2592,7 @@ static uint32_t atapiGetConfigurationFillFeatureCDRead(ATADevState *s, uint8_t *
     return 8;
 }
 
-static uint32_t atapiGetConfigurationFillFeaturePowerManagement(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiR3GetConfigurationFillFeaturePowerManagement(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 4)
         return 0;
@@ -2584,7 +2604,7 @@ static uint32_t atapiGetConfigurationFillFeaturePowerManagement(ATADevState *s,
     return 4;
 }
 
-static uint32_t atapiGetConfigurationFillFeatureTimeout(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
+static uint32_t atapiR3GetConfigurationFillFeatureTimeout(ATADevState *s, uint8_t *pbBuf, size_t cbBuf)
 {
     if (cbBuf < 8)
         return 0;
@@ -2597,7 +2617,7 @@ static uint32_t atapiGetConfigurationFillFeatureTimeout(ATADevState *s, uint8_t
     return 8;
 }
 
-static bool atapiGetConfigurationSS(ATADevState *s)
+static bool atapiR3GetConfigurationSS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
     uint32_t cbBuf = s->cbIOBuffer;
@@ -2609,7 +2629,7 @@ static bool atapiGetConfigurationSS(ATADevState *s)
     /* Accept valid request types only, and only starting feature 0. */
     if ((s->aATAPICmd[1] & 0x03) == 3 || u16Sfn != 0)
     {
-        atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
+        atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
         return false;
     }
     memset(pbBuf, '\0', cbBuf);
@@ -2622,35 +2642,35 @@ static bool atapiGetConfigurationSS(ATADevState *s)
     cbBuf    -= 8;
     pbBuf    += 8;
 
-    cbCopied = atapiGetConfigurationFillFeatureListProfiles(s, pbBuf, cbBuf);
+    cbCopied = atapiR3GetConfigurationFillFeatureListProfiles(s, pbBuf, cbBuf);
     cbBuf -= cbCopied;
     pbBuf += cbCopied;
 
-    cbCopied = atapiGetConfigurationFillFeatureCore(s, pbBuf, cbBuf);
+    cbCopied = atapiR3GetConfigurationFillFeatureCore(s, pbBuf, cbBuf);
     cbBuf -= cbCopied;
     pbBuf += cbCopied;
 
-    cbCopied = atapiGetConfigurationFillFeatureMorphing(s, pbBuf, cbBuf);
+    cbCopied = atapiR3GetConfigurationFillFeatureMorphing(s, pbBuf, cbBuf);
     cbBuf -= cbCopied;
     pbBuf += cbCopied;
 
-    cbCopied = atapiGetConfigurationFillFeatureRemovableMedium(s, pbBuf, cbBuf);
+    cbCopied = atapiR3GetConfigurationFillFeatureRemovableMedium(s, pbBuf, cbBuf);
     cbBuf -= cbCopied;
     pbBuf += cbCopied;
 
-    cbCopied = atapiGetConfigurationFillFeatureRandomReadable(s, pbBuf, cbBuf);
+    cbCopied = atapiR3GetConfigurationFillFeatureRandomReadable (s, pbBuf, cbBuf);
     cbBuf -= cbCopied;
     pbBuf += cbCopied;
 
-    cbCopied = atapiGetConfigurationFillFeatureCDRead(s, pbBuf, cbBuf);
+    cbCopied = atapiR3GetConfigurationFillFeatureCDRead(s, pbBuf, cbBuf);
     cbBuf -= cbCopied;
     pbBuf += cbCopied;
 
-    cbCopied = atapiGetConfigurationFillFeaturePowerManagement(s, pbBuf, cbBuf);
+    cbCopied = atapiR3GetConfigurationFillFeaturePowerManagement(s, pbBuf, cbBuf);
     cbBuf -= cbCopied;
     pbBuf += cbCopied;
 
-    cbCopied = atapiGetConfigurationFillFeatureTimeout(s, pbBuf, cbBuf);
+    cbCopied = atapiR3GetConfigurationFillFeatureTimeout(s, pbBuf, cbBuf);
     cbBuf -= cbCopied;
     pbBuf += cbCopied;
 
@@ -2659,12 +2679,12 @@ static bool atapiGetConfigurationSS(ATADevState *s)
 
     /* Other profiles we might want to add in the future: 0x40 (BD-ROM) and 0x50 (HDDVD-ROM) */
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static bool atapiGetEventStatusNotificationSS(ATADevState *s)
+static bool atapiR3GetEventStatusNotificationSS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
 
@@ -2674,7 +2694,7 @@ static bool atapiGetEventStatusNotificationSS(ATADevState *s)
     if (!(s->aATAPICmd[1] & 1))
     {
         /* no asynchronous operation supported */
-        atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
+        atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
         return false;
     }
 
@@ -2734,12 +2754,12 @@ static bool atapiGetEventStatusNotificationSS(ATADevState *s)
     } while (!ASMAtomicCmpXchgU32(&s->MediaEventStatus, NewStatus, OldStatus));
 
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static bool atapiInquirySS(ATADevState *s)
+static bool atapiR3InquirySS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
 
@@ -2747,27 +2767,27 @@ static bool atapiInquirySS(ATADevState *s)
     Assert(s->cbElementaryTransfer <= 36);
     pbBuf[0] = 0x05; /* CD-ROM */
     pbBuf[1] = 0x80; /* removable */
-#if 1/*ndef VBOX*/  /** @todo implement MESN + AENC. (async notification on removal and stuff.) */
+# if 1/*ndef VBOX*/  /** @todo implement MESN + AENC. (async notification on removal and stuff.) */
     pbBuf[2] = 0x00; /* ISO */
     pbBuf[3] = 0x21; /* ATAPI-2 (XXX: put ATAPI-4 ?) */
-#else
+# else
     pbBuf[2] = 0x00; /* ISO */
     pbBuf[3] = 0x91; /* format 1, MESN=1, AENC=9 ??? */
-#endif
+# endif
     pbBuf[4] = 31; /* additional length */
     pbBuf[5] = 0; /* reserved */
     pbBuf[6] = 0; /* reserved */
     pbBuf[7] = 0; /* reserved */
-    ataSCSIPadStr(pbBuf + 8, s->szInquiryVendorId, 8);
-    ataSCSIPadStr(pbBuf + 16, s->szInquiryProductId, 16);
-    ataSCSIPadStr(pbBuf + 32, s->szInquiryRevision, 4);
+    ataR3SCSIPadStr(pbBuf + 8, s->szInquiryVendorId, 8);
+    ataR3SCSIPadStr(pbBuf + 16, s->szInquiryProductId, 16);
+    ataR3SCSIPadStr(pbBuf + 32, s->szInquiryRevision, 4);
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static bool atapiModeSenseErrorRecoverySS(ATADevState *s)
+static bool atapiR3ModeSenseErrorRecoverySS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
 
@@ -2790,12 +2810,12 @@ static bool atapiModeSenseErrorRecoverySS(ATADevState *s)
     pbBuf[14] = 0x00;
     pbBuf[15] = 0x00;
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static bool atapiModeSenseCDStatusSS(ATADevState *s)
+static bool atapiR3ModeSenseCDStatusSS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
 
@@ -2838,12 +2858,12 @@ static bool atapiModeSenseCDStatusSS(ATADevState *s)
     ataH2BE_U16(&pbBuf[36], 0); /* current write speed */
     ataH2BE_U16(&pbBuf[38], 0); /* number of write speed performance descriptors */
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static bool atapiRequestSenseSS(ATADevState *s)
+static bool atapiR3RequestSenseSS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
 
@@ -2851,12 +2871,12 @@ static bool atapiRequestSenseSS(ATADevState *s)
     memset(pbBuf, '\0', s->cbElementaryTransfer);
     memcpy(pbBuf, s->abATAPISense, RT_MIN(s->cbElementaryTransfer, sizeof(s->abATAPISense)));
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static bool atapiMechanismStatusSS(ATADevState *s)
+static bool atapiR3MechanismStatusSS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
 
@@ -2870,12 +2890,12 @@ static bool atapiMechanismStatusSS(ATADevState *s)
     pbBuf[5] = 1;
     ataH2BE_U16(pbBuf + 6, 0);
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static bool atapiReadTOCNormalSS(ATADevState *s)
+static bool atapiR3ReadTOCNormalSS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer), *q, iStartTrack;
     bool fMSF;
@@ -2886,7 +2906,7 @@ static bool atapiReadTOCNormalSS(ATADevState *s)
     iStartTrack = s->aATAPICmd[6];
     if (iStartTrack > 1 && iStartTrack != 0xaa)
     {
-        atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
+        atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
         return false;
     }
     q = pbBuf + 2;
@@ -2932,12 +2952,12 @@ static bool atapiReadTOCNormalSS(ATADevState *s)
     if (cbSize < s->cbTotalTransfer)
         s->cbTotalTransfer = cbSize;
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static bool atapiReadTOCMultiSS(ATADevState *s)
+static bool atapiR3ReadTOCMultiSS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer);
     bool fMSF;
@@ -2964,12 +2984,12 @@ static bool atapiReadTOCMultiSS(ATADevState *s)
         ataH2BE_U32(pbBuf + 8, 0);
     }
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static bool atapiReadTOCRawSS(ATADevState *s)
+static bool atapiR3ReadTOCRawSS(ATADevState *s)
 {
     uint8_t *pbBuf = s->CTX_SUFF(pbIOBuffer), *q, iStartTrack;
     bool fMSF;
@@ -3051,12 +3071,12 @@ static bool atapiReadTOCRawSS(ATADevState *s)
     if (cbSize < s->cbTotalTransfer)
         s->cbTotalTransfer = cbSize;
     s->iSourceSink = ATAFN_SS_NULL;
-    atapiCmdOK(s);
+    atapiR3CmdOK(s);
     return false;
 }
 
 
-static void atapiParseCmdVirtualATAPI(ATADevState *s)
+static void atapiR3ParseCmdVirtualATAPI(ATADevState *s)
 {
     const uint8_t *pbPacket;
     uint8_t *pbBuf;
@@ -3070,18 +3090,18 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
             if (s->cNotifiedMediaChange > 0)
             {
                 if (s->cNotifiedMediaChange-- > 2)
-                    atapiCmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
+                    atapiR3CmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
                 else
-                    atapiCmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
+                    atapiR3CmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
             }
             else if (s->pDrvMount->pfnIsMounted(s->pDrvMount))
-                atapiCmdOK(s);
+                atapiR3CmdOK(s);
             else
-                atapiCmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
             break;
         case SCSI_GET_EVENT_STATUS_NOTIFICATION:
             cbMax = ataBE2H_U16(pbPacket + 7);
-            ataStartTransfer(s, RT_MIN(cbMax, 8), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_GET_EVENT_STATUS_NOTIFICATION, true);
+            ataR3StartTransfer(s, RT_MIN(cbMax, 8), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_GET_EVENT_STATUS_NOTIFICATION, true);
             break;
         case SCSI_MODE_SENSE_10:
         {
@@ -3095,10 +3115,10 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
                     switch (uPageCode)
                     {
                         case SCSI_MODEPAGE_ERROR_RECOVERY:
-                            ataStartTransfer(s, RT_MIN(cbMax, 16), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_MODE_SENSE_ERROR_RECOVERY, true);
+                            ataR3StartTransfer(s, RT_MIN(cbMax, 16), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_MODE_SENSE_ERROR_RECOVERY, true);
                             break;
                         case SCSI_MODEPAGE_CD_STATUS:
-                            ataStartTransfer(s, RT_MIN(cbMax, 40), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_MODE_SENSE_CD_STATUS, true);
+                            ataR3StartTransfer(s, RT_MIN(cbMax, 40), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_MODE_SENSE_CD_STATUS, true);
                             break;
                         default:
                             goto error_cmd;
@@ -3110,14 +3130,14 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
                     goto error_cmd;
                 default:
                 case SCSI_PAGECONTROL_SAVED:
-                    atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_SAVING_PARAMETERS_NOT_SUPPORTED);
+                    atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_SAVING_PARAMETERS_NOT_SUPPORTED);
                     break;
             }
             break;
         }
         case SCSI_REQUEST_SENSE:
             cbMax = pbPacket[4];
-            ataStartTransfer(s, RT_MIN(cbMax, 18), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_REQUEST_SENSE, true);
+            ataR3StartTransfer(s, RT_MIN(cbMax, 18), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_REQUEST_SENSE, true);
             break;
         case SCSI_PREVENT_ALLOW_MEDIUM_REMOVAL:
             if (s->pDrvMount->pfnIsMounted(s->pDrvMount))
@@ -3126,10 +3146,10 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
                     s->pDrvMount->pfnLock(s->pDrvMount);
                 else
                     s->pDrvMount->pfnUnlock(s->pDrvMount);
-                atapiCmdOK(s);
+                atapiR3CmdOK(s);
             }
             else
-                atapiCmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
             break;
         case SCSI_READ_10:
         case SCSI_READ_12:
@@ -3139,12 +3159,12 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
             if (s->cNotifiedMediaChange > 0)
             {
                 s->cNotifiedMediaChange-- ;
-                atapiCmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
                 break;
             }
             else if (!s->pDrvMount->pfnIsMounted(s->pDrvMount))
             {
-                atapiCmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
                 break;
             }
             if (pbPacket[0] == SCSI_READ_10)
@@ -3154,7 +3174,7 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
             iATAPILBA = ataBE2H_U32(pbPacket + 2);
             if (cSectors == 0)
             {
-                atapiCmdOK(s);
+                atapiR3CmdOK(s);
                 break;
             }
             if ((uint64_t)iATAPILBA + cSectors > s->cTotalSectors)
@@ -3169,10 +3189,10 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
                     LogRel(("PIIX3 ATA: LUN#%d: CD-ROM block number %Ld invalid (READ)\n", s->iLUN, (uint64_t)iATAPILBA + cSectors));
                     uLastLogTS = RTTimeMilliTS();
                 }
-                atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR);
                 break;
             }
-            atapiReadSectors(s, iATAPILBA, cSectors, 2048);
+            atapiR3ReadSectors(s, iATAPILBA, cSectors, 2048);
             break;
         }
         case SCSI_READ_CD:
@@ -3182,19 +3202,19 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
             if (s->cNotifiedMediaChange > 0)
             {
                 s->cNotifiedMediaChange-- ;
-                atapiCmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
                 break;
             }
             else if (!s->pDrvMount->pfnIsMounted(s->pDrvMount))
             {
-                atapiCmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
                 break;
             }
             cSectors = (pbPacket[6] << 16) | (pbPacket[7] << 8) | pbPacket[8];
             iATAPILBA = ataBE2H_U32(pbPacket + 2);
             if (cSectors == 0)
             {
-                atapiCmdOK(s);
+                atapiR3CmdOK(s);
                 break;
             }
             if ((uint64_t)iATAPILBA + cSectors > s->cTotalSectors)
@@ -3209,26 +3229,26 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
                     LogRel(("PIIX3 ATA: LUN#%d: CD-ROM block number %Ld invalid (READ CD)\n", s->iLUN, (uint64_t)iATAPILBA + cSectors));
                     uLastLogTS = RTTimeMilliTS();
                 }
-                atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR);
                 break;
             }
             switch (pbPacket[9] & 0xf8)
             {
                 case 0x00:
                     /* nothing */
-                    atapiCmdOK(s);
+                    atapiR3CmdOK(s);
                     break;
                 case 0x10:
                     /* normal read */
-                    atapiReadSectors(s, iATAPILBA, cSectors, 2048);
+                    atapiR3ReadSectors(s, iATAPILBA, cSectors, 2048);
                     break;
                 case 0xf8:
                     /* read all data */
-                    atapiReadSectors(s, iATAPILBA, cSectors, 2352);
+                    atapiR3ReadSectors(s, iATAPILBA, cSectors, 2352);
                     break;
                 default:
                     LogRel(("PIIX3 ATA: LUN#%d: CD-ROM sector format not supported (%#x)\n", s->iLUN, pbPacket[9] & 0xf8));
-                    atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
+                    atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
                     break;
             }
             break;
@@ -3239,12 +3259,12 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
             if (s->cNotifiedMediaChange > 0)
             {
                 s->cNotifiedMediaChange-- ;
-                atapiCmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
                 break;
             }
             else if (!s->pDrvMount->pfnIsMounted(s->pDrvMount))
             {
-                atapiCmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
                 break;
             }
             iATAPILBA = ataBE2H_U32(pbPacket + 2);
@@ -3260,10 +3280,10 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
                     LogRel(("PIIX3 ATA: LUN#%d: CD-ROM block number %Ld invalid (SEEK)\n", s->iLUN, (uint64_t)iATAPILBA));
                     uLastLogTS = RTTimeMilliTS();
                 }
-                atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_LOGICAL_BLOCK_OOR);
                 break;
             }
-            atapiCmdOK(s);
+            atapiR3CmdOK(s);
             ataSetStatus(s, ATA_STAT_SEEK); /* Linux expects this. */
             break;
         }
@@ -3306,15 +3326,15 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
                     break;
             }
             if (RT_SUCCESS(rc))
-                atapiCmdOK(s);
+                atapiR3CmdOK(s);
             else
-                atapiCmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIA_LOAD_OR_EJECT_FAILED);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIA_LOAD_OR_EJECT_FAILED);
             break;
         }
         case SCSI_MECHANISM_STATUS:
         {
             cbMax = ataBE2H_U16(pbPacket + 8);
-            ataStartTransfer(s, RT_MIN(cbMax, 8), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_MECHANISM_STATUS, true);
+            ataR3StartTransfer(s, RT_MIN(cbMax, 8), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_MECHANISM_STATUS, true);
             break;
         }
         case SCSI_READ_TOC_PMA_ATIP:
@@ -3324,12 +3344,12 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
             if (s->cNotifiedMediaChange > 0)
             {
                 s->cNotifiedMediaChange-- ;
-                atapiCmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
                 break;
             }
             else if (!s->pDrvMount->pfnIsMounted(s->pDrvMount))
             {
-                atapiCmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
                 break;
             }
             cbMax = ataBE2H_U16(pbPacket + 7);
@@ -3340,17 +3360,17 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
             switch (format)
             {
                 case 0:
-                    ataStartTransfer(s, cbMax, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_TOC_NORMAL, true);
+                    ataR3StartTransfer(s, cbMax, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_TOC_NORMAL, true);
                     break;
                 case 1:
-                    ataStartTransfer(s, RT_MIN(cbMax, 12), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_TOC_MULTI, true);
+                    ataR3StartTransfer(s, RT_MIN(cbMax, 12), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_TOC_MULTI, true);
                     break;
                 case 2:
-                    ataStartTransfer(s, cbMax, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_TOC_RAW, true);
+                    ataR3StartTransfer(s, cbMax, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_TOC_RAW, true);
                     break;
                 default:
                   error_cmd:
-                    atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
+                    atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
                     break;
             }
             break;
@@ -3359,63 +3379,63 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
             if (s->cNotifiedMediaChange > 0)
             {
                 s->cNotifiedMediaChange-- ;
-                atapiCmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
                 break;
             }
             else if (!s->pDrvMount->pfnIsMounted(s->pDrvMount))
             {
-                atapiCmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
                 break;
             }
-            ataStartTransfer(s, 8, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_CAPACITY, true);
+            ataR3StartTransfer(s, 8, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_CAPACITY, true);
             break;
         case SCSI_READ_DISC_INFORMATION:
             if (s->cNotifiedMediaChange > 0)
             {
                 s->cNotifiedMediaChange-- ;
-                atapiCmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
                 break;
             }
             else if (!s->pDrvMount->pfnIsMounted(s->pDrvMount))
             {
-                atapiCmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
                 break;
             }
             cbMax = ataBE2H_U16(pbPacket + 7);
-            ataStartTransfer(s, RT_MIN(cbMax, 34), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_DISC_INFORMATION, true);
+            ataR3StartTransfer(s, RT_MIN(cbMax, 34), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_DISC_INFORMATION, true);
             break;
         case SCSI_READ_TRACK_INFORMATION:
             if (s->cNotifiedMediaChange > 0)
             {
                 s->cNotifiedMediaChange-- ;
-                atapiCmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_UNIT_ATTENTION, SCSI_ASC_MEDIUM_MAY_HAVE_CHANGED); /* media changed */
                 break;
             }
             else if (!s->pDrvMount->pfnIsMounted(s->pDrvMount))
             {
-                atapiCmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
+                atapiR3CmdErrorSimple(s, SCSI_SENSE_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT);
                 break;
             }
             cbMax = ataBE2H_U16(pbPacket + 7);
-            ataStartTransfer(s, RT_MIN(cbMax, 36), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_TRACK_INFORMATION, true);
+            ataR3StartTransfer(s, RT_MIN(cbMax, 36), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_TRACK_INFORMATION, true);
             break;
         case SCSI_GET_CONFIGURATION:
             /* No media change stuff here, it can confuse Linux guests. */
             cbMax = ataBE2H_U16(pbPacket + 7);
-            ataStartTransfer(s, RT_MIN(cbMax, 80), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_GET_CONFIGURATION, true);
+            ataR3StartTransfer(s, RT_MIN(cbMax, 80), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_GET_CONFIGURATION, true);
             break;
         case SCSI_INQUIRY:
             cbMax = ataBE2H_U16(pbPacket + 3);
-            ataStartTransfer(s, RT_MIN(cbMax, 36), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_INQUIRY, true);
+            ataR3StartTransfer(s, RT_MIN(cbMax, 36), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_INQUIRY, true);
             break;
         case SCSI_READ_DVD_STRUCTURE:
         {
             cbMax = ataBE2H_U16(pbPacket + 8);
-            ataStartTransfer(s, RT_MIN(cbMax, 4), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_DVD_STRUCTURE, true);
+            ataR3StartTransfer(s, RT_MIN(cbMax, 4), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_READ_DVD_STRUCTURE, true);
             break;
         }
         default:
-            atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
+            atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
             break;
     }
 }
@@ -3424,7 +3444,7 @@ static void atapiParseCmdVirtualATAPI(ATADevState *s)
 /*
  * Parse ATAPI commands, passing them directly to the CD/DVD drive.
  */
-static void atapiParseCmdPassthrough(ATADevState *s)
+static void atapiR3ParseCmdPassthrough(ATADevState *s)
 {
     const uint8_t *pbPacket;
     uint8_t *pbBuf;
@@ -3458,7 +3478,7 @@ static void atapiParseCmdPassthrough(ATADevState *s)
             cbTransfer = ataBE2H_U16(pbPacket + 7);
             if (ASMAtomicReadU32(&s->MediaEventStatus) != ATA_EVENT_STATUS_UNCHANGED)
             {
-                ataStartTransfer(s, RT_MIN(cbTransfer, 8), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_GET_EVENT_STATUS_NOTIFICATION, true);
+                ataR3StartTransfer(s, RT_MIN(cbTransfer, 8), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_GET_EVENT_STATUS_NOTIFICATION, true);
                 break;
             }
             uTxDir = PDMBLOCKTXDIR_FROM_DEVICE;
@@ -3611,7 +3631,7 @@ static void atapiParseCmdPassthrough(ATADevState *s)
             cbTransfer = pbPacket[4];
             if ((s->abATAPISense[2] & 0x0f) != SCSI_SENSE_NONE)
             {
-                ataStartTransfer(s, RT_MIN(cbTransfer, 18), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_REQUEST_SENSE, true);
+                ataR3StartTransfer(s, RT_MIN(cbTransfer, 18), PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_ATAPI_CMD, ATAFN_SS_ATAPI_REQUEST_SENSE, true);
                 break;
             }
             uTxDir = PDMBLOCKTXDIR_FROM_DEVICE;
@@ -3693,7 +3713,7 @@ static void atapiParseCmdPassthrough(ATADevState *s)
                 case 0x0e: /* download microcode with offsets and defer activation */
                 case 0x0f: /* activate deferred microcode */
                     LogRel(("PIIX3 ATA: LUN#%d: CD-ROM passthrough command attempted to update firmware, blocked\n", s->iLUN));
-                    atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
+                    atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_INV_FIELD_IN_CMD_PACKET);
                     break;
                 default:
                     cbTransfer = ataBE2H_U16(pbPacket + 6);
@@ -3711,11 +3731,11 @@ static void atapiParseCmdPassthrough(ATADevState *s)
              * as the Linux kernel doesn't like it (message "scsi: unknown
              * opcode 0x01" in syslog) and replies with a sense code of 0,
              * which sends cdrecord to an endless loop. */
-            atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
+            atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
             break;
         default:
             LogRel(("PIIX3 ATA: LUN#%d: passthrough unimplemented for command %#x\n", s->iLUN, pbPacket[0]));
-            atapiCmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
+            atapiR3CmdErrorSimple(s, SCSI_SENSE_ILLEGAL_REQUEST, SCSI_ASC_ILLEGAL_OPCODE);
             break;
         sendcmd:
             /*
@@ -3726,31 +3746,31 @@ static void atapiParseCmdPassthrough(ATADevState *s)
             Log2(("ATAPI PT: max size %d\n", cbTransfer));
             if (cbTransfer == 0)
                 uTxDir = PDMBLOCKTXDIR_NONE;
-            ataStartTransfer(s, cbTransfer, uTxDir, ATAFN_BT_ATAPI_PASSTHROUGH_CMD, ATAFN_SS_ATAPI_PASSTHROUGH, true);
+            ataR3StartTransfer(s, cbTransfer, uTxDir, ATAFN_BT_ATAPI_PASSTHROUGH_CMD, ATAFN_SS_ATAPI_PASSTHROUGH, true);
     }
 }
 
 
-static void atapiParseCmd(ATADevState *s)
+static void atapiR3ParseCmd(ATADevState *s)
 {
     const uint8_t *pbPacket;
 
     pbPacket = s->aATAPICmd;
-#ifdef DEBUG
+# ifdef DEBUG
     Log(("%s: LUN#%d DMA=%d CMD=%#04x \"%s\"\n", __FUNCTION__, s->iLUN, s->fDMA, pbPacket[0], SCSICmdText(pbPacket[0])));
-#else /* !DEBUG */
+# else /* !DEBUG */
     Log(("%s: LUN#%d DMA=%d CMD=%#04x\n", __FUNCTION__, s->iLUN, s->fDMA, pbPacket[0]));
-#endif /* !DEBUG */
+# endif /* !DEBUG */
     Log2(("%s: limit=%#x packet: %.*Rhxs\n", __FUNCTION__, s->uATARegLCyl | (s->uATARegHCyl << 8), ATAPI_PACKET_SIZE, pbPacket));
 
     if (s->fATAPIPassthrough)
-        atapiParseCmdPassthrough(s);
+        atapiR3ParseCmdPassthrough(s);
     else
-        atapiParseCmdVirtualATAPI(s);
+        atapiR3ParseCmdVirtualATAPI(s);
 }
 
 
-static bool ataPacketSS(ATADevState *s)
+static bool ataR3PacketSS(ATADevState *s)
 {
     s->fDMA = !!(s->uATARegFeature & 1);
     memcpy(s->aATAPICmd, s->CTX_SUFF(pbIOBuffer), ATAPI_PACKET_SIZE);
@@ -3758,7 +3778,7 @@ static bool ataPacketSS(ATADevState *s)
     s->cbTotalTransfer = 0;
     s->cbElementaryTransfer = 0;
     s->cbAtapiPassthroughTransfer = 0;
-    atapiParseCmd(s);
+    atapiR3ParseCmd(s);
     return false;
 }
 
@@ -3767,7 +3787,7 @@ static bool ataPacketSS(ATADevState *s)
  * SCSI_GET_EVENT_STATUS_NOTIFICATION should return "medium removed" event
  * from now on, regardless if there was a medium inserted or not.
  */
-static void ataMediumRemoved(ATADevState *s)
+static void ataR3MediumRemoved(ATADevState *s)
 {
     ASMAtomicWriteU32(&s->MediaEventStatus, ATA_EVENT_STATUS_MEDIA_REMOVED);
 }
@@ -3778,7 +3798,7 @@ static void ataMediumRemoved(ATADevState *s)
  * there was already a medium inserted, don't forget to send the "medium
  * removed" event first.
  */
-static void ataMediumInserted(ATADevState *s)
+static void ataR3MediumInserted(ATADevState *s)
 {
     uint32_t OldStatus, NewStatus;
     do
@@ -3798,12 +3818,11 @@ static void ataMediumInserted(ATADevState *s)
     } while (!ASMAtomicCmpXchgU32(&s->MediaEventStatus, NewStatus, OldStatus));
 }
 
+
 /**
- * Called when a media is mounted.
- *
- * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @interface_method_impl{PDMIMOUNTNOTIFY, pfnMountNotify}
  */
-static DECLCALLBACK(void) ataMountNotify(PPDMIMOUNTNOTIFY pInterface)
+static DECLCALLBACK(void) ataR3MountNotify(PPDMIMOUNTNOTIFY pInterface)
 {
     ATADevState *pIf = PDMIMOUNTNOTIFY_2_ATASTATE(pInterface);
     Log(("%s: changing LUN#%d\n", __FUNCTION__, pIf->iLUN));
@@ -3822,15 +3841,14 @@ static DECLCALLBACK(void) ataMountNotify(PPDMIMOUNTNOTIFY pInterface)
     /* Report media changed in TEST UNIT and other (probably incorrect) places. */
     if (pIf->cNotifiedMediaChange < 2)
         pIf->cNotifiedMediaChange = 1;
-    ataMediumInserted(pIf);
-    ataMediumTypeSet(pIf, ATA_MEDIA_TYPE_UNKNOWN);
+    ataR3MediumInserted(pIf);
+    ataR3MediumTypeSet(pIf, ATA_MEDIA_TYPE_UNKNOWN);
 }
 
 /**
- * Called when a media is unmounted
- * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @interface_method_impl{PDMIMOUNTNOTIFY, pfnUnmountNotify}
  */
-static DECLCALLBACK(void) ataUnmountNotify(PPDMIMOUNTNOTIFY pInterface)
+static DECLCALLBACK(void) ataR3UnmountNotify(PPDMIMOUNTNOTIFY pInterface)
 {
     ATADevState *pIf = PDMIMOUNTNOTIFY_2_ATASTATE(pInterface);
     Log(("%s:\n", __FUNCTION__));
@@ -3843,11 +3861,11 @@ static DECLCALLBACK(void) ataUnmountNotify(PPDMIMOUNTNOTIFY pInterface)
      * present and 2 in which it is changed.
      */
     pIf->cNotifiedMediaChange = 1;
-    ataMediumRemoved(pIf);
-    ataMediumTypeSet(pIf, ATA_MEDIA_NO_DISC);
+    ataR3MediumRemoved(pIf);
+    ataR3MediumTypeSet(pIf, ATA_MEDIA_NO_DISC);
 }
 
-static void ataPacketBT(ATADevState *s)
+static void ataR3PacketBT(ATADevState *s)
 {
     s->cbElementaryTransfer = s->cbTotalTransfer;
     s->cbAtapiPassthroughTransfer = s->cbTotalTransfer;
@@ -3857,7 +3875,7 @@ static void ataPacketBT(ATADevState *s)
 }
 
 
-static void ataResetDevice(ATADevState *s)
+static void ataR3ResetDevice(ATADevState *s)
 {
     s->cMultSectors = ATA_MAX_MULT_SECTORS;
     s->cNotifiedMediaChange = 0;
@@ -3867,7 +3885,7 @@ static void ataResetDevice(ATADevState *s)
 
     s->uATARegSelect = 0x20;
     ataSetStatusValue(s, ATA_STAT_READY);
-    ataSetSignature(s);
+    ataR3SetSignature(s);
     s->cbTotalTransfer = 0;
     s->cbElementaryTransfer = 0;
     s->cbAtapiPassthroughTransfer = 0;
@@ -3883,9 +3901,9 @@ static void ataResetDevice(ATADevState *s)
 }
 
 
-static bool ataExecuteDeviceDiagnosticSS(ATADevState *s)
+static bool ataR3ExecuteDeviceDiagnosticSS(ATADevState *s)
 {
-    ataSetSignature(s);
+    ataR3SetSignature(s);
     if (s->fATAPI)
         ataSetStatusValue(s, 0); /* NOTE: READY is _not_ set */
     else
@@ -3895,8 +3913,8 @@ static bool ataExecuteDeviceDiagnosticSS(ATADevState *s)
 }
 
 
-static int ataTrimSectors(ATADevState *s, uint64_t u64Sector, uint32_t cSectors,
-                          bool *pfRedo)
+static int ataR3TrimSectors(ATADevState *s, uint64_t u64Sector, uint32_t cSectors,
+                            bool *pfRedo)
 {
     RTRANGE TrimRange;
     PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
@@ -3914,7 +3932,7 @@ static int ataTrimSectors(ATADevState *s, uint64_t u64Sector, uint32_t cSectors,
     if (RT_SUCCESS(rc))
         *pfRedo = false;
     else
-        *pfRedo = ataIsRedoSetWarning(s, rc);
+        *pfRedo = ataR3IsRedoSetWarning(s, rc);
 
     STAM_PROFILE_START(&pCtl->StatLockWait, a);
     PDMCritSectEnter(&pCtl->lock, VINF_SUCCESS);
@@ -3923,7 +3941,7 @@ static int ataTrimSectors(ATADevState *s, uint64_t u64Sector, uint32_t cSectors,
 }
 
 
-static bool ataTrimSS(ATADevState *s)
+static bool ataR3TrimSS(ATADevState *s)
 {
     int rc = VERR_GENERAL_FAILURE;
     uint32_t cRangesMax;
@@ -3938,7 +3956,7 @@ static bool ataTrimSS(ATADevState *s)
         if (ATA_RANGE_LENGTH_GET(*pu64Range) == 0)
             break;
 
-        rc = ataTrimSectors(s, *pu64Range & ATA_RANGE_LBA_MASK,
+        rc = ataR3TrimSectors(s, *pu64Range & ATA_RANGE_LBA_MASK,
                             ATA_RANGE_LENGTH_GET(*pu64Range), &fRedo);
         if (RT_FAILURE(rc))
             break;
@@ -3949,7 +3967,7 @@ static bool ataTrimSS(ATADevState *s)
     if (RT_SUCCESS(rc))
     {
         s->iSourceSink = ATAFN_SS_NULL;
-        ataCmdOK(s, ATA_STAT_SEEK);
+        ataR3CmdOK(s, ATA_STAT_SEEK);
     }
     else
     {
@@ -3964,20 +3982,20 @@ static bool ataTrimSS(ATADevState *s)
          * because the request was aborted.
          */
         if (rc != VERR_INTERRUPTED)
-            ataCmdError(s, ID_ERR);
+            ataR3CmdError(s, ID_ERR);
     }
 
     return false;
 }
 
 
-static void ataParseCmd(ATADevState *s, uint8_t cmd)
+static void ataR3ParseCmd(ATADevState *s, uint8_t cmd)
 {
-#ifdef DEBUG
+# ifdef DEBUG
     Log(("%s: LUN#%d CMD=%#04x \"%s\"\n", __FUNCTION__, s->iLUN, cmd, ATACmdText(cmd)));
-#else /* !DEBUG */
+# else /* !DEBUG */
     Log(("%s: LUN#%d CMD=%#04x\n", __FUNCTION__, s->iLUN, cmd));
-#endif /* !DEBUG */
+# endif /* !DEBUG */
     s->fLBA48 = false;
     s->fDMA = false;
     if (cmd == ATA_IDLE_IMMEDIATE)
@@ -3996,14 +4014,14 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
     {
         case ATA_IDENTIFY_DEVICE:
             if (s->pDrvBlock && !s->fATAPI)
-                ataStartTransfer(s, 512, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_NULL, ATAFN_SS_IDENTIFY, false);
+                ataR3StartTransfer(s, 512, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_NULL, ATAFN_SS_IDENTIFY, false);
             else
             {
                 if (s->fATAPI)
-                    ataSetSignature(s);
-                ataCmdError(s, ABRT_ERR);
+                    ataR3SetSignature(s);
+                ataR3CmdError(s, ABRT_ERR);
                 ataUnsetStatus(s, ATA_STAT_READY);
-                ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+                ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
             }
             break;
         case ATA_RECALIBRATE:
@@ -4011,31 +4029,31 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
                 goto abort_cmd;
             /* fall through */
         case ATA_INITIALIZE_DEVICE_PARAMETERS:
-            ataCmdOK(s, ATA_STAT_SEEK);
-            ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+            ataR3CmdOK(s, ATA_STAT_SEEK);
+            ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
             break;
         case ATA_SET_MULTIPLE_MODE:
             if (    s->uATARegNSector != 0
                 &&  (   s->uATARegNSector > ATA_MAX_MULT_SECTORS
                      || (s->uATARegNSector & (s->uATARegNSector - 1)) != 0))
             {
-                ataCmdError(s, ABRT_ERR);
+                ataR3CmdError(s, ABRT_ERR);
             }
             else
             {
                 Log2(("%s: set multi sector count to %d\n", __FUNCTION__, s->uATARegNSector));
                 s->cMultSectors = s->uATARegNSector;
-                ataCmdOK(s, 0);
+                ataR3CmdOK(s, 0);
             }
-            ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+            ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
             break;
         case ATA_READ_VERIFY_SECTORS_EXT:
             s->fLBA48 = true;
         case ATA_READ_VERIFY_SECTORS:
         case ATA_READ_VERIFY_SECTORS_WITHOUT_RETRIES:
             /* do sector number check ? */
-            ataCmdOK(s, ATA_STAT_SEEK);
-            ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+            ataR3CmdOK(s, ATA_STAT_SEEK);
+            ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
             break;
         case ATA_READ_SECTORS_EXT:
             s->fLBA48 = true;
@@ -4044,7 +4062,7 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
             if (!s->pDrvBlock || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = 1;
-            ataStartTransfer(s, ataGetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_READ_SECTORS, false);
+            ataR3StartTransfer(s, ataR3GetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_READ_SECTORS, false);
             break;
         case ATA_WRITE_SECTORS_EXT:
             s->fLBA48 = true;
@@ -4053,7 +4071,7 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
             if (!s->pDrvBlock || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = 1;
-            ataStartTransfer(s, ataGetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_WRITE_SECTORS, false);
+            ataR3StartTransfer(s, ataR3GetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_WRITE_SECTORS, false);
             break;
         case ATA_READ_MULTIPLE_EXT:
             s->fLBA48 = true;
@@ -4061,7 +4079,7 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
             if (!s->pDrvBlock || !s->cMultSectors || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = s->cMultSectors;
-            ataStartTransfer(s, ataGetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_READ_SECTORS, false);
+            ataR3StartTransfer(s, ataR3GetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_READ_SECTORS, false);
             break;
         case ATA_WRITE_MULTIPLE_EXT:
             s->fLBA48 = true;
@@ -4069,7 +4087,7 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
             if (!s->pDrvBlock || !s->cMultSectors || s->fATAPI)
                 goto abort_cmd;
             s->cSectorsPerIRQ = s->cMultSectors;
-            ataStartTransfer(s, ataGetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_WRITE_SECTORS, false);
+            ataR3StartTransfer(s, ataR3GetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_WRITE_SECTORS, false);
             break;
         case ATA_READ_DMA_EXT:
             s->fLBA48 = true;
@@ -4079,7 +4097,7 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
                 goto abort_cmd;
             s->cSectorsPerIRQ = ATA_MAX_MULT_SECTORS;
             s->fDMA = true;
-            ataStartTransfer(s, ataGetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_READ_SECTORS, false);
+            ataR3StartTransfer(s, ataR3GetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_READ_SECTORS, false);
             break;
         case ATA_WRITE_DMA_EXT:
             s->fLBA48 = true;
@@ -4089,27 +4107,27 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
                 goto abort_cmd;
             s->cSectorsPerIRQ = ATA_MAX_MULT_SECTORS;
             s->fDMA = true;
-            ataStartTransfer(s, ataGetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_WRITE_SECTORS, false);
+            ataR3StartTransfer(s, ataR3GetNSectors(s) * s->cbSector, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_READ_WRITE_SECTORS, ATAFN_SS_WRITE_SECTORS, false);
             break;
         case ATA_READ_NATIVE_MAX_ADDRESS_EXT:
             s->fLBA48 = true;
-            ataSetSector(s, s->cTotalSectors - 1);
-            ataCmdOK(s, 0);
-            ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+            ataR3SetSector(s, s->cTotalSectors - 1);
+            ataR3CmdOK(s, 0);
+            ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
             break;
         case ATA_SEEK: /* Used by the SCO OpenServer. Command is marked as obsolete */
-            ataCmdOK(s, 0);
-            ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+            ataR3CmdOK(s, 0);
+            ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
             break;
         case ATA_READ_NATIVE_MAX_ADDRESS:
-            ataSetSector(s, RT_MIN(s->cTotalSectors, 1 << 28) - 1);
-            ataCmdOK(s, 0);
-            ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+            ataR3SetSector(s, RT_MIN(s->cTotalSectors, 1 << 28) - 1);
+            ataR3CmdOK(s, 0);
+            ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
             break;
         case ATA_CHECK_POWER_MODE:
             s->uATARegNSector = 0xff; /* drive active or idle */
-            ataCmdOK(s, 0);
-            ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+            ataR3CmdOK(s, 0);
+            ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
             break;
         case ATA_SET_FEATURES:
             Log2(("%s: feature=%#x\n", __FUNCTION__, s->uATARegFeature));
@@ -4119,34 +4137,34 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
             {
                 case 0x02: /* write cache enable */
                     Log2(("%s: write cache enable\n", __FUNCTION__));
-                    ataCmdOK(s, ATA_STAT_SEEK);
-                    ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+                    ataR3CmdOK(s, ATA_STAT_SEEK);
+                    ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
                     break;
                 case 0xaa: /* read look-ahead enable */
                     Log2(("%s: read look-ahead enable\n", __FUNCTION__));
-                    ataCmdOK(s, ATA_STAT_SEEK);
-                    ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+                    ataR3CmdOK(s, ATA_STAT_SEEK);
+                    ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
                     break;
                 case 0x55: /* read look-ahead disable */
                     Log2(("%s: read look-ahead disable\n", __FUNCTION__));
-                    ataCmdOK(s, ATA_STAT_SEEK);
-                    ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+                    ataR3CmdOK(s, ATA_STAT_SEEK);
+                    ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
                     break;
                 case 0xcc: /* reverting to power-on defaults enable */
                     Log2(("%s: revert to power-on defaults enable\n", __FUNCTION__));
-                    ataCmdOK(s, ATA_STAT_SEEK);
-                    ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+                    ataR3CmdOK(s, ATA_STAT_SEEK);
+                    ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
                     break;
                 case 0x66: /* reverting to power-on defaults disable */
                     Log2(("%s: revert to power-on defaults disable\n", __FUNCTION__));
-                    ataCmdOK(s, ATA_STAT_SEEK);
-                    ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+                    ataR3CmdOK(s, ATA_STAT_SEEK);
+                    ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
                     break;
                 case 0x82: /* write cache disable */
                     Log2(("%s: write cache disable\n", __FUNCTION__));
                     /* As per the ATA/ATAPI-6 specs, a write cache disable
                      * command MUST flush the write buffers to disc. */
-                    ataStartTransfer(s, 0, PDMBLOCKTXDIR_NONE, ATAFN_BT_NULL, ATAFN_SS_FLUSH, false);
+                    ataR3StartTransfer(s, 0, PDMBLOCKTXDIR_NONE, ATAFN_BT_NULL, ATAFN_SS_FLUSH, false);
                     break;
                 case 0x03: { /* set transfer mode */
                     Log2(("%s: transfer mode %#04x\n", __FUNCTION__, s->uATARegNSector));
@@ -4164,8 +4182,8 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
                         default:
                             goto abort_cmd;
                     }
-                    ataCmdOK(s, ATA_STAT_SEEK);
-                    ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+                    ataR3CmdOK(s, ATA_STAT_SEEK);
+                    ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
                     break;
                 }
                 default:
@@ -4183,38 +4201,38 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
         case ATA_FLUSH_CACHE:
             if (!s->pDrvBlock || s->fATAPI)
                 goto abort_cmd;
-            ataStartTransfer(s, 0, PDMBLOCKTXDIR_NONE, ATAFN_BT_NULL, ATAFN_SS_FLUSH, false);
+            ataR3StartTransfer(s, 0, PDMBLOCKTXDIR_NONE, ATAFN_BT_NULL, ATAFN_SS_FLUSH, false);
             break;
         case ATA_STANDBY_IMMEDIATE:
-            ataCmdOK(s, 0);
-            ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+            ataR3CmdOK(s, 0);
+            ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
             break;
         case ATA_IDLE_IMMEDIATE:
             LogRel(("PIIX3 ATA: LUN#%d: aborting current command\n", s->iLUN));
-            ataAbortCurrentCommand(s, false);
+            ataR3AbortCurrentCommand(s, false);
             break;
         case ATA_SLEEP:
-            ataCmdOK(s, 0);
-            ataSetIRQ(s);
+            ataR3CmdOK(s, 0);
+            ataHCSetIRQ(s);
             break;
             /* ATAPI commands */
         case ATA_IDENTIFY_PACKET_DEVICE:
             if (s->fATAPI)
-                ataStartTransfer(s, 512, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_NULL, ATAFN_SS_ATAPI_IDENTIFY, false);
+                ataR3StartTransfer(s, 512, PDMBLOCKTXDIR_FROM_DEVICE, ATAFN_BT_NULL, ATAFN_SS_ATAPI_IDENTIFY, false);
             else
             {
-                ataCmdError(s, ABRT_ERR);
-                ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+                ataR3CmdError(s, ABRT_ERR);
+                ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
             }
             break;
         case ATA_EXECUTE_DEVICE_DIAGNOSTIC:
-            ataStartTransfer(s, 0, PDMBLOCKTXDIR_NONE, ATAFN_BT_NULL, ATAFN_SS_EXECUTE_DEVICE_DIAGNOSTIC, false);
+            ataR3StartTransfer(s, 0, PDMBLOCKTXDIR_NONE, ATAFN_BT_NULL, ATAFN_SS_EXECUTE_DEVICE_DIAGNOSTIC, false);
             break;
         case ATA_DEVICE_RESET:
             if (!s->fATAPI)
                 goto abort_cmd;
             LogRel(("PIIX3 ATA: LUN#%d: performing device RESET\n", s->iLUN));
-            ataAbortCurrentCommand(s, true);
+            ataR3AbortCurrentCommand(s, true);
             break;
         case ATA_PACKET:
             if (!s->fATAPI)
@@ -4222,7 +4240,7 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
             /* overlapping commands not supported */
             if (s->uATARegFeature & 0x02)
                 goto abort_cmd;
-            ataStartTransfer(s, ATAPI_PACKET_SIZE, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_PACKET, ATAFN_SS_PACKET, false);
+            ataR3StartTransfer(s, ATAPI_PACKET_SIZE, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_PACKET, ATAFN_SS_PACKET, false);
             break;
         case ATA_DATA_SET_MANAGEMENT:
             if (!s->pDrvBlock || !s->pDrvBlock->pfnDiscard)
@@ -4231,19 +4249,20 @@ static void ataParseCmd(ATADevState *s, uint8_t cmd)
                 || (s->uATARegFeature & ~UINT8_C(0x01)))
                 goto abort_cmd;
             s->fDMA = true;
-            ataStartTransfer(s, (s->uATARegNSectorHOB << 8 | s->uATARegNSector) * s->cbSector, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_NULL, ATAFN_SS_TRIM, false);
+            ataR3StartTransfer(s, (s->uATARegNSectorHOB << 8 | s->uATARegNSector) * s->cbSector, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_NULL, ATAFN_SS_TRIM, false);
             break;
         default:
         abort_cmd:
-            ataCmdError(s, ABRT_ERR);
+            ataR3CmdError(s, ABRT_ERR);
             if (s->fATAPI)
                 ataUnsetStatus(s, ATA_STAT_READY);
-            ataSetIRQ(s); /* Shortcut, do not use AIO thread. */
+            ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
             break;
     }
 }
 
-#endif /* IN_RING3 */
+# endif /* IN_RING3 */
+#endif /* IN_RING0 || IN_RING3 */
 
 /*
  * Note: There are four distinct cases of port I/O handling depending on
@@ -4366,7 +4385,7 @@ static int ataIOPortWriteU8(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
             /* Don't do anything complicated in GC */
             return VINF_IOM_R3_IOPORT_WRITE;
 #else /* IN_RING3 */
-            ataParseCmd(&pCtl->aIfs[pCtl->iSelectedIf], val);
+            ataR3ParseCmd(&pCtl->aIfs[pCtl->iSelectedIf], val);
 #endif /* !IN_RING3 */
     }
     return VINF_SUCCESS;
@@ -4384,7 +4403,7 @@ static int ataIOPortReadU8(PATACONTROLLER pCtl, uint32_t addr, uint32_t *pu32)
     {
         if (pCtl->iSelectedIf)  /* Device 1 selected, Device 0 responding for it. */
         {
-            if (!pCtl->aIfs[0].pDrvBlock)   /* @todo: this case should never get here! */
+            if (!pCtl->aIfs[0].pDrvBlock)   /** @todo this case should never get here! */
             {
                 Log2(("%s: addr=%#x: no device on channel\n", __FUNCTION__, addr));
                 return VERR_IOM_IOPORT_UNUSED;
@@ -4514,8 +4533,8 @@ static int ataIOPortReadU8(PATACONTROLLER pCtl, uint32_t addr, uint32_t *pu32)
 
                 val = s->uATARegStatus;
 #else /* !IN_RING3 */
-                /* Cannot yield CPU in guest context. And switching to host
-                 * context for each and every busy status is too costly,
+                /* Cannot yield CPU in raw-mode and ring-0 context.  And switching
+                 * to host context for each and every busy status is too costly,
                  * especially on SMP systems where we don't gain much by
                  * yielding the CPU to someone else. */
                 if (++cBusy >= 20)
@@ -4558,26 +4577,27 @@ static int ataControlWrite(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
 {
 #ifndef IN_RING3
     if ((val ^ pCtl->aIfs[0].uATARegDevCtl) & ATA_DEVCTL_RESET)
-        return VINF_IOM_R3_IOPORT_WRITE; /* The RESET stuff is too complicated for GC. */
+        return VINF_IOM_R3_IOPORT_WRITE; /* The RESET stuff is too complicated for RC+R0. */
 #endif /* !IN_RING3 */
 
     Log2(("%s: addr=%#x val=%#04x\n", __FUNCTION__, addr, val));
     /* RESET is common for both drives attached to a controller. */
-    if (!(pCtl->aIfs[0].uATARegDevCtl & ATA_DEVCTL_RESET) &&
-            (val & ATA_DEVCTL_RESET))
+    if (   !(pCtl->aIfs[0].uATARegDevCtl & ATA_DEVCTL_RESET)
+        && (val & ATA_DEVCTL_RESET))
     {
 #ifdef IN_RING3
         /* Software RESET low to high */
-        int32_t uCmdWait0 = -1, uCmdWait1 = -1;
+        int32_t uCmdWait0 = -1;
+        int32_t uCmdWait1 = -1;
         uint64_t uNow = RTTimeNanoTS();
         if (pCtl->aIfs[0].u64CmdTS)
             uCmdWait0 = (uNow - pCtl->aIfs[0].u64CmdTS) / 1000;
         if (pCtl->aIfs[1].u64CmdTS)
             uCmdWait1 = (uNow - pCtl->aIfs[1].u64CmdTS) / 1000;
         LogRel(("PIIX3 ATA: Ctl#%d: RESET, DevSel=%d AIOIf=%d CmdIf0=%#04x (%d usec ago) CmdIf1=%#04x (%d usec ago)\n",
-                    ATACONTROLLER_IDX(pCtl), pCtl->iSelectedIf, pCtl->iAIOIf,
-                    pCtl->aIfs[0].uATARegCommand, uCmdWait0,
-                    pCtl->aIfs[1].uATARegCommand, uCmdWait1));
+                ATACONTROLLER_IDX(pCtl), pCtl->iSelectedIf, pCtl->iAIOIf,
+                pCtl->aIfs[0].uATARegCommand, uCmdWait0,
+                pCtl->aIfs[1].uATARegCommand, uCmdWait1));
         pCtl->fReset = true;
         /* Everything must be done after the reset flag is set, otherwise
          * there are unavoidable races with the currently executing request
@@ -4585,14 +4605,14 @@ static int ataControlWrite(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
         pCtl->fChainedTransfer = false;
         for (uint32_t i = 0; i < RT_ELEMENTS(pCtl->aIfs); i++)
         {
-            ataResetDevice(&pCtl->aIfs[i]);
+            ataR3ResetDevice(&pCtl->aIfs[i]);
             /* The following cannot be done using ataSetStatusValue() since the
              * reset flag is already set, which suppresses all status changes. */
             pCtl->aIfs[i].uATARegStatus = ATA_STAT_BUSY | ATA_STAT_SEEK;
             Log2(("%s: LUN#%d status %#04x\n", __FUNCTION__, pCtl->aIfs[i].iLUN, pCtl->aIfs[i].uATARegStatus));
             pCtl->aIfs[i].uATARegError = 0x01;
         }
-        ataAsyncIOClearRequests(pCtl);
+        ataR3AsyncIOClearRequests(pCtl);
         Log2(("%s: Ctl#%d: message to async I/O thread, resetA\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl)));
         if (val & ATA_DEVCTL_HOB)
         {
@@ -4604,13 +4624,13 @@ static int ataControlWrite(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
         pCtl->u64ResetTime = RTTimeMilliTS();
 
         /* Issue the reset request now. */
-        ataAsyncIOPutRequest(pCtl, &g_ataResetARequest);
+        ataHCAsyncIOPutRequest(pCtl, &g_ataResetARequest);
 #else /* !IN_RING3 */
         AssertMsgFailed(("RESET handling is too complicated for GC\n"));
 #endif /* IN_RING3 */
     }
-    else if ((pCtl->aIfs[0].uATARegDevCtl & ATA_DEVCTL_RESET) &&
-               !(val & ATA_DEVCTL_RESET))
+    else if (   (pCtl->aIfs[0].uATARegDevCtl & ATA_DEVCTL_RESET)
+             && !(val & ATA_DEVCTL_RESET))
     {
 #ifdef IN_RING3
         /* Software RESET high to low */
@@ -4621,7 +4641,7 @@ static int ataControlWrite(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
             val &= ~ATA_DEVCTL_HOB;
             Log2(("%s: ignored setting HOB\n", __FUNCTION__));
         }
-        ataAsyncIOPutRequest(pCtl, &g_ataResetCRequest);
+        ataHCAsyncIOPutRequest(pCtl, &g_ataResetCRequest);
 #else /* !IN_RING3 */
         AssertMsgFailed(("RESET handling is too complicated for GC\n"));
 #endif /* IN_RING3 */
@@ -4629,8 +4649,8 @@ static int ataControlWrite(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
 
     /* Change of interrupt disable flag. Update interrupt line if interrupt
      * is pending on the current interface. */
-    if ((val ^ pCtl->aIfs[0].uATARegDevCtl) & ATA_DEVCTL_DISABLE_IRQ
-        &&  pCtl->aIfs[pCtl->iSelectedIf].fIrqPending)
+    if (   ((val ^ pCtl->aIfs[0].uATARegDevCtl) & ATA_DEVCTL_DISABLE_IRQ)
+        && pCtl->aIfs[pCtl->iSelectedIf].fIrqPending)
     {
         if (!(val & ATA_DEVCTL_DISABLE_IRQ))
         {
@@ -4663,9 +4683,9 @@ static int ataControlWrite(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
     return VINF_SUCCESS;
 }
 
-#ifdef IN_RING3
+#if defined(IN_RING0) || defined(IN_RING3)
 
-static void ataPIOTransfer(PATACONTROLLER pCtl)
+static void ataHCPIOTransfer(PATACONTROLLER pCtl)
 {
     ATADevState *s;
 
@@ -4674,6 +4694,7 @@ static void ataPIOTransfer(PATACONTROLLER pCtl)
 
     if (s->cbTotalTransfer && s->iIOBufferCur > s->iIOBufferEnd)
     {
+# ifdef IN_RING3
         LogRel(("PIIX3 ATA: LUN#%d: %s data in the middle of a PIO transfer - VERY SLOW\n", s->iLUN, s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE ? "loading" : "storing"));
         /* Any guest OS that triggers this case has a pathetic ATA driver.
          * In a real system it would block the CPU via IORDY, here we do it
@@ -4693,11 +4714,14 @@ static void ataPIOTransfer(PATACONTROLLER pCtl)
             s->iIOBufferCur = 0;
             s->iIOBufferEnd = s->cbElementaryTransfer;
         }
+# else
+        AssertReleaseFailed();
+# endif
     }
     if (s->cbTotalTransfer)
     {
         if (s->fATAPITransfer)
-            ataPIOTransferLimitATAPI(s);
+            ataHCPIOTransferLimitATAPI(s);
 
         if (s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE && s->cbElementaryTransfer > s->cbTotalTransfer)
             s->cbElementaryTransfer = s->cbTotalTransfer;
@@ -4706,7 +4730,7 @@ static void ataPIOTransfer(PATACONTROLLER pCtl)
              __FUNCTION__, s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE ? "T2I" : "I2T",
              s->cbTotalTransfer, s->cbElementaryTransfer,
              s->iIOBufferCur, s->iIOBufferEnd));
-        ataPIOTransferStart(s, s->iIOBufferCur, s->cbElementaryTransfer);
+        ataHCPIOTransferStart(s, s->iIOBufferCur, s->cbElementaryTransfer);
         s->cbTotalTransfer -= s->cbElementaryTransfer;
         s->iIOBufferCur += s->cbElementaryTransfer;
 
@@ -4714,11 +4738,11 @@ static void ataPIOTransfer(PATACONTROLLER pCtl)
             s->cbElementaryTransfer = s->cbTotalTransfer;
     }
     else
-        ataPIOTransferStop(s);
+        ataHCPIOTransferStop(s);
 }
 
 
-DECLINLINE(void) ataPIOTransferFinish(PATACONTROLLER pCtl, ATADevState *s)
+DECLINLINE(void) ataHCPIOTransferFinish(PATACONTROLLER pCtl, ATADevState *s)
 {
     /* Do not interfere with RESET processing if the PIO transfer finishes
      * while the RESET line is asserted. */
@@ -4739,7 +4763,7 @@ DECLINLINE(void) ataPIOTransferFinish(PATACONTROLLER pCtl, ATADevState *s)
         ataSetStatus(s, ATA_STAT_BUSY);
 
         Log2(("%s: Ctl#%d: message to async I/O thread, continuing PIO transfer\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl)));
-        ataAsyncIOPutRequest(pCtl, &g_ataPIORequest);
+        ataHCAsyncIOPutRequest(pCtl, &g_ataPIORequest);
     }
     else
     {
@@ -4754,91 +4778,425 @@ DECLINLINE(void) ataPIOTransferFinish(PATACONTROLLER pCtl, ATADevState *s)
         {
             /* There is more to transfer, happens usually for large ATAPI
              * reads - the protocol limits the chunk size to 65534 bytes. */
-            ataPIOTransfer(pCtl);
-            ataSetIRQ(s);
+            ataHCPIOTransfer(pCtl);
+            ataHCSetIRQ(s);
         }
         else
         {
             Log2(("%s: Ctl#%d: skipping message to async I/O thread, ending PIO transfer\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl)));
             /* Finish PIO transfer. */
-            ataPIOTransfer(pCtl);
+            ataHCPIOTransfer(pCtl);
             Assert(!pCtl->fRedo);
         }
     }
 }
 
-#endif /* IN_RING3 */
+#endif /* IN_RING0 || IN_RING3 */
 
-static int ataDataWrite(PATACONTROLLER pCtl, uint32_t addr, uint32_t cbSize, const uint8_t *pbBuf)
+/**
+ * Fallback for ataCopyPioData124 that handles unaligned and out of bounds cases.
+ *
+ * @param   pIf         The device interface to work with.
+ * @param   pbDst       The destination buffer.
+ * @param   pbSrc       The source buffer.
+ * @param   cbCopy      The number of bytes to copy, either 1, 2 or 4 bytes.
+ */
+DECL_NO_INLINE(static, void) ataCopyPioData124Slow(ATADevState *pIf, uint8_t *pbDst, const uint8_t *pbSrc, uint32_t cbCopy)
 {
-    ATADevState *s = &pCtl->aIfs[pCtl->iSelectedIf];
-    uint8_t *p;
+    uint32_t const offStart = pIf->iIOBufferPIODataStart;
+    uint32_t const offNext  = offStart + cbCopy;
 
-    if (s->iIOBufferPIODataStart < s->iIOBufferPIODataEnd)
+    if (offStart + cbCopy > pIf->cbIOBuffer)
     {
-        Assert(s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE);
-        p = s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart;
-#ifndef IN_RING3
-        /* All but the last transfer unit is simple enough for GC, but
-         * sending a request to the async IO thread is too complicated. */
-        if (s->iIOBufferPIODataStart + cbSize < s->iIOBufferPIODataEnd)
+        Log(("%s: cbCopy=%#x offStart=%#x cbIOBuffer=%#x offNext=%#x (iIOBufferPIODataEnd=%#x)\n",
+             __FUNCTION__, cbCopy, offStart, pIf->cbIOBuffer, offNext, pIf->iIOBufferPIODataEnd));
+        if (offStart < pIf->cbIOBuffer)
+            cbCopy = pIf->cbIOBuffer - offStart;
+        else
+            cbCopy = 0;
+    }
+
+    switch (cbCopy)
+    {
+        case 4: pbDst[3] = pbSrc[3]; /* fall thru */
+        case 3: pbDst[2] = pbSrc[2]; /* fall thru */
+        case 2: pbDst[1] = pbSrc[1]; /* fall thru */
+        case 1: pbDst[0] = pbSrc[0]; /* fall thru */
+        case 0: break;
+        default: AssertFailed(); /* impossible */
+    }
+
+    pIf->iIOBufferPIODataStart = offNext;
+
+}
+
+
+/**
+ * Work for ataDataWrite & ataDataRead that copies data without using memcpy.
+ *
+ * This also updates pIf->iIOBufferPIODataStart.
+ *
+ * The two buffers are either stack (32-bit aligned) or somewhere within
+ * pIf->pbIOBuffer.
+ *
+ * @param   pIf         The device interface to work with.
+ * @param   pbDst       The destination buffer.
+ * @param   pbSrc       The source buffer.
+ * @param   cbCopy      The number of bytes to copy, either 1, 2 or 4 bytes.
+ */
+DECLINLINE(void) ataCopyPioData124(ATADevState *pIf, uint8_t *pbDst, const uint8_t *pbSrc, uint32_t cbCopy)
+{
+    /*
+     * Quick bounds checking can be done by checking that the pbIOBuffer offset
+     * (iIOBufferPIODataStart) is aligned at the transfer size (which is ASSUMED
+     * to be 1, 2 or 4).  However, since we're paranoid and don't currently
+     * trust iIOBufferPIODataEnd to be within bounds, we current check against the
+     * IO buffer size too.
+     */
+    Assert(cbCopy == 1 || cbCopy == 2 || cbCopy == 4);
+    uint32_t const offStart = pIf->iIOBufferPIODataStart;
+    if (RT_LIKELY(   !(offStart & (cbCopy - 1))
+                  && offStart + cbCopy <= pIf->cbIOBuffer))
+    {
+        switch (cbCopy)
         {
-            memcpy(p, pbBuf, cbSize);
-            s->iIOBufferPIODataStart += cbSize;
+            case 4: *(uint32_t *)pbDst = *(uint32_t const *)pbSrc; break;
+            case 2: *(uint16_t *)pbDst = *(uint16_t const *)pbSrc; break;
+            case 1: *pbDst = *pbSrc; break;
+        }
+        pIf->iIOBufferPIODataStart = offStart + cbCopy;
+    }
+    else
+        ataCopyPioData124Slow(pIf, pbDst, pbSrc, cbCopy);
+}
+
+
+/**
+ * Port I/O Handler for primary port range OUT operations.
+ * @see FNIOMIOPORTOUT for details.
+ */
+PDMBOTHCBDECL(int) ataIOPortWrite1Data(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
+{
+    uint32_t       i = (uint32_t)(uintptr_t)pvUser;
+    PCIATAState   *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
+    PATACONTROLLER pCtl = &pThis->aCts[i];
+
+    Assert(i < 2);
+    Assert(Port == pCtl->IOPortBase1);
+    Assert(cb == 2 || cb == 4); /* Writes to the data port may be 16-bit or 32-bit. */
+
+    int rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_WRITE);
+    if (rc == VINF_SUCCESS)
+    {
+        ATADevState *s = &pCtl->aIfs[pCtl->iSelectedIf];
+
+        if (s->iIOBufferPIODataStart < s->iIOBufferPIODataEnd)
+        {
+            Assert(s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE);
+            uint8_t       *pbDst = s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart;
+            uint8_t const *pbSrc = (uint8_t const *)&u32;
+
+#ifdef IN_RC
+            /* Raw-mode: The ataHCPIOTransfer following the last transfer unit
+               requires I/O thread signalling, we must go to ring-3 for that. */
+            if (s->iIOBufferPIODataStart + cb < s->iIOBufferPIODataEnd)
+                ataCopyPioData124(s, pbDst, pbSrc, cb);
+            else
+                rc = VINF_IOM_R3_IOPORT_WRITE;
+
+#elif defined(IN_RING0)
+            /* Ring-0: We can do I/O thread signalling here, however for paranoid reasons
+               triggered by a special case in ataHCPIOTransferFinish, we take extra care here. */
+            if (s->iIOBufferPIODataStart + cb < s->iIOBufferPIODataEnd)
+                ataCopyPioData124(s, pbDst, pbSrc, cb);
+            else if (s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE) /* paranoia */
+            {
+                ataCopyPioData124(s, pbDst, pbSrc, cb);
+                ataHCPIOTransferFinish(pCtl, s);
+            }
+            else
+            {
+                Log(("%s: Unexpected\n",__FUNCTION__));
+                rc = VINF_IOM_R3_IOPORT_WRITE;
+            }
+
+#else  /* IN_RING 3*/
+            ataCopyPioData124(s, pbDst, pbSrc, cb);
+            if (s->iIOBufferPIODataStart >= s->iIOBufferPIODataEnd)
+                ataHCPIOTransferFinish(pCtl, s);
+#endif /* IN_RING 3*/
         }
         else
-            return VINF_IOM_R3_IOPORT_WRITE;
-#else /* IN_RING3 */
-        memcpy(p, pbBuf, cbSize);
-        s->iIOBufferPIODataStart += cbSize;
-        if (s->iIOBufferPIODataStart >= s->iIOBufferPIODataEnd)
-            ataPIOTransferFinish(pCtl, s);
-#endif /* !IN_RING3 */
+            Log2(("%s: DUMMY data\n", __FUNCTION__));
+
+        Log3(("%s: addr=%#x val=%.*Rhxs rc=%d\n", __FUNCTION__, Port, cb, &u32, rc));
+        PDMCritSectLeave(&pCtl->lock);
     }
     else
-        Log2(("%s: DUMMY data\n", __FUNCTION__));
-    Log3(("%s: addr=%#x val=%.*Rhxs\n", __FUNCTION__, addr, cbSize, pbBuf));
-    return VINF_SUCCESS;
+        Log3(("%s: addr=%#x -> %d\n", __FUNCTION__, Port, rc));
+    return rc;
 }
 
-static int ataDataRead(PATACONTROLLER pCtl, uint32_t addr, uint32_t cbSize, uint8_t *pbBuf)
+
+/**
+ * Port I/O Handler for primary port range IN operations.
+ * @see FNIOMIOPORTIN for details.
+ */
+PDMBOTHCBDECL(int) ataIOPortRead1Data(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
-    ATADevState *s = &pCtl->aIfs[pCtl->iSelectedIf];
-    uint8_t *p;
+    uint32_t       i = (uint32_t)(uintptr_t)pvUser;
+    PCIATAState   *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
+    PATACONTROLLER pCtl = &pThis->aCts[i];
+
+    Assert(i < 2);
+    Assert(Port == pCtl->IOPortBase1);
+
+    /* Reads from the data register may be 16-bit or 32-bit. Byte accesses are
+       upgraded to word. */
+    Assert(cb == 1 || cb == 2 || cb == 4);
+    uint32_t cbActual = cb != 1 ? cb : 2;
+    *pu32 = 0;
 
-    if (s->iIOBufferPIODataStart < s->iIOBufferPIODataEnd)
+    int rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_READ);
+    if (rc == VINF_SUCCESS)
     {
-        Assert(s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE);
-        p = s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart;
-#ifndef IN_RING3
-        /* All but the last transfer unit is simple enough for GC, but
-         * sending a request to the async IO thread is too complicated. */
-        if (s->iIOBufferPIODataStart + cbSize < s->iIOBufferPIODataEnd)
+        ATADevState *s = &pCtl->aIfs[pCtl->iSelectedIf];
+
+        if (s->iIOBufferPIODataStart < s->iIOBufferPIODataEnd)
         {
-            memcpy(pbBuf, p, cbSize);
-            s->iIOBufferPIODataStart += cbSize;
+            Assert(s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE);
+            uint8_t const *pbSrc = s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart;
+            uint8_t       *pbDst = (uint8_t *)pu32;
+
+#ifdef IN_RC
+            /* All but the last transfer unit is simple enough for RC, but
+             * sending a request to the async IO thread is too complicated. */
+            if (s->iIOBufferPIODataStart + cbActual < s->iIOBufferPIODataEnd)
+                ataCopyPioData124(s, pbDst, pbSrc, cbActual);
+            else
+                rc = VINF_IOM_R3_IOPORT_READ;
+
+#elif defined(IN_RING0)
+            /* Ring-0: We can do I/O thread signalling here.  However there is one
+               case in ataHCPIOTransfer that does a LogRel and would (but not from
+               here) call directly into the driver code.  We detect that odd case
+               here cand return to ring-3 to handle it. */
+            if (s->iIOBufferPIODataStart + cbActual < s->iIOBufferPIODataEnd)
+                ataCopyPioData124(s, pbDst, pbSrc, cbActual);
+            else if (   s->cbTotalTransfer == 0
+                     || s->iSourceSink != ATAFN_SS_NULL
+                     || s->iIOBufferCur <= s->iIOBufferEnd)
+            {
+                ataCopyPioData124(s, pbDst, pbSrc, cbActual);
+                ataHCPIOTransferFinish(pCtl, s);
+            }
+            else
+            {
+                Log(("%s: Unexpected\n",__FUNCTION__));
+                rc = VINF_IOM_R3_IOPORT_READ;
+            }
+
+#else  /* IN_RING3 */
+            ataCopyPioData124(s, pbDst, pbSrc, cbActual);
+            if (s->iIOBufferPIODataStart >= s->iIOBufferPIODataEnd)
+                ataHCPIOTransferFinish(pCtl, s);
+#endif /* IN_RING3 */
+
+            /* Just to be on the safe side (caller takes care of this, really). */
+            if (cb == 1)
+                *pu32 &= 0xff;
         }
         else
-            return VINF_IOM_R3_IOPORT_READ;
-#else /* IN_RING3 */
-        memcpy(pbBuf, p, cbSize);
-        s->iIOBufferPIODataStart += cbSize;
-        if (s->iIOBufferPIODataStart >= s->iIOBufferPIODataEnd)
-            ataPIOTransferFinish(pCtl, s);
-#endif /* !IN_RING3 */
+        {
+            Log2(("%s: DUMMY data\n", __FUNCTION__));
+            memset(pu32, 0xff, cb);
+        }
+        Log3(("%s: addr=%#x val=%.*Rhxs rc=%d\n", __FUNCTION__, Port, cb, pu32, rc));
+
+        PDMCritSectLeave(&pCtl->lock);
     }
     else
+        Log3(("%s: addr=%#x -> %d\n", __FUNCTION__, Port, rc));
+
+    return rc;
+}
+
+
+/**
+ * Port I/O Handler for primary port range IN string operations.
+ * @see FNIOMIOPORTINSTRING for details.
+ */
+PDMBOTHCBDECL(int) ataIOPortReadStr1Data(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint8_t *pbDst,
+                                         uint32_t *pcTransfers, unsigned cb)
+{
+    uint32_t       i     = (uint32_t)(uintptr_t)pvUser;
+    PCIATAState   *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
+    PATACONTROLLER pCtl  = &pThis->aCts[i];
+
+    Assert(i < 2);
+    Assert(Port == pCtl->IOPortBase1);
+    Assert(*pcTransfers > 0);
+
+    int rc;
+    if (cb == 2 || cb == 4)
     {
-        Log2(("%s: DUMMY data\n", __FUNCTION__));
-        memset(pbBuf, '\xff', cbSize);
+        rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_READ);
+        if (rc == VINF_SUCCESS)
+        {
+            ATADevState *s = &pCtl->aIfs[pCtl->iSelectedIf];
+
+            uint32_t const offStart = s->iIOBufferPIODataStart;
+            if (offStart < s->iIOBufferPIODataEnd)
+            {
+                /*
+                 * Figure how much we can copy.  Usually it's the same as the request.
+                 * The last transfer unit cannot be handled in RC, as it involves
+                 * thread communication.  In R0 we let the non-string callback handle it,
+                 * and ditto for overflows/dummy data.
+                 */
+                uint32_t cAvailable = (s->iIOBufferPIODataEnd - offStart) / cb;
+#ifndef IN_RING3
+                if (cAvailable > 0)
+                    cAvailable--;
+#endif
+                uint32_t const cRequested = *pcTransfers;
+                if (cAvailable > cRequested)
+                    cAvailable = cRequested;
+                uint32_t const cbTransfer = cAvailable * cb;
+                if (   offStart + cbTransfer <= s->cbIOBuffer
+                    && cbTransfer > 0)
+                {
+                    /*
+                     * Do the transfer.
+                     */
+                    uint8_t const *pbSrc = s->CTX_SUFF(pbIOBuffer) + offStart;
+                    memcpy(pbDst, pbSrc, cbTransfer);
+                    Log3(("%s: addr=%#x cb=%#x cbTransfer=%#x val=%.*Rhxd\n",
+                          __FUNCTION__, Port, cb, cbTransfer, cbTransfer, pbSrc));
+                    s->iIOBufferPIODataStart = offStart + cbTransfer;
+
+#ifdef IN_RING3
+                    if (s->iIOBufferPIODataStart >= s->iIOBufferPIODataEnd)
+                        ataHCPIOTransferFinish(pCtl, s);
+#endif
+                    *pcTransfers = cRequested - cAvailable;
+                }
+                else
+                    Log2(("%s: DUMMY/Overflow!\n", __FUNCTION__));
+            }
+            else
+            {
+                /*
+                 * Dummy read (shouldn't happen) return 0xff like the non-string handler.
+                 */
+                Log2(("%s: DUMMY data (%#x bytes)\n", __FUNCTION__, *pcTransfers * cb));
+                memset(pbDst, 0xff, *pcTransfers * cb);
+                *pcTransfers = 0;
+            }
+
+            PDMCritSectLeave(&pCtl->lock);
+        }
     }
-    Log3(("%s: addr=%#x val=%.*Rhxs\n", __FUNCTION__, addr, cbSize, pbBuf));
-    return VINF_SUCCESS;
+    /*
+     * Let the non-string I/O callback handle 1 byte reads.
+     */
+    else
+    {
+        Log2(("%s: 1 byte read (%#x transfers)\n", *pcTransfers));
+        AssertFailed();
+        rc = VINF_SUCCESS;
+    }
+    return rc;
+}
+
+
+/**
+ * Port I/O Handler for primary port range OUT string operations.
+ * @see FNIOMIOPORTOUTSTRING for details.
+ */
+PDMBOTHCBDECL(int) ataIOPortWriteStr1Data(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint8_t const *pbSrc,
+                                          uint32_t *pcTransfers, unsigned cb)
+{
+    uint32_t       i     = (uint32_t)(uintptr_t)pvUser;
+    PCIATAState   *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
+    PATACONTROLLER pCtl  = &pThis->aCts[i];
+
+    Assert(i < 2);
+    Assert(Port == pCtl->IOPortBase1);
+    Assert(*pcTransfers > 0);
+
+    int rc;
+    if (cb == 2 || cb == 4)
+    {
+        rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_WRITE);
+        if (rc == VINF_SUCCESS)
+        {
+            ATADevState *s = &pCtl->aIfs[pCtl->iSelectedIf];
+
+            uint32_t const offStart = s->iIOBufferPIODataStart;
+            if (offStart < s->iIOBufferPIODataEnd)
+            {
+                /*
+                 * Figure how much we can copy.  Usually it's the same as the request.
+                 * The last transfer unit cannot be handled in RC, as it involves
+                 * thread communication.  In R0 we let the non-string callback handle it,
+                 * and ditto for overflows/dummy data.
+                 */
+                uint32_t cAvailable = (s->iIOBufferPIODataEnd - offStart) / cb;
+#ifndef IN_RING3
+                if (cAvailable)
+                    cAvailable--;
+#endif
+                uint32_t const cRequested = *pcTransfers;
+                if (cAvailable > cRequested)
+                    cAvailable = cRequested;
+                uint32_t const cbTransfer = cAvailable * cb;
+                if (   offStart + cbTransfer <= s->cbIOBuffer
+                    && cbTransfer)
+                {
+                    /*
+                     * Do the transfer.
+                     */
+                    void *pvDst = s->CTX_SUFF(pbIOBuffer) + offStart;
+                    memcpy(pvDst, pbSrc, cbTransfer);
+                    Log3(("%s: addr=%#x val=%.*Rhxs\n", __FUNCTION__, Port, cbTransfer, pvDst));
+                    s->iIOBufferPIODataStart = offStart + cbTransfer;
+
+#ifdef IN_RING3
+                    if (s->iIOBufferPIODataStart >= s->iIOBufferPIODataEnd)
+                        ataHCPIOTransferFinish(pCtl, s);
+#endif
+                    *pcTransfers = cRequested - cAvailable;
+                }
+                else
+                    Log2(("%s: DUMMY/Overflow!\n", __FUNCTION__));
+            }
+            else
+            {
+                Log2(("%s: DUMMY data (%#x bytes)\n", __FUNCTION__, *pcTransfers * cb));
+                *pcTransfers = 0;
+            }
+
+            PDMCritSectLeave(&pCtl->lock);
+        }
+    }
+    /*
+     * Let the non-string I/O callback handle 1 byte reads.
+     */
+    else
+    {
+        Log2(("%s: 1 byte write (%#x transfers)\n", *pcTransfers));
+        AssertFailed();
+        rc = VINF_SUCCESS;
+    }
+
+    return rc;
 }
 
+
 #ifdef IN_RING3
 
-static void ataDMATransferStop(ATADevState *s)
+static void ataR3DMATransferStop(ATADevState *s)
 {
     s->cbTotalTransfer = 0;
     s->cbElementaryTransfer = 0;
@@ -4854,7 +5212,7 @@ static void ataDMATransferStop(ATADevState *s)
  *
  * @param pCtl      Controller for which to perform the transfer.
  */
-static void ataDMATransfer(PATACONTROLLER pCtl)
+static void ataR3DMATransfer(PATACONTROLLER pCtl)
 {
     PPDMDEVINS pDevIns = CONTROLLER_2_DEVINS(pCtl);
     ATADevState *s = &pCtl->aIfs[pCtl->iAIOIf];
@@ -5003,7 +5361,7 @@ static void ataDMATransfer(PATACONTROLLER pCtl)
         {
             LogRel(("PIIX3 ATA: Ctl#%d: ABORT DMA%s\n", ATACONTROLLER_IDX(pCtl), pCtl->fReset ? " due to RESET" : ""));
             if (!pCtl->fReset)
-                ataDMATransferStop(s);
+                ataR3DMATransferStop(s);
             /* This forces the loop to exit immediately. */
             pDesc = pCtl->pLastDMADesc + 1;
         }
@@ -5036,26 +5394,32 @@ static void ataDMATransfer(PATACONTROLLER pCtl)
 static void ataR3AsyncSignalIdle(PATACONTROLLER pCtl)
 {
     /*
-     * Take the mutex here and recheck the idle indicator to avoid
+     * Take the lock here and recheck the idle indicator to avoid
      * unnecessary work and racing ataR3WaitForAsyncIOIsIdle.
      */
-    int rc = RTSemMutexRequest(pCtl->AsyncIORequestMutex, RT_INDEFINITE_WAIT); AssertRC(rc);
+    int rc = PDMCritSectEnter(&pCtl->AsyncIORequestLock, VINF_SUCCESS);
+    AssertRC(rc);
 
     if (    pCtl->fSignalIdle
-        &&  ataAsyncIOIsIdle(pCtl, false /*fStrict*/))
+        &&  ataR3AsyncIOIsIdle(pCtl, false /*fStrict*/))
     {
         PDMDevHlpAsyncNotificationCompleted(pCtl->pDevInsR3);
         RTThreadUserSignal(pCtl->AsyncIOThread); /* for ataR3Construct/ataR3ResetCommon. */
     }
 
-    rc = RTSemMutexRelease(pCtl->AsyncIORequestMutex); AssertRC(rc);
+    rc = PDMCritSectLeave(&pCtl->AsyncIORequestLock);
+    AssertRC(rc);
 }
 
-/** Async I/O thread for an interface. Once upon a time this was readable
- * code with several loops and a different semaphore for each purpose. But
- * then came the "how can one save the state in the middle of a PIO transfer"
- * question. The solution was to use an ASM, which is what's there now. */
-static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
+/**
+ * Async I/O thread for an interface.
+ *
+ * Once upon a time this was readable code with several loops and a different
+ * semaphore for each purpose. But then came the "how can one save the state in
+ * the middle of a PIO transfer" question.  The solution was to use an ASM,
+ * which is what's there now.
+ */
+static DECLCALLBACK(int) ataR3AsyncIOThread(RTTHREAD ThreadSelf, void *pvUser)
 {
     const ATARequest *pReq;
     uint64_t        u64TS = 0; /* shut up gcc */
@@ -5090,7 +5454,7 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
         {
             if (pCtl->fSignalIdle)
                 ataR3AsyncSignalIdle(pCtl);
-            rc = RTSemEventWait(pCtl->AsyncIOSem, RT_INDEFINITE_WAIT);
+            rc = SUPSemEventWaitNoResume(pCtl->pSupDrvSession, pCtl->hAsyncIOSem, RT_INDEFINITE_WAIT);
             /* Continue if we got a signal by RTThreadPoke().
              * We will get notified if there is a request to process.
              */
@@ -5099,7 +5463,7 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
             if (RT_FAILURE(rc) || RT_UNLIKELY(pCtl->fShutdown))
                 break;
 
-            pReq = ataAsyncIOGetCurrentRequest(pCtl);
+            pReq = ataR3AsyncIOGetCurrentRequest(pCtl);
         }
 
         if (RT_FAILURE(rc) || pCtl->fShutdown)
@@ -5120,7 +5484,7 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                 &&  (ReqType == ATA_AIO_PIO || ReqType == ATA_AIO_DMA))
             {
                 /* Incorrect sequence of PIO/DMA states. Dump request queue. */
-                ataAsyncIODumpRequests(pCtl);
+                ataR3AsyncIODumpRequests(pCtl);
             }
             AssertReleaseMsg(ReqType == ATA_AIO_RESET_ASSERTED || ReqType == ATA_AIO_RESET_CLEARED || ReqType == ATA_AIO_ABORT || pCtl->uAsyncIOState == ReqType, ("I/O state inconsistent: state=%d request=%d\n", pCtl->uAsyncIOState, ReqType));
         }
@@ -5137,7 +5501,7 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
             u64TS = RTTimeNanoTS();
 #if defined(DEBUG) || defined(VBOX_WITH_STATISTICS)
             STAM_PROFILE_ADV_START(&pCtl->StatAsyncTime, a);
-#endif /* DEBUG || VBOX_WITH_STATISTICS */
+#endif
         }
 
         switch (ReqType)
@@ -5204,12 +5568,12 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                              * everything from scratch by resending the current
                              * request. Occurs very rarely, not worth optimizing. */
                             LogRel(("%s: Ctl#%d: redo entire operation\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl)));
-                            ataAsyncIOPutRequest(pCtl, pReq);
+                            ataHCAsyncIOPutRequest(pCtl, pReq);
                             break;
                         }
                     }
                     else
-                        ataCmdOK(s, 0);
+                        ataR3CmdOK(s, 0);
                     s->iIOBufferEnd = s->cbElementaryTransfer;
 
                 }
@@ -5232,15 +5596,15 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                         if (pCtl->BmDma.u8Cmd & BM_CMD_START)
                         {
                             Log2(("%s: Ctl#%d: message to async I/O thread, continuing DMA transfer immediately\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl)));
-                            ataAsyncIOPutRequest(pCtl, &g_ataDMARequest);
+                            ataHCAsyncIOPutRequest(pCtl, &g_ataDMARequest);
                         }
                     }
                     else
                     {
                         Assert(s->uTxDir == PDMBLOCKTXDIR_NONE); /* Any transfer which has an initial transfer size of 0 must be marked as such. */
                         /* Finish DMA transfer. */
-                        ataDMATransferStop(s);
-                        ataSetIRQ(s);
+                        ataR3DMATransferStop(s);
+                        ataHCSetIRQ(s);
                         pCtl->uAsyncIOState = ATA_AIO_NEW;
                     }
                 }
@@ -5248,10 +5612,10 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                 {
                     if (s->cbTotalTransfer)
                     {
-                        ataPIOTransfer(pCtl);
+                        ataHCPIOTransfer(pCtl);
                         Assert(!pCtl->fRedo);
                         if (s->fATAPITransfer || s->uTxDir != PDMBLOCKTXDIR_TO_DEVICE)
-                            ataSetIRQ(s);
+                            ataHCSetIRQ(s);
 
                         if (s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE || s->iSourceSink != ATAFN_SS_NULL)
                         {
@@ -5276,10 +5640,10 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                     {
                         Assert(s->uTxDir == PDMBLOCKTXDIR_NONE); /* Any transfer which has an initial transfer size of 0 must be marked as such. */
                         /* Finish PIO transfer. */
-                        ataPIOTransfer(pCtl);
+                        ataHCPIOTransfer(pCtl);
                         Assert(!pCtl->fRedo);
                         if (!s->fATAPITransfer)
-                            ataSetIRQ(s);
+                            ataHCSetIRQ(s);
                         pCtl->uAsyncIOState = ATA_AIO_NEW;
                     }
                 }
@@ -5303,12 +5667,12 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                     pCtl->pFirstDMADesc = bm->pvAddr;
                     pCtl->pLastDMADesc = RT_ALIGN_32(bm->pvAddr + 1, _4K) - sizeof(BMDMADesc);
                 }
-                ataDMATransfer(pCtl);
+                ataR3DMATransfer(pCtl);
 
                 if (RT_UNLIKELY(pCtl->fRedo && !pCtl->fReset))
                 {
                     LogRel(("PIIX3 ATA: Ctl#%d: redo DMA operation\n", ATACONTROLLER_IDX(pCtl)));
-                    ataAsyncIOPutRequest(pCtl, &g_ataDMARequest);
+                    ataHCAsyncIOPutRequest(pCtl, &g_ataDMARequest);
                     break;
                 }
 
@@ -5336,7 +5700,7 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                     Log2(("%s: Ctl#%d: interrupt reason %#04x\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl), s->uATARegNSector));
                     s->fATAPITransfer = false;
                 }
-                ataSetIRQ(s);
+                ataHCSetIRQ(s);
                 pCtl->uAsyncIOState = ATA_AIO_NEW;
                 break;
             }
@@ -5353,7 +5717,7 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                     if (RT_UNLIKELY(fRedo && !pCtl->fReset))
                     {
                         LogRel(("PIIX3 ATA: Ctl#%d: redo PIO operation\n", ATACONTROLLER_IDX(pCtl)));
-                        ataAsyncIOPutRequest(pCtl, &g_ataPIORequest);
+                        ataHCAsyncIOPutRequest(pCtl, &g_ataPIORequest);
                         break;
                     }
                     s->iIOBufferCur = 0;
@@ -5376,8 +5740,8 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
 
                 if (s->cbTotalTransfer)
                 {
-                    ataPIOTransfer(pCtl);
-                    ataSetIRQ(s);
+                    ataHCPIOTransfer(pCtl);
+                    ataHCSetIRQ(s);
 
                     if (s->uTxDir == PDMBLOCKTXDIR_TO_DEVICE || s->iSourceSink != ATAFN_SS_NULL)
                     {
@@ -5401,12 +5765,12 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                 else
                 {
                     /* Finish PIO transfer. */
-                    ataPIOTransfer(pCtl);
+                    ataHCPIOTransfer(pCtl);
                     if (    !pCtl->fChainedTransfer
                         &&  !s->fATAPITransfer
                         &&  s->uTxDir != PDMBLOCKTXDIR_FROM_DEVICE)
                     {
-                            ataSetIRQ(s);
+                            ataHCSetIRQ(s);
                     }
                     pCtl->uAsyncIOState = ATA_AIO_NEW;
                 }
@@ -5414,8 +5778,8 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
 
             case ATA_AIO_RESET_ASSERTED:
                 pCtl->uAsyncIOState = ATA_AIO_RESET_CLEARED;
-                ataPIOTransferStop(&pCtl->aIfs[0]);
-                ataPIOTransferStop(&pCtl->aIfs[1]);
+                ataHCPIOTransferStop(&pCtl->aIfs[0]);
+                ataHCPIOTransferStop(&pCtl->aIfs[1]);
                 /* Do not change the DMA registers, they are not affected by the
                  * ATA controller reset logic. It should be sufficient to issue a
                  * new command, which is now possible as the state is cleared. */
@@ -5436,7 +5800,7 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                         ataSetStatusValue(&pCtl->aIfs[i], 0); /* NOTE: READY is _not_ set */
                     else
                         ataSetStatusValue(&pCtl->aIfs[i], ATA_STAT_READY | ATA_STAT_SEEK);
-                    ataSetSignature(&pCtl->aIfs[i]);
+                    ataR3SetSignature(&pCtl->aIfs[i]);
                 }
                 break;
 
@@ -5452,17 +5816,17 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                  * new command, which is now possible as the state is cleared. */
                 if (pReq->u.a.fResetDrive)
                 {
-                    ataResetDevice(s);
-                    ataExecuteDeviceDiagnosticSS(s);
+                    ataR3ResetDevice(s);
+                    ataR3ExecuteDeviceDiagnosticSS(s);
                 }
                 else
                 {
                     /* Stop any pending DMA transfer. */
                     s->fDMA = false;
-                    ataPIOTransferStop(s);
+                    ataHCPIOTransferStop(s);
                     ataUnsetStatus(s, ATA_STAT_BUSY | ATA_STAT_DRQ | ATA_STAT_SEEK | ATA_STAT_ERR);
                     ataSetStatus(s, ATA_STAT_READY);
-                    ataSetIRQ(s);
+                    ataHCSetIRQ(s);
                 }
                 break;
 
@@ -5470,14 +5834,14 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                 AssertMsgFailed(("Undefined async I/O state %d\n", pCtl->uAsyncIOState));
         }
 
-        ataAsyncIORemoveCurrentRequest(pCtl, ReqType);
-        pReq = ataAsyncIOGetCurrentRequest(pCtl);
+        ataR3AsyncIORemoveCurrentRequest(pCtl, ReqType);
+        pReq = ataR3AsyncIOGetCurrentRequest(pCtl);
 
         if (pCtl->uAsyncIOState == ATA_AIO_NEW && !pCtl->fChainedTransfer)
         {
-#if defined(DEBUG) || defined(VBOX_WITH_STATISTICS)
+# if defined(DEBUG) || defined(VBOX_WITH_STATISTICS)
             STAM_PROFILE_ADV_STOP(&pCtl->StatAsyncTime, a);
-#endif /* DEBUG || VBOX_WITH_STATISTICS */
+# endif
 
             u64TS = RTTimeNanoTS() - u64TS;
             uWait = u64TS / 1000;
@@ -5517,7 +5881,7 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
                 }
             }
 
-#if defined(DEBUG) || defined(VBOX_WITH_STATISTICS)
+# if defined(DEBUG) || defined(VBOX_WITH_STATISTICS)
             if (uWait < pCtl->StatAsyncMinWait || !pCtl->StatAsyncMinWait)
                 pCtl->StatAsyncMinWait = uWait;
             if (uWait > pCtl->StatAsyncMaxWait)
@@ -5525,7 +5889,7 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
 
             STAM_COUNTER_ADD(&pCtl->StatAsyncTimeUS, uWait);
             STAM_COUNTER_INC(&pCtl->StatAsyncOps);
-#endif /* DEBUG || VBOX_WITH_STATISTICS */
+# endif /* DEBUG || VBOX_WITH_STATISTICS */
         }
 
         PDMCritSectLeave(&pCtl->lock);
@@ -5537,7 +5901,7 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser)
         PDMDevHlpAsyncNotificationCompleted(pCtl->pDevInsR3);
 
     /* Cleanup the state.  */
-    /* Do not destroy request mutex yet, still needed for proper shutdown. */
+    /* Do not destroy request lock yet, still needed for proper shutdown. */
     pCtl->fShutdown = false;
 
     Log2(("%s: Ctl#%d: return %Rrc\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl), rc));
@@ -5564,7 +5928,7 @@ static void ataBMDMACmdWriteB(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
     }
     else
     {
-#ifdef IN_RING3
+#ifndef IN_RC
         /* Check whether the guest OS wants to change DMA direction in
          * mid-flight. Not allowed, according to the PIIX3 specs. */
         Assert(!(pCtl->BmDma.u8Status & BM_STATUS_DMAING) || !((val ^ pCtl->BmDma.u8Cmd) & 0x04));
@@ -5588,10 +5952,10 @@ static void ataBMDMACmdWriteB(PATACONTROLLER pCtl, uint32_t addr, uint32_t val)
         if (pCtl->aIfs[pCtl->iAIOIf].uATARegStatus & ATA_STAT_DRQ)
         {
             Log2(("%s: Ctl#%d: message to async I/O thread, continuing DMA transfer\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl)));
-            ataAsyncIOPutRequest(pCtl, &g_ataDMARequest);
+            ataHCAsyncIOPutRequest(pCtl, &g_ataDMARequest);
         }
 #else /* !IN_RING3 */
-        AssertMsgFailed(("DMA START handling is too complicated for GC\n"));
+        AssertMsgFailed(("DMA START handling is too complicated for RC\n"));
 #endif /* IN_RING3 */
     }
 }
@@ -5688,13 +6052,13 @@ PDMBOTHCBDECL(int) ataBMDMAIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPOR
     switch (VAL(Port, cb))
     {
         case VAL(0, 1):
-#ifndef IN_RING3
+#ifdef IN_RC
             if (u32 & BM_CMD_START)
             {
                 rc = VINF_IOM_R3_IOPORT_WRITE;
                 break;
             }
-#endif /* !IN_RING3 */
+#endif
             ataBMDMACmdWriteB(pCtl, Port, u32);
             break;
         case VAL(2, 1): ataBMDMAStatusWriteB(pCtl, Port, u32); break;
@@ -5722,7 +6086,8 @@ PDMBOTHCBDECL(int) ataBMDMAIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPOR
  *                          This address is *NOT* relative to pci_mem_base like earlier!
  * @param   enmType         One of the PCI_ADDRESS_SPACE_* values.
  */
-static DECLCALLBACK(int) ataBMDMAIORangeMap(PPCIDEVICE pPciDev, /*unsigned*/ int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType)
+static DECLCALLBACK(int) ataR3BMDMAIORangeMap(PPCIDEVICE pPciDev, /*unsigned*/ int iRegion,
+                                              RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType)
 {
     PCIATAState *pThis = PCIDEV_2_PCIATASTATE(pPciDev);
     int         rc = VINF_SUCCESS;
@@ -5734,15 +6099,17 @@ static DECLCALLBACK(int) ataBMDMAIORangeMap(PPCIDEVICE pPciDev, /*unsigned*/ int
     for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aCts); i++)
     {
         int rc2 = PDMDevHlpIOPortRegister(pPciDev->pDevIns, (RTIOPORT)GCPhysAddress + i * 8, 8,
-                                          (RTHCPTR)(uintptr_t)i, ataBMDMAIOPortWrite, ataBMDMAIOPortRead, NULL, NULL, "ATA Bus Master DMA");
+                                          (RTHCPTR)(uintptr_t)i, ataBMDMAIOPortWrite, ataBMDMAIOPortRead,
+                                          NULL, NULL, "ATA Bus Master DMA");
         AssertRC(rc2);
         if (rc2 < rc)
             rc = rc2;
 
-        if (pThis->fGCEnabled)
+        if (pThis->fRCEnabled)
         {
             rc2 = PDMDevHlpIOPortRegisterRC(pPciDev->pDevIns, (RTIOPORT)GCPhysAddress + i * 8, 8,
-                                            (RTGCPTR)i, "ataBMDMAIOPortWrite", "ataBMDMAIOPortRead", NULL, NULL, "ATA Bus Master DMA");
+                                            (RTGCPTR)i, "ataBMDMAIOPortWrite", "ataBMDMAIOPortRead",
+                                            NULL, NULL, "ATA Bus Master DMA");
             AssertRC(rc2);
             if (rc2 < rc)
                 rc = rc2;
@@ -5750,7 +6117,8 @@ static DECLCALLBACK(int) ataBMDMAIORangeMap(PPCIDEVICE pPciDev, /*unsigned*/ int
         if (pThis->fR0Enabled)
         {
             rc2 = PDMDevHlpIOPortRegisterR0(pPciDev->pDevIns, (RTIOPORT)GCPhysAddress + i * 8, 8,
-                                            (RTR0PTR)i, "ataBMDMAIOPortWrite", "ataBMDMAIOPortRead", NULL, NULL, "ATA Bus Master DMA");
+                                            (RTR0PTR)i, "ataBMDMAIOPortWrite", "ataBMDMAIOPortRead",
+                                            NULL, NULL, "ATA Bus Master DMA");
             AssertRC(rc2);
             if (rc2 < rc)
                 rc = rc2;
@@ -5765,7 +6133,7 @@ static DECLCALLBACK(int) ataBMDMAIORangeMap(PPCIDEVICE pPciDev, /*unsigned*/ int
 /**
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) ataStatus_QueryInterface(PPDMIBASE pInterface, const char *pszIID)
+static DECLCALLBACK(void *) ataR3Status_QueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     PCIATAState *pThis = PDMIBASE_2_PCIATASTATE(pInterface);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pThis->IBase);
@@ -5784,7 +6152,7 @@ static DECLCALLBACK(void *) ataStatus_QueryInterface(PPDMIBASE pInterface, const
  * @param   iLUN            The unit which status LED we desire.
  * @param   ppLed           Where to store the LED pointer.
  */
-static DECLCALLBACK(int) ataStatus_QueryStatusLed(PPDMILEDPORTS pInterface, unsigned iLUN, PPDMLED *ppLed)
+static DECLCALLBACK(int) ataR3Status_QueryStatusLed(PPDMILEDPORTS pInterface, unsigned iLUN, PPDMLED *ppLed)
 {
     PCIATAState *pThis = PDMILEDPORTS_2_PCIATASTATE(pInterface);
     if (iLUN < 4)
@@ -5808,7 +6176,7 @@ static DECLCALLBACK(int) ataStatus_QueryStatusLed(PPDMILEDPORTS pInterface, unsi
 /**
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *)  ataQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+static DECLCALLBACK(void *) ataR3QueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     ATADevState *pIf = PDMIBASE_2_ATASTATE(pInterface);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pIf->IBase);
@@ -5839,34 +6207,27 @@ static DECLCALLBACK(int) ataR3QueryDeviceLocation(PPDMIBLOCKPORT pInterface, con
 
     return VINF_SUCCESS;
 }
-#endif /* IN_RING3 */
 
+#endif /* IN_RING3 */
 
 /* -=-=-=-=-=- Wrappers  -=-=-=-=-=- */
 
+
 /**
  * Port I/O Handler for primary port range OUT operations.
  * @see FNIOMIOPORTOUT for details.
  */
-PDMBOTHCBDECL(int) ataIOPortWrite1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
+PDMBOTHCBDECL(int) ataIOPortWrite1Other(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
     uint32_t       i = (uint32_t)(uintptr_t)pvUser;
     PCIATAState   *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
     PATACONTROLLER pCtl = &pThis->aCts[i];
-    int            rc = VINF_SUCCESS;
 
     Assert(i < 2);
+    Assert(Port != pCtl->IOPortBase1);
 
-    rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_WRITE);
-    if (rc != VINF_SUCCESS)
-        return rc;
-    if (Port == pCtl->IOPortBase1)
-    {
-        /* Writes to the data port may be 16-bit or 32-bit. */
-        Assert(cb == 2 || cb == 4);
-        rc = ataDataWrite(pCtl, Port, cb, (const uint8_t *)&u32);
-    }
-    else
+    int rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_WRITE);
+    if (rc == VINF_SUCCESS)
     {
         /* Writes to the other command block ports should be 8-bit only. If they
          * are not, the high bits are simply discarded. Undocumented, but observed
@@ -5876,8 +6237,9 @@ PDMBOTHCBDECL(int) ataIOPortWrite1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Po
             Log(("ataIOPortWrite1: suspect write to port %x val=%x size=%d\n", Port, u32, cb));
 
         rc = ataIOPortWriteU8(pCtl, Port, u32);
+
+        PDMCritSectLeave(&pCtl->lock);
     }
-    PDMCritSectLeave(&pCtl->lock);
     return rc;
 }
 
@@ -5886,27 +6248,17 @@ PDMBOTHCBDECL(int) ataIOPortWrite1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Po
  * Port I/O Handler for primary port range IN operations.
  * @see FNIOMIOPORTIN for details.
  */
-PDMBOTHCBDECL(int) ataIOPortRead1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
+PDMBOTHCBDECL(int) ataIOPortRead1Other(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
     uint32_t       i = (uint32_t)(uintptr_t)pvUser;
     PCIATAState   *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
     PATACONTROLLER pCtl = &pThis->aCts[i];
-    int            rc = VINF_SUCCESS;
 
     Assert(i < 2);
+    Assert(Port != pCtl->IOPortBase1);
 
-    rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_READ);
-    if (rc != VINF_SUCCESS)
-        return rc;
-    if (Port == pCtl->IOPortBase1)
-    {
-        /* Reads from the data register may be 16-bit or 32-bit. */
-        Assert(cb == 1 || cb == 2 || cb == 4);
-        rc = ataDataRead(pCtl, Port, cb == 1 ? 2 : cb, (uint8_t *)pu32);
-        if (cb <= 2)
-            *pu32 &= 0xffff >> (16 - cb * 8);
-    }
-    else
+    int rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_READ);
+    if (rc == VINF_SUCCESS)
     {
         /* Reads from the other command block registers should be 8-bit only.
          * If they are not, the low byte is propagated to the high bits.
@@ -5924,85 +6276,45 @@ PDMBOTHCBDECL(int) ataIOPortRead1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Por
             *pu32 = pad;
             Log(("ataIOPortRead1: suspect read from port %x size=%d\n", Port, cb));
         }
+        PDMCritSectLeave(&pCtl->lock);
     }
-    PDMCritSectLeave(&pCtl->lock);
     return rc;
 }
 
-#ifndef IN_RING0 /** @todo do this in ring-0 as well. */
+
 /**
- * Port I/O Handler for primary port range IN string operations.
- * @see FNIOMIOPORTINSTRING for details.
+ * Port I/O Handler for secondary port range OUT operations.
+ * @see FNIOMIOPORTOUT for details.
  */
-PDMBOTHCBDECL(int) ataIOPortReadStr1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrDst, PRTGCUINTREG pcTransfer, unsigned cb)
+PDMBOTHCBDECL(int) ataIOPortWrite2(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
     uint32_t       i = (uint32_t)(uintptr_t)pvUser;
     PCIATAState   *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
     PATACONTROLLER pCtl = &pThis->aCts[i];
-    int            rc = VINF_SUCCESS;
+    int rc;
 
     Assert(i < 2);
 
-    rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_READ);
-    if (rc != VINF_SUCCESS)
-        return rc;
-    if (Port == pCtl->IOPortBase1)
+    if (cb == 1)
     {
-        uint32_t cTransAvailable, cTransfer = *pcTransfer, cbTransfer;
-        RTGCPTR GCDst = *pGCPtrDst;
-        ATADevState *s = &pCtl->aIfs[pCtl->iSelectedIf];
-        Assert(cb == 2 || cb == 4);
-
-        cTransAvailable = (s->iIOBufferPIODataEnd - s->iIOBufferPIODataStart) / cb;
-#ifndef IN_RING3
-        /* Deal with the unlikely case where no data (or not enough for the read length operation) is available; go back to ring 3. */
-        if (!cTransAvailable)
-        {
-            PDMCritSectLeave(&pCtl->lock);
-            return VINF_IOM_R3_IOPORT_READ;
-        }
-        /* The last transfer unit cannot be handled in GC, as it involves thread communication. */
-        cTransAvailable--;
-#endif /* !IN_RING3 */
-        /* Do not handle the dummy transfer stuff here, leave it to the single-word transfers.
-         * They are not performance-critical and generally shouldn't occur at all. */
-        if (cTransAvailable > cTransfer)
-            cTransAvailable = cTransfer;
-        cbTransfer = cTransAvailable * cb;
-
-        rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart, cbTransfer);
-#ifndef IN_RING3
-        /* Paranoia. */
-        if (RT_FAILURE(rc))
+        rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_WRITE);
+        if (rc == VINF_SUCCESS)
         {
+            rc = ataControlWrite(pCtl, Port, u32);
             PDMCritSectLeave(&pCtl->lock);
-            AssertFailed();
-            return VINF_IOM_R3_IOPORT_READ;
         }
-#else
-        Assert(rc == VINF_SUCCESS);
-#endif
-
-        if (cbTransfer)
-            Log3(("%s: addr=%#x val=%.*Rhxs\n", __FUNCTION__, Port, cbTransfer, s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart));
-        s->iIOBufferPIODataStart += cbTransfer;
-        *pGCPtrDst = (RTGCPTR)((RTGCUINTPTR)GCDst + cbTransfer);
-        *pcTransfer = cTransfer - cTransAvailable;
-#ifdef IN_RING3
-        if (s->iIOBufferPIODataStart >= s->iIOBufferPIODataEnd)
-            ataPIOTransferFinish(pCtl, s);
-#endif /* IN_RING3 */
     }
-    PDMCritSectLeave(&pCtl->lock);
+    else
+        rc = VINF_SUCCESS;
     return rc;
 }
 
 
 /**
- * Port I/O Handler for primary port range OUT string operations.
- * @see FNIOMIOPORTOUTSTRING for details.
+ * Port I/O Handler for secondary port range IN operations.
+ * @see FNIOMIOPORTIN for details.
  */
-PDMBOTHCBDECL(int) ataIOPortWriteStr1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrSrc, PRTGCUINTREG pcTransfer, unsigned cb)
+PDMBOTHCBDECL(int) ataIOPortRead2(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
     uint32_t       i = (uint32_t)(uintptr_t)pvUser;
     PCIATAState   *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
@@ -6011,113 +6323,24 @@ PDMBOTHCBDECL(int) ataIOPortWriteStr1(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT
 
     Assert(i < 2);
 
-    rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_WRITE);
-    if (rc != VINF_SUCCESS)
-        return rc;
-    if (Port == pCtl->IOPortBase1)
+    if (cb == 1)
     {
-        uint32_t cTransAvailable, cTransfer = *pcTransfer, cbTransfer;
-        RTGCPTR GCSrc = *pGCPtrSrc;
-        ATADevState *s = &pCtl->aIfs[pCtl->iSelectedIf];
-        Assert(cb == 2 || cb == 4);
-
-        cTransAvailable = (s->iIOBufferPIODataEnd - s->iIOBufferPIODataStart) / cb;
-#ifndef IN_RING3
-        /* Deal with the unlikely case where no data (or not enough for the read length operation) is available; go back to ring 3. */
-        if (!cTransAvailable)
+        rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_READ);
+        if (rc == VINF_SUCCESS)
         {
+            *pu32 = ataStatusRead(pCtl, Port);
             PDMCritSectLeave(&pCtl->lock);
-            return VINF_IOM_R3_IOPORT_WRITE;
         }
-        /* The last transfer unit cannot be handled in GC, as it involves thread communication. */
-        cTransAvailable--;
-#endif /* !IN_RING3 */
-        /* Do not handle the dummy transfer stuff here, leave it to the single-word transfers.
-         * They are not performance-critical and generally shouldn't occur at all. */
-        if (cTransAvailable > cTransfer)
-            cTransAvailable = cTransfer;
-        cbTransfer = cTransAvailable * cb;
-
-        rc = PGMPhysSimpleReadGCPtr(PDMDevHlpGetVMCPU(pDevIns), s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart, GCSrc, cbTransfer);
-#ifndef IN_RING3
-        /* Paranoia. */
-        if (RT_FAILURE(rc))
-        {
-            PDMCritSectLeave(&pCtl->lock);
-            AssertFailed();
-            return VINF_IOM_R3_IOPORT_WRITE;
-        }
-#else
-        Assert(rc == VINF_SUCCESS);
-#endif
-
-        if (cbTransfer)
-            Log3(("%s: addr=%#x val=%.*Rhxs\n", __FUNCTION__, Port, cbTransfer, s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart));
-        s->iIOBufferPIODataStart += cbTransfer;
-        *pGCPtrSrc = (RTGCPTR)((RTGCUINTPTR)GCSrc + cbTransfer);
-        *pcTransfer = cTransfer - cTransAvailable;
-#ifdef IN_RING3
-        if (s->iIOBufferPIODataStart >= s->iIOBufferPIODataEnd)
-            ataPIOTransferFinish(pCtl, s);
-#endif /* IN_RING3 */
     }
-    PDMCritSectLeave(&pCtl->lock);
-    return rc;
-}
-#endif /* !IN_RING0 */
-
-/**
- * Port I/O Handler for secondary port range OUT operations.
- * @see FNIOMIOPORTOUT for details.
- */
-PDMBOTHCBDECL(int) ataIOPortWrite2(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
-{
-    uint32_t       i = (uint32_t)(uintptr_t)pvUser;
-    PCIATAState   *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
-    PATACONTROLLER pCtl = &pThis->aCts[i];
-    int rc;
-
-    Assert(i < 2);
-
-    if (cb != 1)
-        return VINF_SUCCESS;
-    rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_WRITE);
-    if (rc != VINF_SUCCESS)
-        return rc;
-    rc = ataControlWrite(pCtl, Port, u32);
-    PDMCritSectLeave(&pCtl->lock);
+    else
+        rc = VERR_IOM_IOPORT_UNUSED;
     return rc;
 }
 
-
-/**
- * Port I/O Handler for secondary port range IN operations.
- * @see FNIOMIOPORTIN for details.
- */
-PDMBOTHCBDECL(int) ataIOPortRead2(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
-{
-    uint32_t       i = (uint32_t)(uintptr_t)pvUser;
-    PCIATAState   *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
-    PATACONTROLLER pCtl = &pThis->aCts[i];
-    int            rc;
-
-    Assert(i < 2);
-
-    if (cb != 1)
-        return VERR_IOM_IOPORT_UNUSED;
-
-    rc = PDMCritSectEnter(&pCtl->lock, VINF_IOM_R3_IOPORT_READ);
-    if (rc != VINF_SUCCESS)
-        return rc;
-    *pu32 = ataStatusRead(pCtl, Port);
-    PDMCritSectLeave(&pCtl->lock);
-    return VINF_SUCCESS;
-}
-
 #ifdef IN_RING3
 
 
-DECLINLINE(void) ataRelocBuffer(PPDMDEVINS pDevIns, ATADevState *s)
+DECLINLINE(void) ataR3RelocBuffer(PPDMDEVINS pDevIns, ATADevState *s)
 {
     if (s->pbIOBufferR3)
         s->pbIOBufferRC = MMHyperR3ToRC(PDMDevHlpGetVM(pDevIns), s->pbIOBufferR3);
@@ -6165,7 +6388,7 @@ static DECLCALLBACK(void) ataR3Detach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_
     /*
      * In case there was a medium inserted.
      */
-    ataMediumRemoved(pIf);
+    ataR3MediumRemoved(pIf);
 }
 
 
@@ -6176,7 +6399,7 @@ static DECLCALLBACK(void) ataR3Detach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_
  * @param   pDevIns     The device instance.
  * @param   pIf         The ATA unit state.
  */
-static int ataConfigLun(PPDMDEVINS pDevIns, ATADevState *pIf)
+static int ataR3ConfigLun(PPDMDEVINS pDevIns, ATADevState *pIf)
 {
     int             rc = VINF_SUCCESS;
     PDMBLOCKTYPE    enmType;
@@ -6354,12 +6577,12 @@ static DECLCALLBACK(int)  ataR3Attach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_
     rc = PDMDevHlpDriverAttach(pDevIns, pIf->iLUN, &pIf->IBase, &pIf->pDrvBase, NULL);
     if (RT_SUCCESS(rc))
     {
-        rc = ataConfigLun(pDevIns, pIf);
+        rc = ataR3ConfigLun(pDevIns, pIf);
         /*
          * In case there is a medium inserted.
          */
-        ataMediumInserted(pIf);
-        ataMediumTypeSet(pIf, ATA_MEDIA_TYPE_UNKNOWN);
+        ataR3MediumInserted(pIf);
+        ataR3MediumTypeSet(pIf, ATA_MEDIA_TYPE_UNKNOWN);
     }
     else
         AssertMsgFailed(("Failed to attach LUN#%d. rc=%Rrc\n", pIf->iLUN, rc));
@@ -6411,14 +6634,15 @@ static bool ataR3AllAsyncIOIsIdle(PPDMDEVINS pDevIns)
     for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aCts); i++)
         if (pThis->aCts[i].AsyncIOThread != NIL_RTTHREAD)
         {
-            bool fRc = ataAsyncIOIsIdle(&pThis->aCts[i], false /*fStrict*/);
+            bool fRc = ataR3AsyncIOIsIdle(&pThis->aCts[i], false /*fStrict*/);
             if (!fRc)
             {
                 /* Make it signal PDM & itself when its done */
-                RTSemMutexRequest(pThis->aCts[i].AsyncIORequestMutex, RT_INDEFINITE_WAIT);
+                PDMCritSectEnter(&pThis->aCts[i].AsyncIORequestLock, VERR_IGNORED);
                 ASMAtomicWriteBool(&pThis->aCts[i].fSignalIdle, true);
-                RTSemMutexRelease(pThis->aCts[i].AsyncIORequestMutex);
-                fRc = ataAsyncIOIsIdle(&pThis->aCts[i], false /*fStrict*/);
+                PDMCritSectLeave(&pThis->aCts[i].AsyncIORequestLock);
+
+                fRc = ataR3AsyncIOIsIdle(&pThis->aCts[i], false /*fStrict*/);
                 if (!fRc)
                 {
 #if 0  /** @todo Need to do some time tracking here... */
@@ -6441,13 +6665,13 @@ static bool ataR3AllAsyncIOIsIdle(PPDMDEVINS pDevIns)
  * @param   pDevIns         Device instance of the device which registered the data unit.
  * @param   pSSM            SSM operation handle.
  */
-static DECLCALLBACK(int) ataSaveLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+static DECLCALLBACK(int) ataR3SaveLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
     PCIATAState    *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
 
     /* sanity - the suspend notification will wait on the async stuff. */
     for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aCts); i++)
-        AssertLogRelMsgReturn(ataAsyncIOIsIdle(&pThis->aCts[i], false /*fStrict*/),
+        AssertLogRelMsgReturn(ataR3AsyncIOIsIdle(&pThis->aCts[i], false /*fStrict*/),
                               ("i=%u\n", i),
                               VERR_SSM_IDE_ASYNC_TIMEOUT);
     return VINF_SUCCESS;
@@ -6456,7 +6680,7 @@ static DECLCALLBACK(int) ataSaveLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 /**
  * @copydoc FNSSMDEVLIVEEXEC
  */
-static DECLCALLBACK(int) ataLiveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass)
+static DECLCALLBACK(int) ataR3LiveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass)
 {
     PCIATAState    *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
 
@@ -6479,11 +6703,11 @@ static DECLCALLBACK(int) ataLiveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32
 /**
  * @copydoc FNSSMDEVSAVEEXEC
  */
-static DECLCALLBACK(int) ataSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+static DECLCALLBACK(int) ataR3SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
     PCIATAState    *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
 
-    ataLiveExec(pDevIns, pSSM, SSM_PASS_FINAL);
+    ataR3LiveExec(pDevIns, pSSM, SSM_PASS_FINAL);
 
     for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aCts); i++)
     {
@@ -6560,7 +6784,7 @@ static DECLCALLBACK(int) ataSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 /**
  * Converts the LUN number into a message string.
  */
-static const char *ataStringifyLun(unsigned iLun)
+static const char *ataR3StringifyLun(unsigned iLun)
 {
     switch (iLun)
     {
@@ -6575,7 +6799,7 @@ static const char *ataStringifyLun(unsigned iLun)
 /**
  * FNSSMDEVLOADEXEC
  */
-static DECLCALLBACK(int) ataLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
+static DECLCALLBACK(int) ataR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
     PCIATAState    *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
     int             rc;
@@ -6620,7 +6844,7 @@ static DECLCALLBACK(int) ataLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32
                 if (fInUse != (pIf->pDrvBase != NULL))
                     return SSMR3SetCfgError(pSSM, RT_SRC_POS,
                                             N_("The %s VM is missing a %s device. Please make sure the source and target VMs have compatible storage configurations"),
-                                            fInUse ? "target" : "source", ataStringifyLun(pIf->iLUN) );
+                                            fInUse ? "target" : "source", ataR3StringifyLun(pIf->iLUN) );
 
                 char szSerialNumber[ATA_SERIAL_NUMBER_LENGTH+1];
                 rc = SSMR3GetStrZ(pSSM, szSerialNumber,     sizeof(szSerialNumber));
@@ -6654,7 +6878,7 @@ static DECLCALLBACK(int) ataLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32
     for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aCts); i++)
     {
         /* integrity check */
-        if (!ataAsyncIOIsIdle(&pThis->aCts[i], false))
+        if (!ataR3AsyncIOIsIdle(&pThis->aCts[i], false))
         {
             AssertMsgFailed(("Async I/O for controller %d is active\n", i));
             return VERR_INTERNAL_ERROR_4;
@@ -6847,7 +7071,7 @@ static DECLCALLBACK(bool) ataR3IsAsyncResetDone(PPDMDEVINS pDevIns)
     {
         PDMCritSectEnter(&pThis->aCts[i].lock, VERR_INTERNAL_ERROR);
         for (uint32_t j = 0; j < RT_ELEMENTS(pThis->aCts[i].aIfs); j++)
-            ataResetDevice(&pThis->aCts[i].aIfs[j]);
+            ataR3ResetDevice(&pThis->aCts[i].aIfs[j]);
         PDMCritSectLeave(&pThis->aCts[i].lock);
     }
     return true;
@@ -6882,10 +7106,10 @@ static int ataR3ResetCommon(PPDMDEVINS pDevIns, bool fConstruct)
         pThis->aCts[i].fReset = true;
         pThis->aCts[i].fRedo = false;
         pThis->aCts[i].fRedoIdle = false;
-        ataAsyncIOClearRequests(&pThis->aCts[i]);
+        ataR3AsyncIOClearRequests(&pThis->aCts[i]);
         Log2(("%s: Ctl#%d: message to async I/O thread, reset controller\n", __FUNCTION__, i));
-        ataAsyncIOPutRequest(&pThis->aCts[i], &g_ataResetARequest);
-        ataAsyncIOPutRequest(&pThis->aCts[i], &g_ataResetCRequest);
+        ataHCAsyncIOPutRequest(&pThis->aCts[i], &g_ataResetARequest);
+        ataHCAsyncIOPutRequest(&pThis->aCts[i], &g_ataResetCRequest);
 
         PDMCritSectLeave(&pThis->aCts[i].lock);
     }
@@ -6913,17 +7137,17 @@ static int ataR3ResetCommon(PPDMDEVINS pDevIns, bool fConstruct)
         {
             if (pThis->aCts[i].AsyncIOThread != NIL_RTTHREAD)
             {
-                int rc = RTSemMutexRequest(pThis->aCts[i].AsyncIORequestMutex, RT_INDEFINITE_WAIT);
+                int rc = PDMCritSectEnter(&pThis->aCts[i].AsyncIORequestLock, VERR_IGNORED);
                 AssertRC(rc);
 
                 ASMAtomicWriteBool(&pThis->aCts[i].fSignalIdle, true);
                 rc = RTThreadUserReset(pThis->aCts[i].AsyncIOThread);
                 AssertRC(rc);
 
-                rc = RTSemMutexRelease(pThis->aCts[i].AsyncIORequestMutex);
+                rc = PDMCritSectLeave(&pThis->aCts[i].AsyncIORequestLock);
                 AssertRC(rc);
 
-                if (!ataAsyncIOIsIdle(&pThis->aCts[i], false /*fStrict*/))
+                if (!ataR3AsyncIOIsIdle(&pThis->aCts[i], false /*fStrict*/))
                 {
                     rc = RTThreadUserWait(pThis->aCts[i].AsyncIOThread,  30*1000 /*ms*/);
                     if (RT_FAILURE(rc))
@@ -6968,10 +7192,10 @@ static DECLCALLBACK(void) ataR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
         pThis->aCts[i].pDevInsRC += offDelta;
         pThis->aCts[i].aIfs[0].pDevInsRC += offDelta;
         pThis->aCts[i].aIfs[0].pControllerRC += offDelta;
-        ataRelocBuffer(pDevIns, &pThis->aCts[i].aIfs[0]);
+        ataR3RelocBuffer(pDevIns, &pThis->aCts[i].aIfs[0]);
         pThis->aCts[i].aIfs[1].pDevInsRC += offDelta;
         pThis->aCts[i].aIfs[1].pControllerRC += offDelta;
-        ataRelocBuffer(pDevIns, &pThis->aCts[i].aIfs[1]);
+        ataR3RelocBuffer(pDevIns, &pThis->aCts[i].aIfs[1]);
     }
 }
 
@@ -6999,7 +7223,7 @@ static DECLCALLBACK(int) ataR3Destruct(PPDMDEVINS pDevIns)
         if (pThis->aCts[i].AsyncIOThread != NIL_RTTHREAD)
         {
             ASMAtomicWriteU32(&pThis->aCts[i].fShutdown, true);
-            rc = RTSemEventSignal(pThis->aCts[i].AsyncIOSem);
+            rc = SUPSemEventSignal(pThis->aCts[i].pSupDrvSession, pThis->aCts[i].hAsyncIOSem);
             AssertRC(rc);
             rc = RTSemEventSignal(pThis->aCts[i].SuspendIOSem);
             AssertRC(rc);
@@ -7028,15 +7252,12 @@ static DECLCALLBACK(int) ataR3Destruct(PPDMDEVINS pDevIns)
      */
     for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aCts); i++)
     {
-        if (pThis->aCts[i].AsyncIORequestMutex != NIL_RTSEMMUTEX)
+        if (PDMCritSectIsInitialized(&pThis->aCts[i].AsyncIORequestLock))
+            PDMR3CritSectDelete(&pThis->aCts[i].AsyncIORequestLock);
+        if (pThis->aCts[i].hAsyncIOSem != NIL_SUPSEMEVENT)
         {
-            RTSemMutexDestroy(pThis->aCts[i].AsyncIORequestMutex);
-            pThis->aCts[i].AsyncIORequestMutex = NIL_RTSEMMUTEX;
-        }
-        if (pThis->aCts[i].AsyncIOSem != NIL_RTSEMEVENT)
-        {
-            RTSemEventDestroy(pThis->aCts[i].AsyncIOSem);
-            pThis->aCts[i].AsyncIOSem = NIL_RTSEMEVENT;
+            SUPSemEventClose(pThis->aCts[i].pSupDrvSession, pThis->aCts[i].hAsyncIOSem);
+            pThis->aCts[i].hAsyncIOSem = NIL_SUPSEMEVENT;
         }
         if (pThis->aCts[i].SuspendIOSem != NIL_RTSEMEVENT)
         {
@@ -7076,7 +7297,7 @@ static DECLCALLBACK(int) ataR3Destruct(PPDMDEVINS pDevIns)
  * @param   pCfg        Configuration handle.
  * @param   penmChipset Where to store the chipset type.
  */
-static int ataControllerFromCfg(PPDMDEVINS pDevIns, PCFGMNODE pCfg, CHIPSET *penmChipset)
+static int ataR3ControllerFromCfg(PPDMDEVINS pDevIns, PCFGMNODE pCfg, CHIPSET *penmChipset)
 {
     char szType[20];
 
@@ -7103,12 +7324,12 @@ static int ataControllerFromCfg(PPDMDEVINS pDevIns, PCFGMNODE pCfg, CHIPSET *pen
 /**
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
-static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
+static DECLCALLBACK(int) ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
     PCIATAState    *pThis = PDMINS_2_DATA(pDevIns, PCIATAState *);
     PPDMIBASE       pBase;
     int             rc;
-    bool            fGCEnabled;
+    bool            fRCEnabled;
     bool            fR0Enabled;
     uint32_t        DelayIRQMillies;
 
@@ -7120,9 +7341,8 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
      */
     for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aCts); i++)
     {
-        pThis->aCts[i].AsyncIOSem = NIL_RTSEMEVENT;
+        pThis->aCts[i].hAsyncIOSem = NIL_SUPSEMEVENT;
         pThis->aCts[i].SuspendIOSem = NIL_RTSEMEVENT;
-        pThis->aCts[i].AsyncIORequestMutex = NIL_RTSEMMUTEX;
         pThis->aCts[i].AsyncIOThread = NIL_RTTHREAD;
     }
 
@@ -7138,11 +7358,11 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("PIIX3 configuration error: unknown option specified"));
 
-    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fGCEnabled, true);
+    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fRCEnabled, true);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 configuration error: failed to read GCEnabled as boolean"));
-    Log(("%s: fGCEnabled=%d\n", __FUNCTION__, fGCEnabled));
+    Log(("%s: fRCEnabled=%d\n", __FUNCTION__, fRCEnabled));
 
     rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &fR0Enabled, true);
     if (RT_FAILURE(rc))
@@ -7158,7 +7378,7 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
     Assert(DelayIRQMillies < 50);
 
     CHIPSET enmChipset = CHIPSET_PIIX3;
-    rc = ataControllerFromCfg(pDevIns, pCfg, &enmChipset);
+    rc = ataR3ControllerFromCfg(pDevIns, pCfg, &enmChipset);
     if (RT_FAILURE(rc))
         return rc;
     pThis->u8Type = (uint8_t)enmChipset;
@@ -7167,8 +7387,8 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
      * Initialize data (most of it anyway).
      */
     /* Status LUN. */
-    pThis->IBase.pfnQueryInterface = ataStatus_QueryInterface;
-    pThis->ILeds.pfnQueryStatusLed = ataStatus_QueryStatusLed;
+    pThis->IBase.pfnQueryInterface = ataR3Status_QueryInterface;
+    pThis->ILeds.pfnQueryStatusLed = ataR3Status_QueryStatusLed;
 
     /* PCI configuration space. */
     PCIDevSetVendorId(&pThis->dev, 0x8086); /* Intel */
@@ -7219,7 +7439,7 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
     PCIDevSetHeaderType(&pThis->dev, 0x00);
 
     pThis->pDevIns          = pDevIns;
-    pThis->fGCEnabled       = fGCEnabled;
+    pThis->fRCEnabled       = fRCEnabled;
     pThis->fR0Enabled       = fR0Enabled;
     for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aCts); i++)
     {
@@ -7238,9 +7458,9 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
             pIf->pControllerR3 = &pThis->aCts[i];
             pIf->pControllerR0 = MMHyperR3ToR0(PDMDevHlpGetVM(pDevIns), &pThis->aCts[i]);
             pIf->pControllerRC = MMHyperR3ToRC(PDMDevHlpGetVM(pDevIns), &pThis->aCts[i]);
-            pIf->IBase.pfnQueryInterface       = ataQueryInterface;
-            pIf->IMountNotify.pfnMountNotify   = ataMountNotify;
-            pIf->IMountNotify.pfnUnmountNotify = ataUnmountNotify;
+            pIf->IBase.pfnQueryInterface       = ataR3QueryInterface;
+            pIf->IMountNotify.pfnMountNotify   = ataR3MountNotify;
+            pIf->IMountNotify.pfnUnmountNotify = ataR3UnmountNotify;
             pIf->IPort.pfnQueryDeviceLocation  = ataR3QueryDeviceLocation;
             pIf->Led.u32Magic                  = PDMLED_MAGIC;
         }
@@ -7270,7 +7490,7 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 cannot register PCI device"));
     //AssertMsg(pThis->dev.devfn == 9 || iInstance != 0, ("pThis->dev.devfn=%d\n", pThis->dev.devfn));
-    rc = PDMDevHlpPCIIORegionRegister(pDevIns, 4, 0x10, PCI_ADDRESS_SPACE_IO, ataBMDMAIORangeMap);
+    rc = PDMDevHlpPCIIORegionRegister(pDevIns, 4, 0x10, PCI_ADDRESS_SPACE_IO, ataR3BMDMAIORangeMap);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("PIIX3 cannot register PCI I/O region for BMDMA"));
@@ -7281,30 +7501,39 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
      */
     for (uint32_t i = 0; i < RT_ELEMENTS(pThis->aCts); i++)
     {
-        rc = PDMDevHlpIOPortRegister(pDevIns, pThis->aCts[i].IOPortBase1, 8, (RTHCPTR)(uintptr_t)i,
-                                     ataIOPortWrite1, ataIOPortRead1, ataIOPortWriteStr1, ataIOPortReadStr1, "ATA I/O Base 1");
-        if (RT_FAILURE(rc))
-            return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register I/O handlers"));
+        rc = PDMDevHlpIOPortRegister(pDevIns, pThis->aCts[i].IOPortBase1, 1, (RTHCPTR)(uintptr_t)i,
+                                     ataIOPortWrite1Data, ataIOPortRead1Data,
+                                     ataIOPortWriteStr1Data, ataIOPortReadStr1Data, "ATA I/O Base 1 - Data");
+        AssertLogRelRCReturn(rc, rc);
+        rc = PDMDevHlpIOPortRegister(pDevIns, pThis->aCts[i].IOPortBase1 + 1, 7, (RTHCPTR)(uintptr_t)i,
+                                     ataIOPortWrite1Other, ataIOPortRead1Other, NULL, NULL, "ATA I/O Base 1 - Other");
 
-        if (fGCEnabled)
+        AssertLogRelRCReturn(rc, rc);
+        if (fRCEnabled)
         {
-            rc = PDMDevHlpIOPortRegisterRC(pDevIns, pThis->aCts[i].IOPortBase1, 8, (RTGCPTR)i,
-                                           "ataIOPortWrite1", "ataIOPortRead1", "ataIOPortWriteStr1", "ataIOPortReadStr1", "ATA I/O Base 1");
-            if (RT_FAILURE(rc))
-                return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register I/O handlers (GC)"));
+            rc = PDMDevHlpIOPortRegisterRC(pDevIns, pThis->aCts[i].IOPortBase1, 1, (RTGCPTR)i,
+                                           "ataIOPortWrite1Data", "ataIOPortRead1Data",
+                                           "ataIOPortWriteStr1Data", "ataIOPortReadStr1Data", "ATA I/O Base 1 - Data");
+            AssertLogRelRCReturn(rc, rc);
+            rc = PDMDevHlpIOPortRegisterRC(pDevIns, pThis->aCts[i].IOPortBase1 + 1, 7, (RTGCPTR)i,
+                                           "ataIOPortWrite1Other", "ataIOPortRead1Other", NULL, NULL, "ATA I/O Base 1 - Other");
+            AssertLogRelRCReturn(rc, rc);
         }
 
         if (fR0Enabled)
         {
-#if 1
-            rc = PDMDevHlpIOPortRegisterR0(pDevIns, pThis->aCts[i].IOPortBase1, 8, (RTR0PTR)i,
-                                           "ataIOPortWrite1", "ataIOPortRead1", NULL, NULL, "ATA I/O Base 1");
+#if 0
+            rc = PDMDevHlpIOPortRegisterR0(pDevIns, pThis->aCts[i].IOPortBase1, 1, (RTR0PTR)i,
+                                           "ataIOPortWrite1Data", "ataIOPortRead1Data", NULL, NULL, "ATA I/O Base 1 - Data");
 #else
-            rc = PDMDevHlpIOPortRegisterR0(pDevIns, pThis->aCts[i].IOPortBase1, 8, (RTR0PTR)i,
-                                           "ataIOPortWrite1", "ataIOPortRead1", "ataIOPortWriteStr1", "ataIOPortReadStr1", "ATA I/O Base 1");
+            rc = PDMDevHlpIOPortRegisterR0(pDevIns, pThis->aCts[i].IOPortBase1, 1, (RTR0PTR)i,
+                                           "ataIOPortWrite1Data", "ataIOPortRead1Data",
+                                           "ataIOPortWriteStr1Data", "ataIOPortReadStr1Data", "ATA I/O Base 1 - Data");
 #endif
-            if (RT_FAILURE(rc))
-                return PDMDEV_SET_ERROR(pDevIns, rc, "PIIX3 cannot register I/O handlers (R0).");
+            AssertLogRelRCReturn(rc, rc);
+            rc = PDMDevHlpIOPortRegisterR0(pDevIns, pThis->aCts[i].IOPortBase1 + 1, 7, (RTR0PTR)i,
+                                           "ataIOPortWrite1Other", "ataIOPortRead1Other", NULL, NULL, "ATA I/O Base 1 - Other");
+            AssertLogRelRCReturn(rc, rc);
         }
 
         rc = PDMDevHlpIOPortRegister(pDevIns, pThis->aCts[i].IOPortBase2, 1, (RTHCPTR)(uintptr_t)i,
@@ -7312,7 +7541,7 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
         if (RT_FAILURE(rc))
             return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register base2 I/O handlers"));
 
-        if (fGCEnabled)
+        if (fRCEnabled)
         {
             rc = PDMDevHlpIOPortRegisterRC(pDevIns, pThis->aCts[i].IOPortBase2, 1, (RTGCPTR)i,
                                            "ataIOPortWrite2", "ataIOPortRead2", NULL, NULL, "ATA I/O Base 2");
@@ -7375,10 +7604,13 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
                                    "Profiling of locks.",               "/Devices/IDE%d/ATA%d/Async/LockWait", iInstance, i);
 #endif /* VBOX_WITH_STATISTICS */
 
-        /* Initialize per-controller critical section */
-        rc = PDMDevHlpCritSectInit(pDevIns, &pThis->aCts[i].lock, RT_SRC_POS, "ATA#%u", i);
-        if (RT_FAILURE(rc))
-            return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot initialize critical section"));
+        /* Initialize per-controller critical section. */
+        rc = PDMDevHlpCritSectInit(pDevIns, &pThis->aCts[i].lock,               RT_SRC_POS, "ATA#%u-Ctl", i);
+        AssertLogRelRCReturn(rc, rc);
+
+        /* Initialize per-controller async I/O request critical section. */
+        rc = PDMDevHlpCritSectInit(pDevIns, &pThis->aCts[i].AsyncIORequestLock, RT_SRC_POS, "ATA#%u-Req", i);
+        AssertLogRelRCReturn(rc, rc);
     }
 
     /*
@@ -7408,18 +7640,19 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
          * Start the worker thread.
          */
         pCtl->uAsyncIOState = ATA_AIO_NEW;
-        rc = RTSemEventCreate(&pCtl->AsyncIOSem);
+        pCtl->pSupDrvSession = PDMDevHlpGetSupDrvSession(pDevIns);
+        rc = SUPSemEventCreate(pCtl->pSupDrvSession, &pCtl->hAsyncIOSem);
         AssertLogRelRCReturn(rc, rc);
         rc = RTSemEventCreate(&pCtl->SuspendIOSem);
         AssertLogRelRCReturn(rc, rc);
-        rc = RTSemMutexCreate(&pCtl->AsyncIORequestMutex);
-        AssertLogRelRCReturn(rc, rc);
-        ataAsyncIOClearRequests(pCtl);
-        rc = RTThreadCreateF(&pCtl->AsyncIOThread, ataAsyncIOLoop, (void *)pCtl, 128*1024 /*cbStack*/,
+
+        ataR3AsyncIOClearRequests(pCtl);
+        rc = RTThreadCreateF(&pCtl->AsyncIOThread, ataR3AsyncIOThread, (void *)pCtl, 128*1024 /*cbStack*/,
                              RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "ATA-%u", i);
         AssertLogRelRCReturn(rc, rc);
-        Assert(pCtl->AsyncIOThread != NIL_RTTHREAD && pCtl->AsyncIOSem != NIL_RTSEMEVENT && pCtl->SuspendIOSem != NIL_RTSEMEVENT && pCtl->AsyncIORequestMutex != NIL_RTSEMMUTEX);
-        Log(("%s: controller %d AIO thread id %#x; sem %p susp_sem %p mutex %p\n", __FUNCTION__, i, pCtl->AsyncIOThread, pCtl->AsyncIOSem, pCtl->SuspendIOSem, pCtl->AsyncIORequestMutex));
+        Assert(  pCtl->AsyncIOThread != NIL_RTTHREAD    && pCtl->hAsyncIOSem != NIL_SUPSEMEVENT
+               && pCtl->SuspendIOSem != NIL_RTSEMEVENT  && PDMCritSectIsInitialized(&pCtl->AsyncIORequestLock));
+        Log(("%s: controller %d AIO thread id %#x; sem %p susp_sem %p\n", __FUNCTION__, i, pCtl->AsyncIOThread, pCtl->hAsyncIOSem, pCtl->SuspendIOSem));
 
         for (uint32_t j = 0; j < RT_ELEMENTS(pCtl->aIfs); j++)
         {
@@ -7438,7 +7671,7 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
             rc = PDMDevHlpDriverAttach(pDevIns, pIf->iLUN, &pIf->IBase, &pIf->pDrvBase, s_apszDescs[i][j]);
             if (RT_SUCCESS(rc))
             {
-                rc = ataConfigLun(pDevIns, pIf);
+                rc = ataR3ConfigLun(pDevIns, pIf);
                 if (RT_SUCCESS(rc))
                 {
                     /*
@@ -7580,9 +7813,9 @@ static DECLCALLBACK(int)   ataR3Construct(PPDMDEVINS pDevIns, int iInstance, PCF
     }
 
     rc = PDMDevHlpSSMRegisterEx(pDevIns, ATA_SAVED_STATE_VERSION, sizeof(*pThis) + cbTotalBuffer, NULL,
-                                NULL,            ataLiveExec, NULL,
-                                ataSaveLoadPrep, ataSaveExec, NULL,
-                                ataSaveLoadPrep, ataLoadExec, NULL);
+                                NULL,            ataR3LiveExec, NULL,
+                                ataR3SaveLoadPrep, ataR3SaveExec, NULL,
+                                ataR3SaveLoadPrep, ataR3LoadExec, NULL);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register save state handlers"));
 
@@ -7603,7 +7836,7 @@ const PDMDEVREG g_DevicePIIX3IDE =
     /* szName */
     "piix3ide",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Storage/DevBusLogic.cpp b/src/VBox/Devices/Storage/DevBusLogic.cpp
index be1100a..713d1c9 100644
--- a/src/VBox/Devices/Storage/DevBusLogic.cpp
+++ b/src/VBox/Devices/Storage/DevBusLogic.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -2574,17 +2574,13 @@ static DECLCALLBACK(int) buslogicR3BiosIoPortWrite(PPDMDEVINS pDevIns, void *pvU
  * Port I/O Handler for primary port range OUT string operations.
  * @see FNIOMIOPORTOUTSTRING for details.
  */
-static DECLCALLBACK(int) buslogicR3BiosIoPortWriteStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrSrc,
-                                                      PRTGCUINTREG pcTransfer, unsigned cb)
+static DECLCALLBACK(int) buslogicR3BiosIoPortWriteStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port,
+                                                      uint8_t const *pbSrc, uint32_t *pcTransfers, unsigned cb)
 {
     PBUSLOGIC pBusLogic = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
-    int rc;
-
-    Log2(("#%d %s: pvUser=%#p cb=%d Port=%#x\n",
-          pDevIns->iInstance, __FUNCTION__, pvUser, cb, Port));
+    Log2(("#%d %s: pvUser=%#p cb=%d Port=%#x\n", pDevIns->iInstance, __FUNCTION__, pvUser, cb, Port));
 
-    rc = vboxscsiWriteString(pDevIns, &pBusLogic->VBoxSCSI, (Port - BUSLOGIC_BIOS_IO_PORT),
-                             pGCPtrSrc, pcTransfer, cb);
+    int rc = vboxscsiWriteString(pDevIns, &pBusLogic->VBoxSCSI, (Port - BUSLOGIC_BIOS_IO_PORT), pbSrc, pcTransfers, cb);
     if (rc == VERR_MORE_DATA)
     {
         rc = buslogicR3PrepareBIOSSCSIRequest(pBusLogic);
@@ -2600,16 +2596,14 @@ static DECLCALLBACK(int) buslogicR3BiosIoPortWriteStr(PPDMDEVINS pDevIns, void *
  * Port I/O Handler for primary port range IN string operations.
  * @see FNIOMIOPORTINSTRING for details.
  */
-static DECLCALLBACK(int) buslogicR3BiosIoPortReadStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrDst,
-                                                     PRTGCUINTREG pcTransfer, unsigned cb)
+static DECLCALLBACK(int) buslogicR3BiosIoPortReadStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port,
+                                                     uint8_t *pbDst, uint32_t *pcTransfers, unsigned cb)
 {
     PBUSLOGIC pBusLogic = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
-
-    LogFlowFunc(("#%d %s: pvUser=%#p cb=%d Port=%#x\n",
-                 pDevIns->iInstance, __FUNCTION__, pvUser, cb, Port));
+    LogFlowFunc(("#%d %s: pvUser=%#p cb=%d Port=%#x\n", pDevIns->iInstance, __FUNCTION__, pvUser, cb, Port));
 
     return vboxscsiReadString(pDevIns, &pBusLogic->VBoxSCSI, (Port - BUSLOGIC_BIOS_IO_PORT),
-                              pGCPtrDst, pcTransfer, cb);
+                              pbDst, pcTransfers, cb);
 }
 
 /**
@@ -3224,19 +3218,8 @@ static DECLCALLBACK(int) buslogicR3SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
     SSMR3PutU32   (pSSM, pBusLogic->uMailboxIncomingPositionCurrent);
     SSMR3PutBool  (pSSM, pBusLogic->fStrictRoundRobinMode);
     SSMR3PutBool  (pSSM, pBusLogic->fExtendedLunCCBFormat);
-    /* Now the data for the BIOS interface. */
-    SSMR3PutU8    (pSSM, pBusLogic->VBoxSCSI.regIdentify);
-    SSMR3PutU8    (pSSM, pBusLogic->VBoxSCSI.uTargetDevice);
-    SSMR3PutU8    (pSSM, pBusLogic->VBoxSCSI.uTxDir);
-    SSMR3PutU8    (pSSM, pBusLogic->VBoxSCSI.cbCDB);
-    SSMR3PutMem   (pSSM, pBusLogic->VBoxSCSI.abCDB, sizeof(pBusLogic->VBoxSCSI.abCDB));
-    SSMR3PutU8    (pSSM, pBusLogic->VBoxSCSI.iCDB);
-    SSMR3PutU32   (pSSM, pBusLogic->VBoxSCSI.cbBuf);
-    SSMR3PutU32   (pSSM, pBusLogic->VBoxSCSI.iBuf);
-    SSMR3PutBool  (pSSM, pBusLogic->VBoxSCSI.fBusy);
-    SSMR3PutU8    (pSSM, pBusLogic->VBoxSCSI.enmState);
-    if (pBusLogic->VBoxSCSI.cbBuf)
-        SSMR3PutMem(pSSM, pBusLogic->VBoxSCSI.pbBuf, pBusLogic->VBoxSCSI.cbBuf);
+
+    vboxscsiR3SaveExec(&pBusLogic->VBoxSCSI, pSSM);
 
     /*
      * Save the physical addresses of the command control blocks of still pending tasks.
@@ -3337,27 +3320,13 @@ static DECLCALLBACK(int) buslogicR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM,
     SSMR3GetU32   (pSSM, &pBusLogic->uMailboxIncomingPositionCurrent);
     SSMR3GetBool  (pSSM, &pBusLogic->fStrictRoundRobinMode);
     SSMR3GetBool  (pSSM, &pBusLogic->fExtendedLunCCBFormat);
-    /* Now the data for the BIOS interface. */
-    SSMR3GetU8  (pSSM, &pBusLogic->VBoxSCSI.regIdentify);
-    SSMR3GetU8  (pSSM, &pBusLogic->VBoxSCSI.uTargetDevice);
-    SSMR3GetU8  (pSSM, &pBusLogic->VBoxSCSI.uTxDir);
-    SSMR3GetU8  (pSSM, &pBusLogic->VBoxSCSI.cbCDB);
-    SSMR3GetMem (pSSM, pBusLogic->VBoxSCSI.abCDB, sizeof(pBusLogic->VBoxSCSI.abCDB));
-    SSMR3GetU8  (pSSM, &pBusLogic->VBoxSCSI.iCDB);
-    SSMR3GetU32 (pSSM, &pBusLogic->VBoxSCSI.cbBuf);
-    SSMR3GetU32 (pSSM, &pBusLogic->VBoxSCSI.iBuf);
-    SSMR3GetBool(pSSM, (bool *)&pBusLogic->VBoxSCSI.fBusy);
-    SSMR3GetU8  (pSSM, (uint8_t *)&pBusLogic->VBoxSCSI.enmState);
-    if (pBusLogic->VBoxSCSI.cbBuf)
+
+    rc = vboxscsiR3LoadExec(&pBusLogic->VBoxSCSI, pSSM);
+    if (RT_FAILURE(rc))
     {
-        pBusLogic->VBoxSCSI.pbBuf = (uint8_t *)RTMemAllocZ(pBusLogic->VBoxSCSI.cbBuf);
-        if (!pBusLogic->VBoxSCSI.pbBuf)
-        {
-            LogRel(("BusLogic: Out of memory during restore.\n"));
-            return PDMDEV_SET_ERROR(pDevIns, VERR_NO_MEMORY,
-                                    N_("BusLogic: Out of memory during restore\n"));
-        }
-        SSMR3GetMem(pSSM, pBusLogic->VBoxSCSI.pbBuf, pBusLogic->VBoxSCSI.cbBuf);
+        LogRel(("BusLogic: Failed to restore BIOS state: %Rrc.\n", rc));
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("BusLogic: Failed to restore BIOS state\n"));
     }
 
     if (pBusLogic->VBoxSCSI.fBusy)
@@ -4098,7 +4067,7 @@ const PDMDEVREG g_DeviceBusLogic =
     /* szName */
     "buslogic",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Storage/DevFdc.cpp b/src/VBox/Devices/Storage/DevFdc.cpp
index a62b0fd..de09748 100644
--- a/src/VBox/Devices/Storage/DevFdc.cpp
+++ b/src/VBox/Devices/Storage/DevFdc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -490,7 +490,7 @@ static void fd_revalidate(fdrive_t *drv)
 #endif
             FLOPPY_DPRINTF("%s floppy disk (%d h %d t %d s) %s\n", parse->str,
                            nb_heads, max_track, last_sect, ro ? "ro" : "rw");
-            LogRel(("%s floppy disk (%d h %d t %d s) %s\n", parse->str,
+            LogRel(("FDC: %s floppy disk (%d h %d t %d s) %s\n", parse->str,
                     nb_heads, max_track, last_sect, ro ? "ro" : "rw"));
         }
         if (nb_heads == 1) {
diff --git a/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp b/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
index d301855..11763ab 100644
--- a/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
+++ b/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -3851,7 +3851,7 @@ static DECLCALLBACK(int) lsilogicR3IsaIOPortWrite(PPDMDEVINS pDevIns, void *pvUs
  * Port I/O Handler for primary port range OUT string operations.}
  */
 static DECLCALLBACK(int) lsilogicR3IsaIOPortWriteStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port,
-                                                     PRTGCPTR pGCPtrSrc, PRTGCUINTREG pcTransfer, unsigned cb)
+                                                     uint8_t const *pbSrc, uint32_t *pcTransfers, unsigned cb)
 {
     PLSILOGICSCSI pThis = PDMINS_2_DATA(pDevIns, PLSILOGICSCSI);
     Log2(("#%d %s: pvUser=%#p cb=%d Port=%#x\n", pDevIns->iInstance, __FUNCTION__, pvUser, cb, Port));
@@ -3859,7 +3859,7 @@ static DECLCALLBACK(int) lsilogicR3IsaIOPortWriteStr(PPDMDEVINS pDevIns, void *p
     uint8_t iRegister = pThis->enmCtrlType == LSILOGICCTRLTYPE_SCSI_SPI
                       ? Port - LSILOGIC_BIOS_IO_PORT
                       : Port - LSILOGIC_SAS_BIOS_IO_PORT;
-    int rc = vboxscsiWriteString(pDevIns, &pThis->VBoxSCSI, iRegister, pGCPtrSrc, pcTransfer, cb);
+    int rc = vboxscsiWriteString(pDevIns, &pThis->VBoxSCSI, iRegister, pbSrc, pcTransfers, cb);
     if (rc == VERR_MORE_DATA)
     {
         rc = lsilogicR3PrepareBiosScsiRequest(pThis);
@@ -3875,18 +3875,16 @@ static DECLCALLBACK(int) lsilogicR3IsaIOPortWriteStr(PPDMDEVINS pDevIns, void *p
  * @callback_method_impl{FNIOMIOPORTINSTRING,
  * Port I/O Handler for primary port range IN string operations.}
  */
-static DECLCALLBACK(int) lsilogicR3IsaIOPortReadStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrDst,
-                                                  PRTGCUINTREG pcTransfer, unsigned cb)
+static DECLCALLBACK(int) lsilogicR3IsaIOPortReadStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port,
+                                                    uint8_t *pbDst, uint32_t *pcTransfers, unsigned cb)
 {
     PLSILOGICSCSI pThis = PDMINS_2_DATA(pDevIns, PLSILOGICSCSI);
-
-    LogFlowFunc(("#%d %s: pvUser=%#p cb=%d Port=%#x\n",
-                 pDevIns->iInstance, __FUNCTION__, pvUser, cb, Port));
+    LogFlowFunc(("#%d %s: pvUser=%#p cb=%d Port=%#x\n", pDevIns->iInstance, __FUNCTION__, pvUser, cb, Port));
 
     uint8_t iRegister = pThis->enmCtrlType == LSILOGICCTRLTYPE_SCSI_SPI
                       ? Port - LSILOGIC_BIOS_IO_PORT
                       : Port - LSILOGIC_SAS_BIOS_IO_PORT;
-    return vboxscsiReadString(pDevIns, &pThis->VBoxSCSI, iRegister, pGCPtrDst, pcTransfer, cb);
+    return vboxscsiReadString(pDevIns, &pThis->VBoxSCSI, iRegister, pbDst, pcTransfers, cb);
 }
 
 /**
@@ -4491,20 +4489,7 @@ static DECLCALLBACK(int) lsilogicR3SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
     else
         AssertMsgFailed(("Invalid controller type %d\n", pThis->enmCtrlType));
 
-    /* Now the data for the BIOS interface. */
-    SSMR3PutU8    (pSSM, pThis->VBoxSCSI.regIdentify);
-    SSMR3PutU8    (pSSM, pThis->VBoxSCSI.uTargetDevice);
-    SSMR3PutU8    (pSSM, pThis->VBoxSCSI.uTxDir);
-    SSMR3PutU8    (pSSM, pThis->VBoxSCSI.cbCDB);
-    SSMR3PutMem   (pSSM, pThis->VBoxSCSI.abCDB, sizeof(pThis->VBoxSCSI.abCDB));
-    SSMR3PutU8    (pSSM, pThis->VBoxSCSI.iCDB);
-    SSMR3PutU32   (pSSM, pThis->VBoxSCSI.cbBuf);
-    SSMR3PutU32   (pSSM, pThis->VBoxSCSI.iBuf);
-    SSMR3PutBool  (pSSM, pThis->VBoxSCSI.fBusy);
-    SSMR3PutU8    (pSSM, pThis->VBoxSCSI.enmState);
-    if (pThis->VBoxSCSI.cbBuf)
-        SSMR3PutMem(pSSM, pThis->VBoxSCSI.pbBuf, pThis->VBoxSCSI.cbBuf);
-
+    vboxscsiR3SaveExec(&pThis->VBoxSCSI, pSSM);
     return SSMR3PutU32(pSSM, ~0);
 }
 
@@ -4834,27 +4819,12 @@ static DECLCALLBACK(int) lsilogicR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM,
             AssertMsgFailed(("Invalid controller type %d\n", pThis->enmCtrlType));
     }
 
-    /* Now the data for the BIOS interface. */
-    SSMR3GetU8  (pSSM, &pThis->VBoxSCSI.regIdentify);
-    SSMR3GetU8  (pSSM, &pThis->VBoxSCSI.uTargetDevice);
-    SSMR3GetU8  (pSSM, &pThis->VBoxSCSI.uTxDir);
-    SSMR3GetU8  (pSSM, &pThis->VBoxSCSI.cbCDB);
-    SSMR3GetMem (pSSM, pThis->VBoxSCSI.abCDB, sizeof(pThis->VBoxSCSI.abCDB));
-    SSMR3GetU8  (pSSM, &pThis->VBoxSCSI.iCDB);
-    SSMR3GetU32 (pSSM, &pThis->VBoxSCSI.cbBuf);
-    SSMR3GetU32 (pSSM, &pThis->VBoxSCSI.iBuf);
-    SSMR3GetBool(pSSM, (bool *)&pThis->VBoxSCSI.fBusy);
-    SSMR3GetU8  (pSSM, (uint8_t *)&pThis->VBoxSCSI.enmState);
-    if (pThis->VBoxSCSI.cbBuf)
+    rc = vboxscsiR3LoadExec(&pThis->VBoxSCSI, pSSM);
+    if (RT_FAILURE(rc))
     {
-        pThis->VBoxSCSI.pbBuf = (uint8_t *)RTMemAllocZ(pThis->VBoxSCSI.cbBuf);
-        if (!pThis->VBoxSCSI.pbBuf)
-        {
-            LogRel(("LsiLogic: Out of memory during restore.\n"));
-            return PDMDEV_SET_ERROR(pDevIns, VERR_NO_MEMORY,
-                                    N_("LsiLogic: Out of memory during restore\n"));
-        }
-        SSMR3GetMem(pSSM, pThis->VBoxSCSI.pbBuf, pThis->VBoxSCSI.cbBuf);
+        LogRel(("LsiLogic: Failed to restore BIOS state: %Rrc.\n", rc));
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("LsiLogic: Failed to restore BIOS state\n"));
     }
 
     uint32_t u32;
@@ -5604,7 +5574,7 @@ const PDMDEVREG g_DeviceLsiLogicSCSI =
     /* szName */
     "lsilogicscsi",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
@@ -5660,7 +5630,7 @@ const PDMDEVREG g_DeviceLsiLogicSAS =
     /* szName */
     "lsilogicsas",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/Storage/DevLsiLogicSCSI.h b/src/VBox/Devices/Storage/DevLsiLogicSCSI.h
index 207d8e8..6cc2c6c 100644
--- a/src/VBox/Devices/Storage/DevLsiLogicSCSI.h
+++ b/src/VBox/Devices/Storage/DevLsiLogicSCSI.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/DrvBlock.cpp b/src/VBox/Devices/Storage/DrvBlock.cpp
index 21e26e3..b5bd9f8 100644
--- a/src/VBox/Devices/Storage/DrvBlock.cpp
+++ b/src/VBox/Devices/Storage/DrvBlock.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp b/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp
index 9f53298..7cd2440 100644
--- a/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp
+++ b/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/DrvHostBase.cpp b/src/VBox/Devices/Storage/DrvHostBase.cpp
index fde5326..5e2778a 100644
--- a/src/VBox/Devices/Storage/DrvHostBase.cpp
+++ b/src/VBox/Devices/Storage/DrvHostBase.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/DrvHostBase.h b/src/VBox/Devices/Storage/DrvHostBase.h
index 04a560b..f20893b 100644
--- a/src/VBox/Devices/Storage/DrvHostBase.h
+++ b/src/VBox/Devices/Storage/DrvHostBase.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/DrvHostDVD.cpp b/src/VBox/Devices/Storage/DrvHostDVD.cpp
index 8ed2c1b..58fb917 100644
--- a/src/VBox/Devices/Storage/DrvHostDVD.cpp
+++ b/src/VBox/Devices/Storage/DrvHostDVD.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/DrvHostFloppy.cpp b/src/VBox/Devices/Storage/DrvHostFloppy.cpp
index 2a23e87..f387233 100644
--- a/src/VBox/Devices/Storage/DrvHostFloppy.cpp
+++ b/src/VBox/Devices/Storage/DrvHostFloppy.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/DrvMediaISO.cpp b/src/VBox/Devices/Storage/DrvMediaISO.cpp
index c18a9dd..93ab030 100644
--- a/src/VBox/Devices/Storage/DrvMediaISO.cpp
+++ b/src/VBox/Devices/Storage/DrvMediaISO.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/DrvRawImage.cpp b/src/VBox/Devices/Storage/DrvRawImage.cpp
index 75a2ffc..5ce0bae 100644
--- a/src/VBox/Devices/Storage/DrvRawImage.cpp
+++ b/src/VBox/Devices/Storage/DrvRawImage.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/DrvSCSI.cpp b/src/VBox/Devices/Storage/DrvSCSI.cpp
index 615edbc..0753586 100644
--- a/src/VBox/Devices/Storage/DrvSCSI.cpp
+++ b/src/VBox/Devices/Storage/DrvSCSI.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -647,6 +647,28 @@ static DECLCALLBACK(int) drvscsiRequestSend(PPDMISCSICONNECTOR pInterface, PPDMS
     return rc;
 }
 
+/** @copydoc PDMISCSICONNECTOR::pfnQueryLUNType. */
+static DECLCALLBACK(int) drvscsiQueryLUNType(PPDMISCSICONNECTOR pInterface, uint32_t iLun, PPDMSCSILUNTYPE pLunType)
+{
+    int rc;
+    PDRVSCSI pThis = PDMISCSICONNECTOR_2_DRVSCSI(pInterface);
+    VSCSILUNTYPE enmLunType;
+
+    rc = VSCSIDeviceLunQueryType(pThis->hVScsiDevice, iLun, &enmLunType);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    switch (enmLunType)
+    {
+    case VSCSILUNTYPE_SBC:  *pLunType = PDMSCSILUNTYPE_SBC; break;
+    case VSCSILUNTYPE_MMC:  *pLunType = PDMSCSILUNTYPE_MMC; break;
+    case VSCSILUNTYPE_SSC:  *pLunType = PDMSCSILUNTYPE_SSC; break;
+    default:                *pLunType = PDMSCSILUNTYPE_INVALID;
+    }
+
+    return rc;
+}
+
 /* -=-=-=-=- IBase -=-=-=-=- */
 
 /**
@@ -891,6 +913,7 @@ static DECLCALLBACK(int) drvscsiConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, ui
      */
     pThis->pDrvIns                              = pDrvIns;
     pThis->ISCSIConnector.pfnSCSIRequestSend    = drvscsiRequestSend;
+    pThis->ISCSIConnector.pfnQueryLUNType       = drvscsiQueryLUNType;
 
     pDrvIns->IBase.pfnQueryInterface            = drvscsiQueryInterface;
 
diff --git a/src/VBox/Devices/Storage/DrvSCSIHost.cpp b/src/VBox/Devices/Storage/DrvSCSIHost.cpp
index 17693e5..655df7e 100644
--- a/src/VBox/Devices/Storage/DrvSCSIHost.cpp
+++ b/src/VBox/Devices/Storage/DrvSCSIHost.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/PIIX3ATABmDma.h b/src/VBox/Devices/Storage/PIIX3ATABmDma.h
index 6565441..d51ecb5 100644
--- a/src/VBox/Devices/Storage/PIIX3ATABmDma.h
+++ b/src/VBox/Devices/Storage/PIIX3ATABmDma.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/UsbMsd.cpp b/src/VBox/Devices/Storage/UsbMsd.cpp
index c9ba11a..e55a5df 100644
--- a/src/VBox/Devices/Storage/UsbMsd.cpp
+++ b/src/VBox/Devices/Storage/UsbMsd.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -241,6 +241,9 @@ typedef struct USBMSD
      * the MSD is entering the idle state. */
     volatile bool       fSignalIdle;
 
+    /** Indicates that this device is a CD-ROM. */
+    bool                fIsCdrom;
+
     /**
      * LUN\#0 data.
      */
@@ -535,6 +538,24 @@ static const VUSBDESCDEVICE g_UsbMsdDeviceDesc20 =
     /* .bNumConfigurations = */     1
 };
 
+static const VUSBDESCDEVICE g_UsbCdDeviceDesc20 =
+{
+    /* .bLength = */                sizeof(g_UsbCdDeviceDesc20),
+    /* .bDescriptorType = */        VUSB_DT_DEVICE,
+    /* .bcdUsb = */                 0x200, /* USB 2.0 */
+    /* .bDeviceClass = */           0 /* Class specified in the interface desc. */,
+    /* .bDeviceSubClass = */        0 /* Subclass specified in the interface desc. */,
+    /* .bDeviceProtocol = */        0 /* Protocol specified in the interface desc. */,
+    /* .bMaxPacketSize0 = */        64,
+    /* .idVendor = */               VBOX_USB_VENDOR,
+    /* .idProduct = */              USBMSD_PID_CD,
+    /* .bcdDevice = */              0x0100, /* 1.0 */
+    /* .iManufacturer = */          USBMSD_STR_ID_MANUFACTURER,
+    /* .iProduct = */               USBMSD_STR_ID_PRODUCT_CDROM,
+    /* .iSerialNumber = */          0,
+    /* .bNumConfigurations = */     1
+};
+
 static const VUSBDESCDEVICE g_UsbMsdDeviceDesc30 =
 {
     /* .bLength = */                sizeof(g_UsbMsdDeviceDesc30),
@@ -553,6 +574,24 @@ static const VUSBDESCDEVICE g_UsbMsdDeviceDesc30 =
     /* .bNumConfigurations = */     1
 };
 
+static const VUSBDESCDEVICE g_UsbCdDeviceDesc30 =
+{
+    /* .bLength = */                sizeof(g_UsbCdDeviceDesc30),
+    /* .bDescriptorType = */        VUSB_DT_DEVICE,
+    /* .bcdUsb = */                 0x300, /* USB 2.0 */
+    /* .bDeviceClass = */           0 /* Class specified in the interface desc. */,
+    /* .bDeviceSubClass = */        0 /* Subclass specified in the interface desc. */,
+    /* .bDeviceProtocol = */        0 /* Protocol specified in the interface desc. */,
+    /* .bMaxPacketSize0 = */        9 /* 512, the only option for USB3. */,
+    /* .idVendor = */               VBOX_USB_VENDOR,
+    /* .idProduct = */              USBMSD_PID_CD,
+    /* .bcdDevice = */              0x0110, /* 1.10 */
+    /* .iManufacturer = */          USBMSD_STR_ID_MANUFACTURER,
+    /* .iProduct = */               USBMSD_STR_ID_PRODUCT_CDROM,
+    /* .iSerialNumber = */          0,
+    /* .bNumConfigurations = */     1
+};
+
 static const VUSBDEVICEQUALIFIER g_UsbMsdDeviceQualifier =
 {
     /* .bLength = */                sizeof(g_UsbMsdDeviceQualifier),
@@ -599,6 +638,16 @@ static const PDMUSBDESCCACHE g_UsbMsdDescCacheFS =
     /* .fUseCachedStringsDescriptors = */ true
 };
 
+static const PDMUSBDESCCACHE g_UsbCdDescCacheFS =
+{
+    /* .pDevice = */                &g_UsbCdDeviceDesc20,
+    /* .paConfigs = */              &g_UsbMsdConfigDescFS,
+    /* .paLanguages = */            g_aUsbMsdLanguages,
+    /* .cLanguages = */             RT_ELEMENTS(g_aUsbMsdLanguages),
+    /* .fUseCachedDescriptors = */  true,
+    /* .fUseCachedStringsDescriptors = */ true
+};
+
 static const PDMUSBDESCCACHE g_UsbMsdDescCacheHS =
 {
     /* .pDevice = */                &g_UsbMsdDeviceDesc20,
@@ -609,6 +658,16 @@ static const PDMUSBDESCCACHE g_UsbMsdDescCacheHS =
     /* .fUseCachedStringsDescriptors = */ true
 };
 
+static const PDMUSBDESCCACHE g_UsbCdDescCacheHS =
+{
+    /* .pDevice = */                &g_UsbCdDeviceDesc20,
+    /* .paConfigs = */              &g_UsbMsdConfigDescHS,
+    /* .paLanguages = */            g_aUsbMsdLanguages,
+    /* .cLanguages = */             RT_ELEMENTS(g_aUsbMsdLanguages),
+    /* .fUseCachedDescriptors = */  true,
+    /* .fUseCachedStringsDescriptors = */ true
+};
+
 static const PDMUSBDESCCACHE g_UsbMsdDescCacheSS =
 {
     /* .pDevice = */                &g_UsbMsdDeviceDesc30,
@@ -619,6 +678,16 @@ static const PDMUSBDESCCACHE g_UsbMsdDescCacheSS =
     /* .fUseCachedStringsDescriptors = */ true
 };
 
+static const PDMUSBDESCCACHE g_UsbCdDescCacheSS =
+{
+    /* .pDevice = */                &g_UsbCdDeviceDesc30,
+    /* .paConfigs = */              &g_UsbMsdConfigDescSS,
+    /* .paLanguages = */            g_aUsbMsdLanguages,
+    /* .cLanguages = */             RT_ELEMENTS(g_aUsbMsdLanguages),
+    /* .fUseCachedDescriptors = */  true,
+    /* .fUseCachedStringsDescriptors = */ true
+};
+
 /*******************************************************************************
 *   Internal Functions                                                         *
 *******************************************************************************/
@@ -2020,11 +2089,11 @@ static DECLCALLBACK(PCPDMUSBDESCCACHE) usbMsdUsbGetDescriptorCache(PPDMUSBINS pU
     PUSBMSD pThis = PDMINS_2_DATA(pUsbIns, PUSBMSD);
     LogFlow(("usbMsdUsbGetDescriptorCache/#%u:\n", pUsbIns->iInstance));
     if (pThis->pUsbIns->enmSpeed == VUSB_SPEED_SUPER)
-        return &g_UsbMsdDescCacheSS;
+        return pThis->fIsCdrom ? &g_UsbCdDescCacheSS : &g_UsbMsdDescCacheSS;
     else if (pThis->pUsbIns->enmSpeed == VUSB_SPEED_HIGH)
-        return &g_UsbMsdDescCacheHS;
+        return pThis->fIsCdrom ? &g_UsbCdDescCacheHS : &g_UsbMsdDescCacheHS;
     else
-        return &g_UsbMsdDescCacheFS;
+        return pThis->fIsCdrom ? &g_UsbCdDescCacheFS : &g_UsbMsdDescCacheFS;
 }
 
 
@@ -2101,6 +2170,20 @@ static DECLCALLBACK(int) usbMsdDriverAttach(PPDMUSBINS pUsbIns, unsigned iLUN, u
         pThis->Lun0.pIBase = NULL;
         pThis->Lun0.pIScsiConnector = NULL;
     }
+
+    /*
+     * Find out what kind of device we are.
+     */
+    PDMSCSILUNTYPE enmLunType;
+    pThis->fIsCdrom = false;
+    rc = pThis->Lun0.pIScsiConnector->pfnQueryLUNType(pThis->Lun0.pIScsiConnector, 0 /*iLun*/, &enmLunType);
+    if (RT_SUCCESS(rc))
+    {
+        /* Anything else will be reported as a hard disk. */
+        if (enmLunType == PDMSCSILUNTYPE_MMC)
+            pThis->fIsCdrom = true;
+    }
+
     return rc;
 }
 
@@ -2246,6 +2329,19 @@ static DECLCALLBACK(int) usbMsdConstruct(PPDMUSBINS pUsbIns, int iInstance, PCFG
                                    N_("MSD failed to query the PDMISCSICONNECTOR from the driver below it"));
 
     /*
+     * Find out what kind of device we are.
+     */
+    PDMSCSILUNTYPE enmLunType;
+    pThis->fIsCdrom = false;
+    rc = pThis->Lun0.pIScsiConnector->pfnQueryLUNType(pThis->Lun0.pIScsiConnector, 0 /*iLun*/, &enmLunType);
+    if (RT_SUCCESS(rc))
+    {
+        /* Anything else will be reported as a hard disk. */
+        if (enmLunType == PDMSCSILUNTYPE_MMC)
+            pThis->fIsCdrom = true;
+    }
+
+    /*
      * Register the saved state data unit.
      */
     rc = PDMUsbHlpSSMRegister(pUsbIns, USB_MSD_SAVED_STATE_VERSION, sizeof(*pThis),
@@ -2272,7 +2368,8 @@ const PDMUSBREG g_UsbMsd =
     /* pszDescription */
     "USB Mass Storage Device, one LUN.",
     /* fFlags */
-    PDM_USBREG_HIGHSPEED_CAPABLE | PDM_USBREG_SUPERSPEED_CAPABLE | PDM_USBREG_EMULATED_DEVICE,
+      PDM_USBREG_HIGHSPEED_CAPABLE | PDM_USBREG_SUPERSPEED_CAPABLE
+    | PDM_USBREG_SAVED_STATE_SUPPORTED,
     /* cMaxInstances */
     ~0U,
     /* cbInstance */
diff --git a/src/VBox/Devices/Storage/VBoxSCSI.cpp b/src/VBox/Devices/Storage/VBoxSCSI.cpp
index e077cf5..04fefa5 100644
--- a/src/VBox/Devices/Storage/VBoxSCSI.cpp
+++ b/src/VBox/Devices/Storage/VBoxSCSI.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -38,20 +38,23 @@
 /**
  * Resets the state.
  */
-static void vboxscsiReset(PVBOXSCSI pVBoxSCSI)
+static void vboxscsiReset(PVBOXSCSI pVBoxSCSI, bool fEverything)
 {
-    pVBoxSCSI->regIdentify   = 0;
+    if (fEverything)
+    {
+        pVBoxSCSI->regIdentify = 0;
+        pVBoxSCSI->fBusy       = false;
+    }
     pVBoxSCSI->cbCDB         = 0;
-    memset(pVBoxSCSI->abCDB, 0, sizeof(pVBoxSCSI->abCDB));
+    RT_ZERO(pVBoxSCSI->abCDB);
     pVBoxSCSI->iCDB          = 0;
-    pVBoxSCSI->fBusy         = false;
     pVBoxSCSI->rcCompletion  = 0;
     pVBoxSCSI->uTargetDevice = 0;
     pVBoxSCSI->cbBuf         = 0;
+    pVBoxSCSI->cbBufLeft     = 0;
     pVBoxSCSI->iBuf          = 0;
     if (pVBoxSCSI->pbBuf)
         RTMemFree(pVBoxSCSI->pbBuf);
-
     pVBoxSCSI->pbBuf         = NULL;
     pVBoxSCSI->enmState      = VBOXSCSISTATE_NO_COMMAND;
 }
@@ -65,7 +68,7 @@ static void vboxscsiReset(PVBOXSCSI pVBoxSCSI)
 int vboxscsiInitialize(PVBOXSCSI pVBoxSCSI)
 {
     pVBoxSCSI->pbBuf = NULL;
-    vboxscsiReset(pVBoxSCSI);
+    vboxscsiReset(pVBoxSCSI, true /*fEverything*/);
 
     return VINF_SUCCESS;
 }
@@ -101,29 +104,19 @@ int vboxscsiReadRegister(PVBOXSCSI pVBoxSCSI, uint8_t iRegister, uint32_t *pu32V
         case 1:
         {
             /* If we're not in the 'command ready' state, there may not even be a buffer yet. */
-            if ((pVBoxSCSI->enmState == VBOXSCSISTATE_COMMAND_READY) && pVBoxSCSI->cbBuf > 0)
+            if (   pVBoxSCSI->enmState == VBOXSCSISTATE_COMMAND_READY
+                && pVBoxSCSI->cbBufLeft > 0)
             {
                 AssertMsg(pVBoxSCSI->pbBuf, ("pBuf is NULL\n"));
-                Assert(pVBoxSCSI->enmState == VBOXSCSISTATE_COMMAND_READY);
                 Assert(!pVBoxSCSI->fBusy);
                 uVal = pVBoxSCSI->pbBuf[pVBoxSCSI->iBuf];
                 pVBoxSCSI->iBuf++;
-                pVBoxSCSI->cbBuf--;
-                if (pVBoxSCSI->cbBuf == 0)
-                {
-                    /** The guest read the last byte from the data in buffer.
-                     *  Clear everything and reset command buffer.
-                     */
-                    RTMemFree(pVBoxSCSI->pbBuf);
-                    pVBoxSCSI->pbBuf = NULL;
-                    pVBoxSCSI->cbCDB = 0;
-                    pVBoxSCSI->iCDB  = 0;
-                    pVBoxSCSI->iBuf  = 0;
-                    pVBoxSCSI->rcCompletion = 0;
-                    pVBoxSCSI->uTargetDevice = 0;
-                    pVBoxSCSI->enmState = VBOXSCSISTATE_NO_COMMAND;
-                    memset(pVBoxSCSI->abCDB, 0, sizeof(pVBoxSCSI->abCDB));
-                }
+                pVBoxSCSI->cbBufLeft--;
+
+                /* When the guest reads the last byte from the data in buffer, clear
+                   everything and reset command buffer. */
+                if (pVBoxSCSI->cbBufLeft == 0)
+                    vboxscsiReset(pVBoxSCSI, false /*fEverything*/);
             }
             break;
         }
@@ -150,7 +143,7 @@ int vboxscsiReadRegister(PVBOXSCSI pVBoxSCSI, uint8_t iRegister, uint32_t *pu32V
  * Writes to a register.
  *
  * @returns VBox status code.
- *          VERR_MORE_DATA if a command is ready to be sent to the SCSI driver.
+ * @retval  VERR_MORE_DATA if a command is ready to be sent to the SCSI driver.
  * @param   pVBoxSCSI    Pointer to the SCSI state.
  * @param   iRegister    Index of the register to write to.
  * @param   uVal         Value to write.
@@ -171,7 +164,7 @@ int vboxscsiWriteRegister(PVBOXSCSI pVBoxSCSI, uint8_t iRegister, uint8_t uVal)
             else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_TXDIR)
             {
                 if (uVal != VBOXSCSI_TXDIR_FROM_DEVICE && uVal != VBOXSCSI_TXDIR_TO_DEVICE)
-                    vboxscsiReset(pVBoxSCSI);
+                    vboxscsiReset(pVBoxSCSI, true /*fEverything*/);
                 else
                 {
                     pVBoxSCSI->enmState = VBOXSCSISTATE_READ_CDB_SIZE_BUFHI;
@@ -180,10 +173,9 @@ int vboxscsiWriteRegister(PVBOXSCSI pVBoxSCSI, uint8_t iRegister, uint8_t uVal)
             }
             else if (pVBoxSCSI->enmState == VBOXSCSISTATE_READ_CDB_SIZE_BUFHI)
             {
-                uint8_t     cbCDB = uVal & 0x0F;
-
+                uint8_t cbCDB = uVal & 0x0F;
                 if (cbCDB > VBOXSCSI_CDB_SIZE_MAX)
-                    vboxscsiReset(pVBoxSCSI);
+                    vboxscsiReset(pVBoxSCSI, true /*fEverything*/);
                 else
                 {
                     pVBoxSCSI->enmState = VBOXSCSISTATE_READ_BUFFER_SIZE_LSB;
@@ -211,6 +203,7 @@ int vboxscsiWriteRegister(PVBOXSCSI pVBoxSCSI, uint8_t iRegister, uint8_t uVal)
                 {
                     Log(("%s: Command ready for processing\n", __FUNCTION__));
                     pVBoxSCSI->enmState = VBOXSCSISTATE_COMMAND_READY;
+                    pVBoxSCSI->cbBufLeft = pVBoxSCSI->cbBuf;
                     if (pVBoxSCSI->uTxDir == VBOXSCSI_TXDIR_TO_DEVICE)
                     {
                         /* This is a write allocate buffer. */
@@ -230,36 +223,42 @@ int vboxscsiWriteRegister(PVBOXSCSI pVBoxSCSI, uint8_t iRegister, uint8_t uVal)
                 AssertMsgFailed(("Invalid state %d\n", pVBoxSCSI->enmState));
             break;
         }
+
         case 1:
         {
             if (   pVBoxSCSI->enmState != VBOXSCSISTATE_COMMAND_READY
                 || pVBoxSCSI->uTxDir != VBOXSCSI_TXDIR_TO_DEVICE)
             {
                 /* Reset the state */
-                vboxscsiReset(pVBoxSCSI);
+                vboxscsiReset(pVBoxSCSI, true /*fEverything*/);
             }
-            else
+            else if (pVBoxSCSI->cbBufLeft > 0)
             {
                 pVBoxSCSI->pbBuf[pVBoxSCSI->iBuf++] = uVal;
-                if (pVBoxSCSI->iBuf == pVBoxSCSI->cbBuf)
+                pVBoxSCSI->cbBufLeft--;
+                if (pVBoxSCSI->cbBufLeft == 0)
                 {
                     rc = VERR_MORE_DATA;
                     ASMAtomicXchgBool(&pVBoxSCSI->fBusy, true);
                 }
             }
+            /* else: Ignore extra data, request pending or something. */
             break;
         }
+
         case 2:
         {
             pVBoxSCSI->regIdentify = uVal;
             break;
         }
+
         case 3:
         {
             /* Reset */
-            vboxscsiReset(pVBoxSCSI);
+            vboxscsiReset(pVBoxSCSI, true /*fEverything*/);
             break;
         }
+
         default:
             AssertMsgFailed(("Invalid register to write to %u\n", iRegister));
     }
@@ -334,18 +333,7 @@ int vboxscsiRequestFinished(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest, i
     RTMemFree(pScsiRequest->pbSenseBuffer);
 
     if (pVBoxSCSI->uTxDir == VBOXSCSI_TXDIR_TO_DEVICE)
-    {
-        if (pVBoxSCSI->pbBuf)
-            RTMemFree(pVBoxSCSI->pbBuf);
-        pVBoxSCSI->pbBuf  = NULL;
-        pVBoxSCSI->cbBuf = 0;
-        pVBoxSCSI->cbCDB = 0;
-        pVBoxSCSI->iCDB  = 0;
-        pVBoxSCSI->iBuf  = 0;
-        pVBoxSCSI->uTargetDevice = 0;
-        pVBoxSCSI->enmState = VBOXSCSISTATE_NO_COMMAND;
-        memset(pVBoxSCSI->abCDB, 0, sizeof(pVBoxSCSI->abCDB));
-    }
+        vboxscsiReset(pVBoxSCSI, false /*fEverything*/);
 
     pVBoxSCSI->rcCompletion = rcCompletion;
 
@@ -355,83 +343,104 @@ int vboxscsiRequestFinished(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest, i
 }
 
 int vboxscsiReadString(PPDMDEVINS pDevIns, PVBOXSCSI pVBoxSCSI, uint8_t iRegister,
-                       RTGCPTR *pGCPtrDst, PRTGCUINTREG pcTransfer, unsigned cb)
+                       uint8_t *pbDst, uint32_t *pcTransfers, unsigned cb)
 {
-    RTGCPTR  GCDst      = *pGCPtrDst;
-    uint32_t cbTransfer = *pcTransfer * cb;
+    LogFlowFunc(("pDevIns=%#p pVBoxSCSI=%#p iRegister=%d cTransfers=%u cb=%u\n",
+                 pDevIns, pVBoxSCSI, iRegister, *pcTransfers, cb));
 
-    LogFlowFunc(("pDevIns=%#p pVBoxSCSI=%#p iRegister=%d cTransfer=%u cb=%u\n",
-                 pDevIns, pVBoxSCSI, iRegister, *pcTransfer, cb));
+    /*
+     * Check preconditions, fall back to non-string I/O handler.
+     */
+    Assert(*pcTransfers > 0);
 
     /* Read string only valid for data in register. */
-    AssertMsg(iRegister == 1, ("Hey only register 1 can be read from with string\n"));
+    AssertMsgReturn(iRegister == 1, ("Hey! Only register 1 can be read from with string!\n"), VINF_SUCCESS);
 
     /* Accesses without a valid buffer will be ignored. */
-    if (!pVBoxSCSI->pbBuf)
-        return VINF_SUCCESS;
+    AssertReturn(pVBoxSCSI->pbBuf, VINF_SUCCESS);
 
-    /* Also ignore attempts to read more data than is available. */
-    Assert(cbTransfer <= pVBoxSCSI->cbBuf);
-    if (cbTransfer > pVBoxSCSI->cbBuf)
-        cbTransfer = pVBoxSCSI->cbBuf;  /* Ignore excess data (not supposed to happen). */
+    /* Check state. */
+    AssertReturn(pVBoxSCSI->enmState == VBOXSCSISTATE_COMMAND_READY, VINF_SUCCESS);
+    Assert(!pVBoxSCSI->fBusy);
 
-    int rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, pVBoxSCSI->pbBuf + pVBoxSCSI->iBuf, cbTransfer);
-    AssertRC(rc);
+    /*
+     * Also ignore attempts to read more data than is available.
+     */
+    int rc = VINF_SUCCESS;
+    uint32_t cbTransfer = *pcTransfers * cb;
+    if (pVBoxSCSI->cbBufLeft > 0)
+    {
+        Assert(cbTransfer <= pVBoxSCSI->cbBuf);
+        if (cbTransfer > pVBoxSCSI->cbBuf)
+        {
+            memset(pbDst + pVBoxSCSI->cbBuf, 0xff, cbTransfer - pVBoxSCSI->cbBuf);
+            cbTransfer = pVBoxSCSI->cbBuf;  /* Ignore excess data (not supposed to happen). */
+        }
 
-    *pGCPtrDst = (RTGCPTR)((RTGCUINTPTR)GCDst + cbTransfer);
-    *pcTransfer = 0;
+        /* Copy the data and adance the buffer position. */
+        memcpy(pbDst, pVBoxSCSI->pbBuf + pVBoxSCSI->iBuf, cbTransfer);
 
-    /* Advance current buffer position. */
-    pVBoxSCSI->iBuf  += cbTransfer;
-    pVBoxSCSI->cbBuf -= cbTransfer;
+        /* Advance current buffer position. */
+        pVBoxSCSI->iBuf      += cbTransfer;
+        pVBoxSCSI->cbBufLeft -= cbTransfer;
 
-    if (pVBoxSCSI->cbBuf == 0)
+        /* When the guest reads the last byte from the data in buffer, clear
+           everything and reset command buffer. */
+        if (pVBoxSCSI->cbBufLeft == 0)
+            vboxscsiReset(pVBoxSCSI, false /*fEverything*/);
+    }
+    else
     {
-        /** The guest read the last byte from the data in buffer.
-         *  Clear everything and reset command buffer.
-         */
-        RTMemFree(pVBoxSCSI->pbBuf);
-        pVBoxSCSI->pbBuf  = NULL;
-        pVBoxSCSI->cbCDB = 0;
-        pVBoxSCSI->iCDB  = 0;
-        pVBoxSCSI->iBuf  = 0;
-        pVBoxSCSI->uTargetDevice = 0;
-        pVBoxSCSI->enmState = VBOXSCSISTATE_NO_COMMAND;
-        memset(pVBoxSCSI->abCDB, 0, sizeof(pVBoxSCSI->abCDB));
+        AssertFailed();
+        memset(pbDst, 0, cbTransfer);
     }
+    *pcTransfers = 0;
 
     return rc;
 }
 
 int vboxscsiWriteString(PPDMDEVINS pDevIns, PVBOXSCSI pVBoxSCSI, uint8_t iRegister,
-                        RTGCPTR *pGCPtrSrc, PRTGCUINTREG pcTransfer, unsigned cb)
+                        uint8_t const *pbSrc, uint32_t *pcTransfers, unsigned cb)
 {
-    RTGCPTR  GCSrc      = *pGCPtrSrc;
-    uint32_t cbTransfer = *pcTransfer * cb;
-
+    /*
+     * Check preconditions, fall back to non-string I/O handler.
+     */
+    Assert(*pcTransfers > 0);
     /* Write string only valid for data in/out register. */
-    AssertMsg(iRegister == 1, ("Hey only register 1 can be written to with string\n"));
+    AssertMsgReturn(iRegister == 1, ("Hey! Only register 1 can be written to with string!\n"), VINF_SUCCESS);
 
     /* Accesses without a valid buffer will be ignored. */
-    if (!pVBoxSCSI->pbBuf)
-        return VINF_SUCCESS;
+    AssertReturn(pVBoxSCSI->pbBuf, VINF_SUCCESS);
 
-    Assert(cbTransfer <= pVBoxSCSI->cbBuf);
-    if (cbTransfer > pVBoxSCSI->cbBuf)
-        cbTransfer = pVBoxSCSI->cbBuf;  /* Ignore excess data (not supposed to happen). */
+    /* State machine assumptions. */
+    AssertReturn(pVBoxSCSI->enmState == VBOXSCSISTATE_COMMAND_READY, VINF_SUCCESS);
+    AssertReturn(pVBoxSCSI->uTxDir == VBOXSCSI_TXDIR_TO_DEVICE, VINF_SUCCESS);
 
-    int rc = PDMDevHlpPhysReadGCVirt(pDevIns, pVBoxSCSI->pbBuf + pVBoxSCSI->iBuf, GCSrc, cbTransfer);
-    AssertRC(rc);
+    /*
+     * Ignore excess data (not supposed to happen).
+     */
+    int rc = VINF_SUCCESS;
+    if (pVBoxSCSI->cbBufLeft > 0)
+    {
+        uint32_t cbTransfer = RT_MIN(*pcTransfers * cb, pVBoxSCSI->cbBufLeft);
 
-    /* Advance current buffer position. */
-    pVBoxSCSI->iBuf  += cbTransfer;
-    pVBoxSCSI->cbBuf -= cbTransfer;
+        /* Copy the data and adance the buffer position. */
+        memcpy(pVBoxSCSI->pbBuf + pVBoxSCSI->iBuf, pbSrc, cbTransfer);
+        pVBoxSCSI->iBuf      += cbTransfer;
+        pVBoxSCSI->cbBufLeft -= cbTransfer;
 
-    *pGCPtrSrc = (RTGCPTR)((RTGCUINTPTR)GCSrc + cbTransfer);
-    *pcTransfer = 0;
+        /* If we've reached the end, tell the caller to submit the command. */
+        if (pVBoxSCSI->cbBufLeft == 0)
+        {
+            ASMAtomicXchgBool(&pVBoxSCSI->fBusy, true);
+            rc = VERR_MORE_DATA;
+        }
+    }
+    else
+        AssertFailed();
+    *pcTransfers = 0;
 
-    ASMAtomicXchgBool(&pVBoxSCSI->fBusy, true);
-    return VERR_MORE_DATA;
+    return rc;
 }
 
 void vboxscsiSetRequestRedo(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest)
@@ -446,3 +455,54 @@ void vboxscsiSetRequestRedo(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest)
         AssertPtr(pVBoxSCSI->pbBuf);
     }
 }
+
+DECLHIDDEN(int) vboxscsiR3LoadExec(PVBOXSCSI pVBoxSCSI, PSSMHANDLE pSSM)
+{
+    SSMR3GetU8  (pSSM, &pVBoxSCSI->regIdentify);
+    SSMR3GetU8  (pSSM, &pVBoxSCSI->uTargetDevice);
+    SSMR3GetU8  (pSSM, &pVBoxSCSI->uTxDir);
+    SSMR3GetU8  (pSSM, &pVBoxSCSI->cbCDB);
+    SSMR3GetMem (pSSM, &pVBoxSCSI->abCDB[0], sizeof(pVBoxSCSI->abCDB));
+    SSMR3GetU8  (pSSM, &pVBoxSCSI->iCDB);
+    SSMR3GetU32 (pSSM, &pVBoxSCSI->cbBufLeft);
+    SSMR3GetU32 (pSSM, &pVBoxSCSI->iBuf);
+    SSMR3GetBool(pSSM, (bool *)&pVBoxSCSI->fBusy);
+    SSMR3GetU8  (pSSM, (uint8_t *)&pVBoxSCSI->enmState);
+
+    /*
+     * Old saved states only save the size of the buffer left to read/write.
+     * To avoid changing the saved state version we can just calculate the original
+     * buffer size from the offset and remaining size.
+     */
+    pVBoxSCSI->cbBuf = pVBoxSCSI->cbBufLeft + pVBoxSCSI->iBuf;
+
+    if (pVBoxSCSI->cbBuf)
+    {
+        pVBoxSCSI->pbBuf = (uint8_t *)RTMemAllocZ(pVBoxSCSI->cbBuf);
+        if (!pVBoxSCSI->pbBuf)
+            return VERR_NO_MEMORY;
+
+        SSMR3GetMem(pSSM, pVBoxSCSI->pbBuf, pVBoxSCSI->cbBuf);
+    }
+
+    return VINF_SUCCESS;
+}
+
+DECLHIDDEN(int) vboxscsiR3SaveExec(PVBOXSCSI pVBoxSCSI, PSSMHANDLE pSSM)
+{
+    SSMR3PutU8    (pSSM, pVBoxSCSI->regIdentify);
+    SSMR3PutU8    (pSSM, pVBoxSCSI->uTargetDevice);
+    SSMR3PutU8    (pSSM, pVBoxSCSI->uTxDir);
+    SSMR3PutU8    (pSSM, pVBoxSCSI->cbCDB);
+    SSMR3PutMem   (pSSM, pVBoxSCSI->abCDB, sizeof(pVBoxSCSI->abCDB));
+    SSMR3PutU8    (pSSM, pVBoxSCSI->iCDB);
+    SSMR3PutU32   (pSSM, pVBoxSCSI->cbBufLeft);
+    SSMR3PutU32   (pSSM, pVBoxSCSI->iBuf);
+    SSMR3PutBool  (pSSM, pVBoxSCSI->fBusy);
+    SSMR3PutU8    (pSSM, pVBoxSCSI->enmState);
+
+    if (pVBoxSCSI->cbBuf)
+        SSMR3PutMem(pSSM, pVBoxSCSI->pbBuf, pVBoxSCSI->cbBuf);
+
+    return VINF_SUCCESS;
+}
diff --git a/src/VBox/Devices/Storage/VBoxSCSI.h b/src/VBox/Devices/Storage/VBoxSCSI.h
index 5d05569..4f4b5e2 100644
--- a/src/VBox/Devices/Storage/VBoxSCSI.h
+++ b/src/VBox/Devices/Storage/VBoxSCSI.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -112,13 +112,14 @@ typedef struct VBOXSCSI
     R3PTRTYPE(uint8_t *) pbBuf;
     /** Size of the buffer in bytes. */
     uint32_t             cbBuf;
+    /** The number of bytes left to read/write in the
+     *  buffer.  It is decremented when the guest (BIOS) accesses
+     *  the buffer data. */
+    uint32_t             cbBufLeft;
     /** Current position in the buffer (offBuf if you like). */
     uint32_t             iBuf;
     /** The result code of last operation. */
     int32_t              rcCompletion;
-#if HC_ARCH_BITS == 64
-    uint32_t             Alignment1;
-#endif
     /** Flag whether a request is pending. */
     volatile bool        fBusy;
     /** The state we are in when fetching a command from the BIOS. */
@@ -137,9 +138,12 @@ int vboxscsiSetupRequest(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest, uint
 int vboxscsiRequestFinished(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest, int rcCompletion);
 void vboxscsiSetRequestRedo(PVBOXSCSI pVBoxSCSI, PPDMSCSIREQUEST pScsiRequest);
 int vboxscsiWriteString(PPDMDEVINS pDevIns, PVBOXSCSI pVBoxSCSI, uint8_t iRegister,
-                        RTGCPTR *pGCPtrSrc, PRTGCUINTREG pcTransfer, unsigned cb);
+                        uint8_t const *pbSrc, uint32_t *pcTransfers, unsigned cb);
 int vboxscsiReadString(PPDMDEVINS pDevIns, PVBOXSCSI pVBoxSCSI, uint8_t iRegister,
-                       RTGCPTR *pGCPtrDst, PRTGCUINTREG pcTransfer, unsigned cb);
+                       uint8_t *pbDst, uint32_t *pcTransfers, unsigned cb);
+
+DECLHIDDEN(int) vboxscsiR3LoadExec(PVBOXSCSI pVBoxSCSI, PSSMHANDLE pSSM);
+DECLHIDDEN(int) vboxscsiR3SaveExec(PVBOXSCSI pVBoxSCSI, PSSMHANDLE pSSM);
 RT_C_DECLS_END
 #endif /* IN_RING3 */
 
diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp
index 75f1b49..f68e6f1 100644
--- a/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp
+++ b/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -256,19 +256,20 @@ VBOXDDU_DECL(int) VSCSIDeviceLunDetach(VSCSIDEVICE hVScsiDevice, uint32_t iLun,
 }
 
 
-VBOXDDU_DECL(int) VSCSIDeviceLunGet(VSCSIDEVICE hVScsiDevice, uint32_t iLun,
-                                    PVSCSILUN phVScsiLun)
+VBOXDDU_DECL(int) VSCSIDeviceLunQueryType(VSCSIDEVICE hVScsiDevice, uint32_t iLun,
+                                          PVSCSILUNTYPE pEnmLunType)
 {
     PVSCSIDEVICEINT pVScsiDevice = (PVSCSIDEVICEINT)hVScsiDevice;
 
     /* Parameter checks */
     AssertPtrReturn(pVScsiDevice, VERR_INVALID_HANDLE);
-    AssertPtrReturn(phVScsiLun, VERR_INVALID_POINTER);
+    AssertPtrReturn(pEnmLunType, VERR_INVALID_POINTER);
     AssertReturn(iLun < VSCSI_DEVICE_LUN_MAX, VERR_VSCSI_LUN_INVALID);
     AssertReturn(iLun < pVScsiDevice->cLunsMax, VERR_VSCSI_LUN_NOT_ATTACHED);
     AssertPtrReturn(pVScsiDevice->papVScsiLun[iLun], VERR_VSCSI_LUN_NOT_ATTACHED);
 
-    *phVScsiLun = pVScsiDevice->papVScsiLun[iLun];
+    PVSCSILUNINT hVScsiLun = pVScsiDevice->papVScsiLun[iLun];
+    *pEnmLunType = hVScsiLun->pVScsiLunDesc->enmLunType;
 
     return VINF_SUCCESS;
 }
diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSIInline.h b/src/VBox/Devices/Storage/VSCSI/VSCSIInline.h
index d897a21..ceed024 100644
--- a/src/VBox/Devices/Storage/VSCSI/VSCSIInline.h
+++ b/src/VBox/Devices/Storage/VSCSI/VSCSIInline.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h b/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h
index c5550f1..4f247e2 100644
--- a/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h
+++ b/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp
index 8476bfa..b127f60 100644
--- a/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp
+++ b/src/VBox/Devices/Storage/VSCSI/VSCSIIoReq.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp
index 24462db..1f63119 100644
--- a/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp
+++ b/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp
index 10330cd..9e353f0 100644
--- a/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp
+++ b/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp
index 12a9473..fac259b 100644
--- a/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp
+++ b/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp
index 1541cb2..adc910e 100644
--- a/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp
+++ b/src/VBox/Devices/Storage/VSCSI/VSCSISense.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSIVpdPagePool.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSIVpdPagePool.cpp
index ac18ace..28e590e 100644
--- a/src/VBox/Devices/Storage/VSCSI/VSCSIVpdPagePool.cpp
+++ b/src/VBox/Devices/Storage/VSCSI/VSCSIVpdPagePool.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSIVpdPages.h b/src/VBox/Devices/Storage/VSCSI/VSCSIVpdPages.h
index 8284a74..69eb49a 100644
--- a/src/VBox/Devices/Storage/VSCSI/VSCSIVpdPages.h
+++ b/src/VBox/Devices/Storage/VSCSI/VSCSIVpdPages.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/ide.h b/src/VBox/Devices/Storage/ide.h
index 230ddbd..67608e9 100644
--- a/src/VBox/Devices/Storage/ide.h
+++ b/src/VBox/Devices/Storage/ide.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/Storage/swab.h b/src/VBox/Devices/Storage/swab.h
index b61e9f2..f0769e0 100644
--- a/src/VBox/Devices/Storage/swab.h
+++ b/src/VBox/Devices/Storage/swab.h
@@ -15,7 +15,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/DevOHCI.cpp b/src/VBox/Devices/USB/DevOHCI.cpp
index df8b2ca..6423b81 100644
--- a/src/VBox/Devices/USB/DevOHCI.cpp
+++ b/src/VBox/Devices/USB/DevOHCI.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -374,19 +374,19 @@ typedef struct OHCI
     PDMCRITSECT         CsIrq;
 
     /** The framer thread. */
-    R3PTRTYPE(PPDMTHREAD) hThreadFrame;
+    R3PTRTYPE(PPDMTHREAD)      hThreadFrame;
     /** Event semaphore to interact with the framer thread. */
-    R3PTRTYPE(RTSEMEVENT) hSemEventFrame;
+    R3PTRTYPE(RTSEMEVENTMULTI) hSemEventFrame;
     /** Event semaphore to release the thread waiting for the framer thread to stop. */
     R3PTRTYPE(RTSEMEVENTMULTI) hSemEventFrameStopped;
     /** Flag whether the framer thread should processing frames. */
-    volatile bool         fBusStarted;
+    volatile bool              fBusStarted;
     /** Alignment. */
-    uint32_t              Alignment5;
+    uint32_t                   Alignment5;
     /** How long to wait until the next frame. */
-    uint64_t              nsWait;
+    uint64_t                   nsWait;
     /** Critical section to synchronize the framer and URB completion handler. */
-    RTCRITSECT            CritSect;
+    RTCRITSECT                 CritSect;
 
 } OHCI;
 
@@ -2213,7 +2213,10 @@ static void ohciFramerateCalcNew(POHCI pThis)
         }
     }
     if (uNewFrameRate != pThis->uFrameRate)
+    {
+        LogFlow(("Frame rate changed from %u to %u\n", pThis->uFrameRate, uNewFrameRate));
         ohciCalcTimerIntervals(pThis, uNewFrameRate);
+    }
 }
 
 
@@ -2605,7 +2608,7 @@ static DECLCALLBACK(void) ohciRhXferCompletion(PVUSBIROOTHUBPORT pInterface, PVU
 
     /* Calculate new frame rate and wakeup the . */
     ohciFramerateCalcNew(pThis);
-    RTSemEventSignal(pThis->hSemEventFrame);
+    RTSemEventMultiSignal(pThis->hSemEventFrame);
     RTCritSectLeave(&pThis->CritSect);
 }
 
@@ -2979,8 +2982,8 @@ static bool ohciServiceIsochronousTdUnlink(POHCI pThis, POHCIITD pITd, uint32_t
     if (ITdAddrPrev)
     {
         /* Get validate the previous TD */
-        int iInFlightPrev = ohci_in_flight_find(pThis, ITdAddr);
-        AssertMsgReturn(iInFlightPrev >= 0, ("ITdAddr=%#RX32\n", ITdAddr), false);
+        int iInFlightPrev = ohci_in_flight_find(pThis, ITdAddrPrev);
+        AssertMsgReturn(iInFlightPrev >= 0, ("ITdAddr=%#RX32\n", ITdAddrPrev), false);
         PVUSBURB pUrbPrev = pThis->aInFlight[iInFlightPrev].pUrb;
         if (ohciHasUrbBeenCanceled(pThis, pUrbPrev, pEd)) /* ensures the copy is correct. */
             return false;
@@ -3869,52 +3872,105 @@ static void bump_frame_number(POHCI pThis)
 
 static DECLCALLBACK(int) ohciR3ThreadFrame(PPDMDEVINS pDevIns, PPDMTHREAD pThread)
 {
-    int rc = VINF_SUCCESS;
     POHCI pThis = (POHCI)pThread->pvUser;
-    uint64_t tsNanoStart = 0;
+    uint64_t tsBeginServicing = 0;
+    uint64_t cFramesProcessed = 0;
 
     if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
         return VINF_SUCCESS;
 
+    tsBeginServicing = RTTimeNanoTS();
+    cFramesProcessed = 0;
+
     while (pThread->enmState == PDMTHREADSTATE_RUNNING)
     {
         while (   !ASMAtomicReadBool(&pThis->fBusStarted)
-               && pThread->enmState == PDMTHREADSTATE_RUNNING
-               && RT_SUCCESS(rc))
+               && pThread->enmState == PDMTHREADSTATE_RUNNING)
         {
             /* Signal the waiter that we are stopped now. */
-            rc = RTSemEventMultiSignal(pThis->hSemEventFrameStopped);
+            int rc = RTSemEventMultiSignal(pThis->hSemEventFrameStopped);
             AssertRC(rc);
-            rc = RTSemEventWait(pThis->hSemEventFrame, RT_INDEFINITE_WAIT);
+            rc = RTSemEventMultiReset(pThis->hSemEventFrame);
+            AssertRC(rc);
+
+            /*
+             * We have to check that the Bus was not started and the thread state
+             * did not change or otherwise we risk hanging here indefinitely
+             * if the signaller set the event semaphore before we reset it.
+             */
+            if (ASMAtomicReadBool(&pThis->fBusStarted) || pThread->enmState != PDMTHREADSTATE_RUNNING)
+                break;
+
+            rc = RTSemEventMultiWait(pThis->hSemEventFrame, RT_INDEFINITE_WAIT);
+            AssertLogRelMsgReturn(RT_SUCCESS(rc) || rc == VERR_TIMEOUT, ("%Rrc\n", rc), rc);
+            tsBeginServicing = RTTimeNanoTS();
+            cFramesProcessed = 0;
         }
 
-        AssertLogRelMsgReturn(RT_SUCCESS(rc) || rc == VERR_TIMEOUT, ("%Rrc\n", rc), rc);
         if (RT_UNLIKELY(pThread->enmState != PDMTHREADSTATE_RUNNING))
             break;
 
-        tsNanoStart = RTTimeNanoTS();
-
         RTCritSectEnter(&pThis->CritSect);
 
         /* Reset idle detection flag */
         pThis->fIdle = true;
 
-        /* Frame boundary, so do EOF stuff here. */
-        bump_frame_number(pThis);
-        if ( (pThis->dqic != 0x7) && (pThis->dqic != 0))
-            pThis->dqic--;
+        /*
+         * Process new frames until we reached the required amount of
+         * frames for this service period. We might need to catch up
+         * here and process multiple frames at once due to scheduling
+         * preempting us. This is required because isochronous transfers
+         * have a tight timing requirement.
+         */
+        uint64_t tsNow = RTTimeNanoTS();
+        uint64_t nsWait = 0;
+        while (tsBeginServicing + (cFramesProcessed * RT_NS_1MS) < tsNow)
+        {
+            uint64_t tsNanoStart = RTTimeNanoTS();
+            LogFlowFunc(("Starting new frame at ts %llu\n", tsNanoStart));
+
+            /* Frame boundary, so do EOF stuff here. */
+            bump_frame_number(pThis);
+            if ( (pThis->dqic != 0x7) && (pThis->dqic != 0))
+                pThis->dqic--;
 
-        /* Clean up any URBs that have been removed. */
-        ohciCancelOrphanedURBs(pThis);
+            /* Clean up any URBs that have been removed. */
+            ohciCancelOrphanedURBs(pThis);
 
-        /* Start the next frame. */
-        ohciStartOfFrame(pThis);
+            /* Start the next frame. */
+            ohciStartOfFrame(pThis);
+            cFramesProcessed++;
+
+            tsNow = RTTimeNanoTS();
+            uint64_t tsFrameNext = tsNanoStart + pThis->nsWait;
+
+            if (tsFrameNext > tsNow)
+            {
+                nsWait = tsFrameNext - tsNow;
+                LogFlowFunc(("Current frame took %llu nano seconds to finish, we can wait %llu ns for the next frame\n", tsNow - tsNanoStart, nsWait));
+                break;
+            }
+            else if (tsBeginServicing + (cFramesProcessed + 100) * RT_NS_1MS < tsNow)
+            {
+                /* If we lag to far behind stop trying to catch up. */
+                LogRel(("OHCI#%u: Lagging too far behind, not trying to catch up anymore. Expect glitches with USB devices\n",
+                        pThis->pDevInsR3->iInstance));
+                tsBeginServicing = tsNow;
+                cFramesProcessed = 0;
+            }
+        }
 
         RTCritSectLeave(&pThis->CritSect);
 
         /* Wait for the next round. */
-        RTMSINTERVAL msWait = (RTMSINTERVAL)(((RTTimeNanoTS() + pThis->nsWait) - tsNanoStart) / 1000000);
-        rc = RTSemEventWait(pThis->hSemEventFrame, msWait);
+        if (nsWait >= 500 * RT_NS_1US)
+        {
+            LogFlowFunc(("Going to sleep for at least %llu ns\n", nsWait));
+            int rc = RTSemEventMultiWaitEx(pThis->hSemEventFrame, RTSEMWAIT_FLAGS_RELATIVE | RTSEMWAIT_FLAGS_NANOSECS | RTSEMWAIT_FLAGS_UNINTERRUPTIBLE,
+                                           nsWait);
+            AssertLogRelMsg(RT_SUCCESS(rc) || rc == VERR_TIMEOUT, ("%Rrc\n", rc));
+            RTSemEventMultiReset(pThis->hSemEventFrame);
+        }
     }
 
     return VINF_SUCCESS;
@@ -3930,17 +3986,14 @@ static DECLCALLBACK(int) ohciR3ThreadFrame(PPDMDEVINS pDevIns, PPDMTHREAD pThrea
 static DECLCALLBACK(int) ohciR3ThreadFrameWakeup(PPDMDEVINS pDevIns, PPDMTHREAD pThread)
 {
     POHCI pThis = PDMINS_2_DATA(pDevIns, POHCI);
-    return RTSemEventSignal(pThis->hSemEventFrame);
+    return RTSemEventMultiSignal(pThis->hSemEventFrame);
 }
 
 /**
  * Do frame processing on frame boundary
  */
-static void ohciFrameBoundaryTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
+static DECLCALLBACK(void) ohciFrameBoundaryTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
-    POHCI pThis = (POHCI)pvUser;
-    STAM_PROFILE_START(&pThis->StatTimer, a);
-    STAM_PROFILE_STOP(&pThis->StatTimer, a);
 }
 
 /**
@@ -3957,7 +4010,7 @@ static void ohciBusStart(POHCI pThis)
     pThis->SofTime = PDMDevHlpTMTimeVirtGet(pThis->CTX_SUFF(pDevIns));
     bool fBusActive = ASMAtomicXchgBool(&pThis->fBusStarted, true);
     if (!fBusActive)
-        RTSemEventSignal(pThis->hSemEventFrame);
+        RTSemEventMultiSignal(pThis->hSemEventFrame);
 }
 
 /**
@@ -3972,7 +4025,7 @@ static void ohciBusStop(POHCI pThis)
         AssertRC(rc);
 
         /* Signal the frame thread to stop. */
-        RTSemEventSignal(pThis->hSemEventFrame);
+        RTSemEventMultiSignal(pThis->hSemEventFrame);
 
         /* Wait for signal from the thrad that it stopped. */
         rc = RTSemEventMultiWait(pThis->hSemEventFrameStopped, RT_INDEFINITE_WAIT);
@@ -5176,7 +5229,7 @@ static DECLCALLBACK(int) ohciR3SavePrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
         PVUSBIDEVICE pDev = pRh->aPorts[i].pDev;
         if (pDev)
         {
-            if (!VUSBIDevIsEmulated(pDev))
+            if (!VUSBIDevIsSavedStateSupported(pDev))
             {
                 VUSBIRhDetachDevice(pRh->pIRhConn, pDev);
                 /*
@@ -5260,7 +5313,7 @@ static DECLCALLBACK(int) ohciR3SaveDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
     for (i = 0; i < RT_ELEMENTS(pRh->aPorts); i++)
     {
         if (   pRh->aPorts[i].pDev
-            && !VUSBIDevIsEmulated(pRh->aPorts[i].pDev))
+            && !VUSBIDevIsSavedStateSupported(pRh->aPorts[i].pDev))
             pRh->aPorts[i].pDev = NULL;
     }
 
@@ -5271,7 +5324,7 @@ static DECLCALLBACK(int) ohciR3SaveDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
     {
         PVUSBIDEVICE pDev = Rh.aPorts[i].pDev;
         if (   pDev
-            && !VUSBIDevIsEmulated(pDev))
+            && !VUSBIDevIsSavedStateSupported(pDev))
             VUSBIRhAttachDevice(pRh->pIRhConn, pDev);
     }
 
@@ -5310,7 +5363,7 @@ static DECLCALLBACK(int) ohciR3LoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
         {
             PVUSBIDEVICE pDev = pRh->aPorts[i].pDev;
             if (   pDev
-                && !VUSBIDevIsEmulated(pDev))
+                && !VUSBIDevIsSavedStateSupported(pDev))
             {
                 Load.apDevs[Load.cDevs++] = pDev;
                 VUSBIRhDetachDevice(pRh->pIRhConn, pDev);
@@ -5608,7 +5661,7 @@ static DECLCALLBACK(void) ohciR3Resume(PPDMDEVINS pDevIns)
 
         LogFlowFunc(("Bus was active, restart frame thread\n"));
         ASMAtomicXchgBool(&pThis->fBusStarted, true);
-        RTSemEventSignal(pThis->hSemEventFrame);
+        RTSemEventMultiSignal(pThis->hSemEventFrame);
     }
 }
 
@@ -5702,7 +5755,7 @@ static DECLCALLBACK(int) ohciR3Destruct(PPDMDEVINS pDevIns)
      * Destroy event sempahores.
      */
     if (pThis->hSemEventFrame)
-        RTSemEventDestroy(pThis->hSemEventFrame);
+        RTSemEventMultiDestroy(pThis->hSemEventFrame);
     if (pThis->hSemEventFrameStopped)
         RTSemEventMultiDestroy(pThis->hSemEventFrameStopped);
     if (RTCritSectIsInitialized(&pThis->CritSect))
@@ -5873,7 +5926,7 @@ static DECLCALLBACK(int) ohciR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFG
         return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
                                    N_("EHCI: Failed to create critical section"));
 
-    rc = RTSemEventCreate(&pThis->hSemEventFrame);
+    rc = RTSemEventMultiCreate(&pThis->hSemEventFrame);
     AssertRCReturn(rc, rc);
 
     rc = RTSemEventMultiCreate(&pThis->hSemEventFrameStopped);
@@ -5885,7 +5938,7 @@ static DECLCALLBACK(int) ohciR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFG
                                    N_("OHCI: Failed to create critical section"));
 
     rc = PDMDevHlpThreadCreate(pDevIns, &pThis->hThreadFrame, pThis, ohciR3ThreadFrame,
-                               ohciR3ThreadFrameWakeup, 0, RTTHREADTYPE_IO, "OhciFramer");
+                               ohciR3ThreadFrameWakeup, 0, RTTHREADTYPE_TIMER, "OhciFramer");
     if (RT_FAILURE(rc))
         return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
                                    N_("OHCI: Failed to create worker thread"));
@@ -5902,7 +5955,6 @@ static DECLCALLBACK(int) ohciR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFG
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatCanceledIsocUrbs, STAMTYPE_COUNTER, "/Devices/OHCI/CanceledIsocUrbs", STAMUNIT_OCCURENCES,     "Detected canceled isochronous URBs.");
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatCanceledGenUrbs,  STAMTYPE_COUNTER, "/Devices/OHCI/CanceledGenUrbs",  STAMUNIT_OCCURENCES,     "Detected canceled general URBs.");
     PDMDevHlpSTAMRegister(pDevIns, &pThis->StatDroppedUrbs,      STAMTYPE_COUNTER, "/Devices/OHCI/DroppedUrbs",      STAMUNIT_OCCURENCES,     "Dropped URBs (endpoint halted, or URB canceled).");
-    PDMDevHlpSTAMRegister(pDevIns, &pThis->StatTimer,            STAMTYPE_PROFILE, "/Devices/OHCI/Timer",            STAMUNIT_TICKS_PER_CALL, "Profiling ohciFrameBoundaryTimer.");
 #endif
 
     /*
@@ -5927,7 +5979,7 @@ const PDMDEVREG g_DeviceOHCI =
     /* szName */
     "usb-ohci",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/USB/DrvVUSBRootHub.cpp b/src/VBox/Devices/USB/DrvVUSBRootHub.cpp
index 942621c..98ada56 100644
--- a/src/VBox/Devices/USB/DrvVUSBRootHub.cpp
+++ b/src/VBox/Devices/USB/DrvVUSBRootHub.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2005-2012 Oracle Corporation
+ * Copyright (C) 2005-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -428,6 +428,7 @@ PVUSBURB vusbRhNewUrb(PVUSBROOTHUB pRh, uint8_t DstAddress, uint32_t cbData, uin
      * (Re)init the URB
      */
     pUrb->enmState = VUSBURBSTATE_ALLOCATED;
+    pUrb->fCompleting = false;
     pUrb->pszDesc = NULL;
     pUrb->VUsb.pNext = NULL;
     pUrb->VUsb.ppPrev = NULL;
@@ -597,7 +598,7 @@ static DECLCALLBACK(int) vusbRhCancelUrbsEp(PVUSBIROOTHUBCONNECTOR pInterface, P
     /*
      * Cancel and reap the URB(s) on an endpoint.
      */
-    LogFlow(("vusbRhCancelUrbsEp: pRh=%p pUrb=%p\n", pRh));
+    LogFlow(("vusbRhCancelUrbsEp: pRh=%p pUrb=%p\n", pRh, pUrb));
 
     vusbUrbCancelAsync(pUrb, CANCELMODE_UNDO);
 
diff --git a/src/VBox/Devices/USB/USBProxyDevice-stub.cpp b/src/VBox/Devices/USB/USBProxyDevice-stub.cpp
index a79a64e..cbe1d06 100644
--- a/src/VBox/Devices/USB/USBProxyDevice-stub.cpp
+++ b/src/VBox/Devices/USB/USBProxyDevice-stub.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/USBProxyDevice.cpp b/src/VBox/Devices/USB/USBProxyDevice.cpp
index a51bc36..735142c 100644
--- a/src/VBox/Devices/USB/USBProxyDevice.cpp
+++ b/src/VBox/Devices/USB/USBProxyDevice.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/USBProxyDevice.h b/src/VBox/Devices/USB/USBProxyDevice.h
index 6534a4c..4c786bc 100644
--- a/src/VBox/Devices/USB/USBProxyDevice.h
+++ b/src/VBox/Devices/USB/USBProxyDevice.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/VUSBDevice.cpp b/src/VBox/Devices/USB/VUSBDevice.cpp
index ebbf86f..2adb234 100644
--- a/src/VBox/Devices/USB/VUSBDevice.cpp
+++ b/src/VBox/Devices/USB/VUSBDevice.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1013,11 +1013,23 @@ void vusbDevSetAddress(PVUSBDEV pDev, uint8_t u8Address)
 
     PVUSBROOTHUB pRh = vusbDevGetRh(pDev);
     AssertPtrReturnVoid(pRh);
+    if (pDev->u8Address == VUSB_DEFAULT_ADDRESS)
+        pRh->pDefaultAddress = NULL;
 
     vusbDevAddressUnHash(pDev);
 
     if (u8Address == VUSB_DEFAULT_ADDRESS)
+    {
+        if (pRh->pDefaultAddress != NULL)
+        {
+            vusbDevAddressUnHash(pRh->pDefaultAddress);
+            vusbDevSetState(pRh->pDefaultAddress, VUSB_DEVICE_STATE_POWERED);
+            Log(("2 DEFAULT ADDRS\n"));
+        }
+
+        pRh->pDefaultAddress = pDev;
         vusbDevSetState(pDev, VUSB_DEVICE_STATE_DEFAULT);
+    }
     else
         vusbDevSetState(pDev, VUSB_DEVICE_STATE_ADDRESS);
 
@@ -1034,7 +1046,6 @@ static DECLCALLBACK(int) vusbDevCancelAllUrbsWorker(PVUSBDEV pDev, bool fDetachi
     /*
      * Iterate the URBs and cancel them.
      */
-    RTCritSectEnter(&pDev->CritSectAsyncUrbs);
     PVUSBURB pUrb = pDev->pAsyncUrbHead;
     while (pUrb)
     {
@@ -1051,6 +1062,7 @@ static DECLCALLBACK(int) vusbDevCancelAllUrbsWorker(PVUSBDEV pDev, bool fDetachi
     /*
      * Reap any URBs which became ripe during cancel now.
      */
+    RTCritSectEnter(&pDev->CritSectAsyncUrbs);
     unsigned cReaped;
     do
     {
@@ -1166,8 +1178,7 @@ int vusbDevUrbIoThreadCreate(PVUSBDEV pDev)
 
     ASMAtomicXchgBool(&pDev->fTerminate, false);
     rc = RTThreadCreateF(&pDev->hUrbIoThread, vusbDevUrbIoThread, pDev, 0, RTTHREADTYPE_IO,
-                         RTTHREADFLAGS_WAITABLE, "%s-%d", pDev->pUsbIns->pReg->szName,
-                         pDev->pUsbIns->iInstance);
+                         RTTHREADFLAGS_WAITABLE, "USBDevIo-%d", pDev->i16Port);
     if (RT_SUCCESS(rc))
     {
         /* Wait for it to become active. */
@@ -1221,6 +1232,8 @@ int vusbDevDetach(PVUSBDEV pDev)
     PVUSBROOTHUB pRh = vusbDevGetRh(pDev);
     if (!pRh)
         AssertMsgFailedReturn(("Not attached!\n"), VERR_VUSB_DEVICE_NOT_ATTACHED);
+    if (pRh->pDefaultAddress == pDev)
+        pRh->pDefaultAddress = NULL;
 
     pDev->pHub->pOps->pfnDetach(pDev->pHub, pDev);
     pDev->i16Port = -1;
@@ -1553,17 +1566,17 @@ DECLCALLBACK(VUSBDEVICESTATE) vusbIDeviceGetState(PVUSBIDEVICE pInterface)
 
 
 /**
- * @interface_method_impl{VUSBIDEVICE,pfnIsEmulated}
+ * @interface_method_impl{VUSBIDEVICE,pfnIsSavedStateSupported}
  */
-DECLCALLBACK(bool) vusbIDeviceIsEmulated(PVUSBIDEVICE pInterface)
+DECLCALLBACK(bool) vusbIDeviceIsSavedStateSupported(PVUSBIDEVICE pInterface)
 {
     PVUSBDEV pDev = (PVUSBDEV)pInterface;
-    bool fEmulated = !!(pDev->pUsbIns->pReg->fFlags & PDM_USBREG_EMULATED_DEVICE);
+    bool fSavedStateSupported = RT_BOOL(pDev->pUsbIns->pReg->fFlags & PDM_USBREG_SAVED_STATE_SUPPORTED);
 
     LogFlowFunc(("pInterface=%p\n", pInterface));
 
-    LogFlowFunc(("returns %RTbool\n", fEmulated));
-    return fEmulated;
+    LogFlowFunc(("returns %RTbool\n", fSavedStateSupported));
+    return fSavedStateSupported;
 }
 
 
@@ -1714,13 +1727,13 @@ int vusbDevInit(PVUSBDEV pDev, PPDMUSBINS pUsbIns, const char *pszCaptureFilenam
     Assert(!pDev->IDevice.pfnPowerOn);
     Assert(!pDev->IDevice.pfnPowerOff);
     Assert(!pDev->IDevice.pfnGetState);
-    Assert(!pDev->IDevice.pfnIsEmulated);
+    Assert(!pDev->IDevice.pfnIsSavedStateSupported);
 
     pDev->IDevice.pfnReset = vusbIDeviceReset;
     pDev->IDevice.pfnPowerOn = vusbIDevicePowerOn;
     pDev->IDevice.pfnPowerOff = vusbIDevicePowerOff;
     pDev->IDevice.pfnGetState = vusbIDeviceGetState;
-    pDev->IDevice.pfnIsEmulated = vusbIDeviceIsEmulated;
+    pDev->IDevice.pfnIsSavedStateSupported = vusbIDeviceIsSavedStateSupported;
     pDev->IDevice.pfnGetSpeed = vusbIDeviceGetSpeed;
     pDev->pUsbIns = pUsbIns;
     pDev->pNext = NULL;
diff --git a/src/VBox/Devices/USB/VUSBInternal.h b/src/VBox/Devices/USB/VUSBInternal.h
index ed0ad47..c87cd01 100644
--- a/src/VBox/Devices/USB/VUSBInternal.h
+++ b/src/VBox/Devices/USB/VUSBInternal.h
@@ -328,10 +328,8 @@ typedef struct VUSBROOTHUB
     VUSBHUB                 Hub;
     /** Address hash table. */
     PVUSBDEV                apAddrHash[VUSB_ADDR_HASHSZ];
-
-#if HC_ARCH_BITS == 32
-    uint32_t                Alignment0;
-#endif
+    /** The default address. */
+    PVUSBDEV                pDefaultAddress;
 
     /** Pointer to the driver instance. */
     PPDMDRVINS              pDrvIns;
@@ -341,16 +339,15 @@ typedef struct VUSBROOTHUB
     VUSBIROOTHUBCONNECTOR   IRhConnector;
 
 #if HC_ARCH_BITS == 32
-    uint32_t                Alignment1;
+    uint32_t                Alignment0;
 #endif
-
     /** Critical section protecting the device list. */
     RTCRITSECT              CritSectDevices;
     /** Chain of devices attached to this hub. */
     PVUSBDEV                pDevices;
 
 #if HC_ARCH_BITS == 32
-    uint32_t                Alignment2;
+    uint32_t                Alignment1;
 #endif
 
     /** Availability Bitmap. */
diff --git a/src/VBox/Devices/USB/VUSBReadAhead.cpp b/src/VBox/Devices/USB/VUSBReadAhead.cpp
index ecd1b69..1db5646 100644
--- a/src/VBox/Devices/USB/VUSBReadAhead.cpp
+++ b/src/VBox/Devices/USB/VUSBReadAhead.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/VUSBSniffer.cpp b/src/VBox/Devices/USB/VUSBSniffer.cpp
index 1b8f30f..4ea5766 100644
--- a/src/VBox/Devices/USB/VUSBSniffer.cpp
+++ b/src/VBox/Devices/USB/VUSBSniffer.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/VUSBSniffer.h b/src/VBox/Devices/USB/VUSBSniffer.h
index 9e9b763..674cd7b 100644
--- a/src/VBox/Devices/USB/VUSBSniffer.h
+++ b/src/VBox/Devices/USB/VUSBSniffer.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/VUSBUrb.cpp b/src/VBox/Devices/USB/VUSBUrb.cpp
index c64bc06..4213123 100644
--- a/src/VBox/Devices/USB/VUSBUrb.cpp
+++ b/src/VBox/Devices/USB/VUSBUrb.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -976,7 +976,10 @@ static void vusbMsgCompletion(PVUSBURB pUrb)
     Assert(   pUrb->enmState == VUSBURBSTATE_REAPED
            || pUrb->enmState == VUSBURBSTATE_CANCELLED);
     if (pUrb->enmState != VUSBURBSTATE_CANCELLED)
+    {
         pUrb->enmState = VUSBURBSTATE_ALLOCATED;
+        pUrb->fCompleting = false;
+    }
     RTCritSectLeave(&pPipe->CritSectCtrl);
 
     /* Complete the original control URB on the root hub now. */
@@ -1011,7 +1014,8 @@ void vusbUrbCompletionRh(PVUSBURB pUrb)
     AssertMsg(   pUrb->enmState == VUSBURBSTATE_REAPED
               || pUrb->enmState == VUSBURBSTATE_CANCELLED, ("%d\n", pUrb->enmState));
 
-    if (pUrb->VUsb.pDev->hSniffer)
+    if (   pUrb->VUsb.pDev
+        && pUrb->VUsb.pDev->hSniffer)
     {
         int rc = VUSBSnifferRecordEvent(pUrb->VUsb.pDev->hSniffer, pUrb,
                                           pUrb->enmStatus == VUSBSTATUS_OK
@@ -1287,6 +1291,7 @@ static void vusbMsgSubmitSynchronously(PVUSBURB pUrb, bool fSafeRequest)
      * 'Free' the message URB, i.e. put it back to the allocated state.
      */
     pExtra->Urb.enmState = VUSBURBSTATE_ALLOCATED;
+    pExtra->Urb.fCompleting = false;
 }
 
 /**
@@ -1298,7 +1303,10 @@ void vusbMsgResetExtraData(PVUSBCTRLEXTRA pExtra)
         return;
     pExtra->enmStage = CTLSTAGE_SETUP;
     if (pExtra->Urb.enmState != VUSBURBSTATE_CANCELLED)
+    {
         pExtra->Urb.enmState = VUSBURBSTATE_ALLOCATED;
+        pExtra->Urb.fCompleting = false;
+    }
 }
 
 
@@ -1344,6 +1352,7 @@ static DECLCALLBACK(void) vusbMsgFreeUrb(PVUSBURB pUrb)
     {
         Assert(pUrb->VUsb.pvFreeCtx == &pExtra->Urb);
         pUrb->enmState = VUSBURBSTATE_ALLOCATED;
+        pUrb->fCompleting = false;
     }
 }
 
@@ -1393,6 +1402,7 @@ static PVUSBCTRLEXTRA vusbMsgAllocExtraData(PVUSBURB pUrb)
         //pExtra->Urb.Dev.pvProxyUrb = NULL;
         pExtra->Urb.u32Magic = VUSBURB_MAGIC;
         pExtra->Urb.enmState = VUSBURBSTATE_ALLOCATED;
+        pExtra->Urb.fCompleting = false;
 #ifdef LOG_ENABLED
         RTStrAPrintf(&pExtra->Urb.pszDesc, "URB %p msg->%p", &pExtra->Urb, pUrb);
 #endif
@@ -1459,6 +1469,7 @@ static bool vusbMsgSetup(PVUSBPIPE pPipe, const void *pvBuf, uint32_t cbBuf)
         pPipe->pCtrl = pExtra = (PVUSBCTRLEXTRA)pvNew;
         pExtra->pMsg = (PVUSBSETUP)pExtra->Urb.abData;
         pExtra->Urb.enmState = VUSBURBSTATE_ALLOCATED;
+        pExtra->Urb.fCompleting = false;
     }
 
     /*
@@ -2179,8 +2190,12 @@ void vusbUrbCancel(PVUSBURB pUrb, CANCELMODE mode)
  */
 void vusbUrbCancelAsync(PVUSBURB pUrb, CANCELMODE mode)
 {
-    int rc = vusbDevIoThreadExec(pUrb->VUsb.pDev, 0 /* fFlags */, (PFNRT)vusbUrbCancelWorker, 2, pUrb, mode);
-    AssertRC(rc);
+    /* Don't try to cancel the URB when completion is in progress at the moment. */
+    if (!ASMAtomicXchgBool(&pUrb->fCompleting, true))
+    {
+        int rc = vusbDevIoThreadExec(pUrb->VUsb.pDev, 0 /* fFlags */, (PFNRT)vusbUrbCancelWorker, 2, pUrb, mode);
+        AssertRC(rc);
+    }
 }
 
 
@@ -2199,7 +2214,8 @@ void vusbUrbRipe(PVUSBURB pUrb)
         ||  pUrb->enmState == VUSBURBSTATE_REAPED)
     {
         pUrb->enmState = VUSBURBSTATE_REAPED;
-        vusbUrbCompletion(pUrb);
+        if (!ASMAtomicXchgBool(&pUrb->fCompleting, true))
+            vusbUrbCompletion(pUrb);
     }
     else if (pUrb->enmState == VUSBURBSTATE_CANCELLED)
     {
diff --git a/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp b/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp
index 9af519a..8239de7 100644
--- a/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp
+++ b/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp b/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp
index 44f1afd..5d37f88 100644
--- a/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp
+++ b/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp
@@ -6,7 +6,7 @@
 /*
  * Includes contributions from Hans Petter Selasky
  *
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp b/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp
index df05840..31ff950 100644
--- a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp
+++ b/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp b/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp
index 22f7534..0a7ac27 100644
--- a/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp
+++ b/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp b/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp
index efa7a2e..5f3f156 100644
--- a/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp
+++ b/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/testcase/tstOhciRegisterAccess.cpp b/src/VBox/Devices/USB/testcase/tstOhciRegisterAccess.cpp
index 0eeae14..735b181 100644
--- a/src/VBox/Devices/USB/testcase/tstOhciRegisterAccess.cpp
+++ b/src/VBox/Devices/USB/testcase/tstOhciRegisterAccess.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/testcase/tstPalmOne.c b/src/VBox/Devices/USB/testcase/tstPalmOne.c
index 2bbbbf7..cac2931 100644
--- a/src/VBox/Devices/USB/testcase/tstPalmOne.c
+++ b/src/VBox/Devices/USB/testcase/tstPalmOne.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/testcase/tstTrekStorGo.c b/src/VBox/Devices/USB/testcase/tstTrekStorGo.c
index 7541609..2ea27f2 100644
--- a/src/VBox/Devices/USB/testcase/tstTrekStorGo.c
+++ b/src/VBox/Devices/USB/testcase/tstTrekStorGo.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp b/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp
index 7c453aa..22fced2 100644
--- a/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp
+++ b/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp b/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp
index 3a2f70a..f3d255e 100644
--- a/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp
+++ b/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp b/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp
index bb3c76b..fb4e5dd 100644
--- a/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp
+++ b/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/VMMDev/VMMDev.cpp b/src/VBox/Devices/VMMDev/VMMDev.cpp
index b94a025..567a6ff 100644
--- a/src/VBox/Devices/VMMDev/VMMDev.cpp
+++ b/src/VBox/Devices/VMMDev/VMMDev.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -4130,7 +4130,7 @@ extern "C" const PDMDEVREG g_DeviceVMMDev =
     /* szName */
     "VMMDev",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp b/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp
index 782b99f..8d617dc 100644
--- a/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp
+++ b/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/VMMDev/VMMDevHGCM.h b/src/VBox/Devices/VMMDev/VMMDevHGCM.h
index dd6999a..30fcb50 100644
--- a/src/VBox/Devices/VMMDev/VMMDevHGCM.h
+++ b/src/VBox/Devices/VMMDev/VMMDevHGCM.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/VMMDev/VMMDevState.h b/src/VBox/Devices/VMMDev/VMMDevState.h
index c13fd70..851e7f9 100644
--- a/src/VBox/Devices/VMMDev/VMMDevState.h
+++ b/src/VBox/Devices/VMMDev/VMMDevState.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/VMMDev/VMMDevTesting.cpp b/src/VBox/Devices/VMMDev/VMMDevTesting.cpp
index 75abcbb..ac2c82c 100644
--- a/src/VBox/Devices/VMMDev/VMMDevTesting.cpp
+++ b/src/VBox/Devices/VMMDev/VMMDevTesting.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/VMMDev/VMMDevTesting.h b/src/VBox/Devices/VMMDev/VMMDevTesting.h
index c77db23..5be6bf8 100644
--- a/src/VBox/Devices/VMMDev/VMMDevTesting.h
+++ b/src/VBox/Devices/VMMDev/VMMDevTesting.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/VirtIO/Virtio.cpp b/src/VBox/Devices/VirtIO/Virtio.cpp
index d03577f..cd55e99 100644
--- a/src/VBox/Devices/VirtIO/Virtio.cpp
+++ b/src/VBox/Devices/VirtIO/Virtio.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/VirtIO/Virtio.h b/src/VBox/Devices/VirtIO/Virtio.h
index 1d93cf1..9f3ca97 100644
--- a/src/VBox/Devices/VirtIO/Virtio.h
+++ b/src/VBox/Devices/VirtIO/Virtio.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/build/VBoxDD.d b/src/VBox/Devices/build/VBoxDD.d
index cfd2b43..d80728b 100644
--- a/src/VBox/Devices/build/VBoxDD.d
+++ b/src/VBox/Devices/build/VBoxDD.d
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/build/VBoxDD2.cpp b/src/VBox/Devices/build/VBoxDD2.cpp
index 8946b77..385b451 100644
--- a/src/VBox/Devices/build/VBoxDD2.cpp
+++ b/src/VBox/Devices/build/VBoxDD2.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/build/VBoxDD2.h b/src/VBox/Devices/build/VBoxDD2.h
index 80000f4..f725a68 100644
--- a/src/VBox/Devices/build/VBoxDD2.h
+++ b/src/VBox/Devices/build/VBoxDD2.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/build/VBoxDD2R0.cpp b/src/VBox/Devices/build/VBoxDD2R0.cpp
index ce2b5d3..32bc15c 100644
--- a/src/VBox/Devices/build/VBoxDD2R0.cpp
+++ b/src/VBox/Devices/build/VBoxDD2R0.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/build/VBoxDDR0.cpp b/src/VBox/Devices/build/VBoxDDR0.cpp
index c715900..4cc2b42 100644
--- a/src/VBox/Devices/build/VBoxDDR0.cpp
+++ b/src/VBox/Devices/build/VBoxDDR0.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/build/VBoxDDUDeps.cpp b/src/VBox/Devices/build/VBoxDDUDeps.cpp
index 77bc91b..0ee5032 100644
--- a/src/VBox/Devices/build/VBoxDDUDeps.cpp
+++ b/src/VBox/Devices/build/VBoxDDUDeps.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/build/vl_vbox.h b/src/VBox/Devices/build/vl_vbox.h
deleted file mode 100644
index 891cb87..0000000
--- a/src/VBox/Devices/build/vl_vbox.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/* $Id: vl_vbox.h $ */
-/** @file
- * VBox vl.h Replacement.
- *
- * Avoid including this file whenever possible.
- */
-
-/*
- * Copyright (C) 2006-2011 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#ifndef ___build_vl_vbox_h
-#define ___build_vl_vbox_h
-
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
-#include <VBox/cdefs.h>
-#include <VBox/types.h>
-#include <VBox/param.h>
-#include <VBox/vmm/ssm.h>
-#include <VBox/vmm/tm.h>
-#include <VBox/vmm/pdm.h>
-#include <VBox/err.h>
-#include <VBox/pci.h>
-
-#include <iprt/string.h>
-
-#include "VBoxDD.h"
-
-RT_C_DECLS_BEGIN
-
-/*
- * Misc macros.
- */
-#define TARGET_PAGE_BITS        (PAGE_SHIFT)
-#define TARGET_PAGE_SIZE        (PAGE_SIZE)
-#define TARGET_PAGE_MASK        (~PAGE_OFFSET_MASK)
-
-/*
- * Necessary for pckbd and vga.
- */
-#define TARGET_I386 1
-
-#ifndef glue
-# define _glue(x, y)    x ## y
-# define glue(x, y)     _glue(x, y)
-# define tostring(s)    #s
-# define stringify(s)   tostring(s)
-#endif
-
-#if defined(_MSC_VER) && !defined(__cplusplus)
-#define inline _inline
-#endif
-
-#ifdef _MSC_VER
-#define __func__ __FUNCTION__
-#endif
-
-
-/*
- * Misc types.
- */
-typedef RTGCPHYS                target_phys_addr_t;
-typedef PCIDEVICE               PCIDevice;
-typedef RTGCUINTREG             target_ulong;
-
-
-
-/*
- * Timers.
- */
-#define QEMUTimerCB                             FNTMTIMERQEMU
-typedef struct TMTIMER QEMUTimer;
-#define rt_clock                                TMCLOCK_REAL
-#define vm_clock                                TMCLOCK_VIRTUAL
-#define ticks_per_sec                           TMCpuTicksPerSecond((PVM)cpu_single_env->pVM)
-#define qemu_get_clock(enmClock)                TMR3Clock((PVM)cpu_single_env->pVM, enmClock)
-#define qemu_new_timer(clock, callback, user)   (QEMUTimer *)TMR3TimerCreateExternal((PVM)cpu_single_env->pVM, clock, callback, user, __FUNCTION__ )
-#define qemu_free_timer(timer)                  TMR3TimerDestroy(timer)
-#define qemu_del_timer(timer)                   TMTimerStop(timer)
-#define qemu_mod_timer(timer, expire)           TMTimerSet(timer, (uint64_t)expire)
-#define qemu_timer_pending(timer)               TMTimerIsActive(timer)
-#define cpu_disable_ticks()                     ASMBreakpoint()
-#define cpu_enable_ticks()                      ASMBreakpoint()
-#define cpu_calibrate_ticks()                   do {} while (0)
-#define init_timers()                           do {} while (0)
-#define quit_timers()                           do {} while (0)
-
-
-#ifdef IN_RING3
-/*
- * Saved state.
- */
-typedef struct SSMHANDLE QEMUFile;
-
-#define qemu_put_buffer(f, pv, cb)                  SSMR3PutMem((f), (pv), (cb))
-#define qemu_put_byte(f, u8)                        SSMR3PutU8((f), (uint8_t)(u8))
-#define qemu_put_8s(f, pu8)                         SSMR3PutU8((f), *(pu8))
-#define qemu_put_be16s(f, pu16)                     SSMR3PutU16((f), *(pu16))
-#define qemu_put_be32s(f, pu32)                     SSMR3PutU32((f), *(pu32))
-#define qemu_put_be64s(f, pu64)                     SSMR3PutU64((f), *(pu64))
-#define qemu_put_be16(f, u16)                       SSMR3PutU16((f), (uint16_t)(u16))
-#define qemu_put_be32(f, u32)                       SSMR3PutU32((f), (uint32_t)(u32))
-#define qemu_put_be64(f, u64)                       SSMR3PutU64((f), (uint64_t)(u64))
-
-#define qemu_get_8s(f, pu8)                         SSMR3GetU8((f), (pu8))
-#define qemu_get_be16s(f, pu16)                     SSMR3GetU16((f), (pu16))
-#define qemu_get_be32s(f, pu32)                     SSMR3GetU32((f), (pu32))
-#define qemu_get_be64s(f, pu64)                     SSMR3GetU64((f), (pu64))
-
-DECLINLINE(int) qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size)
-{
-    int rc = SSMR3GetMem(f, buf, size);
-    return RT_SUCCESS(rc) ? size : 0;
-}
-
-DECLINLINE(int) qemu_get_byte(QEMUFile *f)
-{
-    uint8_t u8;
-    int rc = SSMR3GetU8(f, &u8);
-    return RT_SUCCESS(rc) ? (int)u8 : -1;
-}
-
-DECLINLINE(unsigned) qemu_get_be16(QEMUFile *f)
-{
-    uint16_t u16;
-    int rc = SSMR3GetU16(f, &u16);
-    return RT_SUCCESS(rc) ? u16 : ~0;
-}
-
-DECLINLINE(unsigned) qemu_get_be32(QEMUFile *f)
-{
-    uint32_t u32;
-    int rc = SSMR3GetU32(f, &u32);
-    return RT_SUCCESS(rc) ? u32 : ~0U;
-}
-
-DECLINLINE(int64_t) qemu_get_be64(QEMUFile *f)
-{
-    uint64_t u64;
-    int rc = SSMR3GetU64(f, &u64);
-    return RT_SUCCESS(rc) ? (int64_t)u64 : ~0;
-}
-
-#define qemu_put_timer(f, ts)   TMR3TimerSave((ts), (f))
-#define qemu_get_timer(f, ts)   TMR3TimerLoad((ts), (f))
-
-#endif /* IN_RING3 */
-
-
-/*
- * Memory access.
- */
-
-DECLINLINE(int) lduw_raw(void *ptr)
-{
-    uint8_t *p = (uint8_t *)ptr;
-    return p[0] | (p[1] << 8);
-}
-
-/*
- * Misc.
- */
-
-#ifdef _MSC_VER
-/**
- * ffs -- vax ffs instruction
- */
-inline int ffs(int mask)
-{
-    int bit;
-    if (mask == 0)
-        return(0);
-    for (bit = 1; !(mask & 1); bit++)
-        mask >>= 1;
-    return(bit);
-}
-#endif /* _MSC_VER */
-
-/* bswap.h */
-#ifdef _MSC_VER
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN   1234
-#endif
-#ifndef BYTE_ORDER
-#define BYTE_ORDER      LITTLE_ENDIAN
-#endif
-
-static _inline uint16_t bswap_16(register uint16_t x)
-{
-    return ((uint16_t)( \
-                (((uint16_t)(x) & (uint16_t)0x00ffU) << 8) | \
-                (((uint16_t)(x) & (uint16_t)0xff00U) >> 8) )); \
-}
-
-static _inline uint32_t bswap_32(register uint32_t x) \
-{ \
-    return ((uint32_t)( \
-                (((uint32_t)(x) & (uint32_t)0x000000ffUL) << 24) | \
-                (((uint32_t)(x) & (uint32_t)0x0000ff00UL) <<  8) | \
-                (((uint32_t)(x) & (uint32_t)0x00ff0000UL) >>  8) | \
-                (((uint32_t)(x) & (uint32_t)0xff000000UL) >> 24) )); \
-}
-
-static _inline uint64_t bswap_64(register uint64_t x) \
-{ \
-    return ((uint64_t)( \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x00000000000000ffULL) << 56) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x000000000000ff00ULL) << 40) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x0000000000ff0000ULL) << 24) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x00000000ff000000ULL) <<  8) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x000000ff00000000ULL) >>  8) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x0000ff0000000000ULL) >> 24) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \
-                (uint64_t)(((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56) )); \
-}
-
-#else
-#undef __extension__
-#undef __attribute__
-
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN   1234
-#endif
-#ifndef BYTE_ORDER
-#define BYTE_ORDER      LITTLE_ENDIAN
-#endif
-
-#define bswap_16(x) \
-(__extension__ ({ \
-        uint16_t __x = (x); \
-        ((uint16_t)( \
-                (((uint16_t)(__x) & (uint16_t)0x00ffU) << 8) | \
-                (((uint16_t)(__x) & (uint16_t)0xff00U) >> 8) )); \
-}))
-
-#define bswap_32(x) \
-(__extension__ ({ \
-        uint32_t __x = (x); \
-        ((uint32_t)( \
-                (((uint32_t)(__x) & (uint32_t)0x000000ffUL) << 24) | \
-                (((uint32_t)(__x) & (uint32_t)0x0000ff00UL) <<  8) | \
-                (((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >>  8) | \
-                (((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) )); \
-}))
-
-#define bswap_64(x) \
-(__extension__ ({ \
-        uint64_t __x = (x); \
-        ((uint64_t)( \
-                (uint64_t)(((uint64_t)(__x) & (uint64_t)0x00000000000000ffULL) << 56) | \
-                (uint64_t)(((uint64_t)(__x) & (uint64_t)0x000000000000ff00ULL) << 40) | \
-                (uint64_t)(((uint64_t)(__x) & (uint64_t)0x0000000000ff0000ULL) << 24) | \
-                (uint64_t)(((uint64_t)(__x) & (uint64_t)0x00000000ff000000ULL) <<  8) | \
-                (uint64_t)(((uint64_t)(__x) & (uint64_t)0x000000ff00000000ULL) >>  8) | \
-                (uint64_t)(((uint64_t)(__x) & (uint64_t)0x0000ff0000000000ULL) >> 24) | \
-                (uint64_t)(((uint64_t)(__x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \
-                (uint64_t)(((uint64_t)(__x) & (uint64_t)0xff00000000000000ULL) >> 56) )); \
-}))
-#endif
-
-
-#ifndef bswap16
-DECLINLINE(uint16_t) bswap16(uint16_t x)
-{
-    return bswap_16(x);
-}
-#endif
-
-#ifndef bswap32
-DECLINLINE(uint32_t) bswap32(uint32_t x)
-{
-    return bswap_32(x);
-}
-#endif
-
-#ifndef bswap64
-DECLINLINE(uint64_t) bswap64(uint64_t x)
-{
-    return bswap_64(x);
-}
-#endif
-
-DECLINLINE(void) bswap16s(uint16_t *s)
-{
-    *s = bswap16(*s);
-}
-
-DECLINLINE(void) bswap32s(uint32_t *s)
-{
-    *s = bswap32(*s);
-}
-
-DECLINLINE(void) bswap64s(uint64_t *s)
-{
-    *s = bswap64(*s);
-}
-
-#define le_bswap(v, size) (v)
-#define be_bswap(v, size) bswap ## size(v)
-#define le_bswaps(v, size)
-#define be_bswaps(p, size) *p = bswap ## size(*p);
-
-#define CPU_CONVERT(endian, size, type)\
-DECLINLINE(type) endian ## size ## _to_cpu(type v)\
-{\
-    return endian ## _bswap(v, size);\
-}\
-\
-DECLINLINE(type) cpu_to_ ## endian ## size(type v)\
-{\
-    return endian ## _bswap(v, size);\
-}\
-\
-DECLINLINE(void) endian ## size ## _to_cpus(type *p)\
-{\
-    NOREF(p); \
-    endian ## _bswaps(p, size)\
-}\
-\
-DECLINLINE(void) cpu_to_ ## endian ## size ## s(type *p)\
-{\
-    NOREF(p); \
-    endian ## _bswaps(p, size)\
-}\
-\
-DECLINLINE(type) endian ## size ## _to_cpup(const type *p)\
-{\
-    return endian ## size ## _to_cpu(*p);\
-}\
-\
-DECLINLINE(void) cpu_to_ ## endian ## size ## w(type *p, type v)\
-{\
-     *p = cpu_to_ ## endian ## size(v);\
-}
-
-CPU_CONVERT(be, 16, uint16_t)
-CPU_CONVERT(be, 32, uint32_t)
-CPU_CONVERT(be, 64, uint64_t)
-
-CPU_CONVERT(le, 16, uint16_t)
-CPU_CONVERT(le, 32, uint32_t)
-CPU_CONVERT(le, 64, uint64_t)
-
-
-#define cpu_to_le16wu(p, v) cpu_to_le16w(p, v)
-#define cpu_to_le32wu(p, v) cpu_to_le32w(p, v)
-#define le16_to_cpupu(p)    le16_to_cpup(p)
-#define le32_to_cpupu(p)    le32_to_cpup(p)
-
-#define cpu_to_be16wu(p, v) cpu_to_be16w(p, v)
-#define cpu_to_be32wu(p, v) cpu_to_be32w(p, v)
-
-#define cpu_to_32wu cpu_to_le32wu
-
-#undef le_bswap
-#undef be_bswap
-#undef le_bswaps
-#undef be_bswaps
-
-/* end of bswap.h */
-
-RT_C_DECLS_END
-
-#endif
diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk
index a48aa9e..b5b734e 100644
--- a/src/VBox/Devices/testcase/Makefile.kmk
+++ b/src/VBox/Devices/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -98,7 +98,7 @@ endif
 # Run rule for tstDeviceStructSize.
 #
 
-# 1. Dump selected structure in the VMMGC.gc debug info.
+# 1. Dump selected structure in the VMMRC.rc debug info.
 # 2. Generate a testcase from the dump
 ## future
 
diff --git a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp
index 8ebb981..2099495 100644
--- a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp
+++ b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp b/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp
index 2261230..0116c84 100644
--- a/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp
+++ b/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp
@@ -952,11 +952,11 @@ int main()
     GEN_CHECK_OFF(ATACONTROLLER, pDevInsRC);
     GEN_CHECK_OFF(ATACONTROLLER, fShutdown);
     GEN_CHECK_OFF(ATACONTROLLER, AsyncIOThread);
-    GEN_CHECK_OFF(ATACONTROLLER, AsyncIOSem);
+    GEN_CHECK_OFF(ATACONTROLLER, hAsyncIOSem);
     GEN_CHECK_OFF(ATACONTROLLER, aAsyncIORequests[4]);
     GEN_CHECK_OFF(ATACONTROLLER, AsyncIOReqHead);
     GEN_CHECK_OFF(ATACONTROLLER, AsyncIOReqTail);
-    GEN_CHECK_OFF(ATACONTROLLER, AsyncIORequestMutex);
+    GEN_CHECK_OFF(ATACONTROLLER, AsyncIORequestLock);
     GEN_CHECK_OFF(ATACONTROLLER, SuspendIOSem);
     GEN_CHECK_OFF(ATACONTROLLER, fSignalIdle);
     GEN_CHECK_OFF(ATACONTROLLER, DelayIRQMillies);
@@ -975,7 +975,7 @@ int main()
     GEN_CHECK_OFF(PCIATAState, IBase);
     GEN_CHECK_OFF(PCIATAState, ILeds);
     GEN_CHECK_OFF(PCIATAState, pLedsConnector);
-    GEN_CHECK_OFF(PCIATAState, fGCEnabled);
+    GEN_CHECK_OFF(PCIATAState, fRCEnabled);
     GEN_CHECK_OFF(PCIATAState, fR0Enabled);
 
 #ifdef VBOX_WITH_USB
diff --git a/src/VBox/Disassembler/Disasm.cpp b/src/VBox/Disassembler/Disasm.cpp
index c8c928f..a443bb9 100644
--- a/src/VBox/Disassembler/Disasm.cpp
+++ b/src/VBox/Disassembler/Disasm.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/DisasmCore.cpp b/src/VBox/Disassembler/DisasmCore.cpp
index c329ba9..1a8b893 100644
--- a/src/VBox/Disassembler/DisasmCore.cpp
+++ b/src/VBox/Disassembler/DisasmCore.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/DisasmFormatBytes.cpp b/src/VBox/Disassembler/DisasmFormatBytes.cpp
index 32e9757..b0671fa 100644
--- a/src/VBox/Disassembler/DisasmFormatBytes.cpp
+++ b/src/VBox/Disassembler/DisasmFormatBytes.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/DisasmFormatYasm.cpp b/src/VBox/Disassembler/DisasmFormatYasm.cpp
index e0e9f38..a47977e 100644
--- a/src/VBox/Disassembler/DisasmFormatYasm.cpp
+++ b/src/VBox/Disassembler/DisasmFormatYasm.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/DisasmInternal.h b/src/VBox/Disassembler/DisasmInternal.h
index 06e60c4..c640d63 100644
--- a/src/VBox/Disassembler/DisasmInternal.h
+++ b/src/VBox/Disassembler/DisasmInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/DisasmReg.cpp b/src/VBox/Disassembler/DisasmReg.cpp
index 6c1fdc9..c6341a4 100644
--- a/src/VBox/Disassembler/DisasmReg.cpp
+++ b/src/VBox/Disassembler/DisasmReg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/DisasmTables.cpp b/src/VBox/Disassembler/DisasmTables.cpp
index a2f9127..1485307 100644
--- a/src/VBox/Disassembler/DisasmTables.cpp
+++ b/src/VBox/Disassembler/DisasmTables.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/DisasmTablesX64.cpp b/src/VBox/Disassembler/DisasmTablesX64.cpp
index ade2a0a..a4bbf68 100644
--- a/src/VBox/Disassembler/DisasmTablesX64.cpp
+++ b/src/VBox/Disassembler/DisasmTablesX64.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/Makefile.kmk b/src/VBox/Disassembler/Makefile.kmk
index 31f893f..d92e8d9 100644
--- a/src/VBox/Disassembler/Makefile.kmk
+++ b/src/VBox/Disassembler/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/Makefile.kmk b/src/VBox/Disassembler/testcase/Makefile.kmk
index d6f451f..82782d9 100644
--- a/src/VBox/Disassembler/testcase/Makefile.kmk
+++ b/src/VBox/Disassembler/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsm.mac b/src/VBox/Disassembler/testcase/tstAsm.mac
index 0f9b292..d4d8a72 100644
--- a/src/VBox/Disassembler/testcase/tstAsm.mac
+++ b/src/VBox/Disassembler/testcase/tstAsm.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2013 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsm3DNow-1.asm b/src/VBox/Disassembler/testcase/tstAsm3DNow-1.asm
index 35fbaf2..f4c6813 100644
--- a/src/VBox/Disassembler/testcase/tstAsm3DNow-1.asm
+++ b/src/VBox/Disassembler/testcase/tstAsm3DNow-1.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2012 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsmFnstsw-1.asm b/src/VBox/Disassembler/testcase/tstAsmFnstsw-1.asm
index 7141666..cf13ad4 100644
--- a/src/VBox/Disassembler/testcase/tstAsmFnstsw-1.asm
+++ b/src/VBox/Disassembler/testcase/tstAsmFnstsw-1.asm
@@ -8,7 +8,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2011 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-1.asm b/src/VBox/Disassembler/testcase/tstAsmLock-1.asm
index 218477c..bf9b831 100644
--- a/src/VBox/Disassembler/testcase/tstAsmLock-1.asm
+++ b/src/VBox/Disassembler/testcase/tstAsmLock-1.asm
@@ -8,7 +8,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2010 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-2.asm b/src/VBox/Disassembler/testcase/tstAsmLock-2.asm
index 10ea656..6ac1754 100644
--- a/src/VBox/Disassembler/testcase/tstAsmLock-2.asm
+++ b/src/VBox/Disassembler/testcase/tstAsmLock-2.asm
@@ -11,7 +11,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2010 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-3.asm b/src/VBox/Disassembler/testcase/tstAsmLock-3.asm
index f7fa171..bb25c44 100644
--- a/src/VBox/Disassembler/testcase/tstAsmLock-3.asm
+++ b/src/VBox/Disassembler/testcase/tstAsmLock-3.asm
@@ -7,7 +7,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2010 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsmMovFixedReg-1.asm b/src/VBox/Disassembler/testcase/tstAsmMovFixedReg-1.asm
index 70c05ae..615c74c 100644
--- a/src/VBox/Disassembler/testcase/tstAsmMovFixedReg-1.asm
+++ b/src/VBox/Disassembler/testcase/tstAsmMovFixedReg-1.asm
@@ -8,7 +8,7 @@
 ;
 
 ;
-; Copyright (C) 2013 Oracle Corporation
+; Copyright (C) 2013-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsmMovSeg-1.asm b/src/VBox/Disassembler/testcase/tstAsmMovSeg-1.asm
index 8c6d0a5..4fdc42c 100644
--- a/src/VBox/Disassembler/testcase/tstAsmMovSeg-1.asm
+++ b/src/VBox/Disassembler/testcase/tstAsmMovSeg-1.asm
@@ -8,7 +8,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2011 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsmMovzx-1.asm b/src/VBox/Disassembler/testcase/tstAsmMovzx-1.asm
index 57e72f1..6e42e77 100644
--- a/src/VBox/Disassembler/testcase/tstAsmMovzx-1.asm
+++ b/src/VBox/Disassembler/testcase/tstAsmMovzx-1.asm
@@ -8,7 +8,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2011 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsmPop-1.asm b/src/VBox/Disassembler/testcase/tstAsmPop-1.asm
index 25cae4e..be65487 100644
--- a/src/VBox/Disassembler/testcase/tstAsmPop-1.asm
+++ b/src/VBox/Disassembler/testcase/tstAsmPop-1.asm
@@ -8,7 +8,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2011 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsmPush-1.asm b/src/VBox/Disassembler/testcase/tstAsmPush-1.asm
index 1c4286d..727d135 100644
--- a/src/VBox/Disassembler/testcase/tstAsmPush-1.asm
+++ b/src/VBox/Disassembler/testcase/tstAsmPush-1.asm
@@ -8,7 +8,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2011 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm b/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm
index 1cc28ae..6df0522 100644
--- a/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm
+++ b/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm
@@ -8,7 +8,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2010 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstAsmSignExtend-1.asm b/src/VBox/Disassembler/testcase/tstAsmSignExtend-1.asm
index 97f5cf9..5f3f94c 100644
--- a/src/VBox/Disassembler/testcase/tstAsmSignExtend-1.asm
+++ b/src/VBox/Disassembler/testcase/tstAsmSignExtend-1.asm
@@ -8,7 +8,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2011 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstDisasm-1.cpp b/src/VBox/Disassembler/testcase/tstDisasm-1.cpp
index 92916c6..2d124b9 100644
--- a/src/VBox/Disassembler/testcase/tstDisasm-1.cpp
+++ b/src/VBox/Disassembler/testcase/tstDisasm-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstDisasm-1A.asm b/src/VBox/Disassembler/testcase/tstDisasm-1A.asm
index 07edf86..7cbe5b8 100644
--- a/src/VBox/Disassembler/testcase/tstDisasm-1A.asm
+++ b/src/VBox/Disassembler/testcase/tstDisasm-1A.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Disassembler/testcase/tstDisasm-2.cpp b/src/VBox/Disassembler/testcase/tstDisasm-2.cpp
index 3d428a3..ec055b9 100644
--- a/src/VBox/Disassembler/testcase/tstDisasm-2.cpp
+++ b/src/VBox/Disassembler/testcase/tstDisasm-2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -570,7 +570,7 @@ int main(int argc, char **argv)
                 break;
 
             case 'V':
-                RTPrintf("$Revision: 89645 $\n");
+                RTPrintf("$Revision: 100882 $\n");
                 return 0;
 
             default:
diff --git a/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp b/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp
index f7f21c3..b6e5884 100644
--- a/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp
+++ b/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -828,7 +828,7 @@ const PDMDEVREG g_DeviceBusMouse =
     /* szName */
     "busmouse",
     /* szRCMod */
-    "VBoxDDGC.gc",
+    "VBoxDDRC.rc",
     /* szR0Mod */
     "VBoxDDR0.r0",
     /* pszDescription */
diff --git a/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk b/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
index 3651aa3..468008a 100644
--- a/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
+++ b/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2013 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
diff --git a/src/VBox/ExtPacks/BusMouseSample/VBoxBusMouseMain.cpp b/src/VBox/ExtPacks/BusMouseSample/VBoxBusMouseMain.cpp
index bd40a15..7ad44e8 100644
--- a/src/VBox/ExtPacks/BusMouseSample/VBoxBusMouseMain.cpp
+++ b/src/VBox/ExtPacks/BusMouseSample/VBoxBusMouseMain.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/VBox/ExtPacks/Makefile.kmk b/src/VBox/ExtPacks/Makefile.kmk
index ab5b797..1907f0e 100644
--- a/src/VBox/ExtPacks/Makefile.kmk
+++ b/src/VBox/ExtPacks/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2016 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ExtPacks/Skeleton/Makefile.kmk b/src/VBox/ExtPacks/Skeleton/Makefile.kmk
index aeec260..184076a 100644
--- a/src/VBox/ExtPacks/Skeleton/Makefile.kmk
+++ b/src/VBox/ExtPacks/Skeleton/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
diff --git a/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp b/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp
index 2020e28..96513a5 100644
--- a/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp
+++ b/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/VBox/Devices/EFI/Firmware/BaseTools/Makefile.kmk b/src/VBox/ExtPacks/VBoxDTrace/.scm-settings
similarity index 76%
copy from src/VBox/Devices/EFI/Firmware/BaseTools/Makefile.kmk
copy to src/VBox/ExtPacks/VBoxDTrace/.scm-settings
index 93f4bb3..c5f931d 100644
--- a/src/VBox/Devices/EFI/Firmware/BaseTools/Makefile.kmk
+++ b/src/VBox/ExtPacks/VBoxDTrace/.scm-settings
@@ -1,10 +1,10 @@
-# $Id: Makefile.kmk $
+# $Id: .scm-settings $
 ## @file
-# Sub-Makefile for EFI build programs.
+# Source code massager settings for VBoxDTrace.
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation 
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -24,10 +24,11 @@
 # terms and conditions of either the GPL or the CDDL or both.
 #
 
-SUB_DEPTH = ../../../../../..
-include $(KBUILD_PATH)/subheader.kmk
 
-include $(PATH_SUB_CURRENT)/Source/Makefile.kmk
+--filter-out-dirs  "*/onnv/cmd/."
+--filter-out-dirs  "*/onnv/common/."
+--filter-out-dirs  "*/onnv/lib/."
+--filter-out-dirs  "*/onnv/uts/."
 
-include $(FILE_KBUILD_SUB_FOOTER)
+--filter-out-files "*/generated/dt_*"
 
diff --git a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp
index a83bdb9..ebf370b 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp
+++ b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2016 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceWrapper.cpp b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceWrapper.cpp
index cac34c0..04d7e7c 100644
--- a/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceWrapper.cpp
+++ b/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceWrapper.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2016 Oracle Corporation
+ * Copyright (C) 2016-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ExtPacks/VNC/Makefile.kmk b/src/VBox/ExtPacks/VNC/Makefile.kmk
index 3bd712e..40030b3 100644
--- a/src/VBox/ExtPacks/VNC/Makefile.kmk
+++ b/src/VBox/ExtPacks/VNC/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ExtPacks/VNC/VBoxVNC.cpp b/src/VBox/ExtPacks/VNC/VBoxVNC.cpp
index d9ab448..a2d1c43 100644
--- a/src/VBox/ExtPacks/VNC/VBoxVNC.cpp
+++ b/src/VBox/ExtPacks/VNC/VBoxVNC.cpp
@@ -7,7 +7,7 @@
  * Contributed by Ivo Smits <Ivo at UFO-Net.nl>, Howard Su and
  * Christophe Devriese <christophe.devriese at gmail.com>
  *
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp b/src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp
index 29059fa..625893e 100644
--- a/src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp
+++ b/src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/Common/Makefile.kmk b/src/VBox/Frontends/Common/Makefile.kmk
index 352b2f4..f866980 100644
--- a/src/VBox/Frontends/Common/Makefile.kmk
+++ b/src/VBox/Frontends/Common/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk b/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk
index 8239fe0..dd188c3 100644
--- a/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk
+++ b/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/Makefile.kmk b/src/VBox/Frontends/Makefile.kmk
index 3e2ccff..069883b 100644
--- a/src/VBox/Frontends/Makefile.kmk
+++ b/src/VBox/Frontends/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/VBoxAutostart/Makefile.kmk b/src/VBox/Frontends/VBoxAutostart/Makefile.kmk
index 432da4d..77c4e72 100644
--- a/src/VBox/Frontends/VBoxAutostart/Makefile.kmk
+++ b/src/VBox/Frontends/VBoxAutostart/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/VBoxBalloonCtrl/Makefile.kmk b/src/VBox/Frontends/VBoxBalloonCtrl/Makefile.kmk
index 481f22d..4467bad 100644
--- a/src/VBox/Frontends/VBoxBalloonCtrl/Makefile.kmk
+++ b/src/VBox/Frontends/VBoxBalloonCtrl/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2011-2012 Oracle Corporation
+# Copyright (C) 2011-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/VBoxFB/Makefile.kmk b/src/VBox/Frontends/VBoxFB/Makefile.kmk
index 65bbae8..4f523b2 100644
--- a/src/VBox/Frontends/VBoxFB/Makefile.kmk
+++ b/src/VBox/Frontends/VBoxFB/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/VBoxHeadless/Makefile.kmk b/src/VBox/Frontends/VBoxHeadless/Makefile.kmk
index 7929476..2a73793 100644
--- a/src/VBox/Frontends/VBoxHeadless/Makefile.kmk
+++ b/src/VBox/Frontends/VBoxHeadless/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk b/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk
index 02e7d09..253dc92 100644
--- a/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk
+++ b/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/VBoxManage/Makefile.kmk b/src/VBox/Frontends/VBoxManage/Makefile.kmk
index ec7f4bc..07c11ce 100644
--- a/src/VBox/Frontends/VBoxManage/Makefile.kmk
+++ b/src/VBox/Frontends/VBoxManage/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -18,13 +18,37 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
 
+VBOX_COMMON_VBOXMANAGE_DEFS = \
+ 	$(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
+ 	$(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
+ 	$(if $(VBOX_WITH_COPYTOGUEST),VBOX_WITH_COPYTOGUEST) \
+ 	$(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
+ 	$(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
+ 	$(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
+ 	$(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \
+ 	$(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM) \
+ 	$(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
+ 	$(if $(VBOX_WITH_NETFLT), VBOX_WITH_NETFLT) \
+ 	$(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
+ 	$(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
+ 	$(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \
+ 	$(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \
+ 	$(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \
+ 	$(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
+ 	$(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER) \
+ 	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \
+ 	$(if $(VBOX_WITH_VPX),VBOX_WITH_VPX) \
+ 	$(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE) \
+ 	$(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA)
+
+
 ifdef VBOX_WITH_DOCS
  PROGRAMS += VBoxManageHelp
 endif
 VBoxManageHelp_TEMPLATE   = VBoxAdvBldProg
 VBoxManageHelp_DEFS      += \
 	VBOX_ONLY_DOCS \
-	$(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL)
+       $(VBOX_COMMON_VBOXMANAGE_DEFS)
 VBoxManageHelp_SOURCES    = \
 	VBoxManage.cpp \
 	VBoxManageHelp.cpp \
@@ -33,62 +57,44 @@ VBoxManageHelp_SOURCES    = \
 
 ifndef VBOX_ONLY_DOCS
  PROGRAMS += VBoxManage
-endif
-VBoxManage_TEMPLATE   = VBOXMAINCLIENTEXE
-VBoxManage_DEFS.win   = _WIN32_WINNT=0x0500
-VBoxManage_SOURCES    = \
-	VBoxManage.cpp \
-	VBoxInternalManage.cpp \
-	VBoxManageAppliance.cpp \
-	VBoxManageBandwidthControl.cpp \
-	VBoxManageControlVM.cpp \
-	VBoxManageDebugVM.cpp \
-	VBoxManageDHCPServer.cpp \
-	VBoxManageDisk.cpp \
-	$(if $(VBOX_WITH_GUEST_CONTROL),VBoxManageGuestCtrl.cpp) \
-	$(if $(VBOX_WITH_GUEST_CONTROL),VBoxManageGuestCtrlListener.cpp) \
-	$(if $(VBOX_WITH_GUEST_PROPS),VBoxManageGuestProp.cpp) \
-	VBoxManageHelp.cpp \
-	VBoxManageHostonly.cpp \
-	VBoxManageInfo.cpp \
-	VBoxManageList.cpp \
-	VBoxManageMetrics.cpp \
-	VBoxManageMisc.cpp \
-	VBoxManageModifyVM.cpp \
-	VBoxManageSnapshot.cpp \
-	VBoxManageStorageController.cpp \
-	VBoxManageUSB.cpp \
-	$(if $(VBOX_WITH_NAT_SERVICE),VBoxManageNATNetwork.cpp,) \
-	$(if $(VBOX_WITH_NAT_SERVICE),../../NetworkServices/NetLib/VBoxNetPortForwardString.cpp,)
-VBoxManage_SOURCES.win = \
-	VBoxManage.rc
-VBoxManage_LIBS      += $(LIB_DDU)
+ VBoxManage_TEMPLATE   = VBOXMAINCLIENTEXE
+ VBoxManage_DEFS      += $(VBOX_COMMON_VBOXMANAGE_DEFS)
+ VBoxManage_DEFS.win   = _WIN32_WINNT=0x0500
+ VBoxManage_INCS       = $(PATH_TARGET)/manual
+ VBoxManage_INTERMEDIATES = $(PATH_TARGET)/manual/VBoxManageBuiltInHelp.h
+ VBoxManage_SOURCES    = \
+ 	VBoxManage.cpp \
+ 	VBoxInternalManage.cpp \
+ 	VBoxManageAppliance.cpp \
+ 	VBoxManageBandwidthControl.cpp \
+ 	VBoxManageControlVM.cpp \
+ 	VBoxManageDebugVM.cpp \
+ 	VBoxManageDHCPServer.cpp \
+ 	VBoxManageDisk.cpp \
+ 	$(if $(VBOX_WITH_GUEST_CONTROL),VBoxManageGuestCtrl.cpp) \
+ 	$(if $(VBOX_WITH_GUEST_CONTROL),VBoxManageGuestCtrlListener.cpp) \
+ 	$(if $(VBOX_WITH_GUEST_PROPS),VBoxManageGuestProp.cpp) \
+ 	VBoxManageHelp.cpp \
+	$(PATH_TARGET)/manual/VBoxManageBuiltInHelp.cpp \
+ 	VBoxManageHostonly.cpp \
+ 	VBoxManageInfo.cpp \
+ 	VBoxManageList.cpp \
+ 	VBoxManageMetrics.cpp \
+ 	VBoxManageMisc.cpp \
+ 	VBoxManageModifyVM.cpp \
+ 	VBoxManageSnapshot.cpp \
+ 	VBoxManageStorageController.cpp \
+ 	VBoxManageUSB.cpp \
+ 	$(if $(VBOX_WITH_NAT_SERVICE),VBoxManageNATNetwork.cpp,) \
+ 	$(if $(VBOX_WITH_NAT_SERVICE),../../NetworkServices/NetLib/VBoxNetPortForwardString.cpp,)
+ VBoxManage_SOURCES.win = \
+ 	VBoxManage.rc
+ VBoxManage_LIBS      += $(LIB_DDU)
 
-VBoxManage_DEFS      += \
-	$(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
-	$(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
-	$(if $(VBOX_WITH_COPYTOGUEST),VBOX_WITH_COPYTOGUEST) \
-	$(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
-	$(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL) \
-	$(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
-	$(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \
-	$(if $(VBOX_WITH_HGCM), VBOX_WITH_HGCM) \
-	$(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
-	$(if $(VBOX_WITH_NETFLT), VBOX_WITH_NETFLT) \
-	$(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
-	$(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
-	$(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \
-	$(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \
-	$(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \
-	$(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
-	$(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER) \
-	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \
-	$(if $(VBOX_WITH_VPX),VBOX_WITH_VPX) \
-	$(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE) \
-	$(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA)
+ # VBoxNetPortForwardString.h
+ VBoxManageNATNetwork.cpp_INCS += ../../NetworkServices/NetLib/
 
-# VBoxNetPortForwardString.h
-VBoxManageNATNetwork.cpp_INCS += ../../NetworkServices/NetLib/
+endif # VBOX_ONLY_DOCS
 
 ifneq ($(KBUILD_TARGET),win)
  # Workaround for buggy gcc-4.3 compilers, see
diff --git a/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp b/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
index 5e7f729..ff56b59 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
@@ -139,7 +139,7 @@ void printUsageInternal(USAGECATEGORY u64Cmd, PRTSTREAM pStrm)
         "\n"
         "Commands:\n"
         "\n"
-        "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s"
+        "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s"
         "WARNING: This is a development tool and shall only be used to analyse\n"
         "         problems. It is completely unsupported and will change in\n"
         "         incompatible ways without warning.\n",
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManage.cpp b/src/VBox/Frontends/VBoxManage/VBoxManage.cpp
index ca66d38..d208919 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManage.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManage.cpp
@@ -53,26 +53,32 @@
 /** The command doesn't need the COM stuff. */
 #define VBMG_CMD_F_NO_COM       RT_BIT_32(0)
 
+#define VBMG_CMD_TODO HELP_CMD_VBOXMANAGE_INVALID
+
 
 /*******************************************************************************
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
+#ifndef VBOX_ONLY_DOCS
 /**
  * VBoxManage command descriptor.
  */
 typedef struct VBMGCMD
 {
     /** The command.   */
-    const char     *pszCommand;
+    const char                 *pszCommand;
     /** The help category. */
-    USAGECATEGORY   enmHelpCat;
+    USAGECATEGORY               enmHelpCat;
+    /** The new help command. */
+    enum HELP_CMD_VBOXMANAGE    enmCmdHelp;
     /** The handler. */
-    RTEXITCODE (*pfnHandler)(HandlerArg *pArg);
+    RTEXITCODE                (*pfnHandler)(HandlerArg *pArg);
     /** VBMG_CMD_F_XXX,    */
-    uint32_t        fFlags;
+    uint32_t                    fFlags;
 } VBMGCMD;
 /** Pointer to a const VBoxManage command descriptor. */
 typedef VBMGCMD const *PCVBMGCMD;
+#endif
 
 
 /*******************************************************************************
@@ -94,64 +100,64 @@ static CComModule       _Module;
  */
 static const VBMGCMD g_aCommands[] =
 {
-    { "internalcommands",   0,                          handleInternalCommands,     0 },
-    { "list",               USAGE_LIST,                 handleList,                 0 },
-    { "showvminfo",         USAGE_SHOWVMINFO,           handleShowVMInfo,           0 },
-    { "registervm",         USAGE_REGISTERVM,           handleRegisterVM,           0 },
-    { "unregistervm",       USAGE_UNREGISTERVM,         handleUnregisterVM,         0 },
-    { "clonevm",            USAGE_CLONEVM,              handleCloneVM,              0 },
-    { "mediumproperty",     USAGE_MEDIUMPROPERTY,       handleMediumProperty,       0 },
-    { "hdproperty",         USAGE_MEDIUMPROPERTY,       handleMediumProperty,       0 }, /* backward compatibility */
-    { "createmedium",       USAGE_CREATEMEDIUM,         handleCreateMedium,         0 },
-    { "createhd",           USAGE_CREATEMEDIUM,         handleCreateMedium,         0 }, /* backward compatibility */
-    { "createvdi",          USAGE_CREATEMEDIUM,         handleCreateMedium,         0 }, /* backward compatibility */
-    { "modifymedium",       USAGE_MODIFYMEDIUM,         handleModifyMedium,         0 },
-    { "modifyhd",           USAGE_MODIFYMEDIUM,         handleModifyMedium,         0 }, /* backward compatibility */
-    { "modifyvdi",          USAGE_MODIFYMEDIUM,         handleModifyMedium,         0 }, /* backward compatibility */
-    { "clonemedium",        USAGE_CLONEMEDIUM,          handleCloneMedium,          0 },
-    { "clonehd",            USAGE_CLONEMEDIUM,          handleCloneMedium,          0 }, /* backward compatibility */
-    { "clonevdi",           USAGE_CLONEMEDIUM,          handleCloneMedium,          0 }, /* backward compatibility */
-    { "encryptmedium",      USAGE_ENCRYPTMEDIUM,        handleEncryptMedium,        0 },
-    { "checkmediumpwd",     USAGE_MEDIUMENCCHKPWD,      handleCheckMediumPassword,  0 },
-    { "createvm",           USAGE_CREATEVM,             handleCreateVM,             0 },
-    { "modifyvm",           USAGE_MODIFYVM,             handleModifyVM,             0 },
-    { "startvm",            USAGE_STARTVM,              handleStartVM,              0 },
-    { "controlvm",          USAGE_CONTROLVM,            handleControlVM,            0 },
-    { "discardstate",       USAGE_DISCARDSTATE,         handleDiscardState,         0 },
-    { "adoptstate",         USAGE_ADOPTSTATE,           handleAdoptState,           0 },
-    { "snapshot",           USAGE_SNAPSHOT,             handleSnapshot,             0 },
-    { "closemedium",        USAGE_CLOSEMEDIUM,          handleCloseMedium,          0 },
-    { "storageattach",      USAGE_STORAGEATTACH,        handleStorageAttach,        0 },
-    { "storagectl",         USAGE_STORAGECONTROLLER,    handleStorageController,    0 },
-    { "showmediuminfo",     USAGE_SHOWMEDIUMINFO,       handleShowMediumInfo,       0 },
-    { "showhdinfo",         USAGE_SHOWMEDIUMINFO,       handleShowMediumInfo,       0 }, /* backward compatibility */
-    { "showvdiinfo",        USAGE_SHOWMEDIUMINFO,       handleShowMediumInfo,       0 }, /* backward compatibility */
-    { "getextradata",       USAGE_GETEXTRADATA,         handleGetExtraData,         0 },
-    { "setextradata",       USAGE_SETEXTRADATA,         handleSetExtraData,         0 },
-    { "setproperty",        USAGE_SETPROPERTY,          handleSetProperty,          0 },
-    { "usbfilter",          USAGE_USBFILTER,            handleUSBFilter,            0 },
-    { "sharedfolder",       USAGE_SHAREDFOLDER,         handleSharedFolder,         0 },
+    { "internalcommands",   0,                      VBMG_CMD_TODO, handleInternalCommands,     0 },
+    { "list",               USAGE_LIST,             VBMG_CMD_TODO, handleList,                 0 },
+    { "showvminfo",         USAGE_SHOWVMINFO,       VBMG_CMD_TODO, handleShowVMInfo,           0 },
+    { "registervm",         USAGE_REGISTERVM,       VBMG_CMD_TODO, handleRegisterVM,           0 },
+    { "unregistervm",       USAGE_UNREGISTERVM,     VBMG_CMD_TODO, handleUnregisterVM,         0 },
+    { "clonevm",            USAGE_CLONEVM,          VBMG_CMD_TODO, handleCloneVM,              0 },
+    { "mediumproperty",     USAGE_MEDIUMPROPERTY,   VBMG_CMD_TODO, handleMediumProperty,       0 },
+    { "hdproperty",         USAGE_MEDIUMPROPERTY,   VBMG_CMD_TODO, handleMediumProperty,       0 }, /* backward compatibility */
+    { "createmedium",       USAGE_CREATEMEDIUM,     VBMG_CMD_TODO, handleCreateMedium,         0 },
+    { "createhd",           USAGE_CREATEMEDIUM,     VBMG_CMD_TODO, handleCreateMedium,         0 }, /* backward compatibility */
+    { "createvdi",          USAGE_CREATEMEDIUM,     VBMG_CMD_TODO, handleCreateMedium,         0 }, /* backward compatibility */
+    { "modifymedium",       USAGE_MODIFYMEDIUM,     VBMG_CMD_TODO, handleModifyMedium,         0 },
+    { "modifyhd",           USAGE_MODIFYMEDIUM,     VBMG_CMD_TODO, handleModifyMedium,         0 }, /* backward compatibility */
+    { "modifyvdi",          USAGE_MODIFYMEDIUM,     VBMG_CMD_TODO, handleModifyMedium,         0 }, /* backward compatibility */
+    { "clonemedium",        USAGE_CLONEMEDIUM,      VBMG_CMD_TODO, handleCloneMedium,          0 },
+    { "clonehd",            USAGE_CLONEMEDIUM,      VBMG_CMD_TODO, handleCloneMedium,          0 }, /* backward compatibility */
+    { "clonevdi",           USAGE_CLONEMEDIUM,      VBMG_CMD_TODO, handleCloneMedium,          0 }, /* backward compatibility */
+    { "encryptmedium",      USAGE_ENCRYPTMEDIUM,    VBMG_CMD_TODO, handleEncryptMedium,        0 },
+    { "checkmediumpwd",     USAGE_MEDIUMENCCHKPWD,  VBMG_CMD_TODO, handleCheckMediumPassword,  0 },
+    { "createvm",           USAGE_CREATEVM,         VBMG_CMD_TODO, handleCreateVM,             0 },
+    { "modifyvm",           USAGE_MODIFYVM,         VBMG_CMD_TODO, handleModifyVM,             0 },
+    { "startvm",            USAGE_STARTVM,          VBMG_CMD_TODO, handleStartVM,              0 },
+    { "controlvm",          USAGE_CONTROLVM,        VBMG_CMD_TODO, handleControlVM,            0 },
+    { "discardstate",       USAGE_DISCARDSTATE,     VBMG_CMD_TODO, handleDiscardState,         0 },
+    { "adoptstate",         USAGE_ADOPTSTATE,       VBMG_CMD_TODO, handleAdoptState,           0 },
+    { "snapshot",           USAGE_SNAPSHOT,         VBMG_CMD_TODO, handleSnapshot,             0 },
+    { "closemedium",        USAGE_CLOSEMEDIUM,      VBMG_CMD_TODO, handleCloseMedium,          0 },
+    { "storageattach",      USAGE_STORAGEATTACH,    VBMG_CMD_TODO, handleStorageAttach,        0 },
+    { "storagectl",         USAGE_STORAGECONTROLLER,VBMG_CMD_TODO, handleStorageController,    0 },
+    { "showmediuminfo",     USAGE_SHOWMEDIUMINFO,   VBMG_CMD_TODO, handleShowMediumInfo,       0 },
+    { "showhdinfo",         USAGE_SHOWMEDIUMINFO,   VBMG_CMD_TODO, handleShowMediumInfo,       0 }, /* backward compatibility */
+    { "showvdiinfo",        USAGE_SHOWMEDIUMINFO,   VBMG_CMD_TODO, handleShowMediumInfo,       0 }, /* backward compatibility */
+    { "getextradata",       USAGE_GETEXTRADATA,     VBMG_CMD_TODO, handleGetExtraData,         0 },
+    { "setextradata",       USAGE_SETEXTRADATA,     VBMG_CMD_TODO, handleSetExtraData,         0 },
+    { "setproperty",        USAGE_SETPROPERTY,      VBMG_CMD_TODO, handleSetProperty,          0 },
+    { "usbfilter",          USAGE_USBFILTER,        VBMG_CMD_TODO, handleUSBFilter,            0 },
+    { "sharedfolder",       USAGE_SHAREDFOLDER,     VBMG_CMD_TODO, handleSharedFolder,         0 },
 #ifdef VBOX_WITH_GUEST_PROPS
-    { "guestproperty",      USAGE_GUESTPROPERTY,        handleGuestProperty,        0 },
+    { "guestproperty",      USAGE_GUESTPROPERTY,    VBMG_CMD_TODO, handleGuestProperty,        0 },
 #endif
 #ifdef VBOX_WITH_GUEST_CONTROL
-    { "guestcontrol",       USAGE_GUESTCONTROL,         handleGuestControl,         0 },
+    { "guestcontrol",       USAGE_GUESTCONTROL,     VBMG_CMD_TODO, handleGuestControl,         0 },
 #endif
-    { "metrics",            USAGE_METRICS,              handleMetrics,              0 },
-    { "import",             USAGE_IMPORTAPPLIANCE,      handleImportAppliance,      0 },
-    { "export",             USAGE_EXPORTAPPLIANCE,      handleExportAppliance,      0 },
+    { "metrics",            USAGE_METRICS,          VBMG_CMD_TODO, handleMetrics,              0 },
+    { "import",             USAGE_IMPORTAPPLIANCE,  VBMG_CMD_TODO, handleImportAppliance,      0 },
+    { "export",             USAGE_EXPORTAPPLIANCE,  VBMG_CMD_TODO, handleExportAppliance,      0 },
 #ifdef VBOX_WITH_NETFLT
-    { "hostonlyif",         USAGE_HOSTONLYIFS,          handleHostonlyIf,           0 },
+    { "hostonlyif",         USAGE_HOSTONLYIFS,      VBMG_CMD_TODO, handleHostonlyIf,           0 },
 #endif
-    { "dhcpserver",         USAGE_DHCPSERVER,           handleDHCPServer,           0 },
+    { "dhcpserver",         USAGE_DHCPSERVER,       VBMG_CMD_TODO, handleDHCPServer,           0 },
 #ifdef VBOX_WITH_NAT_SERVICE
-    { "natnetwork",         USAGE_NATNETWORK,           handleNATNetwork,           0 },
+    { "natnetwork",         USAGE_NATNETWORK,       VBMG_CMD_TODO, handleNATNetwork,           0 },
 #endif
-    { "extpack",            USAGE_EXTPACK,              handleExtPack,              0 },
-    { "bandwidthctl",       USAGE_BANDWIDTHCONTROL,     handleBandwidthControl,     0 },
-    { "debugvm",            USAGE_DEBUGVM,              handleDebugVM,              0 },
-    { "convertfromraw",     USAGE_CONVERTFROMRAW,       handleConvertFromRaw,       VBMG_CMD_F_NO_COM },
-    { "convertdd",          USAGE_CONVERTFROMRAW,       handleConvertFromRaw,       VBMG_CMD_F_NO_COM },
+    { "extpack",            USAGE_EXTPACK,       HELP_CMD_EXTPACK, handleExtPack,              0 },
+    { "bandwidthctl",       USAGE_BANDWIDTHCONTROL, VBMG_CMD_TODO, handleBandwidthControl,     0 },
+    { "debugvm",            USAGE_DEBUGVM,       HELP_CMD_DEBUGVM, handleDebugVM,              0 },
+    { "convertfromraw",     USAGE_CONVERTFROMRAW,   VBMG_CMD_TODO, handleConvertFromRaw,       VBMG_CMD_F_NO_COM },
+    { "convertdd",          USAGE_CONVERTFROMRAW,   VBMG_CMD_TODO, handleConvertFromRaw,       VBMG_CMD_F_NO_COM },
 };
 
 
@@ -396,7 +402,9 @@ static RTEXITCODE settingsPasswordFile(ComPtr<IVirtualBox> virtualBox, const cha
     com::Utf8Str passwd;
     RTEXITCODE rcExit = readPasswordFile(pszFilename, &passwd);
     if (rcExit == RTEXITCODE_SUCCESS)
+    {
         CHECK_ERROR2I_STMT(virtualBox, SetSettingsSecret(com::Bstr(passwd).raw()), rcExit = RTEXITCODE_FAILURE);
+    }
 
     return rcExit;
 }
@@ -548,12 +556,20 @@ int main(int argc, char *argv[])
 
 #ifndef VBOX_ONLY_DOCS
     PCVBMGCMD pCmd = lookupCommand(argv[iCmd]);
+    if (pCmd && pCmd->enmCmdHelp != VBMG_CMD_TODO)
+        setCurrentCommand(pCmd->enmCmdHelp);
+
     if (   pCmd
         && (   fShowHelp
             || (   argc - iCmdArg == 0
                 && pCmd->enmHelpCat != 0)))
     {
-        printUsage(pCmd->enmHelpCat, ~0U, g_pStdOut);
+        if (pCmd->enmCmdHelp == VBMG_CMD_TODO)
+            printUsage(pCmd->enmHelpCat, ~0U, g_pStdOut);
+        else if (fShowHelp)
+            printHelp(g_pStdOut);
+        else
+            printUsage(g_pStdOut);
         return RTEXITCODE_FAILURE; /* error */
     }
     if (!pCmd)
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManage.h b/src/VBox/Frontends/VBoxManage/VBoxManage.h
index c712654..28700a3 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManage.h
+++ b/src/VBox/Frontends/VBoxManage/VBoxManage.h
@@ -31,6 +31,10 @@
 #include <iprt/stream.h>
 #include <iprt/getopt.h>
 
+#ifndef VBOX_ONLY_DOCS
+# include "VBoxManageBuiltInHelp.h"
+#endif
+
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -182,6 +186,17 @@ RTEXITCODE errorArgument(const char *pszFormat, ...);
 void printUsageInternal(USAGECATEGORY fCategory, PRTSTREAM pStrm);
 
 #ifndef VBOX_ONLY_DOCS
+void        setCurrentCommand(enum HELP_CMD_VBOXMANAGE enmCommand);
+void        setCurrentSubcommand(uint64_t fCurSubcommandScope);
+
+void        printUsage(PRTSTREAM pStrm);
+void        printHelp(PRTSTREAM pStrm);
+RTEXITCODE  errorNoSubcommand(void);
+RTEXITCODE  errorUnknownSubcommand(const char *pszSubCmd);
+RTEXITCODE  errorTooManyParameters(char **papszArgs);
+RTEXITCODE  errorGetOpt(int rcGetOpt, union RTGETOPTUNION const *pValueUnion);
+RTEXITCODE  errorSyntax(const char *pszFormat, ...);
+
 HRESULT showProgress(ComPtr<IProgress> progress);
 #endif
 
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp
index d828df4..c8b423f 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp
@@ -238,7 +238,9 @@ static RTEXITCODE handleBandwidthControlSet(HandlerArg *a, ComPtr<IBandwidthCont
         ComPtr<IBandwidthGroup> bwGroup;
         CHECK_ERROR2I_RET(bwCtrl, GetBandwidthGroup(name.raw(), bwGroup.asOutParam()), RTEXITCODE_FAILURE);
         if (SUCCEEDED(rc))
+        {
             CHECK_ERROR2I_RET(bwGroup, COMSETTER(MaxBytesPerSec)((LONG64)cMaxBytesPerSec), RTEXITCODE_FAILURE);
+        }
     }
 
     return RTEXITCODE_SUCCESS;
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp
index 4d37f94..f92abd2 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManageDebugVM.cpp
@@ -105,12 +105,12 @@ static RTEXITCODE handleDebugVM_GetRegisters(HandlerArg *pArgs, IMachineDebugger
                 break;
 
             default:
-                return errorGetOpt(USAGE_DEBUGVM, rc, &ValueUnion);
+                return errorGetOpt(rc, &ValueUnion);
         }
     }
 
     if (!cRegisters)
-        return errorSyntax(USAGE_DEBUGVM, "The getregisters sub-command takes at least one register name");
+        return errorSyntax("The getregisters sub-command takes at least one register name");
     return RTEXITCODE_SUCCESS;
 }
 
@@ -118,16 +118,46 @@ static RTEXITCODE handleDebugVM_GetRegisters(HandlerArg *pArgs, IMachineDebugger
  * Handles the info sub-command.
  *
  * @returns Suitable exit code.
- * @param   a                   The handler arguments.
+ * @param   pArgs               The handler arguments.
  * @param   pDebugger           Pointer to the debugger interface.
  */
-static RTEXITCODE handleDebugVM_Info(HandlerArg *a, IMachineDebugger *pDebugger)
+static RTEXITCODE handleDebugVM_Info(HandlerArg *pArgs, IMachineDebugger *pDebugger)
 {
-    if (a->argc < 3 || a->argc > 4)
-        return errorSyntax(USAGE_DEBUGVM, "The inject sub-command takes at one or two arguments");
+    /*
+     * Parse arguments.
+     */
+    const char    *pszInfo = NULL;
+    const char    *pszArgs = NULL;
+    RTGETOPTSTATE  GetState;
+    RTGETOPTUNION  ValueUnion;
+    int rc = RTGetOptInit(&GetState, pArgs->argc, pArgs->argv, NULL, 0, 2, RTGETOPTINIT_FLAGS_OPTS_FIRST);
+    AssertRCReturn(rc, RTEXITCODE_FAILURE);
 
-    com::Bstr bstrName(a->argv[2]);
-    com::Bstr bstrArgs(a->argv[3]);
+    while ((rc = RTGetOpt(&GetState, &ValueUnion)) != 0)
+    {
+        switch (rc)
+        {
+            case VINF_GETOPT_NOT_OPTION:
+                if (!pszInfo)
+                    pszInfo = ValueUnion.psz;
+                else if (!pszArgs)
+                    pszArgs = ValueUnion.psz;
+                else
+                    return errorTooManyParameters(&pArgs->argv[GetState.iNext - 1]);
+                break;
+            default:
+                return errorGetOpt(rc, &ValueUnion);
+        }
+    }
+
+    if (!pszInfo)
+        return errorSyntax("Must specify info item to display");
+
+    /*
+     * Do the work.
+     */
+    com::Bstr bstrName(pszInfo);
+    com::Bstr bstrArgs(pszArgs);
     com::Bstr bstrInfo;
     CHECK_ERROR2I_RET(pDebugger, Info(bstrName.raw(), bstrArgs.raw(), bstrInfo.asOutParam()), RTEXITCODE_FAILURE);
     RTPrintf("%ls", bstrInfo.raw());
@@ -144,7 +174,7 @@ static RTEXITCODE handleDebugVM_Info(HandlerArg *a, IMachineDebugger *pDebugger)
 static RTEXITCODE handleDebugVM_InjectNMI(HandlerArg *a, IMachineDebugger *pDebugger)
 {
     if (a->argc != 2)
-        return errorSyntax(USAGE_DEBUGVM, "The inject sub-command does not take any arguments");
+        return errorTooManyParameters(&a->argv[1]);
     CHECK_ERROR2I_RET(pDebugger, InjectNMI(), RTEXITCODE_FAILURE);
     return RTEXITCODE_SUCCESS;
 }
@@ -262,21 +292,21 @@ static RTEXITCODE handleDebugVM_DumpVMCore(HandlerArg *pArgs, IMachineDebugger *
         {
             case 'c':
                 if (pszCompression)
-                    return errorSyntax(USAGE_DEBUGVM, "The --compression option has already been given");
+                    return errorSyntax("The --compression option has already been given");
                 pszCompression = ValueUnion.psz;
                 break;
             case 'f':
                 if (pszFilename)
-                    return errorSyntax(USAGE_DEBUGVM, "The --filename option has already been given");
+                    return errorSyntax("The --filename option has already been given");
                 pszFilename = ValueUnion.psz;
                 break;
             default:
-                return errorGetOpt(USAGE_DEBUGVM, rc, &ValueUnion);
+                return errorGetOpt(rc, &ValueUnion);
         }
     }
 
     if (!pszFilename)
-        return errorSyntax(USAGE_DEBUGVM, "The --filename option is required");
+        return errorSyntax("The --filename option is required");
 
     /*
      * Make the filename absolute before handing it on to the API.
@@ -302,7 +332,7 @@ static RTEXITCODE handleDebugVM_DumpVMCore(HandlerArg *pArgs, IMachineDebugger *
 static RTEXITCODE handleDebugVM_OSDetect(HandlerArg *a, IMachineDebugger *pDebugger)
 {
     if (a->argc != 2)
-        return errorSyntax(USAGE_DEBUGVM, "The osdetect sub-command does not take any arguments");
+        return errorTooManyParameters(&a->argv[1]);
 
     com::Bstr bstrIgnore;
     com::Bstr bstrAll("all");
@@ -324,7 +354,7 @@ static RTEXITCODE handleDebugVM_OSDetect(HandlerArg *a, IMachineDebugger *pDebug
 static RTEXITCODE handleDebugVM_OSInfo(HandlerArg *a, IMachineDebugger *pDebugger)
 {
     if (a->argc != 2)
-        return errorSyntax(USAGE_DEBUGVM, "The osinfo sub-command does not take any arguments");
+        return errorTooManyParameters(&a->argv[1]);
 
     com::Bstr bstrName;
     CHECK_ERROR2I_RET(pDebugger, COMGETTER(OSName)(bstrName.asOutParam()), RTEXITCODE_FAILURE);
@@ -360,7 +390,7 @@ static RTEXITCODE handleDebugVM_OSDmesg(HandlerArg *pArgs, IMachineDebugger *pDe
         switch (rc)
         {
             case 'n': uMaxMessages = ValueUnion.u32; break;
-            default: return errorGetOpt(USAGE_DEBUGVM, rc, &ValueUnion);
+            default: return errorGetOpt(rc, &ValueUnion);
         }
 
     /*
@@ -409,7 +439,7 @@ static RTEXITCODE handleDebugVM_SetRegisters(HandlerArg *pArgs, IMachineDebugger
             {
                 const char *pszEqual = strchr(ValueUnion.psz, '=');
                 if (!pszEqual)
-                    return errorSyntax(USAGE_DEBUGVM, "setregisters expects input on the form 'register=value' got '%s'", ValueUnion.psz);
+                    return errorSyntax("setregisters expects input on the form 'register=value' got '%s'", ValueUnion.psz);
                 try
                 {
                     com::Bstr bstrName(ValueUnion.psz, pszEqual - ValueUnion.psz);
@@ -427,12 +457,12 @@ static RTEXITCODE handleDebugVM_SetRegisters(HandlerArg *pArgs, IMachineDebugger
             }
 
             default:
-                return errorGetOpt(USAGE_DEBUGVM, rc, &ValueUnion);
+                return errorGetOpt(rc, &ValueUnion);
         }
     }
 
     if (!aBstrNames.size())
-        return errorSyntax(USAGE_DEBUGVM, "The setregisters sub-command takes at least one register name");
+        return errorSyntax("The setregisters sub-command takes at least one register name");
 
     /*
      * If it is only one register, use the single register method just so
@@ -589,14 +619,14 @@ static RTEXITCODE handleDebugVM_Show(HandlerArg *pArgs, IMachineDebugger *pDebug
                 else if (!strcmp(ValueUnion.psz, "logrel-settings"))
                     rcExit = handleDebugVM_Show_LogRelSettings(pDebugger, fFlags);
                 else
-                    rcExit = errorSyntax(USAGE_DEBUGVM, "The show sub-command has no idea what '%s' might be", ValueUnion.psz);
+                    rcExit = errorSyntax("The show sub-command has no idea what '%s' might be", ValueUnion.psz);
                 if (rcExit != RTEXITCODE_SUCCESS)
                     return rcExit;
                 break;
             }
 
             default:
-                return errorGetOpt(USAGE_DEBUGVM, rc, &ValueUnion);
+                return errorGetOpt(rc, &ValueUnion);
         }
     }
     return RTEXITCODE_SUCCESS;
@@ -639,7 +669,7 @@ static RTEXITCODE handleDebugVM_Statistics(HandlerArg *pArgs, IMachineDebugger *
 
             case 'p':
                 if (pszPattern)
-                    return errorSyntax(USAGE_DEBUGVM, "Multiple --pattern options are not permitted");
+                    return errorSyntax("Multiple --pattern options are not permitted");
                 pszPattern = ValueUnion.psz;
                 break;
 
@@ -648,12 +678,12 @@ static RTEXITCODE handleDebugVM_Statistics(HandlerArg *pArgs, IMachineDebugger *
                 break;
 
             default:
-                return errorGetOpt(USAGE_DEBUGVM, rc, &ValueUnion);
+                return errorGetOpt(rc, &ValueUnion);
         }
     }
 
     if (fReset && fWithDescriptions)
-        return errorSyntax(USAGE_DEBUGVM, "The --reset and --descriptions options does not mix");
+        return errorSyntax("The --reset and --descriptions options does not mix");
 
     /*
      * Execute the order.
@@ -684,7 +714,7 @@ RTEXITCODE handleDebugVM(HandlerArg *pArgs)
      * The first argument is the VM name or UUID.  Open a session to it.
      */
     if (pArgs->argc < 2)
-        return errorSyntax(USAGE_DEBUGVM, "Too few parameters");
+        return errorNoSubcommand();
     ComPtr<IMachine> ptrMachine;
     CHECK_ERROR2I_RET(pArgs->virtualBox, FindMachine(com::Bstr(pArgs->argv[0]).raw(), ptrMachine.asOutParam()), RTEXITCODE_FAILURE);
     CHECK_ERROR2I_RET(ptrMachine, LockMachine(pArgs->session, LockType_Shared), RTEXITCODE_FAILURE);
@@ -707,34 +737,73 @@ RTEXITCODE handleDebugVM(HandlerArg *pArgs)
                  * String switch on the sub-command.
                  */
                 const char *pszSubCmd = pArgs->argv[1];
-                if (!strcmp(pszSubCmd, "dumpguestcore"))
+                if (!strcmp(pszSubCmd, "dumpvmcore"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_DUMPVMCORE);
                     rcExit = handleDebugVM_DumpVMCore(pArgs, ptrDebugger);
+                }
                 else if (!strcmp(pszSubCmd, "getregisters"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_GETREGISTERS);
                     rcExit = handleDebugVM_GetRegisters(pArgs, ptrDebugger);
+                }
                 else if (!strcmp(pszSubCmd, "info"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_INFO);
                     rcExit = handleDebugVM_Info(pArgs, ptrDebugger);
+                }
                 else if (!strcmp(pszSubCmd, "injectnmi"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_INJECTNMI);
                     rcExit = handleDebugVM_InjectNMI(pArgs, ptrDebugger);
+                }
                 else if (!strcmp(pszSubCmd, "log"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_LOG);
                     rcExit = handleDebugVM_LogXXXX(pArgs, ptrDebugger, pszSubCmd);
+                }
                 else if (!strcmp(pszSubCmd, "logdest"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_LOGDEST);
                     rcExit = handleDebugVM_LogXXXX(pArgs, ptrDebugger, pszSubCmd);
+                }
                 else if (!strcmp(pszSubCmd, "logflags"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_LOGFLAGS);
                     rcExit = handleDebugVM_LogXXXX(pArgs, ptrDebugger, pszSubCmd);
+                }
                 else if (!strcmp(pszSubCmd, "osdetect"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_OSDETECT);
                     rcExit = handleDebugVM_OSDetect(pArgs, ptrDebugger);
+                }
                 else if (!strcmp(pszSubCmd, "osinfo"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_OSINFO);
                     rcExit = handleDebugVM_OSInfo(pArgs, ptrDebugger);
+                }
                 else if (!strcmp(pszSubCmd, "osdmesg"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_OSDMESG);
                     rcExit = handleDebugVM_OSDmesg(pArgs, ptrDebugger);
+                }
                 else if (!strcmp(pszSubCmd, "setregisters"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_SETREGISTERS);
                     rcExit = handleDebugVM_SetRegisters(pArgs, ptrDebugger);
+                }
                 else if (!strcmp(pszSubCmd, "show"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_SHOW);
                     rcExit = handleDebugVM_Show(pArgs, ptrDebugger);
+                }
                 else if (!strcmp(pszSubCmd, "statistics"))
+                {
+                    setCurrentSubcommand(HELP_SCOPE_DEBUGVM_STATISTICS);
                     rcExit = handleDebugVM_Statistics(pArgs, ptrDebugger);
+                }
                 else
-                    errorSyntax(USAGE_DEBUGVM, "Invalid parameter '%s'", pArgs->argv[1]);
+                    errorUnknownSubcommand(pszSubCmd);
             }
         }
         else
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
index a5fca69..c955631 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
@@ -29,6 +29,503 @@
 
 #include "VBoxManage.h"
 
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** If the usage is the given number of length long or longer, the error is
+ * repeated so the user can actually see it. */
+#define ERROR_REPEAT_AFTER_USAGE_LENGTH 16
+
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+#ifndef VBOX_ONLY_DOCS
+enum HELP_CMD_VBOXMANAGE    g_enmCurCommand = HELP_CMD_VBOXMANAGE_INVALID;
+/** The scope maskt for the current subcommand. */
+uint64_t                    g_fCurSubcommandScope = REFENTRYSTR_SCOPE_GLOBAL;
+/** String of spaces that can be used for indentation.   */
+static const char           g_szSpaces[] = "                                                ";
+
+/**
+ * Sets the current command.
+ *
+ * This affects future calls to error and help functions.
+ *
+ * @param   enmCommand          The command.
+ */
+void setCurrentCommand(enum HELP_CMD_VBOXMANAGE enmCommand)
+{
+    Assert(g_enmCurCommand == HELP_CMD_VBOXMANAGE_INVALID);
+    g_enmCurCommand       = enmCommand;
+    g_fCurSubcommandScope = REFENTRYSTR_SCOPE_GLOBAL;
+}
+
+
+/**
+ * Sets the current subcommand.
+ *
+ * This affects future calls to error and help functions.
+ *
+ * @param   fSubcommandScope    The subcommand scope.
+ */
+void setCurrentSubcommand(uint64_t fSubcommandScope)
+{
+    g_fCurSubcommandScope = fSubcommandScope;
+}
+
+
+
+/**
+ * Retruns the width for the given handle.
+ *
+ * @returns Screen width.
+ * @param   pStrm           The stream, g_pStdErr or g_pStdOut.
+ */
+static uint32_t getScreenWidth(PRTSTREAM pStrm)
+{
+    static uint32_t s_acch[2] = { 0, 0};
+    uint32_t        iWhich    = pStrm == g_pStdErr ? 1 : 0;
+    uint32_t        cch       = s_acch[iWhich];
+    if (cch)
+        return cch;
+
+    cch = 80; /** @todo screen width IPRT API. */
+    s_acch[iWhich] = cch;
+    return cch;
+}
+
+
+/**
+ * Prints a string table string (paragraph), performing non-breaking-space
+ * replacement and wrapping.
+ *
+ * @returns Number of lines written.
+ * @param   pStrm           The output stream.
+ * @param   psz             The string table string to print.
+ * @param   cchMaxWidth     The maximum output width.
+ * @param   fFlags          String flags that may affect formatting.
+ */
+static uint32_t printString(PRTSTREAM pStrm, const char *psz, uint32_t cchMaxWidth, uint64_t fFlags)
+{
+    uint32_t    cLinesWritten;
+    size_t      cch     = strlen(psz);
+    const char *pszNbsp = strchr(psz, REFENTRY_NBSP);
+
+    /*
+     * No-wrap case is simpler, so handle that separately.
+     */
+    if (cch <= cchMaxWidth)
+    {
+        if (!pszNbsp)
+            RTStrmWrite(pStrm, psz, cch);
+        else
+        {
+            do
+            {
+                RTStrmWrite(pStrm, psz, pszNbsp - psz);
+                RTStrmPutCh(pStrm, ' ');
+                psz = pszNbsp + 1;
+                pszNbsp = strchr(psz, REFENTRY_NBSP);
+            } while (pszNbsp);
+            RTStrmWrite(pStrm, psz, strlen(psz));
+        }
+        RTStrmPutCh(pStrm, '\n');
+        cLinesWritten = 1;
+    }
+    /*
+     * We need to wrap stuff, too bad.
+     */
+    else
+    {
+        /* Figure the paragraph indent level first. */
+        const char * const pszIndent = psz;
+        uint32_t cchIndent = 0;
+        while (*psz == ' ')
+            cchIndent++, psz++;
+        Assert(cchIndent + 4 + 1 <= RT_ELEMENTS(g_szSpaces));
+
+        if (cchIndent + 8 >= cchMaxWidth)
+            cchMaxWidth += cchIndent + 8;
+
+        /* Work our way thru the string, line by line. */
+        uint32_t cchHangingIndent = 0;
+        cLinesWritten = 0;
+        do
+        {
+            RTStrmWrite(pStrm, g_szSpaces, cchIndent + cchHangingIndent);
+            size_t   offLine       = cchIndent + cchHangingIndent;
+            bool     fPendingSpace = false;
+            do
+            {
+                const char *pszSpace = strchr(psz, ' ');
+                size_t      cchWord  = pszSpace ? pszSpace - psz : strlen(psz);
+                if (   offLine + cchWord + fPendingSpace > cchMaxWidth
+                    && offLine != cchIndent)
+                    break;
+
+                pszNbsp = (const char *)memchr(psz, REFENTRY_NBSP, cchWord);
+                while (pszNbsp)
+                {
+                    size_t cchSubWord = pszNbsp - psz;
+                    if (fPendingSpace)
+                        RTStrmPutCh(pStrm, ' ');
+                    RTStrmWrite(pStrm, psz, cchSubWord);
+                    offLine += cchSubWord + fPendingSpace;
+                    psz     += cchSubWord + 1;
+                    cchWord -= cchSubWord + 1;
+                    pszNbsp = (const char *)memchr(psz, REFENTRY_NBSP, cchWord);
+                    fPendingSpace = true;
+                }
+
+                if (fPendingSpace)
+                    RTStrmPutCh(pStrm, ' ');
+                RTStrmWrite(pStrm, psz, cchWord);
+                offLine += cchWord + fPendingSpace;
+                psz      = pszSpace ? pszSpace + 1 : strchr(psz, '\0');
+                fPendingSpace = true;
+            } while (offLine < cchMaxWidth && *psz != '\0');
+            RTStrmPutCh(pStrm, '\n');
+            cLinesWritten++;
+
+            /* Set up hanging indent if relevant. */
+            if (fFlags & REFENTRYSTR_FLAGS_SYNOPSIS)
+                cchHangingIndent = 4;
+        } while (*psz != '\0');
+    }
+    return cLinesWritten;
+}
+
+
+/**
+ * Checks if the given string is empty (only spaces).
+ * @returns true if empty, false if not.
+ * @param   psz                 The string to examine.
+ */
+DECLINLINE(bool) isEmptyString(const char *psz)
+{
+    char ch;
+    while ((ch = *psz) == ' ')
+        psz++;
+    return ch == '\0';
+}
+
+
+/**
+ * Prints a string table.
+ *
+ * @returns Current number of pending blank lines.
+ * @param   pStrm               The output stream.
+ * @param   pStrTab             The string table.
+ * @param   fScope              The selection scope.
+ * @param   cPendingBlankLines  Pending blank lines from previous string table.
+ * @param   pcLinesWritten      Pointer to variable that should be incremented
+ *                              by the number of lines written.  Optional.
+ */
+static uint32_t printStringTable(PRTSTREAM pStrm, PCREFENTRYSTRTAB pStrTab, uint64_t fScope, uint32_t cPendingBlankLines,
+                                 uint32_t *pcLinesWritten = NULL)
+{
+    uint32_t cLinesWritten = 0;
+    uint32_t cchWidth      = getScreenWidth(pStrm);
+    uint64_t fPrevScope    = fScope;
+    for (uint32_t i = 0; i < pStrTab->cStrings; i++)
+    {
+        uint64_t fCurScope = pStrTab->paStrings[i].fScope;
+        if ((fCurScope & REFENTRYSTR_SCOPE_MASK) == REFENTRYSTR_SCOPE_SAME)
+        {
+            fCurScope &= ~REFENTRYSTR_SCOPE_MASK;
+            fCurScope |= (fPrevScope & REFENTRYSTR_SCOPE_MASK);
+        }
+        if (fCurScope & REFENTRYSTR_SCOPE_MASK & fScope)
+        {
+            const char *psz = pStrTab->paStrings[i].psz;
+            if (psz && !isEmptyString(psz))
+            {
+                while (cPendingBlankLines > 0)
+                {
+                    cPendingBlankLines--;
+                    RTStrmPutCh(pStrm, '\n');
+                    cLinesWritten++;
+                }
+                cLinesWritten += printString(pStrm, psz, cchWidth, fCurScope & REFENTRYSTR_FLAGS_MASK);
+            }
+            else
+                cPendingBlankLines++;
+        }
+        fPrevScope = fCurScope;
+    }
+
+    if (pcLinesWritten)
+        *pcLinesWritten += cLinesWritten;
+    return cPendingBlankLines;
+}
+
+
+/**
+ * Prints brief help for a command or subcommand.
+ *
+ * @returns Number of lines written.
+ * @param   enmCommand          The command.
+ * @param   fSubcommandScope    The subcommand scope, REFENTRYSTR_SCOPE_GLOBAL
+ *                              for all.
+ * @param   pStrm               The output stream.
+ */
+static uint32_t printBriefCommandOrSubcommandHelp(enum HELP_CMD_VBOXMANAGE enmCommand, uint64_t fSubcommandScope, PRTSTREAM pStrm)
+{
+    uint32_t cLinesWritten = 0;
+    uint32_t cPendingBlankLines = 0;
+    uint32_t cFound = 0;
+    for (uint32_t i = 0; i < g_cHelpEntries; i++)
+    {
+        PCREFENTRY pHelp = g_apHelpEntries[i];
+        if (pHelp->idInternal == (int64_t)enmCommand)
+        {
+            cFound++;
+            if (cFound == 1)
+            {
+                if (fSubcommandScope == REFENTRYSTR_SCOPE_GLOBAL)
+                    RTStrmPrintf(pStrm, "Usage - %c%s:\n", RT_C_TO_UPPER(pHelp->pszBrief[0]), pHelp->pszBrief + 1);
+                else
+                    RTStrmPrintf(pStrm, "Usage:\n");
+            }
+            cPendingBlankLines = printStringTable(pStrm, &pHelp->Synopsis, fSubcommandScope, cPendingBlankLines, &cLinesWritten);
+            if (!cPendingBlankLines)
+                cPendingBlankLines = 1;
+        }
+    }
+    Assert(cFound > 0);
+    return cLinesWritten;
+}
+
+
+/**
+ * Prints the brief usage information for the current (sub)command.
+ *
+ * @param   pStrm               The output stream.
+ */
+void printUsage(PRTSTREAM pStrm)
+{
+    printBriefCommandOrSubcommandHelp(g_enmCurCommand, g_fCurSubcommandScope, pStrm);
+}
+
+
+/**
+ * Prints full help for a command or subcommand.
+ *
+ * @param   enmCommand          The command.
+ * @param   fSubcommandScope    The subcommand scope, REFENTRYSTR_SCOPE_GLOBAL
+ *                              for all.
+ * @param   pStrm               The output stream.
+ */
+static void printFullCommandOrSubcommandHelp(enum HELP_CMD_VBOXMANAGE enmCommand, uint64_t fSubcommandScope, PRTSTREAM pStrm)
+{
+    uint32_t cPendingBlankLines = 0;
+    uint32_t cFound = 0;
+    for (uint32_t i = 0; i < g_cHelpEntries; i++)
+    {
+        PCREFENTRY pHelp = g_apHelpEntries[i];
+        if (   pHelp->idInternal == (int64_t)enmCommand
+            || enmCommand == HELP_CMD_VBOXMANAGE_INVALID)
+        {
+            cFound++;
+            cPendingBlankLines = printStringTable(pStrm, &pHelp->Help, fSubcommandScope, cPendingBlankLines);
+            if (cPendingBlankLines < 2)
+                cPendingBlankLines = 2;
+        }
+    }
+    Assert(cFound > 0);
+}
+
+
+/**
+ * Prints the full help for the current (sub)command.
+ *
+ * @param   pStrm               The output stream.
+ */
+void printHelp(PRTSTREAM pStrm)
+{
+    printFullCommandOrSubcommandHelp(g_enmCurCommand, g_fCurSubcommandScope, pStrm);
+}
+
+
+/**
+ * Display no subcommand error message and current command usage.
+ *
+ * @returns RTEXITCODE_SYNTAX.
+ */
+RTEXITCODE errorNoSubcommand(void)
+{
+    Assert(g_enmCurCommand != HELP_CMD_VBOXMANAGE_INVALID);
+    Assert(g_fCurSubcommandScope == REFENTRYSTR_SCOPE_GLOBAL);
+
+    return errorSyntax("No subcommand specified");
+}
+
+
+/**
+ * Display unknown subcommand error message and current command usage.
+ *
+ * May show full command help instead if the subcommand is a common help option.
+ *
+ * @returns RTEXITCODE_SYNTAX, or RTEXITCODE_SUCCESS if common help option.
+ * @param   pszSubcommand       The name of the alleged subcommand.
+ */
+RTEXITCODE errorUnknownSubcommand(const char *pszSubcommand)
+{
+    Assert(g_enmCurCommand != HELP_CMD_VBOXMANAGE_INVALID);
+    Assert(g_fCurSubcommandScope == REFENTRYSTR_SCOPE_GLOBAL);
+
+    /* check if help was requested. */
+    if (   strcmp(pszSubcommand, "--help") == 0
+        || strcmp(pszSubcommand, "-h") == 0
+        || strcmp(pszSubcommand, "-?") == 0)
+    {
+        printFullCommandOrSubcommandHelp(g_enmCurCommand, g_fCurSubcommandScope, g_pStdOut);
+        return RTEXITCODE_SUCCESS;
+    }
+
+    return errorSyntax("Unknown subcommand: %s", pszSubcommand);
+}
+
+
+/**
+ * Display too many parameters error message and current command usage.
+ *
+ * May show full command help instead if the subcommand is a common help option.
+ *
+ * @returns RTEXITCODE_SYNTAX, or RTEXITCODE_SUCCESS if common help option.
+ * @param   papszArgs           The first unwanted parameter.  Terminated by
+ *                              NULL entry.
+ */
+RTEXITCODE errorTooManyParameters(char **papszArgs)
+{
+    Assert(g_enmCurCommand != HELP_CMD_VBOXMANAGE_INVALID);
+    Assert(g_fCurSubcommandScope != REFENTRYSTR_SCOPE_GLOBAL);
+
+    /* check if help was requested. */
+    if (papszArgs)
+        for (uint32_t i = 0; papszArgs[i]; i++)
+            if (   strcmp(papszArgs[i], "--help") == 0
+                || strcmp(papszArgs[i], "-h") == 0
+                || strcmp(papszArgs[i], "-?") == 0)
+            {
+                printFullCommandOrSubcommandHelp(g_enmCurCommand, g_fCurSubcommandScope, g_pStdOut);
+                return RTEXITCODE_SUCCESS;
+            }
+            else if (!strcmp(papszArgs[i], "--"))
+                break;
+
+    return errorSyntax("Too many parameters");
+}
+
+
+/**
+ * Display current (sub)command usage and the custom error message.
+ *
+ * @returns RTEXITCODE_SYNTAX.
+ * @param   pszFormat           Custom error message format string.
+ * @param   ...                 Format arguments.
+ */
+RTEXITCODE errorSyntax(const char *pszFormat, ...)
+{
+    Assert(g_enmCurCommand != HELP_CMD_VBOXMANAGE_INVALID);
+
+    showLogo(g_pStdErr);
+
+    va_list va;
+    va_start(va, pszFormat);
+    RTMsgErrorV(pszFormat, va);
+    va_end(va);
+
+    RTStrmPutCh(g_pStdErr, '\n');
+    if (   printBriefCommandOrSubcommandHelp(g_enmCurCommand, g_fCurSubcommandScope, g_pStdErr)
+        >= ERROR_REPEAT_AFTER_USAGE_LENGTH)
+    {
+        /* Usage was very long, repeat the error message. */
+        RTStrmPutCh(g_pStdErr, '\n');
+        va_start(va, pszFormat);
+        RTMsgErrorV(pszFormat, va);
+        va_end(va);
+    }
+    return RTEXITCODE_SYNTAX;
+}
+
+
+/**
+ * Worker for errorGetOpt.
+ *
+ * @param   rcGetOpt            The RTGetOpt return value.
+ * @param   pValueUnion         The value union returned by RTGetOpt.
+ */
+static void errorGetOptWorker(int rcGetOpt, union RTGETOPTUNION const *pValueUnion)
+{
+    if (rcGetOpt == VINF_GETOPT_NOT_OPTION)
+        RTMsgError("Invalid parameter '%s'", pValueUnion->psz);
+    else if (rcGetOpt > 0)
+    {
+        if (RT_C_IS_PRINT(rcGetOpt))
+            RTMsgError("Invalid option -%c", rcGetOpt);
+        else
+            RTMsgError("Invalid option case %i", rcGetOpt);
+    }
+    else if (rcGetOpt == VERR_GETOPT_UNKNOWN_OPTION)
+        RTMsgError("Unknown option: %s", pValueUnion->psz);
+    else if (rcGetOpt == VERR_GETOPT_INVALID_ARGUMENT_FORMAT)
+        RTMsgError("Invalid argument format: %s", pValueUnion->psz);
+    else if (pValueUnion->pDef)
+        RTMsgError("%s: %Rrs", pValueUnion->pDef->pszLong, rcGetOpt);
+    else
+        RTMsgError("%Rrs", rcGetOpt);
+}
+
+
+/**
+ * Handled an RTGetOpt error or common option.
+ *
+ * This implements the 'V' and 'h' cases.  It reports appropriate syntax errors
+ * for other @a rcGetOpt values.
+ *
+ * @retval  RTEXITCODE_SUCCESS if help or version request.
+ * @retval  RTEXITCODE_SYNTAX if not help or version request.
+ * @param   rcGetOpt            The RTGetOpt return value.
+ * @param   pValueUnion         The value union returned by RTGetOpt.
+ */
+RTEXITCODE errorGetOpt(int rcGetOpt, union RTGETOPTUNION const *pValueUnion)
+{
+    Assert(g_enmCurCommand != HELP_CMD_VBOXMANAGE_INVALID);
+
+    /*
+     * Check if it is an unhandled standard option.
+     */
+    if (rcGetOpt == 'V')
+    {
+        RTPrintf("%sr%d\n", VBOX_VERSION_STRING, RTBldCfgRevision());
+        return RTEXITCODE_SUCCESS;
+    }
+
+    if (rcGetOpt == 'h')
+    {
+        printFullCommandOrSubcommandHelp(g_enmCurCommand, g_fCurSubcommandScope, g_pStdOut);
+        return RTEXITCODE_SUCCESS;
+    }
+
+    /*
+     * We failed.
+     */
+    showLogo(g_pStdErr);
+    errorGetOptWorker(rcGetOpt, pValueUnion);
+    if (   printBriefCommandOrSubcommandHelp(g_enmCurCommand, g_fCurSubcommandScope, g_pStdErr)
+        >= ERROR_REPEAT_AFTER_USAGE_LENGTH)
+    {
+        /* Usage was very long, repeat the error message. */
+        RTStrmPutCh(g_pStdErr, '\n');
+        errorGetOptWorker(rcGetOpt, pValueUnion);
+    }
+    return RTEXITCODE_SYNTAX;
+}
+
+#endif /* VBOX_ONLY_DOCS */
+
 
 
 void showLogo(PRTSTREAM pStrm)
@@ -46,6 +543,9 @@ void showLogo(PRTSTREAM pStrm)
     }
 }
 
+
+
+
 void printUsage(USAGECATEGORY fCategory, uint32_t fSubCategory, PRTSTREAM pStrm)
 {
     bool fDumpOpts = false;
@@ -330,6 +830,7 @@ void printUsage(USAGECATEGORY fCategory, uint32_t fSubCategory, PRTSTREAM pStrm)
         RTStrmPrintf(pStrm, "]\n");
         RTStrmPrintf(pStrm,
                      "                            [--audiocontroller ac97|hda|sb16]\n"
+                     "                            [--audiocodec stac9700|ad1980|stac9221|sb16]\n"
                      "                            [--clipboard disabled|hosttoguest|guesttohost|\n"
                      "                                         bidirectional]\n"
                      "                            [--draganddrop disabled|hosttoguest]\n");
@@ -841,7 +1342,7 @@ void printUsage(USAGECATEGORY fCategory, uint32_t fSubCategory, PRTSTREAM pStrm)
                      "                            [--dhcp |\n"
                      "                            --ip<ipv4> [--netmask<ipv4> (def: 255.255.255.0)] |\n"
                      "                            --ipv6<ipv6> [--netmasklengthv6<length> (def: 64)]]\n"
-# if !defined(RT_OS_SOLARIS)
+# if !defined(RT_OS_SOLARIS) || defined(VBOX_ONLY_DOCS)
                      "                            create |\n"
                      "                            remove <name>\n"
 # endif
@@ -867,14 +1368,22 @@ void printUsage(USAGECATEGORY fCategory, uint32_t fSubCategory, PRTSTREAM pStrm)
 #endif
                      "\n", SEP, SEP);
     }
-    if (fCategory & USAGE_EXTPACK)
+
+#ifndef VBOX_ONLY_DOCS /* Converted to man page, not needed. */
+    if (fCategory == USAGE_ALL)
     {
-        RTStrmPrintf(pStrm,
-                           "%s extpack %s         install [--replace] <tarball> |\n"
-                     "                            uninstall [--force] <name> |\n"
-                     "                            cleanup\n"
-                     "\n", SEP);
+        uint32_t cPendingBlankLines = 0;
+        for (uint32_t i = 0; i < g_cHelpEntries; i++)
+        {
+            PCREFENTRY pHelp = g_apHelpEntries[i];
+            RTStrmPrintf(pStrm, "  %c%s:\n", RT_C_TO_UPPER(pHelp->pszBrief[0]), pHelp->pszBrief + 1);
+            cPendingBlankLines = printStringTable(pStrm, &pHelp->Synopsis, REFENTRYSTR_SCOPE_GLOBAL, cPendingBlankLines);
+            if (!cPendingBlankLines)
+                cPendingBlankLines = 1;
+        }
     }
+
+#endif
 }
 
 /**
@@ -1005,3 +1514,6 @@ RTEXITCODE errorArgument(const char *pszFormat, ...)
     va_end(args);
     return RTEXITCODE_SYNTAX;
 }
+
+
+
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
index 8c0885e..58f0567 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
@@ -1482,8 +1482,9 @@ HRESULT showVMInfo(ComPtr<IVirtualBox> pVirtualBox,
     rc = machine->COMGETTER(AudioAdapter)(AudioAdapter.asOutParam());
     if (SUCCEEDED(rc))
     {
-        const char *pszDrv  = "Unknown";
-        const char *pszCtrl = "Unknown";
+        const char *pszDrv   = "Unknown";
+        const char *pszCtrl  = "Unknown";
+        const char *pszCodec = "Unknown";
         BOOL fEnabled;
         rc = AudioAdapter->COMGETTER(Enabled)(&fEnabled);
         if (SUCCEEDED(rc) && fEnabled)
@@ -1568,6 +1569,23 @@ HRESULT showVMInfo(ComPtr<IVirtualBox> pVirtualBox,
                         pszCtrl = "HDA";
                     break;
             }
+            AudioCodecType_T enmCodecType;
+            rc = AudioAdapter->COMGETTER(AudioCodec)(&enmCodecType);
+            switch (enmCodecType)
+            {
+                case AudioCodecType_SB16:
+                    pszCodec = "SB16";
+                    break;
+                case AudioCodecType_STAC9700:
+                    pszCodec = "STAC9700";
+                    break;
+                case AudioCodecType_AD1980:
+                    pszCodec = "AD1980";
+                    break;
+                case AudioCodecType_STAC9221:
+                    pszCodec = "STAC9221";
+                    break;
+            }
         }
         else
             fEnabled = FALSE;
@@ -1583,8 +1601,8 @@ HRESULT showVMInfo(ComPtr<IVirtualBox> pVirtualBox,
             RTPrintf("Audio:           %s",
                     fEnabled ? "enabled" : "disabled");
             if (fEnabled)
-                RTPrintf(" (Driver: %s, Controller: %s)",
-                    pszDrv, pszCtrl);
+                RTPrintf(" (Driver: %s, Controller: %s, Codec: %s)",
+                    pszDrv, pszCtrl, pszCodec);
             RTPrintf("\n");
         }
     }
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp
index 2bca62f..881c6c8 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp
@@ -660,8 +660,10 @@ static HRESULT listSystemProperties(const ComPtr<IVirtualBox> &pVirtualBox)
 #endif
     systemProperties->COMGETTER(DefaultMachineFolder)(str.asOutParam());
     RTPrintf("Default machine folder:          %ls\n", str.raw());
+    systemProperties->COMGETTER(RawModeSupported)(&fValue);
+    RTPrintf("Raw-mode Supported:              %s\n", fValue ? "yes" : "no");
     systemProperties->COMGETTER(ExclusiveHwVirt)(&fValue);
-    RTPrintf("Exclusive HW virtualization use: %ls\n", fValue ? L"on" : L"off");
+    RTPrintf("Exclusive HW virtualization use: %s\n", fValue ? "on" : "off");
     systemProperties->COMGETTER(DefaultHardDiskFormat)(str.asOutParam());
     RTPrintf("Default hard disk format:        %ls\n", str.raw());
     systemProperties->COMGETTER(VRDEAuthLibrary)(str.asOutParam());
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp
index e3db8fa..7d821c2 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -80,7 +80,7 @@ static HRESULT parseFilterParameters(int argc, char *argv[],
             ComPtr<IMachine> machine;
             rc = aVirtualBox->FindMachine(Bstr(argv[0]).raw(),
                                           machine.asOutParam());
-            if (SUCCEEDED (rc))
+            if (SUCCEEDED(rc))
             {
                 retObjects.reset(1);
                 machine.queryInterfaceTo(&retObjects[0]);
@@ -107,7 +107,7 @@ static Bstr toBaseName(Utf8Str& aFullName)
      * Currently there are two metrics which base name is the same as the
      * sub-metric name: CPU/MHz and Net/<iface>/LinkSpeed.
      */
-    if (strcmp(pszRaw, "CPU/MHz") && !RTStrSimplePatternMatch("Net/*/LinkSpeed", pszRaw))
+    if (pszRaw && strcmp(pszRaw, "CPU/MHz") && !RTStrSimplePatternMatch("Net/*/LinkSpeed", pszRaw))
     {
         char *pszSlash = strrchr(pszRaw, '/');
         if (pszSlash)
@@ -302,16 +302,16 @@ static RTEXITCODE handleMetricsQuery(int argc, char *argv[],
     com::SafeArray<ULONG>         retIndices;
     com::SafeArray<ULONG>         retLengths;
     com::SafeArray<LONG>          retData;
-    CHECK_ERROR (performanceCollector, QueryMetricsData(ComSafeArrayAsInParam(metrics),
-                                             ComSafeArrayAsInParam(objects),
-                                             ComSafeArrayAsOutParam(retNames),
-                                             ComSafeArrayAsOutParam(retObjects),
-                                             ComSafeArrayAsOutParam(retUnits),
-                                             ComSafeArrayAsOutParam(retScales),
-                                             ComSafeArrayAsOutParam(retSequenceNumbers),
-                                             ComSafeArrayAsOutParam(retIndices),
-                                             ComSafeArrayAsOutParam(retLengths),
-                                             ComSafeArrayAsOutParam(retData)) );
+    CHECK_ERROR(performanceCollector, QueryMetricsData(ComSafeArrayAsInParam(metrics),
+                                                       ComSafeArrayAsInParam(objects),
+                                                       ComSafeArrayAsOutParam(retNames),
+                                                       ComSafeArrayAsOutParam(retObjects),
+                                                       ComSafeArrayAsOutParam(retUnits),
+                                                       ComSafeArrayAsOutParam(retScales),
+                                                       ComSafeArrayAsOutParam(retSequenceNumbers),
+                                                       ComSafeArrayAsOutParam(retIndices),
+                                                       ComSafeArrayAsOutParam(retLengths),
+                                                       ComSafeArrayAsOutParam(retData)) );
 
     RTPrintf("Object     Metric               Values\n"
              "---------- -------------------- --------------------------------------------\n");
@@ -500,16 +500,16 @@ static RTEXITCODE handleMetricsCollect(int argc, char *argv[],
         com::SafeArray<ULONG>         retIndices;
         com::SafeArray<ULONG>         retLengths;
         com::SafeArray<LONG>          retData;
-        CHECK_ERROR (performanceCollector, QueryMetricsData(ComSafeArrayAsInParam(metrics),
-                                                 ComSafeArrayAsInParam(objects),
-                                                 ComSafeArrayAsOutParam(retNames),
-                                                 ComSafeArrayAsOutParam(retObjects),
-                                                 ComSafeArrayAsOutParam(retUnits),
-                                                 ComSafeArrayAsOutParam(retScales),
-                                                 ComSafeArrayAsOutParam(retSequenceNumbers),
-                                                 ComSafeArrayAsOutParam(retIndices),
-                                                 ComSafeArrayAsOutParam(retLengths),
-                                                 ComSafeArrayAsOutParam(retData)) );
+        CHECK_ERROR(performanceCollector, QueryMetricsData(ComSafeArrayAsInParam(metrics),
+                                                           ComSafeArrayAsInParam(objects),
+                                                           ComSafeArrayAsOutParam(retNames),
+                                                           ComSafeArrayAsOutParam(retObjects),
+                                                           ComSafeArrayAsOutParam(retUnits),
+                                                           ComSafeArrayAsOutParam(retScales),
+                                                           ComSafeArrayAsOutParam(retSequenceNumbers),
+                                                           ComSafeArrayAsOutParam(retIndices),
+                                                           ComSafeArrayAsOutParam(retLengths),
+                                                           ComSafeArrayAsOutParam(retData)) );
         for (unsigned j = 0; j < retNames.size(); j++)
         {
             Bstr metricUnit(retUnits[j]);
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp
index ba0d2e6..fed14a5 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp
@@ -1099,7 +1099,7 @@ RTEXITCODE handleSharedFolder(HandlerArg *a)
 RTEXITCODE handleExtPack(HandlerArg *a)
 {
     if (a->argc < 1)
-        return errorSyntax(USAGE_EXTPACK, "Incorrect number of parameters");
+        return errorNoSubcommand();
 
     ComObjPtr<IExtPackManager> ptrExtPackMgr;
     CHECK_ERROR2I_RET(a->virtualBox, COMGETTER(ExtensionPackManager)(ptrExtPackMgr.asOutParam()), RTEXITCODE_FAILURE);
@@ -1111,6 +1111,7 @@ RTEXITCODE handleExtPack(HandlerArg *a)
 
     if (!strcmp(a->argv[0], "install"))
     {
+        setCurrentSubcommand(HELP_SCOPE_EXTPACK_INSTALL);
         const char *pszName  = NULL;
         bool        fReplace = false;
 
@@ -1130,16 +1131,16 @@ RTEXITCODE handleExtPack(HandlerArg *a)
 
                 case VINF_GETOPT_NOT_OPTION:
                     if (pszName)
-                        return errorSyntax(USAGE_EXTPACK, "Too many extension pack names given to \"extpack uninstall\"");
+                        return errorSyntax("Too many extension pack names given to \"extpack uninstall\"");
                     pszName = ValueUnion.psz;
                     break;
 
                 default:
-                    return errorGetOpt(USAGE_EXTPACK, ch, &ValueUnion);
+                    return errorGetOpt(ch, &ValueUnion);
             }
         }
         if (!pszName)
-            return errorSyntax(USAGE_EXTPACK, "No extension pack name was given to \"extpack install\"");
+            return errorSyntax("No extension pack name was given to \"extpack install\"");
 
         char szPath[RTPATH_MAX];
         int vrc = RTPathAbs(pszName, szPath, sizeof(szPath));
@@ -1160,6 +1161,7 @@ RTEXITCODE handleExtPack(HandlerArg *a)
     }
     else if (!strcmp(a->argv[0], "uninstall"))
     {
+        setCurrentSubcommand(HELP_SCOPE_EXTPACK_UNINSTALL);
         const char *pszName = NULL;
         bool        fForced = false;
 
@@ -1179,16 +1181,16 @@ RTEXITCODE handleExtPack(HandlerArg *a)
 
                 case VINF_GETOPT_NOT_OPTION:
                     if (pszName)
-                        return errorSyntax(USAGE_EXTPACK, "Too many extension pack names given to \"extpack uninstall\"");
+                        return errorSyntax("Too many extension pack names given to \"extpack uninstall\"");
                     pszName = ValueUnion.psz;
                     break;
 
                 default:
-                    return errorGetOpt(USAGE_EXTPACK, ch, &ValueUnion);
+                    return errorGetOpt(ch, &ValueUnion);
             }
         }
         if (!pszName)
-            return errorSyntax(USAGE_EXTPACK, "No extension pack name was given to \"extpack uninstall\"");
+            return errorSyntax("No extension pack name was given to \"extpack uninstall\"");
 
         Bstr bstrName(pszName);
         ComPtr<IProgress> ptrProgress;
@@ -1200,14 +1202,14 @@ RTEXITCODE handleExtPack(HandlerArg *a)
     }
     else if (!strcmp(a->argv[0], "cleanup"))
     {
+        setCurrentSubcommand(HELP_SCOPE_EXTPACK_CLEANUP);
         if (a->argc > 1)
-            return errorSyntax(USAGE_EXTPACK, "Too many parameters given to \"extpack cleanup\"");
-
+            return errorTooManyParameters(&a->argv[1]);
         CHECK_ERROR2I_RET(ptrExtPackMgr, Cleanup(), RTEXITCODE_FAILURE);
         RTPrintf("Successfully performed extension pack cleanup\n");
     }
     else
-        return errorSyntax(USAGE_EXTPACK, "Unknown command \"%s\"", a->argv[0]);
+        return errorUnknownSubcommand(a->argv[0]);
 
     return RTEXITCODE_SUCCESS;
 }
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
index f501677..4f6c946 100644
--- a/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
+++ b/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
@@ -138,6 +138,7 @@ enum
 #endif
     MODIFYVM_GUESTMEMORYBALLOON,
     MODIFYVM_AUDIOCONTROLLER,
+    MODIFYVM_AUDIOCODEC,
     MODIFYVM_AUDIO,
     MODIFYVM_CLIPBOARD,
     MODIFYVM_DRAGANDDROP,
@@ -306,6 +307,7 @@ static const RTGETOPTDEF g_aModifyVMOptions[] =
 #endif
     { "--guestmemoryballoon",       MODIFYVM_GUESTMEMORYBALLOON,        RTGETOPT_REQ_UINT32 },
     { "--audiocontroller",          MODIFYVM_AUDIOCONTROLLER,           RTGETOPT_REQ_STRING },
+    { "--audiocodec",               MODIFYVM_AUDIOCODEC,                RTGETOPT_REQ_STRING },
     { "--audio",                    MODIFYVM_AUDIO,                     RTGETOPT_REQ_STRING },
     { "--clipboard",                MODIFYVM_CLIPBOARD,                 RTGETOPT_REQ_STRING },
     { "--draganddrop",              MODIFYVM_DRAGANDDROP,               RTGETOPT_REQ_STRING },
@@ -1934,15 +1936,20 @@ RTEXITCODE handleModifyVM(HandlerArg *a)
                 }
                 if (fEnableUsb)
                 {
-                    /* Make sure the OHCI controller is enabled. */
+                    /* Make sure either the OHCI or xHCI controller is enabled. */
                     ULONG cOhciCtrls = 0;
+                    ULONG cXhciCtrls = 0;
                     rc = sessionMachine->GetUSBControllerCountByType(USBControllerType_OHCI, &cOhciCtrls);
-                    if (   SUCCEEDED(rc)
-                        && !cOhciCtrls)
-                    {
-                        ComPtr<IUSBController> UsbCtl;
-                        CHECK_ERROR(sessionMachine, AddUSBController(Bstr("OHCI").raw(), USBControllerType_OHCI,
-                                                              UsbCtl.asOutParam()));
+                    if (SUCCEEDED(rc)) {
+                        rc = sessionMachine->GetUSBControllerCountByType(USBControllerType_XHCI, &cXhciCtrls);
+                        if (   SUCCEEDED(rc)
+                            && cOhciCtrls + cXhciCtrls == 0)
+                        {
+                            /* If there's nothing, enable OHCI (always available). */
+                            ComPtr<IUSBController> UsbCtl;
+                            CHECK_ERROR(sessionMachine, AddUSBController(Bstr("OHCI").raw(), USBControllerType_OHCI,
+                                                                  UsbCtl.asOutParam()));
+                        }
                     }
                 }
                 break;
@@ -1968,15 +1975,20 @@ RTEXITCODE handleModifyVM(HandlerArg *a)
                 }
                 if (fEnableUsb)
                 {
-                    /* Make sure the OHCI controller is enabled. */
+                    /* Make sure either the OHCI or xHCI controller is enabled. */
                     ULONG cOhciCtrls = 0;
+                    ULONG cXhciCtrls = 0;
                     rc = sessionMachine->GetUSBControllerCountByType(USBControllerType_OHCI, &cOhciCtrls);
-                    if (   SUCCEEDED(rc)
-                        && !cOhciCtrls)
-                    {
-                        ComPtr<IUSBController> UsbCtl;
-                        CHECK_ERROR(sessionMachine, AddUSBController(Bstr("OHCI").raw(), USBControllerType_OHCI,
-                                                              UsbCtl.asOutParam()));
+                    if (SUCCEEDED(rc)) {
+                        rc = sessionMachine->GetUSBControllerCountByType(USBControllerType_XHCI, &cXhciCtrls);
+                        if (   SUCCEEDED(rc)
+                            && cOhciCtrls + cXhciCtrls == 0)
+                        {
+                            /* If there's nothing, enable OHCI (always available). */
+                            ComPtr<IUSBController> UsbCtl;
+                            CHECK_ERROR(sessionMachine, AddUSBController(Bstr("OHCI").raw(), USBControllerType_OHCI,
+                                                                  UsbCtl.asOutParam()));
+                        }
                     }
                 }
                 break;
@@ -2147,6 +2159,28 @@ RTEXITCODE handleModifyVM(HandlerArg *a)
                 break;
             }
 
+            case MODIFYVM_AUDIOCODEC:
+            {
+                ComPtr<IAudioAdapter> audioAdapter;
+                sessionMachine->COMGETTER(AudioAdapter)(audioAdapter.asOutParam());
+                ASSERT(audioAdapter);
+
+                if (!RTStrICmp(ValueUnion.psz, "sb16"))
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioCodec)(AudioCodecType_SB16));
+                else if (!RTStrICmp(ValueUnion.psz, "stac9700"))
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioCodec)(AudioCodecType_STAC9700));
+                else if (!RTStrICmp(ValueUnion.psz, "ad1980"))
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioCodec)(AudioCodecType_AD1980));
+                else if (!RTStrICmp(ValueUnion.psz, "stac9221"))
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioCodec)(AudioCodecType_STAC9221));
+                else
+                {
+                    errorArgument("Invalid --audiocodec argument '%s'", ValueUnion.psz);
+                    rc = E_FAIL;
+                }
+                break;
+            }
+
             case MODIFYVM_AUDIO:
             {
                 ComPtr<IAudioAdapter> audioAdapter;
diff --git a/src/VBox/Frontends/VBoxSDL/Framebuffer-darwin.m b/src/VBox/Frontends/VBoxSDL/Framebuffer-darwin.m
index 283b6c6..acd48a3 100644
--- a/src/VBox/Frontends/VBoxSDL/Framebuffer-darwin.m
+++ b/src/VBox/Frontends/VBoxSDL/Framebuffer-darwin.m
@@ -16,7 +16,7 @@ void *VBoxSDLGetDarwinWindowId(void)
         pMainWnd = [pApp mainWindow];
         if (!pMainWnd)
             pMainWnd = pApp->_mainWindow; /* UGLY!! but mApp->_AppFlags._active = 0, so mainWindow() fails. */
-        pView = [pMainWnd contentView]; 
+        pView = [pMainWnd contentView];
     }
     [pPool release];
     return pView;
diff --git a/src/VBox/Frontends/VBoxSDL/Framebuffer.h b/src/VBox/Frontends/VBoxSDL/Framebuffer.h
index 29d0bc0..c10efb9 100644
--- a/src/VBox/Frontends/VBoxSDL/Framebuffer.h
+++ b/src/VBox/Frontends/VBoxSDL/Framebuffer.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -76,10 +76,10 @@ public:
     STDMETHOD(COMGETTER(Height))(ULONG *height);
     STDMETHOD(COMGETTER(BitsPerPixel))(ULONG *bitsPerPixel);
     STDMETHOD(COMGETTER(BytesPerLine))(ULONG *bytesPerLine);
-    STDMETHOD(COMGETTER(PixelFormat)) (BitmapFormat_T *pixelFormat);
-    STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction);
-    STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
-    STDMETHOD(COMGETTER(WinId)) (LONG64 *winId);
+    STDMETHOD(COMGETTER(PixelFormat))(BitmapFormat_T *pixelFormat);
+    STDMETHOD(COMGETTER(HeightReduction))(ULONG *heightReduction);
+    STDMETHOD(COMGETTER(Overlay))(IFramebufferOverlay **aOverlay);
+    STDMETHOD(COMGETTER(WinId))(LONG64 *winId);
     STDMETHOD(COMGETTER(Capabilities))(ComSafeArrayOut(FramebufferCapabilities_T, aCapabilities));
 
     STDMETHOD(NotifyUpdate)(ULONG x, ULONG y, ULONG w, ULONG h);
@@ -222,11 +222,11 @@ public:
 #ifdef RT_OS_WINDOWS
     STDMETHOD_(ULONG, AddRef)()
     {
-        return ::InterlockedIncrement (&refcnt);
+        return ::InterlockedIncrement(&refcnt);
     }
     STDMETHOD_(ULONG, Release)()
     {
-        long cnt = ::InterlockedDecrement (&refcnt);
+        long cnt = ::InterlockedDecrement(&refcnt);
         if (cnt == 0)
             delete this;
         return cnt;
@@ -249,11 +249,11 @@ public:
 
     /* These are not used, or return standard values. */
     STDMETHOD(COMGETTER(BitsPerPixel))(ULONG *bitsPerPixel);
-    STDMETHOD(COMGETTER(PixelFormat)) (ULONG *pixelFormat);
-    STDMETHOD(COMGETTER(UsesGuestVRAM)) (BOOL *usesGuestVRAM);
-    STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction);
-    STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);
-    STDMETHOD(COMGETTER(WinId)) (LONG64 *winId);
+    STDMETHOD(COMGETTER(PixelFormat))(ULONG *pixelFormat);
+    STDMETHOD(COMGETTER(UsesGuestVRAM))(BOOL *usesGuestVRAM);
+    STDMETHOD(COMGETTER(HeightReduction))(ULONG *heightReduction);
+    STDMETHOD(COMGETTER(Overlay))(IFramebufferOverlay **aOverlay);
+    STDMETHOD(COMGETTER(WinId))(LONG64 *winId);
 
     STDMETHOD(Lock)();
     STDMETHOD(Unlock)();
diff --git a/src/VBox/Frontends/VBoxSDL/Makefile.kmk b/src/VBox/Frontends/VBoxSDL/Makefile.kmk
index cd083e9..78342a3 100644
--- a/src/VBox/Frontends/VBoxSDL/Makefile.kmk
+++ b/src/VBox/Frontends/VBoxSDL/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m b/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m
index 6383e7c..36a1e25 100644
--- a/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m
+++ b/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m
@@ -19,21 +19,21 @@
 @end
 
 /* Use this flag to determine whether we use SDLMain.nib or not */
-#define		SDL_USE_NIB_FILE	0
+#define         SDL_USE_NIB_FILE        0
 
 /* Use this flag to determine whether we use CPS (docking) or not */
-#define		SDL_USE_CPS		1
+#define         SDL_USE_CPS             1
 #ifdef SDL_USE_CPS
 /* Portions of CPS.h */
 typedef struct CPSProcessSerNum
 {
-	UInt32		lo;
-	UInt32		hi;
+        UInt32          lo;
+        UInt32          hi;
 } CPSProcessSerNum;
 
-extern OSErr	CPSGetCurrentProcess( CPSProcessSerNum *psn);
-extern OSErr 	CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
-extern OSErr	CPSSetFrontProcess( CPSProcessSerNum *psn);
+extern OSErr    CPSGetCurrentProcess( CPSProcessSerNum *psn);
+extern OSErr    CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
+extern OSErr    CPSSetFrontProcess( CPSProcessSerNum *psn);
 
 #endif /* SDL_USE_CPS */
 
@@ -88,15 +88,15 @@ static NSString *getApplicationName(void)
     if (shouldChdir)
     {
         char parentdir[MAXPATHLEN];
-		CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
-		CFURLRef url2 = CFURLCreateCopyDeletingLastPathComponent(0, url);
-		if (CFURLGetFileSystemRepresentation(url2, true, (UInt8 *)parentdir, MAXPATHLEN)) {
-	        int rc = chdir(parentdir);   /* chdir to the binary app's parent */
-	        Assert(rc == 0);
-		}
-		CFRelease(url);
-		CFRelease(url2);
-	}
+                CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
+                CFURLRef url2 = CFURLCreateCopyDeletingLastPathComponent(0, url);
+                if (CFURLGetFileSystemRepresentation(url2, true, (UInt8 *)parentdir, MAXPATHLEN)) {
+                int rc = chdir(parentdir);   /* chdir to the binary app's parent */
+                Assert(rc == 0);
+                }
+                CFRelease(url);
+                CFRelease(url2);
+        }
 
 }
 
@@ -201,8 +201,8 @@ static void setupWindowMenu(void)
 /* Replacement for NSApplicationMain */
 static void CustomApplicationMain (int argc, char **argv)
 {
-    NSAutoreleasePool	*pool = [[NSAutoreleasePool alloc] init];
-    SDLMain				*sdlMain;
+    NSAutoreleasePool   *pool = [[NSAutoreleasePool alloc] init];
+    SDLMain                             *sdlMain;
 
     /* Ensure the application object is initialised */
     [SDLApplication sharedApplication];
diff --git a/src/VBox/Frontends/VBoxShell/Makefile.kmk b/src/VBox/Frontends/VBoxShell/Makefile.kmk
index 497b426..2fa8141 100644
--- a/src/VBox/Frontends/VBoxShell/Makefile.kmk
+++ b/src/VBox/Frontends/VBoxShell/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
index b5d6c0e..a232ac6 100644
--- a/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
+++ b/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
@@ -279,5 +279,6 @@
         <file alias="os_turbolinux_64.png">images/os_turbolinux_64.png</file>
         <file alias="os_type_16px.png">images/os_type_16px.png</file>
         <file alias="os_ubuntu.png">images/os_ubuntu.png</file>
+        <file alias="os_ubuntu_64.png">images/os_ubuntu_64.png</file>
     </qresource>
 </RCC>
diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox1_hidpi.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox1_hidpi.qrc
index 3755b73..931bb30 100644
--- a/src/VBox/Frontends/VirtualBox/VirtualBox1_hidpi.qrc
+++ b/src/VBox/Frontends/VirtualBox/VirtualBox1_hidpi.qrc
@@ -271,5 +271,6 @@
         <file alias="os_os2warp4_hidpi.png">images/hidpi/os_os2warp4_hidpi.png</file>
         <file alias="os_other_64_hidpi.png">images/hidpi/os_other_64_hidpi.png</file>
         <file alias="os_other_hidpi.png">images/hidpi/os_other_hidpi.png</file>
+        <file alias="os_qnx_hidpi.png">images/hidpi/os_qnx_hidpi.png</file>
     </qresource>
 </RCC>
diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
index fefe756..a6ed66a 100644
--- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
+++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="os_ubuntu_64.png">images/os_ubuntu_64.png</file>
         <file alias="os_win10.png">images/os_win10.png</file>
         <file alias="os_win10_64.png">images/os_win10_64.png</file>
         <file alias="os_win2k.png">images/os_win2k.png</file>
@@ -253,6 +252,8 @@
         <file alias="vm_start_32px.png">images/vm_start_32px.png</file>
         <file alias="vm_start_disabled_16px.png">images/vm_start_disabled_16px.png</file>
         <file alias="vm_start_disabled_32px.png">images/vm_start_disabled_32px.png</file>
+        <file alias="vm_start_headless_16px.png">images/vm_start_headless_16px.png</file>
+        <file alias="vm_start_separate_16px.png">images/vm_start_separate_16px.png</file>
         <file alias="vmw_clone.png">images/vmw_clone.png</file>
         <file alias="vmw_clone_bg.png">images/vmw_clone_bg.png</file>
         <file alias="vmw_first_run.png">images/vmw_first_run.png</file>
diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc
index 3c22848..d7da406 100644
--- a/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc
+++ b/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="os_qnx_hidpi.png">images/hidpi/os_qnx_hidpi.png</file>
         <file alias="os_redhat_64_hidpi.png">images/hidpi/os_redhat_64_hidpi.png</file>
         <file alias="os_redhat_hidpi.png">images/hidpi/os_redhat_hidpi.png</file>
         <file alias="os_solaris_64_hidpi.png">images/hidpi/os_solaris_64_hidpi.png</file>
@@ -261,6 +260,8 @@
         <file alias="vm_start_32px_hidpi.png">images/hidpi/vm_start_32px_hidpi.png</file>
         <file alias="vm_start_disabled_16px_hidpi.png">images/hidpi/vm_start_disabled_16px_hidpi.png</file>
         <file alias="vm_start_disabled_32px_hidpi.png">images/hidpi/vm_start_disabled_32px_hidpi.png</file>
+        <file alias="vm_start_headless_16px_hidpi.png">images/hidpi/vm_start_headless_16px_hidpi.png</file>
+        <file alias="vm_start_separate_16px_hidpi.png">images/hidpi/vm_start_separate_16px_hidpi.png</file>
         <file alias="vrdp_16px_hidpi.png">images/hidpi/vrdp_16px_hidpi.png</file>
         <file alias="vrdp_24px_hidpi.png">images/hidpi/vrdp_24px_hidpi.png</file>
         <file alias="vrdp_32px_hidpi.png">images/hidpi/vrdp_32px_hidpi.png</file>
diff --git a/src/VBox/Frontends/VirtualBox/images/OSE/about.png b/src/VBox/Frontends/VirtualBox/images/OSE/about.png
index ad8061b..a742d38 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/OSE/about.png and b/src/VBox/Frontends/VirtualBox/images/OSE/about.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/OSE/about_hidpi.png b/src/VBox/Frontends/VirtualBox/images/OSE/about_hidpi.png
new file mode 100644
index 0000000..b671a28
Binary files /dev/null and b/src/VBox/Frontends/VirtualBox/images/OSE/about_hidpi.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_16px_hidpi.png b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_16px_hidpi.png
index bfff018..f78e368 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_16px_hidpi.png and b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_16px_hidpi.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_24px_hidpi.png b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_24px_hidpi.png
index 48a9a85..7d84adc 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_24px_hidpi.png and b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_24px_hidpi.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_32px_hidpi.png b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_32px_hidpi.png
index 46674c5..4284fe1 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_32px_hidpi.png and b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_32px_hidpi.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_captured_16px_hidpi.png b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_captured_16px_hidpi.png
index d6bc427..036da6b 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_captured_16px_hidpi.png and b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_captured_16px_hidpi.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_captured_pressed_16px_hidpi.png b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_captured_pressed_16px_hidpi.png
index da0c0e7..b289c2c 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_captured_pressed_16px_hidpi.png and b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_captured_pressed_16px_hidpi.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_pressed_16px_hidpi.png b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_pressed_16px_hidpi.png
index ba71a0c..24fb826 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_pressed_16px_hidpi.png and b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_pressed_16px_hidpi.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_warning_16px_hidpi.png b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_warning_16px_hidpi.png
index 475d116..43b91af 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_warning_16px_hidpi.png and b/src/VBox/Frontends/VirtualBox/images/hidpi/hostkey_warning_16px_hidpi.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hidpi/vm_start_headless_16px_hidpi.png b/src/VBox/Frontends/VirtualBox/images/hidpi/vm_start_headless_16px_hidpi.png
new file mode 100644
index 0000000..81b1df4
Binary files /dev/null and b/src/VBox/Frontends/VirtualBox/images/hidpi/vm_start_headless_16px_hidpi.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hidpi/vm_start_separate_16px_hidpi.png b/src/VBox/Frontends/VirtualBox/images/hidpi/vm_start_separate_16px_hidpi.png
new file mode 100644
index 0000000..e49aba3
Binary files /dev/null and b/src/VBox/Frontends/VirtualBox/images/hidpi/vm_start_separate_16px_hidpi.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hostkey_16px.png b/src/VBox/Frontends/VirtualBox/images/hostkey_16px.png
index 3243290..c6bc479 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hostkey_16px.png and b/src/VBox/Frontends/VirtualBox/images/hostkey_16px.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hostkey_24px.png b/src/VBox/Frontends/VirtualBox/images/hostkey_24px.png
index 9e7cfbf..3f343ba 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hostkey_24px.png and b/src/VBox/Frontends/VirtualBox/images/hostkey_24px.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hostkey_32px.png b/src/VBox/Frontends/VirtualBox/images/hostkey_32px.png
index 1a27a6f..523ec72 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hostkey_32px.png and b/src/VBox/Frontends/VirtualBox/images/hostkey_32px.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hostkey_captured_16px.png b/src/VBox/Frontends/VirtualBox/images/hostkey_captured_16px.png
index b37efb0..d2b98cc 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hostkey_captured_16px.png and b/src/VBox/Frontends/VirtualBox/images/hostkey_captured_16px.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hostkey_captured_pressed_16px.png b/src/VBox/Frontends/VirtualBox/images/hostkey_captured_pressed_16px.png
index 33dd0e2..02dc293 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hostkey_captured_pressed_16px.png and b/src/VBox/Frontends/VirtualBox/images/hostkey_captured_pressed_16px.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hostkey_pressed_16px.png b/src/VBox/Frontends/VirtualBox/images/hostkey_pressed_16px.png
index 0117e74..785bba0 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hostkey_pressed_16px.png and b/src/VBox/Frontends/VirtualBox/images/hostkey_pressed_16px.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/hostkey_warning_16px.png b/src/VBox/Frontends/VirtualBox/images/hostkey_warning_16px.png
index b8d5d45..dbae24b 100644
Binary files a/src/VBox/Frontends/VirtualBox/images/hostkey_warning_16px.png and b/src/VBox/Frontends/VirtualBox/images/hostkey_warning_16px.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/vm_start_headless_16px.png b/src/VBox/Frontends/VirtualBox/images/vm_start_headless_16px.png
new file mode 100644
index 0000000..4d31ac3
Binary files /dev/null and b/src/VBox/Frontends/VirtualBox/images/vm_start_headless_16px.png differ
diff --git a/src/VBox/Frontends/VirtualBox/images/vm_start_separate_16px.png b/src/VBox/Frontends/VirtualBox/images/vm_start_separate_16px.png
new file mode 100644
index 0000000..da196c7
Binary files /dev/null and b/src/VBox/Frontends/VirtualBox/images/vm_start_separate_16px.png differ
diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
index 9c43eaf..36c6e91 100644
--- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
+++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
index ddcae26..2c35f93 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
@@ -1198,11 +1198,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1214,23 +1214,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1247,7 +1247,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1255,11 +1255,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1267,7 +1267,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1334,7 +1334,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1342,7 +1342,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1370,11 +1370,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1386,11 +1386,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1398,7 +1398,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1442,15 +1442,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3315,9 +3315,9 @@ p, li { white-space: pre-wrap; </style></head><body style="
         <translation>Основен драйвер, '%1'</translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>Основен драйвер, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation type="unfinished">Основен драйвер, '%1' { %2 }</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -4540,7 +4540,7 @@ p, li { white-space: pre-wrap; </style></head><body style="
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7422,10 +7422,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Image</source>
         <comment>storage image</comment>
         <translation type="unfinished">Изображение</translation>
@@ -7475,13 +7471,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsSystem</name>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
index e480be1..91d2bad 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
@@ -363,8 +363,8 @@
         <translation type="obsolete">D&iàleg informatiu de la sessió</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
-        <translation type="obsolete">Mostra el diàleg informatiu de la sessió</translation>
+        <source>Show Session Information Window</source>
+        <translation type="obsolete">Mostra el diàleg d'informació de la sessió</translation>
     </message>
     <message>
         <source>&Pause</source>
@@ -455,12 +455,12 @@
         <translation type="obsolete">Habilita o inhabilita les connexions d'escriptori remot (RDP) a aquesta màquina</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Instal·la les Guest Additions...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation>&Insereix la imatge de CD de les Guest Additions...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
-        <translation type="obsolete">Munta la imatge d'instal·lació de les Guest Additions</translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <translation type="obsolete">Insereix el fitxer de disc de les Guest Additions al dispositiu virtual</translation>
     </message>
     <message>
         <source>De&bug</source>
@@ -479,7 +479,7 @@
     <message>
         <source>&Logging...</source>
         <comment>debug action</comment>
-        <translation type="obsolete">&S'està connectant...</translation>
+        <translation type="obsolete">&S'està afegint al registre...</translation>
     </message>
     <message>
         <source>&Help</source>
@@ -951,120 +951,122 @@
         <translation type="obsolete">Arrosega i deixa anar</translation>
     </message>
     <message>
+        <source>Save the machine state of the virtual machine</source>
+        <translation type="obsolete">Desa l'estat de la màquina virtual</translation>
+    </message>
+    <message>
         <source>Power off the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Apaga la màquina virtual</translation>
     </message>
     <message>
         <source>&Network Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Paràmetres de xarxa...</translation>
     </message>
     <message>
         <source>&Shared Folders Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Paràmetre&s de carpeta compartida...</translation>
     </message>
     <message>
         <source>R&emote Display</source>
-        <translation type="unfinished"></translation>
+        <translation>&Pantalla remota</translation>
+    </message>
+    <message>
+        <source>Toggle remote desktop (RDP) connections to this machine</source>
+        <translation type="obsolete">Intercanvia les connexions d'escriptori remotes (RDP) a aquesta màquina</translation>
     </message>
     <message>
         <source>&Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Captura de &vídeo</translation>
+    </message>
+    <message>
+        <source>Toggle video capture</source>
+        <translation type="obsolete">Intercanvia la captura de vídeo</translation>
     </message>
     <message>
         <source>&Video Capture Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Paràmetres de la captura de &vídeo...</translation>
     </message>
     <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
+        <source>Configure video capture settings</source>
+        <translation type="obsolete">Configureu els paràmetres de la captura de vídeo</translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
+        <source>Popup Menu</source>
+        <translation>Menú emergent</translation>
     </message>
     <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">&Instal·la les Guest Additions...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Munta la imatge d'instal·lació de les Guest Additions</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&Webcams</source>
+        <translation>Càmeres &web</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Xarxa</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Fitxer</translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="unfinished">&Teclat</translation>
-    </message>
-    <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Xarxa</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Preferències...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Mostra el &registre...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Fitxer</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1080,175 +1082,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Preferències...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <source>&Keyboard</source>
+        <translation type="unfinished">&Teclat</translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <source>&Hard Disks</source>
+        <translation type="unfinished">&Discos durs</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="unfinished">&Discos durs</translation>
+        <source>&USB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Mostra el &registre...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1287,10 +1289,18 @@
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha connectat cap càmera web</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
+        <translation type="unfinished">No hi ha cap càmera web compatible connecatada a l'ordinador amfitrió</translation>
+    </message>
+    <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1310,7 +1320,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1318,7 +1328,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1342,15 +1352,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1362,11 +1384,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1374,7 +1396,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1418,15 +1440,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1435,34 +1457,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Habilita</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1486,6 +1482,19 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -3259,7 +3268,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
         <comment>details (network)</comment>
-        <translation>Mòdul genèric, «%1» {&nbsp;%2&nbsp;}</translation>
+        <translation type="obsolete">Mòdul genèric, «%1» {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -3279,31 +3288,31 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Video Capture File</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Fitxer de captura de vídeo</translation>
     </message>
     <message>
         <source>Video Capture Attributes</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Atributs de captura de vídeo</translation>
     </message>
     <message>
         <source>Video Capture</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Captura de vídeo</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Desactivat</translation>
     </message>
     <message>
         <source>NAT Network, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Xarxa NAT, «%1»</translation>
     </message>
     <message>
         <source>Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>Mida del marc: %1x%2, Marcs per segon: %3fps, Bits per segon: %4kbps</translation>
     </message>
     <message>
         <source>Minimal Paravirtualization</source>
@@ -3321,83 +3330,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>[Optical Drive]</source>
         <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>USB Controller</source>
         <comment>details (usb)</comment>
         <translation type="unfinished">Controlador USB</translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>Status-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Menu-bar</source>
+        <source>Mini-toolbar Position</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
+        <source>Mini-toolbar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3720,7 +3734,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Extension Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Paquets d'&extensió</translation>
     </message>
     <message>
         <source>Add Package</source>
@@ -3798,8 +3812,28 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Inhabilita el protector de pantalla de l'a&mfitrió</translation>
     </message>
     <message>
+        <source>&Dock and Menubar:</source>
+        <translation type="obsolete">&Acoblador i barra de menú:</translation>
+    </message>
+    <message>
+        <source>Auto-Show in Fullscreen</source>
+        <translation type="obsolete">Mostra automàticament en pantalla completa</translation>
+    </message>
+    <message>
+        <source>When checked, the host dock and menu bar will be shown when the virtual machine is in fullscreen mode.</source>
+        <translation type="obsolete">Quan estigui actiu, l'acoblador de l'amfitrió i la barra de menú es mostraran quan la màquina virtual es trobi en mode de pantalla completa.</translation>
+    </message>
+    <message>
+        <source>&Host Screensaver:</source>
+        <translation type="obsolete">Estalvi de pantalla de l'&amfitrió:</translation>
+    </message>
+    <message>
         <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
-        <translation type="unfinished"></translation>
+        <translation>Quan estigui actiu, l'estalvi de pantalla de l'amfitrió es desactivarà quan la màquina virtual s'estigui executant.</translation>
+    </message>
+    <message>
+        <source>Disable When Running Virtual Machines</source>
+        <translation type="obsolete">Desactiva quan s'estiguin executant màquines virtuals</translation>
     </message>
     <message>
         <source>Host Screensaver:</source>
@@ -3846,19 +3880,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Host Key Combination</source>
-        <translation type="unfinished"></translation>
+        <translation>Combinació de tecla d'amfitrió</translation>
     </message>
     <message>
         <source>Some items have the same shortcuts assigned.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alguns elements tenen les mateixes dreceres assignades.</translation>
     </message>
     <message>
         <source>&VirtualBox Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestor del &VirtualBox</translation>
     </message>
     <message>
         <source>Virtual &Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>&Màquina virtual</translation>
+    </message>
+    <message>
+        <source>Lists all the available shortcuts which can be configured.</source>
+        <translation type="obsolete">Mostra totes les dreceres disponibles que poden configurar-se.</translation>
+    </message>
+    <message>
+        <source>Enter a sequence to filter the shortcut list.</source>
+        <translation type="obsolete">Introduïu una seqüència per filtrar el llistat de dreceres.</translation>
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
@@ -3925,7 +3967,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Interface Languages</source>
-        <translation type="unfinished"></translation>
+        <translation>Llengües de la &interfície</translation>
     </message>
 </context>
 <context>
@@ -4082,116 +4124,128 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&NAT Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>Xarxes &NAT</translation>
     </message>
     <message>
         <source>Lists all available NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra totes les xarxes NAT disponibles.</translation>
     </message>
     <message>
         <source>&Host-only Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>Xarxes de &només amfitrió</translation>
     </message>
     <message>
         <source>No new name specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha proveït un nom nou per a la xarxa NAT que abans s'anomenava <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha proveït un CIDR per a la xarxa NAT <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha proveït un CIDR per a la xarxa NAT que abans s'anomenava <b>%1</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>S'ha proveït un CIDR no vàlid (<i>%1</i>) per a la xarxa NAT <b>%2</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>S'ha proveït un CIDR no vàlid (<i>%1</i>) per a la xarxa NAT abans anomenada <b>%2</b>.</translation>
     </message>
     <message>
         <source>Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom de la xarxa</translation>
     </message>
     <message>
         <source>[empty]</source>
-        <translation type="unfinished"></translation>
+        <translation>[buit]</translation>
     </message>
     <message>
         <source>%1 (renamed from %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (reanomenat des de %2)</translation>
     </message>
     <message>
         <source>Old Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom antic de la xarxa</translation>
     </message>
     <message>
         <source>New Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom nou de la xarxa</translation>
     </message>
     <message>
         <source>Network CIDR</source>
-        <translation type="unfinished"></translation>
+        <translation>CIDR de la xarxa</translation>
     </message>
     <message>
         <source>Supports DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Compatible amb DHCP</translation>
     </message>
     <message>
         <source>yes</source>
-        <translation type="unfinished"></translation>
+        <translation>sí</translation>
     </message>
     <message>
         <source>no</source>
-        <translation type="unfinished"></translation>
+        <translation>no</translation>
     </message>
     <message>
         <source>Supports IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Compatible amb IPv6</translation>
     </message>
     <message>
         <source>Default IPv6 route</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruta IPv6 per defecte</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una adreça IPv4 vàlida.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 network mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una màscara de xarxa IPv4 vàlida.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv6 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una adreça IPv6 vàlida.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment un servidor d'adreça DHCP vàlida.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una màscara de xarxa DHCP vàlida.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server lower address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una límit d'adreça inferior vàlida del servidor DHCP.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server upper address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una límit d'adreça superior vàlida del servidor DHCP.</translation>
     </message>
     <message>
         <source>The name <b>%1</b> is being used for several NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja s'està utilitzant el nom <b>%1</b> per a algunes xarxes NAT.</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>NAT network</comment>
-        <translation type="unfinished">Actiu</translation>
+        <translation>Activa</translation>
+    </message>
+    <message>
+        <source>&Add NAT network</source>
+        <translation type="obsolete">&Afegeix una xarxa NAT</translation>
+    </message>
+    <message>
+        <source>&Remove NAT network</source>
+        <translation type="obsolete">&Suprimeix una xarxa NAT</translation>
+    </message>
+    <message>
+        <source>&Edit NAT network</source>
+        <translation type="obsolete">&Edita una xarxa NAT</translation>
     </message>
     <message>
         <source>Add NAT Network</source>
@@ -4341,15 +4395,15 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsNetworkDetailsHost</name>
     <message>
         <source>Host-only Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalls de xarxa de només l'amfitrió</translation>
     </message>
     <message>
         <source>&Adapter</source>
-        <translation type="unfinished">&Adaptador</translation>
+        <translation>&Adaptador</translation>
     </message>
     <message>
         <source>Manual &Configuration</source>
-        <translation type="unfinished">&Configuració manual</translation>
+        <translation>&Configuració manual</translation>
     </message>
     <message>
         <source>Use manual configuration for this host-only network adapter.</source>
@@ -4357,43 +4411,43 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&IPv4 Address:</source>
-        <translation type="unfinished">Adreça &IPv4:</translation>
+        <translation>Adreça &IPv4:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 address for this adapter.</source>
-        <translation type="unfinished">Mostra l'adreça IPv4 de l'amfitrió d'aquest adaptador.</translation>
+        <translation>Gestiona l'adreça IPv4 de l'amfitrió d'aquest adaptador.</translation>
     </message>
     <message>
         <source>IPv4 Network &Mask:</source>
-        <translation type="unfinished">&Màscara de xarxa IPv4:</translation>
+        <translation>&Màscara de xarxa IPv4:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 network mask for this adapter.</source>
-        <translation type="unfinished">Mostra la màscara de xarxa IPv4 de l'amfitrió d'aquest adaptador.</translation>
+        <translation>Mostra la màscara de xarxa IPv4 de l'amfitrió d'aquest adaptador.</translation>
     </message>
     <message>
         <source>I&Pv6 Address:</source>
-        <translation type="unfinished">Adreça I&Pv6:</translation>
+        <translation>Adreça I&Pv6:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Mostra l'adreça IPv6 de l'amfitrió d'aquest adaptador si IPv6 està suportat.</translation>
+        <translation>Gestiona l'adreça IPv6 de l'amfitrió d'aquest adaptador si IPv6 està suportat.</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &Length:</source>
-        <translation type="unfinished">&Longitud de la màscara de xarxa IPv6:</translation>
+        <translation>&Longitud de la màscara de xarxa IPv6:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Mostra la longitud de l'adreça de la màscara de xarxa IPv6 de l'amfitrió per a aquest adaptador si IPv6 està suportat.</translation>
+        <translation>Gestiona la longitud de l'adreça de la màscara de xarxa IPv6 de l'amfitrió per a aquest adaptador si IPv6 està suportat.</translation>
     </message>
     <message>
         <source>&DHCP Server</source>
-        <translation type="unfinished">Servidor &DHCP</translation>
+        <translation>Servidor &DHCP</translation>
     </message>
     <message>
         <source>&Enable Server</source>
-        <translation type="unfinished">&Habilita el servidor</translation>
+        <translation>&Habilita el servidor</translation>
     </message>
     <message>
         <source>Indicates whether the DHCP Server is enabled on machine startup or not.</source>
@@ -4401,42 +4455,42 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Server Add&ress:</source>
-        <translation type="unfinished">Ad&reça del servidor:</translation>
+        <translation>Ad&reça del servidor:</translation>
     </message>
     <message>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Mostra l'adreça del servidor DHCP de la xarxa associada a aquest adaptador de només l'amfitrió.</translation>
+        <translation>Gestiona l'adreça del servidor DHCP de la xarxa associada a aquest adaptador de només l'amfitrió.</translation>
     </message>
     <message>
         <source>Server &Mask:</source>
-        <translation type="unfinished">&Màscara del servidor:</translation>
+        <translation>&Màscara del servidor:</translation>
     </message>
     <message>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Mostra la màscara de xarxa del servidor DHCP de la xarxa associada a aquest adaptador de només l'amfitrió.</translation>
+        <translation>Gestiona la màscara de xarxa del servidor DHCP de la xarxa associada a aquest adaptador de només l'amfitrió.</translation>
     </message>
     <message>
         <source>&Lower Address Bound:</source>
-        <translation type="unfinished">Adreça límit &inferior:</translation>
+        <translation>Adreça límit &inferior:</translation>
     </message>
     <message>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Mostra l'adreça límit inferior oferida pel servidor DHCP de la xarxa associada aquet adaptador de només l'amfitrió.</translation>
+        <translation>Gestiona l'adreça límit inferior oferida pel servidor DHCP de la xarxa associada aquet adaptador de només l'amfitrió.</translation>
     </message>
     <message>
         <source>&Upper Address Bound:</source>
-        <translation type="unfinished">Adreça límit &superior:</translation>
+        <translation>Adreça límit &superior:</translation>
     </message>
     <message>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Mostra l'adreça límit superior oferida pel servidor DHCP de la xarxa associada a aquest adaptador de només l'amfitrió.</translation>
+        <translation>Gestiona l'adreça límit superior oferida pel servidor DHCP de la xarxa associada a aquest adaptador de només l'amfitrió.</translation>
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4444,43 +4498,59 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsNetworkDetailsNAT</name>
     <message>
         <source>NAT Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalls de la xarxa NAT</translation>
     </message>
     <message>
         <source>&Enable Network</source>
-        <translation type="unfinished"></translation>
+        <translation>&Activa la xarxa</translation>
+    </message>
+    <message>
+        <source>Enable this NAT network.</source>
+        <translation type="obsolete">Activa aquesta xarxa NAT.</translation>
     </message>
     <message>
         <source>Network &Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Nom de la Xarxa:</translation>
     </message>
     <message>
         <source>Holds the name for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestiona el nom per aquesta xarxa.</translation>
     </message>
     <message>
         <source>Network &CIDR:</source>
-        <translation type="unfinished"></translation>
+        <translation>Xarxa &CIDR:</translation>
     </message>
     <message>
         <source>Holds the CIDR for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestiona el CIDR per aquesta xarxa.</translation>
     </message>
     <message>
         <source>Network Options:</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcions de xarxa:</translation>
     </message>
     <message>
         <source>Supports &DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Compatible amb &DHCP</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports DHCP.</source>
+        <translation type="obsolete">Determina si la xarxa és compatible amb DHCP.</translation>
     </message>
     <message>
         <source>Supports &IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Compatible amb &IPv6</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports IPv6.</source>
+        <translation type="obsolete">Determina si la xarxa és compatible amb IPv6.</translation>
     </message>
     <message>
         <source>Advertise Default IPv6 &Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Publicita com a &camí IPv6 per defecte</translation>
+    </message>
+    <message>
+        <source>Determines whether this network should be advertised as the default IPv6 route.</source>
+        <translation type="obsolete">Determina si aquesta xarxa s'hauria de publicitar com a un camí IPv6 per defecte.</translation>
     </message>
     <message>
         <source>Opens a window to manage port forwarding rules.</source>
@@ -4488,7 +4558,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Port Forwarding</source>
-        <translation type="unfinished">Reenviament de &ports</translation>
+        <translation>Reenviament de &ports</translation>
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
@@ -4515,15 +4585,15 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsPortForwardingDlg</name>
     <message>
         <source>Port Forwarding Rules</source>
-        <translation type="unfinished">Regles de redireccionament de ports</translation>
+        <translation>Regles de redireccionament de ports</translation>
     </message>
     <message>
         <source>IPv4</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4</translation>
     </message>
     <message>
         <source>IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6</translation>
     </message>
 </context>
 <context>
@@ -4578,11 +4648,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No proxy host is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha proveït cap servidor intermediari d'amfitrió.</translation>
     </message>
     <message>
         <source>No proxy port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha proveït cap port de servidor intermediari.</translation>
     </message>
     <message>
         <source>Holds the proxy host.</source>
@@ -4659,71 +4729,71 @@ p, li { white-space: pre-wrap; }
     <name>UIHostComboEditor</name>
     <message>
         <source><key_%1></source>
-        <translation type="unfinished"><key_%1></translation>
+        <translation><key_%1></translation>
     </message>
     <message>
         <source>Left </source>
-        <translation type="unfinished">Esquerra</translation>
+        <translation>Esquerra</translation>
     </message>
     <message>
         <source>Right </source>
-        <translation type="unfinished">Dreta</translation>
+        <translation>Dreta</translation>
     </message>
     <message>
         <source>Left Shift</source>
-        <translation type="unfinished">Tecla de majúscules esquerra</translation>
+        <translation>Tecla de majúscules esquerra</translation>
     </message>
     <message>
         <source>Right Shift</source>
-        <translation type="unfinished">Tecla de majúscules dreta</translation>
+        <translation>Tecla de majúscules dreta</translation>
     </message>
     <message>
         <source>Left Ctrl</source>
-        <translation type="unfinished">Control esquerra</translation>
+        <translation>Control esquerra</translation>
     </message>
     <message>
         <source>Right Ctrl</source>
-        <translation type="unfinished">Control dreta</translation>
+        <translation>Control dreta</translation>
     </message>
     <message>
         <source>Left Alt</source>
-        <translation type="unfinished">Alt esquerra</translation>
+        <translation>Alt esquerra</translation>
     </message>
     <message>
         <source>Right Alt</source>
-        <translation type="unfinished">Alt dreta</translation>
+        <translation>Alt dreta</translation>
     </message>
     <message>
         <source>Left WinKey</source>
-        <translation type="unfinished">Tecla de Windows esquerra</translation>
+        <translation>Tecla de Windows esquerra</translation>
     </message>
     <message>
         <source>Right WinKey</source>
-        <translation type="unfinished">Tecla de Windows dreta</translation>
+        <translation>Tecla de Windows dreta</translation>
     </message>
     <message>
         <source>Menu key</source>
-        <translation type="unfinished">Tecla de menú</translation>
+        <translation>Tecla de menú</translation>
     </message>
     <message>
         <source>Alt Gr</source>
-        <translation type="unfinished">Alt Gr</translation>
+        <translation>Alt Gr</translation>
     </message>
     <message>
         <source>Caps Lock</source>
-        <translation type="unfinished">Bloq Majús</translation>
+        <translation>Bloq Majús</translation>
     </message>
     <message>
         <source>Scroll Lock</source>
-        <translation type="unfinished">Bloq Despl</translation>
+        <translation>Bloq Despl</translation>
     </message>
     <message>
         <source>Host+</source>
-        <translation type="unfinished"></translation>
+        <translation>Tecla amfitrió+</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished">Cap</translation>
+        <translation>Cap</translation>
     </message>
 </context>
 <context>
@@ -4910,22 +4980,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Reset shortcut to default</source>
-        <translation type="unfinished"></translation>
+        <translation>Reinicia la drecera al valor per defecte</translation>
     </message>
     <message>
         <source>Unset shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Desconfigura la drecera</translation>
     </message>
 </context>
 <context>
     <name>UIHotKeyTableModel</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Nom</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Drecera</translation>
     </message>
 </context>
 <context>
@@ -5164,23 +5234,24 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Indica l'activitat de captura de vídeo:</nobr><br>%1</translation>
     </message>
     <message>
         <source><nobr><b>Video capture disabled</b></nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>S'ha desactivat la captura de vídeo</b></nobr></translation>
     </message>
     <message>
         <source><nobr><b>Video capture file:</b> %1</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Fitxer de captura de vídeo:</b> %1</nobr></translation>
     </message>
     <message>
         <source>Additional feature status:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="unfinished"></translation>
+        <translation>Estat de característica addicional:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5194,8 +5265,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5272,6 +5342,14 @@ p, li { white-space: pre-wrap; }
         <source>Select a filename for the screenshot ...</source>
         <translation>Seleccioneu un nom de fitxer per a la captura...</translation>
     </message>
+    <message>
+        <source>No Webcams Connected</source>
+        <translation type="obsolete">No s'ha connectat cap càmera web</translation>
+    </message>
+    <message>
+        <source>No supported webcams connected to the host PC</source>
+        <translation type="obsolete">No hi ha cap càmera web compatible connecatada a l'ordinador amfitrió</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsAudio</name>
@@ -5432,122 +5510,130 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Video &Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Captura de &vídeo</translation>
     </message>
     <message>
         <source>When checked, VirtualBox will record the virtual machine session as a video file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Quan estigui marcat, el VirtualBox enregistrarà la sessió a la màquina virtual en un fitxer de vídeo.</translation>
     </message>
     <message>
         <source>&Enable Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>&Activa la captura de vídeo</translation>
     </message>
     <message>
         <source>File &Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Camí al fitxer:</translation>
+    </message>
+    <message>
+        <source>This setting determines the filename VirtualBox uses to save the recorded content.</source>
+        <translation type="obsolete">Aquest paràmetre determina el nom de fitxer que el VirtualBox utilitza per desar el contingut enregistrat.</translation>
     </message>
     <message>
         <source>Frame &Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mida del &marc:</translation>
+    </message>
+    <message>
+        <source>This setting determines the resolution (frame size) of the recorded video.</source>
+        <translation type="obsolete">Aquest paràmetre determina la resolució (mida del marc) del vídeo enregistrat.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
+        <translation type="obsolete">Aquest paràmetre determina la resolució <b>horitzontal</b> (amplada del marc) del vídeo enregistrat.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>vertical</b> resolution (frame height) of the recorded video.</source>
+        <translation type="obsolete">Aquest paràmetre determina la resolució <b>vertical</b> (alçada del marc) del vídeo enregistrat.</translation>
     </message>
     <message>
         <source>&Frame Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Marcs per segon:</translation>
+    </message>
+    <message>
+        <source>This setting determines the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
+        <translation type="obsolete">Aquest paràmetre determina el nombre màxim de <b>marcs per segon</b>. Els marcs addicionals s'ignoraran. En reduir aquest valor s'incrementarà el nombre de marcs que s'ignoraran i reduirà la mida del fitxer.</translation>
     </message>
     <message>
         <source>&Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Qualitat:</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Aquest paràmetre determina la <b>qualitat</b>. En incrementar-lo farà que el vídeo es vegi millor però amb una mida de fitxer més gran.</translation>
+    </message>
+    <message>
+        <source>This setting determines the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Aquest paràmetre determina la taxa de bits en <b>kilobits per segon</b>. En incrementar-lo farà que el vídeo es vegi millor però amb una mida de fitxer més gran.</translation>
     </message>
     <message>
         <source>&Screens:</source>
-        <translation type="unfinished"></translation>
+        <translation>Pantalle&s:</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use hardware graphics acceleration. However the host system does not currently provide this, so you will not be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>La màquina virtual està configurada per utilitzar l'acceleració gràfica per maquinari. Tot i així, el sistema amfitrió no proveeix això i no podreu iniciar la màquina.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to fullscreen or seamless mode.</source>
+        <translation type="obsolete">La màquina virtual té actualment assignada una memòria de vídeo inferior a <b>%1</b>, que és la quantitat mínima requerida per canviar al mode de pantalla completa o mode fluid.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required for High Definition Video to be played efficiently.</source>
-        <translation type="unfinished"></translation>
+        <translation>La màquina virtual té actualment assignada una memòria de vídeo inferior a <b>%1</b>, que és la quantitat mínima requerida per poder reproduir eficientment el vídeo d'alta resolució.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least b>%1</b>.</source>
+        <translation type="obsolete">La màquina virtual està configurada per utilitzar l'acceleració gràfica i el sistema operatiu suggerit és Windows Vista o posterior. Per a un millor rendiment hauríeu d'establir la memòria de vídeo almenys a <b>%1</b>.</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use Video Stream Acceleration. As this feature only works with Windows guest systems it will be disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>La màquina virtual està configurada per utilitzar l'acceleració de flux de vídeo. Atès que aquesta característica només funciona amb Windows, el sistema client es desactivarà.</translation>
     </message>
     <message>
         <source>The VRDE server port value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha especificat el valor del port del servidor VRDE.</translation>
     </message>
     <message>
         <source>The VRDE authentication timeout value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha especificat el valor de temps d'espera d'autenticació VRDE.</translation>
     </message>
     <message>
         <source>User Defined</source>
-        <translation type="unfinished"></translation>
+        <translation>Definit per l'usuari</translation>
     </message>
     <message>
         <source>%1 fps</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 fps</translation>
     </message>
     <message>
         <source>fps</source>
-        <translation type="unfinished"></translation>
+        <translation>fps</translation>
     </message>
     <message>
         <source>low</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>baixa</translation>
     </message>
     <message>
         <source>medium</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>mitjana</translation>
     </message>
     <message>
         <source>high</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>alta</translation>
     </message>
     <message>
         <source>kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>kbps</translation>
     </message>
     <message>
         <source>Screen %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Barra d'eines mini:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Si està marcat, mostra la barra d'eines mini als modes fluid i de pantalla completa.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Mostra en pantalla completa/&fluid</translation>
+        <translation>Pantalla %1</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Si està marcat, mostra una barra d'eines petita a la part de dalt de la pantalla en lloc de a la posició per defecte a la part de sota.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Mostra a la par&t de dalt de la pantalla</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Enable video recording for screen %1.</source>
+        <translation type="obsolete">Activa l'enregistrament de vídeo per a la pantalla %1.</translation>
     </message>
     <message>
         <source>&Screen</source>
@@ -5562,15 +5648,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5586,10 +5668,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5638,6 +5716,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 MB</translation>
     </message>
@@ -5646,6 +5732,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5673,8 +5763,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Mostra el camí on les captures d'aquesta màquina virtual es desaran. Tingueu en compte que les captures poden ocupar prou quantitat d'espai al disc dur.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Bàsic</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Bàsic</translation>
     </message>
     <message>
         <source>Identification</source>
@@ -5725,8 +5815,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Controla la quantitat de memòria de vídeo amb què es proveeix a la màquina virtual.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Avançat</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Avançat</translation>
     </message>
     <message>
         <source>Boo&t Order:</source>
@@ -5821,8 +5911,8 @@ p, li { white-space: pre-wrap; }
         <translation>Carpeta de capture&s:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Descripció</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Descripció</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5897,8 +5987,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">heu seleccionat un tipus de sistema client de 64 bits per a aquesta màquina virtual. Amb aquests tipus de clients es requereix maquinari de virtualització (VT-x/AMD-V), aquesta característica s'activarà automàticament.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation>Arrosega i &deixa anar:</translation>
+        <source>&Drag'n'Drop:</source>
+        <translation type="obsolete">Arrosega i &deixa anar:</translation>
     </message>
     <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
@@ -5906,30 +5996,50 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No name specified for the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha especificat cap màquina virtual.</translation>
     </message>
     <message>
         <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>La recomanació del sistema operatiu de la màquina virtual és de tipus 64-bit. Els sistemes client de 64-bit requereixen la virtualització per maquinari i per tant això s'activarà automàticament si confirmeu els canvis.</translation>
     </message>
     <message>
-        <source>Enc&ryption</source>
+        <source>Basi&c</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, enables encryption for this virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <source>A&dvanced</source>
+        <translation type="unfinished">&Avançat</translation>
     </message>
     <message>
-        <source>En&able Encryption</source>
+        <source>D&rag'n'Drop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encryption C&ipher:</source>
-        <translation type="unfinished"></translation>
+        <source>D&escription</source>
+        <translation type="unfinished">D&escripció</translation>
     </message>
     <message>
-        <source>E&nter New Password:</source>
+        <source>Enc&ryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When checked, enables encryption for this virtual machine.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>En&able Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption C&ipher:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5961,16 +6071,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5981,28 +6087,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Barra d'eines mini:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Si està marcat, mostra la barra d'eines mini als modes fluid i de pantalla completa.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Mostra en pantalla completa/&fluid</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Si està marcat, mostra una barra d'eines petita a la part de dalt de la pantalla en lloc de a la posició per defecte a la part de sota.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -6012,18 +6110,6 @@ p, li { white-space: pre-wrap; }
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -6177,7 +6263,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the TAP interface name.</source>
-        <translation type="obsolete">Mostra el nom de la intefície TAP.</translation>
+        <translation type="obsolete">Mostra el nom de la interfície TAP.</translation>
     </message>
     <message>
         <source>&Setup Application:</source>
@@ -6277,35 +6363,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No bridged network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualment no s'ha seleccionat cap adaptador de xarxa pont.</translation>
     </message>
     <message>
         <source>No internal network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualment no s'ha especificat cap nom de xarxa interna.</translation>
     </message>
     <message>
         <source>No host-only network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualment no s'ha seleccionat cap adaptador de xarxa de només amfitrió.</translation>
     </message>
     <message>
         <source>No generic driver is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualment no s'ha seleccionat cap controlador genèric.</translation>
     </message>
     <message>
         <source>The MAC address must be 12 hexadecimal digits long.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'adreça MAC ha de tenir 12 dígits hexadecimals.</translation>
     </message>
     <message>
         <source>The second digit in the MAC address may not be odd as only unicast addresses are allowed.</source>
-        <translation type="unfinished"></translation>
+        <translation>El segon dígit a l'adreça MAC no pot ser senar ja que només es permeten adreces unicast.</translation>
     </message>
     <message>
         <source>No NAT network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualment no s'ha especificat cap nom de xarxa NAT.</translation>
     </message>
     <message>
         <source>Holds the name of the NAT network that this network card will be connected to. You can create and remove networks using the global network settings in the virtual machine manager window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestiona el nom de la xarxa NAT que és on es connectarà la targeta de xarxa. Podeu crear o eliminar xarxes fent servir els paràmetres globals de xarxa a la finestra de gestió de màquines virtuals.</translation>
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
@@ -6487,23 +6573,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap IRQ.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap port d'E/S.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dos o més ports tenen els mateixos paràmetres.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap camí de port.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">S'han proveït dos camins de ports duplicats.</translation>
     </message>
 </context>
 <context>
@@ -6520,6 +6606,26 @@ p, li { white-space: pre-wrap; }
         <source>Duplicate port path entered </source>
         <translation type="obsolete">S'ha introduït un camí al port duplicat</translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap IRQ.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap port d'E/S.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Dos o més ports tenen els mateixos paràmetres.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap camí de port.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">S'han proveït dos camins de ports duplicats.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsPortForwardingDlg</name>
@@ -6714,6 +6820,10 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Si està marcat, aquesta carpeta compartida serà permanent.</translation>
     </message>
     <message>
+        <source>Window</source>
+        <translation type="obsolete">Finestra</translation>
+    </message>
+    <message>
         <source>When checked, this shared folder will be permanent.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6794,44 +6904,44 @@ p, li { white-space: pre-wrap; }
         <translation>Mostra l'adreça base d'E/S d'aquest port en sèrie. Valors vàlids són nombres enter amb un rang entre <tt>0</tt> i <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap IRQ.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap port d'E/S.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dos o més ports tenen els mateixos paràmetres.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap camí de port.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">S'han proveït dos camins de ports duplicats.</translation>
     </message>
 </context>
 <context>
@@ -6848,6 +6958,26 @@ p, li { white-space: pre-wrap; }
         <source>Duplicate port path entered </source>
         <translation type="obsolete">S'ha introduït un camí de port duplicat</translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap IRQ.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap port d'E/S.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Dos o més ports tenen els mateixos paràmetres.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap camí de port.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">S'han proveït dos camins de ports duplicats.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsStorage</name>
@@ -6949,7 +7079,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No hard disk is selected for <i>%1</i>.</source>
-        <translation type="unfinished">No hi ha cap disc dur seleccionat per a <i>%1</i>.</translation>
+        <translation>No hi ha cap disc dur seleccionat per a <i>%1</i>.</translation>
     </message>
     <message>
         <source><i>%1</i> uses a medium that is already attached to <i>%2</i>.</source>
@@ -7283,46 +7413,46 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No name is currently specified for the controller at position <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha especificat cap nom per al controlador de la posició <b>%1</b>.</translation>
     </message>
     <message>
         <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>El controlador de la posició <b>%1</b> fa servir el nom que ja fa servir el controlador de la posició <b>%2</b>.</translation>
     </message>
     <message>
         <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>%1</i> fa servir el disc dur que es troba connectat a <i>%2</i>.</translation>
     </message>
     <message>
         <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>La màquina té assignats més controladors d'emmagatzematge del que els xips %1 són compatibles. Canvieu el tipus de xip a la pàgina de paràmetres del sistema o reduïu el nombre dels controladors següents d'emmagatzematge a la pàgina de paràmetres d'emmagatzematge: %2</translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk file...</source>
-        <translation type="obsolete">Seleccioneu un fitxer de disc òptic virtual...</translation>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7330,68 +7460,65 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Imatge</translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source>Add USB Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Imatge</translation>
-    </message>
-    <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7407,7 +7534,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7636,30 +7763,54 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Pointing Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dispositiu del &punter:</translation>
     </message>
     <message>
         <source>Determines whether the emulated pointing device is a standard PS/2 mouse, a USB tablet or a USB multi-touch tablet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Determina si el dispositiu del cursor és un ratolí PS/2 estàndard, una tauleta USB o una tauleta multitàctil USB.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. Not enough memory is left for the host operating system. Please select a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Més de <b>%1%</b> de la memòria (<b>%2</b>) de l'ordinador amfitrió està assignada a la màquina virtual. No s'ha deixat suficient memòria per al sistema operatiu amfitrió. Seleccioneu una quantitat inferior.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. There might not be enough memory left for the host operating system. Please consider selecting a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Més de <b>%1%</b> de la memòria (<b>%2</b>) de l'ordinador amfitrió està assignada a la màquina virtual. Això podria no deixar suficient memòria per al sistema operatiu amfitrió. Considereu seleccionar una quantitat inferior.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">La característica E/S APIC no està habilitada a la secció placa mare de la pàgina Sistema. Això és necessari per la compatibilitat amb un xip del tipus ICH9. Es farà automàticament si confirmeu els canvis.</translation>
+    </message>
+    <message>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">L'emulació del controlador USB no s'ha habilitat al a pàgina USB. Això és necessari per la compatibilitat amb un dispositiu d'entrada USB. Es farà automàticament si confirmeu els canvis.</translation>
     </message>
     <message>
         <source>For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Per raons de rendiment, el nombre dels processadors virtuals connectats a la màquina virtual no pot ser més del doble del nombre de processadors físics de l'amfitrió (<b>%1</b>). Reduïu el nombre de processadors virtuals.</translation>
     </message>
     <message>
         <source>More virtual CPUs are assigned to the virtual machine than the number of physical CPUs on the host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hi ha més processadors virtuals connectats a la màquina virtual que el nombre de processadors físics de l'amfitrió (<b>%1</b>). Això pot afectar al rendiment de la màquina virtual. Considereu reduir-ne el nombre de processadors virtuals.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">La característica E/S APIC no està habilitada a la secció placa mare de la pàgina Sistema. Això és necessari per la compatibilitat amb un processador virtual. Es farà automàticament si confirmeu els canvis.</translation>
+    </message>
+    <message>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">La virtualització de maquinari no està habilitada a la secció Acceleració de la pàgina Sistema. Això és necessari per la compatibilitat amb més d'un processador virtual. Es farà automàticament si confirmeu els canvis.</translation>
     </message>
     <message>
         <source>The processor execution cap is set to a low value. This may make the machine feel slow to respond.</source>
+        <translation>El cap d'execució del processador està establer a un valor baix. Això pot fer semblar que la màquina va lenta. </translation>
+    </message>
+    <message>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7687,14 +7838,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 MB</translation>
     </message>
@@ -7845,31 +7988,35 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">L'USB 2.0 es troba activat per a aquesta màquina virtual. Tot i així, això requereix la instal·lació de <b>%1</b>. Instal·leu el paquet d'extensions des del lloc web de baixades del VirtualBox. Una vegada fet això, haureu de tornar a activar l'USB 2.0. Mentrestant es desactivarà a no ser que cancel·leu els canvis dels paràmetres actuals.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0 to be able to start the machine.</source>
+        <translation type="obsolete">L'USB 2.0 es troba activat per a aquesta màquina virtual. Tot i així, això requereix la instal·lació de <b>%1</b>. Instal·leu el paquet d'extensions des del lloc web de baixades del VirtualBox o desactiveu la compabilitat USB 2.0 per iniciar la màquina.</translation>
+    </message>
+    <message>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8126,14 +8273,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Tanca</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Canvia</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Tanca</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8350,8 +8497,8 @@ p, li { white-space: pre-wrap; }
         <translation><nobr>Avís</nobr></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>S'ha produït un error crític mentre s'executava la màquina virtual, que s'ha aturat.</p><p>Per obtenir ajuda, visiteu la secció Community a  <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> o al vostre contracte de suport. Afegiu el contingut del fitxer de registre <tt>VBox.log</tt> i el fitxer d'imatge <tt>VBox.png</tt>,que podreu trobar al directori <nobr& [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation type="obsolete"><p>S'ha produït un error crític mentre s'executava la màquina virtual, que s'ha aturat.</p><p>Per obtenir ajuda, visiteu la secció Community a  <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> o al vostre contracte de suport. Afegiu el contingut del fitxer de registre <tt>VBox.log</tt> i el fitxer d'imatge <tt>VBox.png</tt>,que podreu trobar al directori <nob [...]
     </message>
     <message>
         <source><p>A fatal error has occurred during virtual machine execution! The virtual machine will be powered off. Please copy the following error message using the clipboard to help diagnose the problem:</p></source>
@@ -8482,15 +8629,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete"><p>La màquina virtual passarà ara al mode <b>fluid</b>. Podeu tornar enrere al mode finestra prement <b>%1</b>. Tingueu en compte que la <i>tecla d'amfitrió</i> està definida actualment com <b>%2</b>.</p><p>La barra de menú estarà amagada al mode fluid. Podreu accedir a ella prement <b>tecla d'amfitrió+Home</b>.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>El programa VirtualBox Guest Additions instal·lat al sistema client no és a la darrera versió: la versió instal·lada és %1 i la més nova és la %2. Algunes característiques que requereixen les Guest Additions (integració del punter, la funció de mida automàtica de l'escriptori) poden no treballar correctament.</p><p>Es recomana actualitzar la versió de Guest Additions a la versió actual triant <b>Instal·la les Guest Addi [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>El programa VirtualBox Guest Additions instal·lat al sistema client està antiquat: la versió instal·lada és %1 i la més nova és la %2. Algunes característiques que requereixen les Guest Additions (integració del punter, la funció de mida automàtica de l'escriptori) poden no treballar correctament.</p><p>Es recomana actualitzar la versió de Guest Additions a la versió actual triant <b>Instal·la les Guest Additions</b& [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><b>El programa VirtualBox Guest Additions instal·lat al sistema client és més recent que la versió suportada: la versió instal·lada és %1 i la més nova és la %2. No es pot fer servir una versió més nova de les Guest Additions amb una versió més antiga del VirtualBox.</p><p>Es recomana instal·lar la versió de Guest Additions a la versió actual triant <b>Instal·lar Guest Additions</b> des del menú <b>Dispositius</b [...]
     </message>
     <message>
@@ -8613,9 +8760,9 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Baixa</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Munta</translation>
+        <translation>Munta</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -8787,8 +8934,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Mostra un diàleg amb la informació del producte</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'aquest enllaç: </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'aquest enllaç: </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -8996,8 +9143,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Sob&reescriu</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>S'ha produït un error crític mentre s'executava la màquina virtual, que s'ha aturat.</p><p>Per obtenir ajuda, visiteu la secció Community a  <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> o al vostre contracte de suport. Afegiu el contingut del fitxer de registre <tt>VBox.log</tt> i el fitxer d'imatge <tt>VBox.png</tt>,que podreu trobar al directori <nobr& [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>S'ha produït un error crític mentre s'executava la màquina virtual, que s'ha aturat.</p><p>Per obtenir ajuda, visiteu la secció Community a  <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> o al vostre contracte de suport. Afegiu el contingut del fitxer de registre <tt>VBox.log</tt> i el fitxer d'imatge <tt>VBox.png</tt>,que podreu trobar al directori <nobr><b>%1 [...]
     </message>
     <message>
         <source>Failed to open appliance.</source>
@@ -9335,7 +9482,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">No s'ha pogut desconnectar el disquet (<nobr><b>%1</b></nobr>) de la ranura <i>%2</i> de la màquina <b>%3</b>.</translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully started then s [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="obsolete"><p>Sembla que les Guest Additions del VirtualBox no estan disponibles en aquesta màquina i les carpetes compartides no es poden fer servir sense elles. Per fer servir carpetes compartides a la màquina virtual, instal·leu les Guest Additions si no es troben instal·lades o torneu a instal·lar-les si no estan funcionant correctament seleccionant <b>Instal·la les Guest Additions</b> al menú <b>Màquina</b>. Si es troben instal [...]
     </message>
     <message numerus="yes">
@@ -9395,8 +9542,8 @@ p, li { white-space: pre-wrap; }
         <translation><p>Tingueu en compte que la unitat d'emmagatzematge d'aquest suport no s'eliminarà i, a més serà possible fer-la servir de nou més tard.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
-        <translation type="obsolete"><p>Sembla que les Guest Additions del VirtualBox no estan disponibles en aquesta màquina i les carpetes compartides no es poden fer servir sense elles. Per fer servir carpetes compartides a la màquina virtual, instal·leu les Guest Additions si no es troben instal·lades o torneu a instal·lar-les si no estan funcionant correctament seleccionant <b>Instal·la les Guest Additions</b> al menú <b>Màquina</b>. Si es troben instal [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
+        <translation><p>Sembla que les Guest Additions del VirtualBox no estan disponibles en aquesta màquina i les carpetes compartides no es poden fer servir sense elles. Per fer servir carpetes compartides a la màquina virtual, instal·leu les Guest Additions si no es troben instal·lades o torneu a instal·lar-les si no estan funcionant correctament seleccionant <b>Instal·la les Guest Additions</b> al menú <b>Màquina</b>. Si es troben instal·lades però la m [...]
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
@@ -9699,205 +9846,242 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Cannot start the VirtualBox Manager due to local restrictions.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut iniciar el gestor del VirtualBox degut a restriccions locals.</p><p>Es tancarà l'aplicació.</p></translation>
     </message>
     <message>
         <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut trobar el fitxer de llengua per a la llengua <b>%1</b> al directori <b><nobr>%2</nobr></b>.</p><p>La llengua es reiniciarà temporalment a la llengua per defecte del sistema. Aneu a la finestra de <b>Preferències</b> que podeu obrir des del menú <b>Fitxer</b> de la finestra del gestor del VirtualBox i seleccioneu una de les llengües existents a la pàgina <b>Llengü [...]
     </message>
     <message>
         <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut trobar el fitxer de llengua per a la llengua <b><nobr>%1</nobr></b>.</p><p>La llengua es reiniciarà temporalment l'anglès (per defecte). Aneu a la finestra de <b>Preferències</b> que podeu obrir des del menú <b>Fitxer</b> de la finestra del gestor del VirtualBox i seleccioneu una de les llengües existents a la pàgina <b>Llengües</b>.</p></translation>
     </message>
     <message>
         <source>There is no virtual machine with the identifier <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No existeix cap màquina virtual amb aquest identificador <b>%1</b>.</translation>
     </message>
     <message>
         <source>Ignore</source>
-        <translation type="unfinished">Ignora</translation>
+        <translation>Ignora</translation>
     </message>
     <message>
         <source>Failed to create NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut crear la xarxa NAT.</translation>
     </message>
     <message>
         <source>Failed to remove NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut eliminar la xarxa NAT <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create DHCP server.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut crear el servidor DHCP.</translation>
     </message>
     <message>
         <source>Failed to remove DHCP server for network interface <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut crear el servidor DHCP per a la interfície <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create the host network interface.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut crear la interfície de xarxa de l'amfitrió.</translation>
     </message>
     <message>
         <source>Create &new disk</source>
-        <translation type="unfinished">Crea un disc &nou</translation>
+        <translation>Crea un disc &nou</translation>
     </message>
     <message>
         <source>&Choose existing disk</source>
-        <translation type="unfinished">&Tria un disc existent</translation>
+        <translation>&Tria un disc existent</translation>
     </message>
     <message>
         <source>Leave &empty</source>
-        <translation type="unfinished">Deixa-ho &buit</translation>
+        <translation>Deixa-ho &buit</translation>
     </message>
     <message>
         <source>&Choose disk</source>
-        <translation type="unfinished">Tria un dis&c</translation>
+        <translation>Tria un dis&c</translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Esteu segur que voleu alliberar el disc dur virtual <nobr><b>%1</b></nobr>?</p><p>Això el separarà de les màquines virtuals següents: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual optical disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Esteu segur que voleu alliberar el disc òptic virtual <nobr><b>%1</b></nobr>?</p><p>Això el separarà de les màquines virtuals següents: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual floppy disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Esteu segur que voleu alliberar el disc floppy virtual <nobr><b>%1</b></nobr>?</p><p>Això el separarà de les màquines virtuals següents: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Segur que voleu eliminar el disc dur virtual <nobr><b>%1</b></nobr> de la llista d'imatges de discos durs coneguts?</p></translation>
     </message>
     <message>
         <source><p>As this hard disk is inaccessible its image file can not be deleted.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Atès que no es pot accedir a aquest disc dur, no es pot eliminar el fitxer d'imatge.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual optical disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Segur que voleu eliminar el disc òptic virtual <nobr><b>%1</b></nobr> de la llista d'imatges de discos coneguts?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual floppy disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Segur que voleu eliminar el disc floppy virtual <nobr><b>%1</b></nobr> de la llista d'imatges de discos coneguts?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual optical disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut inserir el disc òptic virtual <nobr><b>%1</b></nobr> a la màquina <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force insertion of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Voleu provar a forçar la inserció d'aquest disc?</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual optical disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut expulsar el disc òptic virtual <nobr><b>%1</b></nobr> a la màquina <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force ejection of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Voleu provar a forçar l'expulsió d'aquest disc?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual floppy disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut inserir el disc floppy virtual <nobr><b>%1</b></nobr> a la màquina <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual floppy disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut expulsar el disc floppy virtual <nobr><b>%1</b></nobr> a la màquina <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source>Failed to open the hard disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut obrir el fitxer de disc dur <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the optical disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut obrir el fitxer de disc òptic <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the floppy disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut obrir el fitxer de disc floppy <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the hard disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut tancar el fitxer de disc dur <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the optical disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut tancar el fitxer de disc òptic <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the floppy disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut tancar el fitxer de disc floppy <nobr><b>%2</b></nobr>.</translation>
     </message>
     <message numerus="yes">
         <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><p>La màquina virtual %n es troba en un estat desat <b>%1</b></p><p>Si continueu, es descartarà l'estat en temps d'execució de la màquina virtual exportada. Tingueu en compte que la màquina existent no canviarà.</p></numerusform>
+            <numerusform><p>Les %n màquines virtuals es troben en un estat desat <b>%1</b></p><p>Si continueu, es descartarà l'estat en temps d'execució de les màquines virtuals exportades. Tingueu en compte que les màquines existent no canviaran.</p></numerusform>
+            <numerusform><p>Les %n màquines virtuals es troben en un estat desat <b>%1</b></p><p>Si continueu, es descartarà l'estat en temps d'execució de les màquines virtuals exportades. Tingueu en compte que les màquines existent no canviaran.</p></numerusform>
         </translation>
     </message>
     <message>
         <source>Switch</source>
-        <translation type="unfinished">Canvia</translation>
+        <translation>Canvia</translation>
     </message>
     <message>
         <source>Failed to enable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut activar el servidor d'escriptori remot per a aquesta màquina virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut desactivar el servidor d'escriptori remot per a aquesta màquina virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to enable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut activar la captura de vídeo per a aquesta màquina virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut desactivar la captura de vídeo per a aquesta màquina virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox Guest Additions</b> disk image file.</p><p>Do you wish to download this disk image file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut trobar el fitxer d'imatge de les VirtualBox Guest Additions.</nobr></p><p>Voleu baixar la imatge de cd des de la xarxa?</p></translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished">Baixa</translation>
+        <translation>Baixa</translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox Guest Additions</b> disk image file from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Segur que voleu baixar la imatge del VirtualBox Guest Additions des de  <nobr><a href="%1">%1</a></nobr> (mida %2 bytes)?</p></translation>
     </message>
     <message>
         <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>S'ha baixat el manual d'usuari del VirtualBox des de <nobr><a href="%1">%1</a></nobr> però no s'ha pogut desar localment com a <nobr><b>%2</b>.</nobr></p><p>Trieu una altra ubicació per al fitxer.</p> {1"?} {1<?} {2<?}</translation>
+    </message>
+    <message>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual CD/DVD drive?</p></source>
+        <translation type="obsolete"><p>S'ha baixat la imatge del VirtualBox Guest Additions des de <nobr><a href="%1">%1</a></nobr> i s'ha desat localment com a <nobr><b>%2</b>.</nobr></p><p>Voleu registrar aquesta imatge de CD i montar-la a la unitat virtual de CD/DVD?</p></translation>
+    </message>
+    <message>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no CD/DVD drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <translation type="obsolete"><p>No es pot inserir la imatge del cd instal·lador de les Guest Additions a la màquina virtual <b>%1</b> si la màquina no té dispositius CD/DVD. Afegiu un dispositiu fent servir la pestanya de discos durs als paràmetres de la màquina.</p></translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut trobar el manual d'usuari del VirtualBox <nobr><b>%1</b>.</nobr></p><p>Voleu baixar aquest fitxer des d'Internet?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox User Manual</b> from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Segur que voleu baixar el manual d'usuari del VirtualBox des de <nobr><a href="%1">%1</a></nobr> (mida %2 bytes)?</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"><p>S'ha baixat el manual d'usuari del VirtualBox des de <nobr><a href="%1">%2</a></nobr> però no s'ha pogut desar localment com a <nobr><b>%3</b>.</nobr></p><p>Trieu una altra ubicació per al fitxer.</p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>S'ha baixat el manual d'usuari del VirtualBox des de <nobr><a href="%1">%1</a></nobr> però no s'ha pogut desar localment com a <nobr><b>%2</b>.</nobr></p><p>Trieu una altra ubicació per al fitxer.</p> {1"?} {1<?} {2<?}</translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p></source>
-        <translation type="unfinished"><p>S'ha baixat el manual d'usuari del VirtualBox des de <nobr><a href="%1">%2</a></nobr> i s'ha desat localment com a <nobr><b>%3</b>.</nobr></p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>S'ha baixat el manual d'usuari del VirtualBox des de <nobr><a href="%1">%1</a></nobr> i s'ha desat localment com a <nobr><b>%2</b>.</nobr></p> {1"?} {1<?} {2<?}</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Tanca</translation>
+        <translation>Tanca</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">D'acord</translation>
+        <translation>D'acord</translation>
     </message>
     <message>
         <source>Do not show this message again</source>
-        <translation type="unfinished">No tornis a mostrar aquest missatge</translation>
+        <translation>No tornis a mostrar aquest missatge</translation>
     </message>
     <message>
         <source><p>Do you want to remove the NAT network <nobr><b>%1</b>?</nobr></p><p>If this network is in use by one or more virtual machine network adapters these adapters will no longer be usable until you correct their settings by either choosing a different network name or a different adapter attachment type.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Voleu eliminar la xarxa NAT <nobr><b>%1</b>?</nobr></p><p>Si aquesta xarxa està en ús per un o més adaptadors de màquines virtuals, aquests adaptadors ja no es podran utilitzar fins que corregiu els paràmetres triant un nom de xarxa diferent o un tipus d'adaptador diferent.</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete"><p>Sembla que les Guest Additions del VirtualBox no estan disponibles en aquesta màquina i les carpetes compartides no es poden fer servir sense elles. Per fer servir carpetes compartides a la màquina virtual, instal·leu les Guest Additions si no es troben instal·lades o torneu a instal·lar-les si no estan funcionant correctament seleccionant <b>Instal·la les Guest Additions</b> al menú <b>Màquina</b>. Si es troben instal [...]
     </message>
     <message>
         <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Munta</translation>
     </message>
     <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
-        <translation type="unfinished"></translation>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
+        <translation>No s'ha pogut afegir la càmera web <b>%1</b> a la màquina virtual <b>%2</b>.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
+        <translation>No s'ha pogut desconnectar la càmera web <b>%1</b> a la màquina virtual <b>%2</b>.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
-        <translation type="unfinished"></translation>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <translation><p>La pantalla virtual utilitza actualment el mode de color <b>%1&nbsp;bit</b>. Per obtenir un millor rendiment, canvieu això a <b>%2&nbsp;bit</b>. Això es pot fer des de la secció <b>Pantalla</b> del tauler de control del sistema operatiu client o des dels paràmetres del sistema.</p></translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
@@ -9912,115 +10096,115 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10073,19 +10257,19 @@ p, li { white-space: pre-wrap; }
     <name>UIMiniToolBar</name>
     <message>
         <source>Always show the toolbar</source>
-        <translation type="unfinished">Mostra sempre la barra d'eines</translation>
+        <translation>Mostra sempre la barra d'eines</translation>
     </message>
     <message>
         <source>Minimize Window</source>
-        <translation type="unfinished">Minimitza la finestra</translation>
+        <translation>Minimitza la finestra</translation>
     </message>
     <message>
         <source>Exit Full Screen or Seamless Mode</source>
-        <translation type="unfinished">Surt del mode de pantalla completa o del mode fluid</translation>
+        <translation>Surt del mode de pantalla completa o del mode fluid</translation>
     </message>
     <message>
         <source>Close VM</source>
-        <translation type="unfinished">Tanca la màquina virtual</translation>
+        <translation>Tanca la màquina virtual</translation>
     </message>
 </context>
 <context>
@@ -10102,8 +10286,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation>&Nom:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Nom:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -10125,6 +10309,10 @@ p, li { white-space: pre-wrap; }
         <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
         <translation>Mostra el tipus de sistema operatiu que voleu instal·lar a dins d'aquesta màquina virtual (anomenat sistema operatiu client).</translation>
     </message>
+    <message>
+        <source>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -10162,7 +10350,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The network operation failed with the following error: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ha fallat la operació de xarxa i s'ha proveït l'error següent: %1.</translation>
     </message>
 </context>
 <context>
@@ -10189,27 +10377,27 @@ p, li { white-space: pre-wrap; }
     <name>UINetworkReplyPrivate</name>
     <message>
         <source>Host not found</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha trobat l'amfitrió</translation>
     </message>
     <message>
         <source>Content access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>S'ha denegat l'accés al contingut</translation>
     </message>
     <message>
         <source>Protocol failure</source>
-        <translation type="unfinished"></translation>
+        <translation>S'ha produït un error de protocol</translation>
     </message>
     <message>
         <source>Wrong SSL certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>El format del certificat SSL és erroni</translation>
     </message>
     <message>
         <source>SSL authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Ha fallat l'autenticació SSL</translation>
     </message>
     <message>
         <source>Unknown reason</source>
-        <translation type="unfinished"></translation>
+        <translation>Es desconeix la raó</translation>
     </message>
 </context>
 <context>
@@ -11108,7 +11296,7 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
     <name>UIPopupCenter</name>
     <message>
         <source>Click for full details</source>
-        <translation type="unfinished"></translation>
+        <translation>Feu clic per mostrar els detalls complets</translation>
     </message>
 </context>
 <context>
@@ -11297,18 +11485,14 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
         <translation>Fitxers de màquina virtual (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Benvingut a VirtualBox!</h3><p>A la part esquerra d'aquesta finestra es mostra un llistat de totes les màquines virtuals a l'ordinador. Aquest llistat és buit actualment perquè encara no heu creat cap màquina virtual.<img src=:/welcome.png align=right/></p><p>Per crear una nova màquina virtual, premeu sobre el botó <b>Nova</b> a la barra principal que es troba a la part de dalt d'aques [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation><h3>Benvingut a VirtualBox!</h3><p>A la part esquerra d'aquesta finestra es mostra un llistat de totes les màquines virtuals a l'ordinador. Aquest llistat és buit actualment perquè encara no heu creat cap màquina virtual.<img src=:/welcome.png align=right/></p><p>Per crear una nova màquina virtual, premeu sobre el botó <b>Nova</b> a la barra principal que es troba a la part de dalt d'aquesta finestra.< [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation>Gestor</translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -11345,11 +11529,11 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
     </message>
     <message>
         <source><b>%1</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1</b> pàgina:</translation>
     </message>
     <message>
         <source><b>%1: %2</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1: %2</b> pàgina:</translation>
     </message>
 </context>
 <context>
@@ -11496,6 +11680,10 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Tanca</translation>
     </message>
@@ -11503,10 +11691,6 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -11618,8 +11802,8 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
         <translation type="obsolete">Resum</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'aquest enllaç: </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'aquest enllaç: </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -11710,220 +11894,99 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
 <context>
     <name>UIVMInfoDialog</name>
     <message>
-        <source>Session Information Dialog</source>
-        <translation type="obsolete">Diàleg Informatiu de la Sessió</translation>
-    </message>
-    <message>
-        <source>&Close</source>
-        <translation type="obsolete">Tan&ca</translation>
-    </message>
-    <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Informació de la sessió</translation>
+        <translation type="unfinished">%1 - Informació de la sessió</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Detalls</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished">&Detalls de configuració</translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">&Temps d'execució</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished">Informació del &temps d'execució</translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>Transferències DMA</translation>
+        <translation type="unfinished">Transferències DMA</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>Transferències PIO</translation>
+        <translation type="unfinished">Transferències PIO</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Lectura de dades</translation>
+        <translation type="unfinished">Lectura de dades</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Escriptura de dades</translation>
+        <translation type="unfinished">Escriptura de dades</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Transmissió de dades</translation>
+        <translation type="unfinished">Transmissió de dades</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Recepció de dades</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Activat</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Desactivat</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Atributs del temps d'execució</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Resolució de pantalla</translation>
-    </message>
-    <message>
-        <source>Hardware Virtualization</source>
-        <translation type="obsolete">Virtualització per Maquinari</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">Estadístiques CD/DVD</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Estadístiques de l'adaptador de xarxa</translation>
-    </message>
-    <message>
-        <source>Adapter 1</source>
-        <translation type="obsolete">Adaptador 1</translation>
-    </message>
-    <message>
-        <source>Adapter 2</source>
-        <translation type="obsolete">Adaptador 2</translation>
-    </message>
-    <message>
-        <source>Adapter 3</source>
-        <translation type="obsolete">Adaptador 3</translation>
-    </message>
-    <message>
-        <source>Adapter 4</source>
-        <translation type="obsolete">Adaptador 4</translation>
-    </message>
-    <message>
-        <source>Not attached</source>
-        <translation type="obsolete">No connectat</translation>
-    </message>
-    <message>
-        <source>Hard Disks Statistics</source>
-        <translation type="obsolete">Estadístiques dels discos durs</translation>
-    </message>
-    <message>
-        <source>Primary Master</source>
-        <translation type="obsolete">Primari Mestre</translation>
-    </message>
-    <message>
-        <source>Primary Slave</source>
-        <translation type="obsolete">Primari Esclau</translation>
-    </message>
-    <message>
-        <source>Secondary Master</source>
-        <translation type="obsolete">Secundari Mestre</translation>
-    </message>
-    <message>
-        <source>Secondary Slave</source>
-        <translation type="obsolete">Secundari Esclau</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Versió %1.%2</translation>
+        <translation type="unfinished">Recepció de dades</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>No detectat</translation>
+        <translation type="unfinished">No detectat</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>No detectat</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>Guest Additions</translation>
+        <translation type="unfinished">No detectat</translation>
     </message>
     <message>
-        <source>Guest OS Type</source>
-        <translation>Tipus de sistema client</translation>
-    </message>
-    <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Estadístiques de discos durs</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">No disponible</translation>
     </message>
     <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">No hi ha cap disc dur</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Atributs del temps d'execució</translation>
     </message>
     <message>
-        <source>No Network Adapters</source>
-        <translation>No hi ha cap adaptador de xarxa</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Resolució de pantalla</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Activat</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Desactivat</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished">Mode de porta-retalls</translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <translation type="obsolete">Paginació imbricada</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Guest Additions</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">No disponible</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Tipus de sistema client</translation>
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation>Estadístiques d'emmagatzematge</translation>
+        <translation type="unfinished">Estadístiques d'emmagatzematge</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
-        <translation>No hi ha cap dispositiu d'emmagatzematge</translation>
+        <translation type="unfinished">No hi ha cap dispositiu d'emmagatzematge</translation>
     </message>
     <message>
         <source>Network Statistics</source>
-        <translation>Estadístiques de xarxa</translation>
-    </message>
-    <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Paginació imbricada</translation>
-    </message>
-    <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>No disponible</translation>
-    </message>
-    <message>
-        <source>Clipboard Mode</source>
-        <translation>Mode de porta-retalls</translation>
-    </message>
-    <message>
-        <source>Drag'n'Drop Mode</source>
-        <translation type="obsolete">Mode d'arrossega i deixa d'anar</translation>
+        <translation type="unfinished">Estadístiques de xarxa</translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">No hi ha cap adaptador de xarxa</translation>
     </message>
 </context>
 <context>
@@ -12503,39 +12566,39 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
     </message>
     <message>
         <source>Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Paràmetres d'emmagatzematge</translation>
     </message>
     <message>
         <source>Please choose a file to export the virtual appliance to</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu un fitxer on exportar l'aplicació virtual</translation>
     </message>
     <message>
         <source>F&ormat:</source>
-        <translation type="unfinished"></translation>
+        <translation>F&ormat:</translation>
     </message>
     <message>
         <source>OVF 0.9</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 0.9</translation>
     </message>
     <message>
         <source>OVF 1.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 1.0</translation>
     </message>
     <message>
         <source>OVF 2.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 2.0</translation>
     </message>
     <message>
         <source>Write in standard OVF 1.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escriu en format estàndard OVF 1.0.</translation>
     </message>
     <message>
         <source>Write in new experimental OVF 2.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escriu en format experimental OVF 2.0.</translation>
     </message>
     <message>
         <source>&Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>&Paràmetres d'emmagatzematge</translation>
     </message>
 </context>
 <context>
@@ -12554,14 +12617,14 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
     </message>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu un fitxer on s'ha d'exportar l'aplicació virtual...</translation>
     </message>
 </context>
 <context>
     <name>UIWizardExportAppPageExpert</name>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu un fitxer on exportar l'aplicació virtual...</translation>
     </message>
 </context>
 <context>
@@ -12631,15 +12694,15 @@ pas i connectar discos durs més endavant, fent servir el diàleg de configuraci
     </message>
     <message>
         <source>Import Virtual Appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>Importa l'aplicació virtual</translation>
     </message>
     <message>
         <source>Choose a virtual appliance file to import...</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu l'aplicació virtual que s'ha d'importar...</translation>
     </message>
     <message>
         <source>Please choose a virtual appliance file to import</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu l'aplicació virtual que s'ha d'importar</translation>
     </message>
 </context>
 <context>
@@ -13227,11 +13290,11 @@ Versió %1</translation>
         <translation type="obsolete">Obre el diàleg per operar amb les carpetes compartides</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">&Instal·la les Guest Additions...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Munta la imatge d'instal·lació de les Guest Additions</translation>
     </message>
     <message>
@@ -13514,7 +13577,7 @@ Versió %1</translation>
         <translation type="obsolete">D&iàleg informatiu de la sessió</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Mostra el diàleg informatiu de la sessió</translation>
     </message>
     <message>
@@ -13990,7 +14053,7 @@ Versió %1</translation>
     </message>
     <message>
         <source>Choose...</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu...</translation>
     </message>
 </context>
 <context>
@@ -14000,8 +14063,8 @@ Versió %1</translation>
         <translation><reinicialitza als valors predeterminats></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">El camí actual per defecte es mostrarà després d'acceptar els canvis i obrir aquest diàleg novament. </translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation>El camí actual per defecte es mostrarà després d'acceptar els canvis i obrir aquest diàleg novament. </translation>
     </message>
     <message>
         <source><not selected></source>
@@ -14049,7 +14112,8 @@ Versió %1</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">El camí actual per defecte es mostrarà després d'acceptar els canvis i obrir aquest diàleg novament. </translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -15309,7 +15373,7 @@ Versió %1</translation>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Si connecteu aquest disc dur es millorarà de forma indirecta fent servir un nou disc dur diferenciat.</translation>
+        <translation>Si connecteu aquest disc dur es millorarà de forma indirecta fent servir un nou disc dur diferenciat.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -15319,7 +15383,7 @@ Versió %1</translation>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Aquest disc dur base es connecta indirectament fent servir el disc dur diferenciat següent:</translation>
+        <translation>Aquest disc dur base es connecta indirectament fent servir el disc dur diferenciat següent:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -15931,107 +15995,77 @@ Versió %1</translation>
         <translation type="obsolete">Trieu una ubicació per al fitxer de disc virtual nou</translation>
     </message>
     <message>
+        <source>Enabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Activat</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Desactivat</translation>
+    </message>
+    <message>
         <source>Unrestricted Execution</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>Execució no restringida</translation>
     </message>
     <message>
         <source>PS/2 Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ratolí PS/2</translation>
     </message>
     <message>
         <source>USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ratolí USB</translation>
     </message>
     <message>
         <source>PS/2 and USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ratolí PS/2 i USB</translation>
     </message>
     <message>
         <source>Unrestricted Execution</source>
-        <translation type="unfinished"></translation>
+        <translation>Execució no restringida</translation>
     </message>
     <message>
         <source>USB Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tablet USB</translation>
     </message>
     <message>
         <source>USB Multi-Touch Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tablet USB multitàctil</translation>
     </message>
     <message>
         <source>NAT Network</source>
         <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Xarxa NAT</translation>
     </message>
     <message>
         <source>NAT network, '%1'</source>
         <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Xarxa NAT, «%1»</translation>
     </message>
     <message>
         <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished">USB</translation>
-    </message>
-    <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>off</source>
-        <comment>guest monitor status</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Cap</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Predeterminat</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation>Podeu crear o afegir fitxers d'imatge de disc als paràmetres de la màquina virtual.</translation>
     </message>
     <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <source>USB</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
+        <source>off</source>
+        <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished">Actiu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inactive</source>
@@ -16041,7 +16075,7 @@ Versió %1</translation>
     <message>
         <source>Active</source>
         <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished">Actiu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inactive</source>
@@ -16051,7 +16085,7 @@ Versió %1</translation>
     <message>
         <source>Active</source>
         <comment>details report (Unrestricted Execution)</comment>
-        <translation type="unfinished">Actiu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inactive</source>
@@ -16059,6 +16093,11 @@ Versió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -16069,6 +16108,31 @@ Versió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Cap</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Predeterminat</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -16079,6 +16143,11 @@ Versió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -16099,6 +16168,11 @@ Versió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -16108,16 +16182,16 @@ Versió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -16393,11 +16467,11 @@ a l'idioma predeterminat del sistema.</qt>
         <translation type="obsolete">Mostra la ruta cap a la carpeta de fitxers VDI predeterminada. S'usa aquesta carpeta, si no se n'especifica explícitament una altra, quan s'afegeix o es crea un disc virtual.</translation>
     </message>
     <message>
-        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Reinicia el camí a la carpeta de màquines virtuals al seu valor predeterminat. Després d'acceptar els canvis i tornar a obrir aquest diàleg, s'hi mostrarà aquest camí.</translation>
     </message>
     <message>
-        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Reinicia el camí a la carpeta de fitxers VDI al seu valor predeterminat. Després d'acceptar els canvis i tornar a obrir aquest diàleg, s'hi mostrarà aquest camí.</translation>
     </message>
     <message>
@@ -16441,7 +16515,7 @@ a l'idioma predeterminat del sistema.</qt>
         <translation type="obsolete">Obre un diàleg per seleccionar el fitxer de la biblioteca d'autenticació VRDP .</translation>
     </message>
     <message>
-        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Reinicia el fitxer de la biblioteca d'autenticació al seu valor predeterminat. Després d'acceptar els canvis i tornar a obrir aquest diàleg, s'hi mostrarà aquest fitxer.</translation>
     </message>
     <message>
@@ -16976,15 +17050,15 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati
         <translation type="obsolete">Crea un disc virtual nou</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -17111,8 +17185,8 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati
         <translation type="obsolete">&No feu servir aquesta informació per contactar amb mi</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
-        <translation type="obsolete"><p>Ompliu aquest formulari de registre per fer-nos saber que fas servir el VirtualBox i, opcionalment, per mantenir't informat sobre noves versions i actualitzacions.</p><p>Introduïu als camps següents el vostre nom complet fent servir caràcters llatins i la vostra adreça de correu. Teniu en compte que innotek farà servir aquesta informació només per recopilar estadístiques d'ús del producte i per informar-vos de novetats.  [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
+        <translation type="obsolete"><p>Ompliu aquest formulari de registre per fer-nos saber que fas servir el VirtualBox i, opcionalment, per mantenir't informat sobre noves versions i actualitzacions.</p><p>Introduïu als camps següents el vostre nom complet fent servir caràcters llatins i la vostra adreça de correu. Teniu en compte que innotek farà servir aquesta informació només per recopilar estadístiques d'ús del producte i per informar-vos de novetats.  [...]
     </message>
     <message>
         <source>VirtualBox Registration Dialog</source>
@@ -17127,8 +17201,8 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati
         <translation type="obsolete">No s'ha pogut dur a terme la conformitat de connexió.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Ompliu aquest formulari de registre per deixar-nos conèixer que feu servir el VirtualBox i, opcionalment, per mantenir-vos informat sobre novetats i actualitzacions.</p><p>Introduïu el vostre nom complet fent servir caràcters llatins i la vostra adreça de correu electrònica als camps següents. Tingueu en compte que Sun Microsystems farà servir aquesta informació només per estadístiques del producte i per enviar-vos notícies sobre  [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Ompliu aquest formulari de registre per deixar-nos conèixer que feu servir el VirtualBox i, opcionalment, per mantenir-vos informat sobre novetats i actualitzacions.</p><p>Introduïu el vostre nom complet fent servir caràcters llatins i la vostra adreça de correu electrònica als camps següents. Tingueu en compte que Sun Microsystems farà servir aquesta informació només per estadístiques del producte i per enviar-vos notícies sobre  [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -17147,8 +17221,8 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati
         <translation type="obsolete">Seleccioneu un país/territori</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
-        <translation type="obsolete"><p>Ompliu aquest formulari de registre per permetre'ns conèixer que feu servir el VirtualBox i, opcionalment, mantenir-vos informat sobre novetats i actualitzacions del VirtualBox.</p><p>Feu servir caràcters llatins per omplir els camps següents. Tingueu en compte que Sun Microsystems farà servir aquesta informació només per a usos estadístics i per enviar-vos notícies sobre el VirtualBox. Sun Microsystems mai compartirà les vos [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
+        <translation type="obsolete"><p>Ompliu aquest formulari de registre per permetre'ns conèixer que feu servir el VirtualBox i, opcionalment, mantenir-vos informat sobre novetats i actualitzacions del VirtualBox.</p><p>Feu servir caràcters llatins per omplir els camps següents. Tingueu en compte que Sun Microsystems farà servir aquesta informació només per a usos estadístics i per enviar-vos notícies sobre el VirtualBox. Sun Microsystems mai compartirà les vos [...]
     </message>
     <message>
         <source>I &already have a Sun Online account:</source>
@@ -17493,8 +17567,8 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati
         <translation type="obsolete">Suspèn l'execució de la màquina virtual</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Benvingut a VirtualBox!</h3><p>A la part esquerra d'aquesta finestra es mostra un llistat de totes les màquines virtuals a l'ordinador. Aquest llistat és buit actualment perquè encara no heu creat cap màquina virtual.<img src=:/welcome.png align=right/></p><p>Per crear una nova màquina virtual, premeu sobre el botó <b>Nova</b> a la barra principal que es troba a la part de dalt d'aques [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Benvingut a VirtualBox!</h3><p>A la part esquerra d'aquesta finestra es mostra un llistat de totes les màquines virtuals a l'ordinador. Aquest llistat és buit actualment perquè encara no heu creat cap màquina virtual.<img src=:/welcome.png align=right/></p><p>Per crear una nova màquina virtual, premeu sobre el botó <b>Nova</b> a la barra principal que es troba a la part de dalt d'aques [...]
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
@@ -18331,6 +18405,217 @@ o a ambdòs (<i>Qualsevol</i>).</qt></translation>
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>Session Information Dialog</source>
+        <translation type="obsolete">Diàleg Informatiu de la Sessió</translation>
+    </message>
+    <message>
+        <source>&Close</source>
+        <translation type="obsolete">Tan&ca</translation>
+    </message>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Informació de la sessió</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Detalls</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Temps d'execució</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">Transferències DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">Transferències PIO</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Lectura de dades</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Escriptura de dades</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Transmissió de dades</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Recepció de dades</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Activat</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="obsolete">Desactivat</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Atributs del temps d'execució</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Resolució de pantalla</translation>
+    </message>
+    <message>
+        <source>Hardware Virtualization</source>
+        <translation type="obsolete">Virtualització per Maquinari</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">Estadístiques CD/DVD</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Estadístiques de l'adaptador de xarxa</translation>
+    </message>
+    <message>
+        <source>Adapter 1</source>
+        <translation type="obsolete">Adaptador 1</translation>
+    </message>
+    <message>
+        <source>Adapter 2</source>
+        <translation type="obsolete">Adaptador 2</translation>
+    </message>
+    <message>
+        <source>Adapter 3</source>
+        <translation type="obsolete">Adaptador 3</translation>
+    </message>
+    <message>
+        <source>Adapter 4</source>
+        <translation type="obsolete">Adaptador 4</translation>
+    </message>
+    <message>
+        <source>Not attached</source>
+        <translation type="obsolete">No connectat</translation>
+    </message>
+    <message>
+        <source>Hard Disks Statistics</source>
+        <translation type="obsolete">Estadístiques dels discos durs</translation>
+    </message>
+    <message>
+        <source>Primary Master</source>
+        <translation type="obsolete">Primari Mestre</translation>
+    </message>
+    <message>
+        <source>Primary Slave</source>
+        <translation type="obsolete">Primari Esclau</translation>
+    </message>
+    <message>
+        <source>Secondary Master</source>
+        <translation type="obsolete">Secundari Mestre</translation>
+    </message>
+    <message>
+        <source>Secondary Slave</source>
+        <translation type="obsolete">Secundari Esclau</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Versió %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">No detectat</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">No detectat</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Guest Additions</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Tipus de sistema client</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Estadístiques de discos durs</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">No hi ha cap disc dur</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">No hi ha cap adaptador de xarxa</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Activat</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Desactivat</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <translation type="obsolete">Paginació imbricada</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">No disponible</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Estadístiques d'emmagatzematge</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">No hi ha cap dispositiu d'emmagatzematge</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Estadístiques de xarxa</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Paginació imbricada</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">No disponible</translation>
+    </message>
+    <message>
+        <source>Clipboard Mode</source>
+        <translation type="obsolete">Mode de porta-retalls</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">Mode d'arrossega i deixa d'anar</translation>
+    </message>
+    <message>
+        <source>Configuration &Details</source>
+        <translation type="obsolete">&Detalls de configuració</translation>
+    </message>
+    <message>
+        <source>&Runtime Information</source>
+        <translation type="obsolete">Informació del &temps d'execució</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMListBox</name>
     <message>
         <source>Inaccessible</source>
@@ -18422,7 +18707,7 @@ o a ambdòs (<i>Qualsevol</i>).</qt></translation>
     </message>
     <message>
         <source>Holds the TAP interface name.</source>
-        <translation type="obsolete">Mostra el nom de la intefície TAP.</translation>
+        <translation type="obsolete">Mostra el nom de la interfície TAP.</translation>
     </message>
     <message>
         <source>&Enable Network Adapter</source>
@@ -19213,7 +19498,7 @@ aquesta característica després d'haver instal·lat un Windows al sistema
         <translation type="obsolete">Reinicialitza</translation>
     </message>
     <message>
-        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Reinicia la ruta de la carpeta de captures al valor per defecte. La ruta actual per defecte es mostrarà acceptant els canvis i obrint novament aquest diàleg.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
index f813894..daed0d1 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
@@ -15,8 +15,8 @@
     </message>
     <message>
         <source>English</source>
-        <comment>Language name, in English</comment>
-        <translation>Catalan (Valencian)</translation>
+        <comment>Catalan (Valencian)</comment>
+        <translation type="obsolete">Catalan</translation>
     </message>
     <message>
         <source>--</source>
@@ -28,6 +28,11 @@
         <comment>Comma-separated list of translators</comment>
         <translation>Vicent Fornés, Pau Iranzo <pau.iranzo at softcatala.org></translation>
     </message>
+    <message>
+        <source>English</source>
+        <comment>Language name, in English</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AttachmentsModel</name>
@@ -363,8 +368,8 @@
         <translation type="obsolete">D&iàleg informatiu de la sessió</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
-        <translation type="obsolete">Mostra el diàleg informatiu de la sessió</translation>
+        <source>Show Session Information Window</source>
+        <translation type="obsolete">Mostra el diàleg d'informació de la sessió</translation>
     </message>
     <message>
         <source>&Pause</source>
@@ -455,12 +460,12 @@
         <translation type="obsolete">Habilita o inhabilita les connexions d'escriptori remot (RDP) a esta màquina</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Instal·la les Guest Additions...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation>&Insereix la imatge de CD de les Guest Additions...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
-        <translation type="obsolete">Munta la imatge d'instal·lació de les Guest Additions</translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <translation type="obsolete">Insereix el fitxer de disc de les Guest Additions al dispositiu virtual</translation>
     </message>
     <message>
         <source>De&bug</source>
@@ -479,7 +484,7 @@
     <message>
         <source>&Logging...</source>
         <comment>debug action</comment>
-        <translation type="obsolete">&S'està connectant...</translation>
+        <translation type="obsolete">&S'està afegint al registre...</translation>
     </message>
     <message>
         <source>&Help</source>
@@ -951,120 +956,122 @@
         <translation type="obsolete">Arrosega i deixa anar</translation>
     </message>
     <message>
+        <source>Save the machine state of the virtual machine</source>
+        <translation type="obsolete">Alça l'estat de la màquina virtual</translation>
+    </message>
+    <message>
         <source>Power off the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Apaga la màquina virtual</translation>
     </message>
     <message>
         <source>&Network Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Paràmetres de xarxa...</translation>
     </message>
     <message>
         <source>&Shared Folders Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Paràmetre&s de carpeta compartida...</translation>
     </message>
     <message>
         <source>R&emote Display</source>
-        <translation type="unfinished"></translation>
+        <translation>&Pantalla remota</translation>
+    </message>
+    <message>
+        <source>Toggle remote desktop (RDP) connections to this machine</source>
+        <translation type="obsolete">Intercanvia les connexions d'escriptori remotes (RDP) a esta màquina</translation>
     </message>
     <message>
         <source>&Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Captura de &vídeo</translation>
+    </message>
+    <message>
+        <source>Toggle video capture</source>
+        <translation type="obsolete">Intercanvia la captura de vídeo</translation>
     </message>
     <message>
         <source>&Video Capture Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Paràmetres de la captura de &vídeo...</translation>
     </message>
     <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
+        <source>Configure video capture settings</source>
+        <translation type="obsolete">Configureu els paràmetres de la captura de vídeo</translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
+        <source>Popup Menu</source>
+        <translation>Menú emergent</translation>
     </message>
     <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">&Instal·la les Guest Additions...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Munta la imatge d'instal·lació de les Guest Additions</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&Webcams</source>
+        <translation>Càmeres &web</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Xarxa</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Fitxer</translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="unfinished">&Teclat</translation>
-    </message>
-    <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Xarxa</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Preferències...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Mostra el &registre...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Fitxer</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1080,175 +1087,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Preferències...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <source>&Keyboard</source>
+        <translation type="unfinished">&Teclat</translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <source>&Hard Disks</source>
+        <translation type="unfinished">&Discos durs</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="unfinished">&Discos durs</translation>
+        <source>&USB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Mostra el &registre...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1287,10 +1294,18 @@
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha connectat cap càmera web</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
+        <translation type="unfinished">No hi ha cap càmera web compatible connecatada a l'ordinador amfitrió</translation>
+    </message>
+    <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1310,7 +1325,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1318,7 +1333,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1342,15 +1357,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1362,11 +1389,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1374,7 +1401,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1418,15 +1445,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1435,34 +1462,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Habilita</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1486,6 +1487,19 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -3259,7 +3273,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
         <comment>details (network)</comment>
-        <translation>Mòdul genèric, «%1» {&nbsp;%2&nbsp;}</translation>
+        <translation type="obsolete">Mòdul genèric, «%1» {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -3279,31 +3293,31 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Video Capture File</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Fitxer de captura de vídeo</translation>
     </message>
     <message>
         <source>Video Capture Attributes</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Atributs de captura de vídeo</translation>
     </message>
     <message>
         <source>Video Capture</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Captura de vídeo</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Desactivat</translation>
     </message>
     <message>
         <source>NAT Network, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Xarxa NAT, «%1»</translation>
     </message>
     <message>
         <source>Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>Mida del marc: %1x%2, Marcs per segon: %3fps, Bits per segon: %4kbps</translation>
     </message>
     <message>
         <source>Minimal Paravirtualization</source>
@@ -3321,83 +3335,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>[Optical Drive]</source>
         <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>USB Controller</source>
         <comment>details (usb)</comment>
         <translation type="unfinished">Controlador USB</translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini-toolbar</source>
-        <comment>details (user interface)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Menu-bar</source>
+        <source>Mini-toolbar Position</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
+        <source>Mini-toolbar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3720,7 +3739,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Extension Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Paquets d'&extensió</translation>
     </message>
     <message>
         <source>Add Package</source>
@@ -3798,8 +3817,28 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Inhabilita el protector de pantalla de l'a&mfitrió</translation>
     </message>
     <message>
+        <source>&Dock and Menubar:</source>
+        <translation type="obsolete">&Acoblador i barra de menú:</translation>
+    </message>
+    <message>
+        <source>Auto-Show in Fullscreen</source>
+        <translation type="obsolete">Mostra automàticament en pantalla completa</translation>
+    </message>
+    <message>
+        <source>When checked, the host dock and menu bar will be shown when the virtual machine is in fullscreen mode.</source>
+        <translation type="obsolete">Quan estiga actiu, l'acoblador de l'amfitrió i la barra de menú es mostraran quan la màquina virtual es trobe en mode de pantalla completa.</translation>
+    </message>
+    <message>
+        <source>&Host Screensaver:</source>
+        <translation type="obsolete">Estalvi de pantalla de l'&amfitrió:</translation>
+    </message>
+    <message>
         <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
-        <translation type="unfinished"></translation>
+        <translation>Quan estiga actiu, l'estalvi de pantalla de l'amfitrió es desactivarà quan la màquina virtual s'estiga executant.</translation>
+    </message>
+    <message>
+        <source>Disable When Running Virtual Machines</source>
+        <translation type="obsolete">Desactiva quan s'estiguen executant màquines virtuals</translation>
     </message>
     <message>
         <source>Host Screensaver:</source>
@@ -3846,19 +3885,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Host Key Combination</source>
-        <translation type="unfinished"></translation>
+        <translation>Combinació de tecla d'amfitrió</translation>
     </message>
     <message>
         <source>Some items have the same shortcuts assigned.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alguns elements tenen les mateixes dreceres assignades.</translation>
     </message>
     <message>
         <source>&VirtualBox Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestor del &VirtualBox</translation>
     </message>
     <message>
         <source>Virtual &Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>&Màquina virtual</translation>
+    </message>
+    <message>
+        <source>Lists all the available shortcuts which can be configured.</source>
+        <translation type="obsolete">Mostra totes les dreceres disponibles que poden configurar-se.</translation>
+    </message>
+    <message>
+        <source>Enter a sequence to filter the shortcut list.</source>
+        <translation type="obsolete">Introduïu una seqüència per filtrar el llistat de dreceres.</translation>
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
@@ -3925,7 +3972,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Interface Languages</source>
-        <translation type="unfinished"></translation>
+        <translation>Llengües de la &interfície</translation>
     </message>
 </context>
 <context>
@@ -4082,116 +4129,128 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&NAT Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>Xarxes &NAT</translation>
     </message>
     <message>
         <source>Lists all available NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra totes les xarxes NAT disponibles.</translation>
     </message>
     <message>
         <source>&Host-only Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>Xarxes de &només amfitrió</translation>
     </message>
     <message>
         <source>No new name specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha proveït un nom nou per a la xarxa NAT que abans s'anomenava <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha proveït un CIDR per a la xarxa NAT <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha proveït un CIDR per a la xarxa NAT que abans s'anomenava <b>%1</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>S'ha proveït un CIDR no vàlid (<i>%1</i>) per a la xarxa NAT <b>%2</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>S'ha proveït un CIDR no vàlid (<i>%1</i>) per a la xarxa NAT abans anomenada <b>%2</b>.</translation>
     </message>
     <message>
         <source>Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom de la xarxa</translation>
     </message>
     <message>
         <source>[empty]</source>
-        <translation type="unfinished"></translation>
+        <translation>[buit]</translation>
     </message>
     <message>
         <source>%1 (renamed from %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (reanomenat des de %2)</translation>
     </message>
     <message>
         <source>Old Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom antic de la xarxa</translation>
     </message>
     <message>
         <source>New Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom nou de la xarxa</translation>
     </message>
     <message>
         <source>Network CIDR</source>
-        <translation type="unfinished"></translation>
+        <translation>CIDR de la xarxa</translation>
     </message>
     <message>
         <source>Supports DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Compatible amb DHCP</translation>
     </message>
     <message>
         <source>yes</source>
-        <translation type="unfinished"></translation>
+        <translation>sí</translation>
     </message>
     <message>
         <source>no</source>
-        <translation type="unfinished"></translation>
+        <translation>no</translation>
     </message>
     <message>
         <source>Supports IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Compatible amb IPv6</translation>
     </message>
     <message>
         <source>Default IPv6 route</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruta IPv6 per defecte</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una adreça IPv4 vàlida.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 network mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una màscara de xarxa IPv4 vàlida.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv6 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una adreça IPv6 vàlida.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment un servidor d'adreça DHCP vàlida.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una màscara de xarxa DHCP vàlida.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server lower address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una límit d'adreça inferior vàlida del servidor DHCP.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server upper address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>La interfície <b>%1</b> de l'amfitrió no té actualment una límit d'adreça superior vàlida del servidor DHCP.</translation>
     </message>
     <message>
         <source>The name <b>%1</b> is being used for several NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja s'està utilitzant el nom <b>%1</b> per a algunes xarxes NAT.</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>NAT network</comment>
-        <translation type="unfinished">Actiu</translation>
+        <translation>Activa</translation>
+    </message>
+    <message>
+        <source>&Add NAT network</source>
+        <translation type="obsolete">&Afig una xarxa NAT</translation>
+    </message>
+    <message>
+        <source>&Remove NAT network</source>
+        <translation type="obsolete">&Suprimeix una xarxa NAT</translation>
+    </message>
+    <message>
+        <source>&Edit NAT network</source>
+        <translation type="obsolete">&Edita una xarxa NAT</translation>
     </message>
     <message>
         <source>Add NAT Network</source>
@@ -4341,15 +4400,15 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsNetworkDetailsHost</name>
     <message>
         <source>Host-only Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalls de xarxa de només l'amfitrió</translation>
     </message>
     <message>
         <source>&Adapter</source>
-        <translation type="unfinished">&Adaptador</translation>
+        <translation>&Adaptador</translation>
     </message>
     <message>
         <source>Manual &Configuration</source>
-        <translation type="unfinished">&Configuració manual</translation>
+        <translation>&Configuració manual</translation>
     </message>
     <message>
         <source>Use manual configuration for this host-only network adapter.</source>
@@ -4357,43 +4416,43 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&IPv4 Address:</source>
-        <translation type="unfinished">Adreça &IPv4:</translation>
+        <translation>Adreça &IPv4:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 address for this adapter.</source>
-        <translation type="unfinished">Mostra l'adreça IPv4 de l'amfitrió d'este adaptador.</translation>
+        <translation>Gestiona l'adreça IPv4 de l'amfitrió d'este adaptador.</translation>
     </message>
     <message>
         <source>IPv4 Network &Mask:</source>
-        <translation type="unfinished">&Màscara de xarxa IPv4:</translation>
+        <translation>&Màscara de xarxa IPv4:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 network mask for this adapter.</source>
-        <translation type="unfinished">Mostra la màscara de xarxa IPv4 de l'amfitrió d'este adaptador.</translation>
+        <translation>Mostra la màscara de xarxa IPv4 de l'amfitrió d'este adaptador.</translation>
     </message>
     <message>
         <source>I&Pv6 Address:</source>
-        <translation type="unfinished">Adreça I&Pv6:</translation>
+        <translation>Adreça I&Pv6:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Mostra l'adreça IPv6 de l'amfitrió d'este adaptador si IPv6 està suportat.</translation>
+        <translation>Gestiona l'adreça IPv6 de l'amfitrió d'este adaptador si IPv6 està suportat.</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &Length:</source>
-        <translation type="unfinished">&Longitud de la màscara de xarxa IPv6:</translation>
+        <translation>&Longitud de la màscara de xarxa IPv6:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Mostra la longitud de l'adreça de la màscara de xarxa IPv6 de l'amfitrió per a este adaptador si IPv6 està suportat.</translation>
+        <translation>Gestiona la longitud de l'adreça de la màscara de xarxa IPv6 de l'amfitrió per a este adaptador si IPv6 està suportat.</translation>
     </message>
     <message>
         <source>&DHCP Server</source>
-        <translation type="unfinished">Servidor &DHCP</translation>
+        <translation>Servidor &DHCP</translation>
     </message>
     <message>
         <source>&Enable Server</source>
-        <translation type="unfinished">&Habilita el servidor</translation>
+        <translation>&Habilita el servidor</translation>
     </message>
     <message>
         <source>Indicates whether the DHCP Server is enabled on machine startup or not.</source>
@@ -4401,42 +4460,42 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Server Add&ress:</source>
-        <translation type="unfinished">Ad&reça del servidor:</translation>
+        <translation>Ad&reça del servidor:</translation>
     </message>
     <message>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Mostra l'adreça del servidor DHCP de la xarxa associada a este adaptador de només l'amfitrió.</translation>
+        <translation>Gestiona l'adreça del servidor DHCP de la xarxa associada a este adaptador de només l'amfitrió.</translation>
     </message>
     <message>
         <source>Server &Mask:</source>
-        <translation type="unfinished">&Màscara del servidor:</translation>
+        <translation>&Màscara del servidor:</translation>
     </message>
     <message>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Mostra la màscara de xarxa del servidor DHCP de la xarxa associada a este adaptador de només l'amfitrió.</translation>
+        <translation>Gestiona la màscara de xarxa del servidor DHCP de la xarxa associada a este adaptador de només l'amfitrió.</translation>
     </message>
     <message>
         <source>&Lower Address Bound:</source>
-        <translation type="unfinished">Adreça límit &inferior:</translation>
+        <translation>Adreça límit &inferior:</translation>
     </message>
     <message>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Mostra l'adreça límit inferior oferida pel servidor DHCP de la xarxa associada aquet adaptador de només l'amfitrió.</translation>
+        <translation>Gestiona l'adreça límit inferior oferida pel servidor DHCP de la xarxa associada aquet adaptador de només l'amfitrió.</translation>
     </message>
     <message>
         <source>&Upper Address Bound:</source>
-        <translation type="unfinished">Adreça límit &superior:</translation>
+        <translation>Adreça límit &superior:</translation>
     </message>
     <message>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Mostra l'adreça límit superior oferida pel servidor DHCP de la xarxa associada a este adaptador de només l'amfitrió.</translation>
+        <translation>Gestiona l'adreça límit superior oferida pel servidor DHCP de la xarxa associada a este adaptador de només l'amfitrió.</translation>
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4444,43 +4503,59 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsNetworkDetailsNAT</name>
     <message>
         <source>NAT Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalls de la xarxa NAT</translation>
     </message>
     <message>
         <source>&Enable Network</source>
-        <translation type="unfinished"></translation>
+        <translation>&Activa la xarxa</translation>
+    </message>
+    <message>
+        <source>Enable this NAT network.</source>
+        <translation type="obsolete">Activa esta xarxa NAT.</translation>
     </message>
     <message>
         <source>Network &Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Nom de la Xarxa:</translation>
     </message>
     <message>
         <source>Holds the name for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestiona el nom per esta xarxa.</translation>
     </message>
     <message>
         <source>Network &CIDR:</source>
-        <translation type="unfinished"></translation>
+        <translation>Xarxa &CIDR:</translation>
     </message>
     <message>
         <source>Holds the CIDR for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestiona el CIDR per esta xarxa.</translation>
     </message>
     <message>
         <source>Network Options:</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcions de xarxa:</translation>
     </message>
     <message>
         <source>Supports &DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Compatible amb &DHCP</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports DHCP.</source>
+        <translation type="obsolete">Determina si la xarxa és compatible amb DHCP.</translation>
     </message>
     <message>
         <source>Supports &IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Compatible amb &IPv6</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports IPv6.</source>
+        <translation type="obsolete">Determina si la xarxa és compatible amb IPv6.</translation>
     </message>
     <message>
         <source>Advertise Default IPv6 &Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Publicita com a &camí IPv6 per defecte</translation>
+    </message>
+    <message>
+        <source>Determines whether this network should be advertised as the default IPv6 route.</source>
+        <translation type="obsolete">Determina si esta xarxa s'hauria de publicitar com a un camí IPv6 per defecte.</translation>
     </message>
     <message>
         <source>Opens a window to manage port forwarding rules.</source>
@@ -4488,7 +4563,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Port Forwarding</source>
-        <translation type="unfinished">Reenviament de &ports</translation>
+        <translation>Reenviament de &ports</translation>
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
@@ -4515,15 +4590,15 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsPortForwardingDlg</name>
     <message>
         <source>Port Forwarding Rules</source>
-        <translation type="unfinished">Regles de redireccionament de ports</translation>
+        <translation>Regles de redireccionament de ports</translation>
     </message>
     <message>
         <source>IPv4</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4</translation>
     </message>
     <message>
         <source>IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6</translation>
     </message>
 </context>
 <context>
@@ -4578,11 +4653,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No proxy host is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha proveït cap servidor intermediari d'amfitrió.</translation>
     </message>
     <message>
         <source>No proxy port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha proveït cap port de servidor intermediari.</translation>
     </message>
     <message>
         <source>Holds the proxy host.</source>
@@ -4659,71 +4734,71 @@ p, li { white-space: pre-wrap; }
     <name>UIHostComboEditor</name>
     <message>
         <source><key_%1></source>
-        <translation type="unfinished"><key_%1></translation>
+        <translation><key_%1></translation>
     </message>
     <message>
         <source>Left </source>
-        <translation type="unfinished">Esquerra</translation>
+        <translation>Esquerra</translation>
     </message>
     <message>
         <source>Right </source>
-        <translation type="unfinished">Dreta</translation>
+        <translation>Dreta</translation>
     </message>
     <message>
         <source>Left Shift</source>
-        <translation type="unfinished">Tecla de majúscules esquerra</translation>
+        <translation>Tecla de majúscules esquerra</translation>
     </message>
     <message>
         <source>Right Shift</source>
-        <translation type="unfinished">Tecla de majúscules dreta</translation>
+        <translation>Tecla de majúscules dreta</translation>
     </message>
     <message>
         <source>Left Ctrl</source>
-        <translation type="unfinished">Control esquerra</translation>
+        <translation>Control esquerra</translation>
     </message>
     <message>
         <source>Right Ctrl</source>
-        <translation type="unfinished">Control dreta</translation>
+        <translation>Control dreta</translation>
     </message>
     <message>
         <source>Left Alt</source>
-        <translation type="unfinished">Alt esquerra</translation>
+        <translation>Alt esquerra</translation>
     </message>
     <message>
         <source>Right Alt</source>
-        <translation type="unfinished">Alt dreta</translation>
+        <translation>Alt dreta</translation>
     </message>
     <message>
         <source>Left WinKey</source>
-        <translation type="unfinished">Tecla de Windows esquerra</translation>
+        <translation>Tecla de Windows esquerra</translation>
     </message>
     <message>
         <source>Right WinKey</source>
-        <translation type="unfinished">Tecla de Windows dreta</translation>
+        <translation>Tecla de Windows dreta</translation>
     </message>
     <message>
         <source>Menu key</source>
-        <translation type="unfinished">Tecla de menú</translation>
+        <translation>Tecla de menú</translation>
     </message>
     <message>
         <source>Alt Gr</source>
-        <translation type="unfinished">Alt Gr</translation>
+        <translation>Alt Gr</translation>
     </message>
     <message>
         <source>Caps Lock</source>
-        <translation type="unfinished">Bloq Majús</translation>
+        <translation>Bloq Majús</translation>
     </message>
     <message>
         <source>Scroll Lock</source>
-        <translation type="unfinished">Bloq Despl</translation>
+        <translation>Bloq Despl</translation>
     </message>
     <message>
         <source>Host+</source>
-        <translation type="unfinished"></translation>
+        <translation>Tecla amfitrió+</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished">Cap</translation>
+        <translation>Cap</translation>
     </message>
 </context>
 <context>
@@ -4910,22 +4985,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Reset shortcut to default</source>
-        <translation type="unfinished"></translation>
+        <translation>Reinicia la drecera al valor per defecte</translation>
     </message>
     <message>
         <source>Unset shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Desconfigura la drecera</translation>
     </message>
 </context>
 <context>
     <name>UIHotKeyTableModel</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Nom</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Drecera</translation>
     </message>
 </context>
 <context>
@@ -5164,23 +5239,24 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Indica l'activitat de captura de vídeo:</nobr><br>%1</translation>
     </message>
     <message>
         <source><nobr><b>Video capture disabled</b></nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>S'ha desactivat la captura de vídeo</b></nobr></translation>
     </message>
     <message>
         <source><nobr><b>Video capture file:</b> %1</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Fitxer de captura de vídeo:</b> %1</nobr></translation>
     </message>
     <message>
         <source>Additional feature status:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="unfinished"></translation>
+        <translation>Estat de característica addicional:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5194,8 +5270,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5272,6 +5347,14 @@ p, li { white-space: pre-wrap; }
         <source>Select a filename for the screenshot ...</source>
         <translation>Seleccioneu un nom de fitxer per a la captura...</translation>
     </message>
+    <message>
+        <source>No Webcams Connected</source>
+        <translation type="obsolete">No s'ha connectat cap càmera web</translation>
+    </message>
+    <message>
+        <source>No supported webcams connected to the host PC</source>
+        <translation type="obsolete">No hi ha cap càmera web compatible connecatada a l'ordinador amfitrió</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsAudio</name>
@@ -5432,122 +5515,130 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Video &Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Captura de &vídeo</translation>
     </message>
     <message>
         <source>When checked, VirtualBox will record the virtual machine session as a video file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Quan estiga marcat, el VirtualBox enregistrarà la sessió a la màquina virtual en un fitxer de vídeo.</translation>
     </message>
     <message>
         <source>&Enable Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>&Activa la captura de vídeo</translation>
     </message>
     <message>
         <source>File &Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Camí al fitxer:</translation>
+    </message>
+    <message>
+        <source>This setting determines the filename VirtualBox uses to save the recorded content.</source>
+        <translation type="obsolete">Este paràmetre determina el nom de fitxer que el VirtualBox utilitza per alçar el contingut enregistrat.</translation>
     </message>
     <message>
         <source>Frame &Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mida del &marc:</translation>
+    </message>
+    <message>
+        <source>This setting determines the resolution (frame size) of the recorded video.</source>
+        <translation type="obsolete">Este paràmetre determina la resolució (mida del marc) del vídeo enregistrat.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
+        <translation type="obsolete">Este paràmetre determina la resolució <b>horitzontal</b> (amplada del marc) del vídeo enregistrat.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>vertical</b> resolution (frame height) of the recorded video.</source>
+        <translation type="obsolete">Este paràmetre determina la resolució <b>vertical</b> (alçada del marc) del vídeo enregistrat.</translation>
     </message>
     <message>
         <source>&Frame Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Marcs per segon:</translation>
+    </message>
+    <message>
+        <source>This setting determines the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
+        <translation type="obsolete">Este paràmetre determina el nombre màxim de <b>marcs per segon</b>. Els marcs addicionals s'ignoraran. En reduir este valor s'incrementarà el nombre de marcs que s'ignoraran i reduirà la mida del fitxer.</translation>
     </message>
     <message>
         <source>&Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Qualitat:</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Este paràmetre determina la <b>qualitat</b>. En incrementar-lo farà que el vídeo es veja millor però amb una mida de fitxer més gran.</translation>
+    </message>
+    <message>
+        <source>This setting determines the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Este paràmetre determina la taxa de bits en <b>kilobits per segon</b>. En incrementar-lo farà que el vídeo es veja millor però amb una mida de fitxer més gran.</translation>
     </message>
     <message>
         <source>&Screens:</source>
-        <translation type="unfinished"></translation>
+        <translation>Pantalle&s:</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use hardware graphics acceleration. However the host system does not currently provide this, so you will not be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>La màquina virtual està configurada per utilitzar l'acceleració gràfica per maquinari. Tot i així, el sistema amfitrió no proveeix això i no podreu iniciar la màquina.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to fullscreen or seamless mode.</source>
+        <translation type="obsolete">La màquina virtual té actualment assignada una memòria de vídeo inferior a <b>%1</b>, que és la quantitat mínima requerida per canviar al mode de pantalla completa o mode fluid.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required for High Definition Video to be played efficiently.</source>
-        <translation type="unfinished"></translation>
+        <translation>La màquina virtual té actualment assignada una memòria de vídeo inferior a <b>%1</b>, que és la quantitat mínima requerida per poder reproduir eficientment el vídeo d'alta resolució.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least b>%1</b>.</source>
+        <translation type="obsolete">La màquina virtual està configurada per utilitzar l'acceleració gràfica i el sistema operatiu suggerit és Windows Vista o posterior. Per a un millor rendiment hauríeu d'establir la memòria de vídeo almenys a <b>%1</b>.</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use Video Stream Acceleration. As this feature only works with Windows guest systems it will be disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>La màquina virtual està configurada per utilitzar l'acceleració de flux de vídeo. Atès que esta característica només funciona amb Windows, el sistema client es desactivarà.</translation>
     </message>
     <message>
         <source>The VRDE server port value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha especificat el valor del port del servidor VRDE.</translation>
     </message>
     <message>
         <source>The VRDE authentication timeout value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha especificat el valor de temps d'espera d'autenticació VRDE.</translation>
     </message>
     <message>
         <source>User Defined</source>
-        <translation type="unfinished"></translation>
+        <translation>Definit per l'usuari</translation>
     </message>
     <message>
         <source>%1 fps</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 fps</translation>
     </message>
     <message>
         <source>fps</source>
-        <translation type="unfinished"></translation>
+        <translation>fps</translation>
     </message>
     <message>
         <source>low</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>baixa</translation>
     </message>
     <message>
         <source>medium</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>mitjana</translation>
     </message>
     <message>
         <source>high</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>alta</translation>
     </message>
     <message>
         <source>kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>kbps</translation>
     </message>
     <message>
         <source>Screen %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Barra d'eines mini:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Si està marcat, mostra la barra d'eines mini als modes fluid i de pantalla completa.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Mostra en pantalla completa/&fluid</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Si està marcat, mostra una barra d'eines petita a la part de dalt de la pantalla en lloc d'a la posició per defecte a la part de sota.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Mostra a la par&t de dalt de la pantalla</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pantalla %1</translation>
     </message>
     <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Enable video recording for screen %1.</source>
+        <translation type="obsolete">Activa l'enregistrament de vídeo per a la pantalla %1.</translation>
     </message>
     <message>
         <source>&Screen</source>
@@ -5562,15 +5653,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5586,10 +5673,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5638,6 +5721,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 MB</translation>
     </message>
@@ -5646,6 +5737,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5673,8 +5768,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Mostra el camí on les captures d'esta màquina virtual s'alçaran. Tingueu en compte que les captures poden ocupar prou quantitat d'espai al disc dur.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Bàsic</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Bàsic</translation>
     </message>
     <message>
         <source>Identification</source>
@@ -5725,8 +5820,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Controla la quantitat de memòria de vídeo amb què es proveeix a la màquina virtual.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Avançat</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Avançat</translation>
     </message>
     <message>
         <source>Boo&t Order:</source>
@@ -5821,8 +5916,8 @@ p, li { white-space: pre-wrap; }
         <translation>Carpeta de capture&s:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Descripció</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Descripció</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5897,8 +5992,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">heu seleccionat un tipus de sistema client de 64 bits per a esta màquina virtual. Amb estos tipus de clients es requereix maquinari de virtualització (VT-x/AMD-V), esta característica s'activarà automàticament.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation>Arrosega i &deixa anar:</translation>
+        <source>&Drag'n'Drop:</source>
+        <translation type="obsolete">Arrosega i &deixa anar:</translation>
     </message>
     <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
@@ -5906,19 +6001,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No name specified for the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha especificat cap màquina virtual.</translation>
     </message>
     <message>
         <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>La recomanació del sistema operatiu de la màquina virtual és de tipus 64-bit. Els sistemes client de 64-bit requereixen la virtualització per maquinari i per tant això s'activarà automàticament si confirmeu els canvis.</translation>
     </message>
     <message>
-        <source>Enc&ryption</source>
+        <source>Basi&c</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, enables encryption for this virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <source>A&dvanced</source>
+        <translation type="unfinished">&Avançat</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
+        <translation type="unfinished">D&escripció</translation>
+    </message>
+    <message>
+        <source>Enc&ryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When checked, enables encryption for this virtual machine.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>En&able Encryption</source>
@@ -5929,6 +6040,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5961,16 +6076,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5981,28 +6092,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Barra d'eines mini:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Si està marcat, mostra la barra d'eines mini als modes fluid i de pantalla completa.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Mostra en pantalla completa/&fluid</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Si està marcat, mostra una barra d'eines petita a la part de dalt de la pantalla en lloc d'a la posició per defecte a la part de sota.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -6012,18 +6115,6 @@ p, li { white-space: pre-wrap; }
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -6177,7 +6268,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the TAP interface name.</source>
-        <translation type="obsolete">Mostra el nom de la intefície TAP.</translation>
+        <translation type="obsolete">Mostra el nom de la interfície TAP.</translation>
     </message>
     <message>
         <source>&Setup Application:</source>
@@ -6277,35 +6368,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No bridged network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualment no s'ha seleccionat cap adaptador de xarxa pont.</translation>
     </message>
     <message>
         <source>No internal network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualment no s'ha especificat cap nom de xarxa interna.</translation>
     </message>
     <message>
         <source>No host-only network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualment no s'ha seleccionat cap adaptador de xarxa de només amfitrió.</translation>
     </message>
     <message>
         <source>No generic driver is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualment no s'ha seleccionat cap controlador genèric.</translation>
     </message>
     <message>
         <source>The MAC address must be 12 hexadecimal digits long.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'adreça MAC ha de tindre 12 dígits hexadecimals.</translation>
     </message>
     <message>
         <source>The second digit in the MAC address may not be odd as only unicast addresses are allowed.</source>
-        <translation type="unfinished"></translation>
+        <translation>El segon dígit a l'adreça MAC no pot ser senar ja que només es permeten adreces unicast.</translation>
     </message>
     <message>
         <source>No NAT network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualment no s'ha especificat cap nom de xarxa NAT.</translation>
     </message>
     <message>
         <source>Holds the name of the NAT network that this network card will be connected to. You can create and remove networks using the global network settings in the virtual machine manager window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestiona el nom de la xarxa NAT que és on es connectarà la targeta de xarxa. Podeu crear o eliminar xarxes fent servir els paràmetres globals de xarxa a la finestra de gestió de màquines virtuals.</translation>
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
@@ -6487,23 +6578,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap IRQ.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap port d'E/S.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dos o més ports tenen els mateixos paràmetres.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap camí de port.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">S'han proveït dos camins de ports duplicats.</translation>
     </message>
 </context>
 <context>
@@ -6520,6 +6611,26 @@ p, li { white-space: pre-wrap; }
         <source>Duplicate port path entered </source>
         <translation type="obsolete">S'ha introduït un camí al port duplicat</translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap IRQ.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap port d'E/S.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Dos o més ports tenen els mateixos paràmetres.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap camí de port.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">S'han proveït dos camins de ports duplicats.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsPortForwardingDlg</name>
@@ -6714,6 +6825,10 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Si està marcat, esta carpeta compartida serà permanent.</translation>
     </message>
     <message>
+        <source>Window</source>
+        <translation type="obsolete">Finestra</translation>
+    </message>
+    <message>
         <source>When checked, this shared folder will be permanent.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6794,44 +6909,44 @@ p, li { white-space: pre-wrap; }
         <translation>Mostra l'adreça base d'E/S d'este port en sèrie. Valors vàlids són nombres enter amb un rang entre <tt>0</tt> i <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap IRQ.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap port d'E/S.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dos o més ports tenen els mateixos paràmetres.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">No s'ha proveït cap camí de port.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">S'han proveït dos camins de ports duplicats.</translation>
     </message>
 </context>
 <context>
@@ -6848,6 +6963,26 @@ p, li { white-space: pre-wrap; }
         <source>Duplicate port path entered </source>
         <translation type="obsolete">S'ha introduït un camí de port duplicat</translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap IRQ.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap port d'E/S.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Dos o més ports tenen els mateixos paràmetres.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">No s'ha proveït cap camí de port.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">S'han proveït dos camins de ports duplicats.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsStorage</name>
@@ -6949,7 +7084,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No hard disk is selected for <i>%1</i>.</source>
-        <translation type="unfinished">No hi ha cap disc dur seleccionat per a <i>%1</i>.</translation>
+        <translation>No hi ha cap disc dur seleccionat per a <i>%1</i>.</translation>
     </message>
     <message>
         <source><i>%1</i> uses a medium that is already attached to <i>%2</i>.</source>
@@ -7283,46 +7418,46 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No name is currently specified for the controller at position <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha especificat cap nom per al controlador de la posició <b>%1</b>.</translation>
     </message>
     <message>
         <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>El controlador de la posició <b>%1</b> fa servir el nom que ja fa servir el controlador de la posició <b>%2</b>.</translation>
     </message>
     <message>
         <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>%1</i> fa servir el disc dur que es troba connectat a <i>%2</i>.</translation>
     </message>
     <message>
         <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>La màquina té assignats més controladors d'emmagatzematge del que els xips %1 són compatibles. Canvieu el tipus de xip a la pàgina de paràmetres del sistema o reduïu el nombre dels controladors següents d'emmagatzematge a la pàgina de paràmetres d'emmagatzematge: %2</translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk file...</source>
-        <translation type="obsolete">Seleccioneu un fitxer de disc òptic virtual...</translation>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7330,68 +7465,65 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Imatge</translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source>Add USB Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Imatge</translation>
-    </message>
-    <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7407,7 +7539,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7636,30 +7768,54 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Pointing Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dispositiu del &punter:</translation>
     </message>
     <message>
         <source>Determines whether the emulated pointing device is a standard PS/2 mouse, a USB tablet or a USB multi-touch tablet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Determina si el dispositiu del cursor és un ratolí PS/2 estàndard, una tauleta USB o una tauleta multitàctil USB.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. Not enough memory is left for the host operating system. Please select a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Més de <b>%1%</b> de la memòria (<b>%2</b>) de l'ordinador amfitrió està assignada a la màquina virtual. No s'ha deixat suficient memòria per al sistema operatiu amfitrió. Seleccioneu una quantitat inferior.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. There might not be enough memory left for the host operating system. Please consider selecting a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Més de <b>%1%</b> de la memòria (<b>%2</b>) de l'ordinador amfitrió està assignada a la màquina virtual. Això podria no deixar suficient memòria per al sistema operatiu amfitrió. Considereu seleccionar una quantitat inferior.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">La característica E/S APIC no està habilitada a la secció placa mare de la pàgina Sistema. Això és necessari per la compatibilitat amb un xip del tipus ICH9. Es farà automàticament si confirmeu els canvis.</translation>
+    </message>
+    <message>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">L'emulació del controlador USB no s'ha habilitat al a pàgina USB. Això és necessari per la compatibilitat amb un dispositiu d'entrada USB. Es farà automàticament si confirmeu els canvis.</translation>
     </message>
     <message>
         <source>For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Per raons de rendiment, el nombre dels processadors virtuals connectats a la màquina virtual no pot ser més del doble del nombre de processadors físics de l'amfitrió (<b>%1</b>). Reduïu el nombre de processadors virtuals.</translation>
     </message>
     <message>
         <source>More virtual CPUs are assigned to the virtual machine than the number of physical CPUs on the host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hi ha més processadors virtuals connectats a la màquina virtual que el nombre de processadors físics de l'amfitrió (<b>%1</b>). Això pot afectar al rendiment de la màquina virtual. Considereu reduir-ne el nombre de processadors virtuals.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">La característica E/S APIC no està habilitada a la secció placa mare de la pàgina Sistema. Això és necessari per la compatibilitat amb un processador virtual. Es farà automàticament si confirmeu els canvis.</translation>
+    </message>
+    <message>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">La virtualització de maquinari no està habilitada a la secció Acceleració de la pàgina Sistema. Això és necessari per la compatibilitat amb més d'un processador virtual. Es farà automàticament si confirmeu els canvis.</translation>
     </message>
     <message>
         <source>The processor execution cap is set to a low value. This may make the machine feel slow to respond.</source>
+        <translation>El cap d'execució del processador està establer a un valor baix. Això pot fer paréixer que la màquina va lenta. </translation>
+    </message>
+    <message>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7687,14 +7843,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 MB</translation>
     </message>
@@ -7845,31 +7993,35 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">L'USB 2.0 es troba activat per a esta màquina virtual. Tot i així, això requereix la instal·lació de <b>%1</b>. Instal·leu el paquet d'extensions des del lloc web de baixades del VirtualBox. Una vegada fet això, haureu de tornar a activar l'USB 2.0. Mentrestant es desactivarà a no ser que cancel·leu els canvis dels paràmetres actuals.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0 to be able to start the machine.</source>
+        <translation type="obsolete">L'USB 2.0 es troba activat per a esta màquina virtual. Tot i així, això requereix la instal·lació de <b>%1</b>. Instal·leu el paquet d'extensions des del lloc web de baixades del VirtualBox o desactiveu la compabilitat USB 2.0 per iniciar la màquina.</translation>
+    </message>
+    <message>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8126,14 +8278,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Tanca</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Canvia</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Tanca</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8350,8 +8502,8 @@ p, li { white-space: pre-wrap; }
         <translation><nobr>Avís</nobr></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>S'ha produït un error crític mentre s'executava la màquina virtual, que s'ha aturat.</p><p>Per obtindre ajuda, visiteu la secció Community a  <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> o al vostre contracte de suport. Afegiu el contingut del fitxer de registre <tt>VBox.log</tt> i el fitxer d'imatge <tt>VBox.png</tt>,que podreu trobar al directori <nobr [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation type="obsolete"><p>S'ha produït un error crític mentre s'executava la màquina virtual, que s'ha aturat.</p><p>Per obtindre ajuda, visiteu la secció Community a  <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> o al vostre contracte de suport. Afegiu el contingut del fitxer de registre <tt>VBox.log</tt> i el fitxer d'imatge <tt>VBox.png</tt>,que podreu trobar al directori <no [...]
     </message>
     <message>
         <source><p>A fatal error has occurred during virtual machine execution! The virtual machine will be powered off. Please copy the following error message using the clipboard to help diagnose the problem:</p></source>
@@ -8482,15 +8634,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete"><p>La màquina virtual passarà ara al mode <b>fluid</b>. Podeu tornar arrere al mode finestra prement <b>%1</b>. Tingueu en compte que la <i>tecla d'amfitrió</i> està definida actualment com <b>%2</b>.</p><p>La barra de menú estarà amagada al mode fluid. Podreu accedir a ella prement <b>tecla d'amfitrió+Home</b>.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>El programa VirtualBox Guest Additions instal·lat al sistema client no és a la darrera versió: la versió instal·lada és %1 i la més nova és la %2. Algunes característiques que requereixen les Guest Additions (integració del punter, la funció de mida automàtica de l'escriptori) poden no treballar correctament.</p><p>Es recomana actualitzar la versió de Guest Additions a la versió actual triant <b>Instal·la les Guest Addi [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>El programa VirtualBox Guest Additions instal·lat al sistema client està antiquat: la versió instal·lada és %1 i la més nova és la %2. Algunes característiques que requereixen les Guest Additions (integració del punter, la funció de mida automàtica de l'escriptori) poden no treballar correctament.</p><p>Es recomana actualitzar la versió de Guest Additions a la versió actual triant <b>Instal·la les Guest Additions</b& [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><b>El programa VirtualBox Guest Additions instal·lat al sistema client és més recent que la versió suportada: la versió instal·lada és %1 i la més nova és la %2. No es pot fer servir una versió més nova de les Guest Additions amb una versió més antiga del VirtualBox.</p><p>Es recomana instal·lar la versió de Guest Additions a la versió actual triant <b>Instal·lar Guest Additions</b> des del menú <b>Dispositius</b [...]
     </message>
     <message>
@@ -8613,9 +8765,9 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Baixa</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Munta</translation>
+        <translation>Munta</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -8787,8 +8939,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Mostra un diàleg amb la informació del producte</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'este enllaç: </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'este enllaç: </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -8996,8 +9148,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Sob&reescriu</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>S'ha produït un error crític mentre s'executava la màquina virtual, que s'ha aturat.</p><p>Per obtindre ajuda, visiteu la secció Community a  <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> o al vostre contracte de suport. Afegiu el contingut del fitxer de registre <tt>VBox.log</tt> i el fitxer d'imatge <tt>VBox.png</tt>,que podreu trobar al directori <nobr [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>S'ha produït un error crític mentre s'executava la màquina virtual, que s'ha aturat.</p><p>Per obtindre ajuda, visiteu la secció Community a  <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> o al vostre contracte de suport. Afegiu el contingut del fitxer de registre <tt>VBox.log</tt> i el fitxer d'imatge <tt>VBox.png</tt>,que podreu trobar al directori <nobr><b>% [...]
     </message>
     <message>
         <source>Failed to open appliance.</source>
@@ -9335,7 +9487,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">No s'ha pogut desconnectar el disquet (<nobr><b>%1</b></nobr>) de la ranura <i>%2</i> de la màquina <b>%3</b>.</translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully started then s [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="obsolete"><p>Pareix que les Guest Additions del VirtualBox no estan disponibles en esta màquina i les carpetes compartides no es poden fer servir sense elles. Per fer servir carpetes compartides a la màquina virtual, instal·leu les Guest Additions si no es troben instal·lades o torneu a instal·lar-les si no estan funcionant correctament seleccionant <b>Instal·la les Guest Additions</b> al menú <b>Màquina</b>. Si es troben instal·la [...]
     </message>
     <message numerus="yes">
@@ -9395,8 +9547,8 @@ p, li { white-space: pre-wrap; }
         <translation><p>Tingueu en compte que la unitat d'emmagatzematge d'este suport no s'eliminarà i, a més serà possible fer-la servir de nou més tard.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
-        <translation type="obsolete"><p>Pareix que les Guest Additions del VirtualBox no estan disponibles en esta màquina i les carpetes compartides no es poden fer servir sense elles. Per fer servir carpetes compartides a la màquina virtual, instal·leu les Guest Additions si no es troben instal·lades o torneu a instal·lar-les si no estan funcionant correctament seleccionant <b>Instal·la les Guest Additions</b> al menú <b>Màquina</b>. Si es troben instal·la [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
+        <translation><p>Pareix que les Guest Additions del VirtualBox no estan disponibles en esta màquina i les carpetes compartides no es poden fer servir sense elles. Per fer servir carpetes compartides a la màquina virtual, instal·leu les Guest Additions si no es troben instal·lades o torneu a instal·lar-les si no estan funcionant correctament seleccionant <b>Instal·la les Guest Additions</b> al menú <b>Màquina</b>. Si es troben instal·lades però la màqu [...]
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
@@ -9699,205 +9851,242 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Cannot start the VirtualBox Manager due to local restrictions.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut iniciar el gestor del VirtualBox degut a restriccions locals.</p><p>Es tancarà l'aplicació.</p></translation>
     </message>
     <message>
         <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut trobar el fitxer de llengua per a la llengua <b>%1</b> al directori <b><nobr>%2</nobr></b>.</p><p>La llengua es reiniciarà temporalment a la llengua per defecte del sistema. Aneu a la finestra de <b>Preferències</b> que podeu obrir des del menú <b>Fitxer</b> de la finestra del gestor del VirtualBox i seleccioneu una de les llengües existents a la pàgina <b>Llengü [...]
     </message>
     <message>
         <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut trobar el fitxer de llengua per a la llengua <b><nobr>%1</nobr></b>.</p><p>La llengua es reiniciarà temporalment l'anglés (per defecte). Aneu a la finestra de <b>Preferències</b> que podeu obrir des del menú <b>Fitxer</b> de la finestra del gestor del VirtualBox i seleccioneu una de les llengües existents a la pàgina <b>Llengües</b>.</p></translation>
     </message>
     <message>
         <source>There is no virtual machine with the identifier <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No existeix cap màquina virtual amb este identificador <b>%1</b>.</translation>
     </message>
     <message>
         <source>Ignore</source>
-        <translation type="unfinished">Ignora</translation>
+        <translation>Ignora</translation>
     </message>
     <message>
         <source>Failed to create NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut crear la xarxa NAT.</translation>
     </message>
     <message>
         <source>Failed to remove NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut eliminar la xarxa NAT <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create DHCP server.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut crear el servidor DHCP.</translation>
     </message>
     <message>
         <source>Failed to remove DHCP server for network interface <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut crear el servidor DHCP per a la interfície <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create the host network interface.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut crear la interfície de xarxa de l'amfitrió.</translation>
     </message>
     <message>
         <source>Create &new disk</source>
-        <translation type="unfinished">Crea un disc &nou</translation>
+        <translation>Crea un disc &nou</translation>
     </message>
     <message>
         <source>&Choose existing disk</source>
-        <translation type="unfinished">&Tria un disc existent</translation>
+        <translation>&Tria un disc existent</translation>
     </message>
     <message>
         <source>Leave &empty</source>
-        <translation type="unfinished">Deixa-ho &buit</translation>
+        <translation>Deixa-ho &buit</translation>
     </message>
     <message>
         <source>&Choose disk</source>
-        <translation type="unfinished">Tria un dis&c</translation>
+        <translation>Tria un dis&c</translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Esteu segur que voleu alliberar el disc dur virtual <nobr><b>%1</b></nobr>?</p><p>Això el separarà de les màquines virtuals següents: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual optical disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Esteu segur que voleu alliberar el disc òptic virtual <nobr><b>%1</b></nobr>?</p><p>Això el separarà de les màquines virtuals següents: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual floppy disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Esteu segur que voleu alliberar el disc floppy virtual <nobr><b>%1</b></nobr>?</p><p>Això el separarà de les màquines virtuals següents: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Segur que voleu eliminar el disc dur virtual <nobr><b>%1</b></nobr> de la llista d'imatges de discos durs coneguts?</p></translation>
     </message>
     <message>
         <source><p>As this hard disk is inaccessible its image file can not be deleted.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Atès que no es pot accedir a este disc dur, no es pot eliminar el fitxer d'imatge.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual optical disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Segur que voleu eliminar el disc òptic virtual <nobr><b>%1</b></nobr> de la llista d'imatges de discos coneguts?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual floppy disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Segur que voleu eliminar el disc floppy virtual <nobr><b>%1</b></nobr> de la llista d'imatges de discos coneguts?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual optical disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut inserir el disc òptic virtual <nobr><b>%1</b></nobr> a la màquina <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force insertion of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Voleu provar a forçar la inserció d'este disc?</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual optical disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut expulsar el disc òptic virtual <nobr><b>%1</b></nobr> a la màquina <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force ejection of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Voleu provar a forçar l'expulsió d'este disc?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual floppy disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut inserir el disc floppy virtual <nobr><b>%1</b></nobr> a la màquina <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual floppy disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut expulsar el disc floppy virtual <nobr><b>%1</b></nobr> a la màquina <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source>Failed to open the hard disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut obrir el fitxer de disc dur <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the optical disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut obrir el fitxer de disc òptic <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the floppy disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut obrir el fitxer de disc floppy <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the hard disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut tancar el fitxer de disc dur <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the optical disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut tancar el fitxer de disc òptic <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the floppy disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">No s'ha pogut tancar el fitxer de disc floppy <nobr><b>%2</b></nobr>.</translation>
     </message>
     <message numerus="yes">
         <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><p>La màquina virtual %n es troba en un estat alçat <b>%1</b></p><p>Si continueu, es descartarà l'estat en temps d'execució de la màquina virtual exportada. Tingueu en compte que la màquina existent no canviarà.</p></numerusform>
+            <numerusform><p>Les %n màquines virtuals es troben en un estat alçat <b>%1</b></p><p>Si continueu, es descartarà l'estat en temps d'execució de les màquines virtuals exportades. Tingueu en compte que les màquines existent no canviaran.</p></numerusform>
+            <numerusform><p>Les %n màquines virtuals es troben en un estat alçat <b>%1</b></p><p>Si continueu, es descartarà l'estat en temps d'execució de les màquines virtuals exportades. Tingueu en compte que les màquines existent no canviaran.</p></numerusform>
         </translation>
     </message>
     <message>
         <source>Switch</source>
-        <translation type="unfinished">Canvia</translation>
+        <translation>Canvia</translation>
     </message>
     <message>
         <source>Failed to enable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut activar el servidor d'escriptori remot per a esta màquina virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut desactivar el servidor d'escriptori remot per a esta màquina virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to enable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut activar la captura de vídeo per a esta màquina virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha pogut desactivar la captura de vídeo per a esta màquina virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox Guest Additions</b> disk image file.</p><p>Do you wish to download this disk image file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut trobar el fitxer d'imatge de les VirtualBox Guest Additions.</nobr></p><p>Voleu baixar la imatge de cd des de la xarxa?</p></translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished">Baixa</translation>
+        <translation>Baixa</translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox Guest Additions</b> disk image file from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Segur que voleu baixar la imatge del VirtualBox Guest Additions des de  <nobr><a href="%1">%1</a></nobr> (mida %2 bytes)?</p></translation>
     </message>
     <message>
         <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>S'ha baixat el manual d'usuari del VirtualBox des de <nobr><a href="%1">%1</a></nobr> però no s'ha pogut alçar localment com a <nobr><b>%2</b>.</nobr></p><p>Trieu una altra ubicació per al fitxer.</p> {1"?} {1<?} {2<?}</translation>
+    </message>
+    <message>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual CD/DVD drive?</p></source>
+        <translation type="obsolete"><p>S'ha baixat la imatge del VirtualBox Guest Additions des de <nobr><a href="%1">%1</a></nobr> i s'ha alçat localment com a <nobr><b>%2</b>.</nobr></p><p>Voleu registrar esta imatge de CD i montar-la a la unitat virtual de CD/DVD?</p></translation>
+    </message>
+    <message>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no CD/DVD drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <translation type="obsolete"><p>No es pot inserir la imatge del cd instal·lador de les Guest Additions a la màquina virtual <b>%1</b> si la màquina no té dispositius CD/DVD. Afegiu un dispositiu fent servir la pestanya de discos durs als paràmetres de la màquina.</p></translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No s'ha pogut trobar el manual d'usuari del VirtualBox <nobr><b>%1</b>.</nobr></p><p>Voleu baixar este fitxer des d'Internet?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox User Manual</b> from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Segur que voleu baixar el manual d'usuari del VirtualBox des de <nobr><a href="%1">%1</a></nobr> (mida %2 bytes)?</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"><p>S'ha baixat el manual d'usuari del VirtualBox des de <nobr><a href="%1">%2</a></nobr> però no s'ha pogut alçar localment com a <nobr><b>%3</b>.</nobr></p><p>Trieu una altra ubicació per al fitxer.</p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>S'ha baixat el manual d'usuari del VirtualBox des de <nobr><a href="%1">%1</a></nobr> però no s'ha pogut alçar localment com a <nobr><b>%2</b>.</nobr></p><p>Trieu una altra ubicació per al fitxer.</p> {1"?} {1<?} {2<?}</translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p></source>
-        <translation type="unfinished"><p>S'ha baixat el manual d'usuari del VirtualBox des de <nobr><a href="%1">%2</a></nobr> i s'ha alçat localment com a <nobr><b>%3</b>.</nobr></p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>S'ha baixat el manual d'usuari del VirtualBox des de <nobr><a href="%1">%1</a></nobr> i s'ha alçat localment com a <nobr><b>%2</b>.</nobr></p> {1"?} {1<?} {2<?}</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Tanca</translation>
+        <translation>Tanca</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">D'acord</translation>
+        <translation>D'acord</translation>
     </message>
     <message>
         <source>Do not show this message again</source>
-        <translation type="unfinished">No tornes a mostrar este missatge</translation>
+        <translation>No tornes a mostrar este missatge</translation>
     </message>
     <message>
         <source><p>Do you want to remove the NAT network <nobr><b>%1</b>?</nobr></p><p>If this network is in use by one or more virtual machine network adapters these adapters will no longer be usable until you correct their settings by either choosing a different network name or a different adapter attachment type.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Voleu eliminar la xarxa NAT <nobr><b>%1</b>?</nobr></p><p>Si esta xarxa està en ús per un o més adaptadors de màquines virtuals, estos adaptadors ja no es podran utilitzar fins que corregiu els paràmetres triant un nom de xarxa diferent o un tipus d'adaptador diferent.</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete"><p>Pareix que les Guest Additions del VirtualBox no estan disponibles en esta màquina i les carpetes compartides no es poden fer servir sense elles. Per fer servir carpetes compartides a la màquina virtual, instal·leu les Guest Additions si no es troben instal·lades o torneu a instal·lar-les si no estan funcionant correctament seleccionant <b>Instal·la les Guest Additions</b> al menú <b>Màquina</b>. Si es troben instal·la [...]
     </message>
     <message>
         <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Munta</translation>
     </message>
     <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
-        <translation type="unfinished"></translation>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
+        <translation>No s'ha pogut afegir la càmera web <b>%1</b> a la màquina virtual <b>%2</b>.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
+        <translation>No s'ha pogut desconnectar la càmera web <b>%1</b> a la màquina virtual <b>%2</b>.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
-        <translation type="unfinished"></translation>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <translation><p>La pantalla virtual utilitza actualment el mode de color <b>%1&nbsp;bit</b>. Per obtindre un millor rendiment, canvieu això a <b>%2&nbsp;bit</b>. Això es pot fer des de la secció <b>Pantalla</b> del tauler de control del sistema operatiu client o des dels paràmetres del sistema.</p></translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
@@ -9912,115 +10101,115 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10073,19 +10262,19 @@ p, li { white-space: pre-wrap; }
     <name>UIMiniToolBar</name>
     <message>
         <source>Always show the toolbar</source>
-        <translation type="unfinished">Mostra sempre la barra d'eines</translation>
+        <translation>Mostra sempre la barra d'eines</translation>
     </message>
     <message>
         <source>Minimize Window</source>
-        <translation type="unfinished">Minimitza la finestra</translation>
+        <translation>Minimitza la finestra</translation>
     </message>
     <message>
         <source>Exit Full Screen or Seamless Mode</source>
-        <translation type="unfinished">Ix del mode de pantalla completa o del mode fluid</translation>
+        <translation>Ix del mode de pantalla completa o del mode fluid</translation>
     </message>
     <message>
         <source>Close VM</source>
-        <translation type="unfinished">Tanca la màquina virtual</translation>
+        <translation>Tanca la màquina virtual</translation>
     </message>
 </context>
 <context>
@@ -10102,8 +10291,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation>&Nom:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Nom:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -10125,6 +10314,10 @@ p, li { white-space: pre-wrap; }
         <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
         <translation>Mostra el tipus de sistema operatiu que voleu instal·lar a dins d'esta màquina virtual (anomenat sistema operatiu client).</translation>
     </message>
+    <message>
+        <source>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -10162,7 +10355,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The network operation failed with the following error: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ha fallat la operació de xarxa i s'ha proveït l'error següent: %1.</translation>
     </message>
 </context>
 <context>
@@ -10189,27 +10382,27 @@ p, li { white-space: pre-wrap; }
     <name>UINetworkReplyPrivate</name>
     <message>
         <source>Host not found</source>
-        <translation type="unfinished"></translation>
+        <translation>No s'ha trobat l'amfitrió</translation>
     </message>
     <message>
         <source>Content access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>S'ha denegat l'accés al contingut</translation>
     </message>
     <message>
         <source>Protocol failure</source>
-        <translation type="unfinished"></translation>
+        <translation>S'ha produït un error de protocol</translation>
     </message>
     <message>
         <source>Wrong SSL certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>El format del certificat SSL és erroni</translation>
     </message>
     <message>
         <source>SSL authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Ha fallat l'autenticació SSL</translation>
     </message>
     <message>
         <source>Unknown reason</source>
-        <translation type="unfinished"></translation>
+        <translation>Es desconeix la raó</translation>
     </message>
 </context>
 <context>
@@ -11108,7 +11301,7 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
     <name>UIPopupCenter</name>
     <message>
         <source>Click for full details</source>
-        <translation type="unfinished"></translation>
+        <translation>Feu clic per mostrar els detalls complets</translation>
     </message>
 </context>
 <context>
@@ -11297,18 +11490,14 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
         <translation>Fitxers de màquina virtual (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Benvingut a VirtualBox!</h3><p>A la part esquerra d'esta finestra es mostra un llistat de totes les màquines virtuals a l'ordinador. Este llistat és buit actualment perquè encara no heu creat cap màquina virtual.<img src=:/welcome.png align=right/></p><p>Per crear una nova màquina virtual, premeu sobre el botó <b>Nova</b> a la barra principal que es troba a la part de dalt d'esta fines [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation><h3>Benvingut a VirtualBox!</h3><p>A la part esquerra d'esta finestra es mostra un llistat de totes les màquines virtuals a l'ordinador. Este llistat és buit actualment perquè encara no heu creat cap màquina virtual.<img src=:/welcome.png align=right/></p><p>Per crear una nova màquina virtual, premeu sobre el botó <b>Nova</b> a la barra principal que es troba a la part de dalt d'esta finestra.</p>&l [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation>Gestor</translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -11345,11 +11534,11 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
     </message>
     <message>
         <source><b>%1</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1</b> pàgina:</translation>
     </message>
     <message>
         <source><b>%1: %2</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1: %2</b> pàgina:</translation>
     </message>
 </context>
 <context>
@@ -11496,6 +11685,10 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Tanca</translation>
     </message>
@@ -11503,10 +11696,6 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -11618,8 +11807,8 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
         <translation type="obsolete">Resum</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'este enllaç: </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><b>S'ha publicat una nova versió del VirtualBox! La versió <b>%1</b> és disponible a <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Podeu baixar-la directament des d'este enllaç: </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -11710,220 +11899,99 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
 <context>
     <name>UIVMInfoDialog</name>
     <message>
-        <source>Session Information Dialog</source>
-        <translation type="obsolete">Diàleg Informatiu de la Sessió</translation>
-    </message>
-    <message>
-        <source>&Close</source>
-        <translation type="obsolete">Tan&ca</translation>
-    </message>
-    <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Informació de la sessió</translation>
+        <translation type="unfinished">%1 - Informació de la sessió</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Detalls</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished">&Detalls de configuració</translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">&Temps d'execució</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished">Informació del &temps d'execució</translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>Transferències DMA</translation>
+        <translation type="unfinished">Transferències DMA</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>Transferències PIO</translation>
+        <translation type="unfinished">Transferències PIO</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Lectura de dades</translation>
+        <translation type="unfinished">Lectura de dades</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Escriptura de dades</translation>
+        <translation type="unfinished">Escriptura de dades</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Transmissió de dades</translation>
+        <translation type="unfinished">Transmissió de dades</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Recepció de dades</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Activat</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Desactivat</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Atributs del temps d'execució</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Resolució de pantalla</translation>
-    </message>
-    <message>
-        <source>Hardware Virtualization</source>
-        <translation type="obsolete">Virtualització per Maquinari</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">Estadístiques CD/DVD</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Estadístiques de l'adaptador de xarxa</translation>
-    </message>
-    <message>
-        <source>Adapter 1</source>
-        <translation type="obsolete">Adaptador 1</translation>
-    </message>
-    <message>
-        <source>Adapter 2</source>
-        <translation type="obsolete">Adaptador 2</translation>
-    </message>
-    <message>
-        <source>Adapter 3</source>
-        <translation type="obsolete">Adaptador 3</translation>
-    </message>
-    <message>
-        <source>Adapter 4</source>
-        <translation type="obsolete">Adaptador 4</translation>
-    </message>
-    <message>
-        <source>Not attached</source>
-        <translation type="obsolete">No connectat</translation>
-    </message>
-    <message>
-        <source>Hard Disks Statistics</source>
-        <translation type="obsolete">Estadístiques dels discos durs</translation>
-    </message>
-    <message>
-        <source>Primary Master</source>
-        <translation type="obsolete">Primari Mestre</translation>
-    </message>
-    <message>
-        <source>Primary Slave</source>
-        <translation type="obsolete">Primari Esclau</translation>
-    </message>
-    <message>
-        <source>Secondary Master</source>
-        <translation type="obsolete">Secundari Mestre</translation>
-    </message>
-    <message>
-        <source>Secondary Slave</source>
-        <translation type="obsolete">Secundari Esclau</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Versió %1.%2</translation>
+        <translation type="unfinished">Recepció de dades</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>No detectat</translation>
+        <translation type="unfinished">No detectat</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>No detectat</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>Guest Additions</translation>
+        <translation type="unfinished">No detectat</translation>
     </message>
     <message>
-        <source>Guest OS Type</source>
-        <translation>Tipus de sistema client</translation>
-    </message>
-    <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Estadístiques de discos durs</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">No disponible</translation>
     </message>
     <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">No hi ha cap disc dur</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Atributs del temps d'execució</translation>
     </message>
     <message>
-        <source>No Network Adapters</source>
-        <translation>No hi ha cap adaptador de xarxa</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Resolució de pantalla</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Activat</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Desactivat</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished">Mode de porta-retalls</translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <translation type="obsolete">Paginació imbricada</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Guest Additions</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">No disponible</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Tipus de sistema client</translation>
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation>Estadístiques d'emmagatzematge</translation>
+        <translation type="unfinished">Estadístiques d'emmagatzematge</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
-        <translation>No hi ha cap dispositiu d'emmagatzematge</translation>
+        <translation type="unfinished">No hi ha cap dispositiu d'emmagatzematge</translation>
     </message>
     <message>
         <source>Network Statistics</source>
-        <translation>Estadístiques de xarxa</translation>
-    </message>
-    <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Paginació imbricada</translation>
-    </message>
-    <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>No disponible</translation>
-    </message>
-    <message>
-        <source>Clipboard Mode</source>
-        <translation>Mode de porta-retalls</translation>
-    </message>
-    <message>
-        <source>Drag'n'Drop Mode</source>
-        <translation type="obsolete">Mode d'arrossega i deixa d'anar</translation>
+        <translation type="unfinished">Estadístiques de xarxa</translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">No hi ha cap adaptador de xarxa</translation>
     </message>
 </context>
 <context>
@@ -12503,39 +12571,39 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
     </message>
     <message>
         <source>Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Paràmetres d'emmagatzematge</translation>
     </message>
     <message>
         <source>Please choose a file to export the virtual appliance to</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu un fitxer on exportar l'aplicació virtual</translation>
     </message>
     <message>
         <source>F&ormat:</source>
-        <translation type="unfinished"></translation>
+        <translation>F&ormat:</translation>
     </message>
     <message>
         <source>OVF 0.9</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 0.9</translation>
     </message>
     <message>
         <source>OVF 1.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 1.0</translation>
     </message>
     <message>
         <source>OVF 2.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 2.0</translation>
     </message>
     <message>
         <source>Write in standard OVF 1.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escriu en format estàndard OVF 1.0.</translation>
     </message>
     <message>
         <source>Write in new experimental OVF 2.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escriu en format experimental OVF 2.0.</translation>
     </message>
     <message>
         <source>&Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>&Paràmetres d'emmagatzematge</translation>
     </message>
 </context>
 <context>
@@ -12554,14 +12622,14 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
     </message>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu un fitxer on s'ha d'exportar l'aplicació virtual...</translation>
     </message>
 </context>
 <context>
     <name>UIWizardExportAppPageExpert</name>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu un fitxer on exportar l'aplicació virtual...</translation>
     </message>
 </context>
 <context>
@@ -12631,15 +12699,15 @@ pas i connectar discos durs més avant, fent servir el diàleg de configuració
     </message>
     <message>
         <source>Import Virtual Appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>Importa l'aplicació virtual</translation>
     </message>
     <message>
         <source>Choose a virtual appliance file to import...</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu l'aplicació virtual que s'ha d'importar...</translation>
     </message>
     <message>
         <source>Please choose a virtual appliance file to import</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu l'aplicació virtual que s'ha d'importar</translation>
     </message>
 </context>
 <context>
@@ -13227,11 +13295,11 @@ Versió %1</translation>
         <translation type="obsolete">Obri el diàleg per operar amb les carpetes compartides</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">&Instal·la les Guest Additions...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Munta la imatge d'instal·lació de les Guest Additions</translation>
     </message>
     <message>
@@ -13514,7 +13582,7 @@ Versió %1</translation>
         <translation type="obsolete">D&iàleg informatiu de la sessió</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Mostra el diàleg informatiu de la sessió</translation>
     </message>
     <message>
@@ -13990,7 +14058,7 @@ Versió %1</translation>
     </message>
     <message>
         <source>Choose...</source>
-        <translation type="unfinished"></translation>
+        <translation>Trieu...</translation>
     </message>
 </context>
 <context>
@@ -14000,8 +14068,8 @@ Versió %1</translation>
         <translation><reinicialitza als valors predeterminats></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">El camí actual per defecte es mostrarà després d'acceptar els canvis i obrir este diàleg novament. </translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation>El camí actual per defecte es mostrarà després d'acceptar els canvis i obrir este diàleg novament. </translation>
     </message>
     <message>
         <source><not selected></source>
@@ -14049,7 +14117,8 @@ Versió %1</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">El camí actual per defecte es mostrarà després d'acceptar els canvis i obrir este diàleg novament. </translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -15309,7 +15378,7 @@ Versió %1</translation>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Si connecteu este disc dur es millorarà de forma indirecta fent servir un nou disc dur diferenciat.</translation>
+        <translation>Si connecteu este disc dur es millorarà de forma indirecta fent servir un nou disc dur diferenciat.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -15319,7 +15388,7 @@ Versió %1</translation>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Este disc dur base es connecta indirectament fent servir el disc dur diferenciat següent:</translation>
+        <translation>Este disc dur base es connecta indirectament fent servir el disc dur diferenciat següent:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -15931,107 +16000,77 @@ Versió %1</translation>
         <translation type="obsolete">Trieu una ubicació per al fitxer de disc virtual nou</translation>
     </message>
     <message>
+        <source>Enabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Activat</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Desactivat</translation>
+    </message>
+    <message>
         <source>Unrestricted Execution</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>Execució no restringida</translation>
     </message>
     <message>
         <source>PS/2 Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ratolí PS/2</translation>
     </message>
     <message>
         <source>USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ratolí USB</translation>
     </message>
     <message>
         <source>PS/2 and USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ratolí PS/2 i USB</translation>
     </message>
     <message>
         <source>Unrestricted Execution</source>
-        <translation type="unfinished"></translation>
+        <translation>Execució no restringida</translation>
     </message>
     <message>
         <source>USB Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tablet USB</translation>
     </message>
     <message>
         <source>USB Multi-Touch Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tablet USB multitàctil</translation>
     </message>
     <message>
         <source>NAT Network</source>
         <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Xarxa NAT</translation>
     </message>
     <message>
         <source>NAT network, '%1'</source>
         <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Xarxa NAT, «%1»</translation>
     </message>
     <message>
         <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished">USB</translation>
-    </message>
-    <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>off</source>
-        <comment>guest monitor status</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Cap</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Predeterminat</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation>Podeu crear o afegir fitxers d'imatge de disc als paràmetres de la màquina virtual.</translation>
     </message>
     <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <source>USB</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
+        <source>off</source>
+        <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished">Actiu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inactive</source>
@@ -16041,7 +16080,7 @@ Versió %1</translation>
     <message>
         <source>Active</source>
         <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished">Actiu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inactive</source>
@@ -16051,7 +16090,7 @@ Versió %1</translation>
     <message>
         <source>Active</source>
         <comment>details report (Unrestricted Execution)</comment>
-        <translation type="unfinished">Actiu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inactive</source>
@@ -16059,6 +16098,11 @@ Versió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -16069,6 +16113,31 @@ Versió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Cap</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Predeterminat</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -16079,6 +16148,11 @@ Versió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -16099,6 +16173,11 @@ Versió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -16108,16 +16187,16 @@ Versió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -16393,11 +16472,11 @@ a l'idioma predeterminat del sistema.</qt>
         <translation type="obsolete">Mostra la ruta cap a la carpeta de fitxers VDI predeterminada. S'usa esta carpeta, si no se n'especifica explícitament una altra, quan s'afig o es crea un disc virtual.</translation>
     </message>
     <message>
-        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Reinicia el camí a la carpeta de màquines virtuals al seu valor predeterminat. Després d'acceptar els canvis i tornar a obrir este diàleg, s'hi mostrarà este camí.</translation>
     </message>
     <message>
-        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Reinicia el camí a la carpeta de fitxers VDI al seu valor predeterminat. Després d'acceptar els canvis i tornar a obrir este diàleg, s'hi mostrarà este camí.</translation>
     </message>
     <message>
@@ -16441,7 +16520,7 @@ a l'idioma predeterminat del sistema.</qt>
         <translation type="obsolete">Obri un diàleg per seleccionar el fitxer de la biblioteca d'autenticació VRDP .</translation>
     </message>
     <message>
-        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Reinicia el fitxer de la biblioteca d'autenticació al seu valor predeterminat. Després d'acceptar els canvis i tornar a obrir este diàleg, s'hi mostrarà este fitxer.</translation>
     </message>
     <message>
@@ -16976,15 +17055,15 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati
         <translation type="obsolete">Crea un disc virtual nou</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -17111,8 +17190,8 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati
         <translation type="obsolete">&No feu servir esta informació per contactar amb mi</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let vos know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Ompliu este formulari de registre per fer-nos saber que fas servir el VirtualBox i, opcionalment, per mantindre't informat sobre noves versions i actualitzacions.</p><p>Introduïu als camps següents el vostre nom complet fent servir caràcters llatins i la vostra adreça de correu. Teniu en compte que innotek farà servir esta informació només per recopilar estadístiques d'ús del producte i per informar-vos de novetats. Inno [...]
+        <source><p>Please fill out this registration form to let vos know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Ompliu este formulari de registre per fer-nos saber que fas servir el VirtualBox i, opcionalment, per mantindre't informat sobre noves versions i actualitzacions.</p><p>Introduïu als camps següents el vostre nom complet fent servir caràcters llatins i la vostra adreça de correu. Teniu en compte que innotek farà servir esta informació només per recopilar estadístiques d'ús del producte i per informar-vos de novetats. Inno [...]
     </message>
     <message>
         <source>VirtualBox Registration Dialog</source>
@@ -17127,8 +17206,8 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati
         <translation type="obsolete">No s'ha pogut dur a terme la conformitat de connexió.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let vos know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed  [...]
-        <translation type="obsolete"><p>Ompliu este formulari de registre per deixar-nos conèixer que feu servir el VirtualBox i, opcionalment, per mantindre-vos informat sobre novetats i actualitzacions.</p><p>Introduïu el vostre nom complet fent servir caràcters llatins i la vostra adreça de correu electrònica als camps següents. Tingueu en compte que Sun Microsystems farà servir esta informació només per estadístiques del producte i per enviar-vos notícies sobre el V [...]
+        <source><p>Please fill out this registration form to let vos know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed  [...]
+        <translation type="obsolete"><p>Ompliu este formulari de registre per deixar-nos conèixer que feu servir el VirtualBox i, opcionalment, per mantindre-vos informat sobre novetats i actualitzacions.</p><p>Introduïu el vostre nom complet fent servir caràcters llatins i la vostra adreça de correu electrònica als camps següents. Tingueu en compte que Sun Microsystems farà servir esta informació només per estadístiques del producte i per enviar-vos notícies sobre el V [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -17147,8 +17226,8 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati
         <translation type="obsolete">Seleccioneu un país/territori</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let vos know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we u [...]
-        <translation type="obsolete"><p>Ompliu este formulari de registre per permetre'ns conèixer que feu servir el VirtualBox i, opcionalment, mantindre-vos informat sobre novetats i actualitzacions del VirtualBox.</p><p>Feu servir caràcters llatins per omplir els camps següents. Tingueu en compte que Sun Microsystems farà servir esta informació només per a usos estadístics i per enviar-vos notícies sobre el VirtualBox. Sun Microsystems mai compartirà les vostres [...]
+        <source><p>Please fill out this registration form to let vos know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we u [...]
+        <translation type="obsolete"><p>Ompliu este formulari de registre per permetre'ns conèixer que feu servir el VirtualBox i, opcionalment, mantindre-vos informat sobre novetats i actualitzacions del VirtualBox.</p><p>Feu servir caràcters llatins per omplir els camps següents. Tingueu en compte que Sun Microsystems farà servir esta informació només per a usos estadístics i per enviar-vos notícies sobre el VirtualBox. Sun Microsystems mai compartirà les vostres [...]
     </message>
     <message>
         <source>I &already have a Sun Online account:</source>
@@ -17493,8 +17572,8 @@ un disc dur per connectar a la ranura remarcada actualment.</a></translati
         <translation type="obsolete">Suspèn l'execució de la màquina virtual</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Benvingut a VirtualBox!</h3><p>A la part esquerra d'esta finestra es mostra un llistat de totes les màquines virtuals a l'ordinador. Este llistat és buit actualment perquè encara no heu creat cap màquina virtual.<img src=:/welcome.png align=right/></p><p>Per crear una nova màquina virtual, premeu sobre el botó <b>Nova</b> a la barra principal que es troba a la part de dalt d'esta fines [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Benvingut a VirtualBox!</h3><p>A la part esquerra d'esta finestra es mostra un llistat de totes les màquines virtuals a l'ordinador. Este llistat és buit actualment perquè encara no heu creat cap màquina virtual.<img src=:/welcome.png align=right/></p><p>Per crear una nova màquina virtual, premeu sobre el botó <b>Nova</b> a la barra principal que es troba a la part de dalt d'esta fines [...]
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
@@ -18331,6 +18410,217 @@ o a ambdòs (<i>Qualsevol</i>).</qt></translation>
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>Session Information Dialog</source>
+        <translation type="obsolete">Diàleg Informatiu de la Sessió</translation>
+    </message>
+    <message>
+        <source>&Close</source>
+        <translation type="obsolete">Tan&ca</translation>
+    </message>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Informació de la sessió</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Detalls</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Temps d'execució</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">Transferències DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">Transferències PIO</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Lectura de dades</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Escriptura de dades</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Transmissió de dades</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Recepció de dades</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Activat</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="obsolete">Desactivat</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Atributs del temps d'execució</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Resolució de pantalla</translation>
+    </message>
+    <message>
+        <source>Hardware Virtualization</source>
+        <translation type="obsolete">Virtualització per Maquinari</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">Estadístiques CD/DVD</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Estadístiques de l'adaptador de xarxa</translation>
+    </message>
+    <message>
+        <source>Adapter 1</source>
+        <translation type="obsolete">Adaptador 1</translation>
+    </message>
+    <message>
+        <source>Adapter 2</source>
+        <translation type="obsolete">Adaptador 2</translation>
+    </message>
+    <message>
+        <source>Adapter 3</source>
+        <translation type="obsolete">Adaptador 3</translation>
+    </message>
+    <message>
+        <source>Adapter 4</source>
+        <translation type="obsolete">Adaptador 4</translation>
+    </message>
+    <message>
+        <source>Not attached</source>
+        <translation type="obsolete">No connectat</translation>
+    </message>
+    <message>
+        <source>Hard Disks Statistics</source>
+        <translation type="obsolete">Estadístiques dels discos durs</translation>
+    </message>
+    <message>
+        <source>Primary Master</source>
+        <translation type="obsolete">Primari Mestre</translation>
+    </message>
+    <message>
+        <source>Primary Slave</source>
+        <translation type="obsolete">Primari Esclau</translation>
+    </message>
+    <message>
+        <source>Secondary Master</source>
+        <translation type="obsolete">Secundari Mestre</translation>
+    </message>
+    <message>
+        <source>Secondary Slave</source>
+        <translation type="obsolete">Secundari Esclau</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Versió %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">No detectat</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">No detectat</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Guest Additions</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Tipus de sistema client</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Estadístiques de discos durs</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">No hi ha cap disc dur</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">No hi ha cap adaptador de xarxa</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Activat</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Desactivat</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <translation type="obsolete">Paginació imbricada</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">No disponible</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Estadístiques d'emmagatzematge</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">No hi ha cap dispositiu d'emmagatzematge</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Estadístiques de xarxa</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Paginació imbricada</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">No disponible</translation>
+    </message>
+    <message>
+        <source>Clipboard Mode</source>
+        <translation type="obsolete">Mode de porta-retalls</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">Mode d'arrossega i deixa d'anar</translation>
+    </message>
+    <message>
+        <source>Configuration &Details</source>
+        <translation type="obsolete">&Detalls de configuració</translation>
+    </message>
+    <message>
+        <source>&Runtime Information</source>
+        <translation type="obsolete">Informació del &temps d'execució</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMListBox</name>
     <message>
         <source>Inaccessible</source>
@@ -18422,7 +18712,7 @@ o a ambdòs (<i>Qualsevol</i>).</qt></translation>
     </message>
     <message>
         <source>Holds the TAP interface name.</source>
-        <translation type="obsolete">Mostra el nom de la intefície TAP.</translation>
+        <translation type="obsolete">Mostra el nom de la interfície TAP.</translation>
     </message>
     <message>
         <source>&Enable Network Adapter</source>
@@ -19213,7 +19503,7 @@ esta característica després d'haver instal·lat un Windows al sistema ope
         <translation type="obsolete">Reinicialitza</translation>
     </message>
     <message>
-        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Reinicia la ruta de la carpeta de captures al valor per defecte. La ruta actual per defecte es mostrarà acceptant els canvis i obrint novament este diàleg.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
index 5ea70b6..b7178bb 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
@@ -367,7 +367,7 @@
         <translation type="obsolete">I&nformace o sezení</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Zobrazí dialog s informacemi o sezení</translation>
     </message>
     <message>
@@ -459,11 +459,11 @@
         <translation type="obsolete">Povolí či zakáže připojení vzdálené plochy (RDP) na tento počítač</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Instalovat Přídavky pro hosta...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="unfinished">&Instalovat Přídavky pro hosta...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Připojí obraz s instalací Přídavků pro hosta</translation>
     </message>
     <message>
@@ -1002,92 +1002,78 @@
         <translation>Vyskakovací nabídka</translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">&Instalovat Přídavky pro hosta...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Připojí obraz s instalací Přídavků pro hosta</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
+        <source>&Webcams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Síť</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Soubor</translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="unfinished">&Klávesnice</translation>
-    </message>
-    <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Síť</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Předvolby...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Zobrazit &záznam...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Soubor</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1103,175 +1089,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Předvolby...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <source>&Keyboard</source>
+        <translation type="unfinished">&Klávesnice</translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <source>&Hard Disks</source>
+        <translation type="unfinished">&Pevné disky</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="unfinished">&Pevné disky</translation>
+        <source>&USB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Zobrazit &záznam...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1317,6 +1303,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create new virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1333,7 +1327,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1341,7 +1335,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1365,15 +1359,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1385,15 +1391,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1437,15 +1443,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1454,19 +1460,6 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Zapnout</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIActonPool</name>
     <message>
         <source>Popup Menu</source>
@@ -1476,19 +1469,6 @@
 <context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1512,6 +1492,19 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -3291,7 +3284,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
         <comment>details (network)</comment>
-        <translation>Obecný ovladač, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation type="obsolete">Obecný ovladač, '%1' {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -3353,83 +3346,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Menu-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3832,7 +3830,7 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsGeneral</name>
     <message>
         <source>Holds the path to the default VDI folder. This folder is used, if not explicitly specified otherwise, when adding existing or creating new virtual hard disks.</source>
-        <translation type="obsolete">Zobrazuje cestu k výchozí složce pro VDI. Pokud se neurčí jinak, je tato složka použita v případě přidání existujícího nebo vytvoření nového virtuálního pevného disku.</translation>
+        <translation type="obsolete">Zobrazuje cestu k výchozí složce pro VDI. Pokud se neurčí jinak, je tato složka použita v případě přidání existujícího nebo vytvoření nového virtuálního pevného disku.</translation>
     </message>
     <message>
         <source>Holds the path to the default virtual machine folder. This folder is used, if not explicitly specified otherwise, when creating new virtual machines.</source>
@@ -3864,7 +3862,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the path to the default hard disk folder. This folder is used, if not explicitly specified otherwise, when adding existing or creating new virtual hard disks.</source>
-        <translation type="obsolete">Zobrazuje cestu k výchozí složce pro obrazy pevných disků. Pokud se neurčí jinak, je tato složka použita v případě přidání existujícího nebo vytvoření nového virtuálního pevného disku.</translation>
+        <translation type="obsolete">Zobrazuje cestu k výchozí složce pro obrazy pevných disků. Pokud se neurčí jinak, je tato složka použita v případě přidání existujícího nebo vytvoření nového virtuálního pevného disku.</translation>
     </message>
     <message>
         <source>When checked, the application will provide an icon with the context menu in the system tray.</source>
@@ -4565,7 +4563,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5205,7 +5203,8 @@ p, li { white-space: pre-wrap; }
         <translation>Status dalších vlastností:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5219,8 +5218,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5583,38 +5581,6 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Povolí nahrávání videa pro obrazovku %1.</translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Mini nástrojová lišta:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Je-li zatrženo, bude se v celoobrazovkovém a bezešvém režimu zobrazovat malá nástrojová lišta.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Zobrazit v &celoobrazovkovém/bezešvém režimu</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Je-li zatrženo, bude se mini nabídková lišta zobrazovat nahoře na obrazovce místo na výchozí pozici dole na obrazovce.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Zobrazit na&hoře na obrazovce</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5627,15 +5593,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">3D {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D {200%?}</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5651,10 +5613,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5703,6 +5661,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 MB</translation>
     </message>
@@ -5711,6 +5677,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5738,8 +5708,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Zobrazuje cestu, kam jsou ukládány snímky virtuálního počítače. Snímky můžou zabrat velké množství diskového prostoru.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Základ</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Základ</translation>
     </message>
     <message>
         <source>Identification</source>
@@ -5790,8 +5760,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Ovládá množství videopaměti poskytnuté virtuálnímu počítači.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Pokročilé</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Pokročilé</translation>
     </message>
     <message>
         <source>Boo&t Order:</source>
@@ -5886,8 +5856,8 @@ p, li { white-space: pre-wrap; }
         <translation>S&ložka pro snímky:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>Pop&is</translation>
+        <source>&Description</source>
+        <translation type="obsolete">Pop&is</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5962,8 +5932,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">zvolili jste 64bitový OS pro tento virtuální počítač. Protože je nutná podpora hardwarové virtualizace (VT-x/AMD-V), byla tato volba automaticky nastavena.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation>&Táhni a pusť:</translation>
+        <source>&Drag'n'Drop:</source>
+        <translation type="obsolete">&Táhni a pusť:</translation>
     </message>
     <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
@@ -5978,6 +5948,22 @@ p, li { white-space: pre-wrap; }
         <translation>Operační systém virtuálního počítače byl nastaven do 64bitového režimu. Ten vyžaduje pro svůj běh podporu hradwarové virtualizace, po odsouhlasení bude atuomaticky povolena.</translation>
     </message>
     <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">&Pokročilé</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
+        <translation type="unfinished">&Popis</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5994,6 +5980,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6026,16 +6016,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6046,28 +6032,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">3D {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D {200%?}</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Mini nástrojová lišta:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Je-li zatrženo, bude se v celoobrazovkovém a bezešvém režimu zobrazovat malá nástrojová lišta.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Zobrazit v &celoobrazovkovém/bezešvém režimu</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Je-li zatrženo, bude se mini nabídková lišta zobrazovat nahoře na obrazovce místo na výchozí pozici dole na obrazovce.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -6077,18 +6055,6 @@ p, li { white-space: pre-wrap; }
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -6879,23 +6845,23 @@ p, li { white-space: pre-wrap; }
         <translation>Zobrazuje základní adresu I/O portu tohoto sériového portu. Platné hodnoty jsou celá čísla v rozsahu od <tt>0</tt> do <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7403,63 +7369,40 @@ p, li { white-space: pre-wrap; }
         <translation>Používáte nyní více řadičů než čipová sada %1 podporuje. Změňte prosím typ čipové sady na záložce Systém nebo zmenšete následující počet %2 řadičů na záložce Úložiště</translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Hot-pluggable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a virtual optical disk file...</source>
-        <translation type="obsolete">Vybrat soubor s virtuálním diskem...</translation>
-    </message>
-    <message>
-        <source>Add Optical Drive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Floppy Drive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Optical &Drive:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7484,6 +7427,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Add USB Controller</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Optical Drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Floppy Drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7500,6 +7455,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Optical &Drive:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create New Hard Disk...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7512,7 +7475,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7784,35 +7747,35 @@ p, li { white-space: pre-wrap; }
         <translation>Nastavili jste omezení procesoru na nízkou hodnotu. To může snížit odezvu virtuálního počítače.</translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7966,31 +7929,31 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Pro tento virtuální počítač je povolena podpora USB 2.0. Je ale potřeba doinstalovat <b>%1</b>. Prosíme doinstalujte rozšíření z webových stránek aplikace VirtualBox. Po instalaci bude možno použít USB 2.0, která je nyní do změny nastavení zakázána.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8247,14 +8210,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Zavřít</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Přepnout</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Zavřít</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8610,15 +8573,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete"><p>Nelze načíst jazykový soubor<b><nobr>%1</nobr></b>. <p>Jazyk bude dočasně nastaven na angličtinu (vestavěnou). Přejděte, prosím, do <b>Nastavení</b>, které najdete v menu <b>Soubor</b> hlavního okna VirtualBoxu, a vyberte existující jazyk na stránce <b>Jazyk</b>.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Přídavky pro hosta nainstalované v hostovaném OS jsou příliš staré: nainstalovaná verze je %1, očekávaná verze je %2. Některé funkce vyžadující Přídavky pro hosta (integrace myši, automatickou změnu velikosti hostované obrazovky) pravděpodobně nebudou správně fungovat.</p><p>Prosím aktualizujte Přídavky pro hosta na aktuální verzi výběrem <b>Instalovat Přídavky pro hosta</b> z nabídky <b>Zařízení</b>.</p [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Přídavky pro hosta nainstalované v hostovaném OS jsou zastaralé: nainstalovaná verze je %1, očekávaná verze je %2. Některé funkce vyžadující Přídavky pro hosta (integrace myši, automatická změna velikosti hostované obrazovky) nemusí fungovat jak byste čekali.</p><p>Je doporučována aktualizace Přídavků pro hosta na aktuální verzi  výběrem <b>Instalovat Přídavky pro hosta</b> z nabídky <b>Zařízení</b>.</p& [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Přídavky pro hosta nainstalované v hostovaném OS jsou příliš aktuální: nainstalovaná verze je %1, očekávaná verze je %2. Některé funkce které vyžadují Přídavky pro hosta (integrace myši, automatická změna velikosti hostované obrazovky) pravděpodobně nebudou správně fungovat.</p><p>Prosím aktualizujte Přídavky pro hosta na aktuální verzi výběrem <b>Instalovat Přídavky pro hosta</b> z nabídky <b>Zařízení</b>. [...]
     </message>
     <message>
@@ -8662,8 +8625,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete"><p>Okno virtuálního počítače je optimalizováno pro použití v <b>%1&nbsp;bitové</b> barevné hloubce, ale barevná kvalita virtuální obrazovky je právě nastavena na <b>%2&nbsp;bitů</b>.</p><p>Prosím otevřete dialog vlastností obrazovky hostovaného OS a vyberte <b>%3&nbsp;bitový</b> barevný režim, pokud je dostupný, pro nejlepší možný výkon virtuálního video subsytému.</p><p>&lt [...]
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Při běhu virtuálního počítače se vyskytla kritická chyba a provádění počítače bylo zastaveno.</p><p>Pro pomoc se prosím podívejte do sekce Community na <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> nebo na smlouvu o podpoře. Prosím poskytněte obsah log souboru <tt>VBox.log</tt> a obrázek <tt>VBox.png</tt>, který najdete v adresáři <nobr><b>%1</b></nobr>, [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation type="obsolete"><p>Při běhu virtuálního počítače se vyskytla kritická chyba a provádění počítače bylo zastaveno.</p><p>Pro pomoc se prosím podívejte do sekce Community na <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> nebo na smlouvu o podpoře. Prosím poskytněte obsah log souboru <tt>VBox.log</tt> a obrázek <tt>VBox.png</tt>, který najdete v adresáři <nobr><b>%1</b></nobr&gt [...]
     </message>
     <message>
         <source><p>You didn't attach a hard disk to the new virtual machine. The machine will not be able to boot unless you attach a hard disk with a guest operating system or some other bootable media to it later using the machine settings window or the First Run Wizard.</p><p>Do you wish to continue?</p></source>
@@ -8770,9 +8733,9 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Stáhnout</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Připojit</translation>
+        <translation type="unfinished">Připojit</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -8944,8 +8907,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Zobrazí dialog s informacemi pro produktu</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Byla vydána nová verze aplikace VirtualBox! Na stránce <a href="http://www.virtualbox.org/">virtualbox.org</a> je verze <b>%1</b>.</p><p>Tuto verzi si můžete stáhnout přímo zde: </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>Byla vydána nová verze aplikace VirtualBox! Na stránce <a href="https://www.virtualbox.org/">virtualbox.org</a> je verze <b>%1</b>.</p><p>Tuto verzi si můžete stáhnout přímo zde: </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -9152,8 +9115,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&Přepsat</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Při běhu virtuálního počítače se vyskytla kritická chyba a provádění počítače bylo zastaveno.</p><p>Pro pomoc se prosím podívejte do sekce Community na <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> nebo na smlouvu o podpoře. Prosím poskytněte obsah log souboru <tt>VBox.log</tt> a obrázek <tt>VBox.png</tt>, který najdete v adresáři <nobr><b>%1</b></nobr>, [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Při běhu virtuálního počítače se vyskytla kritická chyba a provádění počítače bylo zastaveno.</p><p>Pro pomoc se prosím podívejte do sekce Community na <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> nebo na smlouvu o podpoře. Prosím poskytněte obsah log souboru <tt>VBox.log</tt> a obrázek <tt>VBox.png</tt>, který najdete v adresáři <nobr><b>%1</b></nobr>, společně s po [...]
     </message>
     <message>
         <source>hard disk</source>
@@ -9510,8 +9473,8 @@ p, li { white-space: pre-wrap; }
         <translation><p>Poznámka: Médium nebude smazáno a proto bude možné jej později opět přidat do seznamu.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
-        <translation type="obsolete"><p>Pro tento virtuální počítač nejsou dostupné přídavky pro hosta a sdílené složky nelze bez tohoto přídavku použít. Pokud chcete používat sdílené složky, nainstalujte přídavky pro hosta, případně je reinstalujte pokud nepracují správně zvolením položky <b>Instalovat přídavky pro hosta</b> z nabídky <b>Zařízení</b>. Sdílené složky budou přístupné až bude virtuální počítač plně spuštěn.</p></translation>
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
+        <translation type="unfinished"><p>Pro tento virtuální počítač nejsou dostupné přídavky pro hosta a sdílené složky nelze bez tohoto přídavku použít. Pokud chcete používat sdílené složky, nainstalujte přídavky pro hosta, případně je reinstalujte pokud nepracují správně zvolením položky <b>Instalovat přídavky pro hosta</b> z nabídky <b>Zařízení</b>. Sdílené složky budou přístupné až bude virtuální počítač plně spuštěn.</p></translation>
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
@@ -10054,32 +10017,25 @@ p, li { white-space: pre-wrap; }
         <translation><p>Chce odebrat NAT síť <nobr><b>%1</b>?</nobr></p><p>Pokud je tato síť použita jednou nebo více kartami ve virtuálním počítači, pak nelze tyto karty dále použít a musíte nastavení změnit buď na jiný název sítě nebo na jiný typ síťové karty.</p></translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete"><p>Pro tento virtuální počítač nejsou dostupné přídavky pro hosta a sdílené složky nelze bez tohoto přídavku použít. Pokud chcete používat sdílené složky, nainstalujte přídavky pro hosta, případně je reinstalujte pokud nepracují správně zvolením položky <b>Instalovat přídavky pro hosta</b> z nabídky <b>Zařízení</b>. Sdílené složky budou přístupné až bude virtuální počítač plně spuštěn.</p></translation>
     </message>
     <message>
         <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Připojit</translation>
     </message>
     <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10095,115 +10051,115 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10296,8 +10252,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation>&Název:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Název:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -10319,6 +10275,10 @@ p, li { white-space: pre-wrap; }
         <source>Selects 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>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManager</name>
@@ -11492,18 +11452,14 @@ krok a připojit pevné disky později použitím dialogu Nastavení VM.</p&g
         <translation>Soubory virtuálního počítače (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Vítejte ve VirtualBoxu!</h3><p>Levá část tohoto okna je určena pro zobrazení seznamu všech virtuálních počítačů na vašem počítači. Seznam je teď prázdný, protože jste ještě žádný nevytvořili.<img src=:/welcome.png align=right/></p><p>Pro vytvoření nového virtuálního počítače stiskněte tlačítko <b>Nový</b> v horní části hlavního okna.</p><p>Pro okamžitou nápovědu stiskněte klávesu <b&gt [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation><h3>Vítejte ve VirtualBoxu!</h3><p>Levá část tohoto okna je určena pro zobrazení seznamu všech virtuálních počítačů na vašem počítači. Seznam je teď prázdný, protože jste ještě žádný nevytvořili.<img src=:/welcome.png align=right/></p><p>Pro vytvoření nového virtuálního počítače stiskněte tlačítko <b>Nový</b> v horní části hlavního okna.</p><p>Pro okamžitou nápovědu stiskněte klávesu <b>%1</b> ne [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation>Správce</translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -11691,6 +11647,10 @@ krok a připojit pevné disky později použitím dialogu Nastavení VM.</p&g
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Zavřít</translation>
     </message>
@@ -11698,10 +11658,6 @@ krok a připojit pevné disky později použitím dialogu Nastavení VM.</p&g
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -11813,8 +11769,8 @@ krok a připojit pevné disky později použitím dialogu Nastavení VM.</p&g
         <translation type="obsolete">Shrnutí</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Byla vydána nová verze aplikace VirtualBox! Na stránce <a href="http://www.virtualbox.org/">virtualbox.org</a> je verze <b>%1</b>.</p><p>Tuto verzi si můžete stáhnout přímo zde: </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>Byla vydána nová verze aplikace VirtualBox! Na stránce <a href="https://www.virtualbox.org/">virtualbox.org</a> je verze <b>%1</b>.</p><p>Tuto verzi si můžete stáhnout přímo zde: </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -11905,164 +11861,99 @@ krok a připojit pevné disky později použitím dialogu Nastavení VM.</p&g
 <context>
     <name>UIVMInfoDialog</name>
     <message>
-        <source>&Close</source>
-        <translation type="obsolete">&Zavřít</translation>
-    </message>
-    <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Informace o sezení</translation>
+        <translation type="unfinished">%1 - Informace o sezení</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Detaily</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished">Detaily &nastavení</translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">&Runtime</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished">&Informace o běhu</translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>DMA přenosy</translation>
+        <translation type="unfinished">DMA přenosy</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>PIO přenosy</translation>
+        <translation type="unfinished">PIO přenosy</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Přečteno dat</translation>
+        <translation type="unfinished">Přečteno dat</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Zapsáno dat</translation>
+        <translation type="unfinished">Zapsáno dat</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Přeneseno dat</translation>
+        <translation type="unfinished">Přeneseno dat</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Přijato dat</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Povoleno</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Parametry při spuštění</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Rozlišení obrazovky</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">Statistika CD/DVD</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Statistiky síťového rozhraní</translation>
-    </message>
-    <message>
-        <source>Not attached</source>
-        <translation type="obsolete">Nepřipojeno</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Verze %1.%2</translation>
+        <translation type="unfinished">Přijato dat</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Nedetekováno</translation>
+        <translation type="unfinished">Nedetekováno</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Nedetekováno</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>Přídavky pro hosta</translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation>OS hosta</translation>
-    </message>
-    <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Statistika pevného disku</translation>
-    </message>
-    <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Bez pevných disků</translation>
-    </message>
-    <message>
-        <source>No Network Adapters</source>
-        <translation>Bez síťových adaptérů</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Povoleno</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Zakázáno</translation>
+        <translation type="unfinished">Nedetekováno</translation>
     </message>
     <message>
         <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">Nedostupný</translation>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Nedostupný</translation>
     </message>
     <message>
-        <source>Storage Statistics</source>
-        <translation>Statistiky o úložištích</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Parametry při spuštění</translation>
     </message>
     <message>
-        <source>No Storage Devices</source>
-        <translation>Bez zařízení pro úložiště</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Rozlišení obrazovky</translation>
     </message>
     <message>
-        <source>Network Statistics</source>
-        <translation>Statistiky síťových rozhraní</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Přímý přístup k hardware</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished">Režim se schránkou</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>Nedostupný</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clipboard Mode</source>
-        <translation>Režim se schránkou</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Přídavky pro hosta</translation>
     </message>
     <message>
-        <source>Drag'n'Drop Mode</source>
-        <translation type="obsolete">Režim Táhni a pusť</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">OS hosta</translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
-        <translation>Detaily &nastavení</translation>
+        <source>Storage Statistics</source>
+        <translation type="unfinished">Statistiky o úložištích</translation>
     </message>
     <message>
-        <source>&Runtime Information</source>
-        <translation>&Informace o běhu</translation>
+        <source>No Storage Devices</source>
+        <translation type="unfinished">Bez zařízení pro úložiště</translation>
     </message>
     <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <source>Network Statistics</source>
+        <translation type="unfinished">Statistiky síťových rozhraní</translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Bez síťových adaptérů</translation>
     </message>
 </context>
 <context>
@@ -13373,11 +13264,11 @@ Verze %1</translation>
         <translation type="obsolete">Otevře dialog pro správu sdílených složek</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">&Instalovat Přídavky pro hosta...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Připojí obraz s instalací Přídavků pro hosta</translation>
     </message>
     <message>
@@ -13722,7 +13613,7 @@ Verze %1</translation>
         <translation type="obsolete">I&nformace o sezení</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Zobrazí dialog s informacemi o sezení</translation>
     </message>
     <message>
@@ -14149,8 +14040,8 @@ Verze %1</translation>
         <translation><nastavit výchozí></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Aktuální výchozí cesta bude zobrazena pro akceptování změn a novém otevření tohoto dialogu.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished">Aktuální výchozí cesta bude zobrazena pro akceptování změn a novém otevření tohoto dialogu.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -14198,7 +14089,8 @@ Verze %1</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Aktuální výchozí cesta bude zobrazena pro akceptování změn a novém otevření tohoto dialogu.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -15414,10 +15306,20 @@ Verze %1</translation>
         <translation type="obsolete">Obrazy můžete vytvořit pomocí správce virtuální medií.</translation>
     </message>
     <message>
+        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
         <comment>medium</comment>
         <translation type="obsolete">Některé části souboru s diskem jsou nedostupné. Použijte prosím Správce virtuálních medií v režimu <b>Zobrazení rozdílových disků</b> pro zjištění souvislostí.</translation>
     </message>
+    <message>
+        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
         <source>%n year(s)</source>
         <translation>
@@ -16096,51 +15998,11 @@ Verze %1</translation>
         <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Výchozí</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished">Aktivní</translation>
@@ -16171,6 +16033,11 @@ Verze %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -16181,6 +16048,31 @@ Verze %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Výchozí</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -16191,6 +16083,11 @@ Verze %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -16211,17 +16108,17 @@ Verze %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>User interface</source>
-        <comment>DetailsElementType</comment>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Optical Drive)</source>
+        <source>User interface</source>
+        <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>(Optical Drive)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -16233,7 +16130,7 @@ Verze %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
+        <source>Encrypted</source>
         <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -16243,11 +16140,6 @@ Verze %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Please choose a location for new virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16451,11 +16343,11 @@ na výchozí jazyk systému.</qt>
         <translation type="obsolete">Ukazuje cestu k výchozímu VDI adresáři. Tento adresář je použit, pokud se neurčí jinak, když se přidává existující nebo vytváří nový virtuální pevný disk.</translation>
     </message>
     <message>
-        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Přenastaví cestu k adresáři virtuálního počítače na výchozí hodnotu. Skutečná výchozí cesta bude zobrazena po potvrzení změn a znovuotevření toho dialogu.</translation>
     </message>
     <message>
-        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Restartuje cestu k VDI adresáři na výchozí hodnotu. Skutečná výchozí cesta bude zobrazena po potvrzení změn a znovuotevření toho dialogu.</translation>
     </message>
     <message>
@@ -16499,7 +16391,7 @@ na výchozí jazyk systému.</qt>
         <translation type="obsolete">Otevře dialog pro výběr souboru autentizační knihovny VRDP.</translation>
     </message>
     <message>
-        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Přenastaví soubor autentizační knihovny na výchozí hodnotu. Skutečná výchozí knihovna bude zobrazena až po potvrzení změn a otevření tohoto dialogu.</translation>
     </message>
     <message>
@@ -16821,15 +16713,15 @@ na výchozí jazyk systému.</qt>
         <translation type="obsolete">Vytvoří nový virtuální pevný disk</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -16924,8 +16816,8 @@ na výchozí jazyk systému.</qt>
         <translation type="obsolete">Registrační dialog VirtualBoxu</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
-        <translation type="obsolete"><p>prosíme vyplňte registrační formulář a dejte nám vědět že používáte VirtualBox a, volitelně, budete informováni o novinkách a aktualizacích VirtualBoxu.</p><p>Vložte vaše celé jméno pomocí latisnké abecedy a váš e-mail do políčka níže. Vězte že innotek použije tyto informace pouze získávání statistik o používání produktu a pro odesílání novinek o Virtualboxu. Innotek nikdy nepředá vaše data třetím stranám. Detailní informace o tom [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
+        <translation type="obsolete"><p>prosíme vyplňte registrační formulář a dejte nám vědět že používáte VirtualBox a, volitelně, budete informováni o novinkách a aktualizacích VirtualBoxu.</p><p>Vložte vaše celé jméno pomocí latisnké abecedy a váš e-mail do políčka níže. Vězte že innotek použije tyto informace pouze získávání statistik o používání produktu a pro odesílání novinek o Virtualboxu. Innotek nikdy nepředá vaše data třetím stranám. Detailní informace o tom [...]
     </message>
     <message>
         <source>&Name</source>
@@ -16968,8 +16860,8 @@ na výchozí jazyk systému.</qt>
         <translation type="obsolete">Nelze provést prvotní spojení.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Prosíme vyplňte registrační formulář a dejte nám vědět, že používáte VirtualBox a, volitelně, budete informováni o novinkách a aktualizacích VirtualBoxu.</p><p>Vložte vaše celé jméno pomocí latinské abecedy a váš e-mail do políčka níže. Vězte že Sun Microsystems použije tyto informace pouze získávání statistik o používání produktu a pro odesílání novinek o Virtualboxu. Sun Microsystems nikdy nepředá vaše data třetím stranám. Detai [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Prosíme vyplňte registrační formulář a dejte nám vědět, že používáte VirtualBox a, volitelně, budete informováni o novinkách a aktualizacích VirtualBoxu.</p><p>Vložte vaše celé jméno pomocí latinské abecedy a váš e-mail do políčka níže. Vězte že Sun Microsystems použije tyto informace pouze získávání statistik o používání produktu a pro odesílání novinek o Virtualboxu. Sun Microsystems nikdy nepředá vaše data třetím stranám. Detai [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -16988,8 +16880,8 @@ na výchozí jazyk systému.</qt>
         <translation type="obsolete">Vyberte zemi/teritorium</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
-        <translation type="obsolete"><p>Prosíme vyplňte registrační formulář a dejte nám vědět že používáte VirtualBox a, volitelně, budete informováni o novinkách a aktualizacích VirtualBoxu.</p><p>Vložte vaše celé jméno pomocí latinské abecedy a váš e-mail do políčka níže. Vězte že Sun Microsystems použije tyto informace pouze získávání statistik o používání produktu a pro odesílání novinek o Virtualboxu. Sun Microsystems nikdy nepředá vaše data třetím stranám. Detail [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
+        <translation type="obsolete"><p>Prosíme vyplňte registrační formulář a dejte nám vědět že používáte VirtualBox a, volitelně, budete informováni o novinkách a aktualizacích VirtualBoxu.</p><p>Vložte vaše celé jméno pomocí latinské abecedy a váš e-mail do políčka níže. Vězte že Sun Microsystems použije tyto informace pouze získávání statistik o používání produktu a pro odesílání novinek o Virtualboxu. Sun Microsystems nikdy nepředá vaše data třetím stranám. Detail [...]
     </message>
     <message>
         <source>I &already have a Sun Online account:</source>
@@ -17217,8 +17109,8 @@ na výchozí jazyk systému.</qt>
         <translation type="obsolete">Pozastaví chod virtuálního počítače</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Vítejte ve VirtualBoxu!</h3><p>Levá část tohoto okna je určena pro zobrazení seznamu všech virtuálních počítačů na vašem počítači. Seznam je teď prázdný, protože jste ještě žádný nevytvořili.<img src=:/welcome.png align=right/></p><p>Pro vytvoření nového virtuálního počítače stiskněte tlačítko <b>Nový</b> v horní části hlavního okna.</p><p>Pro okamžitou nápovědu stiskněte klávesu <b&gt [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Vítejte ve VirtualBoxu!</h3><p>Levá část tohoto okna je určena pro zobrazení seznamu všech virtuálních počítačů na vašem počítači. Seznam je teď prázdný, protože jste ještě žádný nevytvořili.<img src=:/welcome.png align=right/></p><p>Pro vytvoření nového virtuálního počítače stiskněte tlačítko <b>Nový</b> v horní části hlavního okna.</p><p>Pro okamžitou nápovědu stiskněte klávesu <b&gt [...]
     </message>
     <message>
         <source>Log</source>
@@ -18036,6 +17928,161 @@ hodnotu.</qt></translation>
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>&Close</source>
+        <translation type="obsolete">&Zavřít</translation>
+    </message>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Informace o sezení</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Detaily</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Runtime</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">DMA přenosy</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">PIO přenosy</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Přečteno dat</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Zapsáno dat</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Přeneseno dat</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Přijato dat</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Povoleno</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Parametry při spuštění</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Rozlišení obrazovky</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">Statistika CD/DVD</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Statistiky síťového rozhraní</translation>
+    </message>
+    <message>
+        <source>Not attached</source>
+        <translation type="obsolete">Nepřipojeno</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Verze %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Nedetekováno</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Nedetekováno</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Přídavky pro hosta</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">OS hosta</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Statistika pevného disku</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Bez pevných disků</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Bez síťových adaptérů</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Povoleno</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Zakázáno</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">Nedostupný</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Statistiky o úložištích</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Bez zařízení pro úložiště</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Statistiky síťových rozhraní</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Přímý přístup k hardware</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Nedostupný</translation>
+    </message>
+    <message>
+        <source>Clipboard Mode</source>
+        <translation type="obsolete">Režim se schránkou</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">Režim Táhni a pusť</translation>
+    </message>
+    <message>
+        <source>Configuration &Details</source>
+        <translation type="obsolete">Detaily &nastavení</translation>
+    </message>
+    <message>
+        <source>&Runtime Information</source>
+        <translation type="obsolete">&Informace o běhu</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMListBox</name>
     <message>
         <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
@@ -18712,7 +18759,7 @@ tuto možnost po nainstalování hostovaného operačního systému Windows!<
         <translation type="obsolete">Ukazuje cestu, kam jsou ukládány snímky virtuálního počítače. Snímky můžou zabrat velké množství diskového prostor.</translation>
     </message>
     <message>
-        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Přenastaví cestu k adresáři snímků na výchozí hodnotu. Skutečná výchozí cesta bude zobrazena po potvrzení změn a znovuotevření toho dialogu.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
index b46cdb6..39a2b0c 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
@@ -318,7 +318,7 @@
         <translation type="obsolete">I&nformation om session</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Vis sessionsinformation</translation>
     </message>
     <message>
@@ -410,12 +410,12 @@
         <translation type="obsolete">Tillad eller afvis fjernskærmsforbindelser (RDP) til denne maskine</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Installér Gæstetilføjelser...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation>&Indsæt Gæstetilføjelser CD-aftryk...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
-        <translation type="obsolete">Monterer CD'en med Gæstetilføjelser</translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <translation type="obsolete">Indsæt CD-aftrykket med Gæstetilføjelser i det virtuelle drev</translation>
     </message>
     <message>
         <source>De&bug</source>
@@ -902,116 +902,122 @@
         <translation>Delt udklipsholder</translation>
     </message>
     <message>
+        <source>Drag'n'Drop</source>
+        <translation type="obsolete">Træk og slip</translation>
+    </message>
+    <message>
+        <source>Save the machine state of the virtual machine</source>
+        <translation type="obsolete">Gem tilstanden af den virtuelle maskine</translation>
+    </message>
+    <message>
         <source>Power off the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sluk den virtuelle maskine</translation>
     </message>
     <message>
         <source>&Network Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Netværksindstillinger...</translation>
     </message>
     <message>
         <source>&Shared Folders Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ind&stillinger for Delte mapper...</translation>
     </message>
     <message>
         <source>R&emote Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Fj&ernskærm</translation>
     </message>
     <message>
-        <source>&Video Capture</source>
-        <translation type="unfinished"></translation>
+        <source>Toggle remote desktop (RDP) connections to this machine</source>
+        <translation type="obsolete">Slå fjernskærmsforbindelser (RDP) til denne maskine til/fra</translation>
     </message>
     <message>
-        <source>&Video Capture Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&Video Capture</source>
+        <translation>&Videooptagelse</translation>
     </message>
     <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
+        <source>Toggle video capture</source>
+        <translation type="obsolete">Videooptagelse til/fra</translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
+        <source>&Video Capture Settings...</source>
+        <translation>Indstillinger for &Videooptagelse...</translation>
     </message>
     <message>
-        <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <source>Configure video capture settings</source>
+        <translation type="obsolete">Konfigurer videooptagelse</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Popup Menu</source>
+        <translation>Pop op menu</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <comment>new</comment>
+        <translation type="obsolete">&Installér Gæstetilføjelser...</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Monterer CD'en med Gæstetilføjelser</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&Webcams</source>
+        <translation>&Webcams</translation>
     </message>
     <message>
-        <source>&Status Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Fil</translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">Indstillinger...</translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Vis &log...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Fil</translation>
+        <source>&Save State</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1027,175 +1033,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">Indstillinger...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
+        <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
+        <source>&Hard Disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
+        <source>&USB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Vis &log...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1234,10 +1240,18 @@
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ingen webcams tilsluttede</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
+        <translation type="unfinished">Ingen understøttede webcams forbundet til værtsmaskinen</translation>
+    </message>
+    <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1257,7 +1271,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1265,7 +1279,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1289,15 +1303,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1309,11 +1335,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1321,7 +1347,7 @@
         <translation type="unfinished">Genop&frisk</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1365,15 +1391,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1382,33 +1408,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Aktivér</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1431,6 +1432,18 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -2873,62 +2886,62 @@ p, li { white-space: pre-wrap; }
     <message>
         <source><b>%1</b></source>
         <comment>Group item tool-tip / Group name</comment>
-        <translation type="unfinished"></translation>
+        <translation><b>%1</b></translation>
     </message>
     <message numerus="yes">
         <source>%n group(s)</source>
         <comment>Group item tool-tip / Group info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n gruppe</numerusform>
+            <numerusform>%n grupper</numerusform>
         </translation>
     </message>
     <message>
         <source><nobr>%1</nobr></source>
         <comment>Group item tool-tip / Group info wrapper</comment>
-        <translation type="unfinished"><nobr>%1</nobr></translation>
+        <translation><nobr>%1</nobr></translation>
     </message>
     <message numerus="yes">
         <source>%n machine(s)</source>
         <comment>Group item tool-tip / Machine info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n maskine</numerusform>
+            <numerusform>%n maskiner</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>(%n running)</source>
         <comment>Group item tool-tip / Running machine info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>(%n kører)</numerusform>
+            <numerusform>(%n kører)</numerusform>
         </translation>
     </message>
     <message>
         <source><nobr>%1</nobr></source>
         <comment>Group item tool-tip / Machine info wrapper</comment>
-        <translation type="unfinished"><nobr>%1</nobr></translation>
+        <translation><nobr>%1</nobr></translation>
     </message>
     <message>
         <source><nobr>%1 %2</nobr></source>
         <comment>Group item tool-tip / Machine info wrapper, including running</comment>
-        <translation type="unfinished"><nobr>%1</nobr> {1 %2<?}</translation>
+        <translation><nobr>%1 %2</nobr></translation>
     </message>
     <message>
         <source>Collapse group</source>
-        <translation type="unfinished"></translation>
+        <translation>Sammenfold gruppe</translation>
     </message>
     <message>
         <source>Expand group</source>
-        <translation type="unfinished"></translation>
+        <translation>Udvid gruppe</translation>
     </message>
     <message>
         <source>Enter group</source>
-        <translation type="unfinished"></translation>
+        <translation>Gå til gruppe</translation>
     </message>
     <message>
         <source>Exit group</source>
-        <translation type="unfinished"></translation>
+        <translation>Forlad gruppe</translation>
     </message>
 </context>
 <context>
@@ -3178,7 +3191,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
         <comment>details (network)</comment>
-        <translation>Generisk driver, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation type="obsolete">Generisk driver, '%1' {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -3198,31 +3211,31 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Video Capture File</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Videooptagelsesfil</translation>
     </message>
     <message>
         <source>Video Capture Attributes</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Egenskaber for videooptagelse</translation>
     </message>
     <message>
         <source>Video Capture</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Videooptagelse</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Slået fra</translation>
     </message>
     <message>
         <source>NAT Network, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>NAT-netværk, '%1'</translation>
     </message>
     <message>
         <source>Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>Opløsning: %1x%2, billeder/sek: %3fps, Bitrate: %4kbps</translation>
     </message>
     <message>
         <source>Minimal Paravirtualization</source>
@@ -3240,83 +3253,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>[Optical Drive]</source>
         <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>USB Controller</source>
         <comment>details (usb)</comment>
         <translation type="unfinished">USB-styreenhed</translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini-toolbar</source>
-        <comment>details (user interface)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Menu-bar</source>
+        <source>Mini-toolbar Position</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
+        <source>Mini-toolbar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3646,7 +3664,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Extension Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Udvid&elsespakker</translation>
     </message>
     <message>
         <source>Add Package</source>
@@ -3720,8 +3738,28 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&Slå værtens pauseskærm fra</translation>
     </message>
     <message>
+        <source>&Dock and Menubar:</source>
+        <translation type="obsolete">&Dok og Menulinje:</translation>
+    </message>
+    <message>
+        <source>Auto-Show in Fullscreen</source>
+        <translation type="obsolete">Vis på fuldskærm</translation>
+    </message>
+    <message>
+        <source>When checked, the host dock and menu bar will be shown when the virtual machine is in fullscreen mode.</source>
+        <translation type="obsolete">Hvis markeret, vil værtens Dok og Menulinje blive vist, når den virtuelle maskine er i fuldskærmstilstand.</translation>
+    </message>
+    <message>
+        <source>&Host Screensaver:</source>
+        <translation type="obsolete">Værtens pauseskærm:</translation>
+    </message>
+    <message>
         <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hvis markeret, vil værtens pauseskærm blive slået fra når mindst én virtual maskine kører.</translation>
+    </message>
+    <message>
+        <source>Disable When Running Virtual Machines</source>
+        <translation type="obsolete">Slå fra, når der kører virtuelle maskiner</translation>
     </message>
     <message>
         <source>Host Screensaver:</source>
@@ -3768,19 +3806,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Host Key Combination</source>
-        <translation type="unfinished"></translation>
+        <translation>Værtstast-kombination</translation>
     </message>
     <message>
         <source>Some items have the same shortcuts assigned.</source>
-        <translation type="unfinished"></translation>
+        <translation>Flere elementer tildelt samme genvej.</translation>
     </message>
     <message>
         <source>&VirtualBox Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>&VirtualBox Manager</translation>
     </message>
     <message>
         <source>Virtual &Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtuel &maskine</translation>
+    </message>
+    <message>
+        <source>Lists all the available shortcuts which can be configured.</source>
+        <translation type="obsolete">Viser alle tilgængelige genveje, der kan konfigureres.</translation>
+    </message>
+    <message>
+        <source>Enter a sequence to filter the shortcut list.</source>
+        <translation type="obsolete">Tast en sekvens for at filtrere genvejslisten.</translation>
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
@@ -3847,7 +3893,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Interface Languages</source>
-        <translation type="unfinished"></translation>
+        <translation>Brugerflade-sprog</translation>
     </message>
 </context>
 <context>
@@ -4004,116 +4050,128 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&NAT Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>&NAT-netværk</translation>
     </message>
     <message>
         <source>Lists all available NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Viser tilgængelige NAT-netværk.</translation>
     </message>
     <message>
         <source>&Host-only Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>Interne netværk</translation>
     </message>
     <message>
         <source>No new name specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Intet nyt navn angivet for NAT-netværket <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Subnet ikke angivet for NAT-netværket <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Subnet ikke angivet for NAT-netværk tidligere navngivet <b>%1</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ugyldigt subnet angivet (<i>%1</i>) for NAT-netværk <b>%2</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ugyldigt subnet (<i>%1</i>) angivet for NAT-netværk tidligere navngivet <b>%2</b>.</translation>
     </message>
     <message>
         <source>Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Netværksnavn</translation>
     </message>
     <message>
         <source>[empty]</source>
-        <translation type="unfinished"></translation>
+        <translation>[tom]</translation>
     </message>
     <message>
         <source>%1 (renamed from %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (omdøbt fra %2)</translation>
     </message>
     <message>
         <source>Old Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Gammelt netværksnavn</translation>
     </message>
     <message>
         <source>New Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nyt netværksnavn</translation>
     </message>
     <message>
         <source>Network CIDR</source>
-        <translation type="unfinished"></translation>
+        <translation>Subnet-maske</translation>
     </message>
     <message>
         <source>Supports DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Understøtter DHCP</translation>
     </message>
     <message>
         <source>yes</source>
-        <translation type="unfinished"></translation>
+        <translation>ja</translation>
     </message>
     <message>
         <source>no</source>
-        <translation type="unfinished"></translation>
+        <translation>nej</translation>
     </message>
     <message>
         <source>Supports IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Understøtter IPv6</translation>
     </message>
     <message>
         <source>Default IPv6 route</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard IPv6 rute</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Værts-netværkskort (<i>%1</i>) har ikke en gyldig IPv4-adresse.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 network mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>Værts-netværkskort (<i>%1</i>) har ikke en gyldig IPv4-netværksmaske.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv6 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Værts-netværkskort (<i>%1</i>) har ikke en gyldig IPv6-adresse.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Værts-netværkskort (<i>%1</i>) har ikke en gyldig DHCP-serveradresse.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>Værts-netværkskort (<i>%1</i>) har ikke en gyldig DHCP-server maske.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server lower address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>Værts-netværkskort (<i>%1</i>) har ikke en gyldig nedre grænse for DHCP-adresser.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server upper address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>Værts-netværkskort (<i>%1</i>) har ikke en gyldig øvre grænse for DHCP-adresser.</translation>
     </message>
     <message>
         <source>The name <b>%1</b> is being used for several NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Navnet <b>%1</b> bruges af flere forskellige NAT-netværk.</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>NAT network</comment>
-        <translation type="unfinished">Aktiv</translation>
+        <translation>Aktivt</translation>
+    </message>
+    <message>
+        <source>&Add NAT network</source>
+        <translation type="obsolete">Tilføj N&AT-netværk</translation>
+    </message>
+    <message>
+        <source>&Remove NAT network</source>
+        <translation type="obsolete">Fje&rn NAT-netværk</translation>
+    </message>
+    <message>
+        <source>&Edit NAT network</source>
+        <translation type="obsolete">Tilr&et NAT-netværk</translation>
     </message>
     <message>
         <source>Add NAT Network</source>
@@ -4263,59 +4321,59 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsNetworkDetailsHost</name>
     <message>
         <source>Host-only Network Details</source>
-        <translation type="unfinished">Detaljer for værtsbegrænset netværk</translation>
+        <translation>Detaljer for værtsbegrænset netværk</translation>
     </message>
     <message>
         <source>&Adapter</source>
-        <translation type="unfinished">Netværkskort</translation>
+        <translation>Netværkskort</translation>
     </message>
     <message>
         <source>Manual &Configuration</source>
-        <translation type="unfinished">Manuel konfiguration</translation>
+        <translation>Manuel konfiguration</translation>
     </message>
     <message>
         <source>Use manual configuration for this host-only network adapter.</source>
-        <translation type="obsolete">Konfigurér værtsbegrænset netværkskort manuelt.</translation>
+        <translation type="obsolete">Brug manuel konfiguration for værtsbegrænset netværkskort.</translation>
     </message>
     <message>
         <source>&IPv4 Address:</source>
-        <translation type="unfinished">&IPv4-adresse:</translation>
+        <translation>&IPv4-adresse:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 address for this adapter.</source>
-        <translation type="unfinished">Viser værtens IPv4-adresse for dette netværkskort.</translation>
+        <translation>Viser værtens IPv4-adresse for dette netværkskort.</translation>
     </message>
     <message>
         <source>IPv4 Network &Mask:</source>
-        <translation type="unfinished">IPv4-netværks&maske:</translation>
+        <translation>IPv4-netværks&maske:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 network mask for this adapter.</source>
-        <translation type="unfinished">Viser værtens IPv4-netværksmaske for dette netværkskort.</translation>
+        <translation>Viser værtens IPv4-netværksmaske for dette netværkskort.</translation>
     </message>
     <message>
         <source>I&Pv6 Address:</source>
-        <translation type="unfinished">I&Pv6-adresse:</translation>
+        <translation>I&Pv6-adresse:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Viser værtens IPv6-adresse for dette netværkskort.</translation>
+        <translation>Viser værtens IPv6-adresse for dette netværkskort, hvis IPv6 er understøttet.</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &Length:</source>
-        <translation type="unfinished">&Længde på IPv6-netværksmaske:</translation>
+        <translation>&Længde på IPv6-netværksmaske:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Viser præfix-længden af værtens IPv6-netværksmaske for dette netværkskort, hvis IPv6 understøttes.</translation>
+        <translation>Viser præfix-længden af værtens IPv6-netværksmaske for dette netværkskort, hvis IPv6 er understøttet.</translation>
     </message>
     <message>
         <source>&DHCP Server</source>
-        <translation type="unfinished">&DHCP-server</translation>
+        <translation>&DHCP-server</translation>
     </message>
     <message>
         <source>&Enable Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiv&er server</translation>
     </message>
     <message>
         <source>Indicates whether the DHCP Server is enabled on machine startup or not.</source>
@@ -4323,42 +4381,42 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Server Add&ress:</source>
-        <translation type="unfinished">Serverad&resse:</translation>
+        <translation>Serverad&resse:</translation>
     </message>
     <message>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Viser DHCP-serverens adresse på netværket tilknyttet det værtsbegrænsede netværkskort.</translation>
+        <translation>Viser adressen på DHCP-serveren, der servicerer netværket for det værtsbegrænsede netværkskort.</translation>
     </message>
     <message>
         <source>Server &Mask:</source>
-        <translation type="unfinished">Server-&maske:</translation>
+        <translation>Server-&maske:</translation>
     </message>
     <message>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Viser DHCP-serverens netværksmaske på netværket tilknyttet det værtsbegrænsede netværkskort.</translation>
+        <translation>Viser DHCP-serverens netværksmaske på netværket tilknyttet det værtsbegrænsede netværkskort.</translation>
     </message>
     <message>
         <source>&Lower Address Bound:</source>
-        <translation type="unfinished">Nedre grænse for adresser:</translation>
+        <translation>Nedre grænse for adresser:</translation>
     </message>
     <message>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Viser DHCP-serverens nedre grænse for adresser på netværket tilknyttet det værtsbegrænsede netværkskort.</translation>
+        <translation>Viser DHCP-serverens nedre grænse for adresser på netværket tilknyttet det værtsbegrænsede netværkskort.</translation>
     </message>
     <message>
         <source>&Upper Address Bound:</source>
-        <translation type="unfinished">Øvre grænse for adresser:</translation>
+        <translation>Øvre grænse for adresser:</translation>
     </message>
     <message>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Viser DHCP-serverens øvre grænse for adresser på netværket tilknyttet det værtsbegrænsede netværkskort.</translation>
+        <translation>Viser DHCP-serverens øvre grænse for adresser på netværket tilknyttet det værtsbegrænsede netværkskort.</translation>
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4366,43 +4424,59 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsNetworkDetailsNAT</name>
     <message>
         <source>NAT Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detaljer for NAT-netværk</translation>
     </message>
     <message>
         <source>&Enable Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivér n&etværk</translation>
+    </message>
+    <message>
+        <source>Enable this NAT network.</source>
+        <translation type="obsolete">Aktiverer dette NAT-netværk</translation>
     </message>
     <message>
         <source>Network &Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Netværksnavn:</translation>
     </message>
     <message>
         <source>Holds the name for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Viser netværkets navn.</translation>
     </message>
     <message>
         <source>Network &CIDR:</source>
-        <translation type="unfinished"></translation>
+        <translation>Subnet-maske:</translation>
     </message>
     <message>
         <source>Holds the CIDR for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Viser subnet-masken for dette netværk</translation>
     </message>
     <message>
         <source>Network Options:</source>
-        <translation type="unfinished"></translation>
+        <translation>Netværksindstillinger:</translation>
     </message>
     <message>
         <source>Supports &DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Understøtter &DHCP</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports DHCP.</source>
+        <translation type="obsolete">Styrer om netværket understøtter DHCP.</translation>
     </message>
     <message>
         <source>Supports &IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Understøtter &IPv6</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports IPv6.</source>
+        <translation type="obsolete">Styrer om netværket understøtter IPv6.</translation>
     </message>
     <message>
         <source>Advertise Default IPv6 &Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Indstil som standard IPv6-&rute</translation>
+    </message>
+    <message>
+        <source>Determines whether this network should be advertised as the default IPv6 route.</source>
+        <translation type="obsolete">Styrer om dette netværk skal være standard IPv6-rute.</translation>
     </message>
     <message>
         <source>Opens a window to manage port forwarding rules.</source>
@@ -4410,7 +4484,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Port Forwarding</source>
-        <translation type="unfinished">&Port-viderestilling</translation>
+        <translation>&Port-viderestilling</translation>
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
@@ -4437,15 +4511,15 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsPortForwardingDlg</name>
     <message>
         <source>Port Forwarding Rules</source>
-        <translation type="unfinished">Regler for port-viderestilling</translation>
+        <translation>Regler for port-viderestilling</translation>
     </message>
     <message>
         <source>IPv4</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4</translation>
     </message>
     <message>
         <source>IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6</translation>
     </message>
 </context>
 <context>
@@ -4456,7 +4530,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Enable Proxy</source>
-        <translation>Brug proxy</translation>
+        <translation>Anv&end proxy</translation>
     </message>
     <message>
         <source>Ho&st:</source>
@@ -4500,11 +4574,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No proxy host is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy-adresse ikke angivet.</translation>
     </message>
     <message>
         <source>No proxy port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy-port ikke angivet.</translation>
     </message>
     <message>
         <source>Holds the proxy host.</source>
@@ -4581,71 +4655,71 @@ p, li { white-space: pre-wrap; }
     <name>UIHostComboEditor</name>
     <message>
         <source><key_%1></source>
-        <translation type="unfinished"><tast_%1></translation>
+        <translation><tast_%1></translation>
     </message>
     <message>
         <source>Left </source>
-        <translation type="unfinished">Venstre</translation>
+        <translation>Venstre </translation>
     </message>
     <message>
         <source>Right </source>
-        <translation type="unfinished">Højre</translation>
+        <translation>Højre </translation>
     </message>
     <message>
         <source>Left Shift</source>
-        <translation type="unfinished">Venstre Shift</translation>
+        <translation>Venstre Shift</translation>
     </message>
     <message>
         <source>Right Shift</source>
-        <translation type="unfinished">Højre Shift</translation>
+        <translation>Højre Shift</translation>
     </message>
     <message>
         <source>Left Ctrl</source>
-        <translation type="unfinished">Venstre Ctrl</translation>
+        <translation>Venstre Ctrl</translation>
     </message>
     <message>
         <source>Right Ctrl</source>
-        <translation type="unfinished">Højre Ctrl</translation>
+        <translation>Højre Ctrl</translation>
     </message>
     <message>
         <source>Left Alt</source>
-        <translation type="unfinished">Venstre Alt</translation>
+        <translation>Venstre Alt</translation>
     </message>
     <message>
         <source>Right Alt</source>
-        <translation type="unfinished">Højre Alt</translation>
+        <translation>Højre Alt</translation>
     </message>
     <message>
         <source>Left WinKey</source>
-        <translation type="unfinished">Venstre Windows-tast</translation>
+        <translation>Venstre Windows-tast</translation>
     </message>
     <message>
         <source>Right WinKey</source>
-        <translation type="unfinished">Højre Windows-tast</translation>
+        <translation>Højre Windows-tast</translation>
     </message>
     <message>
         <source>Menu key</source>
-        <translation type="unfinished">Menu tast</translation>
+        <translation>Menu tast</translation>
     </message>
     <message>
         <source>Alt Gr</source>
-        <translation type="unfinished">Alt Gr</translation>
+        <translation>AltGr</translation>
     </message>
     <message>
         <source>Caps Lock</source>
-        <translation type="unfinished">Caps Lock</translation>
+        <translation>Caps Lock</translation>
     </message>
     <message>
         <source>Scroll Lock</source>
-        <translation type="unfinished">Scroll Lock</translation>
+        <translation>Scroll Lock</translation>
     </message>
     <message>
         <source>Host+</source>
-        <translation type="unfinished"></translation>
+        <translation>Vært+</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished">Ingen</translation>
+        <translation>Ingen</translation>
     </message>
 </context>
 <context>
@@ -4834,22 +4908,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Reset shortcut to default</source>
-        <translation type="unfinished"></translation>
+        <translation>Nulstil genvej til standard</translation>
     </message>
     <message>
         <source>Unset shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Fjern genvej</translation>
     </message>
 </context>
 <context>
     <name>UIHotKeyTableModel</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Navn</translation>
+        <translation>Navn</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Genvej</translation>
     </message>
 </context>
 <context>
@@ -5092,23 +5166,24 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Indikerer aktiv videooptagelse:</nobr><br>%1</translation>
     </message>
     <message>
         <source><nobr><b>Video capture disabled</b></nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Videooptagelse deaktiveret</b></nobr></translation>
     </message>
     <message>
         <source><nobr><b>Video capture file:</b> %1</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Videooptagelsesfil:</b> %1</nobr></translation>
     </message>
     <message>
         <source>Additional feature status:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="unfinished"></translation>
+        <translation>Status for udvidelser:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5122,8 +5197,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5200,6 +5274,14 @@ p, li { white-space: pre-wrap; }
         <source>Select a filename for the screenshot ...</source>
         <translation>Vælg et filnavn til skærmbilledet ...</translation>
     </message>
+    <message>
+        <source>No Webcams Connected</source>
+        <translation type="obsolete">Ingen webcams tilsluttede</translation>
+    </message>
+    <message>
+        <source>No supported webcams connected to the host PC</source>
+        <translation type="obsolete">Ingen understøttede webcams forbundet til værtsmaskinen</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsAudio</name>
@@ -5360,122 +5442,130 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Video &Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Videooptagelse</translation>
     </message>
     <message>
         <source>When checked, VirtualBox will record the virtual machine session as a video file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hvis markeret, vil VirtualBox optage sessionen i den virtuelle maskine i en videofil.</translation>
     </message>
     <message>
         <source>&Enable Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Slå vid&eooptagelse til</translation>
     </message>
     <message>
         <source>File &Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>Filsti:</translation>
+    </message>
+    <message>
+        <source>This setting determines the filename VirtualBox uses to save the recorded content.</source>
+        <translation type="obsolete">Styrer navnet på filen som Virtualbox gemmer det optagede indhold i.</translation>
     </message>
     <message>
         <source>Frame &Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Oplø&sning:</translation>
+    </message>
+    <message>
+        <source>This setting determines the resolution (frame size) of the recorded video.</source>
+        <translation type="obsolete">Styrer opløsningen (billedstørrelsen) for optagelsen.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
+        <translation type="obsolete">Styrer den <b>vandrette</b> opløsning (punkter pr.linje) for optagelsen.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>vertical</b> resolution (frame height) of the recorded video.</source>
+        <translation type="obsolete">Styrer den <b>lodrette</b> opløsning (antal linjer) for optagelsen.</translation>
     </message>
     <message>
         <source>&Frame Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>Billed&frekvens:</translation>
+    </message>
+    <message>
+        <source>This setting determines the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
+        <translation type="obsolete">Sætter den øvre grænse for <b>billeder pr.sekund</b>. Yderligere billeder droppes. Jo lavere værdi, jo flere billeder droppes, hvilket reducerer størrelsen på filen, der optages til.</translation>
     </message>
     <message>
         <source>&Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kvalitet:</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Styrer <b>kvaliteten</b>. Jo højere værdi, jo bedre vil optagelsen se ud, men filen, der optages til, vil også fylde mere.</translation>
+    </message>
+    <message>
+        <source>This setting determines the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Styrer bithastigheden i <b>kilobits pr.sekund</b>. Jo højere værdi, jo bedre vil optagelsen se ud, men filen, der optages til, vil også fylde mere.</translation>
     </message>
     <message>
         <source>&Screens:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Skærme:</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use hardware graphics acceleration. However the host system does not currently provide this, so you will not be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Den virtuelle maskine er konfigureret til at bruge hardwareacceleration, men da værtsmaskinen ikke tilbyder dette for øjeblikket, vil du ikke kunne starte maskinen.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to fullscreen or seamless mode.</source>
+        <translation type="obsolete">Du har tildelt mindre end <b>%1</b> til grafikhukommelse, som ellers er den mindste mængde, der tillader den virtuelle maskine at skifte til fuldskærm eller rammefri tilstand.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required for High Definition Video to be played efficiently.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du har tildelt mindre end <b>%1</b> til grafikhukommelse, som ellers er den mindste mængde, der kræves for effektiv afspilning af HD video.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least b>%1</b>.</source>
+        <translation type="obsolete">Den virtuelle maskine er konfigureret til at bruge grafikacceleration og operativsystem-typen er sat til Windows Vista eller nyere. For den bedste ydeevne bør du sætte maskinens grafikhukommelse til mindst <b>%1</b>.</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use Video Stream Acceleration. As this feature only works with Windows guest systems it will be disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Den virtuelle maskine er konfigureret til at bruge Video Stream Acceleration. Da dette kræver Windows som gæsteoperativsystem, deaktiveres VSA.</translation>
     </message>
     <message>
         <source>The VRDE server port value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Værdien for VRDE-serverporten er ikke angivet.</translation>
     </message>
     <message>
         <source>The VRDE authentication timeout value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidsgrænsen for VRDE-autentifikation er ikke angivet.</translation>
     </message>
     <message>
         <source>User Defined</source>
-        <translation type="unfinished"></translation>
+        <translation>Brugerdefineret</translation>
     </message>
     <message>
         <source>%1 fps</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 fps</translation>
     </message>
     <message>
         <source>fps</source>
-        <translation type="unfinished"></translation>
+        <translation>fps</translation>
     </message>
     <message>
         <source>low</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>Lav</translation>
     </message>
     <message>
         <source>medium</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>Mellem</translation>
     </message>
     <message>
         <source>high</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>Høj</translation>
     </message>
     <message>
         <source>kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>kbps</translation>
     </message>
     <message>
         <source>Screen %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Miniværktøjslinje:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Hvis markeret, vises mini-værktøjslinjen i Fuldskærm og Rammefri tilstand.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Vis i &Fuldskærm/Rammefri tilstand</translation>
+        <translation>Skærm %1</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Hvis markeret, vises mini-værktøjslinjen i toppen af skærmen fremfor som standard i bunden af skærmen.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Vis i &toppen af skærm</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Enable video recording for screen %1.</source>
+        <translation type="obsolete">Slå videooptagelse til for skærm %1. </translation>
     </message>
     <message>
         <source>&Screen</source>
@@ -5490,15 +5580,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">3D {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D {200%?}</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5514,10 +5600,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5566,6 +5648,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 MB</translation>
     </message>
@@ -5574,6 +5664,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5585,8 +5679,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Viser stien, hvor øjebliksbilleder af den virtuelle maskine bliver gemt. Bemærk at øjebliksbilleder kan bruge en hel del lagerplads.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Basal</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Basal</translation>
     </message>
     <message>
         <source>&Name:</source>
@@ -5597,8 +5691,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Viser navnet på den virtuelle maskine.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Avanceret</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Avanceret</translation>
     </message>
     <message>
         <source>&Shared Clipboard:</source>
@@ -5613,8 +5707,8 @@ p, li { white-space: pre-wrap; }
         <translation>Øjebliksbilleder:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>Beskrivelse</translation>
+        <source>&Description</source>
+        <translation type="obsolete">Beskrivelse</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5658,8 +5752,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Du har valgt et 64-bit gæsteoperativsystem til denne VM. Da denne type gæst kræver hardware-virtualisering (VT-x/AMD-V) er dette automatisk blevet slået til.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation>Træk og slip:</translation>
+        <source>&Drag'n'Drop:</source>
+        <translation type="obsolete">Træk og slip:</translation>
     </message>
     <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
@@ -5667,13 +5761,29 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No name specified for the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Navn for virtuel maskine ikke angivet.</translation>
     </message>
     <message>
         <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
+        <translation>Den virtuelle maskines operativsystem-type er sat til 64-bit. 64-bit gæsteoperativsystemer kræver hardware-virtualisering, så dette aktiveres automatiskt hvis du bekræfter ændringerne.</translation>
+    </message>
+    <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">Avanceret</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>D&escription</source>
+        <translation type="unfinished">B&eskrivelse</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5690,6 +5800,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5722,16 +5836,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5742,28 +5852,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">3D {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D {200%?}</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Miniværktøjslinje:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Hvis markeret, vises mini-værktøjslinjen i Fuldskærm og Rammefri tilstand.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Vis i &Fuldskærm/Rammefri tilstand</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Hvis markeret, vises mini-værktøjslinjen i toppen af skærmen fremfor som standard i bunden af skærmen.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -5773,18 +5875,6 @@ p, li { white-space: pre-wrap; }
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -5928,35 +6018,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No bridged network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du skal vælge en netværksbro.</translation>
     </message>
     <message>
         <source>No internal network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du skal angive et navn til det interne netværk.</translation>
     </message>
     <message>
         <source>No host-only network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du skal vælge et værtsbegrænset netværkskort.</translation>
     </message>
     <message>
         <source>No generic driver is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Generisk driver ikke valgt.</translation>
     </message>
     <message>
         <source>The MAC address must be 12 hexadecimal digits long.</source>
-        <translation type="unfinished"></translation>
+        <translation>MAC-adressen skal bestå af 12 hexadecimale tegn.</translation>
     </message>
     <message>
         <source>The second digit in the MAC address may not be odd as only unicast addresses are allowed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Det andet tegn i MAC-adressen må ikke være ulige, da kun unicast-adresser er tilladt.</translation>
     </message>
     <message>
         <source>No NAT network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du skal angive et navn til NAT-netværket.</translation>
     </message>
     <message>
         <source>Holds the name of the NAT network that this network card will be connected to. You can create and remove networks using the global network settings in the virtual machine manager window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Indtast navnet på NAT-netværket som dette netværkskort skal forbindes til. Du kan oprette og fjerne netværk via globale indstillinger for netværk i Virtuel Maskine Håndtering.</translation>
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
@@ -6063,23 +6153,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">IRQ ikke angivet.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">I/O port ikke angivet.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">To eller flere porte har samme værdier.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Portsti ikke angivet.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Den samme portsti er angivet flere gange.</translation>
     </message>
 </context>
 <context>
@@ -6096,6 +6186,26 @@ p, li { white-space: pre-wrap; }
         <source>Duplicate port path entered </source>
         <translation type="obsolete">Stien til porten bruges allerede </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">IRQ ikke angivet.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">I/O port ikke angivet.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">To eller flere porte har samme værdier.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">Portsti ikke angivet.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">Den samme portsti er angivet flere gange.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsPortForwardingDlg</name>
@@ -6290,6 +6400,10 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Hvis markeret, vil mappe-delingen blive permanent.</translation>
     </message>
     <message>
+        <source>Window</source>
+        <translation type="obsolete">Vindue</translation>
+    </message>
+    <message>
         <source>When checked, this shared folder will be permanent.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6366,44 +6480,44 @@ p, li { white-space: pre-wrap; }
         <translation>Viser serielportens I/O-adresse. Gyldige værdier er heltal fra <tt>0</tt> til <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">IRQ ikke angivet.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">I/O port ikke angivet.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">To eller flere porte har samme værdier.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Portsti ikke angivet.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Den samme portsti er angivet flere gange.</translation>
     </message>
 </context>
 <context>
@@ -6420,6 +6534,26 @@ p, li { white-space: pre-wrap; }
         <source>Duplicate port path entered </source>
         <translation type="obsolete">Stien til porten bruges allerede </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">IRQ ikke angivet.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">I/O port ikke angivet.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">To eller flere porte har samme værdier.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">Portsti ikke angivet.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">Den samme portsti er angivet flere gange.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsStorage</name>
@@ -6509,7 +6643,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No hard disk is selected for <i>%1</i>.</source>
-        <translation type="unfinished">Ingen harddisk er valgt for <i>%1</i>.</translation>
+        <translation>Ingen harddisk er valgt for <i>%1</i>.</translation>
     </message>
     <message>
         <source><i>%1</i> uses a medium that is already attached to <i>%2</i>.</source>
@@ -6840,50 +6974,50 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Controller: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Styreenhed: %1</translation>
     </message>
     <message>
         <source>No name is currently specified for the controller at position <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Navn ikke angivet for styreenheden på position <b>%1</b>.</translation>
     </message>
     <message>
         <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Styreenheden på position <b>%1</b> har samme navn som styreenheden på position <b>%2</b>.</translation>
     </message>
     <message>
         <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>%1</i> bruger en disk, der allerede er tilsluttet til <i>%2</i></translation>
     </message>
     <message>
         <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Maskinen har flere lager-styreenheder tildelt end et %1 chipset understøtter. Tilpas chipset-typen under System-indstillinger eller formindsk antallet af de følgende lager-styreenheder under Lager-indstillinger: %2</translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk file...</source>
-        <translation type="obsolete">Vælg en virtuel optisk disk-fil...</translation>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6891,68 +7025,65 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Aftryk</translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source>Add USB Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Aftryk</translation>
-    </message>
-    <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6968,7 +7099,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7197,30 +7328,54 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Pointing Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Pegeredskab:</translation>
     </message>
     <message>
         <source>Determines whether the emulated pointing device is a standard PS/2 mouse, a USB tablet or a USB multi-touch tablet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Styrer om pegeredskabet emulerer en standard PS/2 mus, en USB-tablet eller en USB-tablet med multi-touch.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. Not enough memory is left for the host operating system. Please select a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mere end <b>%1%</b> af værtens hukommelse (<b>%2</b>) er tildelt den virtuelle maskine. Dermed er der ikke hukommelse nok til værtens eget operativsystem. Vælg en lavere værdi.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. There might not be enough memory left for the host operating system. Please consider selecting a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mere end <b>%1%</b> af værtens hukommelse (<b>%2</b>) er tildelt den virtuelle maskine. Der er muligvis ikke hukommelse nok tilbage til værtens eget operativsystem. Overvej en lavere tildeling.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">I/O APIC-funktionen er ikke aktiveret under System->Bundkort. Dette kræves for at understøtte et ICH9-chipsæt. Aktivering sker automatisk, hvis du gemmer dine ændringer.</translation>
+    </message>
+    <message>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">Emulering af en USB-styreenhed er ikke aktiveret under System->USB. Dette kræves for at emulere en USB inputenhed. Aktivering sker automatisk, hvis du gemmer dine ændringer.</translation>
     </message>
     <message>
         <source>For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Af ydelsesmæssige grunde, kan antallet af virtuelle CPU'er tildelt en virtuel maskine ikke overstige 2 gange antallet af fysiske CPU'er i værten (<b>%1</b>). Nedsæt antallet af virtuelle CPU'er.</translation>
     </message>
     <message>
         <source>More virtual CPUs are assigned to the virtual machine than the number of physical CPUs on the host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Antallet af virtuelle CPU'er tildelt den virtuelle maskine overstiger antallet af fysiske CPU'er i værten (<b>%1</b>). Dette vil sandsynligvis påvirke den virtuelle maskines ydelse negativt. Overvej derfor at nedsætte antallet af virtuelle CPU'er.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">I/O APIC-funktionen er ikke aktiveret under System->Bundkort. Dette kræves for at understøtte flere virtuelle CPU'er. Aktivering sker automatisk, hvis du gemmer dine ændringer.</translation>
+    </message>
+    <message>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">Hardware-virtualisering er ikke aktiveret under System->Acceleration. Dette kræves for at understøtte flere virtuelle CPU'er. Aktivering sker automatisk, hvis du gemmer dine ændringer.</translation>
     </message>
     <message>
         <source>The processor execution cap is set to a low value. This may make the machine feel slow to respond.</source>
+        <translation>Du har sat ydelsesbegrænsningen til en lav værdi. Maskinen kan føles langsom.</translation>
+    </message>
+    <message>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7248,14 +7403,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 MB</translation>
     </message>
@@ -7406,31 +7553,35 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">USB 2.0 er pt aktiveret i denne virtuelle maskine. Dette kræver at <b>%1</b> installeres - denne udvidelsespakke kan hentes fra VirtualBox' hjemmeside. Derefter kan du reaktivere USB 2.0. USB 2.0 vil blive deaktiveret nu, medmindre du annullerer de nuværende ændringer.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0 to be able to start the machine.</source>
+        <translation type="obsolete">USB 2.0 er aktiveret for denne virtuelle maskine, men dette kræver at <b>%1</b> installeres. Installér udvidelsespakken fra VirtualBox' hjemmeside eller deaktivér USB 2.0 for at kunne starte maskinen.</translation>
+    </message>
+    <message>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7688,14 +7839,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Luk</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Skift</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Luk</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7936,15 +8087,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete"><p>Kunne ikke åbne sprogfilen <b><nobr>%1</nobr></b>. <p>VirtualBox vil derfor midlertidigt bruge engelsk. Du kan vælge det rigtige sprog i afsnittet <b>Sprog</b> tilgængelig via menupunktet <b>Indstillinger</b> i menuen <b>Fil</b></p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Den installerede version %1 af VirtualBox' Gæstetilføjelser er forældet. Den forventede version er %2. De funktioner, der kræver Gæstetilføjelser (integration med mus, dynamisk ændring af gæstens skærmopløsning) vil sandsynligvis ikke fungere.</p><p>Vælg <b>Installér Gæstetilføjelser</b> i menuen <b>Enheder<b> for at opdatere til seneste version.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Den installerede version %1 af VirtualBox' Gæstetilføjelser er forældet. Den forventede version er %2. De funktioner, der kræver Gæstetilføjelser (integration med mus, dynamisk ændring af gæstens skærmopløsning) vil sandsynligvis ikke fungere.</p><p>Vælg <b>Installér Gæstetilføjelser</b> i menuen <b>Enheder<b> for at opdatere til seneste version.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Den installerede version %1 af VirtualBox' Gæstetilføjelser er for høj. Den forventede version er %2.</p><p>Brugen af en nyere version af Gæstetilføjelser med en ældre version af VirtualBox understøttes ikke. Vælg <b>Installér Gæstetilføjelser</b> i menuen <b>Enheder<b> for at installere den korrekte version.</p></translation>
     </message>
     <message>
@@ -8041,9 +8192,9 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Hent</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Montér</translation>
+        <translation>Montér</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -8189,8 +8340,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Vis vindue med produktinformation</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>En ny version af VirtualBox er på gaden! Version <b>%1</b> er tilgængelig fra <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hente denne version her: </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>En ny version af VirtualBox er på gaden! Version <b>%1</b> er tilgængelig fra <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hente denne version her: </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -8320,8 +8471,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">O&verskriv</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Der opstod en alvorlig fejl under afviklingen af den virtuelle maskine og afviklingen er stoppet.</p><p>For hjælp med dette, se under <i>Community</i>-sektionen på <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> eller din support-kontrakt. Hav en kopi af logfilen <tt>VBox.log</tt> og billedfilen <tt>VBox.png</tt>, som du finder i kataloget <nobr><b>%1</ [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Der opstod en alvorlig fejl under afviklingen af den virtuelle maskine og afviklingen er stoppet.</p><p>For hjælp med dette, se under <i>Community</i>-sektionen på <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> eller din support-kontrakt. Hav en kopi af logfilen <tt>VBox.log</tt> og billedfilen <tt>VBox.png</tt>, som du finder i kataloget <nobr><b>%1</b></nobr [...]
     </message>
     <message>
         <source>hard disk</source>
@@ -8729,7 +8880,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Kunne ikke afmontere disketten <nobr><b>%1</b></nobr> fra udvidelsespladsen <i>%2</i> i maskinen <b>%3</b>.</translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully started then s [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="obsolete"><p>VirtualBox Gæstetilføjelser er vist ikke tilgængelige på denne virtuelle maskine og delte mapper fungerer ikke uden. For at kunne anvende delte mapper i den virtuelle maskine, skal du installere gæstetilføjelserne, hvis de ikke er installeret eller geninstallere, hvis de ikke fungerer korrekt ved at vælge <b>Installér gæstetilføjelser</b> fra menuen <b>Enheder</b>. Delte mapper vil først være tilgængelige, når maskinen [...]
     </message>
     <message numerus="yes">
@@ -8789,8 +8940,8 @@ p, li { white-space: pre-wrap; }
         <translation><p>Bemærk at mediets lagerenhed ikke vil blive slettet og derfor kan den bruges igen på et senere tidspunkt.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
-        <translation type="obsolete"><p>VirtualBox Gæstetilføjelser er tilsyneladende ikke tilgængelige på denne virtuelle maskine og delte mapper fungerer ikke uden. For at kunne anvende delte mapper i den virtuelle maskine, skal du installere gæstetilføjelserne, hvis de ikke er installeret eller geninstallere, hvis de ikke fungerer korrekt ved at vælge <b>Installér gæstetilføjelser</b> fra menuen <b>Enheder</b>. Delte mapper vil først være tilgængelige, nå [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
+        <translation><p>VirtualBox Gæstetilføjelser er tilsyneladende ikke tilgængelige på denne virtuelle maskine og delte mapper fungerer ikke uden. For at kunne anvende delte mapper i den virtuelle maskine, skal du installere gæstetilføjelserne, hvis de ikke er installeret eller geninstallere, hvis de ikke fungerer korrekt ved at vælge <b>Installér gæstetilføjelser</b> fra menuen <b>Enheder</b>. Delte mapper er først tilgængelige, når maskinen er startet  [...]
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
@@ -9096,204 +9247,241 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Cannot start the VirtualBox Manager due to local restrictions.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kan ikke starte VirtualBox Håndtering grundet lokale begrænsninger.</p><p>Applikationen afsluttes.</p></translation>
     </message>
     <message>
         <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunne ikke finde en fil indeholdende sproget <b>%1</b> i kataloget <b><nobr>%2</nobr></b>.</p><p>Applikationen vil midlertidigt bruge systemets standardsprog. Vælg et installeret sprog i sektionen <b>Sprog</b> tilgængelig via menupunktet <b>Indstillinger</b> i menuen <b>Fil</b> i VirtualBox Håndtering.</p></translation>
     </message>
     <message>
         <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunne ikke åbne sprogfilen <b><nobr>%1</nobr></b>. <p>VirtualBox vil derfor midlertidigt bruge engelsk. Du kan vælge det rigtige sprog i afsnittet <b>Sprog</b> tilgængelig via menupunktet <b>Indstillinger</b> i menuen <b>Fil</b>i VirtualBox Håndtering.</p></translation>
     </message>
     <message>
         <source>There is no virtual machine with the identifier <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der er ingen virtuel maskine ved navn <b>%1</b>.</translation>
     </message>
     <message>
         <source>Ignore</source>
-        <translation type="unfinished">Ignorer</translation>
+        <translation>Ignorer</translation>
     </message>
     <message>
         <source>Failed to create NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke oprette NAT-netværk.</translation>
     </message>
     <message>
         <source>Failed to remove NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke nedlægge NAT-netværk <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create DHCP server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke oprette DHCP-server.</translation>
     </message>
     <message>
         <source>Failed to remove DHCP server for network interface <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke nedlægge DHCP-server for netværkskort <b>%1</b>. </translation>
     </message>
     <message>
         <source>Failed to create the host network interface.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke oprette værtsbegrænset netværkskort.</translation>
     </message>
     <message>
         <source>Create &new disk</source>
-        <translation type="unfinished">Opret &ny disk</translation>
+        <translation>Opret &ny disk</translation>
     </message>
     <message>
         <source>&Choose existing disk</source>
-        <translation type="unfinished">Vælg eksisterende disk</translation>
+        <translation>Vælg eksisterende disk</translation>
     </message>
     <message>
         <source>Leave &empty</source>
-        <translation type="unfinished">Ing&en disk</translation>
+        <translation>Ing&en disk</translation>
     </message>
     <message>
         <source>&Choose disk</source>
-        <translation type="unfinished">Vælg disk</translation>
+        <translation>Vælg disk</translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Er du sikker på at du vil frigive den virtuelle disk <nobr><b>%1</b></nobr>?</p><p>Det vil fjerne den fra disse virtuelle maskiner: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual optical disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Er du sikker på at du vil frigive den virtuelle optiske disk <nobr><b>%1</b></nobr>?</p><p>Det vil fjerne den fra disse virtuelle maskiner: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual floppy disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Er du sikker på at du vil frigive den virtuelle diskette <nobr><b>%1</b></nobr>?</p><p>Det vil fjerne den fra disse virtuelle maskiner: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Er du sikker på at du vil fjerne den virtuelle disk <nobr><b>%1</b></nobr> fra listen over kendte aftryk?</p></translation>
     </message>
     <message>
         <source><p>As this hard disk is inaccessible its image file can not be deleted.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Da denne disk er utilgængelig, kan diskaftrykket ikke slettes.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual optical disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Er du sikker på at du vil fjerne den virtuelle optiske disk <nobr><b>%1</b></nobr> fra listen over kendte aftryk?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual floppy disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Er du sikker på at du vil fjerne den virtuelle diskette <nobr><b>%1</b></nobr> fra listen over kendte aftryk?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual optical disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunne ikke indsætte den virtuelle optiske disk <nobr><b>%1</b></nobr> i maskinen <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force insertion of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Vil du forsøge at gennemtvinge tilslutning af dette medie?</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual optical disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunne ikke skubbe den virtuelle optiske disk <nobr><b>%1</b></nobr> ud i maskinen <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force ejection of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Vil du forsøge at gennemtvinge udskubning af dette medie?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual floppy disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunne ikke indsætte den virtuelle diskette <nobr><b>%1</b></nobr> i maskinen <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual floppy disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunne ikke skubbe den virtuelle diskette <nobr><b>%1</b></nobr> ud i maskinen <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source>Failed to open the hard disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Kunne ikke åbne harddisk-aftrykket <nobr><b>%1</b></nobr>. </translation>
+    </message>
+    <message>
+        <source>Failed to open the optical disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Kunne ikke åbne optisk-disk-aftrykket <nobr><b>%1</b></nobr>. </translation>
+    </message>
+    <message>
+        <source>Failed to open the floppy disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Kunne ikke åbne diskette-aftrykket <nobr><b>%1</b></nobr>. </translation>
+    </message>
+    <message>
+        <source>Failed to close the hard disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Kunne ikke lukke harddisk-aftrykket <nobr><b>%2</b></nobr>. </translation>
+    </message>
+    <message>
+        <source>Failed to close the optical disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Kunne ikke lukke optisk-disk-aftrykket <nobr><b>%2</b></nobr>. </translation>
+    </message>
+    <message>
+        <source>Failed to close the floppy disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Kunne ikke lukke diskette-aftrykket <nobr><b>%2</b></nobr>. </translation>
     </message>
     <message numerus="yes">
         <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><p>De virtuelle maskiner <b>%1</b> har gemte tilstande.</p><p>Hvis du fortsætter vil kørselstilstanden af de eksporterede maskiner blive kasseret. De øvrige maskiner ændres ikke.</p></numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
         <source>Switch</source>
-        <translation type="unfinished">Skift</translation>
+        <translation>Skift</translation>
     </message>
     <message>
         <source>Failed to enable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke starte fjernskrivebord-servicen for den virtuelle maskine <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke stoppe fjernskrivebord-servicen for den virtuelle maskine <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to enable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke starte videooptagelse for den virtuelle maskine <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke stoppe videooptagelse for den virtuelle maskine <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox Guest Additions</b> disk image file.</p><p>Do you wish to download this disk image file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunne ikke finde  <b>VirtualBox Gæstetilføjelser</b> diskaftrykket </p><p>Vil du hente det fra internettet?</p></translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished">Hent</translation>
+        <translation>Hent</translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox Guest Additions</b> disk image file from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Er du sikker på at du vil hente <b>VirtualBox Gæstetilføjelser</b> diskaftrykket fra <nobr><a href="%1">%1</a></nobr> (%2 bytes)?</p></translation>
     </message>
     <message>
         <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>VirtualBox Gæstetilføjelser</b> diskaftrykket er blevet hentet fra <nobr><a href="%1">%1</a></nobr> men kan ikke gemmes lokalt som <nobr><b>%2</b>.</nobr></p><p>Vælg en anden placering til filen.</p></translation>
+    </message>
+    <message>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual CD/DVD drive?</p></source>
+        <translation type="obsolete"><p><b>VirtualBox Gæstetilføjelser</b> diskaftrykket er blevet hentet fra <nobr><a href="%1">%1</a></nobr> og gemt lokalt som <nobr><b>%2</b>.</nobr></p><p>Vil du montere dette diskaftryk som et virtuelt CD/DVD-drev?</p></translation>
+    </message>
+    <message>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no CD/DVD drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <translation type="obsolete"><p>Kunne ikke indsætte <b>VirtualBox Gæstetilføjelser</b> diskaftrykket i den virtuelle maskine <b>%1</b>, da maskinen ikke har et CD/DVD-drev. Tilføj et drev på siden Lagringsmedier i indstillingerne for den virtuelle maskine.</p></translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunne ikke finde <b>VirtualBox brugermanual</b> <nobr><b>%1</b>.</nobr></p><p>Ønsker du at hente denne fil fra internettet?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox User Manual</b> from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Er du sikker på at du vil hente <b>VirtualBox brugermanual</b> fra <nobr><a href="%1">%1</a></nobr> (%2 bytes)?</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"><p>VirtualBox' brugermanual blev hentet fra <nobr><a href="%1">%2</a></nobr> men kunne ikke gemmes lokalt som <nobr><b>%3</b>.</nobr></p><p>Vælg venligtst en anden placering til filen.</p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>VirtualBox brugermanualen blev hentet fra <nobr><a href="%1">%1</a></nobr> men kunne ikke gemmes lokalt som <nobr><b>%2</b>.</nobr></p><p>Vælg venligst en anden placering til filen.</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p></source>
-        <translation type="unfinished"><p>VirtualBox' brugermanual blev hentet fra <nobr><a href="%1">%2</a></nobr> og gemt lokalt som <nobr><b>%3</b>.</nobr></p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>VirtualBox brugermanualen blev hentet fra <nobr><a href="%1">%1</a></nobr> og gemt lokalt som <nobr><b>%2</b>.</nobr></p></translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Luk</translation>
+        <translation>Luk</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">OK</translation>
+        <translation>OK</translation>
     </message>
     <message>
         <source>Do not show this message again</source>
-        <translation type="unfinished">Vis ikke denne besked igen</translation>
+        <translation>Vis ikke denne besked igen</translation>
     </message>
     <message>
         <source><p>Do you want to remove the NAT network <nobr><b>%1</b>?</nobr></p><p>If this network is in use by one or more virtual machine network adapters these adapters will no longer be usable until you correct their settings by either choosing a different network name or a different adapter attachment type.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Vil du fjerne NAT-netværket <nobr><b>%1</b>?</nobr></p><p>Hvis dette netværk bruges af en eller flere virtuelle maskiners netværkskort, vil disse netværkskort ikke fungere indtil du retter deres indstillinger enten ved at vælge et andet netværksnavn eller en anden forbindelsestype.</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete"><p>VirtualBox Gæstetilføjelser er tilsyneladende ikke tilgængelige på denne virtuelle maskine og delte mapper fungerer ikke uden. For at kunne anvende delte mapper i den virtuelle maskine, skal du installere gæstetilføjelserne, hvis de ikke er installeret eller geninstallere, hvis de ikke fungerer korrekt ved at vælge <b>Installér gæstetilføjelser</b> fra menuen <b>Enheder</b>. Delte mapper vil først være tilgængelige, nå [...]
     </message>
     <message>
         <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Montér</translation>
     </message>
     <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
-        <translation type="unfinished"></translation>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
+        <translation>Kunne ikke tilslutte webkameraet <b>%1</b> til den virtuelle maskine <b>%2</b>.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
+        <translation>Kunne ikke fjerne webkameraet <b>%1</b> fra den virtuelle maskine <b>%2</b>.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
-        <translation type="unfinished"></translation>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <translation><p>Den virtuelle skærm er sat til <b>%1&nbsp;bit</b> farver. Brug i stedet <b>%2&nbsp;bit</b> for bedre ydelse. Dette kan normalt ændres via <b>Skærm</b>-indstillingerne i gæsteoperativsystemets kontrolpanel eller systemindstillinger.</p></translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
@@ -9308,115 +9496,115 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9480,19 +9668,19 @@ p, li { white-space: pre-wrap; }
     <name>UIMiniToolBar</name>
     <message>
         <source>Always show the toolbar</source>
-        <translation type="unfinished">Vis altid værktøjslinjen</translation>
+        <translation>Vis altid værktøjslinjen</translation>
     </message>
     <message>
         <source>Minimize Window</source>
-        <translation type="unfinished">Minimér vindue</translation>
+        <translation>Minimér vindue</translation>
     </message>
     <message>
         <source>Exit Full Screen or Seamless Mode</source>
-        <translation type="unfinished">Forlad fuldskærm/rammefri tilstand</translation>
+        <translation>Forlad fuldskærm/rammefri tilstand</translation>
     </message>
     <message>
         <source>Close VM</source>
-        <translation type="unfinished">Luk virtuel maskine</translation>
+        <translation>Luk virtuel maskine</translation>
     </message>
 </context>
 <context>
@@ -9509,8 +9697,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation>&Navn:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Navn:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -9532,6 +9720,10 @@ p, li { white-space: pre-wrap; }
         <source>Selects 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>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -9569,7 +9761,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The network operation failed with the following error: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Netværkshandlingen fejlede med følgende besked: %1</translation>
     </message>
 </context>
 <context>
@@ -9596,27 +9788,27 @@ p, li { white-space: pre-wrap; }
     <name>UINetworkReplyPrivate</name>
     <message>
         <source>Host not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Vært ikke fundet</translation>
     </message>
     <message>
         <source>Content access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Adgang til indhold nægtet</translation>
     </message>
     <message>
         <source>Protocol failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Protokolfejl</translation>
     </message>
     <message>
         <source>Wrong SSL certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>Forkert format af SSL-certifikat</translation>
     </message>
     <message>
         <source>SSL authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>SSL-godkendelse fejlede</translation>
     </message>
     <message>
         <source>Unknown reason</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukendt årsag</translation>
     </message>
 </context>
 <context>
@@ -10298,7 +10490,7 @@ p, li { white-space: pre-wrap; }
     <name>UIPopupCenter</name>
     <message>
         <source>Click for full details</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik for alle detaljer</translation>
     </message>
 </context>
 <context>
@@ -10487,18 +10679,14 @@ p, li { white-space: pre-wrap; }
         <translation>Virtuel maskine-filer (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Velkommen til VirtualBox!</h3><p>Den venstre side af dette vindue viser alle virtuelle maskiner på din computer. Lige nu er listen tom, fordi du ikke har oprettet nogle virtuelle maskiner endnu.<img src=:/welcome.png align=right/></p><p>For at oprette en virtuel maskine, klik på knappen <b>Ny</b> i værktøjslinjen øverst i vinduet.</p><p>Du kan også trykke <b>%1</b> for at få h [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation><h3>Velkommen til VirtualBox!</h3><p>Den venstre side af dette vindue viser alle virtuelle maskiner på din computer. Lige nu er listen tom, fordi du ikke har oprettet nogle virtuelle maskiner endnu.<img src=:/welcome.png align=right/></p><p>For at oprette en virtuel maskine, klik på knappen <b>Ny</b> i værktøjslinjen øverst i vinduet.</p><p>Du kan også trykke <b>%1</b> for at få hjælp eller besøg [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation>Håndtering</translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -10535,11 +10723,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><b>%1</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1</b> side:</translation>
     </message>
     <message>
         <source><b>%1: %2</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1: %2</b> side:</translation>
     </message>
 </context>
 <context>
@@ -10688,6 +10876,10 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Luk</translation>
     </message>
@@ -10695,10 +10887,6 @@ p, li { white-space: pre-wrap; }
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -10794,8 +10982,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Oversigt</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Der er frigivet en ny version af VirtualBox! Version <b>%1</b> er tilgængelig fra <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hente den nye version her:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>Der er frigivet en ny version af VirtualBox! Version <b>%1</b> er tilgængelig fra <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hente den nye version her:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -10887,160 +11075,98 @@ p, li { white-space: pre-wrap; }
     <name>UIVMInfoDialog</name>
     <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Sessionsinformation</translation>
+        <translation type="unfinished">%1 - Sessionsinformation</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Detaljer</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished">Konfigurations&detaljer</translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">Afvikling</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished">Kø&retidsinformation</translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>DMA-overførsler</translation>
+        <translation type="unfinished">DMA-overførsler</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>PIO-overførsler</translation>
+        <translation type="unfinished">PIO-overførsler</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Data læst</translation>
+        <translation type="unfinished">Data læst</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Data skrevet</translation>
+        <translation type="unfinished">Data skrevet</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Data sendt</translation>
+        <translation type="unfinished">Data sendt</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Data modtaget</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Afviklingsindstillinger</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Skærmopløsning</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">CD/DVD-statistik</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Netværkskort-statistik</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Version %1.%2</translation>
+        <translation type="unfinished">Data modtaget</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Ikke fundet</translation>
+        <translation type="unfinished">Ikke fundet</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Ikke fundet</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>Gæstetilføjelser</translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation>Gæsteoperativsystemtype</translation>
+        <translation type="unfinished">Ikke fundet</translation>
     </message>
     <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Harddisk-statistik</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Ikke tilgængelig</translation>
     </message>
     <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Ingen harddiske</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Afviklingsindstillinger</translation>
     </message>
     <message>
-        <source>No Network Adapters</source>
-        <translation>Ingen netværkskort</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Skærmopløsning</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Slået til</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Slået fra</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished">Udklipsholdertilstand</translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <translation type="obsolete">Nested Paging</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translatorcomment>Probably should not be translated</translatorcomment>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Gæstetilføjelser</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">Ikke tilgængelig</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation>Lagermediestatistik</translation>
+        <translation type="unfinished">Lagermediestatistik</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
-        <translation>Ingen lagerenheder</translation>
+        <translation type="unfinished">Ingen lagerenheder</translation>
     </message>
     <message>
         <source>Network Statistics</source>
-        <translation>Netværksstatistik</translation>
-    </message>
-    <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Nested Paging</translation>
-    </message>
-    <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>Ikke tilgængelig</translation>
+        <translation type="unfinished">Netværksstatistik</translation>
     </message>
     <message>
-        <source>Clipboard Mode</source>
-        <translation>Udklipsholdertilstand</translation>
-    </message>
-    <message>
-        <source>Drag'n'Drop Mode</source>
-        <translation type="obsolete">Træk og slip-tilstand</translation>
-    </message>
-    <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Ingen netværkskort</translation>
     </message>
 </context>
 <context>
@@ -11621,39 +11747,39 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagerindstillinger</translation>
     </message>
     <message>
         <source>Please choose a file to export the virtual appliance to</source>
-        <translation type="unfinished"></translation>
+        <translation>Angiv filnavnet, det prækonfigurerede system skal gemmes under</translation>
     </message>
     <message>
         <source>F&ormat:</source>
-        <translation type="unfinished"></translation>
+        <translation>F&ormat:</translation>
     </message>
     <message>
         <source>OVF 0.9</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 0.9</translation>
     </message>
     <message>
         <source>OVF 1.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 1.0</translation>
     </message>
     <message>
         <source>OVF 2.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 2.0</translation>
     </message>
     <message>
         <source>Write in standard OVF 1.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv i standard OVF 1.0-format.</translation>
     </message>
     <message>
         <source>Write in new experimental OVF 2.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv i nyt eksperimentelt OVF 2.0-format.</translation>
     </message>
     <message>
         <source>&Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagerind&stillinger</translation>
     </message>
 </context>
 <context>
@@ -11672,14 +11798,14 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Angiv filnavnet, det prækonfigurerede system skal gemmes under...</translation>
     </message>
 </context>
 <context>
     <name>UIWizardExportAppPageExpert</name>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Angiv filnavnet, det prækonfigurerede system skal gemmes under...</translation>
     </message>
 </context>
 <context>
@@ -11749,15 +11875,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Import Virtual Appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer virtuelt Prækonfigureret system</translation>
     </message>
     <message>
         <source>Choose a virtual appliance file to import...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg en prækonfigureret system-fil til import...</translation>
     </message>
     <message>
         <source>Please choose a virtual appliance file to import</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg en prækonfigureret system-fil til import</translation>
     </message>
 </context>
 <context>
@@ -12198,11 +12324,11 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Konfigurér deling af mapper</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">&Installér Gæstetilføjelser...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Monterer CD'en med Gæstetilføjelser</translation>
     </message>
     <message>
@@ -12413,7 +12539,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">I&nformation om session</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Vis sessionsinformation</translation>
     </message>
     <message>
@@ -12617,7 +12743,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Choose...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg...</translation>
     </message>
 </context>
 <context>
@@ -12627,8 +12753,8 @@ p, li { white-space: pre-wrap; }
         <translation><nulstil til standard></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Den korrekte standardsti vil blive vist når du accepterer ændringerne og åbner dette vindue igen.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation>Den korrekte standardsti vil blive vist når du accepterer ændringerne og åbner dette vindue igen.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -12676,7 +12802,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Den korrekte standardsti vil blive vist når du accepterer ændringerne og åbner dette vindue igen.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -13779,7 +13906,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Tilslutning af denne harddisk vil blive gjort indirekte via en nyoprettet Ændrings-harddisk.</translation>
+        <translation>Tilslutning af denne harddisk vil blive gjort indirekte via en nyoprettet Ændrings-harddisk.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -13789,7 +13916,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Denne harddisk er indirekte tilsluttet gennem ændrings-harddisken:</translation>
+        <translation>Denne harddisk er indirekte tilsluttet gennem ændrings-harddisken:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -14391,52 +14518,62 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Angiv placeringen af den nye virtuelle disk-fil</translation>
     </message>
     <message>
+        <source>Enabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Aktiveret</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Deaktiveret</translation>
+    </message>
+    <message>
         <source>Unrestricted Execution</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ubegrænset afvikling</translation>
     </message>
     <message>
         <source>PS/2 Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PS/2-mus</translation>
     </message>
     <message>
         <source>USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB-mus</translation>
     </message>
     <message>
         <source>PS/2 and USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PS/2 og USB-mus</translation>
     </message>
     <message>
         <source>Unrestricted Execution</source>
-        <translation type="unfinished"></translation>
+        <translation>Ubegrænset afvikling</translation>
     </message>
     <message>
         <source>USB Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB-tablet</translation>
     </message>
     <message>
         <source>USB Multi-Touch Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB-tablet med multitouch</translation>
     </message>
     <message>
         <source>NAT Network</source>
         <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
+        <translation>NAT-netværk</translation>
     </message>
     <message>
         <source>NAT network, '%1'</source>
         <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>NAT-netværk, '%1'</translation>
     </message>
     <message>
         <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du kan oprette og tilføje diskaftryk i Virtuel diskhåndtering.</translation>
     </message>
     <message>
         <source>USB</source>
@@ -14444,54 +14581,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Ingen</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Standard</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished">Aktiv</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inactive</source>
@@ -14501,7 +14598,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Active</source>
         <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished">Aktiv</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inactive</source>
@@ -14511,7 +14608,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Active</source>
         <comment>details report (Unrestricted Execution)</comment>
-        <translation type="unfinished">Aktiv</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inactive</source>
@@ -14519,6 +14616,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -14529,6 +14631,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Ingen</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -14539,6 +14666,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -14559,6 +14691,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -14568,16 +14705,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14896,15 +15033,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Opret en ny virtuel harddisk</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -14984,8 +15121,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Vælg land/område</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
-        <translation type="obsolete"><p>Udfyld venligst denne registreringsformular for at lade os vide at du bruger VirtualBox og, hvis du ønsker det, så vi kan holde dig underrettet om VirtualBox-nyheder og opdateringer.</p><p>Brug latinske bogstaver i nedenstående felter. Vær opmærksom på at Sun Microsystems kun bruger denne information til at indsamle brugsstatistik og til at sende dig nyhedsbreve om VirtualBox. Sun Microsystems vil aldrig overgive dine data til tre [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
+        <translation type="obsolete"><p>Udfyld venligst denne registreringsformular for at lade os vide at du bruger VirtualBox og, hvis du ønsker det, så vi kan holde dig underrettet om VirtualBox-nyheder og opdateringer.</p><p>Brug latinske bogstaver i nedenstående felter. Vær opmærksom på at Sun Microsystems kun bruger denne information til at indsamle brugsstatistik og til at sende dig nyhedsbreve om VirtualBox. Sun Microsystems vil aldrig overgive dine data til tre [...]
     </message>
     <message>
         <source>I &already have a Sun Online account:</source>
@@ -15186,8 +15323,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Suspendér afviklingen af den virtuelle maskine</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Velkommen til VirtualBox!</h3><p>Den venstre side af dette vindue viser alle virtuelle maskiner på din computer. Lige nu er listen tom, fordi du ikke har oprettet nogle virtuelle maskiner endnu.<img src=:/welcome.png align=right/></p><p>For at oprette en virtuel maskine, klik på knappen <b>Ny</b> i værktøjslinjen.</p><p>Du kan også trykke <b>%1</b> for at få hjælp eller besøge [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Velkommen til VirtualBox!</h3><p>Den venstre side af dette vindue viser alle virtuelle maskiner på din computer. Lige nu er listen tom, fordi du ikke har oprettet nogle virtuelle maskiner endnu.<img src=:/welcome.png align=right/></p><p>For at oprette en virtuel maskine, klik på knappen <b>Ny</b> i værktøjslinjen.</p><p>Du kan også trykke <b>%1</b> for at få hjælp eller besøge [...]
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
@@ -15678,6 +15815,158 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Sessionsinformation</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Detaljer</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">Afvikling</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">DMA-overførsler</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">PIO-overførsler</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Data læst</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Data skrevet</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Data sendt</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Data modtaget</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Afviklingsindstillinger</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Skærmopløsning</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">CD/DVD-statistik</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Netværkskort-statistik</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Version %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Ikke fundet</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Ikke fundet</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Gæstetilføjelser</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Gæsteoperativsystemtype</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Harddisk-statistik</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Ingen harddiske</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Ingen netværkskort</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Slået til</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Slået fra</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <translation type="obsolete">Nested Paging</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translatorcomment>Probably should not be translated</translatorcomment>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">Ikke tilgængelig</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Lagermediestatistik</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Ingen lagerenheder</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Netværksstatistik</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Nested Paging</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Ikke tilgængelig</translation>
+    </message>
+    <message>
+        <source>Clipboard Mode</source>
+        <translation type="obsolete">Udklipsholdertilstand</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">Træk og slip-tilstand</translation>
+    </message>
+    <message>
+        <source>Configuration &Details</source>
+        <translation type="obsolete">Konfigurations&detaljer</translation>
+    </message>
+    <message>
+        <source>&Runtime Information</source>
+        <translation type="obsolete">Kø&retidsinformation</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMLogViewer</name>
     <message>
         <source>Log Viewer</source>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
index 9a4b065..5ad889a 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
@@ -159,10 +159,6 @@
         <translation>&Maschine</translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized (requires Guest Additions)</source>
-        <translation type="obsolete">Passt die Größe der Gastanzeige automatisch an, wenn sich die Fenstergröße ändert (erfordert Gasterweiterungen)</translation>
-    </message>
-    <message>
         <source>&Adjust Window Size</source>
         <translation>Fenstergröße &anpassen</translation>
     </message>
@@ -171,34 +167,10 @@
         <translation>Passt Fenstergröße und -position an die Auflösung des Gastes an</translation>
     </message>
     <message>
-        <source>Disable &Mouse Integration</source>
-        <translation type="obsolete">&Mauszeiger-Integration deaktivieren</translation>
-    </message>
-    <message>
-        <source>Temporarily disable host mouse pointer integration</source>
-        <translation type="obsolete">Integration des Mauszeigers vorübergehend deaktivieren</translation>
-    </message>
-    <message>
-        <source>&Insert Ctrl-Alt-Del</source>
-        <translation type="obsolete">&Sende Strg-Alt-Entf</translation>
-    </message>
-    <message>
-        <source>Send the Ctrl-Alt-Del sequence to the virtual machine</source>
-        <translation type="obsolete">Sendet die Sequenz Strg-Alt-Entf (Affengriff) an die virtuelle Maschine</translation>
-    </message>
-    <message>
-        <source>Send the Ctrl-Alt-Backspace sequence to the virtual machine</source>
-        <translation type="obsolete">Sendet die Sequenz Strg-Alt-Rücktaste an die virtuelle Maschine</translation>
-    </message>
-    <message>
         <source>Take a snapshot of the virtual machine</source>
         <translation>Erstellt einen Sicherungspunkt der virtuellen Maschine</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
-        <translation type="obsolete">Zeigt einen Dialog mit Sitzungsinformationen</translation>
-    </message>
-    <message>
         <source>&Pause</source>
         <translation>&Pause</translation>
     </message>
@@ -219,10 +191,6 @@
         <translation>Ausschalten per &ACPI</translation>
     </message>
     <message>
-        <source>Send the ACPI Power Button press event to the virtual machine</source>
-        <translation type="obsolete">Sendet das ACPI-Ereignis "Ausschaltknopf gedrückt" an die virtuelle Maschine</translation>
-    </message>
-    <message>
         <source>&Close...</source>
         <translation>&Schließen...</translation>
     </message>
@@ -239,34 +207,6 @@
         <translation>&Geräte</translation>
     </message>
     <message>
-        <source>&CD/DVD Devices</source>
-        <translation type="obsolete">&CD/DVD-Laufwerke</translation>
-    </message>
-    <message>
-        <source>&Floppy Devices</source>
-        <translation type="obsolete">&Diskettenlaufwerke</translation>
-    </message>
-    <message>
-        <source>&USB Devices</source>
-        <translation type="obsolete">&USB-Geräte</translation>
-    </message>
-    <message>
-        <source>Change the settings of network adapters</source>
-        <translation type="obsolete">Ändert die Einstellungen der Netzwerkadapter</translation>
-    </message>
-    <message>
-        <source>Create or modify shared folders</source>
-        <translation type="obsolete">Öffnet den Dialog für gemeinsame Ordner</translation>
-    </message>
-    <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Gasterweiterungen installieren...</translation>
-    </message>
-    <message>
-        <source>Mount the Guest Additions installation image</source>
-        <translation type="obsolete">Medium mit den VirtualBox-Gasterweiterungen einbinden</translation>
-    </message>
-    <message>
         <source>De&bug</source>
         <translation>De&bug</translation>
     </message>
@@ -297,26 +237,10 @@
         <translation>Zeige Programm-Icon</translation>
     </message>
     <message>
-        <source>Switch to &Fullscreen</source>
-        <translation type="obsolete">&Vollbildmodus einschalten</translation>
-    </message>
-    <message>
-        <source>Switch between normal and fullscreen mode</source>
-        <translation type="obsolete">Schaltet in den Vollbildmodus bzw zurück</translation>
-    </message>
-    <message>
-        <source>Switch to Seam&less Mode</source>
-        <translation type="obsolete">&Nahtlosen Modus einschalten</translation>
-    </message>
-    <message>
         <source>Switch between normal and seamless desktop integration mode</source>
         <translation>Schaltet in den nahtlosen Fenstermodus (Fenster des Gastes werden nahtlos in den Hostdesktop integriert)</translation>
     </message>
     <message>
-        <source>Switch to &Scaled Mode</source>
-        <translation type="obsolete">&Skalierten Modus einschalten</translation>
-    </message>
-    <message>
         <source>Switch between normal and scaled mode</source>
         <translation>Schaltet in den skalierten Modus bzw. zurück</translation>
     </message>
@@ -329,18 +253,10 @@
         <translation>&Ändern...</translation>
     </message>
     <message>
-        <source>Manage the virtual machine settings</source>
-        <translation type="obsolete">Einstellungen der virtuellen Maschine ändern</translation>
-    </message>
-    <message>
         <source>Session I&nformation...</source>
         <translation>Sitzungsi&nformationen...</translation>
     </message>
     <message>
-        <source>Show the log files of the selected virtual machine</source>
-        <translation type="obsolete">Zeigt die Log-Dateien der ausgewählten virtuellen Maschine</translation>
-    </message>
-    <message>
         <source>&Contents...</source>
         <translation>&Inhalt...</translation>
     </message>
@@ -361,10 +277,6 @@
         <translation>Manager für &Netzoperationen...</translation>
     </message>
     <message>
-        <source>Show Network Operations Manager</source>
-        <translation type="obsolete">Zeige Manager für Netzoperationen</translation>
-    </message>
-    <message>
         <source>Check for a new VirtualBox version</source>
         <translation>Überprüft, ob eine neue Version von VirtualBox verfügbar ist</translation>
     </message>
@@ -373,10 +285,6 @@
         <translation>&Über VirtualBox...</translation>
     </message>
     <message>
-        <source>Show a window with product information</source>
-        <translation type="obsolete">Zeigt einen Dialog mit Produktinformationen</translation>
-    </message>
-    <message>
         <source>Take Sn&apshot...</source>
         <translation>Sicherungs&punkt erstellen...</translation>
     </message>
@@ -385,14 +293,6 @@
         <translation>&Screenshot erstellen...</translation>
     </message>
     <message>
-        <source>Take a screenshot of the virtual machine</source>
-        <translation type="obsolete">Erzeugt ein Bildschirmfoto der virtuellen Maschine</translation>
-    </message>
-    <message>
-        <source>Ins&ert Ctrl-Alt-Backspace</source>
-        <translation type="obsolete">Sende Strg-Alt-&Rücktaste</translation>
-    </message>
-    <message>
         <source>&File</source>
         <comment>Mac OS X version</comment>
         <translation>&Datei</translation>
@@ -427,15 +327,6 @@
         <translation>Exportiert eine Appliance aus VirtualBox</translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global settings</comment>
-        <translation type="obsolete">&Globale Einstellungen...</translation>
-    </message>
-    <message>
-        <source>Display the global settings window</source>
-        <translation type="obsolete">Zeigt den Dialog für globale Einstellungen</translation>
-    </message>
-    <message>
         <source>E&xit</source>
         <translation>B&eenden</translation>
     </message>
@@ -448,18 +339,6 @@
         <translation>&Gruppieren</translation>
     </message>
     <message>
-        <source>Create a new virtual machine</source>
-        <translation type="obsolete">Neue virtuelle Maschine erzeugen</translation>
-    </message>
-    <message>
-        <source>Add an existing virtual machine</source>
-        <translation type="obsolete">Fügt eine existierende virtuelle Maschine hinzu</translation>
-    </message>
-    <message>
-        <source>Rename the selected virtual machine group</source>
-        <translation type="obsolete">Benennt die ausgewählte virtuelle Maschine um</translation>
-    </message>
-    <message>
         <source>S&tart</source>
         <translation>&Starten</translation>
     </message>
@@ -468,30 +347,6 @@
         <translation>&Zeigen</translation>
     </message>
     <message>
-        <source>Re&fresh...</source>
-        <translation type="obsolete">&Aktualisieren...</translation>
-    </message>
-    <message>
-        <source>Refresh the accessibility state of the selected virtual machine</source>
-        <translation type="obsolete">Aktualisiert den Zustand der ausgewählten virtuellen Maschine</translation>
-    </message>
-    <message>
-        <source>Show in Finder</source>
-        <translation type="obsolete">Im Finder zeigen</translation>
-    </message>
-    <message>
-        <source>Show in Explorer</source>
-        <translation type="obsolete">Im Explorer zeigen</translation>
-    </message>
-    <message>
-        <source>Show in File Manager</source>
-        <translation type="obsolete">Im Dateimanager zeigen</translation>
-    </message>
-    <message>
-        <source>Show the VirtualBox Machine Definition file in the File Manager</source>
-        <translation type="obsolete">Zeigt die VirtualBox-VM-Definition im Dateimanager</translation>
-    </message>
-    <message>
         <source>&New...</source>
         <translation>&Neu...</translation>
     </message>
@@ -500,18 +355,10 @@
         <translation>&Hinzufügen...</translation>
     </message>
     <message>
-        <source>Add a new group based on the items selected</source>
-        <translation type="obsolete">Neue Gruppe mit den ausgewählten Maschinen erzeugen</translation>
-    </message>
-    <message>
         <source>Cl&one...</source>
         <translation>&Klonen...</translation>
     </message>
     <message>
-        <source>Clone the selected virtual machine</source>
-        <translation type="obsolete">Die ausgewählte virtuelle Maschine klonen</translation>
-    </message>
-    <message>
         <source>&Remove...</source>
         <translation>&Entfernen...</translation>
     </message>
@@ -520,18 +367,6 @@
         <translation>Verwerfen</translation>
     </message>
     <message>
-        <source>D&iscard saved state...</source>
-        <translation type="obsolete">&Verwerfen...</translation>
-    </message>
-    <message>
-        <source>Create Alias on Desktop</source>
-        <translation type="obsolete">Alias auf dem Desktop erzeugen</translation>
-    </message>
-    <message>
-        <source>Create Shortcut on Desktop</source>
-        <translation type="obsolete">Desktop-Verknüpfung</translation>
-    </message>
-    <message>
         <source>&Close</source>
         <translation>&Schließen</translation>
     </message>
@@ -556,70 +391,10 @@
         <translation>Gruppe &umbenennen...</translation>
     </message>
     <message>
-        <source>Sort the items of the selected virtual machine group alphabetically</source>
-        <translation type="obsolete">Sortiert die Gruppe der ausgewählten Maschine automatisch</translation>
-    </message>
-    <message>
-        <source>Remove the selected virtual machines</source>
-        <translation type="obsolete">Löscht die ausgewählten virtuelle Maschinen</translation>
-    </message>
-    <message>
-        <source>Start the selected virtual machines</source>
-        <translation type="obsolete">Starten der ausgewählten virtuellen Maschinen</translation>
-    </message>
-    <message>
-        <source>Switch to the windows of the selected virtual machines</source>
-        <translation type="obsolete">Holt die Fenster der ausgewählten virtuellen Maschinen in den Vordergrund</translation>
-    </message>
-    <message>
-        <source>Suspend the execution of the selected virtual machines</source>
-        <translation type="obsolete">Suspendiert die Ausführung der ausgewählten virtuellen Maschinen</translation>
-    </message>
-    <message>
-        <source>Reset the selected virtual machines</source>
-        <translation type="obsolete">Zurücksetzen der ausgewählten virtuellen Maschinen</translation>
-    </message>
-    <message>
-        <source>Discard the saved state of the selected virtual machines</source>
-        <translation type="obsolete">Verwirft den gesicherten Zustand der ausgewählten virtuellen Maschinen</translation>
-    </message>
-    <message>
-        <source>Show the VirtualBox Machine Definition file in Finder</source>
-        <translation type="obsolete">Zeigt die VirtualBox-VM-Definition im Finder</translation>
-    </message>
-    <message>
-        <source>Show the VirtualBox Machine Definition file in Explorer</source>
-        <translation type="obsolete">Zeigt die VirtualBox-VM-Definition im Explorer</translation>
-    </message>
-    <message>
-        <source>Creates an alias file to the VirtualBox Machine Definition file on your desktop</source>
-        <translation type="obsolete">Erzeugt einen Alias für die VirtualBox-VM-Definition auf Ihrem Desktop</translation>
-    </message>
-    <message>
-        <source>Creates an shortcut file to the VirtualBox Machine Definition file on your desktop</source>
-        <translation type="obsolete">Erzeugt eine Verknüfung auf die VirtualBox-VM auf Ihrem Destkop</translation>
-    </message>
-    <message>
-        <source>Save State</source>
-        <translation type="obsolete">Zustand sichern</translation>
-    </message>
-    <message>
-        <source>Save the machine state of the selected virtual machines</source>
-        <translation type="obsolete">Sichert den Zustand der ausgewählten virtuellen Maschinen</translation>
-    </message>
-    <message>
-        <source>Send the ACPI Power Button press event to the selected virtual machines</source>
-        <translation type="obsolete">Sendet das ACPI-Ereignis "Ausschaltknopf gedrückt" an die virtuelle Maschinen</translation>
-    </message>
-    <message>
         <source>Po&wer Off</source>
         <translation>&Ausschalten</translation>
     </message>
     <message>
-        <source>Power off the selected virtual machines</source>
-        <translation type="obsolete">Schaltet die ausgewählte virtuelle Maschine aus</translation>
-    </message>
-    <message>
         <source>&New Machine...</source>
         <translation>&Neue Maschine...</translation>
     </message>
@@ -628,38 +403,14 @@
         <translation>Maschine &hinzufügen...</translation>
     </message>
     <message>
-        <source>&Ungroup...</source>
-        <translation type="obsolete">Gruppierung &aufheben...</translation>
-    </message>
-    <message>
-        <source>Ungroup items of the selected virtual machine group</source>
-        <translation type="obsolete">Gruppierung der ausgewählten Gruppe aufheben</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="obsolete">Sortieren</translation>
-    </message>
-    <message>
         <source>Gro&up</source>
         <translation>Gr&uppieren</translation>
     </message>
     <message>
-        <source>Sort the group of the first selected machine alphabetically</source>
-        <translation type="obsolete">Sortiert die Gruppe der ersten ausgewählten Maschine automatisch</translation>
-    </message>
-    <message>
         <source>Shared &Clipboard</source>
         <translation>Gemeinsame &Zwischenablage</translation>
     </message>
     <message>
-        <source>Drag'n'Drop</source>
-        <translation type="obsolete">Drag'n'Drop</translation>
-    </message>
-    <message>
-        <source>Save the machine state of the virtual machine</source>
-        <translation type="obsolete">Sichert den Zustand der virtuellen Maschine</translation>
-    </message>
-    <message>
         <source>Power off the virtual machine</source>
         <translation>Schaltet die virtuelle Maschine aus</translation>
     </message>
@@ -676,39 +427,18 @@
         <translation>&Fernsteuerung</translation>
     </message>
     <message>
-        <source>Toggle remote desktop (RDP) connections to this machine</source>
-        <translation type="obsolete">Fernsteuerung (RDP) ein- oder ausschalten</translation>
-    </message>
-    <message>
         <source>&Video Capture</source>
         <translation>&Videoaufzeichnung</translation>
     </message>
     <message>
-        <source>Toggle video capture</source>
-        <translation type="obsolete">Videoaufzeichnung ein- oder ausschalten</translation>
-    </message>
-    <message>
         <source>&Video Capture Settings...</source>
         <translation>Einstellungen für &Videoaufzeichnung...</translation>
     </message>
     <message>
-        <source>Configure video capture settings</source>
-        <translation type="obsolete">Parameter für Videoaufzeichnung ändern</translation>
-    </message>
-    <message>
-        <source>&Logging...</source>
-        <comment>debug action</comment>
-        <translation type="obsolete">&Logging...</translation>
-    </message>
-    <message>
         <source>Popup Menu</source>
         <translation>Menü in Fullscreen/Seamless</translation>
     </message>
     <message>
-        <source>Show Session Information Window</source>
-        <translation type="obsolete">Zeigt einen Dialog mit Sitzungsinformationen</translation>
-    </message>
-    <message>
         <source>&Webcams</source>
         <translation>&Webcams</translation>
     </message>
@@ -717,10 +447,6 @@
         <translation>&Gasterweiterungen einlegen...</translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual drive</source>
-        <translation type="obsolete">Legt das Medium mit den Gasterweiterungen in das virtuelle CD/DVD-Laufwerk</translation>
-    </message>
-    <message>
         <source>&VirtualBox</source>
         <translation>&VirtualBox</translation>
     </message>
@@ -733,18 +459,10 @@
         <translation>&Einstelungen...</translation>
     </message>
     <message>
-        <source>Opens window to configure menu-bar</source>
-        <translation type="obsolete">Öffnet einen Dialog für die Konfiguration der Menüzeile</translation>
-    </message>
-    <message>
         <source>Show Menu &Bar</source>
         <translation>Zeigt die &Menüleiste</translation>
     </message>
     <message>
-        <source>Toggle menu-bar visibility for this machine</source>
-        <translation type="obsolete">Menüzeile für diese virtuelle Maschine ein-/ausschalten</translation>
-    </message>
-    <message>
         <source>&Status Bar</source>
         <translation>&Statusleiste</translation>
     </message>
@@ -753,18 +471,10 @@
         <translation>&Einstellungen für Statusleiste...</translation>
     </message>
     <message>
-        <source>Opens window to configure status-bar</source>
-        <translation type="obsolete">Öffnet ein Fenster zum Konfigurieren der Statusleiste</translation>
-    </message>
-    <message>
         <source>Show Status &Bar</source>
         <translation>Zeige &Statusleiste</translation>
     </message>
     <message>
-        <source>Toggle status-bar visibility for this machine</source>
-        <translation type="obsolete">Statusleiste für diese virtuelle Maschine ein-/ausschalten</translation>
-    </message>
-    <message>
         <source>&Input</source>
         <translation>&Eingabe</translation>
     </message>
@@ -777,38 +487,14 @@
         <translation>&Einstellungen für Tastatur...</translation>
     </message>
     <message>
-        <source>Display the global settings window to configure shortcuts</source>
-        <translation type="obsolete">Öffnet das Fenster zum Konfigurieren der Tastenkombinationen</translation>
-    </message>
-    <message>
         <source>&Mouse</source>
         <translation>&Maus</translation>
     </message>
     <message>
-        <source>&Hard Drives</source>
-        <translation type="obsolete">&Festplatten</translation>
-    </message>
-    <message>
-        <source>&Hard Drive Settings...</source>
-        <translation type="obsolete">&Einstellungen für Festplatten...</translation>
-    </message>
-    <message>
-        <source>Change the settings of hard drives</source>
-        <translation type="obsolete">Einstellungen für Festplatten ändern</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="obsolete">Netzwerk</translation>
-    </message>
-    <message>
         <source>&USB Settings...</source>
         <translation>&Einstellungen für USB...</translation>
     </message>
     <message>
-        <source>Change the settings of USB devices</source>
-        <translation type="obsolete">Einstellungen für USB-Geräte ändern</translation>
-    </message>
-    <message>
         <source>&Shared Folders</source>
         <translation>&Gemeinsame Ordner</translation>
     </message>
@@ -838,10 +524,6 @@
         <translation>&Minimieren</translation>
     </message>
     <message>
-        <source>Minimize active machine-window</source>
-        <translation type="obsolete">Minimiert das aktive Fenster</translation>
-    </message>
-    <message>
         <source>&Full-screen Mode</source>
         <translation>&Vollbildmodus</translation>
     </message>
@@ -862,10 +544,6 @@
         <translation>Skalierungs&faktor</translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <translation type="obsolete">&Einfügen %1</translation>
-    </message>
-    <message>
         <source>Send the %1 sequence to the virtual machine</source>
         <translation>Sendet %1 an die virtuelle Maschine</translation>
     </message>
@@ -890,27 +568,11 @@
         <translation></translation>
     </message>
     <message>
-        <source>Drag and Drop</source>
-        <translation type="obsolete">Drag und Drop</translation>
-    </message>
-    <message>
         <source>&Logging</source>
         <comment>debug action</comment>
         <translation>&Logging</translation>
     </message>
     <message>
-        <source>&Default Start</source>
-        <translation type="obsolete">&Normaler Start</translation>
-    </message>
-    <message>
-        <source>S&eparate Start</source>
-        <translation type="obsolete">&Abgekoppelter Start</translation>
-    </message>
-    <message>
-        <source>Start the selected virtual machines with detachable GUI</source>
-        <translation type="obsolete">Startet die virtuelle Maschine und erlaubt das Abkoppeln der GUI</translation>
-    </message>
-    <message>
         <source>&Normal Start</source>
         <translation>&Normal starten</translation>
     </message>
@@ -919,18 +581,10 @@
         <translation>&Ohne GUI starten</translation>
     </message>
     <message>
-        <source>Start the selected virtual machines in the background</source>
-        <translation type="obsolete">Startet die ausgewählten virtuellen Maschinen im Hintergrund</translation>
-    </message>
-    <message>
         <source>&Detachable Start</source>
         <translation>&Abkoppelbarer Start</translation>
     </message>
     <message>
-        <source>Start the selected virtual machines with the option of continuing them in the background</source>
-        <translation type="obsolete">Startet die ausgewählten virtuellen Maschinen mit der Möglichkeit, diese im Hintergrund laufen zu lassen</translation>
-    </message>
-    <message>
         <source>Minimize active window</source>
         <translation>Minimiert das aktive Fenster</translation>
     </message>
@@ -953,11 +607,11 @@
     </message>
     <message>
         <source>Display the virtual machine settings window</source>
-        <translation>Einstellungen der virtuellen Maschine ändern</translation>
+        <translation>Zeigt die Einstellungen der virtuellen Maschine</translation>
     </message>
     <message>
         <source>Display the virtual machine session information window</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt Sitzungsinformationen der virtuellen Maschine</translation>
     </message>
     <message>
         <source>&Save State</source>
@@ -965,11 +619,11 @@
     </message>
     <message>
         <source>Save the state of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sichert den Zustand der virtuellen Maschine</translation>
     </message>
     <message>
         <source>Send the ACPI Shutdown signal to the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sendet das ACPI-Signal zum Ausschalten der virtuellen Maschine</translation>
     </message>
     <message>
         <source>&Minimize Window</source>
@@ -977,89 +631,89 @@
     </message>
     <message>
         <source>Automatically resize the guest display when the window is resized</source>
-        <translation type="unfinished"></translation>
+        <translation>Passt die Größe das Gastbildschirms automatisch an, wenn sich die Fenstergröße ändert</translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
-        <translation type="unfinished"></translation>
+        <source>Take guest display screenshot</source>
+        <translation>Erzeugt ein Foto des Gastbildschirms</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure video capture</source>
+        <translation>Zeigt die Einstellungen der virtuellen Maschine zum Konfigurieren der Videoaufzeichnung</translation>
     </message>
     <message>
         <source>Enable guest display video capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiviert die Videoaufzeichnung für den Gastbildschirm</translation>
     </message>
     <message>
         <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Erlaubt ankommende Verbindungen über das RDP-Protokoll für diese virtuelle Maschine</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure menu-bar</source>
+        <translation>Erlaubt das Konfigurieren der Menüleiste</translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable menu-bar</source>
+        <translation>Menüleiste anzeigen</translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure status-bar</source>
+        <translation>Erlaubt das Konfigurieren der Statusleiste</translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable status-bar</source>
+        <translation>Statusleiste anzeigen</translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
-        <translation type="unfinished"></translation>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
+        <translation>Zeigt das Fenster zum Konfigurieren der Tastenkombinationen</translation>
     </message>
     <message>
         <source>&Insert %1</source>
         <comment>that means send the %1 key sequence to the virtual machine</comment>
-        <translation type="unfinished">&Einfügen %1</translation>
+        <translation>&Einfügen %1</translation>
     </message>
     <message>
         <source>&Hard Disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Festplatten</translation>
     </message>
     <message>
         <source>&Hard Disk Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Einstellungen für Festplatten...</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure hard disks</source>
+        <translation>Zeigt die Einstellungen der virtuellen Maschine zum Konfigurieren der virtuellen Festplatten</translation>
     </message>
     <message>
         <source>&Network</source>
-        <translation type="unfinished"></translation>
+        <translation>&Netzwerk</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure network adapters</source>
+        <translation>Zeigt die Einstellungen der virtuellen Maschine zum Konfigurieren der Netzwerkadapter</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure USB devices</source>
+        <translation>Zeigt die Einstellungen der virtuellen Maschine zum Konfigurieren der USB-Geräte</translation>
     </message>
     <message>
         <source>&Drag and Drop</source>
-        <translation type="unfinished"></translation>
+        <translation>&Drag und Drop</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure shared folders</source>
+        <translation>Zeigt die Einstellungen der virtuellen Maschine zum Konfigurieren der Gemeinsamen Ordner</translation>
     </message>
     <message>
         <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt das Medium mit den Gasterweiterungen in das virtuelle optische Laufwerk ein </translation>
     </message>
     <message>
         <source>%1%</source>
         <comment>scale-factor</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1</translation>
     </message>
     <message>
         <source>Enable</source>
@@ -1069,188 +723,175 @@
     <message>
         <source>Resize to %1x%2</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">Ändern nach %1x%2</translation>
+        <translation>Ändern nach %1x%2</translation>
     </message>
     <message>
         <source>Preview Monitor %1</source>
-        <translation type="unfinished">Monitor %1</translation>
+        <translation>Monitor %1</translation>
     </message>
     <message>
         <source>&Connect Network Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>&Netzwerkadapter verbinden</translation>
     </message>
     <message>
         <source>Connect Network Adapter &%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Netzwerkadapter &%1 verbinden</translation>
     </message>
     <message>
         <source>No USB Devices Connected</source>
-        <translation type="unfinished">Kein USB-Gerät angeschlossen</translation>
+        <translation>Kein USB-Gerät angeschlossen</translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
-        <translation type="unfinished">Keine unterstützten Geräte mit dem PC verbunden</translation>
+        <translation>Keine unterstützten Geräte mit dem PC verbunden</translation>
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished">Keine Webcam angeschlossen</translation>
+        <translation>Keine Webcam angeschlossen</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
-        <translation type="unfinished">Keine unterstützen Webcams am PC angeschlossen</translation>
+        <translation>Keine unterstützen Webcams am PC angeschlossen</translation>
     </message>
     <message>
         <source>Create new virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue virtuelle Maschine erzeugen</translation>
     </message>
     <message>
         <source>Add existing virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügt eine existierende virtuelle Maschine hinzu</translation>
     </message>
     <message>
         <source>Rename selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <translation>Benennt die ausgewählte virtuelle Maschine um</translation>
     </message>
     <message>
         <source>&Ungroup</source>
         <translation>Gruppierung &aufheben</translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <source>Ungroup items of selected virtual machine group</source>
+        <translation>Gruppierung der ausgewählten Gruppe aufheben</translation>
     </message>
     <message>
         <source>&Sort</source>
         <translation>&Sortieren</translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort items of selected virtual machine group alphabetically</source>
+        <translation>Sortiert die Einträge der ausgewählten Gruppe alphabetisch</translation>
     </message>
     <message>
         <source>Add new group based on selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Gruppe mit den ausgewählten Maschinen erzeugen</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Die ausgewählte virtuelle Maschine klonen</translation>
     </message>
     <message>
         <source>Remove selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Löscht die ausgewählten virtuelle Maschinen</translation>
     </message>
     <message>
         <source>Start selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Starten der ausgewählten virtuellen Maschinen</translation>
     </message>
     <message>
         <source>Switch to the windows of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Holt die Fenster der ausgewählten virtuellen Maschinen in den Vordergrund</translation>
     </message>
     <message>
         <source>Start selected virtual machines in the background</source>
-        <translation type="unfinished"></translation>
+        <translation>Startet die ausgewählten virtuellen Maschinen im Hintergrund</translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
-        <translation type="unfinished"></translation>
+        <source>Start selected virtual machines with option of continuing in background</source>
+        <translation>Startet die ausgewählten virtuellen Maschinen mit der Möglichkeit, diese im Hintergrund laufen zu lassen</translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Suspend execution of selected virtual machines</source>
+        <translation>Suspendiert die Ausführung der ausgewählten virtuellen Maschinen</translation>
     </message>
     <message>
         <source>Reset selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Zurücksetzen der ausgewählten virtuellen Maschinen</translation>
     </message>
     <message>
         <source>D&iscard Saved State...</source>
         <translation>&Verwerfen...</translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Discard saved state of selected virtual machines</source>
+        <translation>Verwirft den gesicherten Zustand der ausgewählten virtuellen Maschinen</translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Show log files of selected virtual machines</source>
+        <translation>Zeigt die Log-Dateien der ausgewählten virtuellen Maschinen</translation>
     </message>
     <message>
         <source>Re&fresh</source>
         <translation>&Aktualisieren</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Refresh accessibility state of selected virtual machines</source>
+        <translation>Aktualisiert den Zustand der ausgewählten virtuellen Maschinen</translation>
     </message>
     <message>
         <source>S&how in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>Im &Finder zeigen</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt die VirtualBox-VM-Definitionen im Finder</translation>
     </message>
     <message>
         <source>S&how in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>Im &Explorer zeigen</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt die VirtualBox-VM-Definitionen im Explorer</translation>
     </message>
     <message>
         <source>S&how in File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Im &Dateimanager zeigen</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in the File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt die VirtualBox-VM-Definitionen im Dateimanager</translation>
     </message>
     <message>
         <source>Cr&eate Alias on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>&Alias auf dem Desktop erzeugen</translation>
     </message>
     <message>
         <source>Create alias files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Erzeugt Aliases für die VirtualBox-VM-Definitionen auf Ihrem Desktop</translation>
     </message>
     <message>
         <source>Cr&eate Shortcut on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>&Desktop-Verknüpfung erzeugen</translation>
     </message>
     <message>
         <source>Create shortcut files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Erzeugt eine Verknüfung auf die VirtualBox-VM auf Ihrem Destkop</translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort group of first selected virtual machine alphabetically</source>
+        <translation>Sortiert die Gruppe der ersten ausgewählten Maschine alphabetisch</translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Save state of selected virtual machines</source>
+        <translation>Sichert den Zustand der ausgewählten virtuellen Maschinen</translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
+        <translation>Sendet das ACPI-Signal zum Ausschalten der ausgewählten virtuellen Maschinen</translation>
     </message>
     <message>
         <source>Power off selected virtual machines</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Aktivieren</translation>
-    </message>
-    <message>
-        <source>Resize to %1x%2</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Ändern nach %1x%2</translation>
+        <translation>Schaltet die ausgewählten virtuelle Maschinen aus</translation>
     </message>
 </context>
 <context>
@@ -1270,23 +911,24 @@
     <message>
         <source>Status</source>
         <comment>password table field</comment>
-        <translation type="unfinished"></translation>
+        <translation>Status</translation>
     </message>
     <message>
         <source>ID</source>
         <comment>password table field</comment>
-        <translation type="unfinished"></translation>
+        <translation>ID</translation>
     </message>
     <message>
         <source>Password</source>
         <comment>password table field</comment>
-        <translation type="unfinished">Passwort</translation>
+        <translation>Passwort</translation>
     </message>
     <message numerus="yes">
         <source><nobr>Used by the following %n hard disk(s):</nobr><br>%1</source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many hard drives are in the tool-tip and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><nobr>Von der folgenden Festplatte benutzt:</nobr><br>%1</numerusform>
+            <numerusform><nobr>Von den folgenden Festplatten benutzt:</nobr><br>%1</numerusform>
         </translation>
     </message>
 </context>
@@ -1341,18 +983,6 @@
         <translation>RAM</translation>
     </message>
     <message>
-        <source>Hard Disk Controller (IDE)</source>
-        <translation type="obsolete">Festplatten-Controller IDE</translation>
-    </message>
-    <message>
-        <source>Hard Disk Controller (SATA)</source>
-        <translation type="obsolete">Festplatten-Controller SATA</translation>
-    </message>
-    <message>
-        <source>Hard Disk Controller (SCSI)</source>
-        <translation type="obsolete">Festplatten-Controller SCSI</translation>
-    </message>
-    <message>
         <source>DVD</source>
         <translation>DVD-Laufwerk</translation>
     </message>
@@ -1374,7 +1004,7 @@
     </message>
     <message>
         <source>Virtual Disk Image</source>
-        <translation>Virtuelles Plattenabbild</translation>
+        <translation>Plattenabbild</translation>
     </message>
     <message>
         <source>Unknown Hardware Item</source>
@@ -1393,10 +1023,6 @@
         <translation>Warnungen:</translation>
     </message>
     <message>
-        <source>Hard Disk Controller (SAS)</source>
-        <translation type="obsolete">Festplatten-Controller SAS</translation>
-    </message>
-    <message>
         <source>When checked a new unique MAC address will assigned to all configured network cards.</source>
         <translation>Allen aktivierten Netzwerkkarten wird eine neue MAC-Adresse zugewiesen.</translation>
     </message>
@@ -1406,19 +1032,19 @@
     </message>
     <message>
         <source>Storage Controller (IDE)</source>
-        <translation type="unfinished"></translation>
+        <translation>IDE-Controller</translation>
     </message>
     <message>
         <source>Storage Controller (SATA)</source>
-        <translation type="unfinished"></translation>
+        <translation>SATA-Controller</translation>
     </message>
     <message>
         <source>Storage Controller (SCSI)</source>
-        <translation type="unfinished"></translation>
+        <translation>SCSI-Controller</translation>
     </message>
     <message>
         <source>Storage Controller (SAS)</source>
-        <translation type="unfinished"></translation>
+        <translation>SAS-Controller</translation>
     </message>
 </context>
 <context>
@@ -1440,13 +1066,6 @@
     </message>
 </context>
 <context>
-    <name>UIDnDDrag</name>
-    <message>
-        <source>Retrieving data ...</source>
-        <translation type="obsolete">Empfange Daten ...</translation>
-    </message>
-</context>
-<context>
     <name>UIDnDHandler</name>
     <message>
         <source>Dropping data ...</source>
@@ -1458,13 +1077,6 @@
     </message>
 </context>
 <context>
-    <name>UIDnDMimeData</name>
-    <message>
-        <source>Dropping data ...</source>
-        <translation type="obsolete">Kopiere Daten ...</translation>
-    </message>
-</context>
-<context>
     <name>UIDownloader</name>
     <message>
         <source>Looking for %1...</source>
@@ -1509,22 +1121,6 @@
     </message>
 </context>
 <context>
-    <name>UIEncryptionDataModel</name>
-    <message>
-        <source>Password</source>
-        <comment>password table field</comment>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message numerus="yes">
-        <source><nobr>Used by the following %n hard drive(s):</nobr><br>%1</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many hard drives are in the tool-tip and doesn't need to be told).</comment>
-        <translation type="obsolete">
-            <numerusform><nobr>Von der folgenden Festplatte benutzt:</nobr><br>%1</numerusform>
-            <numerusform><nobr>Von den folgenden % Festplatten benutzt:</nobr><br>%1</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
     <name>UIGChooserItemGroup</name>
     <message>
         <source><b>%1</b></source>
@@ -1797,9 +1393,9 @@
         <translation>Generischer Treiber, '%1'</translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>Generischer Treiber, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation>Generischer Treiber, '%1' { %2 }</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -1871,21 +1467,6 @@
         <translation>USB-Controller</translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (user interface)</comment>
-        <translation type="obsolete">Skalierungsfaktor</translation>
-    </message>
-    <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (user interface)</comment>
-        <translation type="obsolete">Nicht skalierte HiDPI-Auflösung</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details (user interface/Unscaled HiDPI Video Output)</comment>
-        <translation type="obsolete">aktiviert</translation>
-    </message>
-    <message>
         <source>Mini-toolbar Position</source>
         <comment>details (user interface)</comment>
         <translation>Position der Mini-Toolbar</translation>
@@ -1998,18 +1579,10 @@
         <translation>&Breite:</translation>
     </message>
     <message>
-        <source>Specifies the maximum width which we would like the guest to use.</source>
-        <translation type="obsolete">Legt die maximale Breite des Gast-Bildschirms fest, die der Gast einstellen darf.</translation>
-    </message>
-    <message>
         <source>&Height:</source>
         <translation>&Höhe:</translation>
     </message>
     <message>
-        <source>Specifies the maximum height which we would like the guest to use.</source>
-        <translation type="obsolete">Legt die maximale Höhe des Gast-Bildschirms fest, die der Gast einstellen darf.</translation>
-    </message>
-    <message>
         <source>Automatic</source>
         <comment>Maximum Guest Screen Size</comment>
         <translation>automatisch</translation>
@@ -2041,24 +1614,20 @@
         <translation>VM-Fenster:</translation>
     </message>
     <message>
-        <source>If checked, machine windows will be raised when the mouse pointer moves over them.</source>
-        <translation type="obsolete">Holt das Fenster der virtuellen Maschine unter der Maus hervor, wenn der Mauszeiger über das Fenster fährt.</translation>
-    </message>
-    <message>
         <source>&Raise Window Under Mouse</source>
         <translation>&Fenster unter Mauszeiger hervorholen</translation>
     </message>
     <message>
         <source>Holds the maximum width which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt die maximale Breite des Gast-Bildschirms fest, die der Gast einstellen darf.</translation>
     </message>
     <message>
         <source>Holds the maximum height which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt die maximale Höhe des Gast-Bildschirms fest, die der Gast einstellen darf.</translation>
     </message>
     <message>
         <source>When checked, machine windows will be raised when the mouse pointer moves over them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Holt das Fenster der virtuellen Maschine unter der Maus hervor, wenn der Mauszeiger über das Fenster fährt.</translation>
     </message>
 </context>
 <context>
@@ -2080,14 +1649,6 @@
         <translation>Version</translation>
     </message>
     <message>
-        <source>Add package</source>
-        <translation type="obsolete">Paket hinzufügen</translation>
-    </message>
-    <message>
-        <source>Remove package</source>
-        <translation type="obsolete">Paket löschen</translation>
-    </message>
-    <message>
         <source>Select an extension package file</source>
         <translation>Zusatzpaket auswählen</translation>
     </message>
@@ -2105,19 +1666,19 @@
     </message>
     <message>
         <source>Add Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Paket hinzufügen</translation>
     </message>
     <message>
         <source>Remove Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Paket entfernen</translation>
     </message>
     <message>
         <source>Adds new package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügt ein neues Paket hinzu.</translation>
     </message>
     <message>
         <source>Removes selected package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernt das aufgewählte Paket.</translation>
     </message>
 </context>
 <context>
@@ -2139,36 +1700,16 @@
         <translation>V&RDP-Authentisierungsbibliothek:</translation>
     </message>
     <message>
-        <source>&Dock and Menubar:</source>
-        <translation type="obsolete">&Dock und Menübar:</translation>
-    </message>
-    <message>
-        <source>Auto-Show in Fullscreen</source>
-        <translation type="obsolete">Automatisch im Vollbildmodus</translation>
-    </message>
-    <message>
-        <source>When checked, the host dock and menu bar will be shown when the virtual machine is in fullscreen mode.</source>
-        <translation type="obsolete">Das Host-Dock und die Menüleiste wird gezeigt, wenn sich die VM im Vollbildmodus befindet.</translation>
-    </message>
-    <message>
-        <source>&Host Screensaver:</source>
-        <translation type="obsolete">&Host-Bildschirmschoner:</translation>
-    </message>
-    <message>
         <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
         <translation>Der Host-Bildschirmschoner wird deaktiviert, solange eine virtuelle Machine ausgeführt wird.</translation>
     </message>
     <message>
-        <source>Disable When Running Virtual Machines</source>
-        <translation type="obsolete">Deaktivieren bei aktiven VMs</translation>
-    </message>
-    <message>
         <source>Host Screensaver:</source>
-        <translation type="unfinished"></translation>
+        <translation>Host-Bildschirmschoner:</translation>
     </message>
     <message>
         <source>&Disable When Running Virtual Machines</source>
-        <translation type="unfinished"></translation>
+        <translation>&Deaktivieren bei aktiven VMs</translation>
     </message>
 </context>
 <context>
@@ -2198,20 +1739,12 @@
         <translation>Virtuelle &Maschine</translation>
     </message>
     <message>
-        <source>Lists all the available shortcuts which can be configured.</source>
-        <translation type="obsolete">Zeigt alle verfügbaren Aktionen, die durch Tastenkombinationen ausgelöst werden können.</translation>
-    </message>
-    <message>
-        <source>Enter a sequence to filter the shortcut list.</source>
-        <translation type="obsolete">Erlaubt das Filtern der Liste.</translation>
-    </message>
-    <message>
         <source>Lists all available shortcuts which can be configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt alle konfigurierbaren Tastenkombinationen.</translation>
     </message>
     <message>
         <source>Holds a sequence to filter the shortcut list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erlaubt das Filtern der Liste.</translation>
     </message>
 </context>
 <context>
@@ -2352,18 +1885,6 @@
         <translation>Größte Adresse</translation>
     </message>
     <message>
-        <source>&Add host-only network</source>
-        <translation type="obsolete">Host-only Netzwerk &hinzufügen</translation>
-    </message>
-    <message>
-        <source>&Remove host-only network</source>
-        <translation type="obsolete">Host-only Netzwerk &entfernen</translation>
-    </message>
-    <message>
-        <source>&Edit host-only network</source>
-        <translation type="obsolete">Host-only Netzwerk &ändern</translation>
-    </message>
-    <message>
         <source>Lists all available host-only networks.</source>
         <translation>Zeigt die verfügbaren host-only Netzwerke.</translation>
     </message>
@@ -2489,64 +2010,52 @@
         <translation>aktiv</translation>
     </message>
     <message>
-        <source>&Add NAT network</source>
-        <translation type="obsolete">NAT-Netzwerk &hinzufügen</translation>
-    </message>
-    <message>
-        <source>&Remove NAT network</source>
-        <translation type="obsolete">NAT-Netzwerk &entfernen</translation>
-    </message>
-    <message>
-        <source>&Edit NAT network</source>
-        <translation type="obsolete">NAT-Netzwerk &ändern</translation>
-    </message>
-    <message>
         <source>Add NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NAT-Netzwerk hinzufügen</translation>
     </message>
     <message>
         <source>Remove NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NAT-Netzwerk entfernen</translation>
     </message>
     <message>
         <source>Edit NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NAT-Netzwerk ändern</translation>
     </message>
     <message>
         <source>Adds new NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Neues NAT-Netzwerk hinzufügen.</translation>
     </message>
     <message>
         <source>Removes selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernt das ausgewählte NAT-Netzwerk.</translation>
     </message>
     <message>
         <source>Edits selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ändert das ausgewählte NAT-Netzwerk.</translation>
     </message>
     <message>
         <source>Add Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Host-only Netzwerk hinzufügen</translation>
     </message>
     <message>
         <source>Remove Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Host-only Netzwerk entfernen</translation>
     </message>
     <message>
         <source>Edit Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Host-only Netzwerk ändern</translation>
     </message>
     <message>
         <source>Adds new host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügt ein neues Host-only Netzwerk hinzu.</translation>
     </message>
     <message>
         <source>Removes selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernt die ausgewählte Host-only Netzwerk.</translation>
     </message>
     <message>
         <source>Edits selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ändert das ausgewählte Host-only Netzwerk.</translation>
     </message>
 </context>
 <context>
@@ -2564,10 +2073,6 @@
         <translation>Manuelle &Konfiguration</translation>
     </message>
     <message>
-        <source>Use manual configuration for this host-only network adapter.</source>
-        <translation type="obsolete">Erlaubt die manuelle Konfiguration dieses Host-only Netzwerkadapters.</translation>
-    </message>
-    <message>
         <source>&IPv4 Address:</source>
         <translation>&IPv4-Adresse:</translation>
     </message>
@@ -2608,10 +2113,6 @@
         <translation>Server &aktivieren</translation>
     </message>
     <message>
-        <source>Indicates whether the DHCP Server is enabled on machine startup or not.</source>
-        <translation type="obsolete">Zeigt an, ob der DHCP-Server beim Start der Maschine aktiviert wird oder nicht.</translation>
-    </message>
-    <message>
         <source>Server Add&ress:</source>
         <translation>Server-A&dresse:</translation>
     </message>
@@ -2645,11 +2146,11 @@
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erlaubt die manuelle Konfiguration dieses Host-only Netzwerkadapters.</translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
-        <translation type="unfinished"></translation>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
+        <translation>Startet den DHCP-Server beim Start der Maschine.</translation>
     </message>
 </context>
 <context>
@@ -2663,10 +2164,6 @@
         <translation>Netzwerk &aktivieren</translation>
     </message>
     <message>
-        <source>Enable this NAT network.</source>
-        <translation type="obsolete">Dieses NAT-Netzwerk aktivieren.</translation>
-    </message>
-    <message>
         <source>Network &Name:</source>
         <translation>Netzwerk-&Name:</translation>
     </message>
@@ -2691,52 +2188,36 @@
         <translation>Unterstützt &DHCP</translation>
     </message>
     <message>
-        <source>Determines whether this network supports DHCP.</source>
-        <translation type="obsolete">Gibt an, ob dieses Netzwerk DHCP unterstützt.</translation>
-    </message>
-    <message>
         <source>Supports &IPv6</source>
         <translation>Unterstützt &IPv6</translation>
     </message>
     <message>
-        <source>Determines whether this network supports IPv6.</source>
-        <translation type="obsolete">Gibt an, ob dieses Netzwerk IPv6 unterstützt.</translation>
-    </message>
-    <message>
         <source>Advertise Default IPv6 &Route</source>
         <translation>Verwende als voreingestellte IPv6-&Route</translation>
     </message>
     <message>
-        <source>Determines whether this network should be advertised as the default IPv6 route.</source>
-        <translation type="obsolete">Legt fest ob dieses Netzwerk als die voreingestellte IPv6-Route verwendet werden soll.</translation>
-    </message>
-    <message>
-        <source>Opens a window to manage port forwarding rules.</source>
-        <translation type="obsolete">Öffnet den Dialog für Regeln zur Portweiterleitung.</translation>
-    </message>
-    <message>
         <source>&Port Forwarding</source>
         <translation>&Port-Weiterleitung</translation>
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiviert dieses Netzwerk.</translation>
     </message>
     <message>
         <source>When checked, this network will support DHCP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiviert DCHP-Unterstützung für dieses Netzwerk.</translation>
     </message>
     <message>
         <source>When checked, this network will support IPv6.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiviert IPv6-Unterstützung für dieses Netzwerk.</translation>
     </message>
     <message>
         <source>When checked, this network will be advertised as the default IPv6 route.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt fest ob dieses Netzwerk als die voreingestellte IPv6-Route verwendet werden soll.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnet den Dialog für Regeln zur Portweiterleitung.</translation>
     </message>
 </context>
 <context>
@@ -2769,18 +2250,10 @@
         <translation>Ho&st:</translation>
     </message>
     <message>
-        <source>Changes the proxy host.</source>
-        <translation type="obsolete">Ändert den Proxy-Host.</translation>
-    </message>
-    <message>
         <source>&Port:</source>
         <translation>&Port:</translation>
     </message>
     <message>
-        <source>Changes the proxy port.</source>
-        <translation type="obsolete">Ändert den Proxy-Port.</translation>
-    </message>
-    <message>
         <source>No proxy host is currently specified.</source>
         <translation>Es wurde kein Proxy-Host angegeben.</translation>
     </message>
@@ -2790,11 +2263,11 @@
     </message>
     <message>
         <source>Holds the proxy host.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt den Proxy-Host fest.</translation>
     </message>
     <message>
         <source>Holds the proxy port.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt den Proxy-Port fest.</translation>
     </message>
 </context>
 <context>
@@ -2812,10 +2285,6 @@
         <translation>&Einmal pro:</translation>
     </message>
     <message>
-        <source>Specifies how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="obsolete">Gibt an, wie oft die Versionsüberprüfung ausgeführt werden soll. Um den Test zu deaktivieren brauchen Sie nur die obige Checkbox deaktivieren.</translation>
-    </message>
-    <message>
         <source>Next Check:</source>
         <translation>Nächste Überprüfung:</translation>
     </message>
@@ -2849,7 +2318,7 @@
     </message>
     <message>
         <source>Selects how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gibt an, wie oft die Versionsüberprüfung ausgeführt werden soll. Um den Test zu abzuschalten deaktivieren Sie die obige Checkbox.</translation>
     </message>
 </context>
 <context>
@@ -2990,24 +2459,9 @@
 <context>
     <name>UIIndicatorsPool</name>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the virtual hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>Zeigt die Aktivität der virtuellen Festplatten:</nobr>%1</p></translation>
-    </message>
-    <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the CD/DVD devices:</nobr>%1</p></source>
-        <comment>CD/DVD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>Zeigt die Aktivität der CD/DVD-Laufwerke:</nobr>%1</p></translation>
-    </message>
-    <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy devices:</nobr>%1</p></source>
-        <comment>FD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>Zeigt die Aktivität der Diskettenlaufwerke:</nobr>%1</p></translation>
-    </message>
-    <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the network interfaces:</nobr>%1</p></source>
         <comment>Network adapters tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>Zeigt die Aktivität der Netzwerkadapter:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Aktivität der Netzwerkadapter:</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr></source>
@@ -3032,7 +2486,7 @@
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the attached USB devices:</nobr>%1</p></source>
         <comment>USB device tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>Zeigt die Aktivität der angeschlossenen USB-Geräte:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Angeschlossene USB-Geräte:</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>No USB devices attached</b></nobr></source>
@@ -3040,14 +2494,9 @@
         <translation><br><nobr><b>Keine USB-Geräte angeschlossen</b></nobr></translation>
     </message>
     <message>
-        <source><br><nobr><b>USB Controller is disabled</b></nobr></source>
-        <comment>USB device tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>USB-Controller ist deaktiviert</b></nobr></translation>
-    </message>
-    <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the machine's shared folders:</nobr>%1</p></source>
         <comment>Shared folders tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>Zeigt die Aktivität der gemeinsamen Ordner:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Gemeinsame Ordner:</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>No shared folders</b></nobr></source>
@@ -3061,15 +2510,11 @@
     </message>
     <message>
         <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_ [...]
-        <translation>Zeigt, ob der Mauszeiger im Gast-BS gefangen ist:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;Zeiger ist nicht gefangen</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;Zeiger ist gefangen</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;Mauszeiger-Integration (MI) ist an</nobr><br><nobr><img src=:/mouse_can_seamless_16px.pn [...]
-    </message>
-    <message>
-        <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source>
-        <translation type="obsolete">Zeigt, ob die Tastatur vom Gast gefangen ist (<img src=:/hostkey_captured_16px.png/>) oder nicht (<img src=:/hostkey_16px.png/>).</translation>
+        <translation>Zeigt, ob der Mauszeiger im Fenster gefangen ist:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;Zeiger ist nicht gefangen</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;Zeiger ist gefangen</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;Mauszeiger-Integration (MI) ist an</nobr><br><nobr><img src=:/mouse_can_seamless_16px.pn [...]
     </message>
     <message>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
-        <translation><nobr>Zeigt die Aktivität der Videoaufzeichnung:</nobr><br>%1</translation>
+        <translation><nobr>Aktivität der Videoaufzeichnung:</nobr><br>%1</translation>
     </message>
     <message>
         <source><nobr><b>Video capture disabled</b></nobr></source>
@@ -3086,26 +2531,26 @@
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
-        <translation><p style='white-space:pre'><nobr>Zeigt die Aktivität der Gastanzeige:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Aktivität der Gastanzeige:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the optical drives:</nobr>%1</p></source>
         <comment>CD tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>Zeigt die optischen Laufwerke:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Optische Laufwerke:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy drives:</nobr>%1</p></source>
         <comment>FD tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>Zeigt die Aktivität der Diskettenlaufwerke:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Diskettenlaufwerke:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
         <comment>HDD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Festplatten:</nobr>%1</p></translation>
     </message>
     <message>
         <source>Indicates whether the host keyboard is captured by the guest OS:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;keyboard is not captured</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;keyboard is captured</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt, ob die Tastatur vom Gast gefangen ist:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;Tastatur nicht gefangen</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;Tastatur ist gefangen</nobr></translation>
     </message>
 </context>
 <context>
@@ -3118,41 +2563,9 @@
 <context>
     <name>UIMachineLogic</name>
     <message>
-        <source>Preview Monitor %1</source>
-        <translation type="obsolete">Monitor %1</translation>
-    </message>
-    <message>
-        <source>Snapshot %1</source>
-        <translation type="obsolete">Sicherungspunkt %1</translation>
-    </message>
-    <message>
-        <source>No USB Devices Connected</source>
-        <translation type="obsolete">Kein USB-Gerät angeschlossen</translation>
-    </message>
-    <message>
-        <source>No supported devices connected to the host PC</source>
-        <translation type="obsolete">Keine unterstützten Geräte mit dem PC verbunden</translation>
-    </message>
-    <message>
         <source>Select a filename for the screenshot ...</source>
         <translation>Wählen Sie einen Dateinamen für diesen Screenshot ...</translation>
     </message>
-    <message>
-        <source>No Webcams Connected</source>
-        <translation type="obsolete">Keine Webcam angeschlossen</translation>
-    </message>
-    <message>
-        <source>No supported webcams connected to the host PC</source>
-        <translation type="obsolete">Keine unterstützen Webcams am PC angeschlossen</translation>
-    </message>
-    <message>
-        <source>Connect Network Adapter</source>
-        <translation type="obsolete">Netzwerkadapter verbinden</translation>
-    </message>
-    <message>
-        <source>Connect Network Adapter %1</source>
-        <translation type="obsolete">Netzwerkadapter %1 verbinden</translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsAudio</name>
@@ -3169,10 +2582,6 @@
         <translation>Audio-&Treiber des Hosts:</translation>
     </message>
     <message>
-        <source>Controls the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation type="obsolete">Richtet den Treiber für Audioausgabe ein. Wird der <b>Null-Audiotreiber</b> ausgewählt, erkennt der Gast eine Audio-Karte, Ein- und Ausgabe werden aber ignoriert.</translation>
-    </message>
-    <message>
         <source>Audio &Controller:</source>
         <translation>Audio-&Controller:</translation>
     </message>
@@ -3182,20 +2591,12 @@
     </message>
     <message>
         <source>Selects the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation type="unfinished"></translation>
+        <translation>Richtet den Treiber für Audioausgabe ein. Wird der <b>Null-Audiotreiber</b> ausgewählt, erkennt der Gast eine Audio-Karte, Ein- und Ausgabe werden aber ignoriert.</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsDisplay</name>
     <message>
-        <source><qt>%1&nbsp;MB</qt></source>
-        <translation type="obsolete"><qt>%1&nbsp;MB</qt></translation>
-    </message>
-    <message>
-        <source>&Video</source>
-        <translation type="obsolete">&Anzeige</translation>
-    </message>
-    <message>
         <source>Video &Memory:</source>
         <translation>&Grafikspeicher:</translation>
     </message>
@@ -3240,18 +2641,10 @@
         <translation>Authentisierungs&methode:</translation>
     </message>
     <message>
-        <source>Defines the VRDP authentication method.</source>
-        <translation type="obsolete">Festlegen der VRDP Authentisierungsmethode.</translation>
-    </message>
-    <message>
         <source>Authentication &Timeout:</source>
         <translation>&Zeitüberschreitung für Authentisierung:</translation>
     </message>
     <message>
-        <source>Specifies the timeout for guest authentication, in milliseconds.</source>
-        <translation type="obsolete">Legt die maximale Zeit für die Anmeldung des Gastes in Millisekunden fest.</translation>
-    </message>
-    <message>
         <source>When checked, the virtual machine will be given access to the Video Acceleration capabilities available on the host.</source>
         <translation>Erlaubt dem Gast Zugriff auf Funktionen zur Video-Beschleunigung des Host-Grafikadapters.</translation>
     </message>
@@ -3260,10 +2653,6 @@
         <translation>&2D-Video-Beschleunigung aktivieren</translation>
     </message>
     <message>
-        <source>The VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="obsolete">Die Portnummer des RDP-Servers. Der Wert <tt>0</tt> (Null) wählt den RDP-Standardport 3389.</translation>
-    </message>
-    <message>
         <source>Mo&nitor Count:</source>
         <translation>Anzahl &Bildschirme:</translation>
     </message>
@@ -3272,10 +2661,6 @@
         <translation>Ändern der Anzahl der virtuellen Monitore für diese virtuelle Maschine.</translation>
     </message>
     <message>
-        <source>Specifies whether multiple simultaneous connections to the VM are permitted.</source>
-        <translation type="obsolete">Legt fest ob mehrere gleichzeitige Verbindungen zur VM erlaubt sind.</translation>
-    </message>
-    <message>
         <source>&Allow Multiple Connections</source>
         <translation>&Gleichzeitige Verbindungen erlauben</translation>
     </message>
@@ -3296,46 +2681,18 @@
         <translation>Datei&pfad:</translation>
     </message>
     <message>
-        <source>This setting determines the filename VirtualBox uses to save the recorded content.</source>
-        <translation type="obsolete">Geben Sie hier den Namen für die Videoaufzeichnungsdatei an.</translation>
-    </message>
-    <message>
         <source>Frame &Size:</source>
         <translation>Bild&größe:</translation>
     </message>
     <message>
-        <source>This setting determines the resolution (frame size) of the recorded video.</source>
-        <translation type="obsolete">Diese Einstellung legt die Auflösung (Größe eines Bildes) der Videoaufzeichnung fest.</translation>
-    </message>
-    <message>
-        <source>This setting determines the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
-        <translation type="obsolete">Diese Einstellung bestimmt die <b>waagerechte</b> Auflösung (Bildbreite) der Videoaufzeichnung.</translation>
-    </message>
-    <message>
-        <source>This setting determines the <b>vertical</b> resolution (frame height) of the recorded video.</source>
-        <translation type="obsolete">Diese Einstellung bestimmt die <b>senkrechte</b> Auflösung (Bildbreite) der Videoaufzeichnung.</translation>
-    </message>
-    <message>
         <source>&Frame Rate:</source>
         <translation>Bild&rate:</translation>
     </message>
     <message>
-        <source>This setting determines the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
-        <translation type="obsolete">Diese Einstellung legt die maximale Anzahl an <b>Bildern pro Sekunde</b> fest. Wird dieser Wert vermindert, so reduziert sich die Dateigröße, aber es werden mehr Bilder übersprungen.</translation>
-    </message>
-    <message>
         <source>&Quality:</source>
         <translation>&Qualität:</translation>
     </message>
     <message>
-        <source>This setting determines the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="obsolete">Wählen Sie hier die <b>Qualität</b>. Mehr Qualität wird durch größere Videoaufzeichnungsdateien erkauft.</translation>
-    </message>
-    <message>
-        <source>This setting determines the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="obsolete">Geben Si ehier die Bitrate in <b>Kilobit pro Sekunde</b> an. Größere Werte ergeben eine bessere Qualität auf Kosten größerer Dateien.</translation>
-    </message>
-    <message>
         <source>&Screens:</source>
         <translation>&Bildschirme:</translation>
     </message>
@@ -3344,18 +2701,10 @@
         <translation>Die virtuelle Maschine soll mit Hardware-Beschleunigung ausgeführt werden. Allerdings kann der Host dieses Feature nicht bereitstellen. Daher können Sie diese Maschine nicht starten.</translation>
     </message>
     <message>
-        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to fullscreen or seamless mode.</source>
-        <translation type="obsolete">Es wurden weniger als <b>%1</b> Grafikspeicher für diese VM eingestellt. Um in den Vollbildmodus oder in den nahtlosen Modus schalten zu können, ist dies zu wenig.</translation>
-    </message>
-    <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required for High Definition Video to be played efficiently.</source>
         <translation>Es wurden weniger als <b>%1</b> Grafikspeicher für diese VM eingestellt. Um Video in guter Qualität abspielen zu können zu können, ist dies zu wenig.</translation>
     </message>
     <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least b>%1</b>.</source>
-        <translation type="obsolete">In den Video-Einstellungen wurde hardwarebeschleunigtes 3D aktiviert, und der Typ des Gastes wurde als Windows Vista oder später eingestellt. Für beste Performance sollte der Grafikspeicher auf mindestens <b>%1</b> eingestellt werden.</translation>
-    </message>
-    <message>
         <source>The virtual machine is set up to use Video Stream Acceleration. As this feature only works with Windows guest systems it will be disabled.</source>
         <translation>Für diese virtuelle Maschine wurde Video-Beschleunigung aktiviert. Dieses Feature ist nur für Windows-Gäste verfügbar und wird daher deaktiviert.</translation>
     </message>
@@ -3403,30 +2752,6 @@
         <translation>Bildschirm %1</translation>
     </message>
     <message>
-        <source>Enable video recording for screen %1.</source>
-        <translation type="obsolete">Videoaufzeichnung für Bildschirm %1 aktivieren.</translation>
-    </message>
-    <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Mini-Toolbar:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Falls aktiviert wird die Mini-Toolbar im Vollbildmodus und im nahtlosen Modus gezeigt.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">im &Vollbild-/Seamless-Modus zeigen</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Zeigt die Mini-Toolbar am oberen Rand des Bildschirms wenn ausgewählt, sonst am unteren Rand.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">am &oberen Bildschirmrand zeigen</translation>
-    </message>
-    <message>
         <source><i>About %1MB per 5 minute video</i></source>
         <translation><i>Ungefährt %1 MB pro Videominute</i></translation>
     </message>
@@ -3468,76 +2793,72 @@
     </message>
     <message>
         <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
+        <translation>HiDPI-Unterstützung:</translation>
     </message>
     <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Portnummer des RDP-Servers. Der Wert <tt>0</tt> (Null) wählt den RDP-Standardport 3389.</translation>
     </message>
     <message>
         <source>Selects the VRDP authentication method.</source>
-        <translation type="unfinished"></translation>
+        <translation>Festlegen der VRDP Authentisierungsmethode.</translation>
     </message>
     <message>
         <source>Holds the timeout for guest authentication, in milliseconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt die maximale Zeit für die Anmeldung des Gastes in Millisekunden fest.</translation>
     </message>
     <message>
         <source>When checked, multiple simultaneous connections to the VM are permitted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt fest, ob mehrere gleichzeitige Verbindungen zur VM erlaubt sind.</translation>
     </message>
     <message>
         <source>Holds the filename VirtualBox uses to save the recorded content.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie hier den Namen für die Videoaufzeichnungsdatei an.</translation>
     </message>
     <message>
         <source>Selects the resolution (frame size) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Einstellung legt die Auflösung (Größe eines Bildes) der Videoaufzeichnung fest.</translation>
     </message>
     <message>
         <source>Holds the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Einstellung bestimmt die <b>waagerechte</b> Auflösung (Bildbreite) der Videoaufzeichnung.</translation>
     </message>
     <message>
         <source>Holds the <b>vertical</b> resolution (frame height) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Einstellung bestimmt die <b>waagerechte</b> Auflösung (Bildbreite) der Videoaufzeichnung.</translation>
     </message>
     <message>
         <source>Controls the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Einstellung legt die maximale Anzahl an <b>Bildern pro Sekunde</b> fest. Wird dieser Wert vermindert, so reduziert sich die Dateigröße, aber es werden mehr Bilder übersprungen.</translation>
     </message>
     <message>
         <source>Controls the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie hier die <b>Qualität</b>. Eine bessere Qualität wird durch größere Videoaufzeichnungsdateien erkauft.</translation>
     </message>
     <message>
         <source>Holds the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie hier die Bitrate in <b>Kilobit pro Sekunde</b> an. Größere Werte ergeben eine bessere Qualität auf Kosten größerer Dateien.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es wurden weniger als <b>%1</b> Grafikspeicher für diese VM eingestellt. Um in den Vollbildmodus oder in den nahtlosen Modus schalten zu können, ist dies zu wenig.</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>When checked, enables video recording for screen %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Videoaufzeichnung für Bildschirm %1 aktivieren.</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsGeneral</name>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of disk space.</source>
-        <translation type="obsolete">Zeigt den Pfad an, wo Sicherungspunkte für diese virtuelle Maschine gespeichert werden. Beachten Sie, dass Sicherungspunkte viel Platz beanspruchen können.</translation>
-    </message>
-    <message>
         <source>Basi&c</source>
         <translation>&Basis</translation>
     </message>
@@ -3566,38 +2887,6 @@
         <translation>Zeigt die Beschreibung für diese virtuelle Maschine. Das Beschreibungsfeld kann für Kommentare über die Konfiguration des installierten Gastsystems verwendet werden.</translation>
     </message>
     <message>
-        <source>If checked, any CD/DVD or floppy disks inserted into or removed from the virtual drives while the machine is running will be remembered.</source>
-        <translation type="obsolete">Falls ausgewählt, werden zur Laufzeit zugewiesene CD/DVD- oder Diskettenmedien in den Einstellungen gespeichert, um die Zuweisung über die Laufzeit der VM hinaus beizubehalten.</translation>
-    </message>
-    <message>
-        <source>Removable Media:</source>
-        <translation type="obsolete">Entfernbare Medien:</translation>
-    </message>
-    <message>
-        <source>&Remember Runtime Changes</source>
-        <translation type="obsolete">&gebundene Medien merken</translation>
-    </message>
-    <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Mini-Toolbar:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Falls aktiviert wird die Mini-Toolbar im Vollbildmodus und im nahtlosen Modus gezeigt.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">am &oberen Bildschirmrand zeigen</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">im &Vollbild-/Seamless-Modus zeigen</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Zeigt die Mini-Toolbar am oberen Rand des Bildschirms wenn ausgewählt, sonst am unteren Rand.</translation>
-    </message>
-    <message>
         <source>D&rag'n'Drop:</source>
         <translation>&Drag'n'Drop:</translation>
     </message>
@@ -3630,10 +2919,6 @@
         <translation>Verschlüsselungs-C&hiffre:</translation>
     </message>
     <message>
-        <source>Holds the cipher to be used for encrypting the virtual machine disks.</source>
-        <translation type="obsolete">Chiffre, die zur Verschlüsselung der virtuellen Festplatten benutzt wird.</translation>
-    </message>
-    <message>
         <source>E&nter New Password:</source>
         <translation>Neues Passwort &eingeben:</translation>
     </message>
@@ -3672,48 +2957,24 @@
     </message>
     <message>
         <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiffre, die zur Verschlüsselung der virtuellen Festplatten benutzt wird.</translation>
     </message>
     <message>
         <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt den Pfad an, wo Sicherungspunkte für diese virtuelle Maschine gespeichert werden. Beachten Sie, dass Sicherungspunkte viel Platz beanspruchen können.</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsInterface</name>
     <message>
         <source>Allows to modify VM menu-bar contents.</source>
-        <translation>Ändern der Menüzeile des VM-Fensters.</translation>
-    </message>
-    <message>
-        <source>Screen Scale Factor:</source>
-        <translation type="obsolete">Skalierungsfaktor:</translation>
-    </message>
-    <message>
-        <source>If checked, guest screen contents will not be scaled up to compensate for high host screen resolutions.</source>
-        <translation type="obsolete">Verhindert die Skalierung des Gast-Bildschirminhaltes, die normalerweise für die Anpassung an hohe Auflösung des Host-Bildschirmes vorgenommen wird.</translation>
-    </message>
-    <message>
-        <source>Use &Unscaled HiDPI Output</source>
-        <translation type="obsolete">&Nicht-skalierte HiDPI-Ausgabe</translation>
+        <translation>Ändern der Menüleiste des VM-Fensters.</translation>
     </message>
     <message>
         <source>Mini ToolBar:</source>
         <translation>Mini-Toolbar:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Falls aktiviert wird die Mini-Toolbar im Vollbildmodus und im nahtlosen Modus gezeigt.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">im &Vollbild-/Seamless-Modus zeigen</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Zeigt die Mini-Toolbar am oberen Rand des Bildschirms wenn ausgewählt, sonst am unteren Rand.</translation>
-    </message>
-    <message>
         <source>Show at &Top of Screen</source>
         <translation>am &oberen Bildschirmrand zeigen</translation>
     </message>
@@ -3723,15 +2984,15 @@
     </message>
     <message>
         <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige die Mini-Toolbar im Vollbildmodus und im nahtlosen Modus.</translation>
     </message>
     <message>
         <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
+        <translation>im &Vollbild-/Seamless-Modus zeigen</translation>
     </message>
     <message>
         <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige die Mini-Toolbar am oberen Rand des Bildschirms anstelle der Voreinstellung am unteren Rand des Bildschirms.</translation>
     </message>
 </context>
 <context>
@@ -3758,10 +3019,6 @@
         <translation>&Angeschlossen an:</translation>
     </message>
     <message>
-        <source>Controls how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="obsolete">Legt fest, wie dieser virtuelle Netzwerkadapter an das physische Netzwerk des Host-Betriebssystems angeschlossen ist.</translation>
-    </message>
-    <message>
         <source>&Name:</source>
         <translation>&Name:</translation>
     </message>
@@ -3774,10 +3031,6 @@
         <translation>&Erweitert</translation>
     </message>
     <message>
-        <source>Shows or hides additional network adapter options.</source>
-        <translation type="obsolete">Zeigt oder verdeckt erweiterte Einstellungen für den Netzwerkadapter.</translation>
-    </message>
-    <message>
         <source>Holds the MAC address of this adapter. It contains exactly 12 characters chosen from {0-9,A-F}. Note that the second character must be an even digit.</source>
         <translation>Zeigt die MAC-Adresse dieses Adapters. Sie besteht aus genau 12 Zeichen aus dem Zeichenvorrat {0-9,A-F}. Das zweite Zeichen muss eine gerade Zahl sein.</translation>
     </message>
@@ -3786,18 +3039,10 @@
         <translation>Erzeugt eine neue zufällige MAC-Adresse.</translation>
     </message>
     <message>
-        <source>Indicates whether the virtual network cable is plugged in on machine startup or not.</source>
-        <translation type="obsolete">Zeigt, ob das virtuelle Netzwerkkabel an die virtuelle Maschine angeschlossen ist oder nicht.</translation>
-    </message>
-    <message>
         <source>&Cable Connected</source>
         <translation>&Kabel verbunden</translation>
     </message>
     <message>
-        <source>Opens a window to manage port forwarding rules.</source>
-        <translation type="obsolete">Öffnet den Dialog für Regeln zur Portweiterleitung.</translation>
-    </message>
-    <message>
         <source>&Port Forwarding</source>
         <translation>&Port-Weiterleitung</translation>
     </message>
@@ -3814,10 +3059,6 @@
         <translation>Konfiguration:</translation>
     </message>
     <message>
-        <source>Enter any configuration settings here for the network attachment driver you will be using. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source>
-        <translation type="obsolete">Geben Sie hier Konfigurationseinstellungen für den generischen Treiber an. Diese Einstellungen müssen in der Form <b>Name=Wert</b> angegeben werden. Die möglichen Einstellungen richten sich nach dem Treiber. Benutzen Sie <b>Shift-Enter</b>, um einen neuen Eintrag hinzuzufügen.</translation>
-    </message>
-    <message>
         <source>Selects the network adapter on the host system that traffic to and from this network card will go through.</source>
         <translation>Bezeichnet den Netzwerkadapter auf dem Host, mit dem diese virtuelle Netzwerkkarte verbunden ist.</translation>
     </message>
@@ -3871,23 +3112,23 @@
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt fest, wie dieser virtuelle Netzwerkadapter an das physische Netzwerk des Host-Betriebssystems angeschlossen ist.</translation>
     </message>
     <message>
         <source>Shows additional network adapter options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt erweiterte Einstellungen für den Netzwerkadapter.</translation>
     </message>
     <message>
         <source>Holds the configuration settings for the network attachment driver. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie hier Konfigurationseinstellungen für den generischen Treiber an. Diese Einstellungen müssen in der Form <b>Name=Wert</b> angegeben werden. Die möglichen Einstellungen richten sich nach dem Treiber. Benutzen Sie <b>Shift-Enter</b>, um einen neuen Eintrag hinzuzufügen.</translation>
     </message>
     <message>
         <source>When checked, the virtual network cable is plugged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindet die virtuelle Maschine mit dem virtuellen Netzwerkkabel.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnet den Dialog für Regeln zur Portweiterleitung.</translation>
     </message>
 </context>
 <context>
@@ -3939,46 +3180,23 @@
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">Es wurde kein IRQ angegeben.</translation>
-    </message>
-    <message>
-        <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">Es wurde kein I/O-Port angegeben.</translation>
-    </message>
-    <message>
-        <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">Zwei oder mehr Ports haben identische Einstellungen.</translation>
-    </message>
-    <message>
-        <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Der gleiche Port-Pfad wurde mehrfach zugewiesen.</translation>
-    </message>
-</context>
-<context>
-    <name>UIMachineSettingsParallelPage</name>
-    <message>
-        <source>No IRQ is currently specified.</source>
-        <translation type="obsolete">Es wurde kein IRQ angegeben.</translation>
+        <translation>Es wurde kein IRQ angegeben.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="obsolete">Es wurde kein I/O-Port angegeben.</translation>
+        <translation>Es wurde kein I/O-Port angegeben.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="obsolete">Zwei oder mehr Ports haben identische Einstellungen.</translation>
+        <translation>Zwei oder mehr Ports haben identische Einstellungen.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="obsolete">Es wurde kein Pfad für den Port angegeben.</translation>
+        <translation>Der Port-Pfad wurde nicht angegeben.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="obsolete">Der gleiche Port-Pfad wurde mehrfach zugewiesen.</translation>
+        <translation>Der gleiche Port-Pfad wurde mehrfach zugewiesen.</translation>
     </message>
 </context>
 <context>
@@ -3987,46 +3205,10 @@
         <source>Port Forwarding Rules</source>
         <translation>Regel für Port-Weiterleitung</translation>
     </message>
-    <message>
-        <source>This table contains a list of port forwarding rules.</source>
-        <translation type="obsolete">Diese Tabelle enthält Regeln zur Weiterleitung von IP-Ports.</translation>
-    </message>
-    <message>
-        <source>Insert new rule</source>
-        <translation type="obsolete">Neue Regel hinzufügen</translation>
-    </message>
-    <message>
-        <source>Copy selected rule</source>
-        <translation type="obsolete">Ausgewählte Regel kopieren</translation>
-    </message>
-    <message>
-        <source>Delete selected rule</source>
-        <translation type="obsolete">Ausgewählte Regel entfernen</translation>
-    </message>
-    <message>
-        <source>This button adds new port forwarding rule.</source>
-        <translation type="obsolete">Eine neue Regel für Port-Weiterleitung hinzufügen.</translation>
-    </message>
-    <message>
-        <source>This button deletes selected port forwarding rule.</source>
-        <translation type="obsolete">Die ausgewählte Regel für Port-Weiterleitung entfernen.</translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsSF</name>
     <message>
-        <source>Adds a new shared folder definition.</source>
-        <translation type="obsolete">Fügt einen neuen gemeinsamen Ordner hinzu.</translation>
-    </message>
-    <message>
-        <source>Edits the selected shared folder definition.</source>
-        <translation type="obsolete">Ändert den ausgewählten gemeinsamen Ordner.</translation>
-    </message>
-    <message>
-        <source>Removes the selected shared folder definition.</source>
-        <translation type="obsolete">Entfernt den ausgewählten gemeinsamen Ordner.</translation>
-    </message>
-    <message>
         <source> Machine Folders</source>
         <translation> Ordner der virtuellen Maschine</translation>
     </message>
@@ -4059,18 +3241,6 @@
         <translation>Zugriff</translation>
     </message>
     <message>
-        <source>&Add Shared Folder</source>
-        <translation type="obsolete">Gemeinsamen Ordner &hinzufügen</translation>
-    </message>
-    <message>
-        <source>&Edit Shared Folder</source>
-        <translation type="obsolete">Gemeinsamen Ordner &ändern</translation>
-    </message>
-    <message>
-        <source>&Remove Shared Folder</source>
-        <translation type="obsolete">Gemeinsamen Ordner &löschen</translation>
-    </message>
-    <message>
         <source>&Folders List</source>
         <translation>Ordner&liste</translation>
     </message>
@@ -4084,27 +3254,27 @@
     </message>
     <message>
         <source>Add Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Gemeinsamen Ordner hinzufügen</translation>
     </message>
     <message>
         <source>Edit Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Gemeinsamen Ordner ändern</translation>
     </message>
     <message>
         <source>Remove Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Gemeinsamen Ordner löschen</translation>
     </message>
     <message>
         <source>Adds new shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügt einen neuen Gemeinsamen Ordner hinzu.</translation>
     </message>
     <message>
         <source>Edits selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ändert den ausgewählten Gemeinsamen Ordner.</translation>
     </message>
     <message>
         <source>Removes selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernt den ausgewählten Gemeinsamen Ordner.</translation>
     </message>
 </context>
 <context>
@@ -4118,10 +3288,6 @@
         <translation>Ordner ändern</translation>
     </message>
     <message>
-        <source>Dialog</source>
-        <translation type="obsolete">Dialog</translation>
-    </message>
-    <message>
         <source>Folder Path:</source>
         <translation>Ordner-Pfad:</translation>
     </message>
@@ -4154,12 +3320,8 @@
         <translation>&Automatisch einbinden</translation>
     </message>
     <message>
-        <source>If checked, this shared folder will be permanent.</source>
-        <translation type="obsolete">Falls aktiviert wird die Änderung permanent.</translation>
-    </message>
-    <message>
         <source>When checked, this shared folder will be permanent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Falls aktiviert wird der Gemeinsame Ordner permanent eingerichtet.</translation>
     </message>
 </context>
 <context>
@@ -4198,26 +3360,6 @@
         <translation>Port&modus:</translation>
     </message>
     <message>
-        <source>Controls the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="obsolete">Stellt den Modus für diese serielle Schnittstelle ein. Falls <b>nicht verbunden</b> gewählt wurde, wird ein serieller Port virtualisiert, der jedoch nicht mit dem Host verbunden ist.</translation>
-    </message>
-    <message>
-        <source>If checked, the pipe specified in the <b>Port Path</b> field will be created by the virtual machine when it starts. Otherwise, the virtual machine will assume that the pipe exists and try to use it.</source>
-        <translation type="obsolete">Wenn diese Box ausgewählt wurde, dann wird die Pipe im <b>Portpfad</b> von der virtuellen Maschine erzeugt, wenn diese startet. Anderenfalls versucht die virtuelle Maschine, sich an eine vorhandene Pipe zu anzuschließen.</translation>
-    </message>
-    <message>
-        <source>&Create Pipe</source>
-        <translation type="obsolete">Erzeuge &Pipe</translation>
-    </message>
-    <message>
-        <source>Holds the path to the serial port's pipe on the host when the port is working in <b>Host Pipe</b> mode, or the host serial device name when the port is working in <b>Host Device</b> mode.</source>
-        <translation type="obsolete">Zeigt den Pfad zur seriellen Port-Pipe des Hostes wenn der Port im Modus <b>Host-Pipe</b> arbeitet oder den Namen der seriellen Schnittstelle des Hostes im Modus <b>Host-Schnittstelle</b>.</translation>
-    </message>
-    <message>
-        <source>Port/File &Path:</source>
-        <translation type="obsolete">Port/Datei-&Pfad:</translation>
-    </message>
-    <message>
         <source>Holds the IRQ number of this serial port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> setting is enabled for this virtual machine.</source>
         <translation>Zeigt die IRQ-Nummer dieser seriellen Schnittstelle. Gültige Werte sind ganze Zahlen im Bereich von <tt>0</tt> bis <tt>255</tt>. Zahlen größer als <tt>15</tt> können nur verwendet werden, wenn der <b>I/O-APIC</b> für diese virtuelle Maschine aktiviert ist.</translation>
     </message>
@@ -4235,58 +3377,35 @@
     </message>
     <message>
         <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Modus <b>Host-Pipe</b>: Enthält den Pfad zur Pipe auf dem Host. Beispiel: "\\.\pipe\myvbox" (Windows) oder "/tmp/myvbox" (UNIX).</p><p>Modus <b>Host-Schnittstelle</b>: Enthält den Grätenamen der seriellen Schnittstelle am Host. Beispiel: "COM1" (Windows) oder "/dev/ttyS0" (UNIX).</p><p>Modus <b>Datei</b>: Enthält den Pfad der Datei, in welche die Ausgabe der s [...]
     </message>
     <message>
         <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Stellt den Modus für diese serielle Schnittstelle ein. Falls <b>nicht verbunden</b> gewählt wurde, wird ein serieller Port emuliert, der jedoch nicht mit dem Host verbunden ist.</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">Es wurde kein IRQ angegeben.</translation>
-    </message>
-    <message>
-        <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">Es wurde kein I/O-Port angegeben.</translation>
+        <translation>Wenn diese Box aktiviert wurde, dann versucht die virtuelle Maschine, sich mit der in <b>Pfad/Adresse</b> angegebenen Pipe zu verbinden. Anderenfalls wird die Pipe beim Start der virtuellen Maschine erzeugt.</translation>
     </message>
     <message>
-        <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">Zwei oder mehr Ports haben identische Einstellungen.</translation>
-    </message>
-    <message>
-        <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Der gleiche Port-Pfad wurde mehrfach zugewiesen.</translation>
-    </message>
-</context>
-<context>
-    <name>UIMachineSettingsSerialPage</name>
-    <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="obsolete">Es wurde kein IRQ angegeben.</translation>
+        <translation>Es wurde kein IRQ angegeben.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="obsolete">Es wurde kein I/O-Port angegeben.</translation>
+        <translation>Es wurde kein I/O-Port angegeben.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="obsolete">Zwei oder mehr Ports haben identische Einstellungen.</translation>
+        <translation>Zwei oder mehr Ports haben identische Einstellungen.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="obsolete">Der Port-Pfad wurde nicht angegeben.</translation>
+        <translation>Der Port-Pfad wurde nicht angegeben.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="obsolete">Der gleiche Port-Pfad wurde mehrfach zugewiesen.</translation>
+        <translation>Der gleiche Port-Pfad wurde mehrfach zugewiesen.</translation>
     </message>
 </context>
 <context>
@@ -4296,22 +3415,6 @@
         <translation><nobr><b>%1</b></nobr><br><nobr>Bus:&nbsp;&nbsp;%2</nobr><br><nobr>Typ:&nbsp;&nbsp;%3</nobr></translation>
     </message>
     <message>
-        <source><nobr>Expand/Collapse&nbsp;Item</nobr></source>
-        <translation type="obsolete"><nobr>Eintrag&nbsp;auf-/zuklappen</nobr></translation>
-    </message>
-    <message>
-        <source><nobr>Add&nbsp;Hard&nbsp;Disk</nobr></source>
-        <translation type="obsolete"><nobr>Festplatte hinzufügen</nobr></translation>
-    </message>
-    <message>
-        <source><nobr>Add&nbsp;CD/DVD&nbsp;Device</nobr></source>
-        <translation type="obsolete"><nobr>CD/DVD-Laufwerk hinzufügen</nobr></translation>
-    </message>
-    <message>
-        <source><nobr>Add&nbsp;Floppy&nbsp;Device</nobr></source>
-        <translation type="obsolete"><nobr>Diskettenlaufwerk hinzufügen</nobr></translation>
-    </message>
-    <message>
         <source>Add Controller</source>
         <translation>Controller hinzufügen</translation>
     </message>
@@ -4344,34 +3447,10 @@
         <translation>Festplatte hinzufügen</translation>
     </message>
     <message>
-        <source>Add CD/DVD Device</source>
-        <translation type="obsolete">CD/DVD-Laufwerk hinzufügen</translation>
-    </message>
-    <message>
-        <source>Add Floppy Device</source>
-        <translation type="obsolete">Diskettenlaufwerk hinzufügen</translation>
-    </message>
-    <message>
         <source>Remove Attachment</source>
         <translation>Anschluss entfernen</translation>
     </message>
     <message>
-        <source>Adds a new controller to the end of the Storage Tree.</source>
-        <translation type="obsolete">Fügt einen neuen Controller hinzu.</translation>
-    </message>
-    <message>
-        <source>Removes the controller highlighted in the Storage Tree.</source>
-        <translation type="obsolete">Entfernt den ausgewählten Controller.</translation>
-    </message>
-    <message>
-        <source>Adds a new attachment to the Storage Tree using currently selected controller as parent.</source>
-        <translation type="obsolete">Fügt einen neuen Anschluss für den ausgewählten Controller hinzu.</translation>
-    </message>
-    <message>
-        <source>Removes the attachment highlighted in the Storage Tree.</source>
-        <translation type="obsolete">Entfernt den ausgewählten Anschluss.</translation>
-    </message>
-    <message>
         <source>Hard &Disk:</source>
         <translation>&Festplatte:</translation>
     </message>
@@ -4380,10 +3459,6 @@
         <translation>&Massenspeicher</translation>
     </message>
     <message>
-        <source>Contains all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="obsolete">Zeigt alle Controller für Massenspeicher dieser Maschine sowie die angeschlossenen Abbilder bzw. Host-Laufwerke.</translation>
-    </message>
-    <message>
         <source>Information</source>
         <translation>Informationen</translation>
     </message>
@@ -4400,10 +3475,6 @@
         <translation>&Name:</translation>
     </message>
     <message>
-        <source>Changes the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="obsolete">Ändert den Namen des aktuell ausgewählten Controllers.</translation>
-    </message>
-    <message>
         <source>&Type:</source>
         <translation>&Typ:</translation>
     </message>
@@ -4452,10 +3523,6 @@
         <translation>SAS-Controller hinzufügen</translation>
     </message>
     <message>
-        <source>Allows to use host I/O caching capabilities.</source>
-        <translation type="obsolete">Benutze den Host-I/O-Cache.</translation>
-    </message>
-    <message>
         <source>Use Host I/O Cache</source>
         <translation>Host I/O-Cache verwenden</translation>
     </message>
@@ -4468,28 +3535,8 @@
         <translation>Hostlaufwerk</translation>
     </message>
     <message>
-        <source>Image</source>
-        <translation type="obsolete">Datei</translation>
-    </message>
-    <message>
         <source>Choose or create a virtual hard disk file. The virtual machine will see the data in the file as the contents of the virtual hard disk.</source>
-        <translation>Wählen Sie ein virtuelles Festplattenabbild. Der Gast kann auf die Daten dieser Datei als virtuelle Festplatte zugreifen.</translation>
-    </message>
-    <message>
-        <source>Set up the virtual hard disk</source>
-        <translation type="obsolete">Virtuelle Festplatte aufsetzen</translation>
-    </message>
-    <message>
-        <source>CD/DVD &Drive:</source>
-        <translation type="obsolete">CD/DVD-&Laufwerk:</translation>
-    </message>
-    <message>
-        <source>Choose a virtual CD/DVD disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation type="obsolete">Wählen Sie ein virtuelles CD/DVD-Abbild oder ein physisches Laufwerk am Host aus. Der Gast kann auf diese Daten als Medium im virtuellen Laufwerk zugreifen.</translation>
-    </message>
-    <message>
-        <source>Set up the virtual CD/DVD drive</source>
-        <translation type="obsolete">Virtuelles CD/DVD-Laufwerk aufsetzen</translation>
+        <translation>Wählen Sie ein Festplattenabbild. Der Gast kann auf die Daten dieser Datei als virtuelle Festplatte zugreifen.</translation>
     </message>
     <message>
         <source>Floppy &Drive:</source>
@@ -4497,45 +3544,17 @@
     </message>
     <message>
         <source>Choose a virtual floppy disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation>Wählen Sie ein virtuelles Diskettenabbild oder ein physisches Diskettenlaufwerk aus. Der Gast kann auf diese Daten als Medium im virtuellen Laufwerk zugreifen.</translation>
-    </message>
-    <message>
-        <source>Set up the virtual floppy drive</source>
-        <translation type="obsolete">Virtuelle Diskette aufsetzen</translation>
-    </message>
-    <message>
-        <source>Create a new hard disk...</source>
-        <translation type="obsolete">Neue Festplatte erzeugen...</translation>
-    </message>
-    <message>
-        <source>Choose a virtual hard disk file...</source>
-        <translation type="obsolete">Datei für virtuelle Festplatte auswählen...</translation>
-    </message>
-    <message>
-        <source>Choose a virtual CD/DVD disk file...</source>
-        <translation type="obsolete">Datei für virtuelles CD/DVD-Medium auswählen...</translation>
+        <translation>Wählen Sie ein Diskettenabbild oder ein physisches Diskettenlaufwerk aus. Der Gast kann auf diese Daten als Medium im virtuellen Laufwerk zugreifen.</translation>
     </message>
     <message>
         <source>Remove disk from virtual drive</source>
         <translation>Medium entfernen</translation>
     </message>
     <message>
-        <source>Choose a virtual floppy disk file...</source>
-        <translation type="obsolete">Datei für virtuelle Diskette auswählen...</translation>
-    </message>
-    <message>
-        <source>When checked the virtual disk will not be removed when the guest system ejects it.</source>
-        <translation type="obsolete">Unterdrückt das Auswerfen des Mediums durch den Gast.</translation>
-    </message>
-    <message>
         <source>&Live CD/DVD</source>
         <translation>&Live-CD/DVD</translation>
     </message>
     <message>
-        <source>When checked the guest system will see the virtual disk as a solid state device.</source>
-        <translation type="obsolete">Markiert das Medium als nicht rotierbaren Speicher (SSD).</translation>
-    </message>
-    <message>
         <source>&Solid-state Drive</source>
         <translation>&SSD-Laufwerk</translation>
     </message>
@@ -4590,26 +3609,10 @@
         <translation>USB-Controller hinzufügen</translation>
     </message>
     <message>
-        <source>When checked the guest system will see the virtual disk as a hot-pluggable device.</source>
-        <translation type="obsolete">Bei Aktivierung wird diese virtuelle Platte als hot-pluggable markiert.</translation>
-    </message>
-    <message>
         <source>&Hot-pluggable</source>
         <translation>&Hotplug-fähig</translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk file...</source>
-        <translation type="obsolete">Wählen Sie ein virtuelles optisches Medium...</translation>
-    </message>
-    <message>
-        <source><nobr>Add&nbsp;Optical&nbsp;Drive</nobr></source>
-        <translation type="obsolete"><nobr>Optisches&nbsp;Laufwerk&nbsp;hinzufügen</nobr></translation>
-    </message>
-    <message>
-        <source><nobr>Add&nbsp;Floppy&nbsp;Drive</nobr></source>
-        <translation type="obsolete"><nobr>Floppy-Laufwerk hinzufügen</nobr></translation>
-    </message>
-    <message>
         <source>Add Optical Drive</source>
         <translation>Optisches Laufwerk hinzufügen</translation>
     </message>
@@ -4623,11 +3626,7 @@
     </message>
     <message>
         <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation>Wählen Sie ein virtuelles Abbild eines optischen Mediums oder ein physisches Laufwerk am Host aus. Der Gast kann auf diese Daten als Medium im virtuellen Laufwerk zugreifen.</translation>
-    </message>
-    <message>
-        <source>Set up the virtual optical drive</source>
-        <translation type="obsolete">Virtuelles optisches Laufwerk aufsetzen</translation>
+        <translation>Wählen Sie ein Abbild eines optischen Mediums oder ein physisches Laufwerk am Host aus. Der Gast kann auf diese Daten als Medium im virtuellen Laufwerk zugreifen.</translation>
     </message>
     <message>
         <source>Encrypted with key:</source>
@@ -4635,97 +3634,94 @@
     </message>
     <message>
         <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt alle Controller für Massenspeicher dieser Maschine sowie die angeschlossenen Abbilder bzw. Host-Laufwerke.</translation>
     </message>
     <message>
         <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ändert den Namen des aktuell ausgewählten Controllers.</translation>
     </message>
     <message>
         <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutze den Host-I/O-Cache.</translation>
     </message>
     <message>
         <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterdrückt das Auswerfen des Mediums durch den Gast.</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Markiert das Medium als nicht rotierbaren Speicher (SSD).</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Markiert diese virtuelle Platte als hot-pluggable.</translation>
     </message>
     <message>
         <source>Image</source>
         <comment>storage image</comment>
-        <translation type="unfinished">Datei</translation>
+        <translation>Datei</translation>
     </message>
     <message>
         <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Eintrag&nbsp;auf-/zuklappen.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Festplatte hinzufügen.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Optisches&nbsp;Laufwerk&nbsp;hinzufügen.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Floppy-Laufwerk hinzufügen.</nobr></translation>
     </message>
     <message>
         <source>Adds new storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügt einen neuen Controller für Massenspeicher hinzu.</translation>
     </message>
     <message>
         <source>Removes selected storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernt den ausgewählten Controller für Massenspeicher.</translation>
     </message>
     <message>
         <source>Adds new storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügt ein neues Massenspeichergerät hinzu.</translation>
     </message>
     <message>
         <source>Removes selected storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernt das ausgewählt Massenspeichergerät.</translation>
     </message>
     <message>
         <source>Create New Hard Disk...</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Festplatte erzeugen...</translation>
     </message>
     <message>
         <source>Choose Virtual Hard Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei für virtuelle Festplatte auswählen...</translation>
     </message>
     <message>
         <source>Choose Virtual Optical Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei für optisches Medium auswählen...</translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
-        <translation type="unfinished"></translation>
+        <source>Remove Disk from Virtual Drive</source>
+        <translation>Entfernt das virtuelle Medium aus dem Laufwerk</translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei für virtuelle Diskette auswählen...</translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation>Abbild auswählen...</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsSystem</name>
     <message>
-        <source><qt>%1&nbsp;MB</qt></source>
-        <translation type="obsolete"><qt>%1&nbsp;MB</qt></translation>
-    </message>
-    <message>
         <source>&Motherboard</source>
         <translation>&Hauptplatine</translation>
     </message>
@@ -4750,18 +3746,10 @@
         <translation>Legt die Bootreihenfolge fest. Mittels der Checkboxen auf der linken Seite können Geräte aktiviert bzw. deaktiviert werden. Durch Auf- bzw. Abwärtsbewegen der Einträge wird die Bootreihenfolge geändert.</translation>
     </message>
     <message>
-        <source>Move Down (Ctrl-Down)</source>
-        <translation type="obsolete">Abwärts (Strg+Ab)</translation>
-    </message>
-    <message>
         <source>Moves the selected boot device down.</source>
         <translation>Bewegt das ausgewählte Gerät weiter nach unten und verringert damit dessen Priorität in der Bootreihenfolge.</translation>
     </message>
     <message>
-        <source>Move Up (Ctrl-Up)</source>
-        <translation type="obsolete">Aufwärts (Strg+Auf)</translation>
-    </message>
-    <message>
         <source>Moves the selected boot device up.</source>
         <translation>Bewegt das ausgewählte Gerät weiter nach oben und erhöht damit dessen Priorität in der Bootreihenfolge.</translation>
     </message>
@@ -4818,11 +3806,6 @@
         <translation>Nested P&aging aktivieren</translation>
     </message>
     <message>
-        <source><qt>%1&nbsp;CPUs</qt></source>
-        <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="obsolete"><qt>%1&nbsp;CPUs</qt></translation>
-    </message>
-    <message>
         <source>When checked, the guest will support the Extended Firmware Interface (EFI), which is required to boot certain guest OSes. Non-EFI aware OSes will not be able to boot if this option is activated.</source>
         <translation>Aktiviert das Extended Firmware Interface (EFI), das zum Booten von manchen speziellen Gästen benötigt wird. Nicht-EFI-fähige Gäste können nicht booten, wenn diese Option aktiviert ist.</translation>
     </message>
@@ -4831,10 +3814,6 @@
         <translation>&EFI aktivieren (nur spezielle Gäste)</translation>
     </message>
     <message>
-        <source>If checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="obsolete">Durch Aktivierung wird die virtuelle Echtzeituhr die Uhrzeit in UTC bereitstellen, anderenfalls in lokaler (Host-)Zeit. Unix-Gäste erwarten die Zeit normalerweise in UTC.</translation>
-    </message>
-    <message>
         <source>Hardware Clock in &UTC Time</source>
         <translation>Hardware-Uhr in &UTC</translation>
     </message>
@@ -4875,14 +3854,6 @@
         <translation>Mehr als <b>%1%</b> des Hauptspeichers des Hosts (<b>%2</b>) wurden der virtuellen Maschine zugewiesen. Damit bleibt möglicherweise nicht genügend Speicher für das Host-Betriebssystem. Bitte wählen ggf. Sie einen kleineren Wert.</translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9. It will be done automatically if you confirm your changes.</source>
-        <translation type="obsolete">Der I/O-APIC wurde in den System-Einstellungen nicht aktiviert. Der ICH9-Chipsatz erfordert die Emulation von I/O-APICs. Diese Einstellung wird daher beim Bestätigen automatisch aktiviert.</translation>
-    </message>
-    <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device. It will be done automatically if you confirm your changes.</source>
-        <translation type="obsolete">Die USB-Controller-Emulation wurde nicht aktiviert. Ein USB-Controller wird für das USB-Zeigergerät benötigt. Diese Einstellung wird daher beim Bestätigen automatisch aktiviert.</translation>
-    </message>
-    <message>
         <source>For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
         <translation>Die Anzahl der virtuellen CPUs einer virtuellen Maschine darf nicht größer sein als die doppelte Anzahl der tatsächlich vorhandenen CPU-Kerne auf dem Host (<b>%1</b>). Bitte verringern Sie die Anzahl der virtuellen CPUs.</translation>
     </message>
@@ -4891,14 +3862,6 @@
         <translation>Die Anzahl der virtuellen CPUs der virtuellen Maschine sollte nicht größer sein als die Anzahl der tatsächlich vorhandenen CPU-Kerne auf dem Host (<b>%1</b>). Bitte verringern Sie die ggf. Anzahl der virtuellen CPUs.</translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
-        <translation type="obsolete">Der I/O-APIC ist in den Systemeinstellungen deaktiviert. Für Multi-CPU-Gäste ist ein I/O-APIC erforderlich. Diese Einstellung wird daher beim Bestätigen automatisch aktiviert.</translation>
-    </message>
-    <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
-        <translation type="obsolete">Hardware-Virtualisierung ist in den Systemeinstellungen deaktiviert. Für Multi-CPU-Gäste muss diese Einstellung aber aktiviert sein. Diese Einstellung wird daher beim Bestätigen automatisch aktiviert.</translation>
-    </message>
-    <message>
         <source>The processor execution cap is set to a low value. This may make the machine feel slow to respond.</source>
         <translation>Die CPU-Ausführungsbegrenzung wurde auf einen sehr niedrigen Wert gesetzt. Dadurch wird die virtuelle Maschine wahrscheinlich spürbar schlechter reagieren.</translation>
     </message>
@@ -4928,82 +3891,34 @@
     </message>
     <message>
         <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Durch Aktivierung wird die virtuelle Echtzeituhr die Uhrzeit in UTC bereitstellen, anderenfalls in lokaler (Host-)Zeit. Unix-Gäste erwarten die Zeit normalerweise in UTC.</translation>
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1 CPU</source>
         <comment>%1 is 1 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>%1 CPUs</source>
         <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsUSB</name>
     <message>
-        <source>&Add Empty Filter</source>
-        <translation type="obsolete">&Leeren Filter hinzufügen</translation>
-    </message>
-    <message>
-        <source>A&dd Filter From Device</source>
-        <translation type="obsolete">Filter von einem Gerät &hinzufügen</translation>
-    </message>
-    <message>
-        <source>&Edit Filter</source>
-        <translation type="obsolete">Filter &ändern</translation>
-    </message>
-    <message>
-        <source>&Remove Filter</source>
-        <translation type="obsolete">Filter &entfernen</translation>
-    </message>
-    <message>
-        <source>&Move Filter Up</source>
-        <translation type="obsolete">Bewege Filter nach &oben</translation>
-    </message>
-    <message>
-        <source>M&ove Filter Down</source>
-        <translation type="obsolete">Bewege Filter nach &unten</translation>
-    </message>
-    <message>
-        <source>Adds a new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="obsolete">Fügt einen neuen USB-Filter hinzu, bei dem alle Felder leer sind. Beachten Sie, dass solch ein Filter auf angeschlossene USB-Geräte passt.</translation>
-    </message>
-    <message>
-        <source>Adds a new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="obsolete">Fügt einen neuen USB-Filter hinzu und initialisiert alle Felder mit den Werten des ausgewählten Gerätes, das an den PC angeschlossen ist.</translation>
-    </message>
-    <message>
-        <source>Edits the selected USB filter.</source>
-        <translation type="obsolete">Ändert den ausgewählten USB-Filter.</translation>
-    </message>
-    <message>
-        <source>Removes the selected USB filter.</source>
-        <translation type="obsolete">Entfernt den ausgewählten USB-Filter.</translation>
-    </message>
-    <message>
-        <source>Moves the selected USB filter up.</source>
-        <translation type="obsolete">Bewegt den ausgewählten USB-Filter nach oben.</translation>
-    </message>
-    <message>
-        <source>Moves the selected USB filter down.</source>
-        <translation type="obsolete">Bewegt den ausgewählten USB-Filter nach unten.</translation>
-    </message>
-    <message>
         <source>New Filter %1</source>
         <comment>usb</comment>
         <translation>Neuer Filter %1</translation>
@@ -5014,15 +3929,7 @@
     </message>
     <message>
         <source>Enable &USB Controller</source>
-        <translation>&USB-Controller aktivieren</translation>
-    </message>
-    <message>
-        <source>When checked, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
-        <translation type="obsolete">Aktiviert den virtuellen USB-EHCI-Controller für diese Maschine und damit USB-2.0-Unterstützung.</translation>
-    </message>
-    <message>
-        <source>Enable USB 2.0 (E&HCI) Controller</source>
-        <translation type="obsolete">USB-&2.0-Controller aktivieren</translation>
+        <translation>&USB-Controller aktivieren</translation>
     </message>
     <message>
         <source>USB Device &Filters</source>
@@ -5077,10 +3984,6 @@
         <translation><nobr>Zustand: %1</nobr></translation>
     </message>
     <message>
-        <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0 to be able to start the machine.</source>
-        <translation type="obsolete">USB-2.0-Unterstützung wurde für diese virtuelle Maschine aktiviert. Dafür ist allerdings die Installation des <b>%1</b> notwendig. Bitte installieren Sie dieses Zusatzpaket von der VirtualBox-Webseite oder deaktivieren Sie die USB-2.0-Unterstützung zum Starten der Maschine.</translation>
-    </message>
-    <message>
         <source>USB &1.1 (OHCI) Controller</source>
         <translation>USB-&1.1-Controller (OHCI)</translation>
     </message>
@@ -5089,10 +3992,6 @@
         <translation>USB-&2.0-Controller (EHCI)</translation>
     </message>
     <message>
-        <source>When checked, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
-        <translation type="obsolete">Aktiviert den virtuellen xHCI-USB-Controller. Dieser implementiert Unterstützung für USB-3.0-Geräte.</translation>
-    </message>
-    <message>
         <source>USB &3.0 (xHCI) Controller</source>
         <translation>USB-&3.0-Controller (xHCI)</translation>
     </message>
@@ -5102,63 +4001,63 @@
     </message>
     <message>
         <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählt den virtuellen OHCI-Controller für USB-1.0-Unterstützung für diese virtuelle Maschine aus.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählt den virtuellen EHCI-Controller für USB-2.0-Unterstützung für diese virtuelle Maschine aus.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählt den virtuellen xHCI-Controller für USB-3.0-Unterstützung für diese virtuelle Maschine aus.</translation>
     </message>
     <message>
         <source>Add Empty Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Leeren Filter hinzufügen</translation>
     </message>
     <message>
         <source>Add Filter From Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Filter von einem Gerät hinzufügen</translation>
     </message>
     <message>
         <source>Edit Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Filter ändern</translation>
     </message>
     <message>
         <source>Remove Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Filter entfernen</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Bewege Filter nach oben</translation>
     </message>
     <message>
         <source>Move Filter Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Bewege Filter nach unten</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügt einen neuen USB-Filter hinzu, bei dem alle Felder leer sind. Beachten Sie, dass solch ein Filter auf alle angeschlossenen USB-Geräte passt.</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügt einen neuen USB-Filter hinzu und initialisiert alle Felder mit den Werten des ausgewählten Gerätes, das an den PC angeschlossen ist.</translation>
     </message>
     <message>
         <source>Edits selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ändert den ausgewählten USB-Filter.</translation>
     </message>
     <message>
         <source>Removes selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernt den ausgewählten USB-Filter.</translation>
     </message>
     <message>
         <source>Moves selected USB filter up.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bewegt den ausgewählten USB-Filter nach oben.</translation>
     </message>
     <message>
         <source>Moves selected USB filter down.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bewegt den ausgewählten USB-Filter nach unten.</translation>
     </message>
 </context>
 <context>
@@ -5191,100 +4090,68 @@
         <translation>&Hersteller-ID:</translation>
     </message>
     <message>
-        <source>Defines the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="obsolete">Legt die Hersteller-ID für den Filter fest. Das Format für den <i>genauen</i> Vergleich ist <tt>XXXX</tt>, wobei <tt>X</tt> eine hexadezimale Zahl darstellt. Eine leere Zeichenfolge passt auf beliebige IDs.</translation>
-    </message>
-    <message>
         <source>&Product ID:</source>
         <translation>&Produkt-ID:</translation>
     </message>
     <message>
-        <source>Defines the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="obsolete">Legt die Produkt-ID für den Filter fest. Das Format für den <i>genauen</i> Vergleich ist <tt>XXXX</tt>, wobei <tt>X</tt> eine hexadezimale Zahl darstellt. Eine leere Zeichenfolge passt auf beliebige IDs.</translation>
-    </message>
-    <message>
         <source>&Revision:</source>
         <translation>&Revisions-Nr:</translation>
     </message>
     <message>
-        <source>Defines the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation type="obsolete">Legt die Revisions-Nr für den Filter fest. Das Format für den <i>genauen</i> Vergleich ist <tt>XXXX</tt>, wobei <tt>X</tt> eine hexadezimale Zahl darstellt. Eine leere Zeichenfolge passt auf beliebige IDs.</translation>
-    </message>
-    <message>
         <source>&Manufacturer:</source>
         <translation>&Hersteller:</translation>
     </message>
     <message>
-        <source>Defines the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">Verwendet den Hersteller als <i>exakte</i> Zeichenfolge. Eine leere Zeichenfolge passt auf beliebige Hersteller.</translation>
-    </message>
-    <message>
         <source>Pro&duct:</source>
         <translation>&Produkt:</translation>
     </message>
     <message>
-        <source>Defines the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">Verwendet den Produktnamen als <i>exakte</i> Zeichenfolge. Eine leere Zeichenfolge passt auf beliebige Produktnamen.</translation>
-    </message>
-    <message>
         <source>&Serial No.:</source>
         <translation>&Seriennr.:</translation>
     </message>
     <message>
-        <source>Defines the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">Verwendet die Seriennummer als <i>exakte</i> Zeichenfolge. Eine leere Zeichenfolge passt auf alle Seriennummern.</translation>
-    </message>
-    <message>
         <source>Por&t:</source>
         <translation>&Port:</translation>
     </message>
     <message>
-        <source>Defines the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">Legt den USB-Port für den Filter fest mit <i>genauer</i> Übereinstimmung fest. Eine leere Zeichenfolge passt auf beliebig Ports.</translation>
-    </message>
-    <message>
         <source>R&emote:</source>
         <translation>&Fernzugriff:</translation>
     </message>
     <message>
-        <source>Defines whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
-        <translation type="obsolete">Legt fest, ob dieser Filter auf USB-Geräte angewendet wird, die nur lokal an den Hostcomputer angeschlossen sind (<i>Nein</i>), nur an einen entfernten Computer über VRDP (<i>Ja</i>) oder beides (<i>Beides</i>).</translation>
-    </message>
-    <message>
         <source>USB Filter Details</source>
         <translation>Filter für USB-Geräte</translation>
     </message>
     <message>
         <source>Holds the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt die Hersteller-ID für den Filter fest. Das Format für den <i>genauen</i> Vergleich ist <tt>XXXX</tt>, wobei <tt>X</tt> eine hexadezimale Zahl darstellt. Eine leere Zeichenfolge passt auf beliebige IDs.</translation>
     </message>
     <message>
         <source>Holds the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt die Produkt-ID für den Filter fest. Das Format für den <i>genauen</i> Vergleich ist <tt>XXXX</tt>, wobei <tt>X</tt> eine hexadezimale Zahl darstellt. Eine leere Zeichenfolge passt auf beliebige IDs.</translation>
     </message>
     <message>
         <source>Holds the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt die Revisions-Nr für den Filter fest. Das Format für den <i>genauen</i> Vergleich ist <tt>XXXX</tt>, wobei <tt>X</tt> eine hexadezimale Zahl darstellt. Eine leere Zeichenfolge passt auf beliebige IDs.</translation>
     </message>
     <message>
         <source>Holds the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwendet den Hersteller als <i>exakte</i> Zeichenfolge. Eine leere Zeichenfolge passt auf beliebige Hersteller.</translation>
     </message>
     <message>
         <source>Holds the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwendet den Produktnamen als <i>exakte</i> Zeichenfolge. Eine leere Zeichenfolge passt auf beliebige Produktnamen.</translation>
     </message>
     <message>
         <source>Holds the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwendet den Hersteller als <i>exakte</i> Zeichenfolge. Eine leere Zeichenfolge passt auf beliebige Hersteller.</translation>
     </message>
     <message>
         <source>Holds the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt den USB-Port für den Filter fest mit <i>genauer</i> Übereinstimmung fest. Eine leere Zeichenfolge passt auf beliebig Ports.</translation>
     </message>
     <message>
         <source>Holds whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt fest, ob dieser Filter auf USB-Geräte angewendet wird, die nur lokal an den Hostcomputer angeschlossen sind (<i>Nein</i>), nur an einen entfernten Computer über VRDP (<i>Ja</i>) oder beides (<i>Beides</i>).</translation>
     </message>
 </context>
 <context>
@@ -5304,10 +4171,6 @@
 <context>
     <name>UIMediumManager</name>
     <message>
-        <source>&Hard drives</source>
-        <translation type="obsolete">&Festplatten</translation>
-    </message>
-    <message>
         <source>&Optical disks</source>
         <translation>&Optische Medien</translation>
     </message>
@@ -5316,16 +4179,12 @@
         <translation>&Disketten</translation>
     </message>
     <message>
-        <source>C&lose</source>
-        <translation type="obsolete">&Schließen</translation>
-    </message>
-    <message>
         <source>Removing medium...</source>
         <translation>Entferne Medium...</translation>
     </message>
     <message>
         <source>&Hard disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Festplatten</translation>
     </message>
 </context>
 <context>
@@ -5363,7 +4222,7 @@
     </message>
     <message>
         <source>Enable Menu Bar</source>
-        <translation>Menüzeile anzeigen</translation>
+        <translation>Menüleiste anzeigen</translation>
     </message>
 </context>
 <context>
@@ -5415,10 +4274,6 @@
         <translation><p>Die COM-Schnittstelle konnte nicht initialisiert werden oder der COM-Server wurde nicht gefunden. Möglicherweise ist der VirtualBox-Server nicht gestartet.</p><p>Die Anwendung wird nun geschlossen.</p></translation>
     </message>
     <message>
-        <source><p>Failed to create the VirtualBox COM object.</p><p>The application will now terminate.</p></source>
-        <translation type="obsolete"><p>Das COM-Objekt für VirtualBox konnte nicht erzeugt werden.</p><p>Die Anwendung wird nun beendet.</p></translation>
-    </message>
-    <message>
         <source>Failed to set global VirtualBox properties.</source>
         <translation>Die globalen Eigenschaften konnten nicht definiert werden.</translation>
     </message>
@@ -5569,10 +4424,6 @@
         <translation>Callee&nbsp;RC:</translation>
     </message>
     <message>
-        <source><p>The virtual machine window is optimized to work in <b>%1&nbsp;bit</b> color mode but the virtual display is currently set to <b>%2&nbsp;bit</b>.</p><p>Please open the display properties dialog of the guest OS and select a <b>%3&nbsp;bit</b> color mode, if it is available, for best possible performance of the virtual video subsystem.</p><p><b>Note</b>. Some operating systems, like  [...]
-        <translation type="obsolete"><p>Das Fenster der virtuellen Maschine ist optimiert für eine Anzeige im <b>%1-Bit</b>-Farbmodus, der aktuelle Modus des virtuellen Bildschirms ist aber auf <b>%2-&nbsp;Bit</b> gesetzt.</p><p>Bitte öffnen Sie die Einstellungen für die Anzeige im Gast und wählen Sie den <b>%3-Bit</b>-Farbmodus, falls verfügbar, um die beste Performance der Anzeige zu erreichen.</p><p><b>Beachte [...]
-    </message>
-    <message>
         <source>Failed to open the license file <nobr><b>%1</b></nobr>. Check file permissions.</source>
         <translation>Die Lizenzdatei <nobr><b>%1</b></nobr> konnte nicht geöffnet werden. Bitte überprüfen Sie die Zugriffsrechte.</translation>
     </message>
@@ -5586,11 +4437,6 @@
         <translation>Verwerfen</translation>
     </message>
     <message>
-        <source>Mount</source>
-        <comment>additions</comment>
-        <translation type="obsolete">Einbinden</translation>
-    </message>
-    <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
         <comment>additional message box paragraph</comment>
         <translation><p>Die Host-Taste ist momentan auf <b>%1</b> eingestellt.</p></translation>
@@ -5637,10 +4483,6 @@
         <translation><p>Der nahtlose Modus konnte nicht aktiviert werden, weil dem Gast zu wenig Grafikspeicher zugewiesen wurde.</p><p>Sie sollten der VM mindestens <b>%1</b> Grafikspeicher zur Verfügung stellen.</p></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to fullscreen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to fullscreen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="obsolete"><p>Der Vollbildmodus konnte nicht aktiviert werden, weil dem Gast zu wenig Grafikspeicher zugewiesen wurde.</p><p>Sie sollten die VM so konfigurieren, dass ihr zumindest <b>%1</b> Grafikspeicher zur Verfügung steht.</p><p>Wählen Sie <b>Ignorieren</b> um dennoch in den Vollbildmodus zu wechseln oder betätigen Sie <b>Abbrechen</b> um dies nicht zu tun.</p></translation>
-    </message>
-    <message>
         <source>You are already running the most recent version of VirtualBox.</source>
         <translation>Sie haben bereits die neueste Version von VirtualBox installiert.</translation>
     </message>
@@ -5654,11 +4496,7 @@
     </message>
     <message>
         <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the s [...]
-        <translation><p>Die virtuelle Maschine meldet Unterstützung der <b>Mauszeiger-Integration</b> durch das Gastsystem. Dies bedeutet, dass die Maus nicht gefangen werden muss, um es im Gastsystem zu benutzen, sondern alle Mausaktionen über der VM-Anzeigebereich werden direkt an den Gast weitergeleitet. Der Fangmodus wird automatisch aufgehoben, falls die Maus momentan gefangen ist.</p><p>Das Mausicon in der Statusleiste wird so &nbsp;<img src=:/m [...]
-    </message>
-    <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Eine neue Version von VirtualBox ist verfügbar! Version <b>%1</b> ist auf <a href="http://www.virtualbox.org/">virtualbox.org</a> verfügbar.</p><p>Sie können diese Version von der folgenden Adresse herunterladen:</p><p><a href=%2>%3</a></p></translation>
+        <translation><p>Die virtuelle Maschine meldet Unterstützung der <b>Mauszeiger-Integration</b> durch das Gastsystem. Dies bedeutet, dass die Maus nicht gefangen werden muss, um es im Gastsystem zu benutzen, sondern alle Mausaktionen über der VM-Anzeigebereich werden direkt an den Gast weitergeleitet. Der Fangmodus wird automatisch aufgehoben, falls die Maus momentan gefangen ist.</p><p>Das Mausicon in der Statusleiste wird so &nbsp;<img src=:/m [...]
     </message>
     <message>
         <source>Release</source>
@@ -5675,10 +4513,6 @@
         <translation><p>Der Datencontainer <b>%1</b> ist bereits vorhanden. Sie können keine neue virtuelle Festplatte mit diesem Container erstellen, weil dieser bereits von einer anderen virtuellen Maschine benutzt werden kann.</p><p>Bitte wählen Sie einen anderen Namen bzw. einen anderen Ordner.</p></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which makes it po [...]
-        <translation type="obsolete"><p>Möchten Sie den Datencontainer der virtuellen Festplatte <nobr><b>%1</b></nobr> wirklich löschen?</p><p>Wählen Sie <b>Löschen</b>, um den Container permanent zu löschen. Diese Operation <b>kann nicht</b> rückgäng gemacht werden.</p><p>Wählen Sie <b>Behalten</b> um die virtuelle Festplatte von der Liste der bekannten Medien zu löschen, den Datencontainer aber z [...]
-    </message>
-    <message>
         <source>Delete</source>
         <comment>hard disk storage</comment>
         <translation>Löschen</translation>
@@ -5701,14 +4535,6 @@
         <translation>Die Rechte für das Medium <nobr><b>%1</b></nobr> konnten nicht ermittelt werden.</translation>
     </message>
     <message>
-        <source><p>One or more virtual hard disks, CD/DVD or floppy disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="obsolete"><p>Eine oder mehrere virtuelle Festplatten, CD/DVDs oder Diskettenmedien sind momentan nicht zugreifbar. Virtuelle Maschinen, die diese Medien benutzen, können so lange nicht benutzt werden, bis die Medien wieder zugreifbar werden.</p><p>Wählen Sie <b>Überprüfen</b> um den Manager für virtuelle Medien zu öffnen oder wählen Sie <b>Ignorieren</b>, um dieses Problem zu ignorieren.</p></translation>
-    </message>
-    <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Ein schwerwiegender Fehler ist aufgetreten, und die Ausführung der virtuellen Maschine wurde unterbrochen.</p><p>Zusätzliche Informationen zu diesem Fehler suchen Sie bitte in der Community-Sektion auf <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> bzw. handeln Sie gemäß Ihres Supportvertrages. Bitte geben Sie die Logdatei <tt>VBox.log</tt>, den Screenshot <tt>VBox.png</tt>, den [...]
-    </message>
-    <message>
         <source>You are trying to shut down the guest with the ACPI power button. This is currently not possible because the guest does not support software shutdown.</source>
         <translation>Sie versuchen den Gast mittels ACPI-Signal zu beenden. Dies ist nicht möglich, weil der Gast momentan das ACPI-Subsystem nicht benutzt.</translation>
     </message>
@@ -5769,10 +4595,6 @@
         <translation>Zurückkehren</translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and disk data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
-        <translation type="obsolete"><p>Wenn ein Sicherungspunkt gelöscht wird, dann werden die Zustandsinformationen des Sicherungspunktes verworfen und Dateien, die Differenzinformationen enthalten, zusammengefasst. Dieser Vorgang kann einige Zeit in Anspruch nehmen, und die Information aus dem Sicherungspunkt kann danach nicht mehr restaueriert werden.</p><p>Möchten Sie den Sicherungspunkt <b>%1</b> wirklich löschen?</p></translation>
-    </message>
-    <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
@@ -5789,10 +4611,6 @@
         <translation>Auswurf erzwingen</translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the CD/DVD device?</p><p>You will not be able to insert any CDs or ISO images or install the Guest Additions without it!</p></source>
-        <translation type="obsolete"><p>Möchten Sie wirklich das CD/DVD-Laufwerk löschen?</p><p>Ohne CD/DVD-Laufwerk können Sie keine CDs oder CD-Abbilder einbinden und die Gast-Erweiterungen nicht installieren!</p></translation>
-    </message>
-    <message>
         <source>&Remove</source>
         <comment>medium</comment>
         <translation>&Entfernen</translation>
@@ -5814,10 +4632,6 @@
         <translation><p>Der Gast-Bildschirm konnte diesem Host-Monitor nicht zugeordnet werden, weil der für den Gast reservierte Grafikspeicher dafür nicht ausreicht. Sie sollten dem Gast mindestens <b>%1</b> Grafikspeicher zuordnen.</p><p>Betätigen Sie <b>Ignorieren</b>, um den Bildschrim dennoch umzuschalten oder <b>Abbrechen</b>, um diese Operation nicht auszuführen.</p></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more disk space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of disk space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
-        <translation type="obsolete"><p>Für das Löschen des Sicherungspunktes %1 wird vorübergehend mehr Platz auf der Festplatte benötigt. Im schlimmsten Fall wird die Größe des Abbildes %2 um %3 wachsen. Auf diesem Dateisystem sind aber nur noch %4 frei.</p><p>Falls während der Operation der Plattenplatz nicht ausreicht kann dies zu Fehlern im Abbild und in der VM-Konfiguration führen, im schlimmsten Fall zum Verlust von VM und VM-Abbild.</p><p>Sie können  [...]
-    </message>
-    <message>
         <source>The current port forwarding rules are not valid. None of the host or guest port values may be set to zero.</source>
         <translation>Die Regeln für die Port-Weiterleitung enthalten momentan Fehler. Keiner der Host- oder Gast-Ports darf Null sein.</translation>
     </message>
@@ -5850,10 +4664,6 @@
         <translation><p>Sie sind dabei, eine virtuelle Festplatte an den Controller <b>%1</b> anzuschließen.</p><p>Möchten Sie eine neue leere Festplatte erzeugen oder möchten Sie ein bereits vorhandenes Plattenabbild verwenden?</p></translation>
     </message>
     <message>
-        <source><p>You are about to add a new CD/DVD drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual CD/DVD disk to put in the drive or to leave it empty for now?</p></source>
-        <translation type="obsolete"><p>Sie sind dabei, ein neues CD/DVD-Gerät an den Controller <b>%1</b> anzuschließen.</p><p>Möchten Sie ein Medium an das Laufwerk binden oder soll das Laufwerk jetzt kein Medium enthalten?</p></translation>
-    </message>
-    <message>
         <source><p>You are about to add a new floppy drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual floppy disk to put in the drive or to leave it empty for now?</p></source>
         <translation><p>Sie sind dabei, ein neues virtuelles Diskettenlaufwerk an den Controller <b>%1</b> anzuschließen.</p><p>Möchten Sie ein existierendes Medium an das Laufwerk binden oder soll das Laufwerk jetzt kein Medium enthalten?</p></translation>
     </message>
@@ -5878,26 +4688,10 @@
         <translation>Die Festplatte <nobr><b>%1</b></nobr> konnte nicht vom Slot <i>%2</i> der VM <b>%3</b> entfernt werden.</translation>
     </message>
     <message>
-        <source>Failed to detach the CD/DVD device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="obsolete">Das CD/DVD-Laufwerk <nobr><b>%1</b></nobr> konnte nicht vom Slot <i>%2</i> der VM <b>%3</b> entfernt werden.</translation>
-    </message>
-    <message>
-        <source>Failed to detach the floppy device (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="obsolete">Das Diskettenlaufwerk <nobr><b>%1</b></nobr> konnte nicht vom Slot <i>%2</i> der VM <b>%3</b> entfernt werden.</translation>
-    </message>
-    <message>
         <source>Failed to attach the hard disk (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation>Die Festplatte <nobr><b>%1</b></nobr> konnte nicht an den Slot <i>%2</i> der VM <b>%3</b> gebunden werden.</translation>
     </message>
     <message>
-        <source>Failed to attach the CD/DVD device (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="obsolete">Das CD/DVD-Laufwerk <nobr><b>%1</b></nobr> konnte nicht an den Slot <i>%2</i> der VM <b>%3</b> gebunden werden.</translation>
-    </message>
-    <message>
-        <source>Failed to attach the floppy device (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="obsolete">Das Diskettenlaufwerk <nobr><b>%1</b></nobr> konnte nicht an den Slot <i>%2</i> der VM <b>%3</b> gebunden werden.</translation>
-    </message>
-    <message>
         <source>Failed to open the Extension Pack <b>%1</b>.</source>
         <translation>Das Zusatzpaket <b>%1</b> konnte nicht geöffnet werden.</translation>
     </message>
@@ -5914,14 +4708,6 @@
         <translation><p>Beachten Sie, dass der Datencontainer dieses Mediums nicht gelöscht wird und Sie daher das Medium später wieder verwenden können.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
-        <translation type="obsolete"><p>Die VirtualBox-Gasterweiterungen sind anscheinend für diese VM nicht verfügbar, sind aber Vorrausetzung für Gemeinsame Ordner. Um diesen Dienst zu benutzen müssen Sie daher die Gasterweiterungen installieren oder diese, falls sie nicht richtig funktionieren, neu installieren. Dies können Sie durch Auswahl von <b>Gasterweiterungen installieren...</b> im Menü <b>Geräte</b> erreichen. Beachten Sie, dass Gemeinsame Ordner  [...]
-    </message>
-    <message>
-        <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="obsolete"><p>Die virtuelle Maschine wird nun in den <b>Vollbildmodus</b> geschaltet. Sie können jederzeit durch Betätigen von <b>%1</b> zum normalen Fenstermodus zurückkehren. Als <i>Host-Taste</i> ist derzeit <b>%2</b> eingestellt.</p><p>Das Hauptmenü wird im Vollbildmodus nicht angezeigt. Sie können es aber durch Betätigen von <b>Host+Pos1</b> aufrufen.</p></translation>
-    </message>
-    <message>
         <source><p>The virtual machine window will be now switched to <b>Seamless</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in seamless mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation><p>Die virtuelle Maschine wird nun in den <b>nahtlosen</b> Anzeigemodus geschaltet. Durch Betätigen von <b>%1</b> können Sie jederzeit in den normalen Fenstermodus zurückkehren. Als <i>Host-Taste</i> ist derzeit <b>%2</b> eingestellt.</p><p>Das Hauptmenü wird im nahtlosen Modus nicht angezeigt. Sie können es aber durch Betätigen von <b>Host+Pos1</b> aufrufen.</p></translation>
     </message>
@@ -6089,14 +4875,6 @@
         <translation><p>Das Maschinen-Verzeichnis <b>%1</b> konnte nicht im Verzeichnis <nobr><b>%2</b></nobr> erzeugt werden.</p><p>Bitte überprüfen Sie, ob das übergeordnete Verzeichnis vorhanden ist und ob Sie geeignete Zugriffsrechte zum Erzeugen des Maschinen-Verzeichnisses haben.</p></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard drive. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
-        <translation type="obsolete">Sie sind im Begriff, eine neue virtuelle Maschine ohne Festplatte zu erzeugen. Ohne Festplatte kann kein Betriebssystem installiert werden. Sie können die Maschine aber mit einem optischen Medium oder über Netzwerk starten.</translation>
-    </message>
-    <message>
-        <source>Failed to drop data.</source>
-        <translation type="obsolete">Daten konnten nicht kopiert werden.</translation>
-    </message>
-    <message>
         <source><p>Are you sure you want to discard the saved state of the following virtual machines?</p><p><b>%1</b></p><p>This operation is equivalent to resetting or powering off the machine without doing a proper shutdown of the guest OS.</p></source>
         <translation><p>Möchten Sie den gesicherten Zustand der folgenden virtuellen Maschinen wirklich freigeben?</p><p><b>%1</b></p><p>Diese Operation ist gleichbedeutend mit dem Ausschalten der VMs ohne sauberes Herunterfahren durch das Gast-Betriebssystem.</p></translation>
     </message>
@@ -6201,18 +4979,6 @@
         <translation>&Medium auswählen</translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="obsolete"><p>Möchten Sie die virtuelle Festplatte <nobr><b>%1</b></nobr> wirklich freigeben?</p><p>Damit wird sie von folgenden virtuellen Maschinen freigegeben:<b>%2</b>.</p></translation>
-    </message>
-    <message>
-        <source><p>Are you sure you want to release the virtual optical disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="obsolete"><p>Möchten Sie wirklich das optische Medium <nobr><b>%1</b></nobr> freigeben?</p><p>Damit wird das Medium von folgenden virtuellen Maschinen freigegeben: <b>%2</b>.</p></translation>
-    </message>
-    <message>
-        <source><p>Are you sure you want to release the virtual floppy disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="obsolete"><p>Möchten Sie wirklich das Diskettenmedium <nobr><b>%1</b></nobr> freigeben?</p><p>Damit wird das Medium von folgenden virtuellen Maschinen freigegeben: <b>%2</b>.</p></translation>
-    </message>
-    <message>
         <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
         <translation><p>Möchten Sie wirklich das Festplattenabbild <nobr><b>%1</b></nobr> von der Liste der bekannten Plattenabbilder löschen?</p></translation>
     </message>
@@ -6252,30 +5018,6 @@
         <source><p>Unable to eject the virtual floppy disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
         <translation><p>Die Diskettenabbilddatei <nobr><b>%1</b></nobr> konnte nicht aus dem virtuellen Laufwerk der VM <b>%2</b> entfernt werden.</p></translation>
     </message>
-    <message>
-        <source>Failed to open the hard disk file <nobr><b>%1</b></nobr>.</source>
-        <translation type="obsolete">Die Plattenabbilddatei <nobr><b>%1</b></nobr> konnte nicht geöffnet werden.</translation>
-    </message>
-    <message>
-        <source>Failed to open the optical disk file <nobr><b>%1</b></nobr>.</source>
-        <translation type="obsolete">Die CD/DVD-Abbilddatei <nobr><b>%1</b></nobr> konnte nicht geöffnet werden.</translation>
-    </message>
-    <message>
-        <source>Failed to open the floppy disk file <nobr><b>%1</b></nobr>.</source>
-        <translation type="obsolete">Die Diskettenabbilddatei <nobr><b>%1</b></nobr> konnte nicht geöffnet werden.</translation>
-    </message>
-    <message>
-        <source>Failed to close the hard disk file <nobr><b>%2</b></nobr>.</source>
-        <translation type="obsolete">Die Plattenabbilddatei <nobr><b>%2</b></nobr> konnte nicht geschlossen werden.</translation>
-    </message>
-    <message>
-        <source>Failed to close the optical disk file <nobr><b>%2</b></nobr>.</source>
-        <translation type="obsolete">Die CD/DVD-Abbilddatei <nobr><b>%2</b></nobr> konnte nicht geschlossen werden.</translation>
-    </message>
-    <message>
-        <source>Failed to close the floppy disk file <nobr><b>%2</b></nobr>.</source>
-        <translation type="obsolete">Die Diskettenabbilddatei <nobr><b>%2</b></nobr> konnte nicht geschlossen werden.</translation>
-    </message>
     <message numerus="yes">
         <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
@@ -6321,14 +5063,6 @@
         <translation><p>Das CD-Abbild mit den <b>VirtualBox-Gasterweiterungen</b> wurde erfolgreich von <nobr><a href="%1">%1</a></nobr> heruntergeladen, konnte aber nicht unter <nobr><b>%2</b></nobr>gespeichert werden.</p><p>Bitte wählen Sie einen anderen Ordner für diese Datei.</p></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual CD/DVD drive?</p></source>
-        <translation type="obsolete"><p>Das CD-Abbild mit den <b>VirtualBox-Gasterweiterungen</b> wurde erfolgreich von <nobr><a href="%1">%1</a></nobr> heruntergeladen und auf der lokalen Festplatte unter <nobr><b>%2</b></nobr>gespeichert.</p><p>Möchten Sie dieses Abbild in VirtualBox registrieren und in das virtuelle CD/DVD-Laufwerk einlegen?</p></translation>
-    </message>
-    <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no CD/DVD drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
-        <translation type="obsolete"><p>Das virtuelle Medium mit den <b>VirtualBox-Gasterweiterungen</b> konnte in kein Laufwerk der virtuellen Machine <b>%1</b> eingelegt werden, da diese keine CD/DVD-Laufwerke besitzt. Bitte fügen Sie ein solches Laufwerk in den Einstellungen zu Massenspeichern ein.</p></translation>
-    </message>
-    <message>
         <source><p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source>
         <translation><p>Das <b>VirtualBox-Benutzerhandbuch</b> <nobr><b>%1</b></nobr> konnte nicht gefunden werden.</p><p>Möchten Sie es aus dem Internet herunterladen?</p></translation>
     </message>
@@ -6383,15 +5117,15 @@
     </message>
     <message>
         <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Der virtuelle Bildschirm ist auf eine Farbtiefe von <b>%1 &nbsp;Bit</b> eingestellt. Für maximale Geschwindigkeit sollten Sie diese auf <b>%2 &nbsp; Bit</b> setzen. Dies lässt sich üblicherweise im Abschnitt <b>Anzeige</b> der Systemeigenschaften des Gastes einstellen.</p></translation>
     </message>
     <message>
         <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Regeln für die Port-Weiterleitung enthalten Fehler. Die Namen müssen eindeutig sein.</translation>
     </message>
     <message>
         <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Regeln für die Port-Weiterleitung enthalten momentan Fehler. Die Host-Ports und IP-Adressen müssen eindeutig sein.</translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
@@ -6399,17 +5133,13 @@
     </message>
     <message>
         <source>Failed to set the global VirtualBox extra data for key <i>%1</i> to value <i>{%2}</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der globale Extradata-Schlüssel <i>%1</i> konnte nicht auf den Wert <i>{%2}</i> gesetzt werden.</translation>
     </message>
     <message>
         <source>Failed to set the extra data for key <i>%1</i> of machine <i>%2</i> to value <i>{%3}</i>.</source>
         <translation>Der Extradata-Schlüssel <i>%1</i> der Maschine <i>%2</i> konnte nicht auf den Wert <i>{%3}</i> gesetzt werden.</translation>
     </message>
     <message>
-        <source><p>One or more virtual hard disks, optical or floppy disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="obsolete"><p>Eine oder mehrere virtuelle Festplatten, optische Medien oder Diskettenmedien sind momentan nicht zugreifbar. Virtuelle Maschinen, die diese Medien benutzen, können so lange nicht benutzt werden, bis die Medien wieder zugreifbar werden.</p><p>Wählen Sie <b>Überprüfen</b> um den Manager für virtuelle Medien zu öffnen oder wählen Sie <b>Ignorieren</b>, um dieses Problem zu ignorieren.</p></translation>
-    </message>
-    <message>
         <source>Failed to save the settings.</source>
         <translation>Die Einstellungen konnten nicht gesichert werden.</translation>
     </message>
@@ -6438,20 +5168,8 @@
         <translation>Das Diskettenlaufwerk (<nobr><b>%1</b></nobr>) konnte nicht vom Slot <i>%2</i> der VM <b>%3</b> entfernt werden.</translation>
     </message>
     <message>
-        <source>Failed to connect network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="obsolete">Die virtuelle Maschine <b>%1</b> konnte nicht an das virtuelle Netzwerkkabel angeschlossen werden.</translation>
-    </message>
-    <message>
-        <source>Failed to disconnect network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="obsolete">Die virtuelle Maschine <b>%1</b> konnte nicht vom virtuellen Netzwerkkabel getrennt werden.</translation>
-    </message>
-    <message>
         <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to enter password!</source>
-        <translation type="obsolete">Das Passwort konnte nicht eingegeben werden!</translation>
+        <translation><p>Das virtuelle Medium mit den <b>VirtualBox-Gasterweiterungen</b> konnte in kein Laufwerk der virtuellen Machine <b>%1</b> eingelegt werden, da diese keine optischen-Laufwerke besitzt. Bitte fügen Sie ein solches Laufwerk in den Einstellungen zu Massenspeichern ein.</p></translation>
     </message>
     <message>
         <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
@@ -6487,51 +5205,51 @@
     </message>
     <message>
         <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die virtuelle Maschine <b>%1</b> konnte nicht an das virtuelle Netzwerkkabel angeschlossen werden.</translation>
     </message>
     <message>
         <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die virtuelle Maschine <b>%1</b> konnte nicht vom virtuellen Netzwerkkabel getrennt werden.</translation>
     </message>
     <message>
         <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Eine oder mehrere Abbilder sind momentan nicht zugreifbar. Virtuelle Maschinen, die diese Medien benutzen, können so lange nicht benutzt werden, bis die Medien wieder zugreifbar werden.</p><p>Wählen Sie <b>Überprüfen</b> um den Manager für virtuelle Medien zu öffnen oder wählen Sie <b>Ignorieren</b>, um dieses Problem zu ignorieren.</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Wenn ein Sicherungspunkt gelöscht wird, dann werden die Zustandsinformationen des Sicherungspunktes verworfen und Dateien, die Differenzinformationen enthalten, zusammengefasst. Dieser Vorgang kann einige Zeit in Anspruch nehmen, und die Information aus dem Sicherungspunkt kann danach nicht mehr restaueriert werden.</p><p>Möchten Sie den Sicherungspunkt <b>%1</b> wirklich löschen?</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Für das Löschen des Sicherungspunktes %1 wird vorübergehend mehr Platz auf der Festplatte benötigt. Im schlimmsten Fall wird die Größe des Abbildes %2 um %3 wachsen. Auf diesem Dateisystem sind aber nur noch %4 frei.</p><p>Falls während der Operation der Plattenplatz nicht ausreicht kann dies zu Fehlern im Abbild und in der VM-Konfiguration führen, im schlimmsten Fall zum Verlust von VM und VM-Abbild.</p><p>Sie können auf eigenes Risi [...]
     </message>
     <message>
         <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Möchten Sie das Abbild <nobr><b>%1</b></nobr> wirklich freigeben?</p><p>Damit wird es von folgenden virtuellen Maschinen freigegeben:<b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Möchten Sie den Datencontainer der virtuellen Festplatte <nobr><b>%1</b></nobr> wirklich löschen?</p><p>Wählen Sie <b>Löschen</b>, um den Container permanent zu löschen. Diese Operation <b>kann nicht</b> rückgäng gemacht werden.</p><p>Wählen Sie <b>Behalten</b> um die virtuelle Festplatte von der Liste der bekannten Medien zu löschen, den Datencontainer aber zu behalten. Dadu [...]
     </message>
     <message>
         <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Plattenabbilddatei <nobr><b>%1</b></nobr> konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Plattenabbilddatei <nobr><b>%1</b></nobr> konnte nicht geschlossen werden.</translation>
     </message>
     <message>
         <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie sind im Begriff, eine neue virtuelle Maschine ohne Festplatte zu erzeugen. Ohne Festplatte kann kein Betriebssystem installiert werden. Sie können die Maschine aber mit einem optischen Medium oder über Netzwerk starten.</translation>
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Die virtuelle Maschine wird nun in den <b>Vollbildmodus</b> geschaltet. Sie können jederzeit durch Betätigen von <b>%1</b> zum normalen Fenstermodus zurückkehren. Als <i>Host-Taste</i> ist derzeit <b>%2</b> eingestellt.</p><p>Das Hauptmenü wird im Vollbildmodus nicht angezeigt. Sie können es aber durch Betätigen von <b>Host+Pos1</b> aufrufen.</p></translation>
     </message>
     <message>
         <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Der Vollbildmodus konnte nicht aktiviert werden, weil dem Gast zu wenig Grafikspeicher zugewiesen wurde.</p><p>Sie sollten die VM so konfigurieren, dass ihr zumindest <b>%1</b> Grafikspeicher zur Verfügung steht.</p><p>Wählen Sie <b>Ignorieren</b> um dennoch in den Vollbildmodus zu wechseln oder betätigen Sie <b>Abbrechen</b> um dies nicht zu tun.</p></translation>
     </message>
 </context>
 <context>
@@ -6681,85 +5399,58 @@
     </message>
 </context>
 <context>
-    <name>UIPortForwardingModel</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">Protokoll</translation>
-    </message>
-    <message>
-        <source>Host IP</source>
-        <translation type="obsolete">Host-IP</translation>
-    </message>
-    <message>
-        <source>Host Port</source>
-        <translation type="obsolete">Host-Port</translation>
-    </message>
-    <message>
-        <source>Guest IP</source>
-        <translation type="obsolete">Gast-IP</translation>
-    </message>
-    <message>
-        <source>Guest Port</source>
-        <translation type="obsolete">Gast-Port</translation>
-    </message>
-</context>
-<context>
     <name>UIPortForwardingTable</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
     <message>
         <source>Protocol</source>
-        <translation type="unfinished">Protokoll</translation>
+        <translation>Protokoll</translation>
     </message>
     <message>
         <source>Host IP</source>
-        <translation type="unfinished">Host-IP</translation>
+        <translation>Host-IP</translation>
     </message>
     <message>
         <source>Host Port</source>
-        <translation type="unfinished">Host-Port</translation>
+        <translation>Host-Port</translation>
     </message>
     <message>
         <source>Guest IP</source>
-        <translation type="unfinished">Gast-IP</translation>
+        <translation>Gast-IP</translation>
     </message>
     <message>
         <source>Guest Port</source>
-        <translation type="unfinished">Gast-Port</translation>
+        <translation>Gast-Port</translation>
     </message>
     <message>
         <source>Contains a list of port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Enthalt eine Liste der Regeln zur Portweiterleitung.</translation>
     </message>
     <message>
         <source>Add New Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Regel hinzufügen</translation>
     </message>
     <message>
         <source>Copy Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte Regel kopieren</translation>
     </message>
     <message>
         <source>Remove Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte Regel entfernen</translation>
     </message>
     <message>
         <source>Adds new port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eine neue Regel für Port-Weiterleitung hinzufügen.</translation>
     </message>
     <message>
         <source>Copies selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die ausgewählte Regel für Port-Weiterleitung kopieren.</translation>
     </message>
     <message>
         <source>Removes selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die ausgewählte Regel für Port-Weiterleitung entfernen.</translation>
     </message>
 </context>
 <context>
@@ -6810,10 +5501,6 @@
         <translation>Virtuelle-Maschinen-Dateien (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Willkommen zu VirtualBox!</h3><p>Der linke Teil dieses Fensters zeigt eine Liste aller virtuellen Maschinen auf Ihrem Computer. Diese Liste ist momentan leer, da Sie noch keine virtuelle Maschine erstellt haben.<img src=:/welcome.png align=right/></p><p>Um eine virtuelle Maschine anzulegen, wählen Sie <b>Neu</b> in der Symbolleiste am oberen Rand des Fensters.</p><p>Die Taste <b>%1& [...]
-    </message>
-    <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation>Manager</translation>
@@ -6837,10 +5524,6 @@
         <translation>Ungültige Einstellungen erkannt</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation type="obsolete">Ändern</translation>
-    </message>
-    <message>
         <source><i>Select a settings category from the list on the left-hand side and move the mouse over a settings item to get more information.</i></source>
         <translation><i>Wählen Sie eine Kategorie aus der Liste auf der linken Seite und fahren Sie mit der Maus über eine Einstellung, um mehr Informationen zu erhalten.</i></translation>
     </message>
@@ -6978,7 +5661,7 @@
     </message>
     <message>
         <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Klicken</b> zum Ein- oder Auszuschalten.</nobr><br><nobr><b>Drag&Drop</b> für neue Anordnung.</nobr></translation>
     </message>
 </context>
 <context>
@@ -7206,10 +5889,6 @@
         <translation>Gemeinsame Zwischenablage</translation>
     </message>
     <message>
-        <source>Drag'n'Drop Mode</source>
-        <translation type="obsolete">Drag'n'Drop</translation>
-    </message>
-    <message>
         <source>Configuration &Details</source>
         <translation>&Konfiguration</translation>
     </message>
@@ -7313,14 +5992,6 @@
 <context>
     <name>UIWizard</name>
     <message>
-        <source>Hide Description</source>
-        <translation type="obsolete">Beschreibung verdecken</translation>
-    </message>
-    <message>
-        <source>Show Description</source>
-        <translation type="obsolete">Beschreibung zeigen</translation>
-    </message>
-    <message>
         <source>&Expert Mode</source>
         <translation>&Expert-Modus</translation>
     </message>
@@ -7340,54 +6011,10 @@
 <context>
     <name>UIWizardCloneVD</name>
     <message>
-        <source>Copy Virtual Hard Drive</source>
-        <translation type="obsolete">Virtuelle Festplatte kopieren</translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <source>Hard drive to copy</source>
-        <translation type="obsolete">Zu kopierende Festplatte</translation>
-    </message>
-    <message>
-        <source><p>Please select the virtual hard drive file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
-        <translation type="obsolete"><p>Bitte wählen Sie eine virtuelle Festplatte zum Kopieren aus. Diese können Sie entweder aus der Liste oder mit Hilfe des Icons neben der Liste mittels Dateidialog auswählen.</p></translation>
-    </message>
-    <message>
-        <source>Choose a virtual hard drive file to copy...</source>
-        <translation type="obsolete">Wählen Sie eine virtuelle Festplatte zum Kopieren...</translation>
-    </message>
-    <message>
-        <source>Hard drive file type</source>
-        <translation type="obsolete">Dateityp der Festplatte</translation>
-    </message>
-    <message>
-        <source>Please choose the type of file that you would like to use for the new virtual hard drive. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="obsolete">Bitte wählen Sie den Typ der neuen virtuelle Festplatte. Falls Sie diese nicht mit anderer Virtualisierungssoftware verwenden, können Sie diese Einstellung unverändert lassen.</translation>
-    </message>
-    <message>
-        <source>Storage on physical hard drive</source>
-        <translation type="obsolete">Art der Speicherung</translation>
-    </message>
-    <message>
-        <source>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="obsolete">Bitte wählen Sie, ob die neue virtuelle Festplatte erst nach und nach zur Laufzeit (dynamisch) alloziert werden soll oder ob die Platte jetzt sofort vollständig alloziert werden soll (feste Größe).</translation>
-    </message>
-    <message>
-        <source><p>A <b>dynamically allocated</b> hard drive file will only use space on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="obsolete"><p>Eine <b>dynamisch allozierte</b> Datei einer virtuellen Platte belegt nur dann Platz auf der physischen Platte des Hosts, wenn der Gast Daten schreibt. Einmal belegter Platz wird nicht automatisch freigegeben.</p></translation>
-    </message>
-    <message>
-        <source><p>A <b>fixed size</b> hard drive file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="obsolete"><p>Das Erzeugen einer Datei <b>fester Größe</b> dauert auf manchen Systemen länger aber bietet eine etwas bessere Performance.</p></translation>
-    </message>
-    <message>
-        <source><p>You can also choose to <b>split</b> the hard drive file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="obsolete"><p>Die virtuelle Platte kann ebenfalls auf mehrere Dateien mit einer maximalen Größe von 2 GB aufgeteilt werden. Dies ist sinnvoll, wenn die virtuelle Maschine auf einem USB-Gerät oder auf älteren Systemen gespeichert werden soll, die keine größeren Dateien unterstützen.</translation>
-    </message>
-    <message>
         <source>&Dynamically allocated</source>
         <translation>&dynamisch alloziert</translation>
     </message>
@@ -7400,109 +6027,81 @@
         <translation>&Aufteilen in Dateien mit weniger als 2GB</translation>
     </message>
     <message>
-        <source>Please choose a location for new virtual hard drive file</source>
-        <translation type="obsolete">Bitte wählen Sie einen Dateinamen für die neue virtuelle Festplatte</translation>
-    </message>
-    <message>
-        <source>New hard drive to create</source>
-        <translation type="obsolete">Neue Festplatte</translation>
-    </message>
-    <message>
-        <source>Please type the name of the new virtual hard drive file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="obsolete">Bitte geben Sie den Namen der neuen Festplatte an oder wählen Sie das Ordner-Icon, um einen anderen Ordner für die Datei zu wählen.</translation>
-    </message>
-    <message>
-        <source>Choose a location for new virtual hard drive file...</source>
-        <translation type="obsolete">Bitte wählen Sie einen Dateinamen für die neue virtuelle Festplatte...</translation>
-    </message>
-    <message>
         <source>%1_copy</source>
         <comment>copied virtual hard drive name</comment>
         <translation>%1_Kopie</translation>
     </message>
     <message>
-        <source>Hard drive to &copy</source>
-        <translation type="obsolete">Zu &kopierende Festplatte</translation>
-    </message>
-    <message>
-        <source>&New hard drive to create</source>
-        <translation type="obsolete">&Neue Festplatte</translation>
-    </message>
-    <message>
-        <source>Hard drive file &type</source>
-        <translation type="obsolete">Datei&typ der Festplatte</translation>
-    </message>
-    <message>
         <source>Copy Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtuelle Festplatte kopieren</translation>
     </message>
     <message>
         <source>Hard disk to copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Zu kopierende Festplatte</translation>
     </message>
     <message>
         <source><p>Please select the virtual hard disk file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Bitte wählen Sie eine virtuelle Festplatte zum Kopieren aus. Diese können Sie entweder aus der Liste oder mit Hilfe des Icons neben der Liste mittels Dateidialog auswählen.</p></translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file to copy...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie eine virtuelle Festplatte zum Kopieren...</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateityp der Festplatte</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wählen Sie den Typ der neuen virtuelle Festplatte. Falls Sie diese nicht mit anderer Virtualisierungssoftware verwenden, können Sie diese Einstellung unverändert lassen.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Art der Speicherung</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wählen Sie, ob die neue virtuelle Festplatte erst nach und nach zur Laufzeit (dynamisch) alloziert werden soll oder ob die Platte jetzt sofort vollständig alloziert werden soll (feste Größe).</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Eine <b>dynamisch allozierte</b> Datei einer virtuellen Platte belegt nur dann Platz auf der physischen Platte des Hosts, wenn der Gast Daten schreibt. Einmal belegter Platz wird nicht automatisch freigegeben.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Das Erzeugen einer Datei <b>fester Größe</b> dauert auf manchen Systemen länger aber bietet eine etwas bessere Performance.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Die virtuelle Platte kann ebenfalls auf mehrere Dateien mit einer maximalen Größe von 2 GB aufgeteilt werden. Dies ist sinnvoll, wenn die virtuelle Maschine auf einem USB-Gerät oder auf älteren Systemen gespeichert werden soll, die keine größeren Dateien unterstützen.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wählen Sie einen Dateinamen für die neue virtuelle Festplatte</translation>
     </message>
     <message>
         <source>New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Festplatte</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte geben Sie den Namen der neuen Festplatte an oder wählen Sie das Ordner-Icon, um einen anderen Ordner für die Datei zu wählen.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wählen Sie einen Dateinamen für die neue virtuelle Festplatte...</translation>
     </message>
     <message>
         <source>Hard disk to &copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Zu &kopierende Festplatte</translation>
     </message>
     <message>
         <source>&New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>&Neue Festplatte</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei&typ der Festplatte</translation>
     </message>
 </context>
 <context>
@@ -7544,10 +6143,6 @@
         <translation>Typ des Klons</translation>
     </message>
     <message>
-        <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard drive files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard drive files will be tied to the virtual hard drive files of original machine and you will not be able to move the new virtual machi [...]
-        <translation type="obsolete"><p>Bitte wählen Sie, wie die Maschine geklont werden soll.</p><p><b>Vollständiger Klon</b> bedeutet, dass eine genaue Kopie der ursprünglichen virtuellen Maschine einschließlich aller virtuellen Festplattendateien angefertigt wird.</p><p>Falls Sie <b>Verknüpfter Klon</b> auswählen, wird eine neue virtuelle Maschine erzeugt aber die virtuellen Festplatten der ursprünglichen virtuellen Maschine werde [...]
-    </message>
-    <message>
         <source><p>If you create a <b>Linked clone</b> then a new snapshot will be created in the original virtual machine as part of the cloning process.</p></source>
         <translation><p>Falls Sie einen <b>verknüpften Klon</b> erzeugen, dann wird während des Klonens ein Sicherungspunkt der ursprünglichen virtuellen Maschine erzeugt.</p></translation>
     </message>
@@ -7605,7 +6200,7 @@
     </message>
     <message>
         <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Bitte wählen Sie, wie die Maschine geklont werden soll.</p><p><b>Vollständiger Klon</b> bedeutet, dass eine genaue Kopie der ursprünglichen virtuellen Maschine einschließlich aller virtuellen Festplattendateien angefertigt wird.</p><p>Falls Sie <b>Verknüpfter Klon</b> auswählen, wird eine neue virtuelle Maschine erzeugt aber die virtuellen Festplatten der ursprünglichen virtuellen Maschine werden verwendet. In  [...]
     </message>
 </context>
 <context>
@@ -7862,42 +6457,10 @@
 <context>
     <name>UIWizardNewVD</name>
     <message>
-        <source>Create Virtual Hard Drive</source>
-        <translation type="obsolete">Virtuelle Festplatte</translation>
-    </message>
-    <message>
         <source>Create</source>
         <translation>Erzeugen</translation>
     </message>
     <message>
-        <source>Hard drive file type</source>
-        <translation type="obsolete">Dateityp der Festplatte</translation>
-    </message>
-    <message>
-        <source>Please choose the type of file that you would like to use for the new virtual hard drive. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="obsolete">Bitte wählen Sie den Typ der neuen virtuelle Festplatte. Falls Sie diese nicht mit anderer Virtualisierungssoftware verwenden, können Sie diese Einstellung unverändert lassen.</translation>
-    </message>
-    <message>
-        <source>Storage on physical hard drive</source>
-        <translation type="obsolete">Art der Speicherung</translation>
-    </message>
-    <message>
-        <source>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="obsolete">Bitte wählen Sie, ob die neue virtuelle Festplatte erst nach und nach zur Laufzeit (dynamisch) alloziert werden soll oder ob die Platte jetzt sofort vollständig alloziert werden soll (feste Größe).</translation>
-    </message>
-    <message>
-        <source><p>A <b>dynamically allocated</b> hard drive file will only use space on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="obsolete"><p>Eine <b>dynamisch allozierte</b> Datei einer virtuellen Platte belegt nur dann Platz auf der physischen Platte des Hosts, wenn der Gast Daten schreibt. Einmal belegter Platz wird nicht automatisch freigegeben.</p></translation>
-    </message>
-    <message>
-        <source><p>A <b>fixed size</b> hard drive file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="obsolete"><p>Das Erzeugen einer Datei <b>fester Größe</b> dauert auf manchen Systemen länger aber bietet eine etwas bessere Performance.</p></translation>
-    </message>
-    <message>
-        <source><p>You can also choose to <b>split</b> the hard drive file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="obsolete"><p>Die virtuelle Platte kann ebenfalls auf mehrere Dateien mit einer maximalen Größe von 2 GB aufgeteilt werden. Dies ist sinnvoll, wenn die virtuelle Maschine auf einem USB-Gerät oder auf älteren Systemen gespeichert werden soll, die keine größeren Dateien unterstützen.</translation>
-    </message>
-    <message>
         <source>&Dynamically allocated</source>
         <translation>&dynamisch alloziert</translation>
     </message>
@@ -7918,18 +6481,6 @@
         <translation>Dateiname und Größe</translation>
     </message>
     <message>
-        <source>Please type the name of the new virtual hard drive file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="obsolete">Bitte geben Sie den Namen der neuen Festplatte an oder wählen Sie das Ordner-Icon, um einen anderen Ordner für die Datei zu wählen.</translation>
-    </message>
-    <message>
-        <source>Choose a location for new virtual hard drive file...</source>
-        <translation type="obsolete">Bitte wählen Sie einen Dateinamen für die neue virtuelle Festplatte...</translation>
-    </message>
-    <message>
-        <source>Select the size of the virtual hard drive in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard drive.</source>
-        <translation type="obsolete">Wählen Sie die Größe der virtuellen Festplatte in Megabyte. Dies ist die maximal nutzbare Größe der virtuellen Festplatte.</translation>
-    </message>
-    <message>
         <source>File &location</source>
         <translation>Datei&pfad</translation>
     </message>
@@ -7938,56 +6489,52 @@
         <translation>Datei&größe</translation>
     </message>
     <message>
-        <source>Hard drive file &type</source>
-        <translation type="obsolete">Datei&typ der Festplatte</translation>
-    </message>
-    <message>
         <source>Create Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtuelle Festplatte</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateityp der Festplatte</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wählen Sie den Typ der neuen virtuelle Festplatte. Falls Sie diese nicht mit anderer Virtualisierungssoftware verwenden, können Sie diese Einstellung unverändert lassen.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Eine <b>dynamisch allozierte</b> Datei einer virtuellen Platte belegt nur dann Platz auf der physischen Platte des Hosts, wenn der Gast Daten schreibt. Einmal belegter Platz wird nicht automatisch freigegeben.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Das Erzeugen einer Datei <b>fester Größe</b> dauert auf manchen Systemen länger aber bietet eine etwas bessere Performance.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Die virtuelle Platte kann ebenfalls auf mehrere Dateien mit einer maximalen Größe von 2 GB aufgeteilt werden. Dies ist sinnvoll, wenn die virtuelle Maschine auf einem USB-Gerät oder auf älteren Systemen gespeichert werden soll, die keine größeren Dateien unterstützen.</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte geben Sie den Namen der neuen Festplatte an oder wählen Sie das Ordner-Icon, um einen anderen Ordner für die Datei zu wählen.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wählen Sie einen Dateinamen für die neue virtuelle Festplatte...</translation>
     </message>
     <message>
         <source>Select the size of the virtual hard disk in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie die Größe der virtuellen Festplatte in Megabyte. Dies ist die maximal nutzbare Größe der virtuellen Festplatte.</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei&typ der Festplatte</translation>
     </message>
 </context>
 <context>
@@ -8017,56 +6564,32 @@
         <translation><p>Wählen Sie die Größe des Hauptspeichers (RAM) der virtuellen Maschine in Megabyte.</p><p>Die empfohlene Größe beträgt <b>%1</b> MB.</p></translation>
     </message>
     <message>
-        <source>Hard drive</source>
-        <translation type="obsolete">Festplatte</translation>
-    </message>
-    <message>
-        <source><p>If you wish you can add a virtual hard drive to the new machine. You can either create a new hard drive file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard drive is <b>%1</b>.</p></source>
-        <translation type="obsolete"><p>Sie können eine virtuelle Festplatte zur Konfiguration hinzufügen. Dafür können Sie eine neue Datei erzeugen oder eine Datei aus der Liste mit dem Icon auswählen.</p><p>Für ein umfangreicheres Setup können Sie diesen Schritt auch auslassen und später Änderungen an der Konfiguration der virtuellen Maschine vornehmen.</p><p>Die empfohlene Größe der Festplatte beträgt <b>%1</b>.</p></translation>
-    </message>
-    <message>
-        <source>Choose a virtual hard drive file...</source>
-        <translation type="obsolete">Datei für virtuelle Festplatte auswählen...</translation>
-    </message>
-    <message>
         <source>&Memory size</source>
         <translation>&Speichergröße</translation>
     </message>
     <message>
-        <source>&Do not add a virtual hard drive</source>
-        <translation type="obsolete">&Keine Festplatte</translation>
-    </message>
-    <message>
-        <source>&Create a virtual hard drive now</source>
-        <translation type="obsolete">&Festplatte erzeugen</translation>
-    </message>
-    <message>
-        <source>&Use an existing virtual hard drive file</source>
-        <translation type="obsolete">&Vorhandene Festplatte verwenden</translation>
-    </message>
-    <message>
         <source>Hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Platte</translation>
     </message>
     <message>
         <source><p>If you wish you can add a virtual hard disk to the new machine. You can either create a new hard disk file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard disk is <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Sie können eine virtuelle Festplatte zur Konfiguration hinzufügen. Dafür können Sie eine neue Datei erzeugen oder eine Datei aus der Liste mit dem Icon auswählen.</p><p>Für ein umfangreicheres Setup können Sie diesen Schritt auch auslassen und später Änderungen an der Konfiguration der virtuellen Maschine vornehmen.</p><p>Die empfohlene Größe der Festplatte beträgt <b>%1</b>.</p></translation>
     </message>
     <message>
         <source>&Do not add a virtual hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>&Keine Festplatte</translation>
     </message>
     <message>
         <source>&Create a virtual hard disk now</source>
-        <translation type="unfinished"></translation>
+        <translation>&Festplatte erzeugen</translation>
     </message>
     <message>
         <source>&Use an existing virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>&Vorhandene Festplatte verwenden</translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file...</source>
-        <translation type="unfinished">Datei für virtuelle Festplatte auswählen...</translation>
+        <translation>Datei für virtuelle Festplatte auswählen...</translation>
     </message>
 </context>
 <context>
@@ -8098,10 +6621,6 @@
         <translation><Voreinstellung></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Der Standardpfad wird nach Bestätigen der Änderungen und erneutes Öffnen dieses Dialogs angezeigt.</translation>
-    </message>
-    <message>
         <source><not selected></source>
         <translation><nicht ausgewählt></translation>
     </message>
@@ -8118,18 +6637,10 @@
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <source>Opens a window to select a different folder.</source>
-        <translation type="obsolete">Öffnet einen Dialog zur Auswahl eines anderen Verzeichnisses.</translation>
-    </message>
-    <message>
         <source>Resets the folder path to the default value.</source>
         <translation>Setzt den Verzeichnispfad auf die Voreinstellung zurück.</translation>
     </message>
     <message>
-        <source>Opens a window to select a different file.</source>
-        <translation type="obsolete">Öffnet einen Dialog um eine andere Datei auszuwählen.</translation>
-    </message>
-    <message>
         <source>Resets the file path to the default value.</source>
         <translation>Setzt den Pfad auf die Voreinstellung zurück.</translation>
     </message>
@@ -8138,32 +6649,24 @@
         <translation>&Kopieren</translation>
     </message>
     <message>
-        <source>Please type the folder path here.</source>
-        <translation type="obsolete">Bitte geben Sie hier das gewünschte Verzeichnis ein.</translation>
-    </message>
-    <message>
-        <source>Please type the file path here.</source>
-        <translation type="obsolete">Bitte geben Sie hier den gewünschten Pfad ein.</translation>
-    </message>
-    <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
         <translation>Der Standardpfad wird nach Bestätigen der Änderungen und erneutes Öffnen dieses Dialogs angezeigt.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnet einen Dialog zur Auswahl eines anderen Verzeichnisses.</translation>
     </message>
     <message>
         <source>Displays a window to select a different file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnet einen Dialog zur Auswahl einer anderen Datei.</translation>
     </message>
     <message>
         <source>Holds the folder path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt den Ordner.</translation>
     </message>
     <message>
         <source>Holds the file path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt den Dateipfad.</translation>
     </message>
 </context>
 <context>
@@ -8364,11 +6867,6 @@
         <translation>Diskette</translation>
     </message>
     <message>
-        <source>CD/DVD</source>
-        <comment>DeviceType</comment>
-        <translation type="obsolete">CD/DVD</translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <comment>DeviceType</comment>
         <translation>Platte</translation>
@@ -8940,17 +7438,12 @@
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Diese Festplatte wird indirekt mittels einer neu erzeugten Differenzdatei angeschlossen.</translation>
-    </message>
-    <message>
-        <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
-        <comment>medium</comment>
-        <translation type="obsolete">Einige der zu dieser virtuellen Festplatte gehörigen Dateien sind nicht zugreifbar. Bitte verwenden Sie den Manager für virtuelle Medien im Modus <b>Zeige Differenz-Abbilder</b> um diese Dateien anzuzeigen.</translation>
+        <translation>Diese Festplatte wird indirekt mittels einer neu erzeugten Differenzdatei angeschlossen.</translation>
     </message>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Diese Basisfestplatte ist indirekt über die folgenden Differenzfestplatten eingebunden:</translation>
+        <translation>Diese Basisfestplatte ist indirekt über die folgenden Differenzfestplatten eingebunden:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -8995,10 +7488,6 @@
         </translation>
     </message>
     <message>
-        <source>(CD/DVD)</source>
-        <translation type="obsolete">(CD/DVD)</translation>
-    </message>
-    <message>
         <source>Screens</source>
         <comment>details report</comment>
         <translation>Bildschirme</translation>
@@ -9381,14 +7870,6 @@
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <source>Please choose a virtual hard drive file</source>
-        <translation type="obsolete">Bitte wählen Sie eine Datei für die virtuelle Festplatte aus</translation>
-    </message>
-    <message>
-        <source>All virtual hard drive files (%1)</source>
-        <translation type="obsolete">Alle Dateien für virtuelle Festplatten (%1)</translation>
-    </message>
-    <message>
         <source>Please choose a virtual optical disk file</source>
         <translation>Bitte wählen Sie eine Datei für ein virtuelles optisches Medium</translation>
     </message>
@@ -9429,25 +7910,11 @@
         <translation>QCOW (QEMU Copy-on-Write)</translation>
     </message>
     <message>
-        <source>Please choose a location for new virtual hard drive file</source>
-        <translation type="obsolete">Bitte wählen Sie einen Dateinamen für die neue virtuelle Festplatte</translation>
-    </message>
-    <message>
         <source>Differencing</source>
         <comment>DiskType</comment>
         <translation>differentiell</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details report (Unrestricted Execution)</comment>
-        <translation type="obsolete">aktiviert</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (Unrestricted Execution)</comment>
-        <translation type="obsolete">deaktiviert</translation>
-    </message>
-    <message>
         <source>Unrestricted Execution</source>
         <comment>details report</comment>
         <translation>Unrestricted Execution</translation>
@@ -9543,7 +8010,7 @@
     <message>
         <source>New dynamically allocated storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>dynamisch belegt</translation>
     </message>
     <message>
         <source>Active</source>
@@ -9625,41 +8092,26 @@
         <translation>(opt. Laufwerk)</translation>
     </message>
     <message>
-        <source>Attaching this hard drive will be performed indirectly using a newly created differencing hard drive.</source>
-        <comment>medium</comment>
-        <translation type="obsolete">Diese Festplatte wird indirekt mittels einer neu erzeugten Differenzdatei angeschlossen.</translation>
-    </message>
-    <message>
-        <source>Some of the files in this hard drive chain are inaccessible. Please use the Virtual Medium Manager to inspect these files.</source>
-        <comment>medium</comment>
-        <translation type="obsolete">Einige der zu dieser virtuellen Festplatte gehörigen Dateien sind nicht zugreifbar. Bitte verwenden Sie den Manager für virtuelle Medien um diese Dateien anzuzeigen.</translation>
-    </message>
-    <message>
-        <source>This base hard drive is indirectly attached using the following differencing hard drive:</source>
-        <comment>medium</comment>
-        <translation type="obsolete">Diese Basisfestplatte ist indirekt über die folgenden Differenzfestplatten eingebunden:</translation>
-    </message>
-    <message>
         <source>Encrypted</source>
         <comment>medium</comment>
         <translation>verschlüsselt</translation>
     </message>
     <message>
         <source>Please choose a virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wählen Sie eine Datei für die virtuelle Festplatte aus</translation>
     </message>
     <message>
         <source>All virtual hard disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Dateien für virtuelle Festplatten (%1)</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Medium Manager to inspect these files.</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Einige der zu dieser virtuellen Festplatte gehörigen Dateien sind nicht zugreifbar. Bitte verwenden Sie den Manager für virtuelle Medien um diese Dateien anzuzeigen.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wählen Sie einen Dateinamen für die neue virtuelle Festplatte</translation>
     </message>
 </context>
 <context>
@@ -9917,10 +8369,6 @@
         <translation>Sicherungspunkt des aktuellen VM-Zustands erstellen</translation>
     </message>
     <message>
-        <source>Show the details of the selected snapshot</source>
-        <translation type="obsolete">Zeigt Einzelheiten des ausgewählten Sicherungspunktes</translation>
-    </message>
-    <message>
         <source> (%1)</source>
         <translation> (%1)</translation>
     </message>
@@ -9933,14 +8381,6 @@
         <translation>Sicherungspunkt &löschen</translation>
     </message>
     <message>
-        <source>Restore the selected snapshot of the virtual machine</source>
-        <translation type="obsolete">Der ausgewählte Sicherungspunkt wird wieder hergestellt</translation>
-    </message>
-    <message>
-        <source>Delete the selected snapshot of the virtual machine</source>
-        <translation type="obsolete">Der ausgewählte Sicherungspunkt wird gelöscht</translation>
-    </message>
-    <message>
         <source> (%1 ago)</source>
         <translation> (vor %1)</translation>
     </message>
@@ -9949,24 +8389,20 @@
         <translation>&Klonen...</translation>
     </message>
     <message>
-        <source>Clone the selected virtual machine</source>
-        <translation type="obsolete">Die ausgewählte virtuelle Maschine klonen</translation>
-    </message>
-    <message>
         <source>Restore selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Zurückkehren auf den ausgewählten Sicherungspunkt</translation>
     </message>
     <message>
         <source>Delete selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Löschen des ausgewählten Sicherungspunktes</translation>
     </message>
     <message>
         <source>Display a window with selected snapshot details</source>
-        <translation type="unfinished"></translation>
+        <translation>Einzelheiten des ausgewählten Sicherungspunktes zeigen</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Die ausgewählte virtuelle Maschine klonen</translation>
     </message>
 </context>
 <context>
@@ -9992,7 +8428,7 @@
     </message>
     <message>
         <source>Snapshot %1</source>
-        <translation type="unfinished">Sicherungspunkt %1</translation>
+        <translation>Sicherungspunkt %1</translation>
     </message>
 </context>
 <context>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
index 5796ed6..0268246 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
@@ -315,7 +315,7 @@
     </message>
     <message>
         <source>Seam&less Mode</source>
-        <translation type="unfinished">Modo f&luído</translation>
+        <translation>Modo &fluído</translation>
     </message>
     <message>
         <source>Switch to seamless desktop integration mode</source>
@@ -1039,55 +1039,55 @@
     </message>
     <message>
         <source>&Webcams</source>
-        <translation type="unfinished"></translation>
+        <translation>&Cámaras web</translation>
     </message>
     <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Insertar imagen de CD de las «Guest Additions»...</translation>
     </message>
     <message>
         <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <translation>&VirtualBox</translation>
     </message>
     <message>
         <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra de &menú</translation>
     </message>
     <message>
         <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Preferencias de barra de menú...</translation>
     </message>
     <message>
         <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar &barra de menú</translation>
     </message>
     <message>
         <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra de &estado</translation>
     </message>
     <message>
         <source>&Status Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Preferencias de barra de estado...</translation>
     </message>
     <message>
         <source>Show Status &Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar barra de &estado</translation>
     </message>
     <message>
         <source>&Input</source>
-        <translation type="unfinished"></translation>
+        <translation>&Entrada</translation>
     </message>
     <message>
         <source>&Keyboard</source>
-        <translation type="unfinished">&Teclado</translation>
+        <translation>&Teclado</translation>
     </message>
     <message>
         <source>&Keyboard Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Preferencias de &teclado...</translation>
     </message>
     <message>
         <source>&Mouse</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ratón</translation>
     </message>
     <message>
         <source>Network</source>
@@ -1095,402 +1095,402 @@
     </message>
     <message>
         <source>&USB Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Preferencias &USB...</translation>
     </message>
     <message>
         <source>&Shared Folders</source>
-        <translation type="unfinished"></translation>
+        <translation>Carpetas &compartidas</translation>
     </message>
     <message>
         <source>Show &Log...</source>
         <comment>debug action</comment>
-        <translation type="unfinished">Mostrar &historial de eventos...</translation>
+        <translation>Mostrar &historial de eventos...</translation>
     </message>
     <message>
         <source>E&xtra Data Manager...</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestor de datos e&xtra...</translation>
     </message>
     <message>
         <source>Display the Extra Data Manager window</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar la ventana del gestor de datos extra</translation>
     </message>
     <message>
         <source>&File</source>
-        <translation type="unfinished">&Archivo</translation>
+        <translation>&Archivo</translation>
     </message>
     <message>
         <source>&Window</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ventana</translation>
     </message>
     <message>
         <source>&Minimize</source>
-        <translation type="unfinished"></translation>
+        <translation>&Minimizar</translation>
     </message>
     <message>
         <source>&Full-screen Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo patalla &completa</translation>
     </message>
     <message>
         <source>Switch between normal and full-screen mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar entre modo normal y pantalla completa</translation>
     </message>
     <message>
         <source>S&caled Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo es&calado</translation>
     </message>
     <message>
         <source>S&cale Factor</source>
-        <translation type="unfinished"></translation>
+        <translation>Factor de es&calado</translation>
     </message>
     <message>
         <source>Send the %1 sequence to the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar la secuencia %1 a la máquina virtual</translation>
     </message>
     <message>
         <source>&Mouse Integration</source>
-        <translation type="unfinished"></translation>
+        <translation>Integración del &ratón</translation>
     </message>
     <message>
         <source>Enable host mouse pointer integration</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar integración del puntero del ratón</translation>
     </message>
     <message>
         <source>&Optical Drives</source>
-        <translation type="unfinished"></translation>
+        <translation>Unidades &ópticas</translation>
     </message>
     <message>
         <source>&Floppy Drives</source>
-        <translation type="unfinished"></translation>
+        <translation>Unidades de &disquete</translation>
     </message>
     <message>
         <source>&USB</source>
-        <translation type="unfinished"></translation>
+        <translation>&USB</translation>
     </message>
     <message>
         <source>&Logging</source>
         <comment>debug action</comment>
-        <translation type="unfinished"></translation>
+        <translation>&Trazas</translation>
     </message>
     <message>
         <source>&Normal Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Inicio &normal</translation>
     </message>
     <message>
         <source>&Headless Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Inicio sin &pantalla</translation>
     </message>
     <message>
         <source>&Detachable Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Inicio &desacoplable</translation>
     </message>
     <message>
         <source>Minimize active window</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimizar ventana activa</translation>
     </message>
     <message>
         <source>Display the Network Operations Manager window</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar el diálogo del Administrador de operaciones de red</translation>
     </message>
     <message>
         <source>Display a window with product information</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar una ventana con información del producto</translation>
     </message>
     <message>
         <source>&Preferences...</source>
         <comment>global preferences window</comment>
-        <translation type="unfinished">&Preferencias...</translation>
+        <translation>&Preferencias...</translation>
     </message>
     <message>
         <source>Display the global preferences window</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar la ventana de preferencias globales</translation>
     </message>
     <message>
         <source>Display the virtual machine settings window</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar la ventana de preferencias de la máquina virtual</translation>
     </message>
     <message>
         <source>Display the virtual machine session information window</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar la ventana de información de sesión de la máquina vitual</translation>
     </message>
     <message>
         <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <translation>&Guardar estado</translation>
     </message>
     <message>
         <source>Save the state of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardar el estado de la máquina virtual</translation>
     </message>
     <message>
         <source>Send the ACPI Shutdown signal to the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar la señal ACPI de apagado a la máquina virtual</translation>
     </message>
     <message>
         <source>&Minimize Window</source>
-        <translation type="unfinished"></translation>
+        <translation>&Minimizar ventana</translation>
     </message>
     <message>
         <source>Automatically resize the guest display when the window is resized</source>
-        <translation type="unfinished"></translation>
+        <translation>Redimensionar automáticamente la pantalla del invitado cuando la ventana es redimensionada</translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
-        <translation type="unfinished"></translation>
+        <source>Take guest display screenshot</source>
+        <translation>Tomar una captura de la pantalla del invitado</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure video capture</source>
+        <translation>Mostrar la ventana de preferencias de la máquina virtual para configurar la captura de vídeo</translation>
     </message>
     <message>
         <source>Enable guest display video capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar captura de vídeo del invitado</translation>
     </message>
     <message>
         <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Permitir conexiones de escritorio remoto (RDP) a esta máquina</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure menu-bar</source>
+        <translation>Mostrar la ventana para configurar la barra de menú</translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable menu-bar</source>
+        <translation>Habilitar barra de menú</translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure status-bar</source>
+        <translation>Mostrar la ventana para configurar la barra de estado</translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable status-bar</source>
+        <translation>Habilitar barra de estado</translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
-        <translation type="unfinished"></translation>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
+        <translation>Mostar la ventana de preferencias globales para configurar atajos de teclado</translation>
     </message>
     <message>
         <source>&Insert %1</source>
         <comment>that means send the %1 key sequence to the virtual machine</comment>
-        <translation type="unfinished"></translation>
+        <translation>&Insertar %1</translation>
     </message>
     <message>
         <source>&Hard Disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Discos duros</translation>
     </message>
     <message>
         <source>&Hard Disk Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Preferencias de &disco duro...</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure hard disks</source>
+        <translation>Mostrar la ventana de preferencias de la máquina virtual para configurar discos duros</translation>
     </message>
     <message>
         <source>&Network</source>
-        <translation type="unfinished"></translation>
+        <translation>&Red</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure network adapters</source>
+        <translation>Mostrar la ventana de preferencias de la máquina virtual para configurar adaptadores de red</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure USB devices</source>
+        <translation>Mostrar la ventana de preferencias de la máquina virtual para configurar dispositivos USB</translation>
     </message>
     <message>
         <source>&Drag and Drop</source>
-        <translation type="unfinished"></translation>
+        <translation>&Arrastrar y soltar</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure shared folders</source>
+        <translation>Mostrar la ventana de preferencias de la máquina virtual para configurar carpetas compartidas</translation>
     </message>
     <message>
         <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Insertar el archivo de disco de las «Guest Additions» en la unidad óptica virtual</translation>
     </message>
     <message>
         <source>%1%</source>
         <comment>scale-factor</comment>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>Enable</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">Habilitado</translation>
+        <translation>Habilitado</translation>
     </message>
     <message>
         <source>Resize to %1x%2</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished"></translation>
+        <translation>Redimensionar a %1x%2</translation>
     </message>
     <message>
         <source>Preview Monitor %1</source>
-        <translation type="unfinished">Previsualizar monitor %1</translation>
+        <translation>Previsualizar monitor %1</translation>
     </message>
     <message>
         <source>&Connect Network Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>&Conectar adaptador de red</translation>
     </message>
     <message>
         <source>Connect Network Adapter &%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Conectar adaptador de red &%1</translation>
     </message>
     <message>
         <source>No USB Devices Connected</source>
-        <translation type="unfinished">No hay dispositivos USB conetados</translation>
+        <translation>No hay dispositivos USB conetados</translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
-        <translation type="unfinished">No hay dispositivos soportados conectados al PC anfitrión</translation>
+        <translation>No hay dispositivos soportados conectados al PC anfitrión</translation>
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Sin cámaras web conectadas</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
-        <translation type="unfinished"></translation>
+        <translation>No hay cámaras web soportadas conectadas al PC anfitrión</translation>
     </message>
     <message>
         <source>Create new virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear nueva máquina virtual</translation>
     </message>
     <message>
         <source>Add existing virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar una máquina virtual existente</translation>
     </message>
     <message>
         <source>Rename selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <translation>Renombrar el grupo seleccionado de máquina virtual</translation>
     </message>
     <message>
         <source>&Ungroup</source>
-        <translation type="unfinished"></translation>
+        <translation>&Desagrupar</translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <source>Ungroup items of selected virtual machine group</source>
+        <translation>Desagrupar elementos del grupo de la máquina seleccionada</translation>
     </message>
     <message>
         <source>&Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ordenar</translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort items of selected virtual machine group alphabetically</source>
+        <translation>Ordenar los elementos del grupo de la máquina virtual seleccionada alfabéticamente</translation>
     </message>
     <message>
         <source>Add new group based on selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar un nuevo grupo basado en las máquinas virtuales seleccionadas</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Clonar la máquina virtual seleccionada</translation>
     </message>
     <message>
         <source>Remove selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina las máquinas virtuales seleccionadas</translation>
     </message>
     <message>
         <source>Start selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar las máquinas virtuales seleccionadas</translation>
     </message>
     <message>
         <source>Switch to the windows of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar a las ventanas de las máquinas virtuales seleccionadas</translation>
     </message>
     <message>
         <source>Start selected virtual machines in the background</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar las máquinas virtuales seleccionadas en segundo plano</translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
-        <translation type="unfinished"></translation>
+        <source>Start selected virtual machines with option of continuing in background</source>
+        <translation>Iniciar las máquinas virtuales seleccionadas con opción de continuar en segundo plano</translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Suspend execution of selected virtual machines</source>
+        <translation>Suspender la ejecución de las máquinas virtuales seleccionadas</translation>
     </message>
     <message>
         <source>Reset selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiniciar las máquinas virtuales seleccionadas</translation>
     </message>
     <message>
         <source>D&iscard Saved State...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Descartar el estado guardado...</translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Discard saved state of selected virtual machines</source>
+        <translation>Descartar el estado guardado de las máquinas virtuales seleccionadas</translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Show log files of selected virtual machines</source>
+        <translation>Mostrar los archivos de trazas de la máquinas virtuales seleccionadas</translation>
     </message>
     <message>
         <source>Re&fresh</source>
-        <translation type="unfinished">A&ctualizar</translation>
+        <translation>&Actualizar</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Refresh accessibility state of selected virtual machines</source>
+        <translation>Actualizar la disponibilidad de la máquinas virtuales seleccionadas</translation>
     </message>
     <message>
         <source>S&how in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar en &Finder</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar los archivos VirtualBox Machine Definition en Finder</translation>
     </message>
     <message>
         <source>S&how in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar en &explorador</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar los archivos VirtualBox Machine Definition en el explorador</translation>
     </message>
     <message>
         <source>S&how in File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar en el &Administrador de archivos</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in the File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar los archivos VirtualBox Machine Definition en el Administrador de archivos</translation>
     </message>
     <message>
         <source>Cr&eate Alias on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear un &alias en el escritorio</translation>
     </message>
     <message>
         <source>Create alias files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Crea archivos de alias a los archivos VirtualBox Machine Definition en su escritorio</translation>
     </message>
     <message>
         <source>Cr&eate Shortcut on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear un &acceso directo en el escritorio</translation>
     </message>
     <message>
         <source>Create shortcut files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Crea archivos de acceso directo a los archivos VirtualBox Machine Definition en su escritorio</translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort group of first selected virtual machine alphabetically</source>
+        <translation>Ordenar el grupo de la primera máquina seleccionada alfabéticamente</translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Save state of selected virtual machines</source>
+        <translation>Guardar el estado de las máquinas virtuales seleccionadas</translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
+        <translation>Enviar la señal ACPI de apagado a las máquinas virtuales seleccionadas</translation>
     </message>
     <message>
         <source>Power off selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar las máquinas virtuales seleccionadas</translation>
     </message>
 </context>
 <context>
@@ -1517,37 +1517,37 @@
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
         <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - Disco cifrado</translation>
     </message>
     <message numerus="yes">
         <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Esta máquina virtual está protegida con contraseña. Inserte la contarseña de cifrado abajo.</numerusform>
+            <numerusform>Esta máquina virtual está protegida con contraseña. Inserte la contarseña de cifrado abajo.</numerusform>
         </translation>
     </message>
     <message>
         <source>Status</source>
         <comment>password table field</comment>
-        <translation type="unfinished"></translation>
+        <translation>Estado</translation>
     </message>
     <message>
         <source>ID</source>
         <comment>password table field</comment>
-        <translation type="unfinished"></translation>
+        <translation>ID</translation>
     </message>
     <message>
         <source>Password</source>
         <comment>password table field</comment>
-        <translation type="unfinished"></translation>
+        <translation>Contraseña</translation>
     </message>
     <message numerus="yes">
         <source><nobr>Used by the following %n hard disk(s):</nobr><br>%1</source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many hard drives are in the tool-tip and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><nobr>Usado por el siguiente disco duro:</nobr><br>%1</numerusform>
+            <numerusform><nobr>Usado por los siguientes %n discos duros:</nobr><br>%1</numerusform>
         </translation>
     </message>
 </context>
@@ -1681,19 +1681,19 @@
     </message>
     <message>
         <source>Storage Controller (IDE)</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlador de almacenamiento (IDE)</translation>
     </message>
     <message>
         <source>Storage Controller (SATA)</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlador de almacenamiento (SATA)</translation>
     </message>
     <message>
         <source>Storage Controller (SCSI)</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlador de almacenamiento (SCSI)</translation>
     </message>
     <message>
         <source>Storage Controller (SAS)</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlador de almacenamiento (SAS)</translation>
     </message>
 </context>
 <context>
@@ -2390,7 +2390,7 @@
     </message>
     <message>
         <source>Retrieving data ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Obteniendo datos...</translation>
     </message>
 </context>
 <context>
@@ -3367,9 +3367,9 @@ p, li { white-space: pre-wrap; }
         <translation>Controlador genérico, «%1»</translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>Controlador genérico, «%1» {&nbsp;%2&nbsp;}</translation>
+        <translation>Controlador genérico, «%1» { %2 }</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -3418,27 +3418,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Minimal Paravirtualization</source>
         <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Paravirtualización mínima</translation>
     </message>
     <message>
         <source>Hyper-V Paravirtualization</source>
         <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Paravirtualización Hyper-V</translation>
     </message>
     <message>
         <source>KVM Paravirtualization</source>
         <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Paravirtualización KVM</translation>
     </message>
     <message>
         <source>[Optical Drive]</source>
         <comment>details (storage)</comment>
-        <translation type="unfinished"></translation>
+        <translation>[Uniada óptica]</translation>
     </message>
     <message>
         <source>USB Controller</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished">Controlador USB</translation>
+        <translation>Controlador USB</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -3448,72 +3448,72 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Mini-toolbar Position</source>
         <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Posición de minibarra de herramientas</translation>
     </message>
     <message>
         <source>Top</source>
         <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Arriba</translation>
     </message>
     <message>
         <source>Bottom</source>
         <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Abajo</translation>
     </message>
     <message>
         <source>Mini-toolbar</source>
         <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Minibarra de herramientas</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (user interface/mini-toolbar)</comment>
-        <translation type="unfinished">Inhabilitado</translation>
+        <translation>Inhabilitado</translation>
     </message>
     <message>
         <source>Scale-factor</source>
         <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Factor de escalado</translation>
     </message>
     <message>
         <source>Unscaled HiDPI Video Output</source>
         <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Salida de vídeo HiDPI no escalada</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details (display/Unscaled HiDPI Video Output)</comment>
-        <translation type="unfinished">Habilitado</translation>
+        <translation>Habilitado</translation>
     </message>
     <message>
         <source>Menu-bar</source>
         <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Barra de menú</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Habilitado</translation>
+        <translation>Habilitado</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Inhabilitado</translation>
+        <translation>Inhabilitado</translation>
     </message>
     <message>
         <source>Status-bar</source>
         <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Barra de estado</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished">Habilitado</translation>
+        <translation>Habilitado</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished">Inhabilitado</translation>
+        <translation>Inhabilitado</translation>
     </message>
 </context>
 <context>
@@ -3773,23 +3773,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Machine Windows:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vetanas de máquina:</translation>
     </message>
     <message>
         <source>&Raise Window Under Mouse</source>
-        <translation type="unfinished"></translation>
+        <translation>&Elevar ventana debajo del ratón</translation>
     </message>
     <message>
         <source>Holds the maximum width which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene la anchura máxima preferida a usar por el invitado.</translation>
     </message>
     <message>
         <source>Holds the maximum height which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene la altura máxima preferida a usar por el invitado.</translation>
     </message>
     <message>
         <source>When checked, machine windows will be raised when the mouse pointer moves over them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, las ventanas de las máquinas se elevarán cuando el puntero del ratón se mueva sobre ellas.</translation>
     </message>
 </context>
 <context>
@@ -3840,19 +3840,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar paquete</translation>
     </message>
     <message>
         <source>Remove Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar paquete</translation>
     </message>
     <message>
         <source>Adds new package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar nuevo paquete.</translation>
     </message>
     <message>
         <source>Removes selected package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar paquete seleccionado.</translation>
     </message>
 </context>
 <context>
@@ -3939,11 +3939,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Host Screensaver:</source>
-        <translation type="unfinished"></translation>
+        <translation>Protector de pantalla de anfitrión:</translation>
     </message>
     <message>
         <source>&Disable When Running Virtual Machines</source>
-        <translation type="unfinished"></translation>
+        <translation>&Deshabilitar al ejecutrar máquinas virtuales</translation>
     </message>
 </context>
 <context>
@@ -4006,11 +4006,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista todos los accesos rápidos que pueden ser configurados.</translation>
     </message>
     <message>
         <source>Holds a sequence to filter the shortcut list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene una secuencia para filtrar la lista de accesos rápidos.</translation>
     </message>
 </context>
 <context>
@@ -4355,51 +4355,51 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar red NAT</translation>
     </message>
     <message>
         <source>Remove NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar red NAT</translation>
     </message>
     <message>
         <source>Edit NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar red NAT</translation>
     </message>
     <message>
         <source>Adds new NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agrega nueva red NAT.</translation>
     </message>
     <message>
         <source>Removes selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar la red NAT seleccionada.</translation>
     </message>
     <message>
         <source>Edits selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Edita la red NAT seleccionada.</translation>
     </message>
     <message>
         <source>Add Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar red sólo-anfitrión</translation>
     </message>
     <message>
         <source>Remove Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar red sólo-anfitrión</translation>
     </message>
     <message>
         <source>Edit Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar red sólo-anfitrión</translation>
     </message>
     <message>
         <source>Adds new host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agrega red sólo-anfitrión.</translation>
     </message>
     <message>
         <source>Removes selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina red sólo-anfitrión.</translation>
     </message>
     <message>
         <source>Edits selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Edita red sólo-anfitrión.</translation>
     </message>
 </context>
 <context>
@@ -4593,11 +4593,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, se usará la configuración manual para este adaptador de red.</translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
-        <translation type="unfinished"></translation>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
+        <translation>Seleccionado, se habilitará el servidor DHCP para esta red en esta máquina al iniciarse.</translation>
     </message>
 </context>
 <context>
@@ -4676,23 +4676,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, esta red será habilitada.</translation>
     </message>
     <message>
         <source>When checked, this network will support DHCP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, esta red soportará DHCP.</translation>
     </message>
     <message>
         <source>When checked, this network will support IPv6.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, esta red soportará IPv6.</translation>
     </message>
     <message>
         <source>When checked, this network will be advertised as the default IPv6 route.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, esta red será promocionada como la ruta IPv6 predeterminada.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Muestra una ventana para configurar las reglas de reenvío de puertos.</translation>
     </message>
 </context>
 <context>
@@ -4770,11 +4770,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the proxy host.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene la máquina anfitrión de «proxy».</translation>
     </message>
     <message>
         <source>Holds the proxy port.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el puerto anfitrión de «proxy».</translation>
     </message>
 </context>
 <context>
@@ -4829,7 +4829,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecciona la frecuencia de comprobación de nueva versión. Si quieres desabilitar completamente esta comprobación, desmarque la casilla de verificación de arriba. </translation>
     </message>
 </context>
 <context>
@@ -5374,26 +5374,26 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Indica la actividad de la pantalla:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the optical drives:</nobr>%1</p></source>
         <comment>CD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Indica la actividad de los discos ópticos:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy drives:</nobr>%1</p></source>
         <comment>FD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Indica la actividad de las unidades de disquetera:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
         <comment>HDD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Indica la actividad del disco duro:</nobr>%1</p></translation>
     </message>
     <message>
         <source>Indicates whether the host keyboard is captured by the guest OS:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;keyboard is not captured</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;keyboard is captured</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation>Indica cuando el teclado del anfitrión es capturado por el SO invitado:<br><nobr><img src=":/hostkey_16px.png/">&nbsp;&nbsp;el teclado no está capturado</nobr><br><nobr><img src=":/hostkey_captured_16px.png"/>&nbsp;&nbsp;el teclado está capturado</nobr></translation>
     </message>
 </context>
 <context>
@@ -5494,7 +5494,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecciona el controlador de audio. El <b>controlador de audio «null»</b> hace que el invitado vea una tarjeta de sonido, sin embargo, los accesos serán ignorados.</translation>
     </message>
 </context>
 <context>
@@ -5800,27 +5800,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
+        <translation><i>Casi %1MB por cada minuto de vídeo</i></translation>
     </message>
     <message>
         <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>El escritorio remoto está actualmente habilitado para esta máquina virtual. Sin embargo, esto requiere que <i>%1</i> esté instalado. Instale el «Extension Pack» desde el sitio de descargas o de otra manera su MV se iniciará con el escritorio remoto deshabilitado.</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>La máquina virtual está configurada para usar el hardware de aceleración gráfica y el sistema operativo está establecido a Windows Vista o posterior. Para mejor rendimiento debería establecer una memoria de vídeo de la máquina de al menos <b>%1</b>.</translation>
     </message>
     <message>
         <source>&Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>&Pantalla</translation>
     </message>
     <message>
         <source>Scale Factor:</source>
-        <translation type="unfinished"></translation>
+        <translation>Factor de escalado:</translation>
     </message>
     <message>
         <source>Controls the guest screen scale factor.</source>
-        <translation type="unfinished"></translation>
+        <translation>Controla el factor de escalado de la pantalla del invitado.</translation>
     </message>
     <message>
         <source>100%</source>
@@ -5832,83 +5832,83 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>When checked, guest screen contents will not be scaled up to compensate for high host screen resolutions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, los contenidos de la pantalla del invitado no serán escalados para compensar la alta resolución de la pantalla del anfitrión.</translation>
     </message>
     <message>
         <source>Use &Unscaled HiDPI Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar salida HiDPI sin &escalar</translation>
     </message>
     <message>
         <source>Acceleration:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aceleración:</translation>
     </message>
     <message>
         <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
+        <translation>Soporte HiDPI:</translation>
     </message>
     <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el número de puerto del servidor VRDP. Puede especificar  <tt>0</tt> (cero), para seleccionar el puerto 3389, el puerto estándar para RDP.</translation>
     </message>
     <message>
         <source>Selects the VRDP authentication method.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecciona el método de autenticación VRDP.</translation>
     </message>
     <message>
         <source>Holds the timeout for guest authentication, in milliseconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el tiempo de espera para la autenticación del invitado, en milisegundos.</translation>
     </message>
     <message>
         <source>When checked, multiple simultaneous connections to the VM are permitted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, múltiples conexiones simultáneas a la MV son permitidas.</translation>
     </message>
     <message>
         <source>Holds the filename VirtualBox uses to save the recorded content.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el nombre de archivo que VirtualBox usa para guardar el contenido grabado.</translation>
     </message>
     <message>
         <source>Selects the resolution (frame size) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecciona la resolución (tamaño de fotograma) del vídeo grabado.</translation>
     </message>
     <message>
         <source>Holds the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene la resolución <b>horizontal</b> (anchura de fotograma) del vídeo grabado.</translation>
     </message>
     <message>
         <source>Holds the <b>vertical</b> resolution (frame height) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene la resolución <b>vertical</b> (altura de fotograma) del vídeo grabado.</translation>
     </message>
     <message>
         <source>Controls the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Controla el número máximo de <b>fotogramas por segundo</b>. Los fotogramas adicionales serán descartados. Reduciendo este valor incrementará el número de fotogramas descartados y reducirá el tamaño de archivo.</translation>
     </message>
     <message>
         <source>Controls the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Controla la <b>calidad</b>. Incrementando este valor el vídeo se verá mejor a costa de incrementar el tamaño de archivo.</translation>
     </message>
     <message>
         <source>Holds the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene la tasa de bits en <b>kilobits por segundo</b>. Incrementando este valor el vídeo se verá mejor a costa de incrementar el tamaño de archivo.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta máquina virtual tiene asignada menos de <b>%1</b> de memoria de vídeo que es la cantidad mínima requerida para cambiar entre pantalla completa o modo fluído.</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>When checked, enables video recording for screen %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, habilita la grabación para la pantalla %1.</translation>
     </message>
 </context>
 <context>
@@ -6095,71 +6095,71 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enc&ryption</source>
-        <translation type="unfinished"></translation>
+        <translation>&Cifrado</translation>
     </message>
     <message>
         <source>When checked, enables encryption for this virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, habilita el cifrado para esta máquina virtual.</translation>
     </message>
     <message>
         <source>En&able Encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar &cifrado</translation>
     </message>
     <message>
         <source>Encryption C&ipher:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Algoritmo de cifrado:</translation>
     </message>
     <message>
         <source>E&nter New Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Inserte nueva contraseña:</translation>
     </message>
     <message>
         <source>Holds the password to be assigned to the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contine la contraseña a asignar a la máquina virtual.</translation>
     </message>
     <message>
         <source>C&onfirm New Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Confirmar nueva contraseña:</translation>
     </message>
     <message>
         <source>Confirms the password to be assigned to the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Confirma la contraseña a asignar a la máquina virtual.</translation>
     </message>
     <message>
         <source>You are trying to encrypt this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site.</source>
-        <translation type="unfinished"></translation>
+        <translation>Está intentando cifrar esta máquina virtual. Sin embargo, requere que <i>%1</i> esté instalado. Instale el «Extension Pack» desde el sitio de descargas de VirtualBox.</translation>
     </message>
     <message>
         <source>Encryption cipher type not specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Algoritmo de cifrado no especificado.</translation>
     </message>
     <message>
         <source>Encryption password empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contraseña de cifrado vacía.</translation>
     </message>
     <message>
         <source>Encryption passwords do not match.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contraseñas de cifrado no coinciden.</translation>
     </message>
     <message>
         <source>Leave Unchanged</source>
         <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dejar sin cambiar</translation>
     </message>
     <message>
         <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecciona el algoritmo de cifrado para cifrar los discos de las máquinas virtuales.</translation>
     </message>
     <message>
         <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene la ruta donde serán almacenadas las instantáneas de esta máquina virtual. Tenga en cuenta que las instantáneas pueden ocupar mucho espacio en disco.</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsInterface</name>
     <message>
         <source>Allows to modify VM menu-bar contents.</source>
-        <translation type="unfinished"></translation>
+        <translation>Permite modificar los contenidos de la barra de menú de la MV.</translation>
     </message>
     <message>
         <source>100%</source>
@@ -6171,7 +6171,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Mini ToolBar:</source>
-        <translation type="unfinished">Mini barra herramientas:</translation>
+        <translation>Minibarra de herramientas:</translation>
     </message>
     <message>
         <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
@@ -6187,23 +6187,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Show at &Top of Screen</source>
-        <translation type="unfinished">Mostrar en la parte &superior de la pantalla</translation>
+        <translation>Mostrar en la parte &superior de la pantalla</translation>
     </message>
     <message>
         <source>Allows to modify VM status-bar contents.</source>
-        <translation type="unfinished"></translation>
+        <translation>Permite modificar los contenidos de la barra de estado de la MV.</translation>
     </message>
     <message>
         <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, muestra la minibarra de herramientas en pantalla completa y modo fluído.</translation>
     </message>
     <message>
         <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar en pantalla &completa/fluído</translation>
     </message>
     <message>
         <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, muestra la minibarra de herramientas en la parte superior de la pantalla, en vez de en su posición predeterminada en la parte inferior de la pantalla.</translation>
     </message>
 </context>
 <context>
@@ -6441,23 +6441,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecciona la manera en que este adaptador se conecta a la red real del SO anfitrión.</translation>
     </message>
     <message>
         <source>Shows additional network adapter options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Muestra opciones adicionales de los adaptadores de red.</translation>
     </message>
     <message>
         <source>Holds the configuration settings for the network attachment driver. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene las preferencias de configuración para el controlador de red. Las preferencias debería ser de la forma <b>nombre=valor</b> y dependerán del controlador. Use <b>shift-enter</b> para añadir una nueva entrada.</translation>
     </message>
     <message>
         <source>When checked, the virtual network cable is plugged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, el cable de la red virtual está conectado.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Muestra una ventana para configurar las reglas de reenvío de puertos.</translation>
     </message>
 </context>
 <context>
@@ -6559,23 +6559,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">No se ha especificado IRQ actualmente.</translation>
+        <translation>No se ha especificado IRQ actualmente.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">No se ha especificado puerto I/O actualmente.</translation>
+        <translation>No se ha especificado puerto I/O actualmente.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">Dos o más puertos tienen las mismas preferencias.</translation>
+        <translation>Dos o más puertos tienen las mismas preferencias.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">No se ha especificado ruta de puerto actualmente.</translation>
+        <translation>No se ha especificado ruta de puerto actualmente.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Hay especificadas rutas de puerto duplicadas actualmente.</translation>
+        <translation>Hay especificadas rutas de puerto duplicadas actualmente.</translation>
     </message>
 </context>
 <context>
@@ -6736,27 +6736,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar carpeta compartida</translation>
     </message>
     <message>
         <source>Edit Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar carpeta compartida</translation>
     </message>
     <message>
         <source>Remove Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar carpeta compartida</translation>
     </message>
     <message>
         <source>Adds new shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar nueva carpeta compartida.</translation>
     </message>
     <message>
         <source>Edits selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar carpeta compartida seleccionada.</translation>
     </message>
     <message>
         <source>Removes selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar carpeta compartida seleccionada.</translation>
     </message>
 </context>
 <context>
@@ -6811,7 +6811,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, this shared folder will be permanent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, esta carpeta compartida será permanente.</translation>
     </message>
 </context>
 <context>
@@ -6895,43 +6895,43 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Connect to existing pipe/socket</source>
-        <translation type="unfinished"></translation>
+        <translation>&Conectar a tubería/socket existente</translation>
     </message>
     <message>
         <source>&Path/Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ruta/Dirección:</translation>
     </message>
     <message>
         <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
-        <translation type="unfinished"></translation>
+        <translation><p>En modo <b>Tubería anfitrión</b>: contiene la ruta a la tubería del puerto serie en el anfitrión. Ejemplos: "\\.\pipe\myvbox" or "/tmp/myvbox", para Windows y UNIX respectivamente.</p><p>En modo <b>Dispositivo anfitrión</b>: contiene el nombre de dispositivo serie del anfitrión. Ejemplos: "COM1" or "/dev/ttyS0".</p><p>En modo <b>Archivo crudo</b>: contiene la  [...]
     </message>
     <message>
         <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecciona el modo de trabajo del puerto serie. Si selecciona <b>Desconectado</b>, el SO invitado detectará el puerto serie pero no podrá trabajar con él.</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, la máquina virtual asumirá que la tubería especificada en el campo <b>Ruta/Dirección</b> existe e intentará usarla. Sino, la tubería o socket será creada por la máquina virtual cuando se inicie.</translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">No se ha especificado IRQ actualmente.</translation>
+        <translation>No se ha especificado IRQ actualmente.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">No se ha especificado puerto I/O actualmente.</translation>
+        <translation>No se ha especificado puerto I/O actualmente.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">Dos o más puertos tienen las mismas preferencias.</translation>
+        <translation>Dos o más puertos tienen las mismas preferencias.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">No se ha especificado ruta de puerto actualmente.</translation>
+        <translation>No se ha especificado ruta de puerto actualmente.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Hay especificadas rutas de puerto duplicadas actualmente.</translation>
+        <translation>Hay especificadas rutas de puerto duplicadas actualmente.</translation>
     </message>
 </context>
 <context>
@@ -7419,11 +7419,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add USB Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar controlador USB</translation>
     </message>
     <message>
         <source>&Hot-pluggable</source>
-        <translation type="unfinished"></translation>
+        <translation>Conectable en &caliente</translation>
     </message>
     <message>
         <source>Choose a virtual optical disk file...</source>
@@ -7431,107 +7431,112 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add Optical Drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar unidad óptica</translation>
     </message>
     <message>
         <source>Add Floppy Drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar unidad de disquete</translation>
     </message>
     <message>
         <source>Optical &Drive:</source>
-        <translation type="unfinished"></translation>
+        <translation>Unidad &óptica:</translation>
     </message>
     <message>
         <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione un disco optico virtual o una unidad física a usar con la unidad virtual. La máquina virtual verá el disco insertado en la unidad con los datos en el archivo o en el disco en la unidad física como sus contenidos.</translation>
     </message>
     <message>
         <source>Encrypted with key:</source>
-        <translation type="unfinished"></translation>
+        <translation>Cifrado con clave:</translation>
     </message>
     <message>
         <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista todos los controladores de almacenamiento para esta máquina virtual y las imágenes virtuales y las unidades conectadas a ellos.</translation>
     </message>
     <message>
         <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el nombre del controlador de almacenamiento seleccionado actualmente en el árbol de almacenamiento.</translation>
     </message>
     <message>
         <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, permite usar las capacidades de caché de E/S del anfitrión.</translation>
     </message>
     <message>
         <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, el disco virtual no será desmontado cuando el SO invitado lo extrae.</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, el sistema operativo invitado reconocerá el disco virtual como un disco de estado solido (SSD).</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, el sistema invitado reconocerá al disco virtual como un dispositivo conectable en caliente.</translation>
     </message>
     <message>
         <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Seleccionar un archivo de imagen de disco virtual...</translation>
     </message>
     <message>
         <source>Image</source>
         <comment>storage image</comment>
-        <translation type="unfinished">Imagen</translation>
+        <translation>Imagen</translation>
     </message>
     <message>
         <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Expande/Colapsa&nbsp;elemento.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Agregar&nbsp;disco&nbsp;duro</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Agregar&nbsp;unidad&nbsp;óptica</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Agregar&nbsp;unidad&nbsp;de&nbsp;disquete</nobr></translation>
     </message>
     <message>
         <source>Adds new storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar nuevo controlador de almacenamiento.</translation>
     </message>
     <message>
         <source>Removes selected storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar controlador de almacenamiento seleccionado.</translation>
     </message>
     <message>
         <source>Adds new storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agrega una nueva conexión de almacenamiento.</translation>
     </message>
     <message>
         <source>Removes selected storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina la conexión de almacenamiento seleccionada.</translation>
     </message>
     <message>
         <source>Create New Hard Disk...</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear nuevo disco duro...</translation>
     </message>
     <message>
         <source>Choose Virtual Hard Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione archivo de disco duro virtual...</translation>
     </message>
     <message>
         <source>Choose Virtual Optical Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione archivo de disco óptico virtual...</translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
-        <translation type="unfinished"></translation>
+        <source>Remove Disk from Virtual Drive</source>
+        <translation>Eliminar disco de la unidad virtual</translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
+        <translation>Seleccionar archivo de disquete virtual...</translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7820,53 +7825,53 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Paravirtualization Interface:</source>
-        <translation type="unfinished"></translation>
+        <translation>Interfaz de &paravirtualización:</translation>
     </message>
     <message>
         <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecciona la interfaz de paravirtualización de invitado a ser usada para esta máquina virtual.</translation>
     </message>
     <message>
         <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>La característica I/O APIC no está actualmente habilitada en la sección placa base de la página del sistema. Esto es necesario para soportar un chip del tipo ICH9 que has habilitado para esta MV. Se hará automáticamente si confirma sus cambios.</translation>
     </message>
     <message>
         <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>La emulación del controlador USB no está actualmente habilitada en la página USB. Esto es necesario para soportar un dispositivo de entrada emulada USB que has habilitado para esta MV. Se hará automáticamente si confirma sus cambios.</translation>
     </message>
     <message>
         <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>La característica I/O APIC no está habilitada actualmente en la sección placa base de la página del sistema. Esto es necesario para soportar más de un procesador virtual que has seleccionado para esta MV. Se hará automáticamente si confirma sus cambios.</translation>
     </message>
     <message>
         <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>El hardware de virtualización no está actualmente habilitado en la sección Aceleración de la página del sistema. Esto es necesario para soportar más de un procesador virtual que has seleccionado para esta MV. Se hará automáticamente si confirma sus cambios.</translation>
     </message>
     <message>
         <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, el dispositivo RTC informará del tiempo en UTC, en caso contrario en tiempo local (anfitrión). Unix normalmente espera que el reloj esté establecido en UTC.</translation>
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1 CPU</source>
         <comment>%1 is 1 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPU</translation>
     </message>
     <message>
         <source>%1 CPUs</source>
         <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPUs</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
 </context>
 <context>
@@ -8006,79 +8011,79 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>USB &1.1 (OHCI) Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlador USB &1.1 (OHCI)</translation>
     </message>
     <message>
         <source>USB &2.0 (EHCI) Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlador USB &2.0 (EHCI)</translation>
     </message>
     <message>
         <source>USB &3.0 (xHCI) Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlador USB &3.0 (xHCI)</translation>
     </message>
     <message>
         <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>USB 2.0/3.0 está habilitado actualmente para esta máquina virtual. Sin embargo, esto require que <b>%1</b> esté instalado. Instale el «Extension Pack» desde el sitio de descargas de VirtualBox o deshabilite USB 2.0/3.0 para iniciar la máquina.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, habilita el controlador USB OHCI de esta máquina. El controlador USB OHCI proporciona soporte USB 1.0.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, habilita el controlador USB EHCI de esta máquina. El controlador USB EHCI proporciona soporte USB 2.0.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionado, habilita el controlador USB xHCI de esta máquina. El controlador USB xHCI proporciona soporte USB 3.0.</translation>
     </message>
     <message>
         <source>Add Empty Filter</source>
-        <translation type="unfinished">Agregar Filtro Vacío</translation>
+        <translation>Agregar filtro vacío</translation>
     </message>
     <message>
         <source>Add Filter From Device</source>
-        <translation type="unfinished">Agregar Filtro desde Dispositivo</translation>
+        <translation>Agregar filtro desde dispositivo</translation>
     </message>
     <message>
         <source>Edit Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar filtro</translation>
     </message>
     <message>
         <source>Remove Filter</source>
-        <translation type="unfinished">Eliminar Filtro</translation>
+        <translation>Eliminar filtro</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
-        <translation type="unfinished">Mover el Filtro hacia Arriba</translation>
+        <translation>Mover el filtro hacia arriba</translation>
     </message>
     <message>
         <source>Move Filter Down</source>
-        <translation type="unfinished">Mover el Filtro hacia Abajo</translation>
+        <translation>Mover el filtro hacia abajo</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agrega un nuevo filtro USB con todos los campos inicialmente establecidos a cadenas vacías. Tenga en cuenta que un filtro así filtrará cualquier dispositivo USB conectado.</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agrega un nuevo filtro USB con todos los campos establecidos al dispositivo USB selecionado conectado al PC anfitrión.</translation>
     </message>
     <message>
         <source>Edits selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Edita el filtro USB seleccionado.</translation>
     </message>
     <message>
         <source>Removes selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina el filtro USB seleccionado.</translation>
     </message>
     <message>
         <source>Moves selected USB filter up.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mueve el filtro USB seleccionado hacia arriba.</translation>
     </message>
     <message>
         <source>Moves selected USB filter down.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mueve el filtro USB seleccionado hacia abajo.</translation>
     </message>
 </context>
 <context>
@@ -8184,35 +8189,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el ID del vendedor del filtro. La cadena de <i>coincidencia exacta</i> es <tt>XXXX</tt> donde <tt>X</tt> es un dígito hexadecimal. Una cadena vacía coincidirá con cualquier valor.</translation>
     </message>
     <message>
         <source>Holds the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el ID del producto del filtro. La cadena de <i>coincidencia exacta</i> es <tt>XXXX</tt> donde <tt>X</tt> es un dígito hexadecimal. Una cadena vacía coincidirá con cualquier valor.</translation>
     </message>
     <message>
         <source>Holds the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el número de revisión del filtro. La cadena de <i>coincidencia exacta</i> es <tt>IIFF</tt> donde <tt>I</tt> es un dígito decimal de una parte entera y <tt>F</tt> es un dígito decimal de una parte fraccional. Una cadena vacía coincidirá con cualquier valor.</translation>
     </message>
     <message>
         <source>Holds the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el productor del filtro como una cadena de <i>coincidencia exacta</i>. Una cadena vacía coincidirá con cualquier valor.</translation>
     </message>
     <message>
         <source>Holds the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el nombre del producto del filtro como una cadena de <i>coincidencia exacta</i>. Una cadena vacía coincidirá con cualquier valor.</translation>
     </message>
     <message>
         <source>Holds the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el número de serie del filtro como una cadena de <i>coincidencia exacta</i>. Una cadena vacía coincidirá con cualquier valor.</translation>
     </message>
     <message>
         <source>Holds the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene el puerto USB anfitrión del filtro como una cadena de <i>coincidencia exacta</i>. Una cadena vacía coincidirá con cualquier valor.</translation>
     </message>
     <message>
         <source>Holds whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene cuando este filtro se aplica a un dispositivo USB conectado localmente a la computadora anfitrión (<i>No</i>), a una computadora con cliente VRDP (<i>Sí</i>) o a ambos (<i>Cualquiera</i>).</translation>
     </message>
 </context>
 <context>
@@ -8253,11 +8258,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Removing medium...</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminando medio...</translation>
     </message>
     <message>
         <source>&Hard disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Discos duros</translation>
     </message>
 </context>
 <context>
@@ -8287,23 +8292,23 @@ p, li { white-space: pre-wrap; }
     <name>UIMenuBarEditorWidget</name>
     <message>
         <source>Virtual Screen Resize</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar tamaño pantalla virtual</translation>
     </message>
     <message>
         <source>Virtual Screen Mapping</source>
-        <translation type="unfinished"></translation>
+        <translation>Mapeo de pantalla virtual</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Cerrar</translation>
+        <translation>Cerrar</translation>
     </message>
     <message>
         <source>Switch</source>
-        <translation type="unfinished">Cambiar</translation>
+        <translation>Cambiar</translation>
     </message>
     <message>
         <source>Enable Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar barra de menú</translation>
     </message>
 </context>
 <context>
@@ -10171,156 +10176,156 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al conectar la cámara web <b>%1</b> a la máquina virtual <b>%2</b>.</translation>
     </message>
     <message>
         <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al desconectar la cámara web <b>%1</b> de la máquina virtual <b>%2</b>.</translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Las «Guest Additions» de VirtualBox no parecen estar disponibles en esta máquina virtual y las carpetas compartidas no pueden ser usadas sin ellas. Para usar las carpetas compartidas dentro de la máquina virtual instale las «Guest Additions» si no están instaladas o reinstalelas si no están funcionando correctamente seleccionando <b>Insertar «Guest Additions»</b> del menú <b>Dispositivos</b>. Si están instaladas las carpetas compartid [...]
     </message>
     <message>
         <source>Insert</source>
         <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <translation>Insertar</translation>
     </message>
     <message>
         <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>La pantalla virtual está actualmente establecida a un modo de color <b>%1&nbsp;bit</b>. Para mejor rendimiento cambie esto a <b>%2&nbsp;bit</b>. Este puede hacerse desde la sección <b>Pantalla</b> del Panel de control o Preferencias del sistema del sistema operativo invitado.</p></translation>
     </message>
     <message>
         <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
+        <translation>Las reglas actuales de reenvío de puertos no son válidas. Los nombres de las reglas deben ser únicos.</translation>
     </message>
     <message>
         <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
-        <translation type="unfinished"></translation>
+        <translation>Las reglas actuales de reenvío de puertos no son válidas. Algunas reglas tienen los mismos puertos de máquina y confictos con direcciones IP.</translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Fallo al crear el objeto COM de VirtualBox.</p><p>La aplicación se cerrará ahora.</p></translation>
     </message>
     <message>
         <source>Failed to set the global VirtualBox extra data for key <i>%1</i> to value <i>{%2}</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al establecer dato extra de VirtualBox para la clave <i>%1</i> al valor <i>{%2}</i>.</translation>
     </message>
     <message>
         <source>Failed to set the extra data for key <i>%1</i> of machine <i>%2</i> to value <i>{%3}</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al establecer dato extra para la clave <i>%1</i> de la máquina <i>%2</i> al valor <i>{%3}</i>.</translation>
     </message>
     <message>
         <source>Failed to save the settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al guardar preferencias.</translation>
     </message>
     <message>
         <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Está a punto de agregar una nueva unidad óptica al controlador <b>%1</b>.</p><p>¿Desea seleccionar un disco óptico virtual a poner en la unidad o desea dejarla vacía por ahora?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>¿Está seguro de que quiere eliminar la unidad óptica?</p><p>No podrá insertar ningún disco óptico o imagen ISO ni instalar las «Guest Additions» sin ella.</p></translation>
     </message>
     <message>
         <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al conectar unidad óptica (<nobr><b>%1</b></nobr>) de la ranura <i>%2</i> de la máquina <b>%3</b>.</translation>
     </message>
     <message>
         <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al conectar unidad de disquete (<nobr><b>%1</b></nobr>) de la ranura <i>%2</i> de la máquina <b>%3</b>.</translation>
     </message>
     <message>
         <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al desconectar unidad óptica (<nobr><b>%1</b></nobr>) de la ranura <i>%2</i> de la máquina <b>%3</b>.</translation>
     </message>
     <message>
         <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al desconectar unidad de disquete (<nobr><b>%1</b></nobr>) de la ranura <i>%2</i> de la máquina <b>%3</b>.</translation>
     </message>
     <message>
         <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No se puede insertar el archivo de imagen de las <b>«Guest Additions» de VirtualBox</b> en la máquina virtual <b>%1</b> dado que la máquina no tiene unidades ópticas. Agregue una unidad usando la página de almacenamiento de la ventana de preferencias de la máquina virtual.</p></translation>
     </message>
     <message>
         <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>El archivo de imagen de las <b>«Guest Additions» de VirtualBox</b> ha sido descargado correctamente de <nobr><a href="%1">%1</a></nobr> y guardado localmente como <nobr><b>%2</b>.</nobr></p><p>¿Desea registrar este archivo de imagen de disco e insertarlo en la unidad óptica virtual?</p></translation>
     </message>
     <message>
         <source>Bad password or authentication failure.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contraseña incorrecta o fallo de autenticación.</translation>
     </message>
     <message>
         <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Ha ocurrido un error crítico durante la ejecución de la máquina virtual y ha sido parada.</p><p>Para obtener ayuda, vaya a la sección «Community» en <a href="http://www.virtualbox.org">http://www.virtualbox.org</a> o su contrato de soporte. Proporcione los contenidos de los archivos de trazas <tt>VBox.log</tt> y el archivo de imagen <tt>VBox.png</tt>, que puede encontrar en el directorio <nobr>& [...]
     </message>
     <message>
         <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Ha ocurrido un error crítico durante la ejecución de la máquina virtual y ha sido parada.</p><p>Para obtener ayuda, vaya a la sección «Community» en <a href="http://www.virtualbox.org">http://www.virtualbox.org</a> o su contrato de soporte. Proporcione los contenidos de los archivos de trazas <tt>VBox.log</tt> que puede encontrar en el directorio de trazas de la máquina, asi como una descripción de lo que estaba  [...]
     </message>
     <message>
         <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>¡Hay una nueva versión de VirtualBox! La versión <b>%1</b> se encuentra disponible en <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Puede descargar dicha versión usando el enlace:</p><p><a href="%2">%3</a></p></translation>
     </message>
     <message>
         <source>Drag and drop operation from host to guest failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>La operación de arrastrar y soltar del anfitrión al invitado falló.</translation>
     </message>
     <message>
         <source>Unable to cancel host to guest drag and drop operation.</source>
-        <translation type="unfinished"></translation>
+        <translation>No se puede cancelar la operación arrastrar y soltar del anfitrión al invitado.</translation>
     </message>
     <message>
         <source>Drag and drop operation from guest to host failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>La operación de arrastrar y soltar del invitado al anfitrión falló.</translation>
     </message>
     <message>
         <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al conectar el cable de adaptador de red de la máquina virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al desconectar el cable de adaptador de red de la máquina virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Uno o más archivos de disco virtuales no están accesibles. Como resultado, no se pueden operar las máquinas virtuales que usen estos archivos hasta que estén accesibles.</p><p>Presione <b>Comprobar</b> para abrir la ventana del Administrador de medios virtuales y ver que medios están inaccesibles o presione <b>Ignorar</b> para ignorar este mensaje.</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Al eliminar una instantánea se descartará la información de estado guardada en ella y los datos almacenados de forma dispersa en varios archivos de imagen que VirtualBox ha creado junto con la instatánea serán fusionados en un archivo. Esto puede ser un proceso largo y la información de la instantánea no puede ser recuperada.</p></p>¿Está seguro que desea eliminar la instantánea seleccionada <b>%1</b>?</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Eliminando la instantánea %1 requerirá temporalmente de más espacio en disco. En el peor caso el tamaño de la imagen %2 crecerá %3 más, sin embargo en el sistema de archivos hay solamente %4 libres.</p><p> Agotar el espacio en disco durante la operación de fusión de archivos podría resultar en la corrupción de la imagen de disco y la configuración de la MV, es decir puede haber pérdidas en los datos de la MV.</p><p>Puede continuar eli [...]
     </message>
     <message>
         <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>¿Esta seguro de que quiere liberar el archivo de imagen de disco <nobr><b>%1</b></nobr>?</p><p>Esto lo desunirá de las siguientes máquinas virtuales: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
-        <translation type="unfinished"></translation>
+        <translation><p>¿Desea eliminar la unidad de almacenamiento del disco duro virtual <nobr><b>%1</b></nobr>?</p><p>Si selecciona <b>Eliminar</b> entonces la unidad de almacenamiento especificada será eliminada definitivamente. Esta operación <b>no se puede deshacer</b>.</p><p>Si selecciona <b>Mantener</b> entonces el disco duro sólo será eliminado de la lista de discos duros conocidos, pero la [...]
     </message>
     <message>
         <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al abrir el archivo de imagen de disco <nobr><b>%1</b></nobr>.</translation>
     </message>
     <message>
         <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallo al cerrar el archivo de imagen de disco <nobr><b>%1</b></nobr>.</translation>
     </message>
     <message>
         <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Está a punto de crear una nueva máquina virtual sin un disco duro. No podrá instalar un sistema operativo en la máquina hasta que agrege uno. Mientras tanto solo podrá iniciar la máquina usando un disco óptico virtual o desde la red.</translation>
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>La ventana de la máquina virtual será cambiada a modo <b>Pantalla completa</b>. Puede volver al modo ventana en cualquier momento pulsando <b>%1</b>.</p><p>Note que la tecla <i>Anfitrión</i> está actualmente definida como <b>%2</b>.</p><p>Note que la barra de menú principal en el modo a pantalla completa está oculta. Puede acceder a ella pulsando <b>Anfitrión+Inicio</b>.</ [...]
     </message>
     <message>
         <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>No se pudo activar el modo pantalla completa debido que no hay suficiente memoria de vídeo de invitado.</p><p>Se debe configurar la máquina virtual con al menos <b>%1</b> de memoria de vídeo.</p><p>Presione <b>Ignorar</b> para cambiar a modo pantalla completa de todos modos, o presione <b>Cancelar</b> para cancelar la operación.</p></translation>
     </message>
 </context>
 <context>
@@ -11475,55 +11480,55 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     <name>UIPortForwardingTable</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Nombre</translation>
+        <translation>Nombre</translation>
     </message>
     <message>
         <source>Protocol</source>
-        <translation type="unfinished">Protocolo</translation>
+        <translation>Protocolo</translation>
     </message>
     <message>
         <source>Host IP</source>
-        <translation type="unfinished">IP anfitrión</translation>
+        <translation>IP anfitrión</translation>
     </message>
     <message>
         <source>Host Port</source>
-        <translation type="unfinished">Puerto anfitrión</translation>
+        <translation>Puerto anfitrión</translation>
     </message>
     <message>
         <source>Guest IP</source>
-        <translation type="unfinished">IP invitado</translation>
+        <translation>IP invitado</translation>
     </message>
     <message>
         <source>Guest Port</source>
-        <translation type="unfinished">Puerto invitado</translation>
+        <translation>Puerto invitado</translation>
     </message>
     <message>
         <source>Contains a list of port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Continene una lista de reglas de reenvío de puerto.</translation>
     </message>
     <message>
         <source>Add New Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar nueva regla</translation>
     </message>
     <message>
         <source>Copy Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar regla seleccionada</translation>
     </message>
     <message>
         <source>Remove Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar regla seleccionada</translation>
     </message>
     <message>
         <source>Adds new port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agrega una nueva regla de reenvío.</translation>
     </message>
     <message>
         <source>Copies selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia la regla de reenvío de puerto seleccionada.</translation>
     </message>
     <message>
         <source>Removes selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina la regla de reenvío de puerto seleccionada.</translation>
     </message>
 </context>
 <context>
@@ -11640,7 +11645,7 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
+        <translation><h3>¡Bienvenido a VirtualBox!</h3><p>La parte izquierda de esta ventana está destinada a mostrar la lista de máquinas virtuales de su computadora. Esta lista está vacía porque todavía no ha creado ninguna máquina virtual.<img src=":/welcome.png" align="right"/></p><p>Para crear una nueva máquina virtual presione el botón <b>Nueva</b> en la barra de herramientas principal localizada en la parte superi [...]
     </message>
 </context>
 <context>
@@ -11729,7 +11734,7 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>Preferencias</translation>
     </message>
 </context>
 <context>
@@ -11808,37 +11813,37 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>User Interface</source>
-        <translation type="unfinished"></translation>
+        <translation>Interfaz de usuario</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Configuración</translation>
+        <translation>Configuración</translation>
     </message>
 </context>
 <context>
     <name>UISettingsSerializerProgress</name>
     <message>
         <source>Loading Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Cargando preferencias...</translation>
     </message>
     <message>
         <source>Saving Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Guardando preferencias...</translation>
     </message>
 </context>
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Cerrar</translation>
+        <translation>Cerrar</translation>
     </message>
     <message>
         <source>Enable Status Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar barra de estado</translation>
     </message>
     <message>
         <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Clic</b> para alternar indicador de presencia.</nobr><br><nobr><b>&Arrastrar y soltar</b> para cambiar indicador de posición.</nobr></translation>
     </message>
 </context>
 <context>
@@ -12006,11 +12011,11 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>&Continue running in the background</source>
-        <translation type="unfinished"></translation>
+        <translation>&Continuar corriendo en segundo plano</translation>
     </message>
     <message>
         <source><p>Close the virtual machine windows but keep the virtual machine running.</p><p>You can use the VirtualBox Manager to return to running the virtual machine in a window.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Cerrar las vetanas de la máquina virtual pero mantener la máquina virtual corriendo.</p><p>Puede usar el Gestor de VirtualBox para volver a la ventana de la máquina virtual.</p></translation>
     </message>
 </context>
 <context>
@@ -12196,11 +12201,11 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiempo de actividad</translation>
     </message>
     <message>
         <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo arrastrar y soltar</translation>
     </message>
 </context>
 <context>
@@ -12362,19 +12367,19 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>&Expert Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo &experto</translation>
     </message>
     <message>
         <source>Switch to <nobr><b>Expert Mode</b></nobr>, a one-page dialog for experienced users.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar a <nobr><b>Modo experto</b></nobr>, un diálogo de única página para usuarios con experiencia.</translation>
     </message>
     <message>
         <source>&Guided Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo &guiado</translation>
     </message>
     <message>
         <source>Switch to <nobr><b>Guided Mode</b></nobr>, a step-by-step dialog with detailed explanations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambiar a <nobr><b>Modo guiado</b></nobr>, un diálogo paso a paso con explicaciones detalladas.</translation>
     </message>
 </context>
 <context>
@@ -12476,75 +12481,75 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>Copy Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar disco duro virtual</translation>
     </message>
     <message>
         <source>Hard disk to copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Disco duro a copiar</translation>
     </message>
     <message>
         <source><p>Please select the virtual hard disk file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Seleccione el archivo del disco duro que quiere copiar si no está seleccionado. Puede seleccionar uno de la lista o usar el icono de carpeta al lado de la lista para seleccionar uno.</p></translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file to copy...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione un archivo de disco duro virtual a copiar...</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de archivo de disco duro</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione el tipo de archivo que quiere usar para el nuevo disco duro virtual. Si no necesita usarlo con otro software de virtualización puede dejar esta preferencia sin modificar.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Almacenamiento en disco duro físico</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione si el nuevo archivo de unidad de disco duro virtual debería crecer según se use (reserva dinámica) o si debería ser creado con su tamaño máximo (tamaño fijo).</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Un archivo de disco duro <b>reservado dinámicamente</b> solo usará espacio en su disco físico a medida que se llena (hasta un máximo <b>tamaño fijo</b>), sin embargo no se reducirá de nuevo automáticamente cuando el espacio en él se libere.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Un archivo de disco duro de <b>tamaño fijo</b> puede tomar más tiempo para su creación en algunos sistemas, pero normalmente es más rápido al usarlo.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>También puede seleccionar <b>dividir</b> el archivo de disco duro virtual en varios archivos de hasta dos gigabytes cada uno. Principalmente esto es útil si desea almacenar la máquina virtual en dispositivos USB extraíbles o en sistemas antiguos, algunos de los cuales no pueden manejar archivos muy grandes.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione una ubicación para el nuevo archivo de disco duro virtual</translation>
     </message>
     <message>
         <source>New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo disco duro a crear</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escriba el nombre del archivo de disco duro virtual en el campo debajo o haga clic en el icono de carpeta para seleccionar una carpeta diferente donde crear el archivo.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione una ubicación para el archivo de disco duro virtual...</translation>
     </message>
     <message>
         <source>Hard disk to &copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Disco duro a &copiar</translation>
     </message>
     <message>
         <source>&New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>&Nuevo disco duro a crear</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>&Tipo de archivo de disco duro</translation>
     </message>
 </context>
 <context>
@@ -12647,7 +12652,7 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Seleccione el tipo de clonación que desea crear.</p><p>Si selecciona <b>Clonación completa</b>, una copia exacta (incluyendo todos los archivos de disco duro virtual) de la máquina original serán creados.</p><p>Si selecciona <b>Clonación enlazada</b>, una nueva máquina será creada, pero los archivos de las unidades de disco duro virtuales serán vinculados a los archivos de disco duro virtual de la máquina origi [...]
     </message>
 </context>
 <context>
@@ -13017,51 +13022,51 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>Create Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Crear de disco duro virtual</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de archivo de disco duro</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecione el tipo de archivo que quiere usar para el nuevo disco duro virtual. Si no necesita usarlo con otro software de virtualización puede dejar esta configuración sin cambiar.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Almacenamiento en unidad de disco duro física</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione si el nuevo archivo de unidad de disco duro virtual debería crecer según se use (reserva dinámica) o si debería ser creado con su tamaño máximo (tamaño fijo).</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Un archivo de disco duro <b>reservado dinámicamente</b> solo usará espacio en su disco físico a medida que se llena (hasta un máximo <b>tamaño fijo</b>), sin embargo no se reducirá de nuevo automáticamente cuando el espacio en él se libere.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Un archivo de disco duro de <b>tamaño fijo</b> puede tomar más tiempo para su creación en algunos sistemas, pero normalmente es más rápido al usarlo.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>También puede seleccionar <b>dividir</b> el archivo de disco duro en varios archivos de hasta dos gigabytes cada uno. Principalmente esto es útil si desea almacenar la máquina virtual en dispositivos USB extraíbles o en sistemas antiguos, algunos de los cuales no pueden manejar archivos muy grandes.</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escriba el nombre del archivo de unidad de disco duro virtual en el campo debajo o haga clic en el icono de carpeta para seleccionar una carpeta diferente donde crear el archivo.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione una ubicación para el archivo de disco duro virtual...</translation>
     </message>
     <message>
         <source>Select the size of the virtual hard disk in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione el tamaño de disco duro virtual en megabytes. Este tamaño es el límite para el archivo de datos que una máquina virtual podrá almacenar en el disco duro.</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>&Tipo de archivo de disco duro</translation>
     </message>
 </context>
 <context>
@@ -13152,27 +13157,27 @@ este paso y luego conectar los Discos Duros desde el diálogo de Configuración
     </message>
     <message>
         <source>Hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Disco duro</translation>
     </message>
     <message>
         <source><p>If you wish you can add a virtual hard disk to the new machine. You can either create a new hard disk file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard disk is <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Si desea puede agregar un disco duro virtual a la nueva máquina. Puede crear un nuevo archivo de disco duro o seleccionar uno de la lista o de otra ubicación usando el icono de la carpeta.</p><p>. Si necesita una configuración de almacenamiento más compleja puede omitir este paso y hacer los cambios a las preferencias de la máquina virtual una vez creada.</p><p> El tamaño recomendado del disco duro es <b>%1</b>.</p>  [...]
     </message>
     <message>
         <source>&Do not add a virtual hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>&No agregar un disco duro virtual</translation>
     </message>
     <message>
         <source>&Create a virtual hard disk now</source>
-        <translation type="unfinished"></translation>
+        <translation>&Crear un disco duro virtual ahora</translation>
     </message>
     <message>
         <source>&Use an existing virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>&Usar un archivo de disco duro virtual existente</translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar un archivo de disco duro virtual...</translation>
     </message>
 </context>
 <context>
@@ -14458,7 +14463,7 @@ Versión %1</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished">El valor de la ruta predeterminada será mostrada después de aceptar los cambios y abrir nuevamente este diálogo.</translation>
+        <translation>El valor de la ruta predeterminada será mostrada después de aceptar los cambios y abrir nuevamente este diálogo.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -14510,19 +14515,19 @@ Versión %1</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Muestra una ventana para seleccionar una carpeta diferente.</translation>
     </message>
     <message>
         <source>Displays a window to select a different file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Muestra una ventana para seleccionar un archivo diferente.</translation>
     </message>
     <message>
         <source>Holds the folder path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene la ruta de carpeta.</translation>
     </message>
     <message>
         <source>Holds the file path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene la ruta de archivo.</translation>
     </message>
 </context>
 <context>
@@ -15751,7 +15756,7 @@ Versión %1</translation>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">La conexión de este disco duro será realizada indirectamente usando un nuevo disco duro diferenciado.</translation>
+        <translation>La conexión de este disco duro será realizada indirectamente usando un nuevo disco duro diferenciado.</translation>
     </message>
     <message>
         <source>Some of the media in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these media.</source>
@@ -15761,7 +15766,7 @@ Versión %1</translation>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Este disco duro base está indirectamente conectado usando el siguiente disco duro diferenciado:</translation>
+        <translation>Este disco duro base está indirectamente conectado usando el siguiente disco duro diferenciado:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -16489,153 +16494,153 @@ Versión %1</translation>
     <message>
         <source>USB</source>
         <comment>StorageControllerType</comment>
-        <translation type="unfinished">USB</translation>
+        <translation>USB</translation>
     </message>
     <message>
         <source>USB Port %1</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
+        <translation>Puerto USB %1</translation>
     </message>
     <message>
         <source>off</source>
         <comment>guest monitor status</comment>
-        <translation type="unfinished"></translation>
+        <translation>apagado</translation>
     </message>
     <message>
         <source>Paravirtualization Interface</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>Interfaz de paravirtualización</translation>
     </message>
     <message>
         <source>None</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ninguna</translation>
     </message>
     <message>
         <source>Default</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation>Predeterminada</translation>
     </message>
     <message>
         <source>Legacy</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation>Heredada</translation>
     </message>
     <message>
         <source>Minimal</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation>Mínima</translation>
     </message>
     <message>
         <source>Hyper-V</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hyper-V</translation>
     </message>
     <message>
         <source>New dynamically allocated storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nuevo almacenamiendo dinámicamente reservado</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished">Activo</translation>
+        <translation>Activo</translation>
     </message>
     <message>
         <source>Inactive</source>
         <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inactiva</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished">Activo</translation>
+        <translation>Activo</translation>
     </message>
     <message>
         <source>Inactive</source>
         <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inactiva</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>details report (Unrestricted Execution)</comment>
-        <translation type="unfinished">Activo</translation>
+        <translation>Activo</translation>
     </message>
     <message>
         <source>Inactive</source>
         <comment>details report (Unrestricted Execution)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inactiva</translation>
     </message>
     <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tomando instantánea</translation>
     </message>
     <message>
         <source>Taking Online Snapshot</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tomando instatánea en linea</translation>
     </message>
     <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation>KVM</translation>
     </message>
     <message>
         <source>Optical</source>
         <comment>DeviceType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Óptica</translation>
     </message>
     <message>
         <source>TCP</source>
         <comment>PortMode</comment>
-        <translation type="unfinished">TCP</translation>
+        <translation>TCP</translation>
     </message>
     <message>
         <source>OHCI</source>
         <comment>USBControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>OHCI</translation>
     </message>
     <message>
         <source>EHCI</source>
         <comment>USBControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>EHCI</translation>
     </message>
     <message>
         <source>xHCI</source>
         <comment>USBControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation>xHCI</translation>
     </message>
     <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Interfaz de usuario</translation>
     </message>
     <message>
         <source>(Optical Drive)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Unidad óptica)</translation>
     </message>
     <message>
         <source>Encrypted</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Cifrada</translation>
     </message>
     <message>
         <source>Please choose a virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecione un archivo de disco duro</translation>
     </message>
     <message>
         <source>All virtual hard disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos los archivos de disco duro (%1)</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Medium Manager to inspect these files.</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Algunos de los archivos en esta cadena de discos duros son inaccesibles. Use el Gestor de medios virtuales para inspeccionar estos archivos.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione una localización para el nuevo archivo de disco duro virtual</translation>
     </message>
 </context>
 <context>
@@ -17524,15 +17529,15 @@ volver al idioma por omisión del sistema.</qt>
     </message>
     <message>
         <source>UUID:</source>
-        <translation type="unfinished"></translation>
+        <translation>UUID:</translation>
     </message>
     <message>
         <source><i>Not&nbsp;Encrypted</i></source>
-        <translation type="unfinished"></translation>
+        <translation><i>No&nbsp;cifrada</i></translation>
     </message>
     <message>
         <source>Encrypted with key:</source>
-        <translation type="unfinished"></translation>
+        <translation>Cifrada con clave:</translation>
     </message>
 </context>
 <context>
@@ -18645,19 +18650,19 @@ Esta funcionalidad requiere "Guest Additions" instalado.</qt></t
     </message>
     <message>
         <source>Restore selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Restaurar la instantánea de la máquina virtual seleccionada</translation>
     </message>
     <message>
         <source>Delete selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminar la instantánea de la máquina virtual seleccionada</translation>
     </message>
     <message>
         <source>Display a window with selected snapshot details</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar una ventana con los detalles de la instantánea seleccionada</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Clonar la máquina virtual seleccionada</translation>
     </message>
 </context>
 <context>
@@ -18718,7 +18723,7 @@ Esta funcionalidad requiere "Guest Additions" instalado.</qt></t
     </message>
     <message>
         <source>Snapshot %1</source>
-        <translation type="unfinished">Instantánea %1</translation>
+        <translation>Instantánea %1</translation>
     </message>
 </context>
 <context>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
index ba31185..9908a40 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
@@ -1,129 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="eu">
 <context>
     <name>@@@</name>
     <message>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="+2075"/>
         <source>English</source>
         <comment>Native language name</comment>
         <translation>Euskara</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>--</source>
         <comment>Native language country name (empty if this language is for all countries)</comment>
         <translation></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>English</source>
         <comment>Language name, in English</comment>
         <translation>Basque</translation>
     </message>
     <message>
+        <location line="+11"/>
         <source>--</source>
         <comment>Language country name, in English (empty if native country name is empty)</comment>
         <translation></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Oracle Corporation</source>
         <comment>Comma-separated list of translators</comment>
-        <translation>Piarres Beobide</translation>
+        <translation>Xabier Aramendi</translation>
     </message>
 </context>
 <context>
-    <name>AttachmentsModel</name>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="obsolete">Disko gogorrak</translation>
-    </message>
-</context>
-<context>
-    <name>BootItemsList</name>
-    <message>
-        <source>Move Up (Ctrl-Up)</source>
-        <translation type="obsolete">Gora Mugitu (Ktrl-Gora)</translation>
-    </message>
+    <name>QApplication</name>
     <message>
-        <source>Move Down (Ctrl-Down)</source>
-        <translation type="obsolete">Behera Mugitu (Ktrl-Behera)</translation>
+        <location filename="../src/main.cpp" line="+427"/>
+        <source>Executable <b>%1</b> requires Qt %2.x, found Qt %3.</source>
+        <translation>Exekutagarria <b>%1</b> behar du Qt %2.x, aurkituta Qt %3.</translation>
     </message>
     <message>
-        <source>Moves the selected boot device up.</source>
-        <translation type="obsolete">Hautatutako abio gailua gora mugitzen du.</translation>
+        <location line="+4"/>
+        <source>Incompatible Qt Library Error</source>
+        <translation>Bateraezintasun Qt Liburutegi Akatsa</translation>
     </message>
     <message>
-        <source>Moves the selected boot device down.</source>
-        <translation type="obsolete">Hautatutako abio gailua behera mugitzen du.</translation>
+        <location line="+199"/>
+        <source>VirtualBox - Error In %1</source>
+        <translation>VirtualBox - Akatsa Hemen %1</translation>
     </message>
-</context>
-<context>
-    <name>BootItemsTable</name>
     <message>
-        <source>Defines the boot device order. Use the checkboxes on the left to enable or disable individual boot devices. Move items up and down to change the device order.</source>
-        <translation type="obsolete">Abio gailu ordena ezartzen du. Aukerakutxak erabili abio gailuak gaitu edo ezgaitzeko. Elementuak gora eta behera mugitu gailu ordena aldatzeko.</translation>
+        <location line="+4"/>
+        <source><html><b>%1 (rc=%2)</b><br/><br/></source>
+        <translation><html><b>%1 (rc=%2)</b><br/><br/></translation>
     </message>
-</context>
-<context>
-    <name>HDItemsModel</name>
     <message>
-        <source>Hard Disk</source>
-        <translation type="obsolete">Disko gogorrak</translation>
+        <location line="-523"/>
+        <source>Please try reinstalling VirtualBox.</source>
+        <translation>Mesedez ezarri berriro VirtualBox.</translation>
     </message>
-</context>
-<context>
-    <name>QApplication</name>
     <message>
+        <location line="-5"/>
         <source>Make sure the kernel module has been loaded successfully.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Executable <b>%1</b> requires Qt %2.x, found Qt %3.</source>
-        <translation><b>%1</b> abiarazgarriak Qt %2.x behar du, Qt %3 aurkitu da.</translation>
-    </message>
-    <message>
-        <source>Incompatible Qt Library Error</source>
-        <translation>Bateraezin Qt Liburutegi Errorea</translation>
+        <translation>Zihurtu kernel moduloa ongi gertatu dela.</translation>
     </message>
     <message>
+        <location line="+463"/>
         <source>VirtualBox - Runtime Error</source>
-        <translation type="unfinished"></translation>
+        <translation>VirtualBox - Runtime Akatsa</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source><b>Cannot access the kernel driver!</b><br/><br/></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kernel driver not accessible</source>
-        <translation type="unfinished"></translation>
+        <translation><b>Ezin da kernel gidagailura sartu!</b><br/><br/></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>Unknown error %2 during initialization of the Runtime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VirtualBox - Error In %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><html><b>%1 (rc=%2)</b><br/><br/></source>
-        <translation type="unfinished"></translation>
+        <translation>%2 akats ezezaguna Runtime abiarazpenean</translation>
     </message>
     <message>
-        <source>Please try reinstalling VirtualBox.</source>
-        <translation type="unfinished"></translation>
+        <location line="-10"/>
+        <source>Kernel driver not accessible</source>
+        <translation>Kernel gidagailua ez dago eskuragarri</translation>
     </message>
     <message>
+        <location line="-498"/>
         <source>The VirtualBox kernel modules do not match this version of VirtualBox. The installation of VirtualBox was apparently not successful. Please try completely uninstalling and reinstalling VirtualBox.</source>
-        <translation type="unfinished"></translation>
+        <translation>VirtualBox kernel moduloak ez datoz bat VirtualBox-en bertsio honekin. VirtualBox-en ezarpenak dirudienez ez da ongi egin. Mesedez saiatu osorik kentzen eta VirtualBox berriro ezartzen.</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>The VirtualBox kernel modules do not match this version of VirtualBox. The installation of VirtualBox was apparently not successful. Executing<br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>may correct this. Make sure that you do not mix the OSE version and the PUEL version of VirtualBox.</source>
-        <translation type="unfinished"></translation>
+        <translation>VirtualBox kernel moduloak ez datoz bat VirtualBox bertsio honekin. VirtualBox-en ezarpena dirudienez ez da ongi egin. <br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/> exekutatzeak hau zuzendu dezake. Zihurtatu ez dituzula VirtualBox-en OSE bertsioa eta PUEL bertsioa nahastu.</translation>
     </message>
     <message>
+        <location line="-22"/>
         <source>This error means that the kernel driver was either not able to allocate enough memory or that some mapping operation failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Akats honek esanahi dut kernel gidatzailea ez dela gauza nahikoa oroimen esleitzeko edo mapaketa eragiketaren batek huts egin duela.</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or there is a permission problem with /dev/vboxdrv. Please reinstall the kernel module by executing<br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>as root. If it is available in your distribution, you should install the DKMS package first. This package keeps track of Linux kernel changes and recompiles the vboxdrv kernel module if necess [...]
         <translation type="unfinished"></translation>
     </message>
@@ -131,83 +110,88 @@
 <context>
     <name>QIArrowSplitter</name>
     <message>
+        <location filename="../src/extensions/QIArrowButtonPress.cpp" line="+45"/>
         <source>&Back</source>
-        <translation type="unfinished"></translation>
+        <translation>&Atzera</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&Next</source>
-        <translation type="unfinished">&Hurrengoa</translation>
+        <translation>&Hurrengoa</translation>
     </message>
 </context>
 <context>
     <name>QIFileDialog</name>
     <message>
+        <location filename="../src/extensions/QIFileDialog.cpp" line="+270"/>
         <source>Select a directory</source>
-        <translation type="unfinished">Hautatu direktorio bat</translation>
+        <translation>Hautatu zuzenbidea</translation>
     </message>
     <message>
+        <location line="+196"/>
+        <location line="+257"/>
         <source>Select a file</source>
-        <translation type="unfinished">Hautatu fitxategi bat</translation>
-    </message>
-</context>
-<context>
-    <name>QIHelpButton</name>
-    <message>
-        <source>&Help</source>
-        <translation type="obsolete">&Laguntza</translation>
+        <translation>Hautatu agiri bat</translation>
     </message>
 </context>
 <context>
     <name>QILabel</name>
     <message>
+        <location filename="../src/extensions/QILabel.cpp" line="+202"/>
         <source>&Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&Kopiatu</translation>
     </message>
 </context>
 <context>
     <name>QIMessageBox</name>
     <message>
+        <location filename="../src/extensions/QIMessageBox.cpp" line="+274"/>
+        <location filename="../src/globals/UIMessageCenter.cpp" line="+1737"/>
+        <location filename="../src/widgets/UIPopupPaneButtonPane.cpp" line="+180"/>
         <source>OK</source>
-        <translation>Ados</translation>
+        <translation>Ongi</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location filename="../src/widgets/UIPopupPaneButtonPane.cpp" line="+10"/>
         <source>Yes</source>
         <translation>Bai</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <location filename="../src/widgets/UIPopupPaneButtonPane.cpp" line="+1"/>
         <source>No</source>
         <translation>Ez</translation>
     </message>
     <message>
+        <location line="-2"/>
+        <location filename="../src/widgets/UIPopupPaneButtonPane.cpp" line="-5"/>
         <source>Cancel</source>
-        <translation>Utzi</translation>
+        <translation>Ezeztatu</translation>
     </message>
     <message>
         <source>Ignore</source>
         <translation type="obsolete">Ezikusi</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIArrowSplitter.cpp" line="+336"/>
         <source>&Details</source>
-        <translation type="unfinished">&Xehetasunak</translation>
+        <translation>&Xehetasunak</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&Details (%1 of %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>&Xehetasunak (%1 -> %2-tik)</translation>
     </message>
     <message>
+        <location filename="../src/extensions/QIMessageBox.cpp" line="-21"/>
         <source>Copy all errors to the clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiatu akats guztiak gakora</translation>
     </message>
     <message>
+        <location line="+24"/>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIRichLabel</name>
-    <message>
-        <source>Copy to clipboard</source>
-        <translation type="obsolete">Arbelara kopiatu</translation>
+        <translation>Kopiatu</translation>
     </message>
 </context>
 <context>
@@ -215,7 +199,7 @@
     <message>
         <source>not complete</source>
         <comment>value state</comment>
-        <translation type="obsolete">ez betea</translation>
+        <translation type="obsolete">osatu gabe</translation>
     </message>
     <message>
         <source>invalid</source>
@@ -224,3060 +208,3755 @@
     </message>
     <message>
         <source><qt>The value of the <b>%1</b> field on the <b>%2</b> page is %3.</qt></source>
-        <translation type="obsolete"><qt><b>%2</b> orrialdeko <b>%1</b> eremuaren balioa %3 da.</qt></translation>
+        <translation type="obsolete"><qt><b>%1</b> eremuaren balioa <b>%2</b> orrialdean da %3.</qt></translation>
     </message>
     <message>
         <source><qt>One of the values on the <b>%1</b> page is %2.</qt></source>
-        <translation type="obsolete"><qt><b>%1</b> orrialdeko balio bat %2 da.</qt></translation>
+        <translation type="obsolete"><qt>Balioetako bat <b>%1</b> orrialdean da %2.</qt></translation>
     </message>
 </context>
 <context>
     <name>UIActionPool</name>
     <message>
+        <location filename="../src/runtime/UIActionPoolRuntime.cpp" line="+64"/>
+        <location filename="../src/selector/UIActionPoolSelector.cpp" line="+370"/>
         <source>&Machine</source>
         <translation>&Makina</translation>
     </message>
     <message>
-        <source>&Fullscreen Mode</source>
-        <translation type="obsolete">&Panataila Osoko Modua</translation>
-    </message>
-    <message>
-        <source>Switch to fullscreen mode</source>
-        <translation type="obsolete">Panataila oso modura aldatu</translation>
-    </message>
-    <message>
-        <source>Seam&less Mode</source>
-        <translation type="unfinished">Gardenta&sun Modua</translation>
-    </message>
-    <message>
-        <source>Switch to seamless desktop integration mode</source>
-        <translation type="obsolete">Idazmahai integrazio garden modura aldatu</translation>
-    </message>
-    <message>
-        <source>Auto-resize &Guest Display</source>
-        <translation type="unfinished">Automatikoki Tamaina Aldatu &Bezero Pantaila</translation>
-    </message>
-    <message>
         <source>Automatically resize the guest display when the window is resized (requires Guest Additions)</source>
-        <translation type="obsolete">Automatikoki tamainaz aldatu bezero pantaila leihoa tamaina aldatzean (Bezero Gehigarriak behar du)</translation>
+        <translation type="obsolete">Berezgaitasunez birneurriratzen du gonbidatu erakuspena leihoa birneurriratzerakoan (Gonbidatu Gehigarriak behar ditu)</translation>
     </message>
     <message>
+        <location line="+503"/>
         <source>&Adjust Window Size</source>
-        <translation>Leiho Tamaina &Doitu</translation>
+        <translation>&Zehaztu Leiho Neurria</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Adjust window size and position to best fit the guest display</source>
-        <translation>Leiho tamaina eta kokalekua doitu bezero pantaila hobe sartzeko</translation>
+        <translation>Zehaztu leiho neurria eta kokapena gonbidatu erakuspen hoberenera finkatzeko</translation>
     </message>
     <message>
         <source>Disable &Mouse Integration</source>
-        <translation type="obsolete">&Sagu Integrazioa ezgaitu</translation>
+        <translation type="obsolete">Ezgaitu &Sagu Baterapena</translation>
     </message>
     <message>
-        <source>Temporarily disable host mouse pointer integration</source>
-        <translation type="obsolete">Aldirako ezgaitu sagu markatzaile integrazioa</translation>
-    </message>
-    <message>
-        <source>Enable &Mouse Integration</source>
-        <translation type="obsolete">&Sagu integrazioa gaitu</translation>
+        <source>Show Session Information Window</source>
+        <translation type="obsolete">Erakutsi Saio Argibide Leihoa</translation>
     </message>
     <message>
-        <source>Enable temporarily disabled host mouse pointer integration</source>
-        <translation type="obsolete">Aldirako ezgaituriko sagu markatzaile integrazioa gaitu</translation>
+        <source>Temporarily disable host mouse pointer integration</source>
+        <translation type="obsolete">Ezgaitu aldibaterako hostalari sagu buru baterapena</translation>
     </message>
     <message>
         <source>&Insert Ctrl-Alt-Del</source>
-        <translation type="obsolete">B&idali Ktrl-Alt-Ezab</translation>
+        <translation type="obsolete">&Txertatu Ctrl-Alt-Ezab</translation>
     </message>
     <message>
         <source>Send the Ctrl-Alt-Del sequence to the virtual machine</source>
-        <translation type="obsolete">Ktrl+Alt+Ezab sekuentzia bidali makina birtualera</translation>
-    </message>
-    <message>
-        <source>&Insert Ctrl-Alt-Backspace</source>
-        <translation type="obsolete">B&idali Ktrl-Alt-Atzera-tekla</translation>
+        <translation type="obsolete">Bidali Ktrl-Alt-Ezab sekuentzia makina birtualari</translation>
     </message>
     <message>
         <source>Send the Ctrl-Alt-Backspace sequence to the virtual machine</source>
-        <translation type="obsolete">Ktrl-Alt-Atzera-tekla sekuentzia bidali makina birtualera</translation>
+        <translation type="obsolete">Bidali Ktrl-Alt-Atzera sekuentzia makina birtualari</translation>
     </message>
     <message>
-        <source>Take &Snapshot...</source>
-        <translation type="obsolete">&Egoera-argazkia egin...</translation>
+        <location line="-434"/>
+        <source>Take a snapshot of the virtual machine</source>
+        <translation>Hartu makina birtualaren argazki bat</translation>
     </message>
     <message>
-        <source>Take a snapshot of the virtual machine</source>
-        <translation>Makina Birtualaren egoera-argazki bat egin</translation>
+        <source>Show Session Information Dialog</source>
+        <translation type="obsolete">Erakutsi Saio Argibide Elkarrizketa</translation>
     </message>
     <message>
-        <source>&Pause</source>
-        <translation>&Gelditu</translation>
+        <location line="-35"/>
+        <location filename="../src/selector/UIActionPoolSelector.cpp" line="+116"/>
+        <source>Display the virtual machine settings window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of the virtual machine</source>
-        <translation>Makina Birtualaren exekuzioa gelditu</translation>
+        <location line="+70"/>
+        <source>Display the virtual machine session information window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>R&esume</source>
-        <translation type="obsolete">Ja&rraitu</translation>
+        <location line="+36"/>
+        <location filename="../src/selector/UIActionPoolSelector.cpp" line="+203"/>
+        <source>&Pause</source>
+        <translation>&Pausatu</translation>
     </message>
     <message>
-        <source>Resume the execution of the virtual machine</source>
-        <translation type="obsolete">Makina birtualaren exekuzioa jarraitu</translation>
+        <location line="+1"/>
+        <source>Suspend the execution of the virtual machine</source>
+        <translation>Utzi makina birtualaren exekuzioa</translation>
     </message>
     <message>
+        <location line="+34"/>
+        <location filename="../src/selector/UIActionPoolSelector.cpp" line="+28"/>
         <source>&Reset</source>
         <translation>Be&rrezarri</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Reset the virtual machine</source>
-        <translation>Makina Birtuala berrezarri</translation>
+        <translation>Berrezarri makina birtuala</translation>
     </message>
     <message>
-        <source>ACPI Sh&utdown</source>
-        <translation></translation>
+        <source>Save the machine state of the virtual machine</source>
+        <translation type="obsolete">Gorde makina birtualaren makina egoera</translation>
     </message>
     <message>
-        <source>ACPI S&hutdown</source>
-        <translation type="obsolete">ACPI It&zalia</translation>
+        <location line="+68"/>
+        <location filename="../src/selector/UIActionPoolSelector.cpp" line="+247"/>
+        <source>ACPI Sh&utdown</source>
+        <translation>ACPI &Itzali</translation>
     </message>
     <message>
         <source>Send the ACPI Power Button press event to the virtual machine</source>
-        <translation type="obsolete">ACPI Indar Botoia Gertaera bidali makina birtualera</translation>
+        <translation type="obsolete">Bidali ACPI Indar Botoi sakatze gertaera makina birtualera</translation>
     </message>
     <message>
+        <location filename="../src/globals/UIActionPool.cpp" line="+472"/>
         <source>&Close...</source>
         <translation>It&xi...</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Close the virtual machine</source>
-        <translation>Makina Birtuala itxi</translation>
+        <translation>Itxi makina birtuala</translation>
     </message>
     <message>
+        <location filename="../src/runtime/UIActionPoolRuntime.cpp" line="+55"/>
         <source>&View</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>&Devices</source>
-        <translation>&Gailuak</translation>
+        <translation>&Ikusi</translation>
     </message>
     <message>
-        <source>&USB Devices</source>
-        <translation type="obsolete">&USB Gailuak</translation>
-    </message>
-    <message>
-        <source>&Shared Folders...</source>
-        <translation type="obsolete">&Partekatutako Karpetak...</translation>
+        <source>Switch to &Scaled Mode</source>
+        <translation type="obsolete">Aldatu &Modu Eskalatura</translation>
     </message>
     <message>
-        <source>Create or modify shared folders</source>
-        <translation type="obsolete">Partekatutako karpetekin aritzeko leihoa ireki</translation>
+        <location line="+132"/>
+        <source>Switch between normal and scaled mode</source>
+        <translation>Aldatu modu arrunt eta eskalatuaren artean</translation>
     </message>
     <message>
-        <source>Enable or disable remote desktop (RDP) connections to this machine</source>
-        <translation type="obsolete">Urruneko idazmahai (RDP) konexioak gaitu edo ezgaitu maina honetarako</translation>
+        <location line="+144"/>
+        <source>Take guest display screenshot</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">Bezero Gehigarriak &Instalatu...</translation>
+        <location line="+54"/>
+        <source>Display virtual machine settings window to configure video capture</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
-        <translation type="obsolete">Bezero Gehigarri instalazio irudia muntatu</translation>
+        <location line="+32"/>
+        <source>Enable guest display video capture</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>De&bug</source>
-        <translation>Ara&zpena</translation>
+        <location line="+32"/>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Statistics...</source>
-        <comment>debug action</comment>
-        <translation>E&statistikak...</translation>
+        <location line="+24"/>
+        <source>&Menu Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Command Line...</source>
-        <comment>debug action</comment>
-        <translation></translation>
+        <location line="+29"/>
+        <source>&Menu Bar Settings...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Help</source>
-        <translation>&Laguntza</translation>
+        <location line="+1"/>
+        <source>Display window to configure menu-bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dock Icon</source>
-        <translation></translation>
+        <location line="+31"/>
+        <source>Show Menu &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Monitor Preview</source>
-        <translation></translation>
+        <location line="+1"/>
+        <source>Enable menu-bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Application Icon</source>
-        <translation></translation>
+        <location line="+25"/>
+        <source>&Status Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch between normal and seamless desktop integration mode</source>
+        <location line="+29"/>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch between normal and scaled mode</source>
+        <location line="+1"/>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Settings...</source>
-        <translation type="unfinished">&Ezarpenak...</translation>
+        <location line="+30"/>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Session I&nformation...</source>
+        <location line="+1"/>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtualaren erregistro fitxategiak ikusi</translation>
+        <location line="+24"/>
+        <source>S&cale Factor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Contents...</source>
-        <translation type="unfinished">&Edukiak...</translation>
+        <location line="+24"/>
+        <source>&Input</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show help contents</source>
+        <location line="+24"/>
+        <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open the browser and go to the VirtualBox product web site</source>
-        <translation type="unfinished">Nabigatzailea ireki eta VirtualBox produktuaren gunera joan</translation>
+        <location line="+29"/>
+        <source>&Keyboard Settings...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Go back to showing all suppressed warnings and messages</source>
-        <translation type="unfinished">Ezabatutako abisu eta mezu guztiak berriz agertzea eragien du</translation>
+        <location line="+1"/>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network Operations Manager...</source>
+        <location line="+34"/>
+        <location line="+36"/>
+        <location line="+31"/>
+        <location line="+30"/>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check for a new VirtualBox version</source>
+        <location line="-96"/>
+        <location line="+36"/>
+        <location line="+31"/>
+        <location line="+30"/>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&About VirtualBox...</source>
+        <location line="+24"/>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take Sn&apshot...</source>
+        <location line="+36"/>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take Screensh&ot...</source>
+        <location line="+1"/>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <comment>Mac OS X version</comment>
-        <translation type="unfinished">&Fitxategia</translation>
+        <location line="+24"/>
+        <source>&Devices</source>
+        <translation>&Gailuak</translation>
     </message>
     <message>
-        <source>&File</source>
-        <comment>Non Mac OS X version</comment>
-        <translation type="unfinished">&Fitxategia</translation>
+        <location line="+27"/>
+        <source>&Hard Disks</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Virtual Media Manager...</source>
+        <location line="+29"/>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Virtual Media Manager window</source>
+        <location line="+1"/>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Import Appliance...</source>
+        <location line="+27"/>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import an appliance into VirtualBox</source>
+        <location line="+27"/>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Export Appliance...</source>
+        <location line="+24"/>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export one or more VirtualBox virtual machines as an appliance</source>
+        <location line="+216"/>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global settings</comment>
-        <translation type="obsolete">Hobes&penak...</translation>
+        <location line="+35"/>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global settings window</source>
-        <translation type="obsolete">Ezarpen orokor leihoa bistarazi</translation>
+        <location line="+112"/>
+        <source>&Logging</source>
+        <comment>debug action</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>E&xit</source>
-        <translation type="unfinished">I&rten</translation>
+        <location line="+29"/>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Erakutsi O&harra...</translation>
     </message>
     <message>
-        <source>Close application</source>
-        <translation type="unfinished">Aplikazioa Itxi</translation>
+        <location line="+839"/>
+        <source>%1%</source>
+        <comment>scale-factor</comment>
+        <translation type="unfinished">%1%</translation>
     </message>
     <message>
-        <source>&Group</source>
+        <location line="+51"/>
+        <source>Enable</source>
+        <comment>Virtual Screen</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create a new virtual machine</source>
-        <translation type="obsolete">Makina Birtual Berria Sortu</translation>
+        <location line="+24"/>
+        <source>Resize to %1x%2</source>
+        <comment>Virtual Screen</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&tart</source>
-        <translation type="unfinished">Abiara&zi</translation>
+        <source>&CD/DVD Devices</source>
+        <translation type="obsolete">&CD/DVD Gailuak</translation>
     </message>
     <message>
-        <source>Start the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtuala abiarazi</translation>
+        <source>&Floppy Devices</source>
+        <translation type="obsolete">&Diskete Gailuak</translation>
     </message>
     <message>
-        <source>S&how</source>
-        <translation type="unfinished">I&kusi</translation>
+        <source>&USB Devices</source>
+        <translation type="obsolete">&USB Gailuak</translation>
     </message>
     <message>
-        <source>Switch to the window of the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtualaren leihora aldatu</translation>
+        <location line="-1192"/>
+        <source>&Webcams</source>
+        <translation>&Webkamerak</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtualaren eskuragarritasun egoera freskatu</translation>
+        <source>Network</source>
+        <translation type="obsolete">Sarea</translation>
     </message>
     <message>
-        <source>&New...</source>
-        <translation type="unfinished">&Berria...</translation>
+        <location line="-85"/>
+        <source>&Network Settings...</source>
+        <translation>&Sare Ezarpenak...</translation>
     </message>
     <message>
-        <source>&Add...</source>
-        <translation type="unfinished">&Gehitu...</translation>
+        <location line="+1"/>
+        <source>Display virtual machine settings window to configure network adapters</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cl&one...</source>
+        <location line="+27"/>
+        <source>&USB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Remove...</source>
+        <location line="+29"/>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard</source>
-        <translation type="unfinished">Baztertu</translation>
+        <location line="+1"/>
+        <source>Display virtual machine settings window to configure USB devices</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of the selected virtual machine</source>
-        <translation type="obsolete">Baztertu hautatutako makina birtualaren gordetako egoera</translation>
+        <location line="+75"/>
+        <source>&Drag and Drop</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Close</source>
+        <location line="+24"/>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <translation type="unfinished">E&rregistroa Ikusi...</translation>
+        <location line="+29"/>
+        <source>&Shared Folders Settings...</source>
+        <translation>&Elkarbanatutako Agiritegi Ezarpenak...</translation>
     </message>
     <message>
-        <source>&VirtualBox Web Site...</source>
-        <translation type="unfinished">&VirtualBox Web Gunea...</translation>
+        <location line="-842"/>
+        <source>R&emote Display</source>
+        <translation>&Hurruneko Erakuspena</translation>
     </message>
     <message>
-        <source>&Reset All Warnings</source>
-        <translation type="unfinished">Abisu Guztiak Be&rrezarri</translation>
+        <source>Toggle remote desktop (RDP) connections to this machine</source>
+        <translation type="obsolete">Aldatu hurruneko mahaigain (HMG) elkarketak makina honetara</translation>
     </message>
     <message>
-        <source>C&heck for Updates...</source>
-        <translation type="unfinished"></translation>
+        <location line="-93"/>
+        <location line="+61"/>
+        <source>&Video Capture</source>
+        <translation>&Bideo Harpena</translation>
     </message>
     <message>
-        <source>Rena&me Group...</source>
-        <translation type="unfinished"></translation>
+        <source>Toggle video capture</source>
+        <translation type="obsolete">Aldatu bideo harpena</translation>
     </message>
     <message>
-        <source>Po&wer Off</source>
-        <translation type="unfinished"></translation>
+        <location line="-32"/>
+        <source>&Video Capture Settings...</source>
+        <translation>*&Bideo Harpen Ezarpenak...</translation>
     </message>
     <message>
-        <source>&New Machine...</source>
-        <translation type="unfinished"></translation>
+        <source>Configure video capture settings</source>
+        <translation type="obsolete">Itxuratu bideo harpen ezarpenak</translation>
     </message>
     <message>
-        <source>&Add Machine...</source>
-        <translation type="unfinished"></translation>
+        <location line="+941"/>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation>&Txertatu Gonbidatu Gehigarrien CD irudia...</translation>
     </message>
     <message>
-        <source>Gro&up</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <translation type="obsolete">Txertatu Gonbidatu Gehigarri diska agiria gidagailu birtualean</translation>
     </message>
     <message>
-        <source>Shared &Clipboard</source>
-        <translation type="unfinished"></translation>
+        <source>&Logging...</source>
+        <comment>debug action</comment>
+        <translation type="obsolete">&Oharreratzea...</translation>
     </message>
     <message>
-        <source>Power off the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <source>&Network Adapters...</source>
+        <translation type="obsolete">&Sare Egokigailuak...</translation>
     </message>
     <message>
-        <source>&Network Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Change the settings of network adapters</source>
+        <translation type="obsolete">Aldatu sare egokigailuen ezarpenak</translation>
     </message>
     <message>
-        <source>&Shared Folders Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&Shared Folders...</source>
+        <translation type="obsolete">&Elkarbanatutako Agiritegiak...</translation>
     </message>
     <message>
-        <source>R&emote Display</source>
-        <translation type="unfinished"></translation>
+        <source>Create or modify shared folders</source>
+        <translation type="obsolete">Sortu edo aldatu elkarbanatutako agiritegiak</translation>
     </message>
     <message>
-        <source>&Video Capture</source>
-        <translation type="unfinished"></translation>
+        <source>&Install Guest Additions...</source>
+        <translation type="obsolete">&Ezarri Gonbidatu Gehigarriak...</translation>
     </message>
     <message>
-        <source>&Video Capture Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Mount the Guest Additions installation image</source>
+        <translation type="obsolete">Osatu Gonbidatu Gehigarri ezarpen irudia</translation>
     </message>
     <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
+        <location line="+26"/>
+        <source>De&bug</source>
+        <translation>&Garbitu</translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
+        <location line="+29"/>
+        <source>&Statistics...</source>
+        <comment>debug action</comment>
+        <translation>&Estatistikak...</translation>
     </message>
     <message>
-        <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <location line="+29"/>
+        <source>&Command Line...</source>
+        <comment>debug action</comment>
+        <translation>&Komando Lerroa...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/globals/UIActionPool.cpp" line="+83"/>
+        <source>&Help</source>
+        <translation>&Laguntza</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/runtime/UIActionPoolRuntime.cpp" line="+91"/>
+        <source>Dock Icon</source>
+        <translation>Uztartu Ikurra</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <location line="+22"/>
+        <source>Show Monitor Preview</source>
+        <translation>Erakutsi Monitore Aurreikuspena</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <location line="+22"/>
+        <source>Show Application Icon</source>
+        <translation>Erakutsi Aplikazio Ikurra</translation>
     </message>
     <message>
-        <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Enable remote desktop (RDP) connections to this machine</source>
+        <translation type="obsolete">Gaitu hurruneko mahaigain (RDP) elkarketak makina honetara</translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Enable &Logging...</source>
+        <comment>debug action</comment>
+        <translation type="obsolete">Gaitu &Oharreratzea...</translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Switch to &Fullscreen</source>
+        <translation type="obsolete">Aldatu &Ikusleiho-osora</translation>
     </message>
     <message>
-        <source>&Input</source>
-        <translation type="unfinished"></translation>
+        <source>Switch between normal and fullscreen mode</source>
+        <translation type="obsolete">Aldatu modu arruntaren eta ikusleiho-osoko artean</translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="unfinished">&Teklatua</translation>
+        <source>Switch to Seam&less Mode</source>
+        <translation type="obsolete">&Aldatu &Irudizko Modura</translation>
     </message>
     <message>
-        <source>&Keyboard Settings...</source>
-        <translation type="unfinished"></translation>
+        <location line="-1394"/>
+        <source>Switch between normal and seamless desktop integration mode</source>
+        <translation>Aldatu modu arruntaren eta irudizko mahaigain baterapen moduaren artean</translation>
     </message>
     <message>
-        <source>&Mouse</source>
-        <translation type="unfinished"></translation>
+        <source>Switch to &Scale Mode</source>
+        <translation type="obsolete">Aldatu &Neurriratu Modura</translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Sarea</translation>
+        <source>Switch between normal and scale mode</source>
+        <translation type="obsolete">Aldatu modu arrunta eta neurriratu modu artean</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
-        <translation type="unfinished"></translation>
+        <location line="+145"/>
+        <source>Auto-resize &Guest Display</source>
+        <translation>&Berez-neurriratu Gonbidatu Erakuspena</translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
-        <translation type="unfinished"></translation>
+        <source>Enable R&emote Display</source>
+        <translation type="obsolete">Gaitu &Hurruneko Erakuspena</translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">E&rregistroa Ikusi...</translation>
+        <location line="-506"/>
+        <location filename="../src/selector/UIActionPoolSelector.cpp" line="-479"/>
+        <source>&Settings...</source>
+        <translation>E&zarpenak...</translation>
     </message>
     <message>
-        <source>E&xtra Data Manager...</source>
-        <translation type="unfinished"></translation>
+        <source>Manage the virtual machine settings</source>
+        <translation type="obsolete">Kudeatu makina birtualaren ezarpenak</translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <location line="+70"/>
+        <source>Session I&nformation...</source>
+        <translation>Saio &Argibideak...</translation>
+    </message>
+    <message>
+        <location filename="../src/globals/UIActionPool.cpp" line="-124"/>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>&File</source>
-        <translation type="unfinished">&Fitxategia</translation>
+        <translation type="unfinished">&Agiria</translation>
     </message>
     <message>
+        <location line="+64"/>
         <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Full-screen Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch between normal and full-screen mode</source>
+        <location line="+1"/>
+        <location filename="../src/runtime/UIActionPoolRuntime.cpp" line="+364"/>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&caled Mode</source>
-        <translation type="unfinished"></translation>
+        <location line="+70"/>
+        <source>&Contents...</source>
+        <translation>&Edukiak...</translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Show help contents</source>
+        <translation>Erakutsi laguntza edukiak</translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <location line="+33"/>
+        <source>Open the browser and go to the VirtualBox product web site</source>
+        <translation>Ireki nabigatzailea eta joan VirtuaBox produktuaren web gunera</translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
-        <translation type="unfinished"></translation>
+        <location line="+34"/>
+        <source>Go back to showing all suppressed warnings and messages</source>
+        <translation>Joan atzera ezabatutako ohar eta mezu guztiak erakusteko</translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
-        <translation type="unfinished"></translation>
+        <location line="+34"/>
+        <source>&Network Operations Manager...</source>
+        <translation>&Sare Eragiketa Kudeatzailea...</translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <location line="+91"/>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
-        <translation type="unfinished"></translation>
+        <location line="+43"/>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Hobespenak...</translation>
     </message>
     <message>
-        <source>&USB</source>
+        <location line="+1"/>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
-        <translation type="unfinished"></translation>
+        <source>Show Network Operations Manager</source>
+        <translation type="obsolete">Erakutsi Sare Eragiketa Kudeatzailea</translation>
     </message>
     <message>
-        <source>&Normal Start</source>
-        <translation type="unfinished"></translation>
+        <location line="-100"/>
+        <source>Check for a new VirtualBox version</source>
+        <translation>Egiaztatu VirtualBox bertsio berririk dagoen</translation>
     </message>
     <message>
-        <source>&Headless Start</source>
-        <translation type="unfinished"></translation>
+        <location line="+55"/>
+        <source>&About VirtualBox...</source>
+        <translation>&VirtualBox-eri buruz...</translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
-        <translation type="unfinished"></translation>
+        <source>Show a window with product information</source>
+        <translation type="obsolete">Erakutsi leiho bat produktuaren argibideekin</translation>
     </message>
     <message>
-        <source>Minimize active window</source>
-        <translation type="unfinished"></translation>
+        <source>Show a dialog with product information</source>
+        <translation type="obsolete">Erakutsi elkarrizketa bat produktuaren argibideekin</translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/runtime/UIActionPoolRuntime.cpp" line="-399"/>
+        <source>Take Sn&apshot...</source>
+        <translation>Hartu &Argazki bat...</translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <location line="+137"/>
+        <location filename="../src/selector/UIActionPoolSelector.cpp" line="+451"/>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">Hobes&penak...</translation>
-    </message>
-    <message>
-        <source>Display the global preferences window</source>
+        <location line="+1"/>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <location line="+39"/>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <location line="+111"/>
+        <source>&Full-screen Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
+        <location line="+1"/>
+        <source>Switch between normal and full-screen mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <location line="+36"/>
+        <source>Seam&less Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <location line="+37"/>
+        <source>S&caled Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+36"/>
         <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+74"/>
         <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
-        <translation type="unfinished"></translation>
+        <location line="+34"/>
+        <source>Take Screensh&ot...</source>
+        <translation>Hartu &Ikusleiho-argazki bat...</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
-        <translation type="unfinished"></translation>
+        <source>Take a screenshot of the virtual machine</source>
+        <translation type="obsolete">Hartu makina birtualaren ikusleiho-argazki bat</translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
-        <translation type="unfinished"></translation>
+        <source>Ins&ert Ctrl-Alt-Backspace</source>
+        <translation type="obsolete">T&xertatu Ctrl-Alt-Atzera</translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/selector/UIActionPoolSelector.cpp" line="-887"/>
+        <source>&File</source>
+        <comment>Mac OS X version</comment>
+        <translation>&Agiria</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>&File</source>
+        <comment>Non Mac OS X version</comment>
+        <translation>&Agiria</translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <location line="+28"/>
+        <source>&Virtual Media Manager...</source>
+        <translation>&Multimedia Birtual Kudeatzailea...</translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display the Virtual Media Manager dialog</source>
+        <translation type="obsolete">Erakutsi Multimedia Birtual Kudeatzaile elkarrizketa</translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <location line="+28"/>
+        <source>&Import Appliance...</source>
+        <translation>&Inportatu Makina Birtuala...</translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Import an appliance into VirtualBox</source>
+        <translation>Inportatu makina birtual bat VirtualBox-era</translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
-        <translation type="unfinished"></translation>
+        <location line="+27"/>
+        <source>&Export Appliance...</source>
+        <translation>&Esportatu Makina Birtuala...</translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="unfinished">Disko &Gogorrak</translation>
+        <location line="+1"/>
+        <source>Export one or more VirtualBox virtual machines as an appliance</source>
+        <translation>Esportatu VirtualBox makina birtual bat edo gehiago appliance bezala</translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <location line="+28"/>
+        <source>E&xtra Data Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <location line="+1"/>
+        <source>Display the Extra Data Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <location line="+108"/>
+        <location line="+155"/>
+        <source>Add existing virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <location line="-127"/>
+        <source>Rename selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <location line="+27"/>
+        <source>&Ungroup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <location line="+1"/>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <location line="+22"/>
+        <location line="+539"/>
+        <source>&Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
+        <location line="-538"/>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="unfinished">%1%</translation>
-    </message>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="unfinished">Gaitu</translation>
-    </message>
-    <message>
-        <source>Resize to %1x%2</source>
-        <comment>Virtual Screen</comment>
+        <location line="+104"/>
+        <source>Add new group based on selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Preview Monitor %1</source>
+        <location line="+60"/>
+        <source>Clone selected virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Connect Network Adapter</source>
+        <location line="+232"/>
+        <source>D&iscard Saved State...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect Network Adapter &%1</source>
+        <location line="+1"/>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No USB Devices Connected</source>
+        <location line="+35"/>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No supported devices connected to the host PC</source>
-        <translation type="unfinished">Ez dago onartutako gailurik konektaturik ostalari PC-ra</translation>
+        <location line="+24"/>
+        <source>Re&fresh</source>
+        <translation type="unfinished">&Berritu</translation>
     </message>
     <message>
-        <source>No Webcams Connected</source>
+        <location line="+1"/>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No supported webcams connected to the host PC</source>
+        <location line="+23"/>
+        <source>S&how in Finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create new virtual machine</source>
+        <location line="+1"/>
+        <source>Show the VirtualBox Machine Definition files in Finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add existing virtual machine</source>
+        <location line="+2"/>
+        <source>S&how in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rename selected virtual machine group</source>
+        <location line="+1"/>
+        <source>Show the VirtualBox Machine Definition files in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Ungroup</source>
+        <location line="+2"/>
+        <source>S&how in File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <location line="+1"/>
+        <source>Show the VirtualBox Machine Definition files in the File Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Sort</source>
+        <location line="+24"/>
+        <source>Cr&eate Alias on Desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <location line="+1"/>
+        <source>Create alias files to the VirtualBox Machine Definition files on your desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add new group based on selected virtual machines</source>
+        <location line="+2"/>
+        <source>Cr&eate Shortcut on Desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clone selected virtual machine</source>
+        <location line="+1"/>
+        <source>Create shortcut files to the VirtualBox Machine Definition files on your desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove selected virtual machines</source>
+        <location line="+24"/>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines</source>
+        <location line="+46"/>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch to the windows of selected virtual machines</source>
+        <location line="+28"/>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines in the background</source>
+        <location line="+28"/>
+        <source>Power off selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
-        <translation type="unfinished"></translation>
+        <source>&Preferences...</source>
+        <comment>global settings</comment>
+        <translation type="obsolete">&Hobespenak...</translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Display the global settings dialog</source>
+        <translation type="obsolete">Erakutsi ezarpen orokor elkarrizketa</translation>
     </message>
     <message>
-        <source>Reset selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <location line="-797"/>
+        <source>E&xit</source>
+        <translation>I&rten</translation>
     </message>
     <message>
-        <source>D&iscard Saved State...</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Close application</source>
+        <translation>Itxi aplikazioa</translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <location line="+18"/>
+        <source>&Group</source>
+        <translation>&Taldea</translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Create a new virtual machine</source>
+        <translation type="obsolete">Sortu makina birtual berri bat</translation>
     </message>
     <message>
-        <source>Re&fresh</source>
-        <translation type="unfinished">&Freskatu</translation>
+        <source>Add an existing virtual machine</source>
+        <translation type="obsolete">Gehitu badagoen makina birtual bat</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Rename the selected virtual machine group</source>
+        <translation type="obsolete">Berrizendatu hautaturiko makina birtual taldea</translation>
     </message>
     <message>
-        <source>S&how in Finder</source>
-        <translation type="unfinished"></translation>
+        <location line="+361"/>
+        <source>S&tart</source>
+        <translation>&Hasi</translation>
     </message>
     <message>
-        <source>Show the VirtualBox Machine Definition files in Finder</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>S&how</source>
+        <translation>&Erakutsi</translation>
     </message>
     <message>
-        <source>S&how in Explorer</source>
-        <translation type="unfinished"></translation>
+        <source>Re&fresh...</source>
+        <translation type="obsolete">Berr&itu...</translation>
     </message>
     <message>
-        <source>Show the VirtualBox Machine Definition files in Explorer</source>
-        <translation type="unfinished"></translation>
+        <source>Refresh the accessibility state of the selected virtual machine</source>
+        <translation type="obsolete">Berritu hautaturiko makina birtualaren sarbidetasun egoera</translation>
     </message>
     <message>
-        <source>S&how in File Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Show in Finder</source>
+        <translation type="obsolete">Erakutsi Bilatzailea</translation>
     </message>
     <message>
-        <source>Show the VirtualBox Machine Definition files in the File Manager</source>
-        <translation type="unfinished"></translation>
+        <source>Show in Explorer</source>
+        <translation type="obsolete">Erakutsi Nabigatzailean</translation>
     </message>
     <message>
-        <source>Cr&eate Alias on Desktop</source>
-        <translation type="unfinished"></translation>
+        <source>Show in File Manager</source>
+        <translation type="obsolete">Erakutsi Agiri Kudeatzailea</translation>
     </message>
     <message>
-        <source>Create alias files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <source>Show the VirtualBox Machine Definition file in the File Manager</source>
+        <translation type="obsolete">Erakutsi VirtualBox Makina Adiera agiria Agiri Kudeatzailean</translation>
     </message>
     <message>
-        <source>Cr&eate Shortcut on Desktop</source>
-        <translation type="unfinished"></translation>
+        <location line="-188"/>
+        <source>&New...</source>
+        <translation>&Berria...</translation>
     </message>
     <message>
-        <source>Create shortcut files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <location line="-317"/>
+        <source>Display the Virtual Media Manager window</source>
+        <translation>Erakutsi Multimedia Birtual Kudeatzaile leihoa</translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Display the global settings window</source>
+        <translation type="obsolete">Erakutsi ezarpen orokorren leihoa</translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <location line="+347"/>
+        <source>&Add...</source>
+        <translation>&Gehitu...</translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Add a new group based on the items selected</source>
+        <translation type="obsolete">Gehitu talde berri bat hautaturiko gaietan ohinarrituta</translation>
     </message>
     <message>
-        <source>Power off selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <location line="+88"/>
+        <source>Cl&one...</source>
+        <translation>Kl&onatu...</translation>
     </message>
-</context>
-<context>
-    <name>UIActionPoolRuntime</name>
     <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Gaitu</translation>
+        <source>Clone the selected virtual machine</source>
+        <translation type="obsolete">Klonatu hautaturiko makina birtuala</translation>
     </message>
     <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
+        <location line="+30"/>
+        <source>&Remove...</source>
+        <translation>&Kendu...</translation>
     </message>
-</context>
-<context>
-    <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
+        <location line="+1"/>
+        <source>Remove selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
     <message>
-        <source>Status</source>
-        <comment>password table field</comment>
+        <location line="+31"/>
+        <location line="+39"/>
+        <source>Start selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <comment>password table field</comment>
+        <location line="-30"/>
+        <source>Switch to the windows of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
-        <comment>password table field</comment>
+        <location line="+29"/>
+        <source>&Normal Start</source>
         <translation type="unfinished"></translation>
     </message>
-    <message numerus="yes">
-        <source><nobr>Used by the following %n hard disk(s):</nobr><br>%1</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many hard drives are in the tool-tip and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>UIApplianceEditorWidget</name>
     <message>
-        <source>Virtual System %1</source>
+        <location line="+23"/>
+        <source>&Headless Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="unfinished">Izena</translation>
+        <location line="+1"/>
+        <source>Start selected virtual machines in the background</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Product</source>
+        <location line="+22"/>
+        <source>&Detachable Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Product-URL</source>
+        <location line="+1"/>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Vendor</source>
+        <location line="+28"/>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Vendor-URL</source>
+        <location line="+28"/>
+        <source>Reset selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Version</source>
-        <translation type="unfinished"></translation>
+        <location line="+29"/>
+        <source>Discard</source>
+        <translation>Baztertu</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
+        <source>D&iscard saved state...</source>
+        <translation type="obsolete">Baztert&u gordetako egoera...</translation>
     </message>
     <message>
-        <source>License</source>
-        <translation type="unfinished"></translation>
+        <location line="+162"/>
+        <source>&Close</source>
+        <translation>It&xi</translation>
     </message>
     <message>
-        <source>Guest OS Type</source>
-        <translation type="unfinished"></translation>
+        <location line="-126"/>
+        <source>Show &Log...</source>
+        <translation>Erakutsi O&harra...</translation>
     </message>
     <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/globals/UIActionPool.cpp" line="-159"/>
+        <source>&VirtualBox Web Site...</source>
+        <translation>VirtualBox &Web Gunea...</translation>
     </message>
     <message>
-        <source>RAM</source>
-        <translation type="unfinished"></translation>
+        <location line="+34"/>
+        <source>&Reset All Warnings</source>
+        <translation>&Berrezarri Ohartarazpen Guztiak</translation>
     </message>
     <message>
-        <source>DVD</source>
+        <location line="+36"/>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Floppy</source>
-        <translation type="unfinished">Disketea</translation>
+        <location line="+33"/>
+        <source>C&heck for Updates...</source>
+        <translation>&Egiaztatu Eguneraketarik dagoen...</translation>
     </message>
     <message>
-        <source>Network Adapter</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/selector/UIActionPoolSelector.cpp" line="-483"/>
+        <source>Rena&me Group...</source>
+        <translation>Berrizendatu &Taldea...</translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <translation type="unfinished"></translation>
+        <source>Sort the items of the selected virtual machine group alphabetically</source>
+        <translation type="obsolete">Antolatu hautaturiko makina birtual taldeko gaiak alfabetikoki</translation>
     </message>
     <message>
-        <source>Sound Card</source>
-        <translation type="unfinished"></translation>
+        <source>Remove the selected virtual machines</source>
+        <translation type="obsolete">Kendu hautaturiko makina birtualak</translation>
     </message>
     <message>
-        <source>Virtual Disk Image</source>
-        <translation type="unfinished">Disko Birtual Irudia</translation>
+        <source>Start the selected virtual machines</source>
+        <translation type="obsolete">Abiarazi hautaturiko makina birtualak</translation>
     </message>
     <message>
-        <source>Unknown Hardware Item</source>
-        <translation type="unfinished"></translation>
+        <source>Switch to the windows of the selected virtual machines</source>
+        <translation type="obsolete">Aldatu hautaturiko makina birtualen leihoetara</translation>
     </message>
     <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
+        <source>Suspend the execution of the selected virtual machines</source>
+        <translation type="obsolete">Eten hautaturiko makina birtualen exekuzioa</translation>
     </message>
     <message>
-        <source><b>Original Value:</b> %1</source>
-        <translation type="unfinished"></translation>
+        <source>Reset the selected virtual machines</source>
+        <translation type="obsolete">Berrezarri hautaturiko makinabirtualak</translation>
     </message>
     <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <source>Discard the saved state of the selected virtual machines</source>
+        <translation type="obsolete">Baztertu hautaturiko makina birtualen gordetako egoera</translation>
     </message>
     <message>
-        <source>Warnings:</source>
-        <translation type="unfinished"></translation>
+        <source>Show the VirtualBox Machine Definition file in Finder</source>
+        <translation type="obsolete">Erakutsi VirtualBox Makina Adiera agiria Bilatzailean</translation>
     </message>
     <message>
-        <source>MB</source>
-        <comment>size suffix MBytes=1024 KBytes</comment>
-        <translation type="obsolete">MB</translation>
+        <source>Show the VirtualBox Machine Definition file in Explorer</source>
+        <translation type="obsolete">Erakutsi VirtualBox Makina Adiera agiria Exploratzailean</translation>
     </message>
     <message>
-        <source>MB</source>
-        <comment>size suffix MBytes=1024KBytes</comment>
-        <translation type="obsolete">MB</translation>
+        <source>Create Alias on Desktop</source>
+        <translation type="obsolete">Sortu Ezinzena Mahaigainean</translation>
     </message>
     <message>
-        <source>When checked a new unique MAC address will assigned to all configured network cards.</source>
-        <translation type="unfinished"></translation>
+        <source>Creates an alias file to the VirtualBox Machine Definition file on your desktop</source>
+        <translation type="obsolete">VirtualBox Makina Adiera agiriaren ezizen agiri bat sortzen du zure mahaigainean</translation>
     </message>
     <message>
-        <source>&Reinitialize the MAC address of all network cards</source>
-        <translation type="unfinished"></translation>
+        <source>Create Shortcut on Desktop</source>
+        <translation type="obsolete">Sortu Lasterbidea Mahaigainean</translation>
     </message>
     <message>
-        <source>Storage Controller (IDE)</source>
-        <translation type="unfinished"></translation>
+        <source>Creates an shortcut file to the VirtualBox Machine Definition file on your desktop</source>
+        <translation type="obsolete">VirtualBox Makina Adiera agiriaren lasterbide agiri bat sortzen du zure mahaigainean</translation>
     </message>
     <message>
-        <source>Storage Controller (SATA)</source>
-        <translation type="unfinished"></translation>
+        <source>Save State</source>
+        <translation type="obsolete">Gorde Egoera</translation>
     </message>
     <message>
-        <source>Storage Controller (SCSI)</source>
-        <translation type="unfinished"></translation>
+        <source>Save the machine state of the selected virtual machines</source>
+        <translation type="obsolete">Gorde hautaturiko makina birtualen makina egoera</translation>
     </message>
     <message>
-        <source>Storage Controller (SAS)</source>
-        <translation type="unfinished"></translation>
+        <source>Send the ACPI Power Button press event to the selected virtual machines</source>
+        <translation type="obsolete">Bidali ACPI Indar Botoi sakatze gertaera hautaturiko makina birtualetara</translation>
     </message>
-</context>
-<context>
-    <name>UIApplianceImportEditorWidget</name>
     <message>
-        <source>Importing Appliance ...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/runtime/UIActionPoolRuntime.cpp" line="-300"/>
+        <location filename="../src/selector/UIActionPoolSelector.cpp" line="+692"/>
+        <source>Po&wer Off</source>
+        <translation>&Itzali</translation>
     </message>
     <message>
-        <source>Reading Appliance ...</source>
-        <translation type="unfinished"></translation>
+        <source>Power off the selected virtual machines</source>
+        <translation type="obsolete">Itzali hautaturiko makina birtualak</translation>
     </message>
-</context>
-<context>
-    <name>UIDescriptionPagePrivate</name>
     <message>
-        <source>No description. Press the Edit button below to add it.</source>
-        <translation type="obsolete">Azalpenik ez. Editatu botoia sakatu berau gehitzeko.</translation>
+        <source>Show the log files of the selected virtual machine</source>
+        <translation type="obsolete">Erakutsi hautaturiko makina birtualen ohar agiriak</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editatu</translation>
+        <location filename="../src/selector/UIActionPoolSelector.cpp" line="-750"/>
+        <source>&New Machine...</source>
+        <translation>&Makina Berria...</translation>
     </message>
     <message>
-        <source>Edit (Ctrl+E)</source>
-        <translation type="obsolete">Editatu (Ktrl+E)</translation>
+        <location line="+1"/>
+        <location line="+155"/>
+        <source>Create new virtual machine</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIDetailsBlock</name>
     <message>
-        <source>Name</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Izena</translation>
+        <location line="-126"/>
+        <source>&Add Machine...</source>
+        <translation>&Gehitu Makina...</translation>
     </message>
     <message>
-        <source>OS Type</source>
-        <comment>details report</comment>
-        <translation type="obsolete">SE mota</translation>
+        <source>&Ungroup...</source>
+        <translation type="obsolete">&Destaldekatu...</translation>
     </message>
     <message>
-        <source>Base Memory</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Oinarri Memoria</translation>
+        <source>Ungroup items of the selected virtual machine group</source>
+        <translation type="obsolete">Destaldekatu hautaturiko makina birtual taldeko gaiak</translation>
     </message>
     <message>
-        <source><nobr>%1 MB</nobr></source>
-        <comment>details report</comment>
-        <translation type="obsolete"><nobr>%4 MB</nobr> {1 ?}</translation>
+        <source>Sort</source>
+        <translation type="obsolete">Antolatu</translation>
     </message>
     <message>
-        <source>Boot Order</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Abio Ordena</translation>
+        <location line="+183"/>
+        <source>Gro&up</source>
+        <translation>&Taldea</translation>
     </message>
     <message>
-        <source>ACPI</source>
-        <comment>details report</comment>
-        <translation type="obsolete">ACPI</translation>
+        <source>Sort the group of the first selected machine alphabetically</source>
+        <translation type="obsolete">Antolatu hautaturiko lehen makinaren taldea alfabetikoki</translation>
     </message>
     <message>
-        <source>I/O APIC</source>
-        <comment>details report</comment>
-        <translation type="obsolete">I/O APIC</translation>
+        <location filename="../src/runtime/UIActionPoolRuntime.cpp" line="+1183"/>
+        <source>Shared &Clipboard</source>
+        <translation>&Elkarbanatutako Gakoa</translation>
     </message>
     <message>
-        <source>Video Memory</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Bideo Memoria</translation>
+        <source>Drag'n'Drop</source>
+        <translation type="obsolete">Arrastatu-eta-Askatu</translation>
     </message>
     <message>
-        <source>3D</source>
-        <comment>details report</comment>
-        <translation type="obsolete">3D</translation>
+        <source>Save the virtual machine state</source>
+        <translation type="obsolete">Gorde makina birtualaren egoera</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (VRDE Server)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="-1182"/>
+        <source>Power off the virtual machine</source>
+        <translation>Itzali makina birtuala</translation>
     </message>
     <message>
-        <source>Not Attached</source>
-        <comment>details report (Storage)</comment>
-        <translation type="obsolete">Ez erantsia</translation>
+        <location filename="../src/globals/UIShortcutPool.cpp" line="+243"/>
+        <location line="+7"/>
+        <source>Popup Menu</source>
+        <translation>Oharleiho Menua</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (audio)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location filename="../src/runtime/UIMachineLogic.cpp" line="+842"/>
+        <source>Preview Monitor %1</source>
+        <translation type="unfinished">Aurreikuspen Monitorea %1</translation>
     </message>
     <message>
-        <source>Adapter %1</source>
-        <comment>details report (network)</comment>
-        <translation type="obsolete">%1 Moldagailua</translation>
+        <location line="+1366"/>
+        <source>&Connect Network Adapter</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (network)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+1"/>
+        <source>Connect Network Adapter &%1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (serial ports)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+21"/>
+        <source>No USB Devices Connected</source>
+        <translation type="unfinished">Ez da USB Gailurik Erantsi</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (parallel ports)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+1"/>
+        <source>No supported devices connected to the host PC</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Device Filters</source>
-        <comment>details report (USB)</comment>
-        <translation type="obsolete">Gailu Iragazkiak</translation>
+        <location line="+45"/>
+        <source>No Webcams Connected</source>
+        <translation type="unfinished">Ez dago Webkamerarik Elkarketaturik</translation>
     </message>
     <message>
-        <source>%1 (%2 active)</source>
-        <comment>details report (USB)</comment>
-        <translation type="obsolete">%1 (%2 aktibo)</translation>
+        <location line="+1"/>
+        <source>No supported webcams connected to the host PC</source>
+        <translation type="unfinished">Ez dago sostengaturiko webkamerarik hostalari PC-ra elkarketaturik</translation>
     </message>
+</context>
+<context>
+    <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>Disabled</source>
-        <comment>details report (USB)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location filename="../src/runtime/UIAddDiskEncryptionPasswordDialog.cpp" line="+288"/>
+        <source>Status</source>
+        <comment>password table field</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Shared Folders</source>
-        <comment>details report (shared folders)</comment>
-        <translation type="obsolete">Partekatutako Karpetak</translation>
+        <location line="+1"/>
+        <source>ID</source>
+        <comment>password table field</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <comment>details report (shared folders)</comment>
-        <translation type="obsolete">Batez</translation>
+        <location line="+1"/>
+        <source>Password</source>
+        <comment>password table field</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+59"/>
+        <source><nobr>Used by the following %n hard disk(s):</nobr><br>%1</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many hard drives are in the tool-tip and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>None</source>
-        <comment>details report (description)</comment>
-        <translation type="obsolete">Batez</translation>
+        <location line="+252"/>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location line="+4"/>
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
-    <name>UIDetailsPagePrivate</name>
+    <name>UIApplianceEditorWidget</name>
+    <message>
+        <location filename="../src/widgets/UIApplianceEditorWidget.cpp" line="+108"/>
+        <source>Virtual System %1</source>
+        <translation>Sistema Birtuala %1</translation>
+    </message>
     <message>
+        <location line="+97"/>
         <source>Name</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Izena</translation>
+        <translation>Izena</translation>
     </message>
     <message>
-        <source>OS Type</source>
-        <comment>details report</comment>
-        <translation type="obsolete">SE mota</translation>
+        <location line="+1"/>
+        <source>Product</source>
+        <translation>Produktua</translation>
     </message>
     <message>
-        <source>Base Memory</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Oinarri Memoria</translation>
+        <location line="+1"/>
+        <source>Product-URL</source>
+        <translation>Produktuaren URL-a</translation>
     </message>
     <message>
-        <source><nobr>%1 MB</nobr></source>
-        <comment>details report</comment>
-        <translation type="obsolete"><nobr>%4 MB</nobr> {1 ?}</translation>
+        <location line="+1"/>
+        <source>Vendor</source>
+        <translation>Saltzailea</translation>
     </message>
     <message>
-        <source>Boot Order</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Abio Ordena</translation>
+        <location line="+1"/>
+        <source>Vendor-URL</source>
+        <translation>Saltzailearen URL-a</translation>
     </message>
     <message>
-        <source>ACPI</source>
-        <comment>details report</comment>
-        <translation type="obsolete">ACPI</translation>
+        <location line="+1"/>
+        <source>Version</source>
+        <translation>Bertsioa</translation>
     </message>
     <message>
-        <source>I/O APIC</source>
-        <comment>details report</comment>
-        <translation type="obsolete">I/O APIC</translation>
+        <location line="+1"/>
+        <location line="+677"/>
+        <source>Description</source>
+        <translation>Azalpena</translation>
     </message>
     <message>
-        <source>Video Memory</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Bideo Memoria</translation>
+        <location line="-676"/>
+        <source>License</source>
+        <translation>Baimena</translation>
     </message>
     <message>
-        <source>3D</source>
-        <comment>details report</comment>
-        <translation type="obsolete">3D</translation>
+        <location line="+1"/>
+        <source>Guest OS Type</source>
+        <translation>Gonbidatu SE Mota</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (VRDE Server)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+1"/>
+        <source>CPU</source>
+        <translation>CPU</translation>
     </message>
     <message>
-        <source>Not Attached</source>
-        <comment>details report (Storage)</comment>
-        <translation type="obsolete">Ez erantsia</translation>
+        <location line="+1"/>
+        <source>RAM</source>
+        <translation>RAM</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (audio)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+1"/>
+        <source>Storage Controller (IDE)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adapter %1</source>
-        <comment>details report (network)</comment>
-        <translation type="obsolete">%1 Moldagailua</translation>
+        <location line="+1"/>
+        <source>Storage Controller (SATA)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (network)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+1"/>
+        <source>Storage Controller (SCSI)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (serial ports)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+1"/>
+        <source>Storage Controller (SAS)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (parallel ports)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <source>Hard Disk Controller (IDE)</source>
+        <translation type="obsolete">Diska Gogor Kontrolatzailea (IDE)</translation>
     </message>
     <message>
-        <source>Device Filters</source>
-        <comment>details report (USB)</comment>
-        <translation type="obsolete">Gailu Iragazkiak</translation>
+        <source>Hard Disk Controller (SATA)</source>
+        <translation type="obsolete">Diska Gogor Kontrolatzailea (SATA)</translation>
     </message>
     <message>
-        <source>%1 (%2 active)</source>
-        <comment>details report (USB)</comment>
-        <translation type="obsolete">%1 (%2 aktibo)</translation>
+        <source>Hard Disk Controller (SCSI)</source>
+        <translation type="obsolete">Diska Gogor Kontrolatzailea (SCSI)</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (USB)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+1"/>
+        <source>DVD</source>
+        <translation>DVD</translation>
     </message>
     <message>
-        <source>Shared Folders</source>
-        <comment>details report (shared folders)</comment>
-        <translation type="obsolete">Partekatutako Karpetak</translation>
+        <location line="+1"/>
+        <source>Floppy</source>
+        <translation>Disketea</translation>
     </message>
     <message>
-        <source>None</source>
-        <comment>details report (shared folders)</comment>
-        <translation type="obsolete">Batez</translation>
+        <location line="+1"/>
+        <source>Network Adapter</source>
+        <translation>Sare Egokitzailea</translation>
     </message>
     <message>
-        <source>None</source>
-        <comment>details report (description)</comment>
-        <translation type="obsolete">Batez</translation>
+        <location line="+1"/>
+        <source>USB Controller</source>
+        <translation>USB Kontrolatzailea</translation>
     </message>
     <message>
-        <source>The selected virtual machine is <i>inaccessible</i>. Please inspect the error message shown below and press the <b>Refresh</b> button if you want to repeat the accessibility check:</source>
-        <translation type="unfinished">Hautaturiko makina birtuala <i>eskuraezina</i> dago. Mesedez arakatu beheko errore mezua eta <b>Freskatu</b> sakatu eskuragarritasun proba errepikatu nahi baduzu:</translation>
+        <location line="+1"/>
+        <source>Sound Card</source>
+        <translation>Soinu Txartela</translation>
     </message>
     <message>
-        <source>General</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Orokorra</translation>
+        <location line="+1"/>
+        <source>Virtual Disk Image</source>
+        <translation>Diska Birtual Irudia</translation>
     </message>
     <message>
-        <source>Audio</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Audioa</translation>
+        <location line="+1"/>
+        <source>Unknown Hardware Item</source>
+        <translation>Hardware Gai Ezezaguna</translation>
     </message>
     <message>
-        <source>Network</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Sarea</translation>
+        <location line="+34"/>
+        <source><b>Original Value:</b> %1</source>
+        <translation><b>Jatorrizko Balioa:</b> %1</translation>
     </message>
     <message>
-        <source>Serial Ports</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Serie Atakak</translation>
+        <location line="+629"/>
+        <source>Configuration</source>
+        <translation>Itxurapena</translation>
     </message>
     <message>
-        <source>USB</source>
-        <comment>details report</comment>
-        <translation type="obsolete">USB</translation>
+        <location filename="../src/widgets/UIApplianceEditorWidget.ui" line="+76"/>
+        <source>Warnings:</source>
+        <translation>Ohartarazpenak:</translation>
     </message>
     <message>
-        <source>Shared Folders</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Partekatutako Karpetak</translation>
+        <source>Hard Disk Controller (SAS)</source>
+        <translation type="obsolete">Diska Gogor Kontrolatzailea (SAS)</translation>
     </message>
-</context>
-<context>
-    <name>UIDnDHandler</name>
     <message>
-        <source>Dropping data ...</source>
-        <translation type="unfinished"></translation>
+        <location line="-28"/>
+        <source>When checked a new unique MAC address will assigned to all configured network cards.</source>
+        <translation>Hautatutakoan MAC helbide bakarra esleituko zaie itxuratutako sare txartel guztieri.</translation>
     </message>
     <message>
-        <source>Retrieving data ...</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>&Reinitialize the MAC address of all network cards</source>
+        <translation>&Berrabiarazi sare txartel guztien MAC helbidea</translation>
     </message>
 </context>
 <context>
-    <name>UIDownloader</name>
+    <name>UIApplianceImportEditorWidget</name>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <location filename="../src/widgets/UIApplianceImportEditorWidget.cpp" line="+154"/>
+        <source>Importing Appliance ...</source>
+        <translation>Makina Birtuala Inportatzen...</translation>
     </message>
     <message>
-        <source>Downloading the VirtualBox Guest Additions disk image file from <nobr><b>%1</b>...</nobr></source>
-        <translation type="obsolete">VirtualBox Bezero Gehigarri CD irudia <nobr><b>%1</b>-etik deskargatzen...</nobr></translation>
+        <location line="-80"/>
+        <source>Reading Appliance ...</source>
+        <translation>Makina Birtuala Irakurtzen...</translation>
     </message>
+</context>
+<context>
+    <name>UIDescriptionPagePrivate</name>
     <message>
-        <source>Cancel the VirtualBox Guest Additions disk image file download</source>
-        <translation type="obsolete">Utzi VirtualBox Bezero Gehigarri CD irudi deskarga</translation>
+        <source>No description. Press the Edit button below to add it.</source>
+        <translation type="obsolete">Azalpen gabe. Sakatu Editatu botoia behean gehitzeko.</translation>
     </message>
     <message>
-        <source>Could not locate the file on the server (response: %1).</source>
-        <translation type="obsolete">Ezin da fitxategia aurkitu zerbitzarian (erantzuna: %1).</translation>
+        <source>Edit</source>
+        <translation type="obsolete">Editatu</translation>
     </message>
     <message>
-        <source>Could not determine the file size.</source>
-        <translation type="obsolete">Ezin da fitxategi tamaina atzeman.</translation>
+        <source>Edit (Ctrl+E)</source>
+        <translation type="obsolete">Editatu (Ctrl+E)</translation>
     </message>
+</context>
+<context>
+    <name>UIDetailsBlock</name>
     <message>
-        <source>Could not connect to the server (%1).</source>
-        <translation type="obsolete">Ezin da zerbitzariarekin konektatu (%1).</translation>
+        <source>Name</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Izena</translation>
     </message>
     <message>
-        <source>Could not download the file (%1).</source>
-        <translation type="obsolete">Ezin da fitxategia deskargatu (%1).</translation>
+        <source>OS Type</source>
+        <comment>details report</comment>
+        <translation type="obsolete">SE Mota</translation>
     </message>
     <message>
-        <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source>
-        <translation type="obsolete"><p>Huts deskargatutako fitxategia <nobr><b>%1</b> bezala gordetzerakoan.</nobr></p></translation>
+        <source>Information inaccessible</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Argibideak eskuraezin</translation>
     </message>
     <message>
-        <source>Select folder to save Guest Additions image to</source>
-        <translation type="obsolete">Hautau Bezero Gehigarri CD irudia gordetzeko karpeta</translation>
+        <source>Base Memory</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Ohinarri Oroimena</translation>
     </message>
     <message>
-        <source>Connection timed out.</source>
-        <translation type="obsolete">Konexioa denboraz kanpo.</translation>
+        <source><nobr>%1 MB</nobr></source>
+        <comment>details report</comment>
+        <translation type="obsolete"><nobr>%1 MB</nobr></translation>
     </message>
     <message>
-        <source>The download process has been cancelled by the user.</source>
-        <translation type="obsolete">Deskarga prozesua erabiltzaileak eten du.</translation>
+        <source>Processors</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Prozesagailuak</translation>
     </message>
     <message>
-        <source>Looking for %1...</source>
-        <translation type="unfinished"></translation>
+        <source><nobr>%1</nobr></source>
+        <comment>details report</comment>
+        <translation type="obsolete"><nobr>%1</nobr></translation>
     </message>
     <message>
-        <source>Downloading %1...</source>
-        <translation type="unfinished"></translation>
+        <source><nobr>%1%</nobr></source>
+        <comment>details report</comment>
+        <translation type="obsolete"><nobr>%1%</nobr></translation>
     </message>
-</context>
-<context>
-    <name>UIDownloaderAdditions</name>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <source>Boot Order</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Abiarazpen Hurrenkera</translation>
     </message>
     <message>
-        <source>Downloading the VirtualBox Guest Additions disk image file from <nobr><b>%1</b>...</nobr></source>
-        <translation type="obsolete">VirtualBox Bezero Gehigarri CD irudia <nobr><b>%1</b>-etik deskargatzen...</nobr></translation>
+        <source>ACPI</source>
+        <comment>details report</comment>
+        <translation type="obsolete">ACPI</translation>
     </message>
     <message>
-        <source>Cancel the VirtualBox Guest Additions disk image file download</source>
-        <translation type="obsolete">Utzi VirtualBox Bezero Gehigarri CD irudi deskarga</translation>
+        <source>IO APIC</source>
+        <comment>details report</comment>
+        <translation type="obsolete">IO APIC</translation>
     </message>
     <message>
-        <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source>
-        <translation type="obsolete"><p>Huts deskargatutako fitxategia <nobr><b>%1</b> bezala gordetzerakoan.</nobr></p></translation>
+        <source>BIOS</source>
+        <comment>details report</comment>
+        <translation type="obsolete">BIOS</translation>
     </message>
     <message>
-        <source>Select folder to save Guest Additions image to</source>
-        <translation type="unfinished">Hautau Bezero Gehigarri CD irudia gordetzeko karpeta</translation>
+        <source>VT-x/AMD-V</source>
+        <comment>details report</comment>
+        <translation type="obsolete">VT-x/AMD-V</translation>
     </message>
     <message>
-        <source>VirtualBox Guest Additions</source>
-        <translation type="unfinished"></translation>
+        <source>PAE/NX</source>
+        <comment>details report</comment>
+        <translation type="obsolete">PAE/NX</translation>
     </message>
-</context>
-<context>
-    <name>UIDownloaderExtensionPack</name>
     <message>
-        <source>Select folder to save %1 to</source>
-        <translation type="unfinished"></translation>
+        <source>Acceleration</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Bizkorpena</translation>
     </message>
     <message>
-        <source>VirtualBox Extension Pack</source>
-        <translation type="unfinished"></translation>
+        <source>Video Memory</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Bideo Oroimena</translation>
     </message>
-</context>
-<context>
-    <name>UIDownloaderUserManual</name>
     <message>
-        <source>Select folder to save User Manual to</source>
-        <translation type="unfinished"></translation>
+        <source>Screens</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Ikusleihoak</translation>
     </message>
     <message>
-        <source>VirtualBox User Manual</source>
-        <translation type="unfinished"></translation>
+        <source>2D Video</source>
+        <comment>details report</comment>
+        <translation type="obsolete">2D Bideoa</translation>
     </message>
-</context>
-<context>
-    <name>UIExportApplianceWzd</name>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <source>3D</source>
+        <comment>details report</comment>
+        <translation type="obsolete">3D</translation>
+    </message>
+    <message>
+        <source>Remote Desktop Server Port</source>
+        <comment>details report (VRDE Server)</comment>
+        <translation type="obsolete">Hurruneko Mahaigain Zerbitzari Ataka</translation>
     </message>
-</context>
-<context>
-    <name>UIFirstRunWzd</name>
     <message>
-        <source>First Run Wizard</source>
-        <translation type="obsolete">Lehen Abiarazte Morroia</translation>
+        <source>Remote Desktop Server</source>
+        <comment>details report (VRDE Server)</comment>
+        <translation type="obsolete">Hurruneko Mahaigain Zerbitzaria</translation>
     </message>
     <message>
-        <source><p>You have started a newly created virtual machine for the first time. This wizard will help you to perform the steps necessary for installing an operating system of your choice onto this virtual machine.</p><p>Use the <b>Next</b> button to go to the next page of the wizard and the <b>Back</b> button to return to the previous page. You can also press <b>Cancel</b> if you want to cancel the execution of this wizard.&lt [...]
-        <translation type="obsolete"><p>Sortu berri duzun makina birtuala lehen aldiz abiarazi duzu. Morroi honek zure aukerako sistema eragile makina birtual horretan instalatzeko egin beharreko urratsetan lagunduko zaitu.</p><p><b>Hurrengoa</b> botoia erabili morroiaren hurrengo orrialdera joateko eta <b>Atzera</b> botoia aurreko orrialdera joateko. Baita <b>Utzi</b> sakatu dezakezu morroiaren exekuzioa eteteko.</p></translation>
+        <source>Disabled</source>
+        <comment>details report (VRDE Server)</comment>
+        <translation type="obsolete">Ezgaituta</translation>
     </message>
     <message>
-        <source>Welcome to the First Run Wizard!</source>
-        <translation type="obsolete">Ongietorri Lehen Abiarazte Morroira!</translation>
+        <source>(CD/DVD)</source>
+        <translation type="obsolete">(CD/DVD)</translation>
     </message>
     <message>
-        <source><p>Select the type of media you would like to use for installation.</p></source>
-        <translation type="obsolete"><p>Hautatu behean instalatzeko erabili nahi duzun instalazio medioa.</p></translation>
+        <source>Not Attached</source>
+        <comment>details report (Storage)</comment>
+        <translation type="obsolete">Erantsi gabe</translation>
     </message>
     <message>
-        <source>Media Type</source>
-        <translation type="obsolete">Euskarri Mota</translation>
+        <source>Host Driver</source>
+        <comment>details report (audio)</comment>
+        <translation type="obsolete">Hostalari Gidagailua</translation>
     </message>
     <message>
-        <source>&CD/DVD Device</source>
-        <translation type="obsolete">&CD/DVD Gailua</translation>
+        <source>Controller</source>
+        <comment>details report (audio)</comment>
+        <translation type="obsolete">Kontrolatzailea</translation>
     </message>
     <message>
-        <source>Alt+C</source>
-        <translation type="obsolete">Alt+C</translation>
+        <source>Disabled</source>
+        <comment>details report (audio)</comment>
+        <translation type="obsolete">Ezgaituta</translation>
     </message>
     <message>
-        <source>&Floppy Device</source>
-        <translation type="obsolete">&Diskete Gailua</translation>
+        <source>Bridged adapter, %1</source>
+        <comment>details report (network)</comment>
+        <translation type="obsolete">Zubi egokitzailea, %1</translation>
     </message>
     <message>
-        <source>Alt+F</source>
-        <translation type="obsolete">Alt+D</translation>
+        <source>Internal network, '%1'</source>
+        <comment>details report (network)</comment>
+        <translation type="obsolete">Barneko sarea, '%1'</translation>
     </message>
     <message>
-        <source><p>Select the media which contains the setup program of the operating system you want to install. This media must be bootable, otherwise the setup program will not be able to start.</p></source>
-        <translation type="obsolete"><p>Hautatu instalatu nahi duzun sistema eragilearen instalazio programa duen euskarria. Euskarria abiarazgarria izan behar da, beste instalazio programak ezin izango du abiarazi.</p></translation>
+        <source>Generic driver, '%1'</source>
+        <comment>details report (network)</comment>
+        <translation type="obsolete">Gidagailu generikoa, '%1'</translation>
     </message>
     <message>
-        <source>Media Source</source>
-        <translation type="obsolete">Euskarri Jatorria</translation>
+        <source>Generic driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <comment>details report (network)</comment>
+        <translation type="obsolete">Gidagailu generikoa, '%1' {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
-        <source>&Host Drive</source>
-        <translation type="obsolete">&Ostalari Gailua</translation>
+        <source>Adapter %1</source>
+        <comment>details report (network)</comment>
+        <translation type="obsolete">Egokitzailea %1</translation>
     </message>
     <message>
-        <source>Alt+H</source>
-        <translation type="obsolete">Alt+O</translation>
+        <source>Disabled</source>
+        <comment>details report (network)</comment>
+        <translation type="obsolete">Ezgaituta</translation>
     </message>
     <message>
-        <source>&Image File</source>
-        <translation type="obsolete">&Irudi Fitxategia</translation>
+        <source>Port %1</source>
+        <comment>details report (serial ports)</comment>
+        <translation type="obsolete">Ataka %1</translation>
     </message>
     <message>
-        <source>Alt+I</source>
-        <translation type="obsolete">Alt+I</translation>
+        <source>Disabled</source>
+        <comment>details report (serial ports)</comment>
+        <translation type="obsolete">Ezgaituta</translation>
     </message>
     <message>
-        <source>VDM</source>
-        <translation type="obsolete">VDM</translation>
+        <source>Port %1</source>
+        <comment>details report (parallel ports)</comment>
+        <translation type="obsolete">Ataka %1</translation>
     </message>
     <message>
-        <source>Select Installation Media</source>
-        <translation type="obsolete">Instalazio Euskarri Hautatu</translation>
+        <source>Disabled</source>
+        <comment>details report (parallel ports)</comment>
+        <translation type="obsolete">Ezgaituta</translation>
     </message>
     <message>
-        <source><p>You have selected the following media to boot from:</p></source>
-        <translation type="obsolete"><p>Bertatik abiarazteko hurrengo euskarria hautatu duzu:</p></translation>
+        <source>Device Filters</source>
+        <comment>details report (USB)</comment>
+        <translation type="obsolete">Gailu Iragazkiak</translation>
     </message>
     <message>
-        <source><p>If the above is correct, press the <b>Finish</b> button. Once you press it, the selected media will be temporarily mounted on the virtual machine and the machine will start execution.</p><p>Please note that when you close the virtual machine, the specified media will be automatically unmounted and the boot device will be set back to the first hard disk.</p><p>Depending on the type of the setup program, you may need to manually  [...]
-        <translation type="obsolete"><p>Aurrekoa zuzena bada, sakatu <b>Amaitu</b> botoia. Egiten duzunean hautatutako euskarria aldi batetarako makina birtualean muntatu eta makinak exekuzioa abiaraziko du.</p><p>Mesedez kontutan izan zuk makina birtuala ixtean, ezarritako euskarri automatikoki desmuntatuko dela eta abio gailu bezala lehenengo disko gogorra ipiniko dela.</p><p>Konfigurazio programa motaren arabera agian diskoa desmuntatu (atera) [...]
+        <source>%1 (%2 active)</source>
+        <comment>details report (USB)</comment>
+        <translation type="obsolete">%1 (%2 gaituta)</translation>
     </message>
     <message>
-        <source>Summary</source>
-        <translation type="obsolete">Laburpena</translation>
+        <source>Disabled</source>
+        <comment>details report (USB)</comment>
+        <translation type="obsolete">Ezgaituta</translation>
     </message>
     <message>
-        <source>CD/DVD Device</source>
-        <translation type="obsolete">CD/DVD Gailua</translation>
+        <source>Shared Folders</source>
+        <comment>details report (shared folders)</comment>
+        <translation type="obsolete">Elkarbanatutako Agiritegiak</translation>
     </message>
     <message>
-        <source>Floppy Device</source>
-        <translation type="obsolete">Diskete Gailua</translation>
+        <source>None</source>
+        <comment>details report (shared folders)</comment>
+        <translation type="obsolete">Ezer ez</translation>
     </message>
     <message>
-        <source>Host Drive %1</source>
-        <translation type="obsolete">Ostalari Kontrolagailua %1</translation>
+        <source>None</source>
+        <comment>details report (description)</comment>
+        <translation type="obsolete">Ezer ez</translation>
     </message>
+</context>
+<context>
+    <name>UIDetailsPagePrivate</name>
     <message>
-        <source><table><tr><td>Type:</td><td>%1</td></tr><tr><td>Source:</td><td>%2</td></tr></table></source>
-        <translation type="obsolete"><table><tr><td>Mota:</td><td>%1</td></tr><tr><td>Jatorria:</td><td>%2</td></tr></table></translation>
+        <location filename="../src/selector/UIVMDesktop.cpp" line="+140"/>
+        <source>The selected virtual machine is <i>inaccessible</i>. Please inspect the error message shown below and press the <b>Refresh</b> button if you want to repeat the accessibility check:</source>
+        <translation>Hautaturiko makina birtuala <i>eskuraezina</i> da. Mesedez aztertu behean erakusten den akats mezua eta sakatu <b>Berritu</b> botoia sarbidetasun egiaztapena berregitea nahi baduzu:</translation>
     </message>
     <message>
-        <source><p>You have started a newly created virtual machine for the first time. This wizard will help you to perform the steps necessary for booting an operating system of your choice on the virtual machine.</p><p>Note that you will not be able to install an operating system into this virtual machine right now because you did not attach any hard disk to it. If this is not what you want, you can cancel the execution of this wizard, select <b>Settings</b& [...]
-        <translation type="obsolete"><p>Sortu  berri duzun makina birtuala lehen aldiz abiarazi duzu. Morroi honek hautatu duzun sistema eragile makina birtualean abiarazteko bete beharreko urratsak betetzen lagunduko zaitu.</p><p>Kontutan izan ezin duzula sistema eragile bat orain instalatu makina birtual honetan ez bait duzu disko gogorrik erantsi makina birtualari. Hau ez bada nahi duzuna, morroi honen exekuzioa utzi dezakezu, <b>Ezarpenak</b> hautatu Vir [...]
+        <source>General</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Orokorra</translation>
     </message>
     <message>
-        <source><p>Select the type of media you would like to use for booting an operating system.</p></source>
-        <translation type="obsolete"><p>Hautatu sistema eragile bat abiarazteko erabili nahi duzun medio mota.</p></translation>
+        <source>System</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Sistema</translation>
     </message>
     <message>
-        <source><p>Select the media that contains the operating system you want to work with. This media must be bootable, otherwise the operating system will not be able to start.</p></source>
-        <translation type="obsolete"><p>Hautatu berarekin lan egin nahi duzun sistema eragile duen euskarria. Euskarri hau abiarazgarria izan behar da, bestela sistema eragilea ez da abiarazteko gai izango</p></translation>
+        <source>Preview</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Aurreikuspena</translation>
     </message>
     <message>
-        <source><p>You have selected the following media to boot an operating system from:</p></source>
-        <translation type="obsolete"><p>Bertatik abiarazteko sistema eragilea duen hurrengo medioa hautatu duzu:</p></translation>
+        <source>Display</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Erakutsi</translation>
     </message>
     <message>
-        <source><p>If the above is correct, press the <b>Finish</b> button. Once you press it, the selected media will be mounted on the virtual machine and the machine will start execution.</p></source>
-        <translation type="obsolete"><p>Aurrekoa zuzena bada <b>Amaitu</b> botoia sakatu. Behin sakatu duzunean, hautatutako medioa makina birtualean kargatuko da eta makinak exekuzioa abiaraziko du.</p></translation>
+        <source>Storage</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Biltegia</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <source>Audio</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Audioa</translation>
     </message>
     <message>
-        <source>Start</source>
-        <translation type="obsolete">Abiarazi</translation>
+        <source>Network</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Sarea</translation>
     </message>
-</context>
-<context>
-    <name>UIFirstRunWzdPage1</name>
     <message>
-        <source>Welcome to the First Run Wizard!</source>
-        <translation type="obsolete">Ongietorri Lehen Abiarazte Morroira!</translation>
+        <source>Serial Ports</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Serieko Atakak</translation>
     </message>
-</context>
-<context>
-    <name>UIFirstRunWzdPage2</name>
     <message>
-        <source><p>Select the media which contains the setup program of the operating system you want to install. This media must be bootable, otherwise the setup program will not be able to start.</p></source>
-        <translation type="obsolete"><p>Hautatu instalatu nahi duzun sistema eragilearen instalazio programa duen euskarria. Euskarria abiarazgarria izan behar da, beste instalazio programak ezin izango du abiarazi.</p></translation>
+        <source>Parallel Ports</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Ataka Kidetuak</translation>
     </message>
     <message>
-        <source><p>Select the media that contains the operating system you want to work with. This media must be bootable, otherwise the operating system will not be able to start.</p></source>
-        <translation type="obsolete"><p>Hautatu berarekin lan egin nahi duzun sistema eragile duen euskarria. Euskarri hau abiarazgarria izan behar da, bestela sistema eragilea ez da abiarazteko gai izango</p></translation>
+        <source>USB</source>
+        <comment>details report</comment>
+        <translation type="obsolete">USB</translation>
     </message>
     <message>
-        <source>Media Source</source>
-        <translation type="obsolete">Euskarri Jatorria</translation>
+        <source>Shared Folders</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Elkarbanatutako Agiritegiak</translation>
     </message>
     <message>
-        <source>Select Installation Media</source>
-        <translation type="obsolete">Instalazio Euskarri Hautatu</translation>
+        <source>Description</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Azalpena</translation>
     </message>
 </context>
 <context>
-    <name>UIFirstRunWzdPage3</name>
+    <name>UIDnDHandler</name>
     <message>
-        <source><p>You have selected the following media to boot from:</p></source>
-        <translation type="obsolete"><p>Bertatik abiarazteko hurrengo euskarria hautatu duzu:</p></translation>
+        <location filename="../src/runtime/UIDnDHandler.cpp" line="+175"/>
+        <source>Dropping data ...</source>
+        <translation>Datuak erortzen...</translation>
     </message>
     <message>
-        <source><p>You have selected the following media to boot an operating system from:</p></source>
-        <translation type="obsolete"><p>Bertatik abiarazteko sistema eragilea duen hurrengo medioa hautatu duzu:</p></translation>
+        <location line="+283"/>
+        <source>Retrieving data ...</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><p>If the above is correct, press the <b>Finish</b> button. Once you press it, the selected media will be temporarily mounted on the virtual machine and the machine will start execution.</p><p>Please note that when you close the virtual machine, the specified media will be automatically unmounted and the boot device will be set back to the first hard disk.</p><p>Depending on the type of the setup program, you may need to manually  [...]
-        <translation type="obsolete"><p>Aurrekoa zuzena bada, sakatu <b>Amaitu</b> botoia. Egiten duzunean hautatutako euskarria aldi batetarako makina birtualean muntatu eta makinak exekuzioa abiaraziko du.</p><p>Mesedez kontutan izan zuk makina birtuala ixtean, ezarritako euskarri automatikoki desmuntatuko dela eta abio gailu bezala lehenengo disko gogorra ipiniko dela.</p><p>Konfigurazio programa motaren arabera agian diskoa desmuntatu (atera) [...]
+</context>
+<context>
+    <name>UIDnDMimeData</name>
+    <message>
+        <source>Dropping data ...</source>
+        <translation type="obsolete">Datuak erortzen...</translation>
+    </message>
+</context>
+<context>
+    <name>UIDownloader</name>
+    <message>
+        <location filename="../src/net/UIDownloader.cpp" line="+50"/>
+        <source>Looking for %1...</source>
+        <translation>Bilatzen %1...</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Downloading %1...</source>
+        <translation>Jeisten %1...</translation>
+    </message>
+</context>
+<context>
+    <name>UIDownloaderAdditions</name>
+    <message>
+        <location filename="../src/net/UIDownloaderAdditions.cpp" line="+112"/>
+        <source>Select folder to save Guest Additions image to</source>
+        <translation>Hautatu Gonbidatu Gehigarri irudia gordetzeko agiritegia</translation>
+    </message>
+    <message>
+        <location line="-51"/>
+        <source>VirtualBox Guest Additions</source>
+        <translation>VirtualBox Gonbidatu Gehigarriak</translation>
+    </message>
+</context>
+<context>
+    <name>UIDownloaderExtensionPack</name>
+    <message>
+        <location filename="../src/net/UIDownloaderExtensionPack.cpp" line="+130"/>
+        <source>Select folder to save %1 to</source>
+        <translation>Hautatu %1 gordetzeko agiritegia</translation>
     </message>
     <message>
-        <source><p>If the above is correct, press the <b>Finish</b> button. Once you press it, the selected media will be mounted on the virtual machine and the machine will start execution.</p></source>
-        <translation type="obsolete"><p>Aurrekoa zuzena bada <b>Amaitu</b> botoia sakatu. Behin sakatu duzunean, hautatutako medioa makina birtualean kargatuko da eta makinak exekuzioa abiaraziko du.</p></translation>
+        <location line="-67"/>
+        <source>VirtualBox Extension Pack</source>
+        <translation>VirtualBox Hedapen Paketea</translation>
     </message>
+</context>
+<context>
+    <name>UIDownloaderUserManual</name>
     <message>
-        <source>Summary</source>
-        <translation type="obsolete">Laburpena</translation>
+        <location filename="../src/net/UIDownloaderUserManual.cpp" line="+116"/>
+        <source>Select folder to save User Manual to</source>
+        <translation>Hautatu Erabiltzaile Eskuliburua gordetzeko agiritegia</translation>
     </message>
     <message>
-        <source>CD/DVD Device</source>
-        <translation type="obsolete">CD/DVD Gailua</translation>
+        <location line="-55"/>
+        <source>VirtualBox User Manual</source>
+        <translation>VirtualBox Erabiltzaile Eskuliburua</translation>
     </message>
 </context>
 <context>
     <name>UIGChooserItemGroup</name>
     <message>
+        <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="+659"/>
         <source><b>%1</b></source>
         <comment>Group item tool-tip / Group name</comment>
-        <translation type="unfinished"></translation>
+        <translation><b>%1</b></translation>
     </message>
     <message numerus="yes">
+        <location line="+10"/>
         <source>%n group(s)</source>
         <comment>Group item tool-tip / Group info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n talde</numerusform>
+            <numerusform>%n talde</numerusform>
         </translation>
     </message>
     <message>
+        <location line="+3"/>
         <source><nobr>%1</nobr></source>
         <comment>Group item tool-tip / Group info wrapper</comment>
-        <translation type="unfinished"></translation>
+        <translation><nobr>%1</nobr></translation>
     </message>
     <message numerus="yes">
+        <location line="+13"/>
         <source>%n machine(s)</source>
         <comment>Group item tool-tip / Machine info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n makina</numerusform>
+            <numerusform>%n makina</numerusform>
         </translation>
     </message>
     <message numerus="yes">
+        <location line="+1"/>
         <source>(%n running)</source>
         <comment>Group item tool-tip / Running machine info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>(%n ekinean)</numerusform>
+            <numerusform>(%n ekinean)</numerusform>
         </translation>
     </message>
     <message>
+        <location line="+4"/>
         <source><nobr>%1</nobr></source>
         <comment>Group item tool-tip / Machine info wrapper</comment>
-        <translation type="unfinished"></translation>
+        <translation><nobr>%1</nobr></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source><nobr>%1 %2</nobr></source>
         <comment>Group item tool-tip / Machine info wrapper, including running</comment>
-        <translation type="unfinished"></translation>
+        <translation><nobr>%1 %2</nobr></translation>
     </message>
     <message>
+        <location line="+15"/>
         <source>Collapse group</source>
-        <translation type="unfinished"></translation>
+        <translation>Bildu taldea</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Expand group</source>
-        <translation type="unfinished"></translation>
+        <translation>Hedatu taldea</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Enter group</source>
-        <translation type="unfinished"></translation>
+        <translation>Sartu taldera</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Exit group</source>
-        <translation type="unfinished"></translation>
+        <translation>Irten taldetik</translation>
     </message>
 </context>
 <context>
     <name>UIGChooserModel</name>
     <message>
+        <location filename="../src/selector/graphics/chooser/UIGChooserModel.cpp" line="+528"/>
         <source>New group</source>
-        <translation type="unfinished"></translation>
+        <translation>Talde berria</translation>
     </message>
 </context>
 <context>
     <name>UIGDetails</name>
     <message>
+        <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="+127"/>
         <source>Name</source>
         <comment>details (general)</comment>
-        <translation type="unfinished">Izena</translation>
+        <translation>Izena</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>Groups</source>
         <comment>details (general)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Taldeak</translation>
     </message>
     <message>
+        <location line="+162"/>
+        <location line="+107"/>
         <source>%1 MB</source>
         <comment>details</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
+        <location line="-102"/>
         <source>Processors</source>
         <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Prozesagailuak</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>%1%</source>
         <comment>details</comment>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
+        <location line="+22"/>
         <source>VT-x/AMD-V</source>
         <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <translation>VT-x/AMD-V</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>PAE/NX</source>
         <comment>details (system)</comment>
+        <translation>PAE/NX</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Minimal Paravirtualization</source>
+        <comment>details (system)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Acceleration</source>
+        <location line="+1"/>
+        <source>Hyper-V Paravirtualization</source>
+        <comment>details (system)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>KVM Paravirtualization</source>
         <comment>details (system)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+4"/>
+        <source>Acceleration</source>
+        <comment>details (system)</comment>
+        <translation>Bizkorpena</translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Screens</source>
         <comment>details (display)</comment>
+        <translation>Ikusleihoak</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <translation type="unfinished">Gaituta</translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>3D</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">3D</translation>
+        <translation>3D</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Acceleration</source>
         <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Bizkorpena</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Disabled</source>
         <comment>details (display/vrde/VRDE server)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>Not attached</source>
+        <location line="+6"/>
+        <source>Video Capture File</source>
+        <comment>details (display/video capture)</comment>
+        <translation>Bido Harpen Agiria</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Video Capture Attributes</source>
+        <comment>details (display/video capture)</comment>
+        <translation>Bideo Harpen Ezaugarriak</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps</source>
+        <translation>Frame Neurria: %1x%2, Frame Maila: %3fps-ko, Bit Maila: %4kbs-ko</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Video Capture</source>
+        <comment>details (display/video capture)</comment>
+        <translation>Bideo Harpena</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Disabled</source>
+        <comment>details (display/video capture)</comment>
+        <translation>Ezgaituta</translation>
+    </message>
+    <message>
+        <source>[CD/DVD]</source>
         <comment>details (storage)</comment>
-        <translation type="obsolete">Ez erantsia</translation>
+        <translation type="obsolete">[CD/DVD]</translation>
     </message>
     <message>
+        <location line="+166"/>
         <source>Controller</source>
         <comment>details (audio)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Kontrolatzailea</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Disabled</source>
         <comment>details (audio)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
+        <translation>Ezgaituta</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>NAT Network, '%1'</source>
+        <comment>details (network)</comment>
+        <translation>NAT Sarea, '%1'</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Adapter %1</source>
         <comment>details (network)</comment>
-        <translation type="unfinished">%1 Moldagailua</translation>
+        <translation>Egokitzailea %1</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Disabled</source>
         <comment>details (network/adapter)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
+        <location line="+81"/>
         <source>Port %1</source>
         <comment>details (serial)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ataka %1</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Disabled</source>
         <comment>details (serial)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
+        <location line="+60"/>
         <source>Port %1</source>
         <comment>details (parallel)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ataka %1</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Disabled</source>
         <comment>details (parallel)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
+        <translation>Ezgaituta</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">USB Kontrolatzailea</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>%1 (%2 active)</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished">%1 (%2 aktibo)</translation>
+        <translation>%1 (%2 gaituta)</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Disabled</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
+        <location line="+58"/>
         <source>None</source>
         <comment>details (shared folders)</comment>
-        <translation type="unfinished">Batez</translation>
+        <translation>Ezer ez</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Menu-bar</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">Gaituta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">Ezgaituta</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enabled</source>
+        <comment>details (user interface/status-bar)</comment>
+        <translation type="unfinished">Gaituta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
+        <translation type="unfinished">Ezgaituta</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location line="+5"/>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Disabled</source>
+        <comment>details (user interface/mini-toolbar)</comment>
+        <translation type="unfinished">Ezgaituta</translation>
     </message>
     <message>
+        <location line="+57"/>
         <source>None</source>
         <comment>details (description)</comment>
-        <translation type="unfinished">Batez</translation>
+        <translation>Ezer ez</translation>
     </message>
     <message>
+        <location line="-1102"/>
         <source>Operating System</source>
         <comment>details (general)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <translation>Sistema Eragilea</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location line="+212"/>
+        <location line="+134"/>
+        <location line="+107"/>
+        <location line="+63"/>
+        <location line="+108"/>
+        <location line="+86"/>
+        <location line="+65"/>
+        <location line="+78"/>
+        <location line="+55"/>
+        <location line="+119"/>
+        <location line="+55"/>
         <source>Information Inaccessible</source>
         <comment>details</comment>
-        <translation type="unfinished"></translation>
+        <translation>Argibideak eskuraezin</translation>
     </message>
     <message>
+        <location line="-925"/>
         <source>Base Memory</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Oinarri Memoria</translation>
+        <translation>Ohinarri Oroimena</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Execution Cap</source>
         <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Exekuzio Muga</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Boot Order</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Abio Ordena</translation>
+        <translation>Abiarazpen Hurrenkera</translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Nested Paging</source>
         <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nested Orrialdeztapena</translation>
     </message>
     <message>
+        <location line="+69"/>
         <source>Video Memory</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">Bideo Memoria</translation>
+        <translation>Bideo Oroimena</translation>
     </message>
     <message>
+        <location line="+44"/>
         <source>2D Video</source>
         <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <translation>2D Bideoa</translation>
     </message>
     <message>
+        <location line="+14"/>
         <source>Remote Desktop Server Port</source>
         <comment>details (display/vrde)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hurruneko Mahaigain Zerbitzari Ataka</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Remote Desktop Server</source>
         <comment>details (display/vrde)</comment>
+        <translation>Hurruneko Mahaigain Zerbitzaria</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+27"/>
         <source>Not Attached</source>
         <comment>details (storage)</comment>
-        <translation type="unfinished">Ez erantsia</translation>
+        <translation>Erantsi gabe</translation>
     </message>
     <message>
+        <location line="+54"/>
         <source>Host Driver</source>
         <comment>details (audio)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hostalari Gidagailua</translation>
     </message>
     <message>
+        <location line="+75"/>
         <source>Bridged Adapter, %1</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Zubi egokitzailea, %1</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Internal Network, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Barneko sarea, '%1'</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Host-only Adapter, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hostalaria-bakarrik Egokitzailea, '%1'</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Generic Driver, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Gidagailu generikoa, '%1'</translation>
     </message>
     <message>
         <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Gidagailu generikoa, '%1' {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
+        <location line="+244"/>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished">Gailu Iragazkiak</translation>
+        <translation>Gailu Iragakiak</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>USB Controller Inaccessible</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB Kontrolatzailea Eskuraezina</translation>
     </message>
     <message>
+        <location line="+53"/>
         <source>Shared Folders</source>
         <comment>details (shared folders)</comment>
-        <translation type="unfinished">Partekatutako Karpetak</translation>
+        <translation>Elkarbanatutako Agiritegiak</translation>
+    </message>
+</context>
+<context>
+    <name>UIGMachinePreview</name>
+    <message>
+        <location filename="../src/selector/graphics/details/UIGMachinePreview.cpp" line="+355"/>
+        <source>Every 0.5 s</source>
+        <translation>0.5 seg-tik behin</translation>
     </message>
     <message>
-        <source>Video Capture File</source>
-        <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Every 1 s</source>
+        <translation>1 seg-tik behin</translation>
     </message>
     <message>
-        <source>Video Capture Attributes</source>
-        <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Every 2 s</source>
+        <translation>2 seg-tik behin</translation>
     </message>
     <message>
-        <source>Video Capture</source>
-        <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Every 5 s</source>
+        <translation>5 seg-tik behin</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (display/video capture)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
+        <location line="+1"/>
+        <source>Every 10 s</source>
+        <translation>10 seg-tik behin</translation>
     </message>
     <message>
-        <source>NAT Network, '%1'</source>
-        <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <location line="-5"/>
+        <source>Update disabled</source>
+        <translation>Eguneraketa ezgaituta</translation>
     </message>
     <message>
-        <source>Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps</source>
-        <translation type="unfinished"></translation>
+        <location line="-207"/>
+        <source>No preview</source>
+        <translation>Ez dago aurreikuspenik</translation>
     </message>
+</context>
+<context>
+    <name>UIGlobalSettingsDisplay</name>
     <message>
-        <source>Minimal Paravirtualization</source>
-        <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/global/UIGlobalSettingsDisplay.ui" line="+24"/>
+        <source>Maximum Guest Screen &Size:</source>
+        <translation>Geh. Gonbidatu Ikusleiho &Neurria:</translation>
     </message>
     <message>
-        <source>Hyper-V Paravirtualization</source>
-        <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <location line="+23"/>
+        <source>&Width:</source>
+        <translation>&Zabalera:</translation>
     </message>
     <message>
-        <source>KVM Paravirtualization</source>
-        <comment>details (system)</comment>
+        <location line="+19"/>
+        <source>Holds the maximum width which we would like the guest to use.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <location line="+26"/>
+        <source>Holds the maximum height which we would like the guest to use.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
+        <location line="+23"/>
+        <source>When checked, machine windows will be raised when the mouse pointer moves over them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/Unscaled HiDPI Video Output)</comment>
-        <translation type="obsolete">Gaiturik</translation>
+        <source>Specifies the maximum width which we would like the guest to use.</source>
+        <translation type="obsolete">Gonbidatuak erabili dezan nahi dugun gehinezko zabalera adierazten du.</translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <location line="-42"/>
+        <source>&Height:</source>
+        <translation>&Garaiera:</translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
+        <source>Specifies the maximum height which we would like the guest to use.</source>
+        <translation type="obsolete">Gonbidatuak erabili dezan nahi dugun gehinezko garaiera adierazten du.</translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <location line="+26"/>
+        <source>Machine Windows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
-        <comment>details (user interface)</comment>
+        <location line="+19"/>
+        <source>&Raise Window Under Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
+        <location filename="../src/settings/global/UIGlobalSettingsDisplay.cpp" line="+181"/>
+        <source>Automatic</source>
+        <comment>Maximum Guest Screen Size</comment>
+        <translation>Berezgaitasunez</translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>Suggest a reasonable maximum screen size to the guest. The guest will only see this suggestion when guest additions are installed.</source>
+        <translation>Iradoki gonbidatuarentzako gehienezko ikusleiho neurri egoki bat. Gonbidatuak iradokizun hau gonbidatu gehigarriak ezarrita daudenean bakarrik ikusten du.</translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>None</source>
+        <comment>Maximum Guest Screen Size</comment>
+        <translation>Ezer ez</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
-        <translation type="unfinished">Gaiturik</translation>
+        <location line="+2"/>
+        <source>Do not attempt to limit the size of the guest screen.</source>
+        <translation>Ez saiatu gonbidatu ikusleihoaren neurria mugatzen.</translation>
     </message>
     <message>
-        <source>Menu-bar</source>
-        <comment>details (user interface)</comment>
+        <location line="+2"/>
+        <source>Hint</source>
+        <comment>Maximum Guest Screen Size</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
+        <location line="+2"/>
+        <source>Suggest a maximum screen size to the guest. The guest will only see this suggestion when guest additions are installed.</source>
+        <translation>Gonbidatuarentzako gehienezko ikusleiho neurria iradokitzendu. Gonbidatuak iradokizun hau gonbidatu gehigarriak ezarrita daudenean bakarrik ikusiko ditu.</translation>
     </message>
+</context>
+<context>
+    <name>UIGlobalSettingsExtension</name>
     <message>
-        <source>Status-bar</source>
-        <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <source>&Extension Packages:</source>
+        <translation type="obsolete">&Hedapen Paketeak:</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished">Gaiturik</translation>
+        <location filename="../src/settings/global/UIGlobalSettingsExtension.ui" line="+24"/>
+        <source>&Extension Packages</source>
+        <translation>&Hedapen Paketeak</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
+        <location line="+31"/>
+        <source>Lists all installed packages.</source>
+        <translation>Ezarritako pakete guztiak zerrendatzen ditu.</translation>
     </message>
-</context>
-<context>
-    <name>UIGDetailsUpdateThreadAudio</name>
     <message>
-        <source>Disabled</source>
-        <comment>details</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+7"/>
+        <source>Active</source>
+        <translation>Gaituta</translation>
     </message>
-</context>
-<context>
-    <name>UIGDetailsUpdateThreadDescription</name>
     <message>
-        <source>None</source>
-        <comment>details</comment>
-        <translation type="obsolete">Batez</translation>
+        <location line="+5"/>
+        <source>Name</source>
+        <translation>Izena</translation>
     </message>
-</context>
-<context>
-    <name>UIGDetailsUpdateThreadDisplay</name>
     <message>
-        <source>Video Memory</source>
-        <comment>details</comment>
-        <translation type="obsolete">Bideo Memoria</translation>
+        <location line="+5"/>
+        <source>Version</source>
+        <translation>Bertsioa</translation>
     </message>
     <message>
-        <source>3D</source>
-        <comment>details report</comment>
-        <translation type="obsolete">3D</translation>
+        <source>Add package</source>
+        <translation type="obsolete">Gehitu paketea</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details report (VRDE Server)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <source>Remove package</source>
+        <translation type="obsolete">Kendu paketea</translation>
     </message>
-</context>
-<context>
-    <name>UIGDetailsUpdateThreadGeneral</name>
     <message>
-        <source>Name</source>
-        <comment>details</comment>
-        <translation type="obsolete">Izena</translation>
+        <location filename="../src/settings/global/UIGlobalSettingsExtension.cpp" line="+286"/>
+        <source>Add Package</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIGDetailsUpdateThreadNetwork</name>
     <message>
-        <source>Adapter %1</source>
-        <comment>details</comment>
-        <translation type="obsolete">%1 Moldagailua</translation>
+        <location line="+1"/>
+        <source>Remove Package</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+2"/>
+        <source>Adds new package.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIGDetailsUpdateThreadParallel</name>
     <message>
-        <source>Disabled</source>
-        <comment>details</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+1"/>
+        <source>Removes selected package.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIGDetailsUpdateThreadSF</name>
     <message>
-        <source>None</source>
-        <comment>details</comment>
-        <translation type="obsolete">Batez</translation>
+        <location line="+43"/>
+        <source>Select an extension package file</source>
+        <translation>Hautatu hedapen pakete agiri bat</translation>
     </message>
-</context>
-<context>
-    <name>UIGDetailsUpdateThreadSerial</name>
     <message>
-        <source>Disabled</source>
-        <comment>details</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+4"/>
+        <source>Extension package files (%1)</source>
+        <translation>Hedapen pakete agiriak (%1)</translation>
     </message>
-</context>
-<context>
-    <name>UIGDetailsUpdateThreadStorage</name>
     <message>
-        <source>Not attached</source>
-        <comment>details</comment>
-        <translation type="obsolete">Ez erantsia</translation>
+        <location line="-130"/>
+        <location line="+217"/>
+        <source>Extensions</source>
+        <translation>Hedapenak</translation>
     </message>
 </context>
 <context>
-    <name>UIGDetailsUpdateThreadSystem</name>
+    <name>UIGlobalSettingsGeneral</name>
     <message>
-        <source>Base Memory</source>
-        <comment>details</comment>
-        <translation type="obsolete">Oinarri Memoria</translation>
+        <source>Displays the path to the default virtual machine folder. This folder is used, if not explicitly specified otherwise, when creating new virtual machines.</source>
+        <translation type="obsolete">Makina birtualaren berezko agiritegi helburua erakusten du. Agiritegi hau erabiltzen da, ez bada besterik adierazten, makina birtual berriak sortzerakoan.</translation>
     </message>
     <message>
-        <source>%1%</source>
-        <comment>details</comment>
-        <translation type="obsolete">%1%</translation>
+        <source>Displays the path to the library that provides authentication for Remote Display (VRDP) clients.</source>
+        <translation type="obsolete">Hurruneko Erakuspen (VRDP) bezeroentzako egiaztapena hornitzen duen liburutegirako helburua erakusten du.</translation>
     </message>
     <message>
-        <source>Boot Order</source>
-        <comment>details</comment>
-        <translation type="obsolete">Abio Ordena</translation>
+        <location filename="../src/settings/global/UIGlobalSettingsGeneral.ui" line="+24"/>
+        <source>Default &Machine Folder:</source>
+        <translation>Berezko &Makina Agiritegia:</translation>
     </message>
-</context>
-<context>
-    <name>UIGDetailsUpdateThreadUSB</name>
     <message>
-        <source>%1 (%2 active)</source>
-        <comment>details</comment>
-        <translation type="obsolete">%1 (%2 aktibo)</translation>
+        <location line="+19"/>
+        <source>Holds the path to the default virtual machine folder. This folder is used, if not explicitly specified otherwise, when creating new virtual machines.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
+        <location line="+7"/>
+        <source>V&RDP Authentication Library:</source>
+        <translation>V&RDP Egiaztapen Liburutegia:</translation>
     </message>
-</context>
-<context>
-    <name>UIGMachinePreview</name>
     <message>
-        <source>Every 0.5 s</source>
+        <location line="+19"/>
+        <source>Holds the path to the library that provides authentication for Remote Display (VRDP) clients.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Every 1 s</source>
+        <location line="+7"/>
+        <source>Host Screensaver:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Every 2 s</source>
+        <location line="+16"/>
+        <source>&Disable When Running Virtual Machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Every 5 s</source>
-        <translation type="unfinished"></translation>
+        <source>&Dock and Menubar:</source>
+        <translation type="obsolete">&Uztarpena eta Menubarra:</translation>
     </message>
     <message>
-        <source>Every 10 s</source>
-        <translation type="unfinished"></translation>
+        <source>Auto-Show in Fullscreen</source>
+        <translation type="obsolete">Berez-Erakutsi Ikusleiho-osoan</translation>
     </message>
     <message>
-        <source>Update disabled</source>
-        <translation type="unfinished"></translation>
+        <source>When checked, the host dock and menu bar will be shown when the virtual machine is in fullscreen mode.</source>
+        <translation type="obsolete">Hautatutakoan, hostalari uztarpena eta menu barra erakutsiko dira makina birtuala ikusleiho-osoko moduan dagoenean.</translation>
     </message>
     <message>
-        <source>No preview</source>
-        <translation type="unfinished"></translation>
+        <source>&Host Screensaver:</source>
+        <translation type="obsolete">&Hostalari Ikusleiho-babeslea:</translation>
     </message>
-</context>
-<context>
-    <name>UIGlobalSettingsDisplay</name>
     <message>
-        <source>Maximum Guest Screen &Size:</source>
-        <translation type="unfinished"></translation>
+        <location line="-3"/>
+        <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
+        <translation>Hautatutakoan, hostalari ikusleiho-babeslea ezgaitu egingo da makina birtuala ekinean dagoenean.</translation>
     </message>
     <message>
-        <source>&Width:</source>
-        <translation type="unfinished"></translation>
+        <source>Disable When Running Virtual Machines</source>
+        <translation type="obsolete">Ezgaitu Makina Birtualak Ekinean daudenean</translation>
     </message>
     <message>
-        <source>&Height:</source>
-        <translation type="unfinished"></translation>
+        <source>When checked, the application will provide an icon with the context menu in the system tray.</source>
+        <translation type="obsolete">Hautatutakoan, aplikazioak ikur bat hornituko du hitzinguru menuarekin sistema erretiluan.</translation>
     </message>
     <message>
-        <source>Automatic</source>
-        <comment>Maximum Guest Screen Size</comment>
-        <translation type="unfinished"></translation>
+        <source>&Show System Tray Icon</source>
+        <translation type="obsolete">&Erakutsi Sistema Erretilu Ikurra</translation>
     </message>
     <message>
-        <source>Suggest a reasonable maximum screen size to the guest. The guest will only see this suggestion when guest additions are installed.</source>
-        <translation type="unfinished"></translation>
+        <source>&Auto show Dock and Menubar in fullscreen</source>
+        <translation type="obsolete">&Berez erakutsi Uztarpen eta Menubarra ikusleiho-osoan</translation>
     </message>
     <message>
-        <source>None</source>
-        <comment>Maximum Guest Screen Size</comment>
-        <translation type="unfinished">Batez</translation>
+        <source>When checked, the host screen saver will be disabled whenever a virtual machine is running.</source>
+        <translation type="obsolete">Hautatutakoan, hostalari ikusleiho babeslea ezgaitu egingo da makina birtual bat ekinean badago ere.</translation>
     </message>
     <message>
-        <source>Do not attempt to limit the size of the guest screen.</source>
-        <translation type="unfinished"></translation>
+        <source>Disable Host &ScreenSaver</source>
+        <translation type="obsolete">Ezgaitu Hostalari &Ikusleiho-Babeslea</translation>
     </message>
+</context>
+<context>
+    <name>UIGlobalSettingsInput</name>
     <message>
-        <source>Hint</source>
-        <comment>Maximum Guest Screen Size</comment>
-        <translation type="unfinished"></translation>
+        <source>Host &Key:</source>
+        <translation type="obsolete">Hostalari &Tekla:</translation>
     </message>
     <message>
-        <source>Suggest a maximum screen size to the guest. The guest will only see this suggestion when guest additions are installed.</source>
-        <translation type="unfinished"></translation>
+        <source>Displays the key used as a Host Key in the VM window. Activate the entry field and press a new Host Key. Note that alphanumeric, cursor movement and editing keys cannot be used.</source>
+        <translation type="obsolete">Makina Birtualaren leihoan erabilitako Hostalari Tekla erakusten du. Gaitu sarrera eremua eta sakatu Hostalari Tekla berri bat. Ohartu ezin direla erabili hizkizenbakiak, kurtsore mugimenduak eta edizio teklak.</translation>
     </message>
     <message>
-        <source>Machine Windows:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/global/UIGlobalSettingsInput.ui" line="+21"/>
+        <source>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</source>
+        <translation>Hautatutakoan, teklatua berezgaitasunez hartzen da Makina Birtualaren leihoa gaitzen den bakoitzean. Teklatua hartzen denan, tekla-sakatze guztiak (sistemaren Alt-Tab bezalakoak barne) MB-era zuzentzen dira.</translation>
     </message>
     <message>
-        <source>&Raise Window Under Mouse</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>&Auto Capture Keyboard</source>
+        <translation>&Berez Hartu Teklatua</translation>
     </message>
     <message>
-        <source>Holds the maximum width which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <source>Reset host combination</source>
+        <translation type="obsolete">Berrezarri hostalari konbinazioa</translation>
     </message>
     <message>
-        <source>Holds the maximum height which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <source>Resets the key combination used as the host combination in the VM window.</source>
+        <translation type="obsolete">Makina Birtualeko leihoan hostalari konbinazio bezala erabiltako tekla konbinazioa berrezartzen du.</translation>
     </message>
     <message>
-        <source>When checked, machine windows will be raised when the mouse pointer moves over them.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/global/UIGlobalSettingsInput.cpp" line="+115"/>
+        <source>Host Key Combination</source>
+        <translation>Hostalari Tekla Konbinazioa</translation>
     </message>
-</context>
-<context>
-    <name>UIGlobalSettingsExtension</name>
     <message>
-        <source>Lists all installed packages.</source>
-        <translation type="unfinished"></translation>
+        <location line="+76"/>
+        <location line="+10"/>
+        <source>Some items have the same shortcuts assigned.</source>
+        <translation>Gai batzuek lartertekla berdinak dituzte esleituta.</translation>
     </message>
     <message>
-        <source>Active</source>
-        <translation type="unfinished"></translation>
+        <location line="+23"/>
+        <source>&VirtualBox Manager</source>
+        <translation>&VirtualBox Kudeatzailea</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="unfinished">Izena</translation>
+        <location line="+1"/>
+        <source>Virtual &Machine</source>
+        <translation>&Makina Birtuala</translation>
     </message>
     <message>
-        <source>Version</source>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Lists all available shortcuts which can be configured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select an extension package file</source>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>Holds a sequence to filter the shortcut list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extension package files (%1)</source>
-        <translation type="unfinished"></translation>
+        <source>Lists all the available shortcuts which can be configured.</source>
+        <translation type="obsolete">Itxuratuak izan daitezkeen lastertekla guztiak zerrendatzen ditu.</translation>
     </message>
     <message>
-        <source>Extensions</source>
-        <translation type="unfinished"></translation>
+        <source>Enter a sequence to filter the shortcut list.</source>
+        <translation type="obsolete">Sartu sekuentzia bat lastertekla zerrenda iragazteko.</translation>
     </message>
+</context>
+<context>
+    <name>UIGlobalSettingsLanguage</name>
     <message>
-        <source>&Extension Packages</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/global/UIGlobalSettingsLanguage.cpp" line="+95"/>
+        <location line="+1"/>
+        <source> (built-in)</source>
+        <comment>Language</comment>
+        <translation> (barne-eraikita)</translation>
     </message>
     <message>
-        <source>Add Package</source>
-        <translation type="unfinished"></translation>
+        <location line="+26"/>
+        <source><unavailable></source>
+        <comment>Language</comment>
+        <translation><eskuraezina></translation>
     </message>
     <message>
-        <source>Remove Package</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source><unknown></source>
+        <comment>Author(s)</comment>
+        <translation><ezezaguna></translation>
     </message>
     <message>
-        <source>Adds new package.</source>
-        <translation type="unfinished"></translation>
+        <location line="+13"/>
+        <source>Default</source>
+        <comment>Language</comment>
+        <translation>Berezkoa</translation>
     </message>
     <message>
-        <source>Removes selected package.</source>
-        <translation type="unfinished"></translation>
+        <location line="+237"/>
+        <source>Language:</source>
+        <translation>Hizkuntza:</translation>
     </message>
-</context>
-<context>
-    <name>UIGlobalSettingsGeneral</name>
     <message>
-        <source>Holds the path to the default VDI folder. This folder is used, if not explicitly specified otherwise, when adding existing or creating new virtual hard disks.</source>
-        <translation type="obsolete">Lehenetsiriko VDI karpetaren bidea bistaratzen du. Karpeta hau erabiliko, beste ezer zehazten ez den bitartean, disko gogor birtual sortu edo gehitzerakoan.</translation>
+        <source>&Interface Language:</source>
+        <translation type="obsolete">&Interfaze Hizkuntza:</translation>
     </message>
     <message>
-        <source>Holds the path to the default virtual machine folder. This folder is used, if not explicitly specified otherwise, when creating new virtual machines.</source>
-        <translation type="unfinished">Lehenetsiriko makina birtual karpetaren bidea bistaratzen du. Karpeta hau erabiliko, beste ezer zehazten ez den bitartean, makina birtualak sortzerakoan.</translation>
+        <location filename="../src/settings/global/UIGlobalSettingsLanguage.ui" line="+24"/>
+        <source>&Interface Languages</source>
+        <translation>&Interfaze Hizkuntzak</translation>
     </message>
     <message>
-        <source>Holds the path to the library that provides authentication for Remote Display (VRDP) clients.</source>
-        <translation type="unfinished">Urruneko Pantaila (VRDP) bezeroentzat autentifikazioaz hornitzen duen liburutegiaren bidea erakusten du.</translation>
+        <location line="+10"/>
+        <source>Lists all available user interface languages. The effective language is written in <b>bold</b>. Select <i>Default</i> to reset to the system default language.</source>
+        <translation>Erabiltzaile interfaze hizkuntza eskuragarri guztien zerrenda. Gaitutako hizkuntza <b>lodiz</b> idatzita dago. Hautatu <i>Berezkoa</i> sistemaren berezko hizkuntzan berrezartzeko.</translation>
     </message>
     <message>
-        <source>Default &Machine Folder:</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Name</source>
+        <translation>Izena</translation>
     </message>
     <message>
-        <source>V&RDP Authentication Library:</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <source>Id</source>
+        <translation>Id-a</translation>
     </message>
     <message>
-        <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <source>Language</source>
+        <translation>Hizkuntza</translation>
     </message>
     <message>
-        <source>Host Screensaver:</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <source>Author</source>
+        <translation>Egilea</translation>
     </message>
     <message>
-        <source>&Disable When Running Virtual Machines</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/global/UIGlobalSettingsLanguage.cpp" line="+2"/>
+        <source>Author(s):</source>
+        <translation>Egilea(k):</translation>
     </message>
 </context>
 <context>
-    <name>UIGlobalSettingsInput</name>
+    <name>UIGlobalSettingsNetwork</name>
     <message>
-        <source>Holds the key used as a Host Key in the VM window. Activate the entry field and press a new Host Key. Note that alphanumeric, cursor movement and editing keys cannot be used.</source>
-        <translation type="obsolete">MB leihoan Ostalari Tekla bezala erabilitakoa tekla erakusten du. Eremua gaitu eta Ostalari Tekla berria sakatu. Kontutan izan alfazenbakizkoak, kurtsore mugimenduak eta edizio teklak ezin direla Ostalari tekla bezala erabili.</translation>
+        <source>host IPv4 address of <b>%1</b> is wrong</source>
+        <translation type="obsolete"><b>%1</b>-ren hostalari IPv4 helbidea okerra da</translation>
     </message>
     <message>
-        <source>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</source>
-        <translation type="unfinished">Markaturik dagoenean, teklatua automatikoki kapturatuko da MB leiho aktibatzen den bakoitzean. Teklatua kapturatzen denean, tekla sakatze guztiak (Alt-TAb bezalako sistemakoak barne) makina birtualera bidaliko da.</translation>
+        <source>host IPv4 network mask of <b>%1</b> is wrong</source>
+        <translation type="obsolete"><b>%1</b>-ren hostalari IPv4 sare mozorroa okerra da</translation>
     </message>
     <message>
-        <source>&Auto Capture Keyboard</source>
-        <translation type="unfinished"></translation>
+        <source>host IPv6 address of <b>%1</b> is wrong</source>
+        <translation type="obsolete"><b>%1</b>-ren hostalari IPv6 helbidea okerra da</translation>
     </message>
     <message>
-        <source>Host Key Combination</source>
-        <translation type="unfinished"></translation>
+        <source>DHCP server address of <b>%1</b> is wrong</source>
+        <translation type="obsolete"><b>%1</b>-ren DHCP zerbitzari helbidea okerra da</translation>
     </message>
     <message>
-        <source>Some items have the same shortcuts assigned.</source>
-        <translation type="unfinished"></translation>
+        <source>DHCP server network mask of <b>%1</b> is wrong</source>
+        <translation type="obsolete"><b>%1</b>-ren DHCP zerbitzari sare mozorroa okerra da</translation>
     </message>
     <message>
-        <source>&VirtualBox Manager</source>
-        <translation type="unfinished"></translation>
+        <source>DHCP lower address bound of <b>%1</b> is wrong</source>
+        <translation type="obsolete"><b>%1</b>-ren DHCP behe helbide muga okerra da</translation>
     </message>
     <message>
-        <source>Virtual &Machine</source>
-        <translation type="unfinished"></translation>
+        <source>DHCP upper address bound of <b>%1</b> is wrong</source>
+        <translation type="obsolete"><b>%1</b>-ren DHCP goi helbide muga okerra da</translation>
     </message>
     <message>
-        <source>Lists all available shortcuts which can be configured.</source>
+        <location filename="../src/settings/global/UIGlobalSettingsNetwork.cpp" line="+137"/>
+        <source>No new name specified for the NAT network previously called <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds a sequence to filter the shortcut list.</source>
+        <location line="+10"/>
+        <source>No CIDR specified for the NAT network <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIGlobalSettingsLanguage</name>
     <message>
-        <source> (built-in)</source>
-        <comment>Language</comment>
-        <translation type="unfinished"> (barneratua)</translation>
+        <location line="+2"/>
+        <source>No CIDR specified for the NAT network previously called <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><unavailable></source>
-        <comment>Language</comment>
-        <translation type="unfinished"><erabilezina></translation>
+        <location line="+11"/>
+        <source>Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><unknown></source>
-        <comment>Author(s)</comment>
-        <translation type="unfinished"><ezezaguna></translation>
+        <location line="+3"/>
+        <source>Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
-        <comment>Language</comment>
-        <translation type="unfinished">Lehenetsia</translation>
+        <location line="+23"/>
+        <source>Network Name</source>
+        <translation>Sarearen Izena</translation>
     </message>
     <message>
-        <source>Language:</source>
-        <translation type="unfinished">Hizkuntza:</translation>
+        <location line="+7"/>
+        <source>[empty]</source>
+        <translation>[hutsik]</translation>
     </message>
     <message>
-        <source>Lists all available user interface languages. The effective language is written in <b>bold</b>. Select <i>Default</i> to reset to the system default language.</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>%1 (renamed from %2)</source>
+        <translation>%1 (%2-tik berrizendatua)</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="unfinished">Izena</translation>
+        <location line="+1"/>
+        <source>Old Network Name</source>
+        <translation>Sare Zaharraren Izena</translation>
     </message>
     <message>
-        <source>Id</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>New Network Name</source>
+        <translation>Sare Berriaren Izena</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="unfinished"> Hizkuntza </translation>
+        <location line="+4"/>
+        <source>Network CIDR</source>
+        <translation>Sarearen CIDR</translation>
     </message>
     <message>
-        <source>Author</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Supports DHCP</source>
+        <translation>DHCP sostengua du</translation>
     </message>
     <message>
-        <source>Author(s):</source>
-        <translation type="unfinished">Egilea(k):</translation>
+        <location line="+1"/>
+        <location line="+2"/>
+        <location line="+2"/>
+        <source>yes</source>
+        <translation>bai</translation>
     </message>
     <message>
-        <source>&Interface Languages</source>
-        <translation type="unfinished"></translation>
+        <location line="-4"/>
+        <location line="+2"/>
+        <source>no</source>
+        <translation>ez</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>Supports IPv6</source>
+        <translation>IPv6 sostengua du</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Default IPv6 route</source>
+        <translation>Berezko IPv6 biderapena</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Host interface <b>%1</b> does not currently have a valid IPv4 address.</source>
+        <translation><b>%1</b> hostalari interfazeak une honetan ez du IPv4 helbide baliozko bat.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Host interface <b>%1</b> does not currently have a valid IPv4 network mask.</source>
+        <translation><b>%1</b> hostalari interfazeak une honetan ez du IPv4 sare mozorro baliozko bat.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Host interface <b>%1</b> does not currently have a valid IPv6 address.</source>
+        <translation><b>%1</b> hostalari interfazeak une honetan ez du IPv6 helbide baliozko bat.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Host interface <b>%1</b> does not currently have a valid DHCP server address.</source>
+        <translation><b>%1</b> hostalari interfazeak une honetan ez du DHCP zerbitzari helbide baliozko bat.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Host interface <b>%1</b> does not currently have a valid DHCP server mask.</source>
+        <translation><b>%1</b> hostalari interfazeak une honetan ez du DHCP zerbitzari mozorro baliozko bat.</translation>
     </message>
-</context>
-<context>
-    <name>UIGlobalSettingsNetwork</name>
     <message>
+        <location line="+6"/>
+        <source>Host interface <b>%1</b> does not currently have a valid DHCP server lower address bound.</source>
+        <translation><b>%1</b> hostalari interfazeak une honetan ez du DHCP zerbitzari barren helbide muga baliozko bat.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Host interface <b>%1</b> does not currently have a valid DHCP server upper address bound.</source>
+        <translation><b>%1</b> hostalari interfazeak une honetan ez du DHCP zerbitzari gain helbide muga baliozko bat.</translation>
+    </message>
+    <message>
+        <location line="+18"/>
         <source>Adapter</source>
-        <translation type="unfinished">Moldagailua</translation>
+        <translation>Egokitzailea</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Automatically configured</source>
         <comment>interface</comment>
-        <translation type="unfinished"></translation>
+        <translation>Berezgaitasunez itxuratuta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Manually configured</source>
         <comment>interface</comment>
-        <translation type="unfinished"></translation>
+        <translation>Eskuz itxuratuta</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>IPv4 Address</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4 Helbidea</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+10"/>
+        <location line="+18"/>
         <source>Not set</source>
         <comment>address</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ezarri gabe</translation>
     </message>
     <message>
+        <location line="-26"/>
         <source>IPv4 Network Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4 Sare Mozorroa</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+28"/>
         <source>Not set</source>
         <comment>mask</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ezarri gabe</translation>
     </message>
     <message>
+        <location line="-24"/>
         <source>IPv6 Address</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6 Helbidea</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>IPv6 Network Mask Length</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6 Sare Mozorro Luzera</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Not set</source>
         <comment>length</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ezarri gabe</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>DHCP Server</source>
-        <translation type="unfinished"></translation>
+        <translation>DHCP Zerbitzaria</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Enabled</source>
         <comment>server</comment>
-        <translation type="unfinished">Gaiturik</translation>
+        <translation>Gaituta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Disabled</source>
         <comment>server</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Helbidea</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Network Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Sare Mozorroa</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Lower Bound</source>
-        <translation type="unfinished"></translation>
+        <translation>Behe Muga</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+4"/>
         <source>Not set</source>
         <comment>bound</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ezarri gabe</translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>Upper Bound</source>
-        <translation type="unfinished"></translation>
+        <translation>Goi Muga</translation>
     </message>
     <message>
-        <source>Lists all available host-only networks.</source>
-        <translation type="unfinished"></translation>
+        <location line="+244"/>
+        <source>The name <b>%1</b> is being used for several NAT networks.</source>
+        <translation><b>%1</b> izena NAT sare ugarik erabiltzen dute.</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="unfinished">Izena</translation>
+        <location line="+50"/>
+        <source>Active</source>
+        <comment>NAT network</comment>
+        <translation>Gaituta</translation>
     </message>
     <message>
-        <source>Networking</source>
+        <location line="+4"/>
+        <source>Add NAT Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&NAT Networks</source>
+        <location line="+1"/>
+        <source>Remove NAT Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all available NAT networks.</source>
+        <location line="+1"/>
+        <source>Edit NAT Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Host-only Networks</source>
+        <location line="+2"/>
+        <source>Adds new NAT network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No new name specified for the NAT network previously called <b>%1</b>.</source>
+        <location line="+1"/>
+        <source>Removes selected NAT network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No CIDR specified for the NAT network <b>%1</b>.</source>
+        <location line="+1"/>
+        <source>Edits selected NAT network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No CIDR specified for the NAT network previously called <b>%1</b>.</source>
+        <location line="+10"/>
+        <source>Add Host-only Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.</source>
+        <location line="+1"/>
+        <source>Remove Host-only Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.</source>
+        <location line="+1"/>
+        <source>Edit Host-only Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network Name</source>
+        <location line="+2"/>
+        <source>Adds new host-only network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[empty]</source>
+        <location line="+1"/>
+        <source>Removes selected host-only network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 (renamed from %2)</source>
+        <location line="+1"/>
+        <source>Edits selected host-only network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Old Network Name</source>
-        <translation type="unfinished"></translation>
+        <source>&Add NAT network</source>
+        <translation type="obsolete">&Gehitu NAT sarea</translation>
     </message>
     <message>
-        <source>New Network Name</source>
-        <translation type="unfinished"></translation>
+        <source>&Remove NAT network</source>
+        <translation type="obsolete">&Kendu NAT sarea</translation>
     </message>
     <message>
-        <source>Network CIDR</source>
-        <translation type="unfinished"></translation>
+        <source>&Edit NAT network</source>
+        <translation type="obsolete">&Editatu NAT sarea</translation>
     </message>
     <message>
-        <source>Supports DHCP</source>
-        <translation type="unfinished"></translation>
+        <source>&Add host-only network</source>
+        <translation type="obsolete">&Gehitu hostalaria-bakarrik sarea</translation>
     </message>
     <message>
-        <source>yes</source>
-        <translation type="unfinished"></translation>
+        <source>&Remove host-only network</source>
+        <translation type="obsolete">&Kendu hostalaria-bakarrik sarea</translation>
     </message>
     <message>
-        <source>no</source>
-        <translation type="unfinished"></translation>
+        <source>&Edit host-only network</source>
+        <translation type="obsolete">&Editatu hostalaria-bakarrik sarea</translation>
     </message>
     <message>
-        <source>Supports IPv6</source>
-        <translation type="unfinished"></translation>
+        <source>&Host-only Networks:</source>
+        <translation type="obsolete">&Hostalaria-bakarrik Sareak:</translation>
     </message>
     <message>
-        <source>Default IPv6 route</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/global/UIGlobalSettingsNetwork.ui" line="+22"/>
+        <source>&NAT Networks</source>
+        <translation>&NAT Sareak</translation>
     </message>
     <message>
-        <source>Host interface <b>%1</b> does not currently have a valid IPv4 address.</source>
-        <translation type="unfinished"></translation>
+        <location line="+21"/>
+        <source>Lists all available NAT networks.</source>
+        <translation>NAT sare eskuragarri guztiak zerrendatzen ditu.</translation>
     </message>
     <message>
-        <source>Host interface <b>%1</b> does not currently have a valid IPv4 network mask.</source>
-        <translation type="unfinished"></translation>
+        <location line="+14"/>
+        <source>&Host-only Networks</source>
+        <translation>&Hostalaria-bakarrik Sareak</translation>
     </message>
     <message>
-        <source>Host interface <b>%1</b> does not currently have a valid IPv6 address.</source>
-        <translation type="unfinished"></translation>
+        <location line="+21"/>
+        <source>Lists all available host-only networks.</source>
+        <translation>Eskuragarri dauden hostalaria-bakarrik sare guztiak zerrendatzen ditu.</translation>
     </message>
     <message>
-        <source>Host interface <b>%1</b> does not currently have a valid DHCP server address.</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <location filename="../src/settings/global/UIGlobalSettingsNetwork.cpp" line="-25"/>
+        <source>Name</source>
+        <translation>Izena</translation>
     </message>
     <message>
-        <source>Host interface <b>%1</b> does not currently have a valid DHCP server mask.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/global/UIGlobalSettingsNetwork.cpp" line="+138"/>
+        <location line="+52"/>
+        <source>Networking</source>
+        <translation>Sareketa</translation>
     </message>
+</context>
+<context>
+    <name>UIGlobalSettingsNetworkDetails</name>
     <message>
-        <source>Host interface <b>%1</b> does not currently have a valid DHCP server lower address bound.</source>
-        <translation type="unfinished"></translation>
+        <source>Host-only Network Details</source>
+        <translation type="obsolete">Hostalaria-bakarrik Sare Xehetasunak</translation>
     </message>
     <message>
-        <source>Host interface <b>%1</b> does not currently have a valid DHCP server upper address bound.</source>
-        <translation type="unfinished"></translation>
+        <source>&Adapter</source>
+        <translation type="obsolete">&Egokitzailea</translation>
     </message>
     <message>
-        <source>The name <b>%1</b> is being used for several NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <source>Manual &Configuration</source>
+        <translation type="obsolete">Eskuz &Itxurapena</translation>
     </message>
     <message>
-        <source>Active</source>
-        <comment>NAT network</comment>
-        <translation type="unfinished"></translation>
+        <source>Use manual configuration for this host-only network adapter.</source>
+        <translation type="obsolete">Erabili eskuzko itxurapena hostalaria-bakarrik sare egokitzaile honentzat.</translation>
     </message>
     <message>
-        <source>Add NAT Network</source>
-        <translation type="unfinished"></translation>
+        <source>&IPv4 Address:</source>
+        <translation type="obsolete">&IPv4 Helbidea:</translation>
     </message>
     <message>
-        <source>Remove NAT Network</source>
-        <translation type="unfinished"></translation>
+        <source>Displays the host IPv4 address for this adapter.</source>
+        <translation type="obsolete">Hostalariaren IPv4 helbidea erakusten du egokitzaile honentzat.</translation>
     </message>
     <message>
-        <source>Edit NAT Network</source>
-        <translation type="unfinished"></translation>
+        <source>IPv4 Network &Mask:</source>
+        <translation type="obsolete">IPv4 Sare &Mozorroa:</translation>
     </message>
     <message>
-        <source>Adds new NAT network.</source>
-        <translation type="unfinished"></translation>
+        <source>Displays the host IPv4 network mask for this adapter.</source>
+        <translation type="obsolete">Hostalariaren IPv4 sare mozorroa erakusten du egokitzaile honentzat.</translation>
     </message>
     <message>
-        <source>Removes selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <source>I&Pv6 Address:</source>
+        <translation type="obsolete">I&Pv6 Helbidea:</translation>
     </message>
     <message>
-        <source>Edits selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <source>Displays the host IPv6 address for this adapter if IPv6 is supported.</source>
+        <translation type="obsolete">Hostalariaren IPv6 helbidea erakusten du egokitzaile honentzat IPv6 sostengatzen bada.</translation>
     </message>
     <message>
-        <source>Add Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <source>IPv6 Network Mask &Length:</source>
+        <translation type="obsolete">IPv6 Sare Mozorro &Luzera:</translation>
     </message>
     <message>
-        <source>Remove Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <source>Displays the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
+        <translation type="obsolete">Hostalariaren IPv6 sare mozorroa erakusten du egokitzaile honentzat IPv6 sostengatzen bada.</translation>
     </message>
     <message>
-        <source>Edit Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <source>&DHCP Server</source>
+        <translation type="obsolete">&DHCP Zerbitzaria</translation>
     </message>
     <message>
-        <source>Adds new host-only network.</source>
-        <translation type="unfinished"></translation>
+        <source>&Enable Server</source>
+        <translation type="obsolete">&Gaitu Zerbitzaria</translation>
     </message>
     <message>
-        <source>Removes selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <source>Server Add&ress:</source>
+        <translation type="obsolete">Zerbitzari &Helbidea:</translation>
     </message>
     <message>
-        <source>Edits selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <source>Server &Mask:</source>
+        <translation type="obsolete">Zerbitzari &Mozorroa:</translation>
+    </message>
+    <message>
+        <source>&Lower Address Bound:</source>
+        <translation type="obsolete">&Behe Helbide Muga:</translation>
+    </message>
+    <message>
+        <source>&Upper Address Bound:</source>
+        <translation type="obsolete">&Goi Helbide Muga:</translation>
     </message>
 </context>
 <context>
     <name>UIGlobalSettingsNetworkDetailsHost</name>
     <message>
+        <location filename="../src/settings/global/UIGlobalSettingsNetworkDetailsHost.ui" line="+26"/>
         <source>Host-only Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostalaria-bakarrik Sare Xehetasunak</translation>
     </message>
     <message>
+        <location line="+16"/>
         <source>&Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>&Egokitzailea</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Manual &Configuration</source>
+        <translation>Eskuzko &Itxurapena</translation>
+    </message>
+    <message>
+        <source>Use manual configuration for this host-only network adapter.</source>
+        <translation type="obsolete">Erabili eskuzko itxurapena hostalaria-bakarrik sare egokitzaile honentzat.</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>When checked, manual configuration will be used for this network adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&IPv4 Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>&IPv4 Helbidea:</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Holds the host IPv4 address for this adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>IPv4 Network &Mask:</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4 Sare &Mozorroa:</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Holds the host IPv4 network mask for this adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>I&Pv6 Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>I&Pv6 Helbidea:</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>IPv6 Network Mask &Length:</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6 Sare Mozorro &Luzera:</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+21"/>
         <source>&DHCP Server</source>
-        <translation type="unfinished"></translation>
+        <translation>&DHCP Zerbitzaria</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>&Enable Server</source>
+        <translation>&Gaitu Zerbitzaria</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Server Add&ress:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zerbitzari &Helbidea:</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Server &Mask:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zerbitzari &Mozorroa:</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&Lower Address Bound:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Behe Helbide Muga:</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&Upper Address Bound:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Goi Helbide Muga:</translation>
     </message>
     <message>
+        <location line="+19"/>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, manual configuration will be used for this network adapter.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIGlobalSettingsNetworkDetailsNAT</name>
     <message>
+        <location filename="../src/settings/global/UIGlobalSettingsNetworkDetailsNAT.ui" line="+18"/>
         <source>NAT Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>NAT Sare Xehetasunak</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>&Enable Network</source>
+        <translation>&Gaitu Sarea</translation>
+    </message>
+    <message>
+        <source>Enable this NAT network.</source>
+        <translation type="obsolete">Gaitu NAT sare hau.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>When checked, this network will be enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Network &Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sare &Izena:</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Holds the name for this network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Network &CIDR:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sare &CIDR:</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Holds the CIDR for this network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
         <source>Network Options:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sare Aukerak:</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Supports &DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>&DHCP sostengua du</translation>
     </message>
     <message>
-        <source>Supports &IPv6</source>
+        <location line="+3"/>
+        <source>When checked, this network will support DHCP.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advertise Default IPv6 &Route</source>
+        <location line="+10"/>
+        <source>When checked, this network will support IPv6.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Port Forwarding</source>
+        <location line="+10"/>
+        <source>When checked, this network will be advertised as the default IPv6 route.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, this network will be enabled.</source>
+        <location line="+7"/>
+        <source>Displays a window to configure port forwarding rules.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, this network will support DHCP.</source>
-        <translation type="unfinished"></translation>
+        <location line="-20"/>
+        <source>Supports &IPv6</source>
+        <translation>&IPv6 sostengua du</translation>
     </message>
     <message>
-        <source>When checked, this network will support IPv6.</source>
+        <location line="+10"/>
+        <source>Advertise Default IPv6 &Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, this network will be advertised as the default IPv6 route.</source>
-        <translation type="unfinished"></translation>
+        <source>Opens a window to manage port forwarding rules.</source>
+        <translation type="obsolete">Bidalketa ataka arauak kudeatzeko leiho bat irekitzen du.</translation>
     </message>
     <message>
-        <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <location line="+13"/>
+        <source>&Port Forwarding</source>
+        <translation>&Bidalketa Ataka</translation>
     </message>
 </context>
 <context>
     <name>UIGlobalSettingsPortForwardingDlg</name>
     <message>
+        <location filename="../src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp" line="+108"/>
         <source>Port Forwarding Rules</source>
-        <translation type="unfinished"></translation>
+        <translation>Bidalketa Ataka Arauak</translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>IPv4</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6</translation>
     </message>
 </context>
 <context>
     <name>UIGlobalSettingsProxy</name>
     <message>
+        <location filename="../src/settings/global/UIGlobalSettingsProxy.ui" line="+24"/>
         <source>When checked, VirtualBox will use the proxy settings supplied for tasks like downloading Guest Additions from the network or checking for updates.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Enable proxy</source>
+        <translation type="obsolete">&Gaitu proxya</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>&Enable Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>&Gaitu Proxya</translation>
     </message>
     <message>
+        <location line="+35"/>
         <source>Ho&st:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Hostalaria:</translation>
     </message>
     <message>
-        <source>&Port:</source>
+        <location line="+13"/>
+        <source>Holds the proxy host.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No proxy host is currently specified.</source>
+        <location line="+20"/>
+        <source>Holds the proxy port.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No proxy port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <source>Changes the proxy host.</source>
+        <translation type="obsolete">Proxy hostalaria aldatzen du.</translation>
     </message>
     <message>
-        <source>Holds the proxy host.</source>
-        <translation type="unfinished"></translation>
+        <location line="-13"/>
+        <source>&Port:</source>
+        <translation>&Ataka:</translation>
     </message>
     <message>
-        <source>Holds the proxy port.</source>
-        <translation type="unfinished"></translation>
+        <source>Changes the proxy port.</source>
+        <translation type="obsolete">Proxy ataka aldatzen du.</translation>
+    </message>
+    <message>
+        <source>&Use authentication</source>
+        <translation type="obsolete">&Erabili egiaztapena</translation>
+    </message>
+    <message>
+        <source>User &name:</source>
+        <translation type="obsolete">&Erabiltzaile izena:</translation>
+    </message>
+    <message>
+        <source>Changes the user name used for authentication.</source>
+        <translation type="obsolete">Egiaztapenerako erabilitako erabiltzaile izena aldatzen du.</translation>
+    </message>
+    <message>
+        <source>Pass&word:</source>
+        <translation type="obsolete">&Sarhitza:</translation>
+    </message>
+    <message>
+        <source>Changes the password used for authentication.</source>
+        <translation type="obsolete">Egiaztapenerako erabilitako sarhitza aldatzen du.</translation>
+    </message>
+    <message>
+        <location filename="../src/settings/global/UIGlobalSettingsProxy.cpp" line="+126"/>
+        <source>No proxy host is currently specified.</source>
+        <translation>Ez dago proxy hostalaririk adierazita.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>No proxy port is currently specified.</source>
+        <translation>Ez dago proxy atakarik adierazita.</translation>
     </message>
 </context>
 <context>
     <name>UIGlobalSettingsUpdate</name>
     <message>
+        <location filename="../src/settings/global/UIGlobalSettingsUpdate.ui" line="+24"/>
         <source>When checked, the application will periodically connect to the VirtualBox website and check whether a new VirtualBox version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Check for updates</source>
+        <translation type="obsolete">&Egiaztatu eguneraketak</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>&Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation>&Egiaztatu Eguneraketarik dagoen</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>&Once per:</source>
+        <translation>&Behin:</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Selects how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+28"/>
         <source>Next Check:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hurrengo Egiaztapena:</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Check for:</source>
-        <translation type="unfinished"></translation>
+        <translation>Egiaztatu hau:</translation>
     </message>
     <message>
+        <location line="+10"/>
         <source><p>Choose this if you only wish to be notified about stable updates to VirtualBox.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Hautatu hau VirtualBox eguneraketa egonkorren jakinarazpena jasotzea nahi baduzu.</p></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&Stable Release Versions</source>
-        <translation type="unfinished"></translation>
+        <translation>&Argitalpen Egonkor Bertsioak</translation>
     </message>
     <message>
-        <source><p>Choose this if you wish to be notified about all new VirtualBox releases.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+10"/>
+        <source>&All New Releases</source>
+        <translation>Argitalpen &Berri Guztiak</translation>
     </message>
     <message>
-        <source>&All New Releases</source>
-        <translation type="unfinished"></translation>
+        <location line="+10"/>
+        <source>All New Releases and &Pre-Releases</source>
+        <translation>Argitalpen Berri eta &Aurre-Argitapen Guztiak</translation>
     </message>
     <message>
-        <source><p>Choose this to be notified about all new VirtualBox releases and pre-release versions of VirtualBox.</p></source>
-        <translation type="unfinished"></translation>
+        <source>&Stable release versions</source>
+        <translation type="obsolete">&Bertsio egonkor agirtalpenak</translation>
     </message>
     <message>
-        <source>All New Releases and &Pre-Releases</source>
-        <translation type="unfinished"></translation>
+        <location line="-13"/>
+        <source><p>Choose this if you wish to be notified about all new VirtualBox releases.</p></source>
+        <translation><p>Hautatu hau VirtualBox argitalpen berri guztien jakinarazpena jasotzea nahi baduzu.</p></translation>
     </message>
     <message>
-        <source>Selects how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="unfinished"></translation>
+        <source>&All new releases</source>
+        <translation type="obsolete">&Argitalpen berri guztiak</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source><p>Choose this to be notified about all new VirtualBox releases and pre-release versions of VirtualBox.</p></source>
+        <translation><p>Hautatu hau VirtualBox argitalpen eta aurre-argitalpen berri guztien jakinarazpena jasotzea nahi baduzu.</p></translation>
+    </message>
+    <message>
+        <source>All new releases and &pre-releases</source>
+        <translation type="obsolete">&Argitalpen berri eta aurre-argitalpen guztiak</translation>
     </message>
 </context>
 <context>
     <name>UIHelpButton</name>
     <message>
+        <location filename="../src/widgets/UISpecialControls.cpp" line="+180"/>
         <source>&Help</source>
-        <translation type="unfinished">&Laguntza</translation>
+        <translation>&Laguntza</translation>
     </message>
 </context>
 <context>
     <name>UIHostComboEditor</name>
     <message>
+        <location filename="../src/widgets/UIHostComboEditor.cpp" line="+111"/>
+        <location line="+14"/>
         <source><key_%1></source>
-        <translation type="unfinished"><%1_tekla></translation>
+        <translation><key_%1></translation>
     </message>
     <message>
+        <location line="+12"/>
         <source>Left </source>
-        <translation type="unfinished">Ezker </translation>
+        <translation>Ezker </translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Right </source>
-        <translation type="unfinished">Eskuin </translation>
+        <translation>Eskuin </translation>
     </message>
     <message>
+        <location line="+115"/>
         <source>Left Shift</source>
-        <translation type="unfinished">Esker Shift</translation>
+        <translation>Ezkerreko Aldatu</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Right Shift</source>
-        <translation type="unfinished">Eskuin Shift</translation>
+        <translation>Eskuineko Aldatu</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Left Ctrl</source>
-        <translation type="unfinished">Ezker Ktrl</translation>
+        <translation>Ezkerreko Ktrl</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Right Ctrl</source>
-        <translation type="unfinished">Eskuin Ktrl</translation>
+        <translation>Eskuineko Ktrl</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Left Alt</source>
-        <translation type="unfinished">Ezker Alt</translation>
+        <translation>Ezkerreko Alt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Right Alt</source>
-        <translation type="unfinished">Eskuin Alt</translation>
+        <translation>Eskuineko Alt</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Left WinKey</source>
-        <translation type="unfinished">Ezker WinTekla</translation>
+        <translation>Ezkerreko Win-Tekla</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Right WinKey</source>
-        <translation type="unfinished">Eskuin WinTekla</translation>
+        <translation>Eskuineko Win-Tekla</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Menu key</source>
-        <translation type="unfinished">Menu tekla</translation>
+        <translation>Menu tekla</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Alt Gr</source>
-        <translation type="unfinished">Alt Gr</translation>
+        <translation>Alt Gr</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Caps Lock</source>
-        <translation type="unfinished">Caps Lock</translation>
+        <translation>Larri Blokeoa</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Scroll Lock</source>
-        <translation type="unfinished">Scroll Lock</translation>
+        <translation>Irristari Blokeoa</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Host+</source>
-        <translation type="unfinished"></translation>
+        <translation>Host+</translation>
     </message>
     <message>
+        <location line="+15"/>
+        <location line="+440"/>
         <source>None</source>
-        <translation type="unfinished">Batez</translation>
+        <translation>Ezer ez</translation>
     </message>
 </context>
 <context>
@@ -3291,36 +3970,16 @@
         <translation type="obsolete">Eskuin </translation>
     </message>
     <message>
-        <source>Left Shift</source>
-        <translation type="obsolete">Esker Shift</translation>
-    </message>
-    <message>
-        <source>Right Shift</source>
-        <translation type="obsolete">Eskuin Shift</translation>
-    </message>
-    <message>
-        <source>Left Ctrl</source>
-        <translation type="obsolete">Ezker Ktrl</translation>
-    </message>
-    <message>
-        <source>Right Ctrl</source>
-        <translation type="obsolete">Eskuin Ktrl</translation>
-    </message>
-    <message>
-        <source>Left Alt</source>
-        <translation type="obsolete">Ezker Alt</translation>
-    </message>
-    <message>
         <source>Right Alt</source>
-        <translation type="obsolete">Eskuin Alt</translation>
+        <translation type="obsolete">Eskuineko Alt</translation>
     </message>
     <message>
         <source>Left WinKey</source>
-        <translation type="obsolete">Ezker WinTekla</translation>
+        <translation type="obsolete">Ezker Win-Tekla</translation>
     </message>
     <message>
         <source>Right WinKey</source>
-        <translation type="obsolete">Eskuin WinTekla</translation>
+        <translation type="obsolete">Eskuineko Win-Tekla</translation>
     </message>
     <message>
         <source>Menu key</source>
@@ -3332,4262 +3991,4838 @@
     </message>
     <message>
         <source>Caps Lock</source>
-        <translation type="obsolete">Caps Lock</translation>
+        <translation type="obsolete">Larri Blokeoa</translation>
     </message>
     <message>
         <source>Scroll Lock</source>
-        <translation type="obsolete">Scroll Lock</translation>
+        <translation type="obsolete">Irristari Blokeoa</translation>
     </message>
     <message>
         <source><key_%1></source>
-        <translation type="obsolete"><%1_tekla></translation>
-    </message>
-    <message>
-        <source>F1</source>
-        <translation type="obsolete">F1</translation>
-    </message>
-    <message>
-        <source>F2</source>
-        <translation type="obsolete">F2</translation>
-    </message>
-    <message>
-        <source>F3</source>
-        <translation type="obsolete">F3</translation>
-    </message>
-    <message>
-        <source>F4</source>
-        <translation type="obsolete">F4</translation>
-    </message>
-    <message>
-        <source>F5</source>
-        <translation type="obsolete">F5</translation>
-    </message>
-    <message>
-        <source>F6</source>
-        <translation type="obsolete">F6</translation>
-    </message>
-    <message>
-        <source>F7</source>
-        <translation type="obsolete">F7</translation>
-    </message>
-    <message>
-        <source>F8</source>
-        <translation type="obsolete">F8</translation>
-    </message>
-    <message>
-        <source>F9</source>
-        <translation type="obsolete">F9</translation>
-    </message>
-    <message>
-        <source>F10</source>
-        <translation type="obsolete">F10</translation>
-    </message>
-    <message>
-        <source>F11</source>
-        <translation type="obsolete">F11</translation>
-    </message>
-    <message>
-        <source>F12</source>
-        <translation type="obsolete">F12</translation>
-    </message>
-    <message>
-        <source>F13</source>
-        <translation type="obsolete">F13</translation>
-    </message>
-    <message>
-        <source>F14</source>
-        <translation type="obsolete">F14</translation>
-    </message>
-    <message>
-        <source>F15</source>
-        <translation type="obsolete">F15</translation>
-    </message>
-    <message>
-        <source>F16</source>
-        <translation type="obsolete">F16</translation>
-    </message>
-    <message>
-        <source>F17</source>
-        <translation type="obsolete">F17</translation>
-    </message>
-    <message>
-        <source>F18</source>
-        <translation type="obsolete">F18</translation>
+        <translation type="obsolete"><key_%1></translation>
     </message>
     <message>
-        <source>F19</source>
-        <translation type="obsolete">F19</translation>
+        <source>None</source>
+        <translation type="obsolete">Ezer ez</translation>
     </message>
     <message>
-        <source>F20</source>
-        <translation type="obsolete">F20</translation>
+        <source>Left Shift</source>
+        <translation type="obsolete">Ezker Aldatu</translation>
     </message>
     <message>
-        <source>F21</source>
-        <translation type="obsolete">F21</translation>
+        <source>Right Shift</source>
+        <translation type="obsolete">Eskuineko Aldatu</translation>
     </message>
     <message>
-        <source>F22</source>
-        <translation type="obsolete">F22</translation>
+        <source>Left Ctrl</source>
+        <translation type="obsolete">Ezker Ktrl</translation>
     </message>
     <message>
-        <source>F23</source>
-        <translation type="obsolete">F23</translation>
+        <source>Right Ctrl</source>
+        <translation type="obsolete">Eskuineko Ktrl</translation>
     </message>
     <message>
-        <source>F24</source>
-        <translation type="obsolete">F24</translation>
+        <source>Left Alt</source>
+        <translation type="obsolete">Ezker Alt</translation>
     </message>
     <message>
-        <source>None</source>
-        <translation type="obsolete">Batez</translation>
+        <location line="-366"/>
+        <location filename="../src/widgets/UIHotKeyEditor.cpp" line="+178"/>
+        <source>Unset shortcut</source>
+        <translation>Desezarri lastertekla</translation>
     </message>
     <message>
+        <location filename="../src/widgets/UIHotKeyEditor.cpp" line="-1"/>
         <source>Reset shortcut to default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unset shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Berrezarri lastertekla berezkoan</translation>
     </message>
 </context>
 <context>
     <name>UIHotKeyTableModel</name>
     <message>
+        <location filename="../src/settings/global/UIGlobalSettingsInput.cpp" line="+118"/>
         <source>Name</source>
-        <translation type="unfinished">Izena</translation>
+        <translation>Izena</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIImportApplianceWzd</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <translation>Lastertekla</translation>
     </message>
 </context>
 <context>
     <name>UIImportLicenseViewer</name>
     <message>
+        <location filename="../src/wizards/importappliance/UIWizardImportApp.cpp" line="+123"/>
         <source><b>The virtual system "%1" requires that you agree to the terms and conditions of the software license agreement shown below.</b><br /><br />Click <b>Agree</b> to continue or click <b>Disagree</b> to cancel the import.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>Software License Agreement</source>
-        <translation type="unfinished"></translation>
+        <translation>Software Baimen Ituna</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>&Disagree</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ez Onartu</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&Agree</source>
-        <translation type="unfinished"></translation>
+        <translation>&Onartu</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&Print...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ir&arkitu...</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&Save...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Gorde...</translation>
     </message>
     <message>
+        <location line="-28"/>
         <source>Text (*.txt)</source>
-        <translation type="unfinished"></translation>
+        <translation>Idazkia (*.txt)</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Save license to file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Gorde baimena agirian...</translation>
     </message>
 </context>
 <context>
     <name>UIIndicatorsPool</name>
     <message>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the virtual hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>Diska gogor birutalen jarduera adierazten du:</nobr>%1</p></translation>
+    </message>
+    <message>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the CD/DVD devices:</nobr>%1</p></source>
+        <comment>CD/DVD tooltip</comment>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>CD/DVD gailuen jarduera adierazten du:</nobr>%1</p></translation>
+    </message>
+    <message>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy devices:</nobr>%1</p></source>
+        <comment>FD tooltip</comment>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>Diskete gailuen jarduera adierazten du:</nobr>%1</p></translation>
+    </message>
+    <message>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+383"/>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the network interfaces:</nobr>%1</p></source>
         <comment>Network adapters tooltip</comment>
-        <translation></translation>
+        <translation><p style='white-space:pre'><nobr>Sare interfazeen jarduera adierazten du:</nobr>%1</p></translation>
     </message>
     <message>
+        <location line="+45"/>
         <source><br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr></source>
         <comment>Network adapters tooltip</comment>
-        <translation></translation>
+        <translation><br><nobr><b>Egokitzailea %1 (%2)</b>: %3 kablea %4</nobr></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>connected</source>
         <comment>Network adapters tooltip</comment>
-        <translation>konektatuta</translation>
+        <translation>elkartuta</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>disconnected</source>
         <comment>Network adapters tooltip</comment>
-        <translation>deskonektatuta</translation>
+        <translation>etenda</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source><br><nobr><b>All network adapters are disabled</b></nobr></source>
         <comment>Network adapters tooltip</comment>
-        <translation><br><nobr><b>Sare moldagailu guztiak ezgaiturik daude</b></nobr></translation>
+        <translation><br><nobr><b>Sare egokitzaile guztiak ezgaituta daude</b></nobr></translation>
     </message>
     <message>
+        <location line="+54"/>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the attached USB devices:</nobr>%1</p></source>
         <comment>USB device tooltip</comment>
-        <translation></translation>
+        <translation><p style='white-space:pre'><nobr>Erantsitako USB gailuen jarduera adierazten du:</nobr>%1</p></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source><br><nobr><b>No USB devices attached</b></nobr></source>
         <comment>USB device tooltip</comment>
-        <translation><br><nobr><b>Ez dago USB gailurik erantsirik</b></nobr></translation>
+        <translation><br><nobr><b>Ez dago USB gailurik erantsita</b></nobr></translation>
     </message>
     <message>
         <source><br><nobr><b>USB Controller is disabled</b></nobr></source>
         <comment>USB device tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>USB Kontrolatzailea ezgaiturik dago</b></nobr></translation>
+        <translation type="obsolete"><br><nobr><b>USB Kontrolatzailea ezgaituta dago</b></nobr></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the machine's shared folders:</nobr>%1</p></source>
-        <comment>Shared folders tooltip</comment>
-        <translation></translation>
+        <location line="-394"/>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><br><nobr><b>No shared folders</b></nobr></source>
-        <comment>Shared folders tooltip</comment>
-        <translation><br><nobr><b>Ez dago partekatutako karpetarik</b></nobr></translation>
+        <location line="+73"/>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the optical drives:</nobr>%1</p></source>
+        <comment>CD tooltip</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+77"/>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy drives:</nobr>%1</p></source>
+        <comment>FD tooltip</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><hr>The VRDP Server is listening on port %1</source>
-        <translation type="obsolete"><hr>VRDP Zerbitzaria %1 atakan entzuten ari da</translation>
+        <location line="+295"/>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the machine's shared folders:</nobr>%1</p></source>
+        <comment>Shared folders tooltip</comment>
+        <translation><p style='white-space:pre'><nobr>Makinaren elkarbanatutako agiritegien jarduera adierazten du:</nobr>%1</p></translation>
     </message>
     <message>
-        <source><br><nobr><b>%1:</b>&nbsp;%2</nobr></source>
-        <comment>Virtualization Stuff LED</comment>
-        <translation></translation>
+        <location line="+25"/>
+        <source><br><nobr><b>No shared folders</b></nobr></source>
+        <comment>Shared folders tooltip</comment>
+        <translation><br><nobr><b>Ez dago elkarbanatutako agiritegirik</b></nobr></translation>
     </message>
     <message>
-        <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_ [...]
-        <translation></translation>
+        <location line="+43"/>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+131"/>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Bideo harpen jarduera adierazten du:</nobr><br>%1</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source><nobr><b>Video capture disabled</b></nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Bideo harpena ezgaituta</b></nobr></translation>
     </message>
     <message>
+        <location line="+5"/>
         <source><nobr><b>Video capture file:</b> %1</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Bideo harpen agiria:</b> %1</nobr></translation>
     </message>
     <message>
+        <location line="+87"/>
         <source>Additional feature status:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></source>
         <comment>Virtualization Stuff LED</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the optical drives:</nobr>%1</p></source>
-        <comment>CD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <location line="+15"/>
+        <location line="+6"/>
+        <source><br><nobr><b>%1:</b>&nbsp;%2</nobr></source>
+        <comment>Virtualization Stuff LED</comment>
+        <translation><br><nobr><b>%1:</b>&nbsp;%2</nobr></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy drives:</nobr>%1</p></source>
-        <comment>FD tooltip</comment>
+        <location line="+56"/>
+        <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_ [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <location line="+42"/>
+        <source>Indicates whether the host keyboard is captured by the guest OS:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;keyboard is not captured</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;keyboard is captured</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indicates whether the host keyboard is captured by the guest OS:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;keyboard is not captured</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;keyboard is captured</nobr></source>
-        <translation type="unfinished"></translation>
+        <source><hr>The Remote Desktop Server is listening on port %1</source>
+        <translation type="obsolete"><hr>Hurruneko Mahaigain Zerbitzaria %1 atakan ari da aditzen</translation>
     </message>
 </context>
 <context>
     <name>UILineTextEdit</name>
     <message>
+        <location filename="../src/widgets/UILineTextEdit.cpp" line="+118"/>
         <source>&Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>&Editatu</translation>
     </message>
 </context>
 <context>
     <name>UIMachineLogic</name>
     <message>
-        <source>VirtualBox OSE</source>
-        <translation type="obsolete">VirtualBox OSE</translation>
+        <source>Preview Monitor %1</source>
+        <translation type="obsolete">Aurreikuspen Monitorea %1</translation>
     </message>
     <message>
         <source>Snapshot %1</source>
-        <translation type="obsolete">%1 egoera-argazkia</translation>
+        <translation type="obsolete">Berehalakoa %1</translation>
+    </message>
+    <message>
+        <source>No Webcams Connected</source>
+        <translation type="obsolete">Ez dago Webkamerarik Elkarketaturik</translation>
+    </message>
+    <message>
+        <source>No supported webcams connected to the host PC</source>
+        <translation type="obsolete">Ez dago sostengaturiko webkamerarik hostalari PC-ra elkarketaturik</translation>
+    </message>
+    <message>
+        <source>Connect Network Adapter</source>
+        <translation type="obsolete">Elkarketatu Sare Egokitzailea</translation>
+    </message>
+    <message>
+        <source>Connect Network Adapter %1</source>
+        <translation type="obsolete">Elkarketatu %1 Sare Egokitzailea</translation>
+    </message>
+    <message>
+        <source>No CD/DVD Devices Attached</source>
+        <translation type="obsolete">Ez da CD/DVD Gailurik Erantsi</translation>
+    </message>
+    <message>
+        <source>No CD/DVD devices attached to that VM</source>
+        <translation type="obsolete">Ez da CD/DVD Gailurik Erantsi MB horretara</translation>
+    </message>
+    <message>
+        <source>No Floppy Devices Attached</source>
+        <translation type="obsolete">Ez da Diskete Gailurik Erantsi</translation>
+    </message>
+    <message>
+        <source>No floppy devices attached to that VM</source>
+        <translation type="obsolete">Ez da Diskete Gailurik Erantsi MB horretara</translation>
+    </message>
+    <message>
+        <source>No USB Devices Connected</source>
+        <translation type="obsolete">Ez da USB Gailurik Erantsi</translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
-        <translation type="obsolete">Ez dago onartutako gailurik konektaturik ostalari PC-ra</translation>
+        <translation type="obsolete">Sostengu gabeko gailuak elkartuta hostalari PG-ra</translation>
     </message>
     <message>
+        <location filename="../src/runtime/UIMachineLogic.cpp" line="-636"/>
         <source>Select a filename for the screenshot ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu ikusleiho-argazkiarentzako agirizen bat...</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsAudio</name>
     <message>
+        <location filename="../src/settings/machine/UIMachineSettingsAudio.ui" line="+24"/>
         <source>When checked, a virtual PCI audio card will be plugged into the virtual machine and will communicate with the host audio system using the specified driver.</source>
-        <translation type="unfinished">Markaturik dagoenean, PCI audio txartel birtuala makina birtualean erantsirik dago eta ezarritako kontrolatzailea erabiliko ostalariaren audio txartelarekin harremanetan jartzeko.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Enable &Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>&Gaitu Audioa</translation>
     </message>
     <message>
+        <location line="+29"/>
         <source>Host Audio &Driver:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostalariko Audio &Gidagailua:</translation>
     </message>
     <message>
-        <source>Audio &Controller:</source>
+        <location line="+19"/>
+        <source>Selects the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the type of the virtual sound card. Depending on this value, VirtualBox will provide different audio hardware to the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Audio &Controller:</source>
+        <translation>Audio &Kontrolatzailea:</translation>
     </message>
     <message>
-        <source>Selects the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation type="unfinished"></translation>
+        <location line="+19"/>
+        <source>Selects the type of the virtual sound card. Depending on this value, VirtualBox will provide different audio hardware to the virtual machine.</source>
+        <translation>Soinu txartel birutala hautatzen du. Balio honen arabera, VirtualBox-ek audio hardware ezberdina hornituko dio makina birtualari.</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsDisplay</name>
     <message>
-        <source><qt>%1&nbsp;MB</qt></source>
-        <translation type="obsolete"><qt>%1&nbsp;MB</qt></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsDisplay.cpp" line="+344"/>
+        <source>The virtual machine is set up to use hardware graphics acceleration. However the host system does not currently provide this, so you will not be able to start the machine.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Video &Memory:</source>
+        <location line="+24"/>
+        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required for High Definition Video to be played efficiently.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the amount of video memory provided to the virtual machine.</source>
-        <translation type="unfinished">Makina birtualari ezarritako bideo memoria kontrolatzen du.</translation>
+        <location line="+31"/>
+        <source>The virtual machine is set up to use Video Stream Acceleration. As this feature only works with Windows guest systems it will be disabled.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MB</source>
-        <translation type="unfinished">MB</translation>
+        <location line="+32"/>
+        <source>The VRDE server port value is not currently specified.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extended Features:</source>
+        <location line="+7"/>
+        <source>The VRDE authentication timeout value is not currently specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will be given access to the 3D graphics capabilities available on the host.</source>
-        <translation type="unfinished"></translation>
+        <source><qt>%1&nbsp;MB</qt></source>
+        <translation type="obsolete"><qt>%1&nbsp;MB</qt></translation>
     </message>
     <message>
-        <source>Enable &3D Acceleration</source>
-        <translation type="unfinished"></translation>
+        <location line="+73"/>
+        <source>User Defined</source>
+        <translation>Erabiltzaileak Zehaztuta</translation>
     </message>
     <message>
-        <source>&Remote Display</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>%1 fps</source>
+        <translation>%1 fs-ko</translation>
     </message>
     <message>
-        <source>When checked, the VM will act as a Remote Desktop Protocol (RDP) server, allowing remote clients to connect and operate the VM (when it is running) using a standard RDP client.</source>
-        <translation type="unfinished">Markaturik dagoenean, makina birtuala Urruneko Idazmahai Protokolo (RDP) zerbitzari birtuala gaituko du, bezeroei makina birtualera (martxan dagoenean) RDP bezero estandar bat erabiliaz konektatzeko aukera emanez.</translation>
+        <location line="-4"/>
+        <source>fps</source>
+        <translation>fs-ko</translation>
     </message>
     <message>
-        <source>&Enable Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server &Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication &Method:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Defines the VRDP authentication method.</source>
-        <translation type="obsolete">VRDP autentifikazio metodoa ezartzen du.</translation>
-    </message>
-    <message>
-        <source>Authentication &Timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specifies the timeout for guest authentication, in milliseconds.</source>
-        <translation type="obsolete">Bezero autentifikazioen denbora-muga ezartzen du, milisegundotan.</translation>
-    </message>
-    <message>
-        <source>When checked, the virtual machine will be given access to the Video Acceleration capabilities available on the host.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable &2D Video Acceleration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mo&nitor Count:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Controls the amount of virtual monitors provided to the virtual machine.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Allow Multiple Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video &Capture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, VirtualBox will record the virtual machine session as a video file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Enable Video Capture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File &Path:</source>
+        <location line="-152"/>
+        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Frame &Size:</source>
+        <location line="+28"/>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Frame Rate:</source>
+        <location line="+35"/>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Quality:</source>
-        <translation type="unfinished"></translation>
+        <location line="+76"/>
+        <location line="+1"/>
+        <location line="+482"/>
+        <source>%1 MB</source>
+        <translation type="unfinished">%1 MB</translation>
     </message>
     <message>
-        <source>&Screens:</source>
-        <translation type="unfinished"></translation>
+        <location line="-479"/>
+        <location line="+1"/>
+        <source>%1%</source>
+        <translation type="unfinished">%1%</translation>
     </message>
     <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration. However the host system does not currently provide this, so you will not be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <location line="+13"/>
+        <source>low</source>
+        <comment>quality</comment>
+        <translation>apala</translation>
     </message>
     <message>
-        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required for High Definition Video to be played efficiently.</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>medium</source>
+        <comment>quality</comment>
+        <translation>ertaina</translation>
     </message>
     <message>
-        <source>The virtual machine is set up to use Video Stream Acceleration. As this feature only works with Windows guest systems it will be disabled.</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>high</source>
+        <comment>quality</comment>
+        <translation>handia</translation>
     </message>
     <message>
-        <source>The VRDE server port value is not currently specified.</source>
+        <location line="+512"/>
+        <source><i>About %1MB per 5 minute video</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The VRDE authentication timeout value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <location line="-518"/>
+        <source>kbps</source>
+        <translation>kbs-ko</translation>
     </message>
     <message>
-        <source>User Defined</source>
-        <translation type="unfinished"></translation>
+        <source>&Video</source>
+        <translation type="obsolete">&Bideoa</translation>
     </message>
     <message>
-        <source>%1 fps</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsDisplay.ui" line="+39"/>
+        <source>Video &Memory:</source>
+        <translation>Bideo &Oroimena:</translation>
     </message>
     <message>
-        <source>fps</source>
-        <translation type="unfinished"></translation>
+        <location line="+18"/>
+        <location line="+31"/>
+        <source>Controls the amount of video memory provided to the virtual machine.</source>
+        <translation>Makina birtualari hornitutako bideo oroimen kopurua agintzen du.</translation>
     </message>
     <message>
-        <source>low</source>
-        <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsDisplay.cpp" line="-15"/>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>medium</source>
-        <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsDisplay.ui" line="+305"/>
+        <source>Extended Features:</source>
+        <translation>Ezaugarri Hedatuak:</translation>
     </message>
     <message>
-        <source>high</source>
-        <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <location line="-144"/>
+        <source>When checked, the virtual machine will be given access to the 3D graphics capabilities available on the host.</source>
+        <translation>Hautatutakoan, makina birtualak sarbidea emango du hostalarian eskuragarri dauden 3D grafika gaitasunetara.</translation>
     </message>
     <message>
-        <source>kbps</source>
+        <location line="-219"/>
+        <source>&Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Screen %1</source>
+        <location line="+121"/>
+        <source>Scale Factor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>About %1MB per 5 minute video</i></source>
+        <location line="+15"/>
+        <location line="+31"/>
+        <source>Controls the guest screen scale factor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <location line="+3"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <location line="+7"/>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Screen</source>
+        <location line="+16"/>
+        <source>When checked, guest screen contents will not be scaled up to compensate for high host screen resolutions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale Factor:</source>
+        <location line="+3"/>
+        <source>Use &Unscaled HiDPI Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the guest screen scale factor.</source>
+        <location line="+7"/>
+        <source>Acceleration:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
+        <location line="+19"/>
+        <source>Enable &3D Acceleration</source>
+        <translation>Gaitu &3D Bideo Bizkorpena</translation>
     </message>
     <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
+        <location line="+40"/>
+        <source>&Remote Display</source>
+        <translation>&Hurruneko Erakuspena</translation>
     </message>
     <message>
-        <source>When checked, guest screen contents will not be scaled up to compensate for high host screen resolutions.</source>
+        <location line="+9"/>
+        <source>When checked, the VM will act as a Remote Desktop Protocol (RDP) server, allowing remote clients to connect and operate the VM (when it is running) using a standard RDP client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use &Unscaled HiDPI Output</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>&Enable Server</source>
+        <translation>&Gaitu Zerbitzaria</translation>
     </message>
     <message>
-        <source>Acceleration:</source>
-        <translation type="unfinished"></translation>
+        <location line="+29"/>
+        <source>Server &Port:</source>
+        <translation>Zerbitzari &Ataka:</translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
+        <location line="+13"/>
+        <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Authentication &Method:</source>
+        <translation>Egiaztapen &Metodoa:</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Selects the VRDP authentication method.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Holds the timeout for guest authentication, in milliseconds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+23"/>
         <source>When checked, multiple simultaneous connections to the VM are permitted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+87"/>
         <source>Holds the filename VirtualBox uses to save the recorded content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Selects the resolution (frame size) of the recorded video.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Holds the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Holds the <b>vertical</b> resolution (frame height) of the recorded video.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
+        <location line="+32"/>
         <source>Controls the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+26"/>
         <source>Controls the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+48"/>
         <source>Holds the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
-        <translation type="unfinished"></translation>
+        <source>Defines the VRDP authentication method.</source>
+        <translation type="obsolete">VRDP egiaztapen metodoa zehazten du.</translation>
     </message>
     <message>
-        <source>%1 MB</source>
-        <translation type="unfinished"></translation>
+        <location line="-295"/>
+        <source>Authentication &Timeout:</source>
+        <translation>Egiaztapen &Epemuga:</translation>
     </message>
     <message>
-        <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <source>Specifies the timeout for guest authentication, in milliseconds.</source>
+        <translation type="obsolete">Gonbidatu egiaztapenerako epemuga adierazten du, segundumilaenetan.</translation>
     </message>
     <message>
-        <source>When checked, enables video recording for screen %1.</source>
-        <translation type="unfinished"></translation>
+        <location line="+66"/>
+        <source>Video &Capture</source>
+        <translation>Bideo &Harpena</translation>
     </message>
-</context>
-<context>
-    <name>UIMachineSettingsGeneral</name>
     <message>
-        <source><qt>%1&nbsp;MB</qt></source>
-        <translation type="obsolete"><qt>%1&nbsp;MB</qt></translation>
+        <location line="+12"/>
+        <source>When checked, VirtualBox will record the virtual machine session as a video file.</source>
+        <translation>Hautatutakoan, VirtualBox-ek makina birtualaren saioa bideo agiri bezala grabatuko du.</translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of disk space.</source>
-        <translation type="obsolete">Makina birtual honen egoera-argazkiak gordeko diren bidea erakusten du. Kontutan izan egoera-argazkiek disko leku asko erabili dezaketela.</translation>
+        <location line="+3"/>
+        <source>&Enable Video Capture</source>
+        <translation>&Gaitu Bideo Harpena</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation type="unfinished">&Basikoa</translation>
+        <location line="+29"/>
+        <source>File &Path:</source>
+        <translation>Agiri &Helburua:</translation>
     </message>
     <message>
-        <source>Holds the name of the virtual machine.</source>
-        <translation type="obsolete">Makina birtualaren izena bistaratzen du.</translation>
+        <source>This setting determines the filename VirtualBox uses to save the recorded content.</source>
+        <translation type="obsolete">Ezarpen honek VirtualBox-ek grabatutako edukiak gordetzeko erabiltzen duen agirizena zehazten du.</translation>
     </message>
     <message>
-        <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-        <translation type="obsolete">Makina birtual honetan instalatzea pentsatzen duzun sistema eragilea erakusten du (sistema eragile bezeroa deiturikoa).</translation>
+        <location line="+20"/>
+        <source>Frame &Size:</source>
+        <translation>Frame &Neurria:</translation>
     </message>
     <message>
-        <source>Base &Memory Size</source>
-        <translation type="obsolete">Oinarri &Memoria Tamaina</translation>
+        <source>This setting determines the resolution (frame size) of the recorded video.</source>
+        <translation type="obsolete">Ezarpen honek grabatutako bideoaren bereizmena (frame neurria) zehazten du.</translation>
     </message>
     <message>
-        <source>Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start.</source>
-        <translation type="obsolete">Makina Birtualari ezarritako memoria kantitatea ezartzen du. Gehiegi ezarriaz gero, makina agian ez da abiaraziko.</translation>
+        <source>This setting determines the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
+        <translation type="obsolete">Ezarpen honek grabatutako bideoaren <b>etzaneko</b> bereizmena (frame zabalera) zehazten du.</translation>
     </message>
     <message>
-        <source><</source>
-        <translation type="obsolete"><</translation>
+        <source>This setting determines the <b>vertical</b> resolution (frame height) of the recorded video.</source>
+        <translation type="obsolete">Ezarpen honek grabatutako bideoaren <b>zutikako</b> bereizmena (frame garaiera) zehazten du.</translation>
     </message>
     <message>
-        <source>></source>
-        <translation type="obsolete">></translation>
+        <location line="+40"/>
+        <source>&Frame Rate:</source>
+        <translation>&Frame Maila:</translation>
     </message>
     <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
+        <source>This setting determines the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
+        <translation type="obsolete">Ezarpen honek gehinezko<b>frame segunduko</b> zenbatekoa zehazten du. Frame gehigarriak jauzi egingo dira. Balio hau gutxitzeak jauzitako frame zenbatekoa handitu eta agiriaren neurria txikiagotuko du.</translation>
     </message>
     <message>
-        <source>&Video Memory Size</source>
-        <translation type="obsolete">&Bideo Memoria Tamaina</translation>
+        <location line="+58"/>
+        <source>&Quality:</source>
+        <translation>&Ontasuna:</translation>
     </message>
     <message>
-        <source>Controls the amount of video memory provided to the virtual machine.</source>
-        <translation type="obsolete">Makina birtualari ezarritako bideo memoria kontrolatzen du.</translation>
+        <source>This setting determines the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Ezarpen honek <b>ontasuna</b> zehazten du. Balio hau handitzeak bideoak hobea ematea egingo du agiriaren neurria apur bat handituz.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation type="unfinished">&Aurreratua</translation>
+        <source>This setting determines the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Ezarpen honek bitneurria zehazten du<b>kilobit segunduko</b>-tan. Balio hau handitzeak bideoak hobea ematea egingo du agiriaren neurria apur bat handituz.</translation>
     </message>
     <message>
-        <source>Defines the boot device order. Use the checkboxes on the left to enable or disable individual boot devices. Move items up and down to change the device order.</source>
-        <translation type="obsolete">Abio gailu ordena ezartzen du. Aukerakutxak erabili abio gailuak gaitu edo ezgaitzeko. Elementuak gora eta behera mugitu gailu ordena aldatzeko.</translation>
+        <location line="+77"/>
+        <source>&Screens:</source>
+        <translation>&Ikusleihoak:</translation>
     </message>
     <message>
-        <source>Move Up (Ctrl-Up)</source>
-        <translation type="obsolete">Gora Mugitu (Ktrl-Gora)</translation>
+        <location line="-413"/>
+        <source>When checked, the virtual machine will be given access to the Video Acceleration capabilities available on the host.</source>
+        <translation>Hautatutakoan, makina birtualak hostalarian eskuragarri dauden Bideo Bizkorpen gaitasunetarako sarbidea emango du.</translation>
     </message>
     <message>
-        <source>Moves the selected boot device up.</source>
-        <translation type="obsolete">Hautatutako abio gailua gora mugitzen du.</translation>
+        <location line="+3"/>
+        <source>Enable &2D Video Acceleration</source>
+        <translation>Gaitu &2D Bideo Bizkorpena</translation>
     </message>
     <message>
-        <source>Move Down (Ctrl-Down)</source>
-        <translation type="obsolete">Behera Mugitu (Ktrl-Behera)</translation>
+        <source>The VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
+        <translation type="obsolete">VRDP Zerbitzari ataka zenbakia. Adierazi dezakezu <tt>0</tt> (huts), 3389 ataka hautatzeko, RDP-rako ataka estandarra.</translation>
     </message>
     <message>
-        <source>Moves the selected boot device down.</source>
-        <translation type="obsolete">Hautatutako abio gailua behera mugitzen du.</translation>
+        <location line="-173"/>
+        <source>Mo&nitor Count:</source>
+        <translation>&Monitore Zenbatekoa:</translation>
     </message>
     <message>
-        <source>Enable A&CPI</source>
-        <translation type="obsolete">A&CPI Gaitu</translation>
+        <location line="+18"/>
+        <location line="+31"/>
+        <source>Controls the amount of virtual monitors provided to the virtual machine.</source>
+        <translation>Makina birtualari hornitutako monitore birtual kopurua agintzen du.</translation>
     </message>
     <message>
-        <source>Enable IO A&PIC</source>
-        <translation type="obsolete">IO A&PIC gaitu</translation>
+        <source><qt>%1</qt></source>
+        <translation type="obsolete"><qt>%1</qt></translation>
     </message>
     <message>
-        <source>Enable &VT-x/AMD-V</source>
-        <translation type="obsolete">&VT-x/AMD-V gaitu</translation>
+        <source>Specifies whether multiple simultaneous connections to the VM are permitted.</source>
+        <translation type="obsolete">Makina Birtualera zenbat elkarketa aldiberean baimentzen diren adierazten du.</translation>
     </message>
     <message>
-        <source>&Shared Clipboard:</source>
-        <translation type="unfinished"></translation>
+        <location line="+268"/>
+        <source>&Allow Multiple Connections</source>
+        <translation>&Ahalbidetu Elkarketa Anitz</translation>
     </message>
     <message>
-        <source>Selects which clipboard data will be copied between the guest and the host OS. This feature requires Guest Additions to be installed in the guest OS.</source>
-        <translation type="unfinished">Bezero eta ostalariaren sistema eragileen arteko arbela partekatzeko modua ezartzen du. Kontutan izan honek Bezero Gehigarriak sistema eragile bezeroan instalaturik egotea behar duela.</translation>
+        <location filename="../src/widgets/UIFilmContainer.cpp" line="+147"/>
+        <source>Screen %1</source>
+        <translation>%1 Ikusleihoa</translation>
     </message>
     <message>
-        <source>S&napshot Folder:</source>
+        <location line="+1"/>
+        <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation type="unfinished">A&zalpena</translation>
+        <source>Enable video recording for screen %1.</source>
+        <translation type="obsolete">Gaitu bideo grabaketa %1 ikusleihorako.</translation>
     </message>
+</context>
+<context>
+    <name>UIMachineSettingsGeneral</name>
     <message>
-        <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
-        <translation type="unfinished">Makina birtualaren azalpena erakusten du. Azalpenen eremua instalaturiko bezero sistemaren eragileari edo konfigurazioari buruz iruzkinak egiteko da erabilgarria.</translation>
+        <source>Displays the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of disk space.</source>
+        <translation type="obsolete">Makina birtual honen berehalakoak gordetzen diren helburua erakusten du. Ohartarazten dugu argazkiek diskako tokia asko hartzen dutela.</translation>
     </message>
     <message>
-        <source>If checked, any CD/DVD or floppy disks inserted into or removed from the virtual drives while the machine is running will be remembered.</source>
-        <translation type="obsolete">Markaturik badago, Muntaturiko CD/DVD edo diskete euskarrietan eginiko edozein aldaketa gorde egingo da, abiarazteen artean muntaturiko medioen konfigurazioa mantentzeko.</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Ohinarrizkoa</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
+        <source>&Advanced</source>
+        <translation type="obsolete">A&urreratua</translation>
+    </message>
+    <message>
+        <location filename="../src/settings/machine/UIMachineSettingsGeneral.ui" line="+33"/>
+        <source>Basi&c</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
+        <location line="+26"/>
+        <source>A&dvanced</source>
+        <translation type="unfinished">A&urreratua</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>&Shared Clipboard:</source>
+        <translation>&Elkarbanatutako Gakoa:</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Selects which clipboard data will be copied between the guest and the host OS. This feature requires Guest Additions to be installed in the guest OS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No name specified for the virtual machine.</source>
+        <location line="+20"/>
+        <source>D&rag'n'Drop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
+        <location line="+56"/>
+        <source>D&escription</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>When checked, enables encryption for this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>En&able Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+44"/>
         <source>Encryption C&ipher:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Holds the password to be assigned to the virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>C&onfirm New Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Confirms the password to be assigned to the virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are trying to encrypt this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site.</source>
-        <translation type="unfinished"></translation>
+        <location line="-244"/>
+        <source>S&napshot Folder:</source>
+        <translation>&Argaki Agiritegia:</translation>
     </message>
     <message>
-        <source>Encryption cipher type not specified.</source>
-        <translation type="unfinished"></translation>
+        <source>Show in &Fullscreen/Seamless</source>
+        <translation type="obsolete">Erakutsi &Ikusleiho-osoa/Irudizkoan</translation>
     </message>
     <message>
-        <source>Encryption password empty.</source>
-        <translation type="unfinished"></translation>
+        <source>Show at &Top of Screen</source>
+        <translation type="obsolete">Erakutsi Ikusleihoaren &Gainean</translation>
     </message>
     <message>
-        <source>Encryption passwords do not match.</source>
-        <translation type="unfinished"></translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Azalpena</translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
+        <source>Displays the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
+        <translation type="obsolete">Makina birtualaren azalpena erakusten du. Azalpen eramua erabilgarria da ezarritako SE gonbidatuaren itxurapen xehetasunak aipatzeko.</translation>
     </message>
     <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
-        <translation type="unfinished"></translation>
+        <source>Removable Media:</source>
+        <translation type="obsolete">Multimedia Kengarria:</translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
-        <translation type="unfinished"></translation>
+        <source>&Remember Runtime Changes</source>
+        <translation type="obsolete">&Gogoratu Runtime Aldaketak</translation>
     </message>
-</context>
-<context>
-    <name>UIMachineSettingsInterface</name>
     <message>
-        <source>Allows to modify VM menu-bar contents.</source>
+        <source>Mini ToolBar:</source>
+        <translation type="obsolete">TresnaBarra Txikia:</translation>
+    </message>
+    <message>
+        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
+        <translation type="obsolete">Hautatzen bada, Tresnabarra Txikia erakusten du Ikusleiho-osoko eta Irudizko moduetan.</translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
+        <source>Show In &Fullscreen/Seamless</source>
+        <translation type="obsolete">Erakutsi &Ikusleiho-osoan/Irudizkoan</translation>
     </message>
     <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
+        <source>Show At &Top Of Screen</source>
+        <translation type="obsolete">&Erakutsi Ikusleihoaren Goialdean</translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="unfinished"></translation>
+        <source>&Drag'n'Drop:</source>
+        <translation type="obsolete">&Arrastatu-eta-Askatu:</translation>
     </message>
     <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="unfinished"></translation>
+        <location line="-46"/>
+        <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
+        <translation>Gonbidatuaren eta hostalari SE-ren artean arrastatu-eta-askatuz zein datu kopiatuko diren hautatzen du. Ezaugarri honek Gonbidatu Gehigarriak ezarrita behar ditu gonbidatu SE-an.</translation>
     </message>
     <message>
-        <source>Allows to modify VM status-bar contents.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsGeneral.cpp" line="+378"/>
+        <source>No name specified for the virtual machine.</source>
+        <translation>Ez da izenik adierazi makina birtualarentzat.</translation>
     </message>
     <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <location line="+7"/>
+        <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Full-screen/Seamless</source>
+        <location line="+22"/>
+        <source>You are trying to encrypt this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <location line="+14"/>
+        <source>Encryption cipher type not specified.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Encryption password empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Encryption passwords do not match.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>UIMachineSettingsNetwork</name>
+    <name>UIMachineSettingsInterface</name>
     <message>
-        <source>Not selected</source>
-        <comment>network adapter name</comment>
+        <location filename="../src/settings/machine/UIMachineSettingsInterface.ui" line="+35"/>
+        <source>Allows to modify VM menu-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adapter</source>
-        <comment>network</comment>
-        <translation type="obsolete">Moldagailua</translation>
+        <location line="+7"/>
+        <source>Mini ToolBar:</source>
+        <translation type="unfinished">TresnaBarra Txikia:</translation>
     </message>
     <message>
-        <source>Network</source>
-        <comment>internal</comment>
-        <translation type="obsolete">Sarea</translation>
+        <location line="+16"/>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select TAP setup application</source>
-        <translation type="obsolete">Hautatu TAP konfigurazio aplikazioa</translation>
+        <location line="+16"/>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select TAP terminate application</source>
-        <translation type="obsolete">Hautatu TAP amaiera aplikazioa</translation>
+        <location line="+3"/>
+        <source>Show at &Top of Screen</source>
+        <translation type="unfinished">Erakutsi Ikusleihoaren &Gainean</translation>
     </message>
     <message>
-        <source>When checked, plugs this virtual network adapter into the virtual machine.</source>
-        <translation type="unfinished">Aukeratua dagoenean, sare moldagailu birtual hau eransten du makina birtualean.</translation>
+        <location line="+29"/>
+        <source>Allows to modify VM status-bar contents.</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>UIMachineSettingsNetwork</name>
     <message>
-        <source>&Enable Network Adapter</source>
-        <translation type="unfinished">&Gaitu Sare Moldagailua</translation>
+        <location filename="../src/settings/machine/UIMachineSettingsNetwork.ui" line="+29"/>
+        <source>When checked, plugs this virtual network adapter into the virtual machine.</source>
+        <translation>Hautatutakoan, sare egokitzaile birtual hau makina birtualean elkartzen du.</translation>
     </message>
     <message>
-        <source>Adapter &Type:</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>&Enable Network Adapter</source>
+        <translation>&Gaitu Sare Egokitzailea</translation>
     </message>
     <message>
+        <location line="+127"/>
         <source>Selects the type of the virtual network adapter. Depending on this value, VirtualBox will provide different network hardware to the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sare egokitzaile birtualaren mota hautatzen du. Balio honen arabera, VirtualBox-ek sare hardware ezberdina hornituko dio makina birtualari.</translation>
     </message>
     <message>
+        <location line="-98"/>
         <source>&Attached to:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Hona erantsita:</translation>
     </message>
     <message>
         <source>Controls how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="obsolete">Ostalari SE-ren sare errealera konektatzeko moldagailu birtualak modua kontrolatzen du.</translation>
+        <translation type="obsolete">Egokitzaile birtual hau SE Hostalariaren egizko sarera nola eransten den agintzen du.</translation>
     </message>
     <message>
-        <source>&Name:</source>
-        <translation type="unfinished"></translation>
+        <location line="+79"/>
+        <source>Adapter &Type:</source>
+        <translation>Egokitzaile &Mota:</translation>
     </message>
     <message>
-        <source>Generates a new random MAC address.</source>
-        <translation type="unfinished">Ausazko MAC berri bat sortzen du.</translation>
+        <source>no bridged network adapter is selected</source>
+        <translation type="obsolete">ez da zubitutako sare egokitzailerik hautatu</translation>
     </message>
     <message>
-        <source>&Generate</source>
-        <translation type="obsolete">&Sortu</translation>
+        <source>no internal network name is specified</source>
+        <translation type="obsolete">ez da barneko sare izenik adierazi</translation>
     </message>
     <message>
-        <source>Indicates whether the virtual network cable is plugged in on machine startup or not.</source>
-        <translation type="obsolete">Abiaraztean sare kable birtuala konektaturik dagoen erakusten du.</translation>
+        <source>no host-only network adapter is selected</source>
+        <translation type="obsolete">ez da hostalaria-bakarrik sare egokitzailerik hautatu</translation>
     </message>
     <message>
-        <source>Ca&ble Connected</source>
-        <translation type="obsolete">Ka&blea Konektaturik</translation>
+        <location filename="../src/settings/machine/UIMachineSettingsNetwork.cpp" line="+735"/>
+        <location line="+2"/>
+        <source>Not selected</source>
+        <comment>network adapter name</comment>
+        <translation>Hautatu gabe</translation>
     </message>
     <message>
-        <source>Holds the TAP interface name.</source>
-        <translation type="obsolete">TAP interfaze izena bistaratzen du.</translation>
+        <location filename="../src/settings/machine/UIMachineSettingsNetwork.ui" line="-53"/>
+        <source>&Name:</source>
+        <translation>&Izena:</translation>
     </message>
     <message>
-        <source>Holds the command executed to set up the TAP interface.</source>
-        <translation type="obsolete">TAP interfazea konfiguratzeko exekutatutako komandoa bistaratzen du.</translation>
+        <location line="+41"/>
+        <source>A&dvanced</source>
+        <translation>A&urreratua</translation>
     </message>
     <message>
-        <source>Selects the setup application.</source>
-        <translation type="obsolete">Konfigurazio aplikazioa Hautatzen du.</translation>
+        <source>Shows or hides additional network adapter options.</source>
+        <translation type="obsolete">Sare gehigarri egokitzaile aukerak erakutsi edo ezkutatzen ditu.</translation>
     </message>
     <message>
-        <source>Holds the command executed to terminate the TAP interface.</source>
-        <translation type="obsolete">TAP interfazea amaitzeko exekutatutako komandoa bistaratzen du.</translation>
+        <source>Displays the MAC address of this adapter. It contains exactly 12 characters chosen from {0-9,A-F}. Note that the second character must be an even digit.</source>
+        <translation type="obsolete">Egokitzaile honen MAC helbidea erakusten du. Zehatz-mehatz 12 hizki ditu {0-9,A-F}-tik hartuta. Ohartu bigarren hizkia zenbaki bikoiti bat izan behar dela.</translation>
     </message>
     <message>
-        <source>Selects the terminate application.</source>
-        <translation type="obsolete">Hautatu amaiera aplikazioa.</translation>
+        <location line="+90"/>
+        <source>Generates a new random MAC address.</source>
+        <translation>Zorizko MAC helbide berri bat sortzen du.</translation>
     </message>
     <message>
-        <source>Host Interface Settings</source>
-        <translation type="obsolete">Ostalari Interfaze Ezarpenak</translation>
+        <source>Indicates whether the virtual network cable is plugged in on machine startup or not.</source>
+        <translation type="obsolete">Abiaraztean sare birtual kablea makinara elkartuta egongo den edo ez adierazten du.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation type="unfinished">&Aurreratua</translation>
+        <source>&Cable connected</source>
+        <translation type="obsolete">&Kablea elkartuta</translation>
     </message>
     <message>
-        <source>Holds the MAC address of this adapter. It contains exactly 12 characters chosen from {0-9,A-F}. Note that the second character must be an even digit.</source>
-        <translation type="unfinished"></translation>
+        <source>Opens dialog to manage port forwarding rules.</source>
+        <translation type="obsolete">Bidalketa ataka arau kudeaketarako elkarrizketa irekitzen du.</translation>
     </message>
     <message>
-        <source>&Cable Connected</source>
+        <location line="+37"/>
+        <source>&Port Forwarding</source>
+        <translation>&Bidalketa Ataka</translation>
+    </message>
+    <message>
+        <location line="-89"/>
+        <source>&Promiscuous Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Port Forwarding</source>
+        <location line="-86"/>
+        <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Promiscuous Mode:</source>
+        <location line="+51"/>
+        <source>Shows additional network adapter options.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+54"/>
         <source>Selects the promiscuous mode policy of the network adapter when attached to an internal network, host only network or a bridge.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Generic Properties:</source>
+        <location line="+26"/>
+        <source>Holds the MAC address of this adapter. It contains exactly 12 characters chosen from {0-9,A-F}. Note that the second character must be an even digit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the network adapter on the host system that traffic to and from this network card will go through.</source>
-        <translation type="unfinished"></translation>
+        <location line="+14"/>
+        <source>Generic Properties:</source>
+        <translation>Ezaugarri Generikoak:</translation>
     </message>
     <message>
-        <source>Holds the name of the internal network that this network card will be connected to. You can create a new internal network by choosing a name which is not used by any other network cards in this virtual machine or others.</source>
+        <location line="+10"/>
+        <source>Holds the configuration settings for the network attachment driver. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the virtual network adapter on the host system that traffic to and from this network card will go through. You can create and remove adapters using the global network settings in the virtual machine manager window.</source>
+        <location line="+7"/>
+        <source>When checked, the virtual network cable is plugged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the driver to be used with this network card.</source>
+        <location line="+10"/>
+        <source>Displays a window to configure port forwarding rules.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&MAC Address:</source>
-        <translation type="unfinished"></translation>
+        <location line="-7"/>
+        <source>&Cable Connected</source>
+        <translation>&Kablez Elkarketaturik</translation>
     </message>
     <message>
-        <source>No bridged network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <source>Opens a window to manage port forwarding rules.</source>
+        <translation type="obsolete">Bidalketa ataka arauak kudeatzeko leiho bat irekitzen du.</translation>
     </message>
     <message>
-        <source>No internal network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <source>no generic driver is selected</source>
+        <translation type="obsolete">ez da gidatzaile generikorik hautatu</translation>
     </message>
     <message>
-        <source>No host-only network adapter is currently selected.</source>
+        <location filename="../src/settings/machine/UIMachineSettingsNetwork.cpp" line="-310"/>
+        <source>Selects the network adapter on the host system that traffic to and from this network card will go through.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No generic driver is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <location line="-220"/>
+        <source>No bridged network adapter is currently selected.</source>
+        <translation>Ez da zubitutako sare egokitzailerik hautatu.</translation>
     </message>
     <message>
-        <source>The MAC address must be 12 hexadecimal digits long.</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>No internal network name is currently specified.</source>
+        <translation>Ez da barneko sare izenik adierazi.</translation>
     </message>
     <message>
-        <source>The second digit in the MAC address may not be odd as only unicast addresses are allowed.</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>No host-only network adapter is currently selected.</source>
+        <translation>Ez da hostalaria-bakarrik sare egokitzailerik hautatu.</translation>
     </message>
     <message>
+        <location line="+9"/>
+        <source>No generic driver is currently selected.</source>
+        <translation>Ez da gidagailu generikorik adierazi.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
         <source>No NAT network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez dago NAT sare izenik adierazita.</translation>
     </message>
     <message>
-        <source>Holds the name of the NAT network that this network card will be connected to. You can create and remove networks using the global network settings in the virtual machine manager window.</source>
-        <translation type="unfinished"></translation>
+        <location line="+12"/>
+        <source>The MAC address must be 12 hexadecimal digits long.</source>
+        <translation>MAC helbideak 12 digito hamaseitarreko luzera izan behar du.</translation>
     </message>
     <message>
-        <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
+        <location line="+10"/>
+        <source>The second digit in the MAC address may not be odd as only unicast addresses are allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Shows additional network adapter options.</source>
+        <location line="+169"/>
+        <source>Holds the name of the internal network that this network card will be connected to. You can create a new internal network by choosing a name which is not used by any other network cards in this virtual machine or others.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the configuration settings for the network attachment driver. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source>
+        <location line="+9"/>
+        <source>Selects the virtual network adapter on the host system that traffic to and from this network card will go through. You can create and remove adapters using the global network settings in the virtual machine manager window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual network cable is plugged in.</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>Selects the driver to be used with this network card.</source>
+        <translation>Sare txartel honekin erabiltzeko gidagailua hautatzen du.</translation>
     </message>
     <message>
-        <source>Displays a window to configure port forwarding rules.</source>
+        <location line="+6"/>
+        <source>Holds the name of the NAT network that this network card will be connected to. You can create and remove networks using the global network settings in the virtual machine manager window.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIMachineSettingsNetworkDetails</name>
     <message>
-        <source>Generates a new random MAC address.</source>
-        <translation type="obsolete">Ausazko MAC berri bat sortzen du.</translation>
+        <location filename="../src/settings/machine/UIMachineSettingsNetwork.ui" line="-53"/>
+        <source>&MAC Address:</source>
+        <translation>&MAC Helbidea:</translation>
     </message>
     <message>
-        <source>Indicates whether the virtual network cable is plugged in on machine startup or not.</source>
-        <translation type="obsolete">Abiaraztean sare kable birtuala konektaturik dagoen erakusten du.</translation>
+        <source>the MAC address must be 12 hexadecimal digits long.</source>
+        <translation type="obsolete">MAC helbideak 12 digito hexadezimaleko luzera izan behar du.</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsParallel</name>
     <message>
+        <location filename="../src/settings/machine/UIMachineSettingsParallel.cpp" line="+135"/>
         <source>Port %1</source>
         <comment>parallel ports</comment>
+        <translation>Ataka %1</translation>
+    </message>
+    <message>
+        <location line="+227"/>
+        <source>No IRQ is currently specified.</source>
+        <translation type="unfinished">Ez dago IRQ-rik adierazita.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>No I/O port is currently specified.</source>
+        <translation type="unfinished">Ez dago S/I atakarik adierazita.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="unfinished">Bi ataka edo gehiagok ezarpen berdinak dituzte.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>No port path is currently specified.</source>
+        <translation type="unfinished">Ez dago ataka helbururik adierazita.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>There are currently duplicate port paths specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../src/settings/machine/UIMachineSettingsParallel.ui" line="+29"/>
         <source>When checked, enables the given parallel port of the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatutakoan, makina birtualaren emaniko ataka kideak gaitzen ditu.</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&Enable Parallel Port</source>
-        <translation type="unfinished"></translation>
+        <translation>&Gaitu Ataka Kidetuak</translation>
     </message>
     <message>
+        <location line="+41"/>
         <source>Port &Number:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ataka Zenbakia:</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Holds the parallel port number. You can choose one of the standard parallel ports or select <b>User-defined</b> and specify port parameters manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&IRQ:</source>
+        <translation>&IRQ:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Holds the IRQ number of this parallel port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> setting is enabled for this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>I/O Po&rt:</source>
+        <translation>S/I &Ataka:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Holds the base I/O port address of this parallel port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Port &Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ataka &Helburua:</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Holds the host parallel device name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the IRQ number of this parallel port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> setting is enabled for this virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <source>Displays the host parallel device name.</source>
+        <translation type="obsolete">Hostalari gailu kidetu izena erakusten du.</translation>
+    </message>
+</context>
+<context>
+    <name>UIMachineSettingsParallelPage</name>
+    <message>
+        <source>Duplicate port number selected </source>
+        <translation type="obsolete">Bikoiztu hautaturiko ataka zenbakia </translation>
     </message>
     <message>
-        <source>Holds the base I/O port address of this parallel port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source>
-        <translation type="unfinished"></translation>
+        <source>Port path not specified </source>
+        <translation type="obsolete">Ataka helburua ez da adierazi </translation>
+    </message>
+    <message>
+        <source>Duplicate port path entered </source>
+        <translation type="obsolete">Bikoiztu sartutako ataka helburua </translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ez dago IRQ-rik adierazita.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ez dago S/I atakarik adierazita.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Bi ataka edo gehiagok ezarpen berdinak dituzte.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ez dago ataka helbururik adierazita.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ez dago bikoizturiko ataka helbururik adierazita.</translation>
     </message>
 </context>
 <context>
-    <name>UIMachineSettingsParallelPage</name>
+    <name>UIMachineSettingsPortForwardingDlg</name>
     <message>
-        <source>Duplicate port number selected </source>
-        <translation type="obsolete">Bikoizturiko ataka zenbakia hautatu da </translation>
+        <location filename="../src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp" line="+92"/>
+        <source>Port Forwarding Rules</source>
+        <translation>Bidalketa Ataka Arauak</translation>
     </message>
     <message>
-        <source>Duplicate port path entered </source>
-        <translation type="obsolete">Bikoizturiko ataka bidea idatzi da </translation>
+        <source>This table contains a list of port forwarding rules.</source>
+        <translation type="obsolete">Taula honek bidalketa ataka arauak ditu.</translation>
     </message>
-</context>
-<context>
-    <name>UIMachineSettingsPortForwardingDlg</name>
     <message>
-        <source>Port Forwarding Rules</source>
-        <translation type="unfinished"></translation>
+        <source>Insert new rule</source>
+        <translation type="obsolete">Txertatu arau berria</translation>
+    </message>
+    <message>
+        <source>Copy selected rule</source>
+        <translation type="obsolete">Kopiatu hautaturiko araua</translation>
+    </message>
+    <message>
+        <source>Delete selected rule</source>
+        <translation type="obsolete">Ezabatu hautaturiko araua</translation>
+    </message>
+    <message>
+        <source>This button adds new port forwarding rule.</source>
+        <translation type="obsolete">Botoi honek bidalketa ataka arau berria gehitzen du.</translation>
+    </message>
+    <message>
+        <source>This button deletes selected port forwarding rule.</source>
+        <translation type="obsolete">Botoi honek hautaturiko bidalketa ataka araua ezabatzen du.</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsSF</name>
     <message>
         <source>Adds a new shared folder definition.</source>
-        <translation type="obsolete">Partekatutako karpeta definizio berria gehitzen du.</translation>
+        <translation type="obsolete">Agiritegi elkarbanatu adiera berri bat gehitzen du.</translation>
     </message>
     <message>
         <source>Edits the selected shared folder definition.</source>
-        <translation type="obsolete">Hautatutako karpeta definizioa editatzen du.</translation>
+        <translation type="obsolete">Hautaturiko agiritegi elkarbanatu adiera editatzen du.</translation>
     </message>
     <message>
         <source>Removes the selected shared folder definition.</source>
-        <translation type="obsolete">Hautatutako partekatutako karpeta definizioa ezabatzen du.</translation>
+        <translation type="obsolete">Hautaturiko agiritegi elkarbanatu adiera kentzen du.</translation>
     </message>
     <message>
+        <location filename="../src/settings/machine/UIMachineSettingsSF.cpp" line="+695"/>
         <source> Machine Folders</source>
-        <translation type="unfinished"> Makina Karpetak</translation>
+        <translation> Makina Agiritegiak</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source> Transient Folders</source>
-        <translation type="unfinished"> Karpeta Mugikorrak</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-273"/>
         <source>Full</source>
+        <translation>Osoa</translation>
+    </message>
+    <message>
+        <location line="-12"/>
+        <source>Add Shared Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Read-only</source>
+        <location line="+1"/>
+        <source>Edit Shared Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all shared folders accessible to this machine. Use 'net use x: \\vboxsvr\share' to access a shared folder named <i>share</i> from a DOS-like OS, or 'mount -t vboxsf share mount_point' to access it from a Linux OS. This feature requires Guest Additions.</source>
+        <location line="+1"/>
+        <source>Remove Shared Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="unfinished">Izena</translation>
+        <location line="+2"/>
+        <source>Adds new shared folder.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation type="unfinished">Bidea</translation>
+        <location line="+1"/>
+        <source>Edits selected shared folder.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Access</source>
+        <location line="+1"/>
+        <source>Removes selected shared folder.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Folders List</source>
+        <location line="+7"/>
+        <source>Read-only</source>
+        <translation>Irakurri-bakarrik</translation>
+    </message>
+    <message>
+        <location filename="../src/settings/machine/UIMachineSettingsSF.ui" line="+69"/>
+        <source>Lists all shared folders accessible to this machine. Use 'net use x: \\vboxsvr\share' to access a shared folder named <i>share</i> from a DOS-like OS, or 'mount -t vboxsf share mount_point' to access it from a Linux OS. This feature requires Guest Additions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+10"/>
+        <source>Name</source>
+        <translation>Izena</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Path</source>
+        <translation>Helburua</translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>Auto-mount</source>
-        <translation type="unfinished"></translation>
+        <translation>Berez-osatu</translation>
     </message>
     <message>
-        <source>Yes</source>
-        <translation type="unfinished">Bai</translation>
+        <location line="+5"/>
+        <source>Access</source>
+        <translation>Sarbidea</translation>
     </message>
     <message>
-        <source>Add Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <source>&Add Shared Folder</source>
+        <translation type="obsolete">&Gehitu Elkarbanatutako Agiritegia</translation>
     </message>
     <message>
-        <source>Edit Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <source>&Edit Shared Folder</source>
+        <translation type="obsolete">&Editatu Elkarbanatutako Agiritegia</translation>
     </message>
     <message>
-        <source>Remove Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <source>&Remove Shared Folder</source>
+        <translation type="obsolete">&Kendu Elkarbanatutako Agiritegia</translation>
     </message>
     <message>
-        <source>Adds new shared folder.</source>
-        <translation type="unfinished"></translation>
+        <location line="-62"/>
+        <source>&Folders List</source>
+        <translation>&Agiritegia Zerrenda</translation>
     </message>
     <message>
-        <source>Edits selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <source>Auto-Mount</source>
+        <translation type="obsolete">Berez-Osatu</translation>
     </message>
     <message>
-        <source>Removes selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsSF.cpp" line="+1"/>
+        <source>Yes</source>
+        <translation>Bai</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsSFDetails</name>
     <message>
+        <location filename="../src/settings/machine/UIMachineSettingsSFDetails.cpp" line="+130"/>
         <source>Add Share</source>
-        <translation type="unfinished">Gehitu Partekatzea</translation>
+        <translation>Gehitu Elkarbanaketa</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Edit Share</source>
-        <translation type="unfinished">Editatu Partekatzea</translation>
+        <translation>Editatu Elkarbanaketa</translation>
+    </message>
+    <message>
+        <source>Dialog</source>
+        <translation type="obsolete">Elkarrizketa</translation>
     </message>
     <message>
+        <location filename="../src/settings/machine/UIMachineSettingsSFDetails.ui" line="+29"/>
         <source>Folder Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiritegi Helburua:</translation>
     </message>
     <message>
+        <location line="+13"/>
         <source>Folder Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiritegi Izena:</translation>
     </message>
     <message>
-        <source>Holds the name of the shared folder (as it will be seen by the guest OS).</source>
-        <translation type="unfinished">Partekatutako karpetaren izen bistaratzen du (Ostalari PC-an ikusiko den bezala).</translation>
+        <source>Displays the name of the shared folder (as it will be seen by the guest OS).</source>
+        <translation type="obsolete">Elkarbanatutako agiritegiaren izena erakusten du (Gonbidatu SE-n ikusiko den bezala).</translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>When checked, the guest OS will not be able to write to the specified shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatzen bada, gonbidatu SE-ak ezingo du adierazitako agiritegi elkarbanatuan idatzi.</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&Read-only</source>
+        <translation>&Irakurri-bakarrik</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>When checked, this shared folder will be permanent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&Make Permanent</source>
-        <translation type="unfinished"></translation>
+        <translation>&Egin Iraunkorra</translation>
     </message>
     <message>
+        <location line="-13"/>
         <source>When checked, the guest OS will try to automatically mount the shared folder on startup.</source>
+        <translation>Hautatzen bada, gonbidatu SE-a berezgaitasunez saiatuko da agiritegi elkarbanatua osatzen hasterakoan.</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation type="obsolete">Leihoa</translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Holds the name of the shared folder (as it will be seen by the guest OS).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>&Auto-mount</source>
-        <translation type="unfinished"></translation>
+        <translation>&Berez-Osatu</translation>
     </message>
     <message>
-        <source>When checked, this shared folder will be permanent.</source>
-        <translation type="unfinished"></translation>
+        <source>If checked, this shared folder will be permanent.</source>
+        <translation type="obsolete">Hautatzen bada, agiritegi elkarbanatu hau egonkorra izango da.</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsSerial</name>
     <message>
+        <location filename="../src/settings/machine/UIMachineSettingsSerial.cpp" line="+155"/>
         <source>Port %1</source>
         <comment>serial ports</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ataka %1</translation>
     </message>
     <message>
-        <source>When checked, enables the given serial port of the virtual machine.</source>
-        <translation type="unfinished">Hautaturik dagoenean, makina birtualaren emandako serie ataka gaitu.</translation>
+        <location line="+252"/>
+        <source>No IRQ is currently specified.</source>
+        <translation type="unfinished">Ez dago IRQ-rik adierazita.</translation>
     </message>
     <message>
-        <source>&Enable Serial Port</source>
-        <translation type="unfinished">&Gaitu Serie Ataka</translation>
+        <location line="+5"/>
+        <source>No I/O port is currently specified.</source>
+        <translation type="unfinished">Ez dago S/I atakarik adierazita.</translation>
     </message>
     <message>
-        <source>Port &Number:</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="unfinished">Bi ataka edo gehiagok ezarpen berdinak dituzte.</translation>
     </message>
     <message>
-        <source>Selects the serial port number. You can choose one of the standard serial ports or select <b>User-defined</b> and specify port parameters manually.</source>
-        <translation type="unfinished">Serie ataka zenbakia bistarazi. Serie ataka estandarretako bat hautatu edo <b>Erabiltzaileak-definituriko</b> bat eta ataka parametroak eskuz ezarri.</translation>
+        <location line="+13"/>
+        <source>No port path is currently specified.</source>
+        <translation type="unfinished">Ez dago ataka helbururik adierazita.</translation>
     </message>
     <message>
-        <source>&IRQ:</source>
+        <location line="+5"/>
+        <source>There are currently duplicate port paths specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the IRQ number of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> is enabled for this virtual machine.</source>
-        <translation type="obsolete">Serie ataka honen IRQ zenbakia bistarazi. Balio erabilgarriak zenbaki osoak <tt>0</tt> eta <tt>255</tt> artean. <tt>15</tt> baina balioa handiagoak erabiltzeko <b>I/O APIC</b> gaiturik egon behar da makina birtual honetan.</translation>
+        <location filename="../src/settings/machine/UIMachineSettingsSerial.ui" line="+29"/>
+        <source>When checked, enables the given serial port of the virtual machine.</source>
+        <translation>Hautatzen bada, emaniko makina birtualaren serie ataka gaitzen du.</translation>
     </message>
     <message>
-        <source>I/O Po&rt:</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>&Enable Serial Port</source>
+        <translation>&Gaitu Serie Ataka</translation>
     </message>
     <message>
-        <source>Holds the base I/O port address of this serial port. This should be a whole number between <tt>0</tt> and <tt>0xFFFF</tt>.</source>
-        <translation type="obsolete">Serie ataka honen oinarri S/I helbidea bistaratzen du. Balio erabilgarria zenbaki osoak <tt>0</tt> eta <tt>0xFFFF</tt> tartean.</translation>
+        <location line="+41"/>
+        <source>Port &Number:</source>
+        <translation>&Ataka Zenbakia:</translation>
     </message>
     <message>
-        <source>Port &Mode:</source>
+        <source>Displays the serial port number. You can choose one of the standard serial ports or select <b>User-defined</b> and specify port parameters manually.</source>
+        <translation type="obsolete">Serieko ataka zenbakia erakusten du. Serieko ataka estandar bat hautatu dezakezu edo hautatu <b>Erabiltzaileak-zehaztuta</b> eta adierazi ataka parametroak eskuz.</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Selects the serial port number. You can choose one of the standard serial ports or select <b>User-defined</b> and specify port parameters manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="obsolete">Serie ataka honen funtzionamendu modua kontrolatzen du. <b>Deskonektaturik</b> hautatuaz gero, bezero SE-ak serie ataka ikusiko du baina ezingo du berarekin lan egin.</translation>
+        <location line="+7"/>
+        <source>&IRQ:</source>
+        <translation>&IRQ:</translation>
     </message>
     <message>
-        <source>If checked, the pipe specified in the <b>Port Path</b> field will be created by the virtual machine when it starts. Otherwise, the virtual machine will assume that the pipe exists and try to use it.</source>
-        <translation type="obsolete">Markaturik badago, <b>Ataka Bidean</b> ezarritako kanalizazioa sortuko da makina birtualean abiaraztean. Bestela makina birtuala dagoen kanalizazioa erabiltzen saiatuko da.</translation>
+        <location line="+10"/>
+        <source>Holds the IRQ number of this serial port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> setting is enabled for this virtual machine.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Create Pipe</source>
-        <translation type="obsolete">&Sortu Kanalizazioa</translation>
+        <location line="+7"/>
+        <source>I/O Po&rt:</source>
+        <translation>S/I &Ataka:</translation>
     </message>
     <message>
-        <source>Holds the path to the serial port's pipe on the host when the port is working in <b>Host Pipe</b> mode, or the host serial device name when the port is working in <b>Host Device</b> mode.</source>
-        <translation type="obsolete">Ostalarian Serial atakarako kanalizazioaren bidea erakusten du ataka <b>Ostalari Kanalizazio</b> moduan funtzionatzean, edo serie ataka izena atakak <b>Ostalari Gailua</b> moduan funtzinoatzean.</translation>
+        <location line="+10"/>
+        <source>Holds the base I/O port address of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the IRQ number of this serial port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> setting is enabled for this virtual machine.</source>
+        <location line="+26"/>
+        <source>Port &Mode:</source>
+        <translation>Ataka &Modua:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the base I/O port address of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source>
+        <location line="+20"/>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+13"/>
         <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="unfinished"></translation>
+        <source>Controls the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <translation type="obsolete">Serie ataka honetako lan modua agintzen du. <b>Etenda</b> hautatzen baduzu, SE gonbidatuak serieko ataka atzemango du baina ez da eragiketak egiteko gai izango.</translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
-        <translation type="unfinished"></translation>
+        <source>&Create Pipe</source>
+        <translation type="obsolete">&Sortu Hodia</translation>
+    </message>
+    <message>
+        <source>Port/File &Path:</source>
+        <translation type="obsolete">Ataka/Agiria &Helburua:</translation>
+    </message>
+    <message>
+        <source>Displays the base I/O port address of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source>
+        <translation type="obsolete">Serieko ataka honen ohinarri S/I ataka helbidea erakusten du. Baliozko balioak dira <tt>0</tt> eta <tt>0xFFFF</tt> arteko zenbaki osoak.</translation>
+    </message>
+</context>
+<context>
+    <name>UIMachineSettingsSerialPage</name>
+    <message>
+        <source>Duplicate port number selected </source>
+        <translation type="obsolete">Bikoiztu hautaturiko ataka zenbakia </translation>
+    </message>
+    <message>
+        <source>Port path not specified </source>
+        <translation type="obsolete">Ataka helburua ez da adierazi </translation>
+    </message>
+    <message>
+        <source>Duplicate port path entered </source>
+        <translation type="obsolete">Bikoiztu sartutako ataka helburua </translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ez dago IRQ-rik adierazita.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ez dago S/I atakarik adierazita.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Bi ataka edo gehiagok ezarpen berdinak dituzte.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ez dago ataka helbururik adierazita.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ez dago ataka helbururik adierazita.</translation>
     </message>
 </context>
 <context>
-    <name>UIMachineSettingsSerialPage</name>
+    <name>UIMachineSettingsStorage</name>
     <message>
-        <source>Duplicate port number selected </source>
-        <translation type="obsolete">Bikoizturiko ataka zenbakia hautatu da </translation>
+        <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="+705"/>
+        <source><nobr><b>%1</b></nobr><br><nobr>Bus:&nbsp;&nbsp;%2</nobr><br><nobr>Type:&nbsp;&nbsp;%3</nobr></source>
+        <translation><nobr><b>%1</b></nobr><br><nobr>Busa:&nbsp;&nbsp;%2</nobr><br><nobr>Mota:&nbsp;&nbsp;%3</nobr></translation>
     </message>
     <message>
-        <source>Duplicate port path entered </source>
-        <translation type="obsolete">Bikoizturiko ataka bidea idatzi da </translation>
+        <source><nobr>Expand/Collapse&nbsp;Item</nobr></source>
+        <translation type="obsolete"><nobr>Hedatu/Bildu&nbsp;Gaia</nobr></translation>
     </message>
-</context>
-<context>
-    <name>UIMachineSettingsStorage</name>
     <message>
-        <source><nobr><b>%1</b></nobr><br><nobr>Bus:&nbsp;&nbsp;%2</nobr><br><nobr>Type:&nbsp;&nbsp;%3</nobr></source>
-        <translation type="unfinished"></translation>
+        <source><nobr>Add&nbsp;Hard&nbsp;Disk</nobr></source>
+        <translation type="obsolete"><nobr>Gehitu&nbsp;Diska&nbsp;Gogorra</nobr></translation>
     </message>
     <message>
-        <source>Add Controller</source>
-        <translation type="unfinished"></translation>
+        <source><nobr>Add&nbsp;CD/DVD&nbsp;Device</nobr></source>
+        <translation type="obsolete"><nobr>Gehitu&nbsp;CD/DVD&nbsp;Gailua</nobr></translation>
     </message>
     <message>
-        <source>Add IDE Controller</source>
-        <translation type="unfinished"></translation>
+        <source><nobr>Add&nbsp;Floppy&nbsp;Device</nobr></source>
+        <translation type="obsolete"><nobr>Gehitu&nbsp;Diskete&nbsp;Gailua</nobr></translation>
     </message>
     <message>
-        <source>Add SATA Controller</source>
-        <translation type="unfinished"></translation>
+        <location line="+207"/>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Irudia</translation>
     </message>
     <message>
-        <source>Add SCSI Controller</source>
+        <location line="+167"/>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Controller</source>
+        <location line="+3"/>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Controller</source>
+        <location line="+3"/>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Attachment</source>
+        <location line="+3"/>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <location line="+1364"/>
+        <source>Add Controller</source>
+        <translation>Gehitu Kontrolatzailea</translation>
     </message>
     <message>
-        <source>Remove Attachment</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Add IDE Controller</source>
+        <translation>Gehitu IDE Kontrolatzailea</translation>
     </message>
     <message>
-        <source>Hard &Disk:</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Add SATA Controller</source>
+        <translation>Gehitu SATA Kontrolatzailea</translation>
     </message>
     <message>
-        <source>&Storage Tree</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Add SCSI Controller</source>
+        <translation>Gehitu SCSI Kontrolatzailea</translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>Add Floppy Controller</source>
+        <translation>Gehitu Diskete Kontrolatzailea</translation>
     </message>
     <message>
-        <source>The Storage Tree can contain several controllers of different types. This machine currently has no controllers.</source>
+        <location line="+1"/>
+        <source>Add USB Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Attributes</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Remove Controller</source>
+        <translation>Kendu Kontrolatzailea</translation>
     </message>
     <message>
-        <source>&Name:</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Add Attachment</source>
+        <translation>Gehitu Eranskina</translation>
     </message>
     <message>
-        <source>&Type:</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Add Hard Disk</source>
+        <translation>Gehitu Diska Gogorra</translation>
     </message>
     <message>
-        <source>Selects the sub-type of the storage controller currently selected in the Storage Tree.</source>
+        <location line="+291"/>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the slot on the storage controller used by this attachment. The available slots depend on the type of the controller and other attachments on it.</source>
+        <location line="+2"/>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, allows the guest to send ATAPI commands directly to the host-drive which makes it possible to use CD/DVD writers connected to the host inside the VM. Note that writing audio CD inside the VM is not yet supported.</source>
+        <location line="+156"/>
+        <source>Create New Hard Disk...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Passthrough</source>
+        <location line="+4"/>
+        <source>Choose Virtual Hard Disk File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Virtual Size:</source>
+        <location line="+8"/>
+        <source>Choose Virtual Optical Disk File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Actual Size:</source>
+        <location line="+7"/>
+        <location line="+16"/>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size:</source>
+        <location line="-7"/>
+        <source>Choose Virtual Floppy Disk File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <source>Add CD/DVD Device</source>
+        <translation type="obsolete">Gehitu CD/DVD Gailua</translation>
     </message>
     <message>
-        <source>Type (Format):</source>
-        <translation type="unfinished"></translation>
+        <source>Add Floppy Device</source>
+        <translation type="obsolete">Gehitu Diskete Gailua</translation>
     </message>
     <message>
-        <source>Attached to:</source>
-        <translation type="unfinished"></translation>
+        <location line="-474"/>
+        <source>Remove Attachment</source>
+        <translation>Kendu Eranskina</translation>
     </message>
     <message>
-        <source>Use Host I/O Cache</source>
-        <translation type="unfinished"></translation>
+        <source>Adds a new controller to the end of the Storage Tree.</source>
+        <translation type="obsolete">Kontrolatzaile berri bat gehintzen du Biltegi Zuhaitz amaieran.</translation>
     </message>
     <message>
-        <source>Add SAS Controller</source>
-        <translation type="unfinished"></translation>
+        <source>Removes the controller highlighted in the Storage Tree.</source>
+        <translation type="obsolete">Biltegi Zuhaitzean nabarmenduriko kontrolatzailea kentzen du.</translation>
     </message>
     <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <source>Adds a new attachment to the Storage Tree using currently selected controller as parent.</source>
+        <translation type="obsolete">Eranskin berri bat gehitzen du Biltegi Zuhaitzean unean hautaturiko kontrolatzailea gaineko bezala erabiliz.</translation>
     </message>
     <message>
-        <source>Host Drive</source>
-        <translation type="unfinished">Ostalari Gailua</translation>
+        <source>Removes the attachment highlighted in the Storage Tree.</source>
+        <translation type="obsolete">Biltegi Zuhaitzean nabarmenduriko eranskina kentzen du.</translation>
     </message>
     <message>
-        <source>Image</source>
-        <translation type="obsolete">Irudia</translation>
+        <location line="+282"/>
+        <source>Hard &Disk:</source>
+        <translation>&Diska Gogorra:</translation>
     </message>
     <message>
-        <source>Choose or create a virtual hard disk file. The virtual machine will see the data in the file as the contents of the virtual hard disk.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsStorage.ui" line="+51"/>
+        <source>&Storage Tree</source>
+        <translation>&Biltegi Zuhaitza</translation>
     </message>
     <message>
-        <source>Floppy &Drive:</source>
-        <translation type="unfinished"></translation>
+        <source>Contains all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <translation type="obsolete">Makina honentzako biltegiratutako kontrolatzaile guztiak eta berari erantsitako irudi birtual eta hostalari gidatzaileak ditu.</translation>
     </message>
     <message>
-        <source>Choose a virtual floppy disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation type="unfinished"></translation>
+        <location line="+64"/>
+        <location line="+294"/>
+        <source>Information</source>
+        <translation>Argibideak</translation>
     </message>
     <message>
-        <source>Remove disk from virtual drive</source>
-        <translation type="unfinished"></translation>
+        <location line="-287"/>
+        <source>The Storage Tree can contain several controllers of different types. This machine currently has no controllers.</source>
+        <translation>Biltegi Zuhaitzak mota ezberdineko kontrolatzaile ugari eduki ditzake. Makina honek orain ez du kontrolatzailerik.</translation>
     </message>
     <message>
-        <source>&Live CD/DVD</source>
-        <translation type="unfinished"></translation>
+        <location line="+39"/>
+        <location line="+118"/>
+        <source>Attributes</source>
+        <translation>Ezaugarriak</translation>
     </message>
     <message>
-        <source>&Solid-state Drive</source>
-        <translation type="unfinished"></translation>
+        <location line="-111"/>
+        <source>&Name:</source>
+        <translation>&Izena:</translation>
     </message>
     <message>
-        <source>Details:</source>
-        <translation type="unfinished"></translation>
+        <source>Changes the name of the storage controller currently selected in the Storage Tree.</source>
+        <translation type="obsolete">Biltegi Zuhaitzean orain hautaturiko biltegi kontrolatzailearen izena aldatzen du.</translation>
     </message>
     <message>
-        <source>at most one supported</source>
-        <comment>controller</comment>
+        <location line="-99"/>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>up to %1 supported</source>
-        <comment>controllers</comment>
+        <location line="+112"/>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Port Count:</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>&Type:</source>
+        <translation>&Mota:</translation>
     </message>
     <message>
-        <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source>
-        <translation type="unfinished"></translation>
+        <location line="+13"/>
+        <source>Selects the sub-type of the storage controller currently selected in the Storage Tree.</source>
+        <translation>Biltegi Zuhaitzean orain hautaturiko biltegi kontrolatzailearen azpi-mota aldatzen du.</translation>
     </message>
     <message>
-        <source>Controller: %1</source>
+        <location line="+39"/>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No name is currently specified for the controller at position <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>Use Host I/O Cache</source>
+        <translation>Erabili Hostalari S/I Katxea</translation>
     </message>
     <message>
-        <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
+        <location line="+70"/>
+        <source>Selects the slot on the storage controller used by this attachment. The available slots depend on the type of the controller and other attachments on it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No hard disk is selected for <i>%1</i>.</source>
+        <location line="+36"/>
+        <source>When checked, allows the guest to send ATAPI commands directly to the host-drive which makes it possible to use CD/DVD writers connected to the host inside the VM. Note that writing audio CD inside the VM is not yet supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
+        <location line="+3"/>
+        <source>&Passthrough</source>
+        <translation>&Igaropena</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
+        <location line="+16"/>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <location line="+3"/>
+        <source>&Solid-state Drive</source>
+        <translation>&Egoera-solikodko Gidagailua</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
-        <translation type="unfinished"></translation>
+        <location line="+56"/>
+        <source>Virtual Size:</source>
+        <translation>Neurri Birtuala:</translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
-        <translation type="unfinished"></translation>
+        <location line="+20"/>
+        <source>Actual Size:</source>
+        <translation>Oraingo Neurria:</translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
-        <translation type="unfinished"></translation>
+        <location line="+20"/>
+        <source>Size:</source>
+        <translation>Neurria:</translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation type="unfinished"></translation>
+        <location line="+40"/>
+        <source>Location:</source>
+        <translation>Kokalekua:</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Attached to:</source>
+        <translation type="unfinished">Hona Erantsita:</translation>
     </message>
     <message>
+        <location line="+20"/>
         <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="unfinished"></translation>
+        <location line="-160"/>
+        <source>Type (Format):</source>
+        <translation>Mota (Heuskarria):</translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <source>Attached To:</source>
+        <translation type="obsolete">Hona Erantsita:</translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <source>Allows to use host I/O caching capabilities.</source>
+        <translation type="obsolete">Hostalari S/I katxe gaitasunak erabiltzea ahalbidetzen du.</translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
-        <translation type="unfinished"></translation>
+        <source>Use host I/O cache</source>
+        <translation type="obsolete">Erabili hostalari S/I katxea</translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="-290"/>
+        <source>Add SAS Controller</source>
+        <translation>Gehitu SAS Kontrolatzailea</translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <location filename="../src/settings/machine/UIMachineSettingsStorage.ui" line="+20"/>
+        <source>Type:</source>
+        <translation>Mota:</translation>
+    </message>
+    <message>
+        <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="-1544"/>
+        <source>Host Drive</source>
+        <translation>Hostalari Gidagailua</translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="obsolete">Irudia</translation>
+    </message>
+    <message>
+        <location line="+1457"/>
+        <source>No name is currently specified for the controller at position <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <location line="+6"/>
+        <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Irudia</translation>
+        <location line="+18"/>
+        <source>No hard disk is selected for <i>%1</i>.</source>
+        <translation>Ez da diska gogorrik hautatu <i>%1</i>-rako.</translation>
     </message>
     <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <location line="+6"/>
+        <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <location line="+27"/>
+        <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <location line="+36"/>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <location line="+1"/>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create New Hard Disk...</source>
-        <translation type="unfinished"></translation>
+        <location line="+279"/>
+        <source>Choose or create a virtual hard disk file. The virtual machine will see the data in the file as the contents of the virtual hard disk.</source>
+        <translation>Hautatu edo sortu diska gogor birtual agiri bat. Makina birtualak agiriko datuak diska gogor birtualeko eduki bezala ikusiko ditu.</translation>
     </message>
     <message>
-        <source>Choose Virtual Hard Disk File...</source>
-        <translation type="unfinished"></translation>
+        <source>Set up the virtual hard disk</source>
+        <translation type="obsolete">Ezarri diska gogor birtuala</translation>
     </message>
     <message>
-        <source>Choose Virtual Optical Disk File...</source>
-        <translation type="unfinished"></translation>
+        <source>CD/DVD &Drive:</source>
+        <translation type="obsolete">CD/DVD &Gidagailua:</translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
-        <translation type="unfinished"></translation>
+        <source>Choose a virtual CD/DVD disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <translation type="obsolete">Hautatu gidagailu birtualarekin erabiltzeko CD/DVD diska bat edo gidagailu fisiko bat. Makina birtualak gidagailuan txertaturiko diska bat ikusiko du agiriko datuekin edo gidagailu fisikoko diskan bere edukiak bezala.</translation>
     </message>
     <message>
-        <source>Choose Virtual Floppy Disk File...</source>
-        <translation type="unfinished"></translation>
+        <source>Set up the virtual CD/DVD drive</source>
+        <translation type="obsolete">Ezarri CD/DVD gidagailu birtuala</translation>
     </message>
-</context>
-<context>
-    <name>UIMachineSettingsSystem</name>
     <message>
-        <source><qt>%1&nbsp;MB</qt></source>
-        <translation type="obsolete"><qt>%1&nbsp;MB</qt></translation>
+        <location line="+11"/>
+        <source>Floppy &Drive:</source>
+        <translation>&Diskete Gidagailua:</translation>
     </message>
     <message>
-        <source>&Motherboard</source>
+        <location line="+2"/>
+        <source>Choose a virtual floppy disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Base &Memory:</source>
-        <translation type="unfinished"></translation>
+        <source>Set up the virtual floppy drive</source>
+        <translation type="obsolete">Ezarri diskete birtual gidagailua</translation>
     </message>
     <message>
-        <source>Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start.</source>
-        <translation type="unfinished">Makina Birtualari ezarritako memoria kantitatea ezartzen du. Gehiegi ezarriaz gero, makina agian ez da abiaraziko.</translation>
+        <source>Create a new hard disk...</source>
+        <translation type="obsolete">Sortu diska gogor berri bat...</translation>
     </message>
     <message>
-        <source>MB</source>
-        <translation type="unfinished">MB</translation>
+        <source>Choose a virtual hard disk file...</source>
+        <translation type="obsolete">Hautatu diska gogor birtual agiri bat...</translation>
     </message>
     <message>
-        <source>&Boot Order:</source>
-        <translation type="unfinished"></translation>
+        <source>Choose a virtual CD/DVD disk file...</source>
+        <translation type="obsolete">Hautatu CD/DVD birtual diska agiri bat...</translation>
     </message>
     <message>
-        <source>Defines the boot device order. Use the checkboxes on the left to enable or disable individual boot devices. Move items up and down to change the device order.</source>
-        <translation type="unfinished">Abio gailu ordena ezartzen du. Aukerakutxak erabili abio gailuak gaitu edo ezgaitzeko. Elementuak gora eta behera mugitu gailu ordena aldatzeko.</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-335"/>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Move Down (Ctrl-Down)</source>
-        <translation type="obsolete">Behera Mugitu (Ktrl-Behera)</translation>
+        <location line="+104"/>
+        <source>Remove disk from virtual drive</source>
+        <translation>Kendu diska gidagailu birtualetik</translation>
     </message>
     <message>
-        <source>Moves the selected boot device down.</source>
-        <translation type="unfinished">Hautatutako abio gailua behera mugitzen du.</translation>
+        <source>Choose a virtual floppy disk file...</source>
+        <translation type="obsolete">Hautatu diskete diska birtual agiri bat...</translation>
     </message>
     <message>
-        <source>Move Up (Ctrl-Up)</source>
-        <translation type="obsolete">Gora Mugitu (Ktrl-Gora)</translation>
+        <source>When checked the virtual disk will not be removed when the guest system ejects it.</source>
+        <translation type="obsolete">Hautatutakoan diska birtuala ez da kenduko gonbidatu sistemak ateratzen  duenean.</translation>
     </message>
     <message>
-        <source>Moves the selected boot device up.</source>
-        <translation type="unfinished">Hautatutako abio gailua gora mugitzen du.</translation>
+        <location filename="../src/settings/machine/UIMachineSettingsStorage.ui" line="-68"/>
+        <source>&Live CD/DVD</source>
+        <translation>&Live CD/DVD</translation>
     </message>
     <message>
-        <source>Extended Features:</source>
-        <translation type="unfinished"></translation>
+        <source>When checked the guest system will see the virtual disk as a solid state device.</source>
+        <translation type="obsolete">Hautatutakoan gonbidatu sistemak diska birtuala egoera solidoko gailu bat bezala ikusiko du.</translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will support the Input Output APIC (I/O APIC), which may slightly decrease performance. <b>Note:</b> don't disable this feature after having installed a Windows guest operating system!</source>
-        <translation type="unfinished"></translation>
+        <source>&Solid-state drive</source>
+        <translation type="obsolete">&Egoera-solido gidagailua</translation>
     </message>
     <message>
-        <source>Enable &I/O APIC</source>
-        <translation type="unfinished"></translation>
+        <location line="+148"/>
+        <source>Details:</source>
+        <translation>Xehetasunak:</translation>
     </message>
     <message>
-        <source>&Processor</source>
-        <translation type="unfinished"></translation>
+        <source>no name specified for controller at position <b>%1</b>.</source>
+        <translation type="obsolete">ez da izenik adierazi kontrolatzailearentzat <b>%1</b> kokapenean.</translation>
     </message>
     <message>
-        <source>&Processor(s):</source>
-        <translation type="unfinished"></translation>
+        <source>controller at position <b>%1</b> uses the name that is already used by controller at position <b>%2</b>.</source>
+        <translation type="obsolete"><b>%1</b> kokapeneko kontrolatzaileak jadanik <b>%2</b> kokapeneko kontrolatzaileak erabiltzen duen izena erabiltzen du.</translation>
     </message>
     <message>
-        <source>When checked, the Physical Address Extension (PAE) feature of the host CPU will be exposed to the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <source>no hard disk is selected for <i>%1</i>.</source>
+        <translation type="obsolete">ez da diska gogorrik hautatu <i>%1</i>-rako.</translation>
     </message>
     <message>
-        <source>Enable PA&E/NX</source>
+        <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="-342"/>
+        <source>at most one supported</source>
+        <comment>controller</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Acce&leration</source>
+        <location line="+1"/>
+        <source>up to %1 supported</source>
+        <comment>controllers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware Virtualization:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsStorage.ui" line="-302"/>
+        <source>&Port Count:</source>
+        <translation>&Ataka Zenbatekoa:</translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will try to make use of the host CPU's hardware virtualization extensions such as Intel VT-x and AMD-V.</source>
+        <location line="+13"/>
+        <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable &VT-x/AMD-V</source>
-        <translation type="unfinished">&VT-x/AMD-V gaitu</translation>
-    </message>
-    <message>
-        <source>When checked, the virtual machine will try to make use of the nested paging extension of Intel VT-x and AMD-V.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/UIVMInfoDialog.cpp" line="+707"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-723"/>
+        <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="-505"/>
+        <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="-1720"/>
+        <source>Controller: %1</source>
+        <translation>Kontrolatzailea: %1</translation>
     </message>
+</context>
+<context>
+    <name>UIMachineSettingsSystem</name>
     <message>
-        <source>Enable Nested Pa&ging</source>
-        <translation type="unfinished"></translation>
+        <source>you have assigned more than <b>%1%</b> of your computer's memory (<b>%2</b>) to the virtual machine. Not enough memory is left for your host operating system. Please select a smaller amount.</source>
+        <translation type="obsolete">Zure ordenagailuaren (<b>%2</b>) <b>%1%</b> baino oroimen gehigo duzu esleituta makina birtualera. Ez da nahikoa oroimen gelditzen zure hostalari sistema eragilerako. Mesedez hautatu kopuru txikiago bat.</translation>
     </message>
     <message>
-        <source>When checked, the guest will support the Extended Firmware Interface (EFI), which is required to boot certain guest OSes. Non-EFI aware OSes will not be able to boot if this option is activated.</source>
-        <translation type="unfinished"></translation>
+        <source>you have assigned more than <b>%1%</b> of your computer's memory (<b>%2</b>) to the virtual machine. There might not be enough memory left for your host operating system. Continue at your own risk.</source>
+        <translation type="obsolete">Zure ordenagailuaren (<b>%2</b>) <b>%1%</b> baino oroimen gehigo duzu esleituta makina birtualera. Badaiteke nahikoa oroimen ez gelditzea zure hostalari sistema eragilerako. Jarraitu zeure arriskupean.</translation>
     </message>
     <message>
-        <source>Enable &EFI (special OSes only)</source>
-        <translation type="unfinished"></translation>
+        <source>for performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
+        <translation type="obsolete">egintza zergaitiengaitik, makina birtualera erantsitako CPU birtual zenbatekoa ezin da hostalariko CPU fisikoak (<b>%1</b> baino bi aldiz gehiago izan. Mesedez murriztu CPU birtual zenbatekoa.</translation>
     </message>
     <message>
-        <source>Hardware Clock in &UTC Time</source>
-        <translation type="unfinished"></translation>
+        <source>you have assigned more virtual CPUs to the virtual machine than the number of physical CPUs on your host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
+        <translation type="obsolete">zure hostalari sistemak dituen CPU fisiko zenbatekoa (<b>%1</b>) baino CPU birtual gehiago esleitu dizkiozu makina birtualari. Honek zure makina birtualaren egintza itsusituko du. Mesedez kontuan hartu CPU birtual zenbatekoa gutxitzea.</translation>
     </message>
     <message>
-        <source>Controls the number of virtual CPUs in the virtual machine. You need hardware virtualization support on your host system to use more than one virtual CPU.</source>
-        <translation type="unfinished"></translation>
+        <source>you have assigned more than one virtual CPU to this VM. This will not work unless the IO-APIC feature is also enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source>
+        <translation type="obsolete">CPU birtual bat baino gehiago esleitu dizkiozu MB honi. Honek ez du lan egingo IO-APIC ezaugarria ere gaituta ez badago. Hau berezgaitasunez egingo da MB Ezarpenak onartzen dituzunean Ongi botoia sakatuz.</translation>
     </message>
     <message>
-        <source>&Chipset:</source>
-        <translation type="unfinished"></translation>
+        <source>you have assigned more than one virtual CPU to this VM. This will not work unless hardware virtualization (VT-x/AMD-V) is also enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source>
+        <translation type="obsolete">CPU birtual bat baino gehiago esleitu dizkiozu MB honi. Honek ez du lan egingo hardware birtualizazioa (VT-x/AMD-V) ere gaituta ez badago. Hau berezgaitasunez egingo da MB Ezarpenak onartzen dituzunean Ongi botoia sakatuz.</translation>
     </message>
     <message>
-        <source>Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset emulation is experimental and not recommended except for guest systems (such as Mac OS X) which require it.</source>
+        <location filename="../src/settings/machine/UIMachineSettingsSystem.cpp" line="+312"/>
+        <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. Not enough memory is left for the host operating system. Please select a smaller amount.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Execution Cap:</source>
+        <location line="+9"/>
+        <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. There might not be enough memory left for the host operating system. Please consider selecting a smaller amount.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Limits the amount of time that each virtual CPU is allowed to run for. Each virtual CPU will be allowed to use up to this percentage of the processing time available on one physical CPU. The execution cap can be disabled by setting it to 100%. Setting the cap too low can make the machine feel slow to respond.</source>
+        <location line="+10"/>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Pointing Device:</source>
+        <location line="+9"/>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Determines whether the emulated pointing device is a standard PS/2 mouse, a USB tablet or a USB multi-touch tablet.</source>
+        <location line="+38"/>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. Not enough memory is left for the host operating system. Please select a smaller amount.</source>
+        <location line="+9"/>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. There might not be enough memory left for the host operating system. Please consider selecting a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <location line="+60"/>
+        <location line="+1"/>
+        <source>%1 MB</source>
+        <translation type="unfinished">%1 MB</translation>
     </message>
     <message>
-        <source>For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
+        <location line="+3"/>
+        <source>%1 CPU</source>
+        <comment>%1 is 1 for now</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>More virtual CPUs are assigned to the virtual machine than the number of physical CPUs on the host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
+        <location line="+1"/>
+        <source>%1 CPUs</source>
+        <comment>%1 is host cpu count * 2 for now</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The processor execution cap is set to a low value. This may make the machine feel slow to respond.</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <location line="+1"/>
+        <source>%1%</source>
+        <translation type="unfinished">%1%</translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <location line="-95"/>
+        <source>For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <location line="+8"/>
+        <source>More virtual CPUs are assigned to the virtual machine than the number of physical CPUs on the host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <location line="+27"/>
+        <source>The processor execution cap is set to a low value. This may make the machine feel slow to respond.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
-        <translation type="unfinished"></translation>
+        <source><qt>%1&nbsp;MB</qt></source>
+        <translation type="obsolete"><qt>%1&nbsp;MB</qt></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
-        <translation type="unfinished"></translation>
+        <source><qt>%1&nbsp;CPU</qt></source>
+        <comment>%1 is 1 for now</comment>
+        <translation type="obsolete"><qt>%1&nbsp;CPU</qt></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsSystem.ui" line="+22"/>
+        <source>&Motherboard</source>
+        <translation>&Ohinplaka</translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
+        <location line="+6"/>
+        <source>Base &Memory:</source>
+        <translation>&Ohinarri Oroimena:</translation>
     </message>
     <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
+        <location line="+25"/>
+        <location line="+39"/>
+        <source>Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start.</source>
+        <translation>Makina birtutalari hornitutako oroimen kopurua kontrolatzen du. Gehiegi esleitzen baduzu, badaiteke makina ez abiatzea.</translation>
     </message>
     <message>
-        <source>%1 MB</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsSystem.cpp" line="+50"/>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>%1 CPU</source>
-        <comment>%1 is 1 for now</comment>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsSystem.ui" line="+7"/>
+        <source>&Boot Order:</source>
+        <translation>&Abiarazpen Hurrenkera:</translation>
     </message>
     <message>
-        <source>%1 CPUs</source>
-        <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished"></translation>
+        <location line="+24"/>
+        <source>Defines the boot device order. Use the checkboxes on the left to enable or disable individual boot devices. Move items up and down to change the device order.</source>
+        <translation>Gailu abiarazte hurrenkera zehazten du. Erabili ezkerreko hautakutxak banakako abiarazpen gailuak gaitzeko edo ezgaitzeko. Mugitu gaiak gora edo behera gailu hurrenkera aldatzeko.</translation>
     </message>
     <message>
-        <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <source>Move Down (Ctrl-Down)</source>
+        <translation type="obsolete">Mugitu Behera (Ktrl-Behera)</translation>
     </message>
-</context>
-<context>
-    <name>UIMachineSettingsUSB</name>
     <message>
-        <source>Adds a new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="obsolete">Ostalari ordenagailuari erantsitako hautatutako USB gailuaren eremu balioekin USB iragazki berri bat sortu.</translation>
+        <location line="+46"/>
+        <source>Moves the selected boot device down.</source>
+        <translation>Abiarazpen gailua behera mugitzen du.</translation>
     </message>
     <message>
-        <source>Moves the selected USB filter up.</source>
-        <translation type="obsolete">Haututako USB iragazkia gora mugitzen du.</translation>
+        <source>Move Up (Ctrl-Up)</source>
+        <translation type="obsolete">Mugitu Gora (Ktrl-Gora)</translation>
     </message>
     <message>
-        <source>Moves the selected USB filter down.</source>
-        <translation type="obsolete">Haututako USB iragazkia behera mugitzen du.</translation>
+        <location line="-17"/>
+        <source>Moves the selected boot device up.</source>
+        <translation>Abiarazpen gailua gora mugitzen du.</translation>
     </message>
     <message>
-        <source>New Filter %1</source>
-        <comment>usb</comment>
-        <translation type="unfinished"></translation>
+        <location line="+147"/>
+        <location line="+197"/>
+        <source>Extended Features:</source>
+        <translation>Ezaugarri Hedatuak:</translation>
     </message>
     <message>
-        <source>When checked, enables the virtual USB controller of this machine.</source>
-        <translation type="unfinished">Markaturik dagoenean, makina honetako USB kontrolatzaile birtuala gaitzen du.</translation>
+        <source>Enable &IO APIC</source>
+        <translation type="obsolete">Gaitu &IO APIC</translation>
     </message>
     <message>
-        <source>Enable &USB Controller</source>
-        <translation type="unfinished">Gaitu &USB Kontrolatzailea</translation>
+        <location line="-143"/>
+        <source>&Processor</source>
+        <translation>&Prozesagailuak</translation>
     </message>
     <message>
-        <source>USB Device &Filters</source>
-        <translation type="unfinished">USB Gailu &Iragazkiak</translation>
+        <location line="+6"/>
+        <source>&Processor(s):</source>
+        <translation>&Prozesagailua(k):</translation>
     </message>
     <message>
-        <source>Lists all USB filters of this machine. The checkbox to the left defines whether the particular filter is enabled or not. Use the context menu or buttons to the right to add or remove USB filters.</source>
+        <location line="+130"/>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[filter]</source>
+        <location line="+17"/>
+        <source>When checked, the Physical Address Extension (PAE) feature of the host CPU will be exposed to the virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Vendor ID: %1</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>Enable PA&E/NX</source>
+        <translation>Gaitu PA&E/NX</translation>
     </message>
     <message>
-        <source><nobr>Product ID: %2</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
+        <location line="+21"/>
+        <source>Acce&leration</source>
+        <translation>&Bizkorpena</translation>
     </message>
     <message>
-        <source><nobr>Revision: %3</nobr></source>
-        <comment>USB filter tooltip</comment>
+        <location line="+6"/>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Product: %4</nobr></source>
-        <comment>USB filter tooltip</comment>
+        <location line="+21"/>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Manufacturer: %5</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
+        <location line="+22"/>
+        <source>Hardware Virtualization:</source>
+        <translation>Hardware Birtualizazioa:</translation>
     </message>
     <message>
-        <source><nobr>Serial No.: %1</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <source>When checked, the virtual machine will try to make use of the host CPU's hardware virtualization extensions such as Intel VT-x and AMD-V.</source>
+        <translation>Hautatutakoan, makina birtuala Intel VT-x eta AMD-V bezalako hostalari CPU-aren hardware birtualizazio hedapenak erabiltzen saiatuko da.</translation>
     </message>
     <message>
-        <source><nobr>Port: %1</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>Enable &VT-x/AMD-V</source>
+        <translation>Gaitu &VT-x/AMD-V</translation>
     </message>
     <message>
-        <source><nobr>State: %1</nobr></source>
-        <comment>USB filter tooltip</comment>
+        <location line="+13"/>
+        <source>When checked, the virtual machine will try to make use of the nested paging extension of Intel VT-x and AMD-V.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>Enable Nested Pa&ging</source>
+        <translation>Gaitu &Nested Orrialdeztapena</translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
-        <translation type="unfinished"></translation>
+        <source><qt>%1&nbsp;CPUs</qt></source>
+        <comment>%1 is host cpu count * 2 for now</comment>
+        <translation type="obsolete"><qt>%1&nbsp;CPU</qt></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <location line="-295"/>
+        <source>When checked, the guest will support the Extended Firmware Interface (EFI), which is required to boot certain guest OSes. Non-EFI aware OSes will not be able to boot if this option is activated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>Enable &EFI (special OSes only)</source>
+        <translation>Gaitu &EFI (SE bereziak bakarrik)</translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
-        <translation type="unfinished"></translation>
+        <source>Hardware clock in &UTC time</source>
+        <translation type="obsolete">Hardware ordularia &UTC orduan</translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
-        <translation type="unfinished"></translation>
+        <location line="+62"/>
+        <location line="+39"/>
+        <source>Controls the number of virtual CPUs in the virtual machine. You need hardware virtualization support on your host system to use more than one virtual CPU.</source>
+        <translation>Makina birtualeko CPU birtual zenbatekoa kontrolatzen du. Hardware birtualizazio sostengua behar duzu zure hostalari sisteman CPU birtual bat baino gehiago erabiltzeko.</translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
-        <translation type="unfinished"></translation>
+        <location line="-210"/>
+        <source>&Chipset:</source>
+        <translation>&Chipseta:</translation>
     </message>
     <message>
-        <source>Add Empty Filter</source>
+        <location line="+21"/>
+        <source>Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset emulation is experimental and not recommended except for guest systems (such as Mac OS X) which require it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Filter From Device</source>
+        <location line="+22"/>
+        <source>&Pointing Device:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Filter</source>
+        <location line="+21"/>
+        <source>Determines whether the emulated pointing device is a standard PS/2 mouse, a USB tablet or a USB multi-touch tablet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Filter</source>
+        <location line="+32"/>
+        <source>When checked, the virtual machine will support the Input Output APIC (I/O APIC), which may slightly decrease performance. <b>Note:</b> don't disable this feature after having installed a Windows guest operating system!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Move Filter Up</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>Enable &I/O APIC</source>
+        <translation>Gaitu &S/I APIC</translation>
     </message>
     <message>
-        <source>Move Filter Down</source>
+        <location line="+17"/>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>Hardware Clock in &UTC Time</source>
+        <translation>Hardware Ordularia &UTC Orduan</translation>
     </message>
     <message>
-        <source>Adds new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="unfinished"></translation>
+        <location line="+98"/>
+        <source>&Execution Cap:</source>
+        <translation>&Exekuzio Muga:</translation>
     </message>
     <message>
-        <source>Edits selected USB filter.</source>
+        <location line="+18"/>
+        <location line="+38"/>
+        <source>Limits the amount of time that each virtual CPU is allowed to run for. Each virtual CPU will be allowed to use up to this percentage of the processing time available on one physical CPU. The execution cap can be disabled by setting it to 100%. Setting the cap too low can make the machine feel slow to respond.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <source>you have set the processor execution cap to a low value. This can make the machine feel slow to respond.</source>
+        <translation type="obsolete">exekuzio muga bailo apal batean ezarri duzu. Honek makinak astiro erantzutea eragingo du.</translation>
     </message>
     <message>
-        <source>Moves selected USB filter up.</source>
-        <translation type="unfinished"></translation>
+        <source><qt>%1%</qt></source>
+        <comment>Min CPU execution cap in %</comment>
+        <translation type="obsolete"><qt>%1%</qt></translation>
     </message>
     <message>
-        <source>Moves selected USB filter down.</source>
-        <translation type="unfinished"></translation>
+        <source><qt>%1%</qt></source>
+        <comment>Max CPU execution cap in %</comment>
+        <translation type="obsolete"><qt>%1%</qt></translation>
     </message>
 </context>
 <context>
-    <name>UIMachineSettingsUSBFilterDetails</name>
+    <name>UIMachineSettingsUSB</name>
     <message>
-        <source>Any</source>
-        <comment>remote</comment>
-        <translation type="unfinished">Edozein</translation>
+        <source>&Add Empty Filter</source>
+        <translation type="obsolete">&Gehitu Iragazki Hutsa</translation>
     </message>
     <message>
-        <source>Yes</source>
-        <comment>remote</comment>
-        <translation type="unfinished">Bai</translation>
+        <source>A&dd Filter From Device</source>
+        <translation type="obsolete">G&ehitu Iragazkia Gailutik</translation>
     </message>
     <message>
-        <source>No</source>
-        <comment>remote</comment>
-        <translation type="unfinished">Ez</translation>
+        <source>&Edit Filter</source>
+        <translation type="obsolete">&Editatu Iragazkia</translation>
     </message>
     <message>
-        <source>&Name:</source>
-        <translation type="unfinished"></translation>
+        <source>&Remove Filter</source>
+        <translation type="obsolete">&Kendu Iragazkia</translation>
     </message>
     <message>
-        <source>Holds the filter name.</source>
-        <translation type="unfinished">Iragazki izena bistarazten du.</translation>
+        <source>&Move Filter Up</source>
+        <translation type="obsolete">&Mugitu Iragazkia Gora</translation>
     </message>
     <message>
-        <source>&Vendor ID:</source>
-        <translation type="unfinished"></translation>
+        <source>M&ove Filter Down</source>
+        <translation type="obsolete">M&ugitu Iragazkia Behera</translation>
     </message>
     <message>
-        <source>&Product ID:</source>
-        <translation type="unfinished"></translation>
+        <source>Adds a new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
+        <translation type="obsolete">USB iragazki berri bat gehitzen du eremu guztietan hautaturiko hostalari PG-ra erantsitako USB gailuaren balioak ezarriz.</translation>
     </message>
     <message>
-        <source>&Revision:</source>
-        <translation type="unfinished"></translation>
+        <source>Edits the selected USB filter.</source>
+        <translation type="obsolete">Hautaturiko USB iragazkia editatzen du.</translation>
     </message>
     <message>
-        <source>&Manufacturer:</source>
-        <translation type="unfinished"></translation>
+        <source>Removes the selected USB filter.</source>
+        <translation type="obsolete">Hautaturiko USB iragazkia kentzen du.</translation>
     </message>
     <message>
-        <source>Pro&duct:</source>
-        <translation type="unfinished"></translation>
+        <source>Moves the selected USB filter up.</source>
+        <translation type="obsolete">Hautaturiko USB iragazkia gora mugitzen du.</translation>
     </message>
     <message>
-        <source>&Serial No.:</source>
-        <translation type="unfinished"></translation>
+        <source>Moves the selected USB filter down.</source>
+        <translation type="obsolete">Hautaturiko USB iragazkia behera mugitzen du.</translation>
     </message>
     <message>
-        <source>Por&t:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="+567"/>
+        <source>New Filter %1</source>
+        <comment>usb</comment>
+        <translation>Iragazki Berria %1</translation>
     </message>
     <message>
-        <source>R&emote:</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsUSB.ui" line="+29"/>
+        <source>When checked, enables the virtual USB controller of this machine.</source>
+        <translation>Hautatutakoan, makina honen USB kontrolatzaile birtuala gaitzen du.</translation>
     </message>
     <message>
-        <source>USB Filter Details</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>Enable &USB Controller</source>
+        <translation>Gaitu &USB Kontrolatzailea</translation>
     </message>
     <message>
-        <source>Holds the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <source>When checked, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <translation type="obsolete">Hautatutakoan, makina honen USB EHCI kontrolatzaile birtuala gaitzen du. USB EHCI kontrolatzaileak USB 2.0 sostengua ematen du.</translation>
     </message>
     <message>
-        <source>Holds the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <source>Enable USB 2.0 (E&HCI) Controller</source>
+        <translation type="obsolete">Gaitu USB 2.0 (E&HCI) Kontrolatzailea</translation>
     </message>
     <message>
-        <source>Holds the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
+        <location line="+56"/>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <location line="+3"/>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <location line="+7"/>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <location line="+3"/>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <location line="+7"/>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
+        <location line="+3"/>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIMachineWindow</name>
     <message>
-        <source> EXPERIMENTAL build %1r%2 - %3</source>
-        <translation type="unfinished"></translation>
+        <location line="+10"/>
+        <source>USB Device &Filters</source>
+        <translation>USB Gailu &Iragazkiak</translation>
     </message>
-</context>
-<context>
-    <name>UIMachineWindowNormal</name>
     <message>
-        <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source>
-        <translation></translation>
+        <location line="+37"/>
+        <source>Lists all USB filters of this machine. The checkbox to the left defines whether the particular filter is enabled or not. Use the context menu or buttons to the right to add or remove USB filters.</source>
+        <translation>Makina honetako USB iragazki guztiak zerrendatzen ditu. Ezkerreko hautakutxak zein iragazki bereizi gaitzen den edo ez zehazten du. Erabili hitzinguru menua edo eskuineko botoiak USB iragazkiak gehitzeko edo kentzeko.</translation>
     </message>
-</context>
-<context>
-    <name>UIMediumManager</name>
     <message>
-        <source>&Optical disks</source>
+        <location line="+7"/>
+        <source>[filter]</source>
+        <translation>[iragazkia]</translation>
+    </message>
+    <message>
+        <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="-52"/>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy disks</source>
+        <location line="+29"/>
+        <source>Add Empty Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Select</source>
-        <translation type="obsolete">&Hautatu</translation>
+        <location line="+1"/>
+        <source>Add Filter From Device</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removing medium...</source>
+        <location line="+1"/>
+        <source>Edit Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard disks</source>
+        <location line="+1"/>
+        <source>Remove Filter</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIMediumTypeChangeDialog</name>
     <message>
-        <source>Modify medium attributes</source>
+        <location line="+1"/>
+        <source>Move Filter Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to change the settings of the disk image file <b>%1</b>.</p><p>Please choose one of the following modes and press <b>%2</b> to proceed or <b>%3</b> otherwise.</p></source>
+        <location line="+1"/>
+        <source>Move Filter Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose mode:</source>
+        <location line="+2"/>
+        <source>Adds new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIMenuBarEditorWidget</name>
     <message>
-        <source>Virtual Screen Resize</source>
+        <location line="+2"/>
+        <source>Adds new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Virtual Screen Mapping</source>
+        <location line="+2"/>
+        <source>Edits selected USB filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Itxi</translation>
+        <location line="+1"/>
+        <source>Removes selected USB filter.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch</source>
+        <location line="+1"/>
+        <source>Moves selected USB filter up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable Menu Bar</source>
+        <location line="+1"/>
+        <source>Moves selected USB filter down.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIMessageCenter</name>
     <message>
-        <source>VirtualBox - Information</source>
-        <comment>msg box title</comment>
-        <translation>VirtualBox - Argibideak</translation>
+        <location line="+276"/>
+        <source><nobr>Vendor ID: %1</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Saltzaile ID-a: %1</nobr></translation>
     </message>
     <message>
-        <source>VirtualBox - Question</source>
-        <comment>msg box title</comment>
-        <translation>VirtualBox - Galdera</translation>
+        <location line="+4"/>
+        <source><nobr>Product ID: %2</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Produktu ID-a: %2</nobr></translation>
     </message>
     <message>
-        <source>VirtualBox - Warning</source>
-        <comment>msg box title</comment>
-        <translation>VirtualBox - Kontuz</translation>
+        <location line="+4"/>
+        <source><nobr>Revision: %3</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Berrikuspena: %3</nobr></translation>
     </message>
     <message>
-        <source>VirtualBox - Error</source>
-        <comment>msg box title</comment>
-        <translation>VirtualBox - Errorea</translation>
+        <location line="+4"/>
+        <source><nobr>Product: %4</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Produktua: %4</nobr></translation>
     </message>
     <message>
-        <source>VirtualBox - Critical Error</source>
-        <comment>msg box title</comment>
-        <translation>VirtualBox - Errore Kritikoa</translation>
+        <location line="+4"/>
+        <source><nobr>Manufacturer: %5</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Ekoizlea: %5</nobr></translation>
     </message>
     <message>
-        <source>Do not show this message again</source>
-        <comment>msg box flag</comment>
-        <translation>Ez erakutsi mezu hau berriz</translation>
+        <location line="+4"/>
+        <source><nobr>Serial No.: %1</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Serial Zbk.: %1</nobr></translation>
     </message>
     <message>
-        <source>Failed to open <tt>%1</tt>. Make sure your desktop environment can properly handle URLs of this type.</source>
-        <translation>Huts <tt>%1</tt> irekitzean. Ziurtatu zaitez zure idazmahai inguruneak mota honetako URL-ak kudea ditzakeela.</translation>
+        <location line="+4"/>
+        <source><nobr>Port: %1</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Ataka: %1</nobr></translation>
     </message>
     <message>
-        <source><p>Failed to initialize COM or to find the VirtualBox COM server. Most likely, the VirtualBox server is not running or failed to start.</p><p>The application will now terminate.</p></source>
-        <translation><p>Huts VirtualBox COM zerbitzaria bilatzeko COM abiaraztean. Seguruenik, VirtualBox zerbitzaria ez dago abiarazirik edo huts egin du abiaraztean.</p><p>Aplikazioa orain itxi egingo da.</p></translation>
+        <location line="+5"/>
+        <source><nobr>State: %1</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Egoera: %1</nobr></translation>
     </message>
+</context>
+<context>
+    <name>UIMachineSettingsUSBFilterDetails</name>
     <message>
-        <source><p>Failed to create the VirtualBox COM object.</p><p>The application will now terminate.</p></source>
-        <translation type="obsolete"><p>Huts VirtualBox COM elementua sortzerakoan.</p><p>Aplikazioa itxi egingo da orain,</p></translation>
+        <location filename="../src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp" line="+57"/>
+        <source>Any</source>
+        <comment>remote</comment>
+        <translation>Edozein</translation>
     </message>
     <message>
-        <source><p>Failed to load the global GUI configuration.</p><p>The application will now terminate.</p></source>
-        <translation type="obsolete"><p>Huts GUI interfaze nagusiaren konfigurazioa kargatzerakoan.</p><p>Aplikazioa itxi egingo da orain,</p></translation>
+        <location line="+1"/>
+        <source>Yes</source>
+        <comment>remote</comment>
+        <translation>Bai</translation>
     </message>
     <message>
-        <source><p>Failed to save the global GUI configuration.<p></source>
-        <translation type="obsolete"><p>Huts GUI interfaze nagusiaren konfigurazioa gordetzerakoan.<p></translation>
+        <location line="+1"/>
+        <source>No</source>
+        <comment>remote</comment>
+        <translation>Ez</translation>
     </message>
     <message>
-        <source>Failed to set global VirtualBox properties.</source>
-        <translation>Huts VirtualBox propietate orokorrak ezartzerakoan.</translation>
+        <location filename="../src/settings/machine/UIMachineSettingsUSBFilterDetails.ui" line="+38"/>
+        <source>&Name:</source>
+        <translation>&Izena:</translation>
     </message>
     <message>
-        <source>Failed to access the USB subsystem.</source>
-        <translation>Huts USB azpisistema atzitzerakoan.</translation>
+        <source>Displays the filter name.</source>
+        <translation type="obsolete">Iragazki izena erakusten du.</translation>
     </message>
     <message>
-        <source>Failed to create a new virtual machine.</source>
-        <translation>Huts makina birtual berria sortzerakoan.</translation>
+        <location line="+13"/>
+        <source>Holds the filter name.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to create a new virtual machine <b>%1</b>.</source>
-        <translation type="obsolete">Huts <b>%1</b> makina birtual berria sortzerakoan.</translation>
+        <location line="+7"/>
+        <source>&Vendor ID:</source>
+        <translation>&Saltzaile ID-a:</translation>
     </message>
     <message>
-        <source>Failed to apply the settings to the virtual machine <b>%1</b>.</source>
-        <translation type="obsolete">Huts hobespenak <b>%1</b> makina birtualean ezartzerakoan.</translation>
+        <location line="+13"/>
+        <source>Holds the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings of the virtual machine <b>%1</b>.</source>
-        <translation type="obsolete">Huts <b>%1</b> makina birtualaren hobespenak gordetzerakoan.</translation>
+        <location line="+20"/>
+        <source>Holds the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to load the settings of the virtual machine <b>%1</b>.</source>
-        <translation type="obsolete">Huts <b>%1</b> makina birtualaren hobespenak kargatzerakoan.</translation>
+        <location line="+20"/>
+        <source>Holds the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to start the virtual machine <b>%1</b>.</source>
-        <translation>Huts <b>%1</b> makina birtuala abiarazterakoan.</translation>
+        <location line="+20"/>
+        <source>Holds the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to pause the execution of the virtual machine <b>%1</b>.</source>
-        <translation>Huts <b>%1</b> makina birtualaren exekuzioa gelditzerakoan.</translation>
+        <location line="+20"/>
+        <source>Holds the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to resume the execution of the virtual machine <b>%1</b>.</source>
-        <translation>Huts <b>%1</b> makina birtualaren exekuzioa jarraitzerakoan.</translation>
+        <location line="+20"/>
+        <source>Holds the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the state of the virtual machine <b>%1</b>.</source>
-        <translation>Huts <b>%1</b> makina birtualaren egoera gordetzerakoan.</translation>
+        <location line="+20"/>
+        <source>Holds the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to create a snapshot of the virtual machine <b>%1</b>.</source>
-        <translation>Huts <b>%1</b> makina birtualaren egoera-argazkia egiterakoan.</translation>
+        <location line="+26"/>
+        <source>Holds whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to stop the virtual machine <b>%1</b>.</source>
-        <translation>Huts <b>%1</b> makina birtuala gelditzerakoan.</translation>
+        <source>Defines the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
+        <translation type="obsolete">Saltzaile ID iragazkia zehazten du. <i>berdin zehatz</i> kate heuskarria da <tt>XXXX</tt> non <tt>X</tt> zenbaki hexadezimal bat da. Kate huts batek edozein balio berdinduko du.</translation>
     </message>
     <message>
-        <source>Failed to remove the virtual machine <b>%1</b>.</source>
-        <translation>Huts <b>%1</b> makina birtuala ezabatzerakoan.</translation>
+        <location line="-139"/>
+        <source>&Product ID:</source>
+        <translation>&Produktu ID-a:</translation>
     </message>
     <message>
-        <source>Failed to discard the saved state of the virtual machine <b>%1</b>.</source>
-        <translation>Huts <b>%1</b> makina birtualaren gordetako egoera baztertzerakoan.</translation>
+        <source>Defines the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
+        <translation type="obsolete">Ekoizle ID iragazkia zehazten du. <i>berdin zehatz</i> kate heuskarria da <tt>XXXX</tt> non <tt>X</tt> zenbaki hexadezimal bat da. Kate huts batek edozein balio berdinduko du.</translation>
     </message>
     <message>
-        <source>Failed to discard the snapshot <b>%1</b> of the virtual machine <b>%2</b>.</source>
-        <translation type="obsolete">Huts <b>%2</b> makina birtualaren <b>%1</b> egoera-argazkia baztertzerakoan.</translation>
+        <location line="+20"/>
+        <source>&Revision:</source>
+        <translation>&Berrikuspena:</translation>
     </message>
     <message>
-        <source>Failed to discard the current state of the virtual machine <b>%1</b>.</source>
-        <translation type="obsolete">Huts <b>%1</b> makina birtualaren uneko egoera baztertzerakoan.</translation>
+        <location line="+20"/>
+        <source>&Manufacturer:</source>
+        <translation>&Ekoizlea:</translation>
     </message>
     <message>
-        <source>Failed to discard the current snapshot and the current state of the virtual machine <b>%1</b>.</source>
-        <translation type="obsolete">Huts <b>%1</b> makina birtualaren uneko egoera-argazkia eta uneko egoera baztertzerakoan.</translation>
+        <source>Defines the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <translation type="obsolete">Ekoizle iragazkia zehazten du <i>berdin zehatz</i> kate bat bezala. Kate huts batek edozein balio berdinduko du.</translation>
     </message>
     <message>
-        <source>There is no virtual machine named <b>%1</b>.</source>
-        <translation>Ez dago <b>%1</b> izeneko makina birtualik.</translation>
+        <location line="+20"/>
+        <source>Pro&duct:</source>
+        <translation>Pr&oduktua:</translation>
     </message>
     <message>
-        <source><p>Are you sure you want to permanently delete the virtual machine <b>%1</b>?</p><p>This operation cannot be undone.</p></source>
-        <translation type="obsolete"><p>Ziur al zaude <b>%1</b> Maina Birtuala betirako ezabatu nahi duzula?</p><p>Ekintza hau ezin da desegin.</p></translation>
+        <source>Defines the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <translation type="obsolete">Produktuaren izen iragazkia zehazten du <i>berdin zehatz</i> kate bat bezala. Kate huts batek edozein balio berdinduko du.</translation>
     </message>
     <message>
-        <source><p>Are you sure you want to unregister the inaccessible virtual machine <b>%1</b>?</p><p>You will not be able to register it again from GUI.</p></source>
-        <translation type="obsolete"><p>Ziur al zaude eskuratu ezin den <b>%1</b> makina birtualaren erregistroa kendu nahi duzula?</p><p>Ezingo duzu berau interfazearen bidez berriz erregistratu.</p></translation>
+        <location line="+20"/>
+        <source>&Serial No.:</source>
+        <translation>&Serie Zbk:</translation>
     </message>
     <message>
-        <source><p>Are you sure you want to discard the saved state of the virtual machine <b>%1</b>?</p><p>This operation is equivalent to resetting or powering off the machine without doing a proper shutdown of the guest OS.</p></source>
-        <translation type="obsolete"><p>Ziur al zaude <b>%1</b> makina birtualaren gordetako uneko egoera baztertu nahi duzula?</p><p>Ekintza hau makinaren reset botoia jo edo behar bezala bezero sistema eragilea itzali gabe makina itzaltzearen berdina da</p></translation>
+        <source>Defines the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <translation type="obsolete">Serie zenbaki iragazkia zehazten du <i>berdin zehatz</i> kate bat bezala. Kate huts batek edozein balio berdinduko du.</translation>
     </message>
     <message>
-        <source><p>Releasing this media image will detach it from the following virtual machine(s): <b>%1</b>.</p><p>Continue?</p></source>
-        <translation type="obsolete"><p>Euskarri hau ateratzeak berau hurrengo makina birtuale(ta)tik kentzea eragingo du: <b>%1</b>.</p><p>Jarraitu?</p></translation>
+        <location line="+20"/>
+        <source>Por&t:</source>
+        <translation>&Ataka:</translation>
     </message>
     <message>
-        <source><p>The image file <b>%1</b> already exists. You cannot create a new virtual hard disk that uses this file, because it can be already used by another virtual hard disk.</p><p>Please specify a different image file name.</p></source>
-        <translation type="obsolete"><p>Badago dagoeneko <b>%1</b> irudi fitxategia. Ezin duzu fitxategi hau erabiltzen duen disko gogor birtual berri bat sortu, agian beste disko gogor birtual batek erabiltzen duelako</p><p>Mesedez ezarri beste irudi fitxategi izen bat.</p></translation>
+        <source>Defines the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
+        <translation type="obsolete">Hostalari USB ataka iragazkia zehazten du <i>berdin zehatz</i> kate bat bezala. Kate huts batek edozein balio berdinduko du.</translation>
     </message>
     <message>
-        <source><p>Do you want to delete this hard disk's image file <nobr><b>%1</b>?</nobr></p><p>If you select <b>No</b> then the virtual hard disk will be unregistered and removed from the collection, but the image file will be left on your physical disk.</p><p>If you select <b>Yes</b> then the image file will be permanently deleted after unregistering the hard disk. This operation cannot be undone.< [...]
-        <translation type="obsolete"><p><nobr><b>%1</b></nobr> disko gogor irudi fitxategia ezabatu nahi duzu?</p><p><b>Ez</b> hautatzen baduzu disko gogor birtualaren erregistroa kendu eta bildumatik kenduko da, baina irudi fitxategia disko fisioan utziko da.</p><p><b>Bai</b> hautatzen baduzu fitxategi hau guztiz ezabatua izango da erregistroa kendu ondoren. Ekintza hau ezin da desegin.</p></translation>
+        <location line="+20"/>
+        <source>R&emote:</source>
+        <translation>&Hurrunekoa:</translation>
     </message>
     <message>
-        <source>Failed to delete the virtual hard disk image <b>%1</b>.</source>
-        <translation type="obsolete">Huts <b>%1</b> disko gogor irudi fitxategia ezabatzerakoan.</translation>
+        <source>&Action:</source>
+        <translation type="obsolete">&Ekintza:</translation>
     </message>
     <message>
-        <source><p>Do you want to remove (unregister) the virtual hard disk <nobr><b>%1</b>?</nobr></p></source>
-        <translation type="obsolete"><p><nobr><b>%1</b></nobr> disko gogor birtuala ezabatu (erregistroa kendu) nahi duzu?</p></translation>
+        <location line="-166"/>
+        <source>USB Filter Details</source>
+        <translation>USB Iragazki Xehetasunak</translation>
     </message>
+</context>
+<context>
+    <name>UIMachineWindow</name>
     <message>
-        <source>Failed to create the virtual hard disk image <nobr><b>%1</b>.</nobr></source>
-        <translation type="obsolete">Huts disko gogor birtual irudia sortzerakoan:<nobr><b>%1</b>.</nobr></translation>
+        <location filename="../src/runtime/UIMachineWindow.cpp" line="+251"/>
+        <source> EXPERIMENTAL build %1r%2 - %3</source>
+        <translation> ESPERIMENTALA eraiketa %1r%2 - %3</translation>
     </message>
+</context>
+<context>
+    <name>UIMachineWindowNormal</name>
     <message>
-        <source>Failed to attach a hard disk image with UUID %1 to the device slot %2 of the controller %3 of the machine <b>%4</b>.</source>
-        <translation type="obsolete">Huts UUID %1 duen disko gogor irudia <b>%4</b> makinaren %3 kontrolatzaileko %2 atakan eransterakoan.</translation>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+41"/>
+        <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>UIMediumManager</name>
     <message>
-        <source>Failed to detach a hard disk image from the device slot %1 of the controller %2 of the machine <b>%3</b>.</source>
-        <translation type="obsolete">Huts <b>%3</b> makinako %2 kontrolatzailearen %1 atakan dagoen irudi fitxategia kentzerakoan.</translation>
+        <source>&Hard drives</source>
+        <translation type="obsolete">Diska &gogorrak</translation>
     </message>
     <message>
-        <source>hard disk</source>
-        <translation type="obsolete">disko gogorra</translation>
+        <location filename="../src/medium/UIMediumManager.cpp" line="+383"/>
+        <source>Removing medium...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CD/DVD image</source>
-        <translation type="obsolete">CD/DVD irudia</translation>
+        <location line="+1405"/>
+        <source>&Hard disks</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>floppy image</source>
-        <translation type="obsolete">Diskete irudia</translation>
+        <location line="+1"/>
+        <source>&Optical disks</source>
+        <translation>Diska &optikoak</translation>
     </message>
     <message>
-        <source>Failed to register the %1 <nobr><b>%2</b></nobr>.</source>
-        <translation type="obsolete">Huts %1 <nobr><b>%2</b></nobr> erregistratzerakoan.</translation>
+        <location line="+1"/>
+        <source>&Floppy disks</source>
+        <translation>Diskete &diskak</translation>
     </message>
     <message>
-        <source>Failed to unregister the %1 <nobr><b>%2</b></nobr>.</source>
-        <translation type="obsolete">Huts %1 <nobr><b>%2</b></nobr> erregistroa kentzerakoan.</translation>
+        <source>&Select</source>
+        <translation type="obsolete">&Hautatu</translation>
     </message>
     <message>
-        <source>Failed to create a new session.</source>
-        <translation>Huts saio berria sortzean.</translation>
+        <source>C&lose</source>
+        <translation type="obsolete">It&xi</translation>
     </message>
+</context>
+<context>
+    <name>UIMediumTypeChangeDialog</name>
     <message>
-        <source>Failed to open a session for the virtual machine <b>%1</b>.</source>
-        <translation>Huts <b>%1</b> makina birtualarentzat saio bat irekitzean.</translation>
+        <location filename="../src/UIMediumTypeChangeDialog.cpp" line="+118"/>
+        <source>Modify medium attributes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to determine the accessibility state of the media <nobr><b>%1</b></nobr>. Some of the registered media may become inaccessible.</source>
-        <translation type="obsolete">Huts <nobr><b>%1</b></nobr> medioaren eskuragarritasun egoera egiaztatzerakoan. Erregistraturiko zenbait euskarri eskuraezin egon litezke.</translation>
+        <location line="+3"/>
+        <source><p>You are about to change the settings of the disk image file <b>%1</b>.</p><p>Please choose one of the following modes and press <b>%2</b> to proceed or <b>%3</b> otherwise.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to create the host network interface <b>%1</b>.</source>
-        <translation type="obsolete">Huts <b>%1</b> ostalari sare interfazea sortzerakoan.</translation>
+        <location line="+8"/>
+        <source>Choose mode:</source>
+        <translation>Hautatu modua:</translation>
     </message>
+</context>
+<context>
+    <name>UIMenuBarEditorWidget</name>
     <message>
-        <source>Failed to remove the host network interface <b>%1</b>.</source>
-        <translation>Huts <b>%1</b> ostalari sare interfazea kentzerakoan.</translation>
+        <location filename="../src/runtime/UIMenuBarEditorWindow.cpp" line="+570"/>
+        <source>Virtual Screen Resize</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the USB device <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation>Huts <b>%1</b> USB gailua <b>%2</b> makina birtualean eransterakoan.</translation>
+        <location line="+3"/>
+        <source>Virtual Screen Mapping</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the USB device <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation>Huts <b>%1</b> USB gailua <b>%2</b> makina birtualetik kentzerakoan.</translation>
+        <location line="+63"/>
+        <source>Switch</source>
+        <translation type="unfinished">Aldatu</translation>
     </message>
     <message>
-        <source>Failed to create the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) for the virtual machine <b>%3</b>.</source>
-        <translation>Huts <b>%1</b> partekatutako karpeta (<nobr><b>%2</b></nobr>-ra lotua) <b>%3</b> makina birtualean sortzerakoan.</translation>
+        <location line="+318"/>
+        <source>Close</source>
+        <translation type="unfinished">Itxi</translation>
     </message>
     <message>
-        <source>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</source>
-        <translation type="obsolete">Huts <b>%1</b> partekatutako karpeta (<nobr><b>%2</b></nobr>-ra lotua) <b>%3</b> makina birtualetik kentzerakoan.</translation>
+        <location line="+4"/>
+        <source>Enable Menu Bar</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>UIMessageCenter</name>
     <message>
-        <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source>
-        <translation><p>Makina Birtualak bezero SE-ak bideo modu honetan ez duela <b>sagu integrazioa</b> onartzen erreportatu du. Sagua kapturatu egin beharko duzu (MB leihoan klikatuaz edo ostalari tekla sakatuaz) sagua bezeroko sistema eragilean erabili ahal izateko.</p></translation>
+        <location filename="../src/globals/UIMessageCenter.cpp" line="-1467"/>
+        <location line="+2550"/>
+        <source>VirtualBox - Information</source>
+        <comment>msg box title</comment>
+        <translation>VirtualBox - Argibideak</translation>
     </message>
     <message>
-        <source><p>The Virtual Machine is currently in the <b>Paused</b> state and not able to see any keyboard or mouse input. If you want to continue to work inside the VM, you need to resume it by selecting the corresponding action from the menu bar.</p></source>
-        <translation><p>Makina Birtuala orain <b>Gelditurik</b> egoeran dago eta horregatik ez du sagu edo teklatu sarrerarik onartzen. MB barnean lanean jarraitu nahi izanez gero berau jarraitu behar duzu dagokion ekintza hautatuaz menu barratik.</p></translation>
+        <location line="-2546"/>
+        <location line="+2550"/>
+        <source>VirtualBox - Question</source>
+        <comment>msg box title</comment>
+        <translation>VirtualBox - Galdera</translation>
     </message>
     <message>
-        <source><p>One or more of the registered virtual hard disks, CD/DVD or floppy disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>OK</b> to open the Virtual Disk Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="obsolete"><p>Erregistraturik dauden disko gogor, CD/DVD edo diskete euskarriren bat ez dago eskuragarri. Honegatik, euskarri hori erabiltzen duen makina birtualik ezingo duzu erabili, berriz eskuragarri egon arte.</p><p><b>Ados</b> sakatu Disko Gogor Kudeatzailea ireki eta zein euskarri eskuragarri dauden ikusteko, edo <b>Baztertu</b> sakatu mezu hau albo batetara uzteko.</p></translation>
+        <location line="-2546"/>
+        <location line="+2550"/>
+        <source>VirtualBox - Warning</source>
+        <comment>msg box title</comment>
+        <translation>VirtualBox - Ohartarazpena</translation>
     </message>
     <message>
-        <source><p>Cannot run VirtualBox in <i>VM Selector</i> mode due to local restrictions.</p><p>The application will now terminate.</p></source>
-        <translation type="obsolete"><p>Murrizpen lokalak direla eta ezin da VirtualBox <i>MB hautatzaile</i> moduan abiarazi.</p><p>Aplikazioa itxi egingo da.</p></translation>
+        <location line="-2546"/>
+        <location line="+2550"/>
+        <source>VirtualBox - Error</source>
+        <comment>msg box title</comment>
+        <translation>VirtualBox - Akatsa</translation>
     </message>
     <message>
-        <source>Failed to open/interpret appliance <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <location line="-2546"/>
+        <location line="+2550"/>
+        <source>VirtualBox - Critical Error</source>
+        <comment>msg box title</comment>
+        <translation>VirtualBox - Akats Larria</translation>
     </message>
     <message>
-        <source>Failed to import appliance <b>%1</b>.</source>
+        <location line="-2409"/>
+        <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to prepare the export of the appliance <b>%1</b>.</source>
+        <location line="+101"/>
+        <source>Failed to set the global VirtualBox extra data for key <i>%1</i> to value <i>{%2}</i>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to export appliance <b>%1</b>.</source>
+        <location line="+8"/>
+        <source>Failed to set the extra data for key <i>%1</i> of machine <i>%2</i> to value <i>{%3}</i>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Fatal Error</nobr></source>
-        <comment>runtime error info</comment>
-        <translation><nobr>Errore Konponezina</nobr></translation>
+        <location line="+163"/>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Non-Fatal Error</nobr></source>
-        <comment>runtime error info</comment>
-        <translation><nobr>Errore Konpongarria</nobr></translation>
+        <location line="+146"/>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Warning</nobr></source>
-        <comment>runtime error info</comment>
-        <translation><nobr>Abisua</nobr></translation>
+        <location line="+15"/>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Error ID: </nobr></source>
-        <comment>runtime error info</comment>
-        <translation><nobr>Errore ID-a: </nobr></translation>
+        <location line="+62"/>
+        <source>Failed to save the settings.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Severity: </source>
-        <comment>runtime error info</comment>
-        <translation>Larritasuna: </translation>
+        <location line="+7"/>
+        <source><p>Do you want to remove the NAT network <nobr><b>%1</b>?</nobr></p><p>If this network is in use by one or more virtual machine network adapters these adapters will no longer be usable until you correct their settings by either choosing a different network name or a different adapter attachment type.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A fatal error has occurred during virtual machine execution! The virtual machine will be powered off. Please copy the following error message using the clipboard to help diagnose the problem:</p></source>
-        <translation><p>Errore konponezin bat gertatu da makina birtuala exekutatzean! Makina birtuala itzali egingo da. Hurrengo errore mezua beranduago begiratzeko kopiatzeko arbela erabiltzea gomendatzen da:</p></translation>
+        <location line="+30"/>
+        <source>Failed to create NAT network.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>An error has occurred during virtual machine execution! The error details are shown below. You may try to correct the error and resume the virtual machine execution.</p></source>
-        <translation><p>Errore bat gertatu da makina birtuala exekutatzean! Errore xehetasunak behean ikusten dira. Azaldutako errorea konpondu eta makina birtual exekuzioa jarraitzen saiatu zaitezke.</p></translation>
+        <location line="+7"/>
+        <source>Failed to remove NAT network <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine execution may run into an error condition as described below. We suggest that you take an appropriate action to avert the error.</p></source>
-        <translation><p>Makina Birtual exekuzioak behean azaltzen den bezala errore egoera batetan jarraitu dezake. Mezu hau albo batetara utzi dezakezu, baina azaldutako errorea berriz ez gertatzeko egin beharrekoa egitea gomendatzen da.</p></translation>
+        <location line="+8"/>
+        <source>Failed to create DHCP server.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result&nbsp;Code: </source>
-        <comment>error info</comment>
-        <translation>Emaitza&nbsp;Kodea: </translation>
+        <location line="+7"/>
+        <source>Failed to remove DHCP server for network interface <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Component: </source>
-        <comment>error info</comment>
-        <translation>Osagaia: </translation>
+        <location line="+8"/>
+        <location line="+7"/>
+        <source>Failed to create the host network interface.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Interface: </source>
-        <comment>error info</comment>
-        <translation>Interfazea: </translation>
+        <location line="+73"/>
+        <source>Create &new disk</source>
+        <translation type="unfinished">&Sortu diska berria</translation>
     </message>
     <message>
-        <source>Callee: </source>
-        <comment>error info</comment>
-        <translation>Deitura: </translation>
+        <location line="+0"/>
+        <source>&Choose existing disk</source>
+        <translation type="unfinished">&Hautatu badagoen diska</translation>
     </message>
     <message>
-        <source>Callee&nbsp;RC: </source>
-        <comment>error info</comment>
-        <translation>Deitura eta RC: </translation>
+        <location line="+6"/>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="obsolete"><p>Ezin da <b><nobr>%1</nobr></b> hizkuntza fitxategia kargatu.<p>Hizkuntza aldiroko Ingelesera (barneratua) berrezarriko da. Mesedez joan VirtualBox leiho nagusiko <b>Fitxategia</b> menuan aurki dezakezun <b>Hobespenak</b> leihora eta hautatu erabilgarri daudenetako bat <b>Hizkuntza</b> orrialdean.</p></translation>
+        <location line="+5"/>
+        <location line="+11"/>
+        <source>Leave &empty</source>
+        <translation type="unfinished">Utzi &hutsik</translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
-        <translation type="obsolete"><p>Bezero sistema eragilea instalaturik dauden Virtualbox Bezero Gehigarriak zaharregiak dira: Instalaturiko bertsioa %1 da eta espero zena %2. Bezero gehigarriak behar dituzten zenbait funtziok (sagu integrazioa, bezero pantaila auto tamaina aldaketa) behar bezala funtzionatzeaz utziko dute ziurrenik.</p><p>Mesedez eguneratu Bezero Gehigarriak gaur egungo bertsiora <b>Gailuak</b> menuko <b>Bezero Gehigarriak</b& [...]
+        <location line="-11"/>
+        <location line="+11"/>
+        <source>&Choose disk</source>
+        <translation type="unfinished">&Hautatu diska</translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
-        <translation type="obsolete"><p>Bezero sistema eragilea instalaturik dauden Virtualbox Bezero Gehigarriak zaharkiturik daude: Instalaturiko bertsioa %1 da eta espero zena %2. Bezero gehigarriak behar dituzten zenbait funtziok (sagu integrazioa, bezero pantaila auto tamaina aldaketa) behar bezala funtzionatzeaz utziko dute ziurrenik.</p><p>Mesedez eguneratu Bezero Gehigarriak gaur egungo bertsiora <b>Gailuak</b> menuko <b>Bezero Gehigarriak Inst [...]
+        <location line="+127"/>
+        <source><p>Error changing disk image mode from <b>%1</b> to <b>%2</b>.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
-        <translation type="obsolete"><p>Bezero sistema eragilea instalaturik dauden Virtualbox Bezero Gehigarriak berriegiak dira: Instalaturik dagoen bertsioa %1 da eta espero zena %2</p><p>Gehigarrien Virtualbox baino bertsio berriago bat erabiltzea ez da onartzen. Mesedez instalatu egungo Bezero Gehigarriak <b>Gailuak</b> menuko <b>Bezero Gehigarriak Instalatu </b>hautatuaz.</p></translation>
+        <location line="+34"/>
+        <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to change the snapshot folder path of the virtual machine <b>%1<b> to <nobr><b>%2</b></nobr>.</source>
-        <translation type="obsolete">Huts <b>%1<b> makina birtualaren egoera-argazki bidea <nobr> <b>%2</b></nobr>-ra aldatzean.</translation>
+        <location line="+12"/>
+        <source><p>As this hard disk is inaccessible its image file can not be deleted.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not enter seamless mode due to insufficient guest video memory.</p><p>You should configure the VM to have at least <b>%1</b> of video memory.</p></source>
-        <translation type="obsolete"><p>Ezin da integratu garden moduan sartu bezero bideo memoria askieza dela eta.</p><p>Makina birtuala behintzat <b>%1</b> bideo memoria edukitzeko konfiguratu beharko zenuke.</p></translation>
+        <location line="+7"/>
+        <source><p>Are you sure you want to remove the virtual optical disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</p><p>Please close all programs in the guest OS that may be using this shared folder and try again.</p></source>
-        <translation><p>Huts <b>%1</b> partekatutako kapeta (<nobr><b>%2</b></nobr>-ra lotua dagoena) <b>%3</b> makina birtualetik ezabatzerakoan.</p> <p>Mesedez itxi partekatutako karpeta hori erabiltzen ari diren sistema eragileko aplikazioak eta berriz saiatu.</p></translation>
+        <location line="+8"/>
+        <source><p>Are you sure you want to remove the virtual floppy disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not find the VirtualBox Guest Additions disk image file file <nobr><b>%1</b></nobr> or <nobr><b>%2</b>.</nobr></p><p>Do you wish to download this disk image file from the Internet?</p></source>
-        <translation type="obsolete"><p>Ez da <nobr><b>%1</b></nobr> edo <nobr><b>%2</b></nobr> VirtualBox Bezero Gehigarri irudia aurkitu.</p><p>Irudi hau internetetik deskargatu nahi al duzu?</p></translation>
+        <location line="+91"/>
+        <source><p>Unable to insert the virtual optical disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Failed to download the VirtualBox Guest Additions disk image file from <nobr><a href="%1">%2</a>.</nobr></p><p>%3</p></source>
-        <translation type="obsolete"><p>Huts Virtualbox Bezero Gehigarri CD irudia <nobr><a href="%1">%2</a>-etik deskargatzean.</nobr></p><p>%3</p></translation>
+        <location line="+2"/>
+        <location line="+16"/>
+        <source><p>Would you like to try to force insertion of this disk?</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to download the VirtualBox Guest Additions disk image file from <nobr><a href="%1">%2</a></nobr> (size %3 bytes)?</p></source>
-        <translation type="obsolete"><p>Ziur zaude VirtualBox Bezero Gehigarrien CD irudia <nobr><a href="%1">%2</a>-etik deskargatu nahi duzula </nobr> (tamaina %3 byte)?</p></translation>
+        <location line="-12"/>
+        <source><p>Unable to eject the virtual optical disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions disk image file has been successfully downloaded from <nobr><a href="%1">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual CD/DVD drive?</p></source>
-        <translation type="obsolete"><p>VirtualBox Bezero Gehigarri CD irudia behar bezala deskargatu da <nobr><a href="%1">%2</a></nobr> -etik eta <nobr><b>%3</b>bezala gorde da.</nobr></p> <p>CD irudi hori erregistratu eta CD/DVD birtualean kargatu nahi al duzu?</p></translation>
+        <location line="+2"/>
+        <location line="+16"/>
+        <source><p>Would you like to try to force ejection of this disk?</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%1</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="obsolete"><p>Makina Birtuala orain <b>pantaila oso</b> modura aldatuko da. Atzera leihoturiko modura itzuli zaitezke edozein momentutan <b>%1</b> sakatuaz. Kontutan izan <i>Ostalari</i> tekla une honetan <b>%2</b> bezala ezarririk dagoela.</p><p> Kontutan izan menu-barra ezkutaturik dagoela pantaila osoko moduan. Bera eskuratzeko aski da <b>Osta+Etxea</b>sakatzearekin.</p></tran [...]
+        <location line="-8"/>
+        <source><p>Unable to insert the virtual floppy disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>Seamless</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%1</b>.</p><p>Note that the main menu bar is hidden in seamless mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="obsolete"><p>Makina Birtuala orain <b>integrazio garden</b> modura aldatuko da. Atzera leihoturiko modura itzuli zaitezke edozein momentutan <b>%1</b> sakatuaz. Kontutan izan <i>Ostalari</i> tekla une honetan <b>%2</b> bezala ezarririk dagoela.</p><p> Kontutan izan menu-barra ezkutaturik dagoela pantaila osoko moduan. Bera eskuratzeko aski da <b>Osta+Etxea</b>sakatzearekin.</p>< [...]
+        <location line="+6"/>
+        <source><p>Unable to eject the virtual floppy disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
+        <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><p>The virtual machine window is optimized to work in <b>%1&nbsp;bit</b> color mode but the virtual display is currently set to <b>%2&nbsp;bit</b>.</p><p>Please open the display properties dialog of the guest OS and select a <b>%3&nbsp;bit</b> color mode, if it is available, for best possible performance of the virtual video subsystem.</p><p><b>Note</b>. Some operating systems, like  [...]
-        <translation type="obsolete"><p>Makina birtualaren leihoa <b>%1&nbsp;bit</b> kolore moduan funtzionatzeko garatua izan da baina pantaila birtualaren kalitatea <b>%2&nbsp;bitera</b> ezarririk dago.</p><p>Mesedez ireki bezero sistema eragileko pantaila propietateak eta hautatu <b>%3&nbsp;bit</b> duen modu bat, erabilgarri badago, bideo birtual azpisistemak ahal den hobekien funtzionatzeko.</p><p><b> [...]
+    <message numerus="yes">
+        <location line="+181"/>
+        <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source><p>You didn't attach a hard disk to the new virtual machine. The machine will not be able to boot unless you attach a hard disk with a guest operating system or some other bootable media to it later using the machine settings window or the First Run Wizard.</p><p>Do you wish to continue?</p></source>
-        <translation type="obsolete"><p>Ez duzu disko gogor birtualik erantsi makina birtual honetara. Makina ez da abiarazteko gai izango sistema eragile duen disko gogor bat edo beste euskarri abiarazgarri baten bat erantsi arte, berau beranduago egiteko ezarpen leiho edo Lehen Abiarazte Morroiaren bidez egin dezakezu.</p><p>Aurrera jarraitu nahi al duzu?</p></translation>
+        <location line="+284"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <source>Switch</source>
+        <translation type="unfinished">Aldatu</translation>
     </message>
     <message>
-        <source>Failed to open the license file <nobr><b>%1</b></nobr>. Check file permissions.</source>
+        <location line="-7"/>
+        <source><p>The virtual machine window will be now switched to <b>Scale</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in scaled mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to send the ACPI Power Button press event to the virtual machine <b>%1</b>.</source>
+        <location line="+87"/>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Failed to load the global GUI configuration from <b><nobr>%1</nobr></b>.</p><p>The application will now terminate.</p></source>
+        <location line="+8"/>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Failed to save the global GUI configuration to <b><nobr>%1</nobr></b>.</p><p>The application will now terminate.</p></source>
+        <location line="+20"/>
+        <source>Failed to enable the remote desktop server for the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings of the virtual machine <b>%1</b> to <b><nobr>%2</nobr></b>.</source>
+        <location line="+1"/>
+        <source>Failed to disable the remote desktop server for the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
-        <comment>machine</comment>
-        <translation type="obsolete">Ezabatu</translation>
-    </message>
-    <message>
-        <source>Discard</source>
-        <comment>saved state</comment>
-        <translation type="unfinished">Baztertu</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <comment>hard disk</comment>
-        <translation type="obsolete">Ezabatu</translation>
-    </message>
-    <message>
-        <source>Disable</source>
-        <comment>hard disk</comment>
-        <translation type="obsolete">Ezgaitu</translation>
-    </message>
-    <message>
-        <source><p>The host key is currently defined as <b>%1</b>.</p></source>
-        <comment>additional message box paragraph</comment>
+        <location line="-10"/>
+        <source>Failed to enable video capturing for the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Capture</source>
-        <comment>do input capture</comment>
+        <location line="+1"/>
+        <source>Failed to disable video capturing for the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check</source>
-        <comment>inaccessible media message box</comment>
+        <location line="+25"/>
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save</source>
-        <comment>warnAboutAutoConvertedSettings message box</comment>
-        <translation type="obsolete">&Gorde</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <comment>warnAboutAutoConvertedSettings message box</comment>
-        <translation type="obsolete">Utzi</translation>
+        <location line="+58"/>
+        <source><p>Could not find the <b>VirtualBox Guest Additions</b> disk image file.</p><p>Do you wish to download this disk image file from the Internet?</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reset</source>
-        <comment>machine</comment>
-        <translation type="unfinished">Berrezarri</translation>
+        <location line="+3"/>
+        <location line="+10"/>
+        <location line="+40"/>
+        <location line="+10"/>
+        <location line="+29"/>
+        <location line="+10"/>
+        <source>Download</source>
+        <translation type="unfinished">Jeitsi</translation>
     </message>
     <message>
-        <source>Continue</source>
-        <comment>no hard disk attached</comment>
+        <location line="-93"/>
+        <source><p>Are you sure you want to download the <b>VirtualBox Guest Additions</b> disk image file from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Go Back</source>
-        <comment>no hard disk attached</comment>
+        <location line="+10"/>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
-        <comment>hard disk</comment>
-        <translation type="obsolete">Hautatu</translation>
+        <location line="+16"/>
+        <source>Insert</source>
+        <comment>additions</comment>
+        <translation>Txertatu</translation>
     </message>
     <message>
-        <source><p>Could not enter seamless mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p></source>
+        <location line="+6"/>
+        <source>Failed to update Guest Additions. The Guest Additions disk image file will be inserted for user installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting this host-only network will remove the host-only interface this network is based on. Do you want to remove the (host-only network) interface <nobr><b>%1</b>?</nobr></p><p><b>Note:</b> this interface may be in use by one or more virtual network adapters belonging to one of your VMs. After it is removed, these adapters will no longer be usable until you correct their settings by either choosing a different in [...]
+        <location line="+8"/>
+        <source><p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are already running the most recent version of VirtualBox.</source>
+        <location line="+10"/>
+        <source><p>Are you sure you want to download the <b>VirtualBox User Manual</b> from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at  [...]
-        <translation type="unfinished"><p>Zuk Makina Birtualaren pantailan <b>sagu botoia</b> edo <b>ostalari tekla</b> sakatu duzu. Honek makina birtualak ostalariaren sagu markatzailea (bakarrik sagu markatzaile integrazioa ez badu SE bezeroak onartzen) eta teklatua <b>kapturatzea</b> eragingo du, honekin agian ez dira erabilgarri izango ostalari makinan abiarazirik dauden aplikazio batzuekin .</p><p><b>Ostalari tekla</b&gt [...]
+        <location line="+10"/>
+        <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
+        <translation type="unfinished"><p>VirtualBox Erabiltzaile Eskuliburua ongi jeitsi da hemendik, <nobr><a href="%1">%2</a></nobr>baina ezin da tokian gorde honela <nobr><b>%3</b>.</nobr></p><p>Mesedez hautatu beste kokaleku bat agiriarentzat.</p> {1"?} {1<?} {2<?}</translation>
     </message>
     <message>
-        <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time t [...]
-        <translation type="unfinished"></translation>
+        <location line="+10"/>
+        <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p></source>
+        <translation type="unfinished"><p>VirtualBox Erabiltzaile Eskuliburua ongi jeitsi da hemendik, <nobr><a href="%1">%2</a></nobr> eta tokian gorde da honela <nobr><b>%3</b>.</nobr></p> {1"?} {1<?} {2<?}</translation>
     </message>
     <message>
-        <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the s [...]
-        <translation type="unfinished"></translation>
+        <location line="+710"/>
+        <source>Do not show this message again</source>
+        <comment>msg box flag</comment>
+        <translation>Ez erakutsi mezu hau berriro</translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="obsolete"><p>Makina Birtuala orain <b>pantaila oso</b> modura aldatuko da. Atzera leihoturiko modura itzuli zaitezke edozein momentutan <b>%1</b> sakatuaz. Kontutan izan <i>Ostalari</i> tekla une honetan <b>%2</b> bezala ezarririk dagoela.</p><p> Kontutan izan menu-barra ezkutaturik dagoela pantaila osoko moduan. Bera eskuratzeko aski da <b>Osta+Etxea</b>sakatzearekin.</p> {1&lt [...]
+        <location line="-2335"/>
+        <source>Failed to open <tt>%1</tt>. Make sure your desktop environment can properly handle URLs of this type.</source>
+        <translation>Hutsegitea <tt>%1</tt> irekitzerakoan. Zihurtatu zure mahaigin inguruak mota honetako URL-ak egoki kudeatu ditzakeela.</translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>Seamless</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in seamless mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="obsolete"><p>Makina Birtuala orain <b>integrazio garden</b> modura aldatuko da. Atzera leihoturiko modura itzuli zaitezke edozein momentutan <b>%1</b> sakatuaz. Kontutan izan <i>Ostalari</i> tekla une honetan <b>%2</b> bezala ezarririk dagoela.</p><p> Kontutan izan menu-barra ezkutaturik dagoela pantaila osoko moduan. Bera eskuratzeko aski da <b>Osta+Etxea</b>sakatzearekin.</p>  [...]
+        <location line="-102"/>
+        <source><p>Failed to initialize COM or to find the VirtualBox COM server. Most likely, the VirtualBox server is not running or failed to start.</p><p>The application will now terminate.</p></source>
+        <translation><p>Hutsegitea COM abiaraztean edo VirtualBox COM zerbitzaria aurkitzerakoan. Zihurrenik VirtualBox zerbitzaria ez dago ekinean edo huts egin du abiatzean.</p><p>Orain aplikazioak amaitu egingo du.</p></translation>
     </message>
     <message>
-        <source>&Contents...</source>
-        <translation type="obsolete">&Edukiak...</translation>
+        <source><p>Failed to create the VirtualBox COM object.</p><p>The application will now terminate.</p></source>
+        <translation type="obsolete"><p>Hutsegitea VirtualBox COM objetua sortzerakoan.</p><p>Orain aplikazioak amaitu egingo du.</p></translation>
     </message>
     <message>
-        <source>Show the online help contents</source>
-        <translation type="obsolete">Sare bidezko laguntza edukia bistarazi</translation>
+        <location line="+601"/>
+        <source>Failed to set global VirtualBox properties.</source>
+        <translation>Hutsegitea VirtualBox ezaugarri orokorrak ezartzerakoan.</translation>
     </message>
     <message>
-        <source>&VirtualBox Web Site...</source>
-        <translation type="obsolete">&VirtualBox Web Gunea...</translation>
+        <location line="+14"/>
+        <source>Failed to access the USB subsystem.</source>
+        <translation>Hutsegitea USB azpisistemara sartzerakoan.</translation>
     </message>
     <message>
-        <source>Open the browser and go to the VirtualBox product web site</source>
-        <translation type="obsolete">Nabigatzailea ireki eta VirtualBox produktuaren gunera joan</translation>
+        <location line="+410"/>
+        <source>Failed to create a new virtual machine.</source>
+        <translation>Hutsegitea makina birtual berri bat sortzerakoan.</translation>
     </message>
     <message>
-        <source>&Reset All Warnings</source>
-        <translation type="obsolete">Abisu Guztiak Be&rrezarri</translation>
+        <source>Failed to create a new virtual machine <b>%1</b>.</source>
+        <translation type="obsolete">Hutsegitea makina birtual berri bat sortzerakoan. <b>%1</b>.</translation>
     </message>
     <message>
-        <source>Go back to showing all suppressed warnings and messages</source>
-        <translation type="obsolete">Ezabatutako abisu eta mezu guztiak berriz agertzea eragien du</translation>
+        <source>Failed to apply the settings to the virtual machine <b>%1</b>.</source>
+        <translation type="obsolete">Hutsegitea <b>%1</b> makina birtualari ezarpenak ezartzerakoan.</translation>
     </message>
     <message>
-        <source>The following files already exist:<br /><br />%1<br /><br />Are you sure you want to replace them? Replacing them will overwrite their contents.</source>
-        <translation type="unfinished"></translation>
+        <location line="+366"/>
+        <location line="+8"/>
+        <source>Failed to start the virtual machine <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtuala abiarazterakoan.</translation>
     </message>
     <message>
-        <source>You are running a prerelease version of VirtualBox. This version is not suitable for production use.</source>
-        <translation type="unfinished"></translation>
+        <location line="-1061"/>
+        <source>Failed to pause the execution of the virtual machine <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtualaren exekuzioa pausatzerakoan.</translation>
     </message>
     <message>
-        <source>You are trying to shut down the guest with the ACPI power button. This is currently not possible because the guest does not support software shutdown.</source>
-        <translation type="unfinished"></translation>
+        <location line="+8"/>
+        <source>Failed to resume the execution of the virtual machine <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtualaren exekuzioa berrekiterakoan.</translation>
     </message>
     <message>
-        <source><p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</p><p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+8"/>
+        <source>Failed to save the state of the virtual machine <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtualaren egoera gordetzerakoan.</translation>
     </message>
     <message>
-        <source>Close VM</source>
-        <translation type="unfinished"></translation>
+        <location line="+84"/>
+        <location line="+8"/>
+        <source>Failed to create a snapshot of the virtual machine <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtualaren argazki bat sortzerakoan.</translation>
     </message>
     <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <location line="-76"/>
+        <location line="+8"/>
+        <source>Failed to stop the virtual machine <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtuala gelditzerakoan.</translation>
     </message>
     <message>
-        <source>Discard</source>
-        <translation type="obsolete">Baztertu</translation>
+        <location line="-129"/>
+        <location line="+8"/>
+        <source>Failed to remove the virtual machine <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtuala kentzerakoan.</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Utzi</translation>
+        <location line="+81"/>
+        <source>Failed to discard the saved state of the virtual machine <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtualaren gordetako egoera baztertzerakoan.</translation>
     </message>
     <message>
-        <source>Release</source>
-        <comment>detach medium</comment>
-        <translation type="unfinished">Atera</translation>
+        <location line="-299"/>
+        <source>There is no virtual machine named <b>%1</b>.</source>
+        <translation>Ez dago <b>%1</b> izena duen makina birtualik.</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <comment>medium</comment>
-        <translation type="unfinished">Kendu</translation>
+        <location line="+16"/>
+        <source>Failed to create a new session.</source>
+        <translation>Hutsegitea saio berri bat sortzerakoan.</translation>
     </message>
     <message>
-        <source><p>The hard disk storage unit at location <b>%1</b> already exists. You cannot create a new virtual hard disk that uses this location because it can be already used by another virtual hard disk.</p><p>Please specify a different location.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <location line="+8"/>
+        <source>Failed to open a session for the virtual machine <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtualerako saio bat irekitzerakoan.</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <comment>hard disk storage</comment>
-        <translation type="unfinished">Ezabatu</translation>
+        <location line="+499"/>
+        <location line="+8"/>
+        <source>Failed to remove the host network interface <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> hostalari sare interfazea kentzerakoan.</translation>
     </message>
     <message>
-        <source>Keep</source>
-        <comment>hard disk storage</comment>
+        <location line="+86"/>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to delete the storage unit of the hard disk <b>%1</b>.</source>
+        <location line="+22"/>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to create the hard disk storage <nobr><b>%1</b>.</nobr></source>
+        <location line="+6"/>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to access the disk image file <nobr><b>%1</b></nobr>.</source>
+        <location line="+22"/>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to remove the selected host network interface <nobr><b>%1</b>?</nobr></p><p><b>Note:</b> This interface may be in use by one or more network adapters of this or another VM. After it is removed, these adapters will no longer work until you correct their settings by either choosing a different interface name or a different adapter attachment type.</p></source>
-        <translation type="obsolete"><p>Hautaturiko <nobr><b>%1</b></nobr> sare interfazea ezabatu nahi al duzu? </p><p><b>Oharra:</b> Interfaze hau erabilia egon daiteke sare moldagailu bat edo gehiagorengatik beste MB batetan. Ezabatu ondoren sare moldagailu horiek ez dute funtzionatuko ezarpen horiek aldatu arte  edo beste interfaze izen bat hautatuz o moldagailu eranste modu ezberdin bat hautatuaz.</p></translation>
-    </message>
-    <message>
-        <source>E&xit</source>
-        <comment>warnAboutAutoConvertedSettings message box</comment>
-        <translation type="obsolete">I&rten</translation>
-    </message>
-    <message>
-        <source>hard disk</source>
-        <comment>failed to close ...</comment>
-        <translation type="obsolete">disko gogorra</translation>
+        <location line="+8"/>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CD/DVD image</source>
-        <comment>failed to close ...</comment>
-        <translation type="obsolete">CD/DVD irudia</translation>
+        <location line="+82"/>
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>floppy image</source>
-        <comment>failed to close ...</comment>
-        <translation type="obsolete">Diskete irudia</translation>
+        <location line="+61"/>
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A file named <b>%1</b> already exists. Are you sure you want to replace it?<br /><br />Replacing it will overwrite its contents.</source>
+        <location line="+45"/>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Certain guests (e.g. OS/2 and QNX) require this feature.</p><p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p></source>
+        <location line="+6"/>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to check files.</source>
+        <location line="+69"/>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to remove file.</source>
+        <location line="+7"/>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You seem to have the USBFS filesystem mounted at /sys/bus/usb/drivers. We strongly recommend that you change this, as it is a severe mis-configuration of your system which could cause USB devices to fail in unexpected ways.</source>
+        <location line="+6"/>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are running an EXPERIMENTAL build of VirtualBox. This version is not suitable for production use.</source>
+        <location line="+188"/>
+        <location line="+409"/>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restore</source>
+        <location line="-284"/>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="unfinished">Ezabatu</translation>
+        <location line="+106"/>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to restore the snapshot <b>%1</b> of the virtual machine <b>%2</b>.</source>
+        <location line="+39"/>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to delete the snapshot <b>%1</b> of the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <location line="+42"/>
+        <location line="+8"/>
+        <source>Failed to attach the USB device <b>%1</b> to the virtual machine <b>%2</b>.</source>
+        <translation>Hutsegitea <b>%1</b> USB gailua <b>%2</b>makina birtualera eransterakoan.</translation>
     </message>
     <message>
-        <source>&Select</source>
-        <comment>medium</comment>
-        <translation type="obsolete">&Hautatu</translation>
+        <location line="+8"/>
+        <location line="+8"/>
+        <source>Failed to detach the USB device <b>%1</b> from the virtual machine <b>%2</b>.</source>
+        <translation>Hutsegitea <b>%1</b> USB gailua <b>%2</b>makina birtualetik deseransterakoan.</translation>
     </message>
     <message>
-        <source>Force Unmount</source>
-        <translation type="unfinished"></translation>
+        <location line="-785"/>
+        <location line="+9"/>
+        <source>Failed to create the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) for the virtual machine <b>%3</b>.</source>
+        <translation>Hutsegitea <b>%1</b> agiritegi elkarbanatua sortzerakoan (zuzentzen <nobr><b>%2</b></nobr>-ra) <b>%3</b> makina birtualerako.</translation>
     </message>
     <message>
-        <source>E&xit</source>
-        <comment>warnAboutSettingsAutoConversion message box</comment>
-        <translation type="obsolete">I&rten</translation>
+        <source>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</source>
+        <translation type="obsolete">Hutsegitea <b>%1</b> agiritegi elkarbanatua kentzerakoan (zuzentzen <nobr><b>%2</b></nobr>-ra) <b>%3</b> makina birtualerako.</translation>
     </message>
     <message>
-        <source>hard disk</source>
-        <comment>failed to mount ...</comment>
-        <translation type="obsolete">disko gogorra</translation>
+        <location filename="../src/globals/UIPopupCenter.cpp" line="+201"/>
+        <source>Close</source>
+        <translation type="unfinished">Itxi</translation>
     </message>
     <message>
-        <source>CD/DVD image</source>
-        <comment>failed to mount ...</comment>
-        <translation type="obsolete">CD/DVD irudia</translation>
+        <location line="+45"/>
+        <source>Ok</source>
+        <translation type="unfinished">Ongi</translation>
     </message>
     <message>
-        <source>floppy image</source>
-        <comment>failed to mount ...</comment>
-        <translation type="obsolete">Diskete irudia</translation>
+        <location line="+213"/>
+        <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>hard disk</source>
-        <comment>failed to attach ...</comment>
-        <translation type="obsolete">disko gogorra</translation>
+        <location line="+10"/>
+        <source><p>The Virtual Machine is currently in the <b>Paused</b> state and not able to see any keyboard or mouse input. If you want to continue to work inside the VM, you need to resume it by selecting the corresponding action from the menu bar.</p></source>
+        <translation><p>Makina Birtuala une honetan <b>Pausatuta</b> egoeran dago eta ez da gai teklatu edo sagurik ikusteko. Makina Birtualarekin lanean jarraitzea nahi baduzu, hau berrekin behar duzu dagokion ekintza hautatuz menu barratik.</p></translation>
     </message>
     <message>
-        <source>&Remove</source>
-        <comment>medium</comment>
+        <location line="+14"/>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>VT-x/AMD-V hardware acceleration is not available on your system. Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</source>
-        <translation type="unfinished"></translation>
+        <source><p>Cannot run VirtualBox in <i>VM Selector</i> mode due to local restrictions.</p><p>The application will now terminate.</p></source>
+        <translation type="obsolete"><p>Ezin da VirtualBox<i>MB Hautatzailea</i>n moduan ekin tokiko murrizpenengaitik.</p><p>Orain aplikazioa amaitu egingo da.</p></translation>
     </message>
     <message>
-        <source><p>VT-x/AMD-V hardware acceleration is not available on your system. Certain guests (e.g. OS/2 and QNX) require this feature and will fail to boot without it.</p></source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/globals/UIMessageCenter.cpp" line="+469"/>
+        <source><nobr>Fatal Error</nobr></source>
+        <comment>runtime error info</comment>
+        <translation><nobr>Akats Larria</nobr></translation>
     </message>
     <message>
-        <source><p>Could not change the guest screen to this host screen due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+6"/>
+        <source><nobr>Non-Fatal Error</nobr></source>
+        <comment>runtime error info</comment>
+        <translation><nobr>Akats Ez Larria</nobr></translation>
     </message>
     <message>
-        <source><p>Could not change the guest screen to this host screen due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch the screen anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+6"/>
+        <source><nobr>Warning</nobr></source>
+        <comment>runtime error info</comment>
+        <translation><nobr>Kontuz</nobr></translation>
     </message>
     <message>
-        <source>Failed to open virtual machine located in %1.</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <source><nobr>Error ID: </nobr></source>
+        <comment>runtime error info</comment>
+        <translation><nobr>Akats ID-a:</nobr></translation>
     </message>
     <message>
-        <source>Failed to add virtual machine <b>%1</b> located in <i>%2</i> because its already present.</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Severity: </source>
+        <comment>runtime error info</comment>
+        <translation>Larritasuna: </translation>
     </message>
     <message>
-        <source>Delete all files</source>
-        <translation type="unfinished"></translation>
+        <location line="+8"/>
+        <source><p>A fatal error has occurred during virtual machine execution! The virtual machine will be powered off. Please copy the following error message using the clipboard to help diagnose the problem:</p></source>
+        <translation><p>Akats larri bat gertatu da makin birtuala exekutatzerakoan! Makina birtuala itzali egingo da. Mesedez kopiatu hurrengo akats mezua gakoa erabiliz arazoa aurkitzen laguntzeko:</p></translation>
     </message>
     <message>
-        <source>Remove only</source>
-        <translation type="unfinished"></translation>
+        <location line="+8"/>
+        <source><p>An error has occurred during virtual machine execution! The error details are shown below. You may try to correct the error and resume the virtual machine execution.</p></source>
+        <translation><p>Akats bat gertatu da makina birtualaren exekuzioan! Akatsaren xehetasunak behean erakusten dira. Akatsa zuzentzen eta makina birtualaren exekuzioa berrekiten saiatu zaitezke.</p></translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation type="unfinished">Kendu</translation>
+        <location line="+8"/>
+        <source><p>The virtual machine execution may run into an error condition as described below. We suggest that you take an appropriate action to avert the error.</p></source>
+        <translation><p>Makina birtualaren exekuzioa akats baldintza batean exekutatu daiteke behean azaldu bezala. Akatsa saihesteko ekintza egokia burutzea gomendatzen dugu.</p></translation>
     </message>
     <message>
-        <source><p>You are about to add a virtual hard disk to controller <b>%1</b>.</p><p>Would you like to create a new, empty file to hold the disk contents or select an existing one?</p></source>
+        <location line="+299"/>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new floppy drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual floppy disk to put in the drive or to leave it empty for now?</p></source>
+        <location line="+1"/>
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the hard disk (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <location line="+18"/>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to update Guest Additions. The Guest Additions disk image file will be inserted for user installation.</source>
+        <location line="+76"/>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to install the Extension Pack <b>%1</b>.</source>
+        <location line="+242"/>
+        <location line="+7"/>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to uninstall the Extension Pack <b>%1</b>.</source>
+        <location line="+7"/>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Remove</source>
+        <location line="+7"/>
+        <location line="+7"/>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. None of the host or guest port values may be set to zero.</source>
-        <translation type="unfinished"></translation>
+        <location line="+152"/>
+        <location line="+221"/>
+        <source>Result&nbsp;Code: </source>
+        <comment>error info</comment>
+        <translation>Emaitz&nbsp;Kodea: </translation>
     </message>
     <message>
-        <source><p>There are unsaved changes in the port forwarding configuration.</p><p>If you proceed your changes will be discarded.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+6"/>
+        <source>Component: </source>
+        <comment>error info</comment>
+        <translation>Osagaia: </translation>
     </message>
     <message>
-        <source>Failed to attach the hard disk (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="unfinished"></translation>
+        <location line="+8"/>
+        <source>Interface: </source>
+        <comment>error info</comment>
+        <translation>Interfazea: </translation>
     </message>
     <message>
-        <source><p>Note that the storage unit of this medium will not be deleted and that it will be possible to use it later again.</p></source>
+        <location line="+9"/>
+        <source>Callee: </source>
+        <comment>error info</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>Seamless</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in seamless mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <location line="+8"/>
+        <source>Callee&nbsp;RC: </source>
+        <comment>error info</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>Scale</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in scaled mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> dialog which you can open from the <b>File</b> menu of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p></source>
+        <translation type="obsolete"><p>Ezin da <b>%1</b> hizkuntzarako hizkuntza agiria aurkitu <b><nobr>%2</nobr></b> zuzenbidean.</p><p>Hizkuntza aldibaterako Ingeleran (barne-eraikita) berrezarriko da. Mesedez joan <b>Hobespenak</b> elkarrizketara VirtualBox leihoko <b>Agiria</b> menutik ireki dezakezuna, eta hautatu <b>Hizkuntza</b> orrialdean dauden hizkuntzetako bat.</p></translation>
     </message>
     <message>
-        <source>Failed to open the Extension Pack <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> dialog which you can open from the <b>File</b> menu of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p></source>
+        <translation type="obsolete"><p>Ezin da <b><nobr>%1</nobr></b> hizkuntza agiria gertatu. <p>Hizkuntza aldibaterako Ingeleran (barne-eraikita) berrezarriko da. Mesedez joan <b>Hobespenak</b> elkarrizketara VirtualBox leihoko <b>Agiria</b> menutik ireki dezakezuna, eta hautatu <b>Hizkuntza</b> orrialdean dauden hizkuntzetako bat.</p></translation>
     </message>
     <message>
-        <source><p>You are about to install a VirtualBox extension pack. Extension packs complement the functionality of VirtualBox and can contain system level software that could be potentially harmful to your system. Please review the description below and only proceed if you have obtained the extension pack from a trusted source.</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%1< [...]
-        <translation type="unfinished"></translation>
+        <location line="-1581"/>
+        <location line="+11"/>
+        <source><p>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</p><p>Please close all programs in the guest OS that may be using this shared folder and try again.</p></source>
+        <translation><p>Hutsegitea <b>%1</b> elkarbanatutako agiritegia kentzerakoan (hona zuzentzeno <nobr><b>%2</b></nobr>) <b>%3</b> makina birtutaletik.</p><p>Mesedez itxi elkarbanatutako agiritegi hau erabiltzen egon daitezkeen SE gonbidatuko programa guztiak eta saiatu berriro.</p></translation>
     </message>
     <message>
-        <source>Extension packs complement the functionality of VirtualBox and can contain system level software that could be potentially harmful to your system. Please review the description below and only proceed if you have obtained the extension pack from a trusted source.</source>
-        <translation type="unfinished"></translation>
+        <source><p>Are you sure you want to download the VirtualBox Guest Additions CD image from <nobr><a href="%1">%2</a></nobr> (size %3 bytes)?</p></source>
+        <translation type="obsolete"><p>Zihur zaude VirtualBox Gonbidatu Gehigarriak CD irudia <nobr><a href="%1">%2</a></nobr>-tik (neurria %3 byte) jeistea nahi duzula?</p></translation>
     </message>
     <message>
-        <source><p>An older version of the extension pack is already installed, would you like to upgrade? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Current Version:&nbsp;&nbsp;</b></td& [...]
-        <translation type="unfinished"></translation>
+        <source>Failed to find license files in <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Hutsegitea baimen agiriak aurkitzerakoan, <nobr><b>%1</b></nobr>.</translation>
     </message>
     <message>
-        <source>&Upgrade</source>
-        <translation type="unfinished"></translation>
+        <location line="+1174"/>
+        <source>Failed to open the license file <nobr><b>%1</b></nobr>. Check file permissions.</source>
+        <translation>Hutsegitea <nobr><b>%1</b></nobr> baimen agiria irekitzerakoan. Egiaztatu agiri baimenak.</translation>
     </message>
     <message>
-        <source><p>An newer version of the extension pack is already installed, would you like to downgrade? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Current Version:&nbsp;&nbsp;</b></t [...]
+        <location line="-1577"/>
+        <source>Failed to send the ACPI Power Button press event to the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Downgrade</source>
-        <translation type="unfinished"></translation>
+        <source><p>Congratulations! You have been successfully registered as a user of VirtualBox.</p><p>Thank you for finding time to fill out the registration form!</p></source>
+        <translation type="obsolete"><p>Zorionak! Ongi erregistratu zara VirtualBox erabiltzaile bezala.</p><p>Mila esker erregistrazio galdekizuna betetzeko astia aurkitzeagaitik!</p></translation>
     </message>
     <message>
-        <source><p>The extension pack is already installed with the same version, would you like reinstall it? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td>& [...]
-        <translation type="unfinished"></translation>
+        <location line="-341"/>
+        <source><p>Failed to load the global GUI configuration from <b><nobr>%1</nobr></b>.</p><p>The application will now terminate.</p></source>
+        <translation><p>Hutsegitea EIG itxurapen orokorra <b><nobr>%1</nobr></b>-tik gertatzerakoan.</p><p>Orain aplikazioak amaitu egingo du.</p></translation>
     </message>
     <message>
-        <source>&Reinstall</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source><p>Failed to save the global GUI configuration to <b><nobr>%1</nobr></b>.</p><p>The application will now terminate.</p></source>
+        <translation><p>Hutsegitea EIG itxurapen orokorra <b><nobr>%1</nobr></b>-an gordetzerakoan.</p><p>Orain aplikazioak amaitu egingo du.</p></translation>
     </message>
     <message>
-        <source><p>You are about to remove the VirtualBox extension pack <b>%1</b>.</p><p>Are you sure you want to proceed?</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+746"/>
+        <source>Failed to save the settings of the virtual machine <b>%1</b> to <b><nobr>%2</nobr></b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtualaren ezarpenak<b><nobr>%2</nobr></b>-an gordetzerakoan.</translation>
     </message>
     <message>
-        <source>The extension pack <br><nobr><b>%1</b><nobr><br> was installed successfully.</source>
-        <translation type="unfinished"></translation>
+        <source>Failed to load the settings of the virtual machine <b>%1</b> from <b><nobr>%2</nobr></b>.</source>
+        <translation type="obsolete">Hutsegitea <b>%1</b> makina birtualaren ezarpenak<b><nobr>%2</nobr></b>-tik gertatzerakoan.</translation>
     </message>
     <message>
-        <source><p>Cannot create the machine folder <b>%1</b> in the parent folder <nobr><b>%2</b>.</nobr></p><p>Please check that the parent really exists and that you have permissions to create the machine folder.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-492"/>
+        <source>Discard</source>
+        <comment>saved state</comment>
+        <translation>Baztertu</translation>
     </message>
     <message>
-        <source>Failed to register the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Download</source>
+        <comment>additions</comment>
+        <translation type="obsolete">Jeitsi</translation>
     </message>
     <message>
-        <source><p>The machine settings were changed while you were editing them. You currently have unsaved setting changes.</p><p>Would you like to reload the changed settings or to keep your own changes?</p></source>
-        <translation type="unfinished"></translation>
+        <source>Mount</source>
+        <comment>additions</comment>
+        <translation type="obsolete">Osatu</translation>
     </message>
     <message>
-        <source>Reload settings</source>
-        <translation type="unfinished"></translation>
+        <location line="+1116"/>
+        <location filename="../src/globals/UIPopupCenter.cpp" line="-49"/>
+        <source><p>The host key is currently defined as <b>%1</b>.</p></source>
+        <comment>additional message box paragraph</comment>
+        <translation><p>Hostalari tekla orain <b>%1</b> bezala zehaztuta dago.</p></translation>
     </message>
     <message>
-        <source>Keep changes</source>
-        <translation type="unfinished"></translation>
+        <location line="+6"/>
+        <source>Capture</source>
+        <comment>do input capture</comment>
+        <translation>Harpena</translation>
     </message>
     <message>
-        <source>The virtual machine that you are changing has been started. Only certain settings can be changed while a machine is running. All other changes will be lost if you close this window now.</source>
-        <translation type="unfinished"></translation>
+        <location line="-1134"/>
+        <source>Check</source>
+        <comment>inaccessible media message box</comment>
+        <translation>Egiaztatu</translation>
     </message>
     <message>
-        <source>Failed to clone the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Switch</source>
+        <comment>fullscreen</comment>
+        <translation type="obsolete">Aldatu</translation>
     </message>
     <message>
-        <source>Create a snapshot of the current machine state</source>
-        <translation type="unfinished"></translation>
+        <source>Switch</source>
+        <comment>seamless</comment>
+        <translation type="obsolete">Aldatu</translation>
     </message>
     <message>
-        <source><p>Error changing disk image mode from <b>%1</b> to <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+23"/>
+        <source>Reset</source>
+        <comment>machine</comment>
+        <translation>Berrezarri</translation>
     </message>
     <message>
-        <source>Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer</source>
-        <translation type="unfinished"></translation>
+        <location line="+707"/>
+        <source>Continue</source>
+        <comment>no hard disk attached</comment>
+        <translation>Jarraitu</translation>
     </message>
     <message>
-        <source>VirtualBox is not currently allowed to access USB devices.  You can change this by adding your user to the 'vboxusers' group.  Please see the user manual for a more detailed explanation</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Go Back</source>
+        <comment>no hard disk attached</comment>
+        <translation>Joan Atzera</translation>
     </message>
     <message>
-        <source>VirtualBox is not currently allowed to access USB devices.  You can change this by allowing your user to access the 'usbfs' folder and files.  Please see the user manual for a more detailed explanation</source>
+        <location line="+463"/>
+        <source><p>Could not enter seamless mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The USB Proxy Service has not yet been ported to this host</source>
-        <translation type="unfinished"></translation>
+        <location line="+152"/>
+        <source>You are already running the most recent version of VirtualBox.</source>
+        <translation>Jadanik VirtualBox bertsio berriena duzu.</translation>
     </message>
     <message>
-        <source>Could not load the Host USB Proxy service</source>
+        <location line="-227"/>
+        <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can't find snapshot named <b>%1</b>.</source>
+        <location filename="../src/globals/UIPopupCenter.cpp" line="-13"/>
+        <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time t [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source>
-        <translation type="obsolete"><p>Huts deskargatutako fitxategia <nobr><b>%1</b> bezala gordetzerakoan.</nobr></p></translation>
-    </message>
-    <message>
-        <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source>
+        <location line="+24"/>
+        <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the s [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/globals/UIMessageCenter.cpp" line="+217"/>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>VirtualBox bertsio berri bat argitaratu da! <b>%1</b> bertsioa eskuragari dago hemen, <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Bertsioa hau hurrengo lotura erabiliz jeitsi dezakezu:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
-        <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-801"/>
+        <source>Release</source>
+        <comment>detach medium</comment>
+        <translation>Argitaratu</translation>
     </message>
     <message>
-        <source>Install</source>
-        <comment>extension pack</comment>
-        <translation type="unfinished"></translation>
+        <source><p>Are you sure you want to remove the %1 <nobr><b>%2</b></nobr> from the list of known media?</p></source>
+        <translation type="obsolete"><p>Zihur zaude %1 <nobr><b>%2</b></nobr> multimedia ezagunen zerrendatik kentzea nahi duzula?</p></translation>
     </message>
     <message>
-        <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+51"/>
+        <source>Remove</source>
+        <comment>medium</comment>
+        <translation>Kendu</translation>
     </message>
     <message>
-        <source><p>You have version %1 of the <b><nobr>%2</nobr></b> installed.</p><p>You should download and install version %3 of this extension pack from Oracle!</p></source>
+        <location line="+182"/>
+        <source><p>The hard disk storage unit at location <b>%1</b> already exists. You cannot create a new virtual hard disk that uses this location because it can be already used by another virtual hard disk.</p><p>Please specify a different location.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Failed to initialize COM because the VirtualBox global configuration directory <b><nobr>%1</nobr></b> is not accessible. Please check the permissions of this directory and of its parent directory.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-165"/>
+        <source>Delete</source>
+        <comment>hard disk storage</comment>
+        <translation>Ezabatu</translation>
     </message>
     <message>
-        <source><p>You are about to remove following virtual machine items from the machine list:</p><p><b>%1</b></p><p>Do you wish to proceed?</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Keep</source>
+        <comment>hard disk storage</comment>
+        <translation>Heutsi</translation>
     </message>
     <message>
-        <source><p>You are about to remove following inaccessible virtual machines from the machine list:</p><p>%1</p><p>Do you wish to proceed?</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+6"/>
+        <location line="+8"/>
+        <source>Failed to delete the storage unit of the hard disk <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> diska gogorreko biltegiratze unitatea ezabatzerakoan.</translation>
     </message>
     <message>
-        <source><p>You are about to remove following virtual machines from the machine list:</p><p>%1</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well? Doing this will also remove the files containing the machine's virtual hard disks if they are not in use by another machine.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+160"/>
+        <location line="+8"/>
+        <location line="+8"/>
+        <source>Failed to create the hard disk storage <nobr><b>%1</b>.</nobr></source>
+        <translation>Hutsegitea diska gogor biltegia sortzerakoan <nobr><b>%1</b>.</nobr></translation>
     </message>
     <message>
-        <source><p>You are about to remove following virtual machines from the machine list:</p><p>%1</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well?</p></source>
-        <translation type="unfinished"></translation>
+        <source>Failed to open the %1 <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Hutsegitea %1 irekitzerakoan <nobr><b>%2</b></nobr>.</translation>
     </message>
     <message>
-        <source>Do you wish to cancel all current network operations?</source>
-        <translation type="unfinished"></translation>
+        <source>Failed to close the %1 <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Hutsegitea %1 isterakoan <nobr><b>%2</b></nobr>.</translation>
     </message>
     <message>
-        <source>ACPI Shutdown</source>
-        <comment>machine</comment>
-        <translation type="unfinished"></translation>
+        <source><p>Failed to connect to the VirtualBox online registration service due to the following error:</p><p><b>%1</b></p></source>
+        <translation type="obsolete"><p>Hutsegitea VirtualBox-en onlineko erregistrazio zerbitzura elkartzerakoan hurrengo akatsagaitik: </p><p><b>%1</b></p></translation>
     </message>
     <message>
-        <source>Power Off</source>
-        <comment>machine</comment>
+        <location line="+218"/>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Cannot remove the machine folder <nobr><b>%1</b>.</nobr></p><p>Please check that this folder really exists and that you have permissions to remove it.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+675"/>
+        <source>The following files already exist:<br /><br />%1<br /><br />Are you sure you want to replace them? Replacing them will overwrite their contents.</source>
+        <translation>Jadanik badaude hurrengo agiriak:<br /><br />%1<br /><br />Zihur zaude ordeztea nahi dituzula? Hauek ordezteak beren edukiak gainidaztea eragingo du.</translation>
     </message>
     <message>
-        <source><p>Cannot create the machine folder <b>%1</b> in the parent folder <nobr><b>%2</b>.</nobr></p><p>This folder already exists and possibly belongs to another machine.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-2000"/>
+        <source>You are running a prerelease version of VirtualBox. This version is not suitable for production use.</source>
+        <translation>VirtualBox aurreargitalpen bertsio bat ari zara erabiltzen. Bertsio hau ez da ekoizpen erabilpenerako.</translation>
     </message>
     <message>
-        <source><p>Are you sure you want to discard the saved state of the following virtual machines?</p><p><b>%1</b></p><p>This operation is equivalent to resetting or powering off the machine without doing a proper shutdown of the guest OS.</p></source>
+        <location filename="../src/globals/UIPopupCenter.cpp" line="-31"/>
+        <source>You are trying to shut down the guest with the ACPI power button. This is currently not possible because the guest does not support software shutdown.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you really want to reset the following virtual machines?</p><p><b>%1</b></p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
+        <location filename="../src/globals/UIMessageCenter.cpp" line="+1372"/>
+        <source><p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</p><p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you really want to send an ACPI shutdown signal to the following virtual machines?</p><p><b>%1</b></p></source>
-        <translation type="unfinished"></translation>
+        <location line="+4"/>
+        <location line="+6"/>
+        <location line="+11"/>
+        <location line="+6"/>
+        <location line="+11"/>
+        <source>Close VM</source>
+        <translation>Itxi MB</translation>
     </message>
     <message>
-        <source><p>Do you really want to power off the following virtual machines?</p><p><b>%1</b></p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-222"/>
+        <location line="+188"/>
+        <location line="+6"/>
+        <location line="+11"/>
+        <location line="+6"/>
+        <source>Continue</source>
+        <translation>Jarraitu</translation>
     </message>
     <message>
-        <source><p>You are trying to move machine <nobr><b>%1</b></nobr> to group <nobr><b>%2</b></nobr> which already have sub-group <nobr><b>%1</b></nobr>.</p><p>Please resolve this name-conflict and try again.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-962"/>
+        <location line="+9"/>
+        <location filename="../src/globals/UIPopupCenter.cpp" line="-167"/>
+        <source>Cancel</source>
+        <translation>Ezeztatu</translation>
     </message>
     <message>
-        <source><p>You are trying to move group <nobr><b>%1</b></nobr> to group <nobr><b>%2</b></nobr> which already have another item with the same name.</p><p>Would you like to automatically rename it?</p></source>
-        <translation type="unfinished"></translation>
+        <source>Failed to create the host-only network interface.</source>
+        <translation type="obsolete">Hutsegitea hostalaria-bakarrik sare interfazea sortzerakoan.</translation>
     </message>
     <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <source>Failed to open appliance.</source>
+        <translation type="obsolete">Hutsegitea makina birtuala irekitzerakoan.</translation>
     </message>
     <message>
-        <source><p>You are about to restore snapshot <nobr><b>%1</b></nobr>.</p><p>You can create a snapshot of the current state of the virtual machine first by checking the box below; if you do not do this the current state will be permanently lost. Do you wish to proceed?</p></source>
+        <location line="+704"/>
+        <source>Failed to open/interpret appliance <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to restore snapshot <nobr><b>%1</b></nobr>?</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+8"/>
+        <source>Failed to import appliance <b>%1</b>.</source>
+        <translation>Hutsegitea makina birtuala inportatzerakoan <b>%1</b>.</translation>
     </message>
     <message>
-        <source>Failed to set groups of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Failed to create appliance.</source>
+        <translation type="obsolete">Hutsegitea makina birtuala sortzerakoan.</translation>
     </message>
     <message>
-        <source><p>Could not start the machine <b>%1</b> because the following physical network interfaces were not found:</p><p><b>%2</b></p><p>You can either change the machine's network settings or stop the machine.</p></source>
+        <location line="+36"/>
+        <location line="+8"/>
+        <source>Failed to prepare the export of the appliance <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change Network Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Failed to create an appliance.</source>
+        <translation type="obsolete">Hutsegitea makina birtual bat sortzerakoan.</translation>
     </message>
     <message>
-        <source>Close Virtual Machine</source>
-        <translation type="obsolete">Makina Birtuala Itxi</translation>
+        <location line="+8"/>
+        <source>Failed to export appliance <b>%1</b>.</source>
+        <translation>Hutsegitea makina birtuala esportatzerakoan <b>%1</b>.</translation>
     </message>
     <message>
-        <source><p>Cannot start the VirtualBox Manager due to local restrictions.</p><p>The application will now terminate.</p></source>
+        <location line="-660"/>
+        <source><p>Deleting this host-only network will remove the host-only interface this network is based on. Do you want to remove the (host-only network) interface <nobr><b>%1</b>?</nobr></p><p><b>Note:</b> this interface may be in use by one or more virtual network adapters belonging to one of your VMs. After it is removed, these adapters will no longer be usable until you correct their settings by either choosing a different in [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+1437"/>
+        <source>A file named <b>%1</b> already exists. Are you sure you want to replace it?<br /><br />Replacing it will overwrite its contents.</source>
+        <translation>Jadanik badago <b>%1</b> izeneko agiri bat. Zihur zaude ordeztea nahi duzula? Ordezteak bere edukiak gainidaztea eragingo du.</translation>
     </message>
     <message>
-        <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
+        <location line="-598"/>
+        <source><p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Certain guests (e.g. OS/2 and QNX) require this feature.</p><p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There is no virtual machine with the identifier <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source><p>Invalid e-mail address or password specified.</p></source>
+        <translation type="obsolete"><p>Post@ helbide edo sarhitz okerra adierazi da.</p></translation>
     </message>
     <message>
-        <source>Ignore</source>
-        <translation type="unfinished"></translation>
+        <source><p>Failed to register the VirtualBox product.</p><p>%1</p></source>
+        <translation type="obsolete"><p>Hutsegitea VirtualBox produktua erregistratzerakoan.</p><p>%1</p></translation>
     </message>
     <message>
-        <source>Failed to create NAT network.</source>
-        <translation type="unfinished"></translation>
+        <location line="-223"/>
+        <source>Failed to check files.</source>
+        <translation>Hutsegitea agiriak egiaztatzerakoan.</translation>
     </message>
     <message>
-        <source>Failed to remove NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Failed to remove file.</source>
+        <translation>Hutsegitea agiria kentzerakoan.</translation>
     </message>
     <message>
-        <source>Failed to create DHCP server.</source>
+        <location line="-1190"/>
+        <source>You seem to have the USBFS filesystem mounted at /sys/bus/usb/drivers. We strongly recommend that you change this, as it is a severe mis-configuration of your system which could cause USB devices to fail in unexpected ways.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to remove DHCP server for network interface <b>%1</b>.</source>
+        <location line="+10"/>
+        <source><p>Cannot start the VirtualBox Manager due to local restrictions.</p><p>The application will now terminate.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to create the host network interface.</source>
-        <translation type="unfinished"></translation>
+        <location line="+14"/>
+        <source>You are running an EXPERIMENTAL build of VirtualBox. This version is not suitable for production use.</source>
+        <translation>VirtualBox eraiketa ESPERIMENTAL bat erabiltzen ari zara. Bertsio hau ez da ekoizpen erabilpenerako.</translation>
     </message>
     <message>
-        <source>Create &new disk</source>
+        <location line="+35"/>
+        <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Choose existing disk</source>
+        <location line="+10"/>
+        <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave &empty</source>
+        <location line="+36"/>
+        <source>There is no virtual machine with the identifier <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Choose disk</source>
-        <translation type="unfinished"></translation>
+        <location line="+31"/>
+        <source>Failed to access the disk image file <nobr><b>%1</b></nobr>.</source>
+        <translation>Hutsegitea disk irudi agirira sartzerakoan, <nobr><b>%1</b></nobr>.</translation>
     </message>
     <message>
-        <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+194"/>
+        <location line="+1032"/>
+        <location line="+156"/>
+        <location line="+21"/>
+        <source>Ignore</source>
+        <translation type="unfinished">Ezikusi</translation>
     </message>
     <message>
-        <source><p>As this hard disk is inaccessible its image file can not be deleted.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-1085"/>
+        <location line="+9"/>
+        <source>Restore</source>
+        <translation>Leheneratu</translation>
     </message>
     <message>
-        <source><p>Are you sure you want to remove the virtual optical disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+12"/>
+        <location line="+15"/>
+        <source>Delete</source>
+        <translation>Ezabatu</translation>
     </message>
     <message>
-        <source><p>Are you sure you want to remove the virtual floppy disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
+        <location line="+22"/>
+        <location line="+9"/>
+        <source>Failed to restore the snapshot <b>%1</b> of the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Unable to insert the virtual optical disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
+        <location line="+9"/>
+        <location line="+8"/>
+        <source>Failed to delete the snapshot <b>%1</b> of the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Would you like to try to force insertion of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <source>Unable to mount the %1 <nobr><b>%2</b></nobr> on the machine <b>%3</b>.</source>
+        <translation type="obsolete">Ezinezkoa %1 osatzea <nobr><b>%2</b></nobr> <b>%3</b> makinan.</translation>
     </message>
     <message>
-        <source><p>Unable to eject the virtual optical disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <source>Unable to unmount the %1 <nobr><b>%2</b></nobr> from the machine <b>%3</b>.</source>
+        <translation type="obsolete">Ezinezkoa %1 osatzea <nobr><b>%2</b></nobr> <b>%3</b> makinatik.</translation>
     </message>
     <message>
-        <source><p>Would you like to try to force ejection of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+493"/>
+        <source>Force Unmount</source>
+        <translation>Behartu Desosatzea</translation>
     </message>
     <message>
-        <source><p>Unable to insert the virtual floppy disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <source>E&xit</source>
+        <comment>warnAboutSettingsAutoConversion message box</comment>
+        <translation type="obsolete">I&rten</translation>
     </message>
     <message>
-        <source><p>Unable to eject the virtual floppy disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+        <source>hard disk</source>
+        <comment>failed to mount ...</comment>
+        <translation type="obsolete">diska gogorra</translation>
     </message>
     <message>
-        <source>Switch</source>
-        <translation type="unfinished"></translation>
+        <source>CD/DVD</source>
+        <comment>failed to mount ... host-drive</comment>
+        <translation type="obsolete">CD/DVD</translation>
     </message>
     <message>
-        <source>Failed to enable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>CD/DVD image</source>
+        <comment>failed to mount ...</comment>
+        <translation type="obsolete">CD/DVD irudia</translation>
     </message>
     <message>
-        <source>Failed to disable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>floppy</source>
+        <comment>failed to mount ... host-drive</comment>
+        <translation type="obsolete">disketea</translation>
     </message>
     <message>
-        <source>Failed to enable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>floppy image</source>
+        <comment>failed to mount ...</comment>
+        <translation type="obsolete">diskete irudia</translation>
     </message>
     <message>
-        <source>Failed to disable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source><p>Are you sure you want to delete the CD/DVD-ROM device?</p><p>You will not be able to mount any CDs or ISO images or install the Guest Additions without it!</p></source>
+        <translation type="obsolete"><p>Zihur zaude CD/DVD-ROM gailua ezabatzea nahi duzula?</p><p>Ezingo duzu CD edo ISO irudirik osatu edo Gonbidatu Gehigarririk ezarri bera gabe!</p></translation>
     </message>
     <message>
-        <source><p>Could not find the <b>VirtualBox Guest Additions</b> disk image file.</p><p>Do you wish to download this disk image file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-306"/>
+        <source>&Remove</source>
+        <comment>medium</comment>
+        <translation>&Kendu</translation>
     </message>
     <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
+        <location line="+671"/>
+        <source><p>VT-x/AMD-V hardware acceleration is not available on your system. Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</source>
+        <translation><p>VT-x/AMD-V hardware bizkorpena ez dago eskuragarri zure sisteman. Zure 64-biteko gonbidatuak huts egin du 64-bit CPU-a atzematean eta ezingo da abiarazi.</translation>
     </message>
     <message>
-        <source><p>Are you sure you want to download the <b>VirtualBox Guest Additions</b> disk image file from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+17"/>
+        <source><p>VT-x/AMD-V hardware acceleration is not available on your system. Certain guests (e.g. OS/2 and QNX) require this feature and will fail to boot without it.</p></source>
+        <translation><p>VT-x/AMD-V hardware bizkorpena ez dago eskuragarri zure sisteman. Zenbait gonbidatuk (adib. OS/2 eta QNX) ezaugarri hau behar dute eta huts egingo dute abiatzean bera gabe.</p></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
+        <location line="+132"/>
+        <source><p>Could not change the guest screen to this host screen due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source>
+        <location line="-11"/>
+        <source><p>Could not change the guest screen to this host screen due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch the screen anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to download the <b>VirtualBox User Manual</b> from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <source><p>Are you sure you want to download the VirtualBox User Manual from <nobr><a href="%1">%2</a></nobr> (size %3 bytes)?</p></source>
+        <translation type="obsolete"><p>Zihur zaude VirtualBox Erabiltzaile Eskuliburua jeistea nahi duzula hemendik, <nobr><a href="%1">%2</a></nobr> (neurria %3 byte)?</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"></translation>
+        <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p></source>
+        <translation type="obsolete"><p>VirtualBox Erabiltzaile Eskuliburua ongi jeitsi da hemendik, <nobr><a href="%1">%2</a></nobr> eta tokian gorde da honela <nobr><b>%3</b>.</nobr></p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p></source>
-        <translation type="unfinished"></translation>
+        <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source>
+        <translation type="obsolete"><p>VirtualBox Erabiltzaile Eskuliburua ongi jeitsi da hemendik, <nobr><a href="%1">%2</a></nobr>baina ezin da tokian gorde honela <nobr><b>%3</b>.</nobr></p><p>Mesedez hautatu beste kokaleku bat agiriarentzat.</p></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Itxi</translation>
+        <location line="-1366"/>
+        <source>Failed to open virtual machine located in %1.</source>
+        <translation>Hutsegitea %1 kokalekuan dagoen makina birtuala irekitzerakoan.</translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <location line="+8"/>
+        <source>Failed to add virtual machine <b>%1</b> located in <i>%2</i> because its already present.</source>
+        <translation>Hutsegitea <i>%2</i> kokalekuan dagoen <b>%1</b> makina birtuala gehitzerakoan jadanik badagoelako.</translation>
     </message>
     <message>
-        <source>Do not show this message again</source>
-        <translation type="unfinished">Ez erakutsi mezu hau berriz</translation>
+        <location line="+124"/>
+        <source>Delete all files</source>
+        <translation>Ezabatu agiri guztiak</translation>
     </message>
     <message>
-        <source><p>Do you want to remove the NAT network <nobr><b>%1</b>?</nobr></p><p>If this network is in use by one or more virtual machine network adapters these adapters will no longer be usable until you correct their settings by either choosing a different network name or a different adapter attachment type.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Remove only</source>
+        <translation>Kendu bakarrik</translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <location line="-81"/>
+        <location line="+73"/>
+        <location line="+268"/>
+        <location line="+16"/>
+        <source>Remove</source>
+        <translation>Kendu</translation>
     </message>
     <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
+        <location line="+112"/>
+        <source><p>You are about to add a virtual hard disk to controller <b>%1</b>.</p><p>Would you like to create a new, empty file to hold the disk contents or select an existing one?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <source>Create &new disk</source>
+        <comment>add attachment routine</comment>
+        <translation type="obsolete">&Sortu diska berria</translation>
     </message>
     <message>
-        <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <source>&Choose existing disk</source>
+        <comment>add attachment routine</comment>
+        <translation type="obsolete">&Hautatu badagoen diska</translation>
     </message>
     <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
-        <translation type="unfinished"></translation>
+        <source>&Choose disk</source>
+        <comment>add attachment routine</comment>
+        <translation type="obsolete">&Hautatu diska</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
+        <source>Leave &empty</source>
+        <comment>add attachment routine</comment>
+        <translation type="obsolete">Utzi &hutsik</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <location line="+21"/>
+        <source><p>You are about to add a new floppy drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual floppy disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
+        <location line="+251"/>
+        <source>Failed to detach the hard disk (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to set the global VirtualBox extra data for key <i>%1</i> to value <i>{%2}</i>.</source>
+        <location line="+960"/>
+        <location line="+8"/>
+        <source>Failed to install the Extension Pack <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to set the extra data for key <i>%1</i> of machine <i>%2</i> to value <i>{%3}</i>.</source>
-        <translation type="unfinished"></translation>
+        <location line="+8"/>
+        <location line="+8"/>
+        <source>Failed to uninstall the Extension Pack <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> Hedapen Paketea kentzerakoan.</translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
-        <translation type="unfinished"></translation>
+        <location line="-44"/>
+        <source>&Remove</source>
+        <translation>&Kendu</translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <location line="-1138"/>
+        <source>The current port forwarding rules are not valid. None of the host or guest port values may be set to zero.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <location line="+24"/>
+        <source><p>There are unsaved changes in the port forwarding configuration.</p><p>If you proceed your changes will be discarded.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <location line="-50"/>
+        <source>Failed to attach the hard disk (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <location line="+160"/>
+        <location line="+8"/>
+        <source><p>Note that the storage unit of this medium will not be deleted and that it will be possible to use it later again.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <location line="+582"/>
+        <source><p>The virtual machine window will be now switched to <b>Seamless</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in seamless mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Switch</source>
+        <comment>scale</comment>
+        <translation type="obsolete">Aldatu</translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+420"/>
+        <location line="+7"/>
+        <source>Failed to open the Extension Pack <b>%1</b>.</source>
+        <translation><b>%1</b> Hedapen Paketea irekitzerakoan.</translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <location line="-92"/>
+        <source><p>You are about to install a VirtualBox extension pack. Extension packs complement the functionality of VirtualBox and can contain system level software that could be potentially harmful to your system. Please review the description below and only proceed if you have obtained the extension pack from a trusted source.</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%1< [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
-        <translation type="unfinished"></translation>
+        <source>&Install</source>
+        <translation type="obsolete">&Ezarri</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <location line="+19"/>
+        <source>Extension packs complement the functionality of VirtualBox and can contain system level software that could be potentially harmful to your system. Please review the description below and only proceed if you have obtained the extension pack from a trusted source.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
-        <translation type="unfinished"></translation>
+        <location line="+14"/>
+        <source><p>An older version of the extension pack is already installed, would you like to upgrade? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Current Version:&nbsp;&nbsp;</b></td& [...]
+        <translation><p>Jadanik hedapen paketearen bertsio zaharrago bat dago ezarrita, eguneratzea nahi duzu? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Izena:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Bertsio Berria:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Oraingo Bertsioa:&nbsp;&nbsp;</b&gt [...]
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="unfinished"></translation>
+        <location line="+10"/>
+        <source>&Upgrade</source>
+        <translation>&Eguneratu</translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source><p>An newer version of the extension pack is already installed, would you like to downgrade? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>New Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Current Version:&nbsp;&nbsp;</b></t [...]
+        <translation><p>Jadanik hedapen paketearen bertsio berriago bat dago ezarrita, zaharragoratzea nahi duzu? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Izena:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Bertsio Berria:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Oraingo Bertsioa:&nbsp;&nbsp;</b [...]
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
-        <translation type="unfinished"></translation>
+        <location line="+10"/>
+        <source>&Downgrade</source>
+        <translation>&Zaharragoratu</translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source><p>The extension pack is already installed with the same version, would you like reinstall it? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Name:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Version:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Description:&nbsp;&nbsp;</b></td>& [...]
+        <translation><p>Hedapen paketea jadanik bertsio berdinarekin ezarrita dago, berriro ezartzea nahi duzu? <p>%1</p><p><table cellpadding=0 cellspacing=0><tr><td><b>Izena:&nbsp;&nbsp;</b></td><td>%2</td></tr><tr><td><b>Bertsioa:&nbsp;&nbsp;</b></td><td>%3</td></tr><tr><td><b>Azalpena:&nbsp;&nbsp;</b></td>& [...]
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>&Reinstall</source>
+        <translation>&Berriro ezarri</translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source><p>You are about to remove the VirtualBox extension pack <b>%1</b>.</p><p>Are you sure you want to proceed?</p></source>
+        <translation><p>VirtualBox <b>%1</b> hedapen paketea kentzear zaude.</p><p>Zihur zaude jarraitzea nahi duzula?</p></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="+56"/>
+        <source>The extension pack <br><nobr><b>%1</b><nobr><br> was installed successfully.</source>
+        <translation><br><nobr><b>%1</b><nobr><br> hedapen paketea ongi ezarri da.</translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-803"/>
+        <source><p>Cannot create the machine folder <b>%1</b> in the parent folder <nobr><b>%2</b>.</nobr></p><p>Please check that the parent really exists and that you have permissions to create the machine folder.</p></source>
+        <translation><p>Ezin da makinaren <b>%1</b> agiritegia sortu gaineko <nobr><b>%2</b> agiritegian.</nobr></p><p>Mesedez egiaztatu gainekoa egitan dagoela eta makina agiritegia sortzeko baimena duzula.</p></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-76"/>
+        <source>Failed to register the virtual machine <b>%1</b>.</source>
+        <translation><b>%1</b> makina birtutala erregistratzerakoan.</translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-395"/>
+        <source><p>The machine settings were changed while you were editing them. You currently have unsaved setting changes.</p><p>Would you like to reload the changed settings or to keep your own changes?</p></source>
+        <translation><p>Makinaren ezarpenak aldatu egin dira editatzen zenituen bitartean. Une honetan gordegabeko ezarpen aldaketak dituzu.</p><p>Aldatutako ezarpenak birgertatzea edo zeure aldaketei heustea nahi duzu?</p></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
-        <translation type="unfinished"></translation>
+        <location line="+4"/>
+        <source>Reload settings</source>
+        <translation>Birgertatu ezarpenak</translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <location line="+0"/>
+        <source>Keep changes</source>
+        <translation>Heutsi aldaketei</translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <location line="-14"/>
+        <source>The virtual machine that you are changing has been started. Only certain settings can be changed while a machine is running. All other changes will be lost if you close this window now.</source>
+        <translation>Aldatzen ari zaren makina birtuala abiarazi egin da. Zenbati ezarpen bakarrik aldatu daitezke makina ekinean dagoela. Beste aldaketa guztiak galdu egingo dira leiho hau orain isten baduzu.</translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
-        <translation type="unfinished"></translation>
+        <location line="+413"/>
+        <location line="+8"/>
+        <source>Failed to clone the virtual machine <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtuala klonatzerakoan.</translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <location line="-641"/>
+        <source>Create a snapshot of the current machine state</source>
+        <translation>Sortu makinaren oraingo egoeraren argazki bat</translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="unfinished"></translation>
+        <source>Sorry, some generic error happens.</source>
+        <translation type="obsolete">Barkatu, zenbati akats generiko gertatu dira.</translation>
     </message>
-</context>
-<context>
-    <name>UIMiniProcessWidgetAdditions</name>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <location line="+1861"/>
+        <source>Could not load the Host USB Proxy Service (VERR_FILE_NOT_FOUND). The service might not be installed on the host computer</source>
+        <translation>Ezin da Hostalari USB Proxy Zerbitzua gertatu (VERR_FILE_NOT_FOUND). Badaiteke zerbitzua hostalari ordenagailuan ezarrita ez egotea</translation>
     </message>
     <message>
-        <source>Cancel the VirtualBox Guest Additions disk image file download</source>
-        <translation type="obsolete">Utzi VirtualBox Bezero Gehigarri CD irudi deskarga</translation>
+        <location line="+1"/>
+        <source>VirtualBox is not currently allowed to access USB devices.  You can change this by adding your user to the 'vboxusers' group.  Please see the user manual for a more detailed explanation</source>
+        <translation>VirtualBox-ek ez du sarbiderik USB gailuetara.  Hau zure erabiltzailea 'vboxusers' taldera gehituz aldatu dezakezu.  Mesedez ikusi erabiltzaile eskuliburua azalpen xehetuagorako</translation>
     </message>
     <message>
-        <source>Downloading the VirtualBox Guest Additions disk image file from <nobr><b>%1</b>...</nobr></source>
-        <translation type="obsolete">VirtualBox Bezero Gehigarri CD irudia <nobr><b>%1</b>-etik deskargatzen...</nobr></translation>
+        <location line="+1"/>
+        <source>VirtualBox is not currently allowed to access USB devices.  You can change this by allowing your user to access the 'usbfs' folder and files.  Please see the user manual for a more detailed explanation</source>
+        <translation>VirtualBox-ek ez du sarbiderik USB gailuetara.  Hau zure erabiltzaileari 'usbfe' agiritegira eta agirietara sarbidea ahalbidetuz aldatu dezakezu.  Mesedez ikusi erabiltzaile eskuliburua azalpen xehetuagorako</translation>
     </message>
-</context>
-<context>
-    <name>UIMiniProcessWidgetUserManual</name>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <location line="+1"/>
+        <source>The USB Proxy Service has not yet been ported to this host</source>
+        <translation>USB Proxy Zerbitzua oraindik ez dago hostalari honetan ezarrita</translation>
     </message>
-</context>
-<context>
-    <name>UIMiniProgressWidgetAdditions</name>
     <message>
-        <source>Cancel the VirtualBox Guest Additions disk image file download</source>
-        <translation type="obsolete">Utzi VirtualBox Bezero Gehigarri CD irudi deskarga</translation>
+        <location line="+1"/>
+        <source>Could not load the Host USB Proxy service</source>
+        <translation>Ezin da Hostalari USB Proxy zerbitzua gertatu</translation>
     </message>
     <message>
-        <source>Downloading the VirtualBox Guest Additions disk image file from <nobr><b>%1</b>...</nobr></source>
-        <translation type="obsolete">VirtualBox Bezero Gehigarri CD irudia <nobr><b>%1</b>-etik deskargatzen...</nobr></translation>
+        <location line="-1079"/>
+        <source>Can't find snapshot named <b>%1</b>.</source>
+        <translation>Ezin da<b>%1</b> izeneko berehalakoa aurkitu.</translation>
     </message>
-</context>
-<context>
-    <name>UIMiniToolBar</name>
     <message>
-        <source>Always show the toolbar</source>
-        <translation type="unfinished"></translation>
+        <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source>
+        <translation type="obsolete"><p>Hutsegitea jeitsitako agiria gordetzerakoan,<nobr><b>%1</b>.</nobr></p></translation>
     </message>
     <message>
-        <source>Minimize Window</source>
-        <translation type="unfinished"></translation>
+        <location line="+543"/>
+        <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source>
+        <translation><p><b><nobr>%2</nobr></b>-ren bertsio zahar bat (%1) duzu ezarrita.</p><p>Nahi duzu azkenengoa Internetetik jeistea?</p></translation>
     </message>
     <message>
-        <source>Exit Full Screen or Seamless Mode</source>
-        <translation type="unfinished"></translation>
+        <source>Download</source>
+        <comment>extension pack</comment>
+        <translation type="obsolete">Jeitsi</translation>
     </message>
     <message>
-        <source>Close VM</source>
-        <translation type="unfinished"></translation>
+        <location line="+10"/>
+        <source><p>Are you sure you want to download the <b><nobr>%1</nobr></b> from <nobr><a href="%2">%2</a></nobr> (size %3 bytes)?</p></source>
+        <translation><p>Zihur zaude <b><nobr>%1</nobr></b> <nobr><a href="%2">%2</a></nobr>-tik jeistea nahi duzula (neurria %3 byte)?</p></translation>
     </message>
-</context>
-<context>
-    <name>UIMultiScreenLayout</name>
     <message>
-        <source>Virtual Screen %1</source>
-        <translation type="unfinished"></translation>
+        <location line="+20"/>
+        <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to install this extension pack?</p></source>
+        <translation><p><b><nobr>%1</nobr></b> ongi jeitsi da <nobr><a href="%2">%2</a></nobr>-tik eta tokian gorde da <nobr><b>%3</b> bezala.</nobr></p><p>Nahi duzu hedapen pakete hau ezartzea?</p></translation>
     </message>
     <message>
-        <source>Use Host Screen %1</source>
-        <translation type="unfinished"></translation>
+        <location line="+6"/>
+        <location line="+19"/>
+        <source>Install</source>
+        <comment>extension pack</comment>
+        <translation>Ezarri</translation>
     </message>
-</context>
-<context>
-    <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished"></translation>
+        <location line="-35"/>
+        <source><p>The <b><nobr>%1</nobr></b> has been successfully downloaded from <nobr><a href="%2">%2</a></nobr> but can't be saved locally as <nobr><b>%3</b>.</nobr></p><p>Please choose another location for that file.</p></source>
+        <translation><p><b><nobr>%1</nobr></b> ongi jeitsi da <nobr><a href="%2">%2</a></nobr>-tik baina ezin da tokian gorde <nobr><b>%3</b> bezala.</nobr></p><p>Mesedez hautatu beste kokaleku bat agiriarentzat.</p></translation>
     </message>
     <message>
-        <source>Holds the name of the virtual machine.</source>
-        <translation type="unfinished">Makina birtualaren izena bistaratzen du.</translation>
+        <location line="-116"/>
+        <source><p>You have version %1 of the <b><nobr>%2</nobr></b> installed.</p><p>You should download and install version %3 of this extension pack from Oracle!</p></source>
+        <translation><p><b><nobr>%2</nobr></b>-ren %1 bertsioa  duzu ezarrita.</p><p> Hedapen pakete honen %3 bertsioa jeitsi eta ezarri behar duzu Oracle-tik!</p></translation>
     </message>
     <message>
-        <source>&Type:</source>
-        <translation type="unfinished"></translation>
+        <source>Ok</source>
+        <comment>extension pack</comment>
+        <translation type="obsolete">Ongi</translation>
     </message>
     <message>
-        <source>Selects the operating system family that you plan to install into this virtual machine.</source>
+        <location line="-1651"/>
+        <source><p>Failed to initialize COM because the VirtualBox global configuration directory <b><nobr>%1</nobr></b> is not accessible. Please check the permissions of this directory and of its parent directory.</p><p>The application will now terminate.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Version:</source>
-        <translation type="unfinished"></translation>
+        <location line="+185"/>
+        <source><p>You are about to remove following virtual machine items from the machine list:</p><p><b>%1</b></p><p>Do you wish to proceed?</p></source>
+        <translation><p>Hurrengo makina birtual gaiak kentzear zaude makinaren zerrendatik:</p><p><b>%1</b></p><p>Jarraitzea nahi duzu?</p></translation>
     </message>
     <message>
-        <source>Selects 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>
+        <location line="+53"/>
+        <source><p>You are about to remove following inaccessible virtual machines from the machine list:</p><p>%1</p><p>Do you wish to proceed?</p></source>
+        <translation><p>Hurrengo sarbiderik gabeko makina birtuala kentzear zaude makinaren zerrendatik:</p><p><b>%1</b></p><p>Jarraitzea nahi duzu?</p></translation>
     </message>
-</context>
-<context>
-    <name>UINetworkManagerDialog</name>
     <message>
-        <source>Network Operations Manager</source>
+        <location line="+5"/>
+        <source><p>You are about to remove following virtual machines from the machine list:</p><p>%1</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well? Doing this will also remove the files containing the machine's virtual hard disks if they are not in use by another machine.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There are no active network operations.</source>
+        <location line="+6"/>
+        <source><p>You are about to remove following virtual machines from the machine list:</p><p>%1</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Cancel All</source>
-        <translation type="unfinished"></translation>
+        <location line="+1380"/>
+        <source>Do you wish to cancel all current network operations?</source>
+        <translation>Une honetako sare eragiketa guztiak ezeztatzea nahi duzu?</translation>
     </message>
     <message>
-        <source>Cancel all active network operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network Operation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart network operation</source>
-        <translation type="unfinished"></translation>
+        <location line="-1297"/>
+        <source>ACPI Shutdown</source>
+        <comment>machine</comment>
+        <translation>ACPI Itzalketa</translation>
     </message>
     <message>
-        <source>Cancel network operation</source>
-        <translation type="unfinished"></translation>
+        <location line="+11"/>
+        <source>Power Off</source>
+        <comment>machine</comment>
+        <translation>Itzali</translation>
     </message>
     <message>
-        <source>The network operation failed with the following error: %1.</source>
-        <translation type="unfinished"></translation>
+        <location line="+758"/>
+        <source><p>Cannot remove the machine folder <nobr><b>%1</b>.</nobr></p><p>Please check that this folder really exists and that you have permissions to remove it.</p></source>
+        <translation><p>Ezin da <nobr><b>%1</b> makina agiritegia kendu.</nobr></p><p>Mesedez egiaztatu agiritegi hau egitan dagoela eta kentzeko baimena duzula.</p></translation>
     </message>
-</context>
-<context>
-    <name>UINetworkManagerIndicator</name>
     <message>
-        <source>Current network operations:</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source><p>Cannot create the machine folder <b>%1</b> in the parent folder <nobr><b>%2</b>.</nobr></p><p>This folder already exists and possibly belongs to another machine.</p></source>
+        <translation><p>Ezin da<b>%1</b> makina agiritegia sortu <nobr><b>%2</b> gaineko agiritegian.</nobr></p><p>Agiritegi hau jadanik badago eta zihurrenik beste makina batena da.</p></translation>
     </message>
     <message>
-        <source>failed</source>
-        <comment>network operation</comment>
+        <location line="-805"/>
+        <source><p>Are you sure you want to discard the saved state of the following virtual machines?</p><p><b>%1</b></p><p>This operation is equivalent to resetting or powering off the machine without doing a proper shutdown of the guest OS.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(%1 of %2)</source>
+        <location line="+12"/>
+        <source><p>Do you really want to reset the following virtual machines?</p><p><b>%1</b></p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Double-click for more information.</source>
+        <location line="+11"/>
+        <source><p>Do you really want to send an ACPI shutdown signal to the following virtual machines?</p><p><b>%1</b></p></source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UINetworkReplyPrivate</name>
     <message>
-        <source>Host not found</source>
+        <location line="+10"/>
+        <source><p>Do you really want to power off the following virtual machines?</p><p><b>%1</b></p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Content access denied</source>
+        <location line="-186"/>
+        <source><p>You are trying to move machine <nobr><b>%1</b></nobr> to group <nobr><b>%2</b></nobr> which already have sub-group <nobr><b>%1</b></nobr>.</p><p>Please resolve this name-conflict and try again.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Protocol failure</source>
+        <location line="+9"/>
+        <source><p>You are trying to move group <nobr><b>%1</b></nobr> to group <nobr><b>%2</b></nobr> which already have another item with the same name.</p><p>Would you like to automatically rename it?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wrong SSL certificate format</source>
-        <translation type="unfinished"></translation>
+        <location line="+5"/>
+        <source>Rename</source>
+        <translation>Berrizendatu</translation>
     </message>
     <message>
-        <source>SSL authentication failed</source>
+        <location line="+248"/>
+        <source><p>You are about to restore snapshot <nobr><b>%1</b></nobr>.</p><p>You can create a snapshot of the current state of the virtual machine first by checking the box below; if you do not do this the current state will be permanently lost. Do you wish to proceed?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown reason</source>
+        <location line="+11"/>
+        <source><p>Are you sure you want to restore snapshot <nobr><b>%1</b></nobr>?</p></source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UINewHDWizard</name>
-    <message>
-        <source>Create New Virtual Disk</source>
-        <translation type="obsolete">Disko Birtual Berria Sortu</translation>
-    </message>
-    <message>
-        <source><p>This wizard will help you to create a new virtual hard disk image for your virtual machine.</p>
-<p>Use the <b>Next</b> button to go to the next page of the wizard
-and the <b>Back</b> button to return to the previous page.</p></source>
-        <translation type="obsolete"><p>Morroi honek zure makina birtualarentzat disko gogor birtual berriak sortzen lagunduko zaitu.</p>
-<p>Erabili <b>Hurrengoa</b> botoia morroiaren hurrengo orrialdera joateko
-eta <b>Atzera</b> botoia morroiaren aurreko orrialdera joateko.</p></translation>
-    </message>
-    <message>
-        <source>Welcome to the Create New Virtual Disk Wizard!</source>
-        <translation type="obsolete">Ongietorri Disko Gogor Birtual Berriak Sortzeko Morroira!</translation>
-    </message>
-    <message>
-        <source><p>Select the type of virtual hard disk image you want to create.</p>
-<p>A <b>dynamically expanding image</b> initially occupies a very small amount
-of space on your physical hard disk. It will grow dynamically (up to
-the size specified) as the Guest OS claims disk space.</p>
-<p>A <b>fixed-size image</b> does not grow. It is stored in a file of approximately
-the same size as the size of the virtual hard disk.</p></source>
-        <translation type="obsolete"><p>Hautatu sortu nahi duzun disko gogor birtual irudiaren mota.</p>
-<p>A <b>dinamikoki hedatzen</b> diren irudiek hasiera batetan disko
-gogorrean tamaina oso txikia artzen dute. Berau dinamikoki handituko
-da (ezarritako muga arte) bezero sistema eragileak lekua eskatzen
-duen eran.</p>
-<p><b>tamaina ezarritako irudiak</b> ez dira hazten, hauek disko
-gogor birtualaren antzeko tamaina batetako fitxategi batetan gordetzen dira.</p></translation>
-    </message>
-    <message>
-        <source>Image Type</source>
-        <translation type="obsolete">Irudi Mota</translation>
-    </message>
-    <message>
-        <source>&Dynamically expanding image</source>
-        <translation type="obsolete">&Dinamikoki hedatzen den irudia</translation>
-    </message>
-    <message>
-        <source>Alt+D</source>
-        <translation type="obsolete">Alt+D</translation>
-    </message>
-    <message>
-        <source>&Fixed-size image</source>
-        <translation type="obsolete">&Tamaina-ezarritako irudia</translation>
-    </message>
-    <message>
-        <source>Alt+F</source>
-        <translation type="obsolete">Alt+T</translation>
-    </message>
-    <message>
-        <source>Virtual Disk Image Type</source>
-        <translation type="obsolete">Disko Birtual Irudi Mota</translation>
-    </message>
-    <message>
-        <source><p>Press the <b>Select</b> button to select the location and name of the file
-to store the virtual hard disk image or type a file name in the entry field.</p></source>
-        <translation type="obsolete"><p>Sakatu <b>Hautatu</b> botoia disko gogor birtuala gordetzeko
-erabiliko den fitxategiaren kokaleku eta izena hautatu edo fitxategi izen bat idazteko sarrera eremuan.</p></translation>
-    </message>
-    <message>
-        <source>&Image File Name</source>
-        <translation type="obsolete">&Irudi Fitxategi Izena</translation>
-    </message>
-    <message>
-        <source>Select</source>
-        <translation type="obsolete">Hautatu</translation>
-    </message>
-    <message>
-        <source><p>Select the size of the virtual hard disk image in megabytes. This size will be reported to the Guest OS
-as the size of the virtual hard disk.</p></source>
-        <translation type="obsolete"><p>Hautatu disko birtual irudi tamaina megabyte-tan. Tamaina hau SE ostalariari emango zaio
-disko gogor birtual tamaina bezala</p></translation>
-    </message>
-    <message>
-        <source>Image &Size</source>
-        <translation type="obsolete">Irudi &Tamaina</translation>
-    </message>
-    <message>
-        <source>Virtual Disk Location and Size</source>
-        <translation type="obsolete">Disko Birtual Kokapen eta Tamaina</translation>
-    </message>
-    <message>
-        <source>You are going to create a new virtual hard disk image with the following parameters:</source>
-        <translation type="obsolete">Hurrengo parametroak erabiliaz disko gogor birtual bat sortzera zoaz:</translation>
-    </message>
-    <message>
-        <source>If the above settings are correct, press the <b>Finish</b> button.
-                            Once you press it, a new hard disk image will be created.
-                            </source>
-        <translation type="obsolete">Aurreko ezarpen guztiak zuzenak badira, sakatu <b>Amaitu</b> botoia.
-                            Behin sakatu duzunean, disko irudi berria sortuko da.
-                            </translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="obsolete">Laburpena</translation>
-    </message>
-    <message>
-        <source><nobr>%1 Bytes</nobr></source>
-        <translation type="obsolete"><nobr>%1 Byte</nobr></translation>
-    </message>
-    <message>
-        <source><table><tr><td>Type:</td><td>%1</td></tr><tr><td>Location:</td><td>%2</td></tr><tr><td>Size:</td><td>%3&nbsp;(%4&nbsp;Bytes)</td></tr></table></source>
-        <translation type="obsolete"><table><tr><td>Mota:</td><td>%1</td></tr><tr><td>Kokapena:</td><td>%2</td></tr><tr><td>Tamaina:</td><td>%3&nbsp;(%4&nbsp;Byte)</td></tr></table></translation>
-    </message>
-    <message>
-        <source>Hard disk images (*.vdi)</source>
-        <translation type="obsolete">Disko gogor irudiak (*.vdi)</translation>
-    </message>
-    <message>
-        <source>Select a file for the new hard disk image file</source>
-        <translation type="obsolete">Hautatu fitxategi bat disko gogor berriaren irudi fitxategiarentzat</translation>
-    </message>
     <message>
-        <source>Location</source>
-        <comment>summary</comment>
-        <translation type="obsolete">Kokalekuak</translation>
+        <location line="-248"/>
+        <source>Failed to set groups of the virtual machine <b>%1</b>.</source>
+        <translation>Hutsegitea <b>%1</b> makina birtualaren taldeak ezartzerakoan.</translation>
     </message>
     <message>
-        <source>Size</source>
-        <comment>summary</comment>
-        <translation type="obsolete">Tamaina</translation>
+        <location line="+1214"/>
+        <source><p>Could not start the machine <b>%1</b> because the following physical network interfaces were not found:</p><p><b>%2</b></p><p>You can either change the machine's network settings or stop the machine.</p></source>
+        <translation><p>Ezin da <b>%1</b> makina abiarazi hurrengo sare interfaze fisikoak ez direlako aurkitu:</p><p><b>%2</b></p><p>Makinaren sare ezarpenak aldatu edo makina gelditu dezakezu.</p></translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <location line="+5"/>
+        <source>Change Network Settings</source>
+        <translation>Aldatu Sare Ezarpenak</translation>
     </message>
     <message>
-        <source>Storage Type</source>
-        <translation type="obsolete">Biltegiratze Mota</translation>
+        <source>Close Virtual Machine</source>
+        <translation type="obsolete">Itxi Makina Birtuala</translation>
     </message>
-</context>
-<context>
-    <name>UINewHDWizardPageWelcome</name>
     <message>
-        <source>Welcome to the Create New Virtual Disk Wizard!</source>
-        <translation type="obsolete">Ongietorri Disko Gogor Birtual Berriak Sortzeko Morroira!</translation>
+        <location filename="../src/widgets/UIPopupPaneButtonPane.cpp" line="-1"/>
+        <source>Do not show this message again</source>
+        <translation type="unfinished">Ez erakutsi mezu hau berriro</translation>
     </message>
 </context>
 <context>
-    <name>UINewHDWzdPage2</name>
+    <name>UIMiniToolBar</name>
     <message>
-        <source>Storage Type</source>
-        <translation type="obsolete">Biltegiratze Mota</translation>
+        <location filename="../src/widgets/UIMiniToolBar.cpp" line="+665"/>
+        <source>Always show the toolbar</source>
+        <translation>Betik erakutsi tresnabarra</translation>
     </message>
-</context>
-<context>
-    <name>UINewHDWzdPage3</name>
     <message>
-        <source>Virtual Disk Location and Size</source>
-        <translation type="obsolete">Disko Birtual Kokapen eta Tamaina</translation>
+        <location line="+27"/>
+        <source>Minimize Window</source>
+        <translation>Txikiengotu Leihoa</translation>
     </message>
     <message>
-        <source>Select a file for the new hard disk image file</source>
-        <translation type="obsolete">Hautatu fitxategi bat disko gogor berriaren irudi fitxategiarentzat</translation>
+        <location line="+8"/>
+        <source>Exit Full Screen or Seamless Mode</source>
+        <translation>Irten Ikusleiho Osotik edo Irudizko Modutik</translation>
     </message>
     <message>
-        <source>Hard disk images (*.vdi)</source>
-        <translation type="obsolete">Disko gogor irudiak (*.vdi)</translation>
+        <location line="+7"/>
+        <source>Close VM</source>
+        <translation>Itxi MB</translation>
     </message>
 </context>
 <context>
-    <name>UINewHDWzdPage4</name>
-    <message>
-        <source>Summary</source>
-        <translation type="obsolete">Laburpena</translation>
-    </message>
+    <name>UIMultiScreenLayout</name>
     <message>
-        <source>Location</source>
-        <comment>summary</comment>
-        <translation type="obsolete">Kokalekuak</translation>
+        <location filename="../src/runtime/UIActionPoolRuntime.cpp" line="+2109"/>
+        <location line="+15"/>
+        <location line="+47"/>
+        <source>Virtual Screen %1</source>
+        <translation>Ikusleiho Birtuala %1</translation>
     </message>
     <message>
-        <source>Size</source>
-        <comment>summary</comment>
-        <translation type="obsolete">Tamaina</translation>
+        <location line="+220"/>
+        <source>Use Host Screen %1</source>
+        <translation>Erabili Hostalari Ikusleihoa %1</translation>
     </message>
 </context>
 <context>
-    <name>UINewVMWzd</name>
-    <message>
-        <source>Create New Virtual Machine</source>
-        <translation type="obsolete">Makina Birtual Berria Sortu</translation>
-    </message>
-    <message>
-        <source><p>This wizard will guide you through the steps that are necessary to create
-a new virtual machine for VirtualBox.</p>
-<p>Use the <b>Next</b> button to go the next page of the wizard
-and the <b>Back</b> button to return to the previous page.</p></source>
-        <translation type="obsolete"><p>Morroi honek VirtualBox-rentzat makina birtual berriak sortzeko egin
-beharreko huratsetan algunduko zaitu.</p>
-<p>Erabili <b>Hurrengoa</b> botoia morroiaren hurrengo orrialdera joateko
-eta <b>Atzera</b> botoia morroiaren aurreko orrialdera joateko.</p></translation>
-    </message>
-    <message>
-        <source>Welcome to the New Virtual Machine Wizard!</source>
-        <translation type="obsolete">Ongietorri Makina Birtual Berriak Sortzeko Morroira!</translation>
-    </message>
-    <message>
-        <source><p>Enter a name for the new virtual machine and select the type of the guest operating
-system you plan to install onto the virtual machine.</p>
-<p>The name of the virtual machine usually indicates its software and hardware configuration.
-It will be used by all VirtualBox components to identify your virtual machine.</p></source>
-        <translation type="obsolete"><p>Idatzi makina birtual berriaren izena eta makina horretan instalatzea
-pentsatzen duzun sistema eragile mota hautatu</p>
- <p>Makina birtualaren izenak normalean duen software eta hardware konfigurazioa erakusten du.
-Hau VirtualBox-ek zure makina birtuala identifikatzeko erabiliko du.</p></translation>
-    </message>
-    <message>
-        <source>N&ame</source>
-        <translation type="obsolete">Izen&a</translation>
-    </message>
-    <message>
-        <source>OS &Type</source>
-        <translation type="obsolete">SE mo&ta</translation>
-    </message>
-    <message>
-        <source>VM Name and OS Type</source>
-        <translation type="obsolete">MB Izena SE Mota</translation>
-    </message>
-    <message>
-        <source><p>Select the amount of base memory (RAM) in megabytes to be allocated to the virtual machine.</p></source>
-        <translation type="obsolete"><p>Hautatu makina birtualak esleituko duen oinarri memoria (RAM) kopurua.</p></translation>
-    </message>
-    <message>
-        <source>Base &Memory Size</source>
-        <translation type="obsolete">Oinarri &Memoria Tamaina</translation>
-    </message>
-    <message>
-        <source><</source>
-        <translation type="obsolete"><</translation>
-    </message>
-    <message>
-        <source>=</source>
-        <translation type="obsolete">=</translation>
-    </message>
-    <message>
-        <source>></source>
-        <translation type="obsolete">></translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
+    <name>UINameAndSystemEditor</name>
     <message>
-        <source>Memory</source>
-        <translation type="obsolete">Memoria</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Izena:</translation>
     </message>
     <message>
-        <source><p>Select a hard disk image to be used
-as the boot hard disk of the virtual machine. You can either create a new hard
-disk using the <b>New</b> button or select an existing hard disk
-image from the drop-down list or by pressing the <b>Existing</b>
-button (to invoke the Virtual Disk Manager window).</p>
-<p>If you need a more complicated hard disk setup, you can also skip this
-step and attach hard disks later using the VM Settings dialog.</p></source>
-        <translation type="obsolete"><p>Hautatu makina birtualak abio disko gogor bezala
-erabiliko duen disko gogor irudia. Edo <b>Berria</b> botoia sakatuaz
-disko gogor berri bat sortu edo hautapen zerrendatik irudi bat hautatu
-<b>Dagoena</b> botoia sakatuaz (Disko Gogor Kudeatzaile irekiaz).</p>
-<p>Disko gogor konfigurazio hedatuago bat behar izanez gero, urrats
-hau albo batetara utzi eta beranduago MB ezarpen leiho erabiliaz disko
-gogorrak erantsi ditzakezu.</p></translation>
+        <location filename="../src/widgets/UINameAndSystemEditor.cpp" line="+164"/>
+        <source>N&ame:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>B&oot Hard Disk (Primary Master)</source>
-        <translation type="obsolete">Abi&o Disko Gogorra (Lehen Mailako Maisua)</translation>
+        <location line="+1"/>
+        <source>Holds the name of the virtual machine.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>N&ew...</source>
-        <translation type="obsolete">&Berria...</translation>
+        <location line="+2"/>
+        <source>Selects the operating system family that you plan to install into this virtual machine.</source>
+        <translation>Makina birtual honetan ezartzeko asmoa duzun sistema eragile sendia hautatzen du.</translation>
     </message>
     <message>
-        <source>E&xisting...</source>
-        <translation type="obsolete">Da&goena...</translation>
+        <location line="+3"/>
+        <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+        <translation>Makina birtual honetan ezartzeko asmoa duzun sistema eragile sendia hautatzen du (sistema eragile gonbidatua deitua).</translation>
     </message>
     <message>
-        <source>Virtual Hard Disk</source>
-        <translation type="obsolete">Disko Gogor Birtuala</translation>
+        <source>Displays the name of the virtual machine.</source>
+        <translation type="obsolete">Makina birtualaren izen erakusten  du.</translation>
     </message>
     <message>
-        <source>
-                            <p>
-                            You are going to create a new virtual machine
-                            with the following parameters:
-                            </p>
-                            </source>
-        <translation type="obsolete">
-                            <p>
-                            Hurrengo ezarpenekin makina birtual berri bat
-                            sortzera zoaz:
-                            </p>
-                            </translation>
+        <location line="-4"/>
+        <source>&Type:</source>
+        <translation>&Mota:</translation>
     </message>
     <message>
-        <source>
-                            <p>
-                            If the above is correct press the <b>Finish</b> button.
-                            Once you press it, a new virtual machine will be created.
-                            </p><p>
-                            Note that you can alter these and all other setting of the
-                            created virtual machine at any time using the
-                            <b>Settings</b> dialog accessible through
-                            the menu of the main window.
-                            </p>
-                            </source>
-        <translation type="obsolete">
-                            <p>
-                            Aurrekoa zuzena bada sakatu  <b>Amaitu</b> botoia.
-                            Bein botoia sakatu duzunean makina birtual berria sortuko da.
-                            </p><p>
-                            Kontutan izan ezarpen hauek eta beste batzuk edozein unetan
-                            menu nagusiko <b>Ezarpenak</b> aukeraren bidez aldatu ditzakezula
-                            </p>
-                            </translation>
+        <source>Displays the operating system family that you plan to install into this virtual machine.</source>
+        <translation type="obsolete">Makina birtual honetan ezartzeko asmoa duzun sistema eragile sendia erakusten du.</translation>
     </message>
     <message>
-        <source>Summary</source>
-        <translation type="obsolete">Laburpena</translation>
+        <location line="+3"/>
+        <source>&Version:</source>
+        <translation>&Bertsioa:</translation>
     </message>
     <message>
-        <source><qt>%1&nbsp;MB</qt></source>
-        <translation type="obsolete"><qt>%1&nbsp;MB</qt></translation>
+        <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+        <translation type="obsolete">Makina birtual honetan ezartzeko asmoa duzun sistema eragile sendia erakusten du. (gonbidatu sistema eragilea deitua).</translation>
     </message>
+</context>
+<context>
+    <name>UINetworkManagerDialog</name>
     <message>
-        <source><tr><td>Name:</td><td>%1</td></tr><tr><td>OS Type:</td><td>%2</td></tr><tr><td>Base Memory:</td><td>%3&nbsp;MB</td></tr></source>
-        <translation type="obsolete"><tr><td>Izena:</td><td>%1</td></tr><tr><td>SE Mota:</td><td>%2</td></tr><tr><td>Oinarri Memoria:</td><td>%3&nbsp;MB</td></tr></translation>
+        <location filename="../src/net/UINetworkManagerDialog.cpp" line="+160"/>
+        <source>Network Operations Manager</source>
+        <translation>Sare Eragiketa Kudeatzailea</translation>
     </message>
     <message>
-        <source><tr><td>Start-up Disk:</td><td>%4</td></tr></source>
-        <translation type="obsolete"><tr><td>Abio Disko Gogorra:</td><td>%4</td></tr></translation>
+        <location line="+3"/>
+        <source>There are no active network operations.</source>
+        <translation>Ez dago sare eragiketarik gaituta.</translation>
     </message>
     <message>
-        <source>The recommended base memory size is <b>%1</b> MB.</source>
-        <translation type="obsolete">Gomendatutako oinarri memoria <b>%1</b> MB-eko da.</translation>
+        <location line="+3"/>
+        <source>&Cancel All</source>
+        <translation>E&zeztatu Guztiak</translation>
     </message>
     <message>
-        <source>The recommended size of the start-up disk is <b>%1</b> MB.</source>
-        <translation type="obsolete">Abio diskoaren gomendatutako tamaina <b>%1</b> MB da.</translation>
+        <location line="+1"/>
+        <source>Cancel all active network operations</source>
+        <translation>Ezeztatu sare eragiketa gaitu guztiak</translation>
     </message>
     <message>
-        <source>MB</source>
-        <comment>megabytes</comment>
-        <translation type="obsolete">MB</translation>
+        <source>Error: %1.</source>
+        <translation type="obsolete">Akatsa: %1.</translation>
     </message>
     <message>
-        <source>Name</source>
-        <comment>summary</comment>
-        <translation type="obsolete">Izena</translation>
+        <location filename="../src/net/UINetworkRequestWidget.cpp" line="+184"/>
+        <source>The network operation failed with the following error: %1.</source>
+        <translation>Sare eragiketak huts egin du hurrengo akatsarekin: %1.</translation>
     </message>
     <message>
-        <source>OS Type</source>
-        <comment>summary</comment>
-        <translation type="obsolete">SE mota</translation>
+        <location line="+18"/>
+        <source>Network Operation</source>
+        <translation>Sare Eragiketa</translation>
     </message>
     <message>
-        <source>Base Memory</source>
-        <comment>summary</comment>
-        <translation type="obsolete">Oinarri Memoria</translation>
+        <location line="+3"/>
+        <source>Restart network operation</source>
+        <translation>Berrabiarazi sare eragiketa</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <location line="+3"/>
+        <source>Cancel network operation</source>
+        <translation>Ezeztatu sare eragiketa</translation>
     </message>
 </context>
 <context>
-    <name>UINewVMWzdPage1</name>
+    <name>UINetworkManagerIndicator</name>
     <message>
-        <source>Welcome to the New Virtual Machine Wizard!</source>
-        <translation type="obsolete">Ongietorri Makina Birtual Berriak Sortzeko Morroira!</translation>
+        <location filename="../src/net/UINetworkManagerIndicator.cpp" line="+216"/>
+        <source>Current network operations:</source>
+        <translation>Oraingo sare eragiketak:</translation>
     </message>
-</context>
-<context>
-    <name>UINewVMWzdPage2</name>
     <message>
-        <source>N&ame</source>
-        <translation type="obsolete">Izen&a</translation>
+        <location line="+7"/>
+        <source>failed</source>
+        <comment>network operation</comment>
+        <translation>hutsegitea</translation>
     </message>
     <message>
-        <source>OS &Type</source>
-        <translation type="obsolete">SE mo&ta</translation>
+        <location line="+1"/>
+        <source>(%1 of %2)</source>
+        <translation>(%1 -> %2-tik)</translation>
     </message>
     <message>
-        <source>VM Name and OS Type</source>
-        <translation type="obsolete">MB Izena SE Mota</translation>
+        <location line="+8"/>
+        <source>Double-click for more information.</source>
+        <translation>Klik-bikoitza argibide gehiagorako.</translation>
     </message>
 </context>
 <context>
-    <name>UINewVMWzdPage3</name>
+    <name>UINetworkReplyPrivate</name>
     <message>
-        <source><p>Select the amount of base memory (RAM) in megabytes to be allocated to the virtual machine.</p></source>
-        <translation type="obsolete"><p>Hautatu makina birtualak esleituko duen oinarri memoria (RAM) kopurua.</p></translation>
+        <location filename="../src/net/UINetworkReply.cpp" line="+648"/>
+        <source>Host not found</source>
+        <translation>Hostalaria ez da aurkitu</translation>
     </message>
     <message>
-        <source>Base &Memory Size</source>
-        <translation type="obsolete">Oinarri &Memoria Tamaina</translation>
+        <location line="+2"/>
+        <source>Content access denied</source>
+        <translation>Edukirako sarbidea ukatuta</translation>
     </message>
     <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
+        <location line="+2"/>
+        <source>Protocol failure</source>
+        <translation>Protokolo hutsegitea</translation>
     </message>
     <message>
-        <source>Memory</source>
-        <translation type="obsolete">Memoria</translation>
+        <location line="+2"/>
+        <source>Wrong SSL certificate format</source>
+        <translation>SSL egiaztagiri heuskarri okerra</translation>
     </message>
     <message>
-        <source>The recommended base memory size is <b>%1</b> MB.</source>
-        <translation type="obsolete">Gomendatutako oinarri memoria <b>%1</b> MB-eko da.</translation>
+        <location line="+2"/>
+        <source>SSL authentication failed</source>
+        <translation>SSL egiaztapen hutsegitea</translation>
     </message>
     <message>
-        <source>MB</source>
-        <comment>size suffix MBytes=1024 KBytes</comment>
-        <translation type="obsolete">MB</translation>
+        <location line="+2"/>
+        <source>Unknown reason</source>
+        <translation>Zergaitik ezezaguna</translation>
     </message>
 </context>
 <context>
-    <name>UINewVMWzdPage4</name>
-    <message>
-        <source>Virtual Hard Disk</source>
-        <translation type="obsolete">Disko Gogor Birtuala</translation>
-    </message>
+    <name>UIPopupCenter</name>
     <message>
-        <source>The recommended size of the start-up disk is <b>%1</b> MB.</source>
-        <translation type="obsolete">Abio diskoaren gomendatutako tamaina <b>%1</b> MB da.</translation>
+        <location filename="../src/widgets/UIPopupPane.cpp" line="+278"/>
+        <location line="+1"/>
+        <source>Click for full details</source>
+        <translation>Klikatu xehetasun guztietarako</translation>
     </message>
 </context>
 <context>
-    <name>UINewVMWzdPage5</name>
-    <message>
-        <source>Summary</source>
-        <translation type="obsolete">Laburpena</translation>
-    </message>
+    <name>UIPortForwardingModel</name>
     <message>
         <source>Name</source>
-        <comment>summary</comment>
         <translation type="obsolete">Izena</translation>
     </message>
     <message>
-        <source>OS Type</source>
-        <comment>summary</comment>
-        <translation type="obsolete">SE mota</translation>
+        <source>Protocol</source>
+        <translation type="obsolete">Protokoloa</translation>
     </message>
     <message>
-        <source>Base Memory</source>
-        <comment>summary</comment>
-        <translation type="obsolete">Oinarri Memoria</translation>
+        <source>Host IP</source>
+        <translation type="obsolete">Hostalari IP-a</translation>
     </message>
     <message>
-        <source>MB</source>
-        <comment>size suffix MBytes=1024KBytes</comment>
-        <translation type="obsolete">MB</translation>
+        <source>Host Port</source>
+        <translation type="obsolete">Hostalari Ataka</translation>
     </message>
-</context>
-<context>
-    <name>UIPopupCenter</name>
     <message>
-        <source>Click for full details</source>
-        <translation type="unfinished"></translation>
+        <source>Guest IP</source>
+        <translation type="obsolete">Gonbidatu IP-a</translation>
     </message>
-</context>
-<context>
-    <name>UIPortForwardingModel</name>
     <message>
-        <source>Name</source>
-        <translation type="obsolete">Izena</translation>
+        <source>Guest Port</source>
+        <translation type="obsolete">Gonbidatu Ataka</translation>
     </message>
 </context>
 <context>
     <name>UIPortForwardingTable</name>
     <message>
+        <location filename="../src/widgets/UIPortForwardingTable.cpp" line="+429"/>
         <source>Name</source>
         <translation type="unfinished">Izena</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Protocol</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Protokoloa</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Host IP</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hostalari IP-a</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Host Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hostalari Ataka</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Guest IP</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gonbidatu IP-a</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Guest Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gonbidatu Ataka</translation>
     </message>
     <message>
+        <location line="+391"/>
         <source>Contains a list of port forwarding rules.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Add New Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copy Selected Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Remove Selected Rule</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+2"/>
         <source>Adds new port forwarding rule.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Copies selected port forwarding rule.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Removes selected port forwarding rule.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7595,207 +8830,254 @@ gogorrak erantsi ditzakezu.</p></translation>
 <context>
     <name>UIProgressDialog</name>
     <message>
+        <location filename="../src/widgets/UIProgressDialog.cpp" line="+322"/>
         <source>A few seconds remaining</source>
-        <translation type="unfinished"></translation>
+        <translation>Segundu gutxi gelditzen dira</translation>
     </message>
     <message>
+        <location line="-177"/>
         <source>Canceling...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezeztatzen...</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>E&zeztatu</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Cancel the current operation</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezeztatu oraingo eragiketa</translation>
     </message>
     <message>
+        <location line="+147"/>
         <source>%1, %2 remaining</source>
         <comment>You may wish to translate this more like "Time remaining: %1, %2"</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1, %2 gelditzen da</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>%1 remaining</source>
         <comment>You may wish to translate this more like "Time remaining: %1"</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 gelditzen da</translation>
     </message>
 </context>
 <context>
     <name>UISelectorWindow</name>
     <message>
+        <location filename="../src/selector/UISelectorWindow.cpp" line="+228"/>
         <source>Show Toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Erakutsi Tresnabarra</translation>
     </message>
     <message>
+        <location line="+8"/>
         <source>Show Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Erakutsi Egoerabarra</translation>
     </message>
     <message>
+        <location line="+122"/>
         <source>Select a virtual machine file</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu makina birtual agiria</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Virtual machine files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Makina birtual agiriak (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Ongietorri VirtualBox-era!</h3><p>Leiho honen ezkerreko zatian ordenagailu honetako makina birtual guztiak daude. Zerrenda orain hutsik dago oraindik ez duzu makina birtualik sortu eta.<img src=:/welcome.png align=right/></p><p>Makina berri bat sortzeko sakatu <b>Berria</b> botoia leihoaren goialdeko tresna-barran nagusian.</p><p><b>%1</b> tekla sakatu dezakezu laguntza eskura [...]
+        <location line="+579"/>
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation><h3>Ongi etorri VirtualBox-era!</h3><p>Leiho honetako ezker aldea zure ordenagailuko makina birtualen zerrenda bat da. Zerrenda orain hutsik dago oraindik ez duzulako makina birtualik sortu.<img src=:/welcome.png align=right/></p><p>Makina birtual berri bat sortzeko, sakatu <b>Berria</b> botoia leihoaren goialdeko tresna barra nagusian.</p><p><b>%1</b> tekla sakatu dezakezu berehalako laguntza lo [...]
     </message>
     <message>
+        <location line="+80"/>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
+        <translation>Kudeatzailea</translation>
     </message>
 </context>
 <context>
     <name>UISession</name>
     <message>
+        <location filename="../src/runtime/UISession.cpp" line="+525"/>
         <source>Updating Guest Additions</source>
-        <translation type="unfinished"></translation>
+        <translation>Gonbidatu Gehigarriak Eguneratzen</translation>
     </message>
 </context>
 <context>
     <name>UISettingsDialog</name>
     <message>
+        <location filename="../src/settings/UISettingsDialog.ui" line="+26"/>
         <source><i>Select a settings category from the list on the left-hand side and move the mouse over a settings item to get more information.</i></source>
-        <translation type="unfinished"></translation>
+        <translation><i>Hautatu ezarpen kategoria bat ezkerreko zerrendatik eta mugitu sagua ezarpen gaien gainean argibide gehiago lortzeko.</i></translation>
     </message>
     <message>
-        <source>Invalid settings detected</source>
-        <translation type="unfinished"></translation>
+        <source>On the <b>%1</b> page, %2</source>
+        <translation type="obsolete"><b>%1</b> orrialdean, %2</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation type="obsolete">Ezarpenak</translation>
+        <location filename="../src/settings/UISettingsDialog.cpp" line="+319"/>
+        <source>Invalid settings detected</source>
+        <translation>Ezarpen baliogabea atzeman da</translation>
     </message>
     <message>
+        <location line="+76"/>
         <source><b>%1</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1</b> orrialdea:</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source><b>%1: %2</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1: %2</b> orrialdea:</translation>
+    </message>
+    <message>
+        <source>Non-optimal settings detected</source>
+        <translation type="obsolete">Ezarpen ez-hoberena atzeman da</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="obsolete">Ezarpenak</translation>
     </message>
 </context>
 <context>
     <name>UISettingsDialogGlobal</name>
     <message>
+        <location filename="../src/settings/UISettingsDialogSpecific.cpp" line="+251"/>
         <source>General</source>
-        <translation type="unfinished">Orokorra</translation>
+        <translation>Orokorra</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Input</source>
-        <translation type="unfinished"></translation>
+        <translation>Sarrera</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Eguneraketa</translation>
     </message>
     <message>
+        <location line="+4"/>
         <source>Language</source>
-        <translation type="unfinished"> Hizkuntza </translation>
+        <translation>Hizkuntza</translation>
     </message>
     <message>
         <source>USB</source>
         <translation type="obsolete">USB</translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>Network</source>
-        <translation type="unfinished">Sarea</translation>
+        <translation>Sarea</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Extensions</source>
+        <translation>Hedapenak</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+6"/>
         <source>VirtualBox - %1</source>
-        <translation type="unfinished"></translation>
+        <translation>VirtualBox - %1</translation>
     </message>
     <message>
+        <location line="-24"/>
         <source>Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxya</translation>
     </message>
     <message>
+        <location line="-10"/>
         <source>Display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>Erakuspena</translation>
     </message>
 </context>
 <context>
     <name>UISettingsDialogMachine</name>
     <message>
+        <location line="+349"/>
         <source>General</source>
-        <translation type="unfinished">Orokorra</translation>
+        <translation>Orokorra</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation>Sistema</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Erakutsi</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Storage</source>
-        <translation type="unfinished"></translation>
+        <translation>Biltegia</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Audio</source>
-        <translation type="unfinished">Audioa</translation>
+        <translation>Audioa</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Network</source>
-        <translation type="unfinished">Sarea</translation>
+        <translation>Sarea</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Ports</source>
-        <translation type="unfinished"></translation>
+        <translation>Atakak</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Serial Ports</source>
-        <translation type="unfinished">Serie Atakak</translation>
+        <translation>Serieko Atakak</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Parallel Ports</source>
-        <translation type="unfinished"></translation>
+        <translation>Ataka Kidetuak</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>USB</source>
-        <translation type="unfinished">USB</translation>
+        <translation>USB</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Shared Folders</source>
-        <translation type="unfinished">Partekatutako Karpetak</translation>
-    </message>
-    <message>
-        <source>%1 - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Elkarbanatutako Agiritegiak</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>User Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+17"/>
         <source>Settings</source>
         <translation type="unfinished">Ezarpenak</translation>
     </message>
+    <message>
+        <location line="+10"/>
+        <source>%1 - %2</source>
+        <translation>%1 - %2</translation>
+    </message>
 </context>
 <context>
     <name>UISettingsSerializerProgress</name>
     <message>
+        <location filename="../src/settings/UISettingsSerializer.cpp" line="+339"/>
         <source>Loading Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Saving Settings...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7803,6436 +9085,4038 @@ gogorrak erantsi ditzakezu.</p></translation>
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <location filename="../src/runtime/UIStatusBarEditorWindow.cpp" line="+153"/>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+361"/>
         <source>Close</source>
         <translation type="unfinished">Itxi</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
     <message>
+        <location filename="../src/widgets/UILineTextEdit.cpp" line="-39"/>
         <source>Edit text</source>
-        <translation type="unfinished"></translation>
+        <translation>Editatu idazkia</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>&Replace...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ordeztu...</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Replaces the current text with the content of a file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordeztu oraingo idazkia agiri baten edukiarekin.</translation>
     </message>
     <message>
+        <location line="+5"/>
         <source>Text (*.txt);;All (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Idazkia (*.txt);;Guztiak (*.*)</translation>
     </message>
     <message>
+        <location line="+0"/>
         <source>Select a file to open...</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu irekitzeko agiri bat...</translation>
     </message>
 </context>
 <context>
     <name>UIUpdateManager</name>
     <message>
+        <location filename="../src/net/UIUpdateDefs.cpp" line="+46"/>
         <source>1 day</source>
-        <translation type="unfinished"></translation>
+        <translation>1 egun</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>2 days</source>
-        <translation type="unfinished"></translation>
+        <translation>2 egun</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>3 days</source>
-        <translation type="unfinished"></translation>
+        <translation>3 egun</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>4 days</source>
-        <translation type="unfinished"></translation>
+        <translation>4 egun</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>5 days</source>
-        <translation type="unfinished"></translation>
+        <translation>5 egun</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>6 days</source>
-        <translation type="unfinished"></translation>
+        <translation>6 egun</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>1 week</source>
-        <translation type="unfinished"></translation>
+        <translation>1 aste</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>2 weeks</source>
-        <translation type="unfinished"></translation>
+        <translation>2 aste</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>3 weeks</source>
-        <translation type="unfinished"></translation>
+        <translation>3 aste</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>1 month</source>
-        <translation type="unfinished"></translation>
+        <translation>1 hilabete</translation>
     </message>
     <message>
+        <location line="+64"/>
         <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection timed out.</source>
-        <translation type="obsolete">Konexioa denboraz kanpo.</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="obsolete">Laburpena</translation>
+        <translation>Inoiz ez</translation>
     </message>
 </context>
 <context>
     <name>UIUpdateStepVirtualBox</name>
     <message>
+        <location filename="../src/net/UIUpdateManager.cpp" line="+195"/>
         <source>Checking for a new VirtualBox version...</source>
-        <translation type="unfinished"></translation>
+        <translation>VirtualBox bertsio berririk dagoen egiaztatzen...</translation>
     </message>
 </context>
 <context>
     <name>UIVMCloseDialog</name>
     <message>
+        <location filename="../src/runtime/UIVMCloseDialog.cpp" line="+404"/>
         <source>Close Virtual Machine</source>
-        <translation type="unfinished">Makina Birtuala Itxi</translation>
+        <translation>Itxi Makina Birtuala</translation>
     </message>
     <message>
+        <location line="+3"/>
         <source>You want to:</source>
-        <translation type="unfinished">Hau nahi duzu:</translation>
+        <translation>Nahi duzu:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&Continue running in the background</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source><p>Close the virtual machine windows but keep the virtual machine running.</p><p>You can use the VirtualBox Manager to return to running the virtual machine in a window.</p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source><p>Saves the current execution state of the virtual machine to the physical hard disk of the host PC.</p><p>Next time this machine is started, it will be restored from the saved state and continue execution from the same place you saved it at, which will let you continue your work immediately.</p><p>Note that saving the machine state may take a long time, depending on the guest operating system type and the amount of memory you assigned to th [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1"/>
         <source>&Save the machine state</source>
-        <translation type="unfinished">Makina egoera &grabatu</translation>
+        <translation>&Gorde makinaren egoera</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source><p>Sends the ACPI Power Button press event to the virtual machine.</p><p>Normally, the guest operating system running inside the virtual machine will detect this event and perform a clean shutdown procedure. This is a recommended way to turn off the virtual machine because all applications running inside it will get a chance to save their data and state.</p><p>If the machine doesn't respond to this action then the guest operating system  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1"/>
         <source>S&end the shutdown signal</source>
-        <translation type="unfinished"></translation>
+        <translation>&Bidali itzaltze seinalea</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source><p>Turns off the virtual machine.</p><p>Note that this action will stop machine execution immediately so that the guest operating system running inside it will not be able to perform a clean shutdown procedure which may result in <i>data loss</i> inside the virtual machine. Selecting this action is recommended only if the virtual machine does not respond to the <b>Send the shutdown signal</b> action.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1"/>
         <source>&Power off the machine</source>
-        <translation type="unfinished">Makina &Itzali</translation>
+        <translation>&Itzali makina</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Restore the machine state stored in the current snapshot</source>
-        <translation type="unfinished"></translation>
+        <translation>Leheneratu makinaren biltegiratutako egoera oraingo berehalakoan</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source><p>When checked, the machine will be returned to the state stored in the current snapshot after it is turned off. This is useful if you are sure that you want to discard the results of your last sessions and start again at that snapshot.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Hautatutakoan, makina oraingo berehalakoan biltegiratutako egoerara itzuliko da itzali ondoren. Hau erabilgarria da azken saioetako emaitzak baztertzeaz eta argazki berri bat hasteaz zihur bazaude.</p></translation>
     </message>
     <message>
+        <location line="-2"/>
         <source>&Restore current snapshot '%1'</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Continue running in the background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>Close the virtual machine windows but keep the virtual machine running.</p><p>You can use the VirtualBox Manager to return to running the virtual machine in a window.</p></source>
-        <translation type="unfinished"></translation>
+        <translation>&Leheneratu oraingo berehalakoa '%1'</translation>
     </message>
 </context>
 <context>
     <name>UIVMDesktop</name>
     <message>
+        <location filename="../src/selector/UIVMDesktop.cpp" line="+228"/>
         <source>&Details</source>
-        <translation type="unfinished">&Xehetasunak</translation>
+        <translation>&Xehetasunak</translation>
     </message>
     <message>
+        <location line="-32"/>
         <source>&Snapshots</source>
-        <translation type="unfinished">&Egoera-argazkia</translation>
+        <translation>&Berehalakoak</translation>
     </message>
 </context>
 <context>
     <name>UIVMInfoDialog</name>
     <message>
+        <location filename="../src/UIVMInfoDialog.cpp" line="-592"/>
         <source>%1 - Session Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 - Saio Argibideak</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Xehetasunak</translation>
+        <location line="+3"/>
+        <source>Configuration &Details</source>
+        <translation type="unfinished">Itxurapen &Xehetasunak</translation>
     </message>
     <message>
+        <location line="+1"/>
+        <source>&Runtime Information</source>
+        <translation type="unfinished">&Runtime Argibideak</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <location line="+37"/>
         <source>DMA Transfers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">DMA Eskualdaketak</translation>
     </message>
     <message>
+        <location line="-35"/>
         <source>PIO Transfers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">PIO Eskualdaketak</translation>
     </message>
     <message>
+        <location line="+2"/>
+        <location line="+35"/>
+        <location line="+27"/>
         <source>Data Read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Datu Irakurrita</translation>
     </message>
     <message>
+        <location line="-60"/>
+        <location line="+35"/>
+        <location line="+27"/>
         <source>Data Written</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Datu Idatzita</translation>
     </message>
     <message>
+        <location line="+44"/>
         <source>Data Transmitted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Datu Igorrita</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Data Received</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not attached</source>
-        <translation type="obsolete">Ez erantsia</translation>
+        <translation type="unfinished">Datu Jasota</translation>
     </message>
     <message>
+        <location line="+375"/>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ez da Atzeman</translation>
     </message>
     <message>
+        <location line="+9"/>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Network Adapters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Storage Statistics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Storage Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ez da Atzeman</translation>
     </message>
     <message>
+        <location line="+7"/>
         <source>Not Available</source>
         <comment>details report (VRDE server port)</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ez dago Eskuragarri</translation>
     </message>
     <message>
-        <source>Clipboard Mode</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Runtime Ezaugarriak</translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
+        <location line="+3"/>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Ikusleiho Bereizmena</translation>
     </message>
     <message>
-        <source>&Runtime Information</source>
+        <location line="+6"/>
+        <source>VM Uptime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished">Gako Modua</translation>
     </message>
     <message>
+        <location line="+1"/>
         <source>Drag and Drop Mode</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIVMListView</name>
-    <message>
-        <source>Inaccessible</source>
-        <translation type="unfinished">Eskuraezina</translation>
-    </message>
-    <message>
-        <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
-        <comment>VM tooltip (name, last state change, session state)</comment>
-        <translation type="unfinished"><nobr>%1<br></nobr><nobr>%2 %3-tik</nobr><br><nobr>%4 saioa</nobr></translation>
-    </message>
-    <message>
-        <source><nobr><b>%1</b><br></nobr><nobr>Inaccessible since %2</nobr></source>
-        <comment>Inaccessible VM tooltip (name, last state change)</comment>
-        <translation type="unfinished"><nobr><b>%1</b><br></nobr><nobr>Eskuraezina %2 -tik</nobr></translation>
-    </message>
-    <message>
-        <source>S&how</source>
-        <translation type="obsolete">I&kusi</translation>
-    </message>
-    <message>
-        <source>Switch to the window of the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtualaren leihora aldatu</translation>
-    </message>
-    <message>
-        <source>S&tart</source>
-        <translation type="obsolete">Abiara&zi</translation>
-    </message>
-    <message>
-        <source>Start the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtuala abiarazi</translation>
-    </message>
-    <message>
-        <source>R&esume</source>
-        <translation type="obsolete">Ja&rraitu</translation>
-    </message>
-    <message>
-        <source>Resume the execution of the virtual machine</source>
-        <translation type="obsolete">Makina birtualaren exekuzioa jarraitu</translation>
-    </message>
-    <message>
-        <source>&Pause</source>
-        <translation type="obsolete">&Gelditu</translation>
-    </message>
-    <message>
-        <source>Suspend the execution of the virtual machine</source>
-        <translation type="obsolete">Makina Birtualaren exekuzioa gelditu</translation>
-    </message>
-</context>
-<context>
-    <name>UIVMLogViewer</name>
-    <message>
-        <source>Close the search panel</source>
-        <translation type="unfinished">Bilaketa panela itxi</translation>
-    </message>
-    <message>
-        <source>&Find</source>
-        <translation type="unfinished">&Bilatu</translation>
-    </message>
-    <message>
-        <source>Enter a search string here</source>
-        <translation type="unfinished">Bilaketa katea idatzi hemen</translation>
-    </message>
-    <message>
-        <source>&Previous</source>
-        <translation type="unfinished">&Aurrekoa</translation>
-    </message>
-    <message>
-        <source>Search for the previous occurrence of the string</source>
-        <translation type="unfinished">Katearen aurreko errepikatzea bilatu</translation>
-    </message>
-    <message>
-        <source>&Next</source>
-        <translation type="unfinished">&Hurrengoa</translation>
-    </message>
-    <message>
-        <source>Search for the next occurrence of the string</source>
-        <translation type="unfinished">Katearen hurrengo errepikatzea bilatu</translation>
-    </message>
-    <message>
-        <source>C&ase Sensitive</source>
-        <translation type="unfinished">Min/M&aius Ezberdindu</translation>
-    </message>
-    <message>
-        <source>Perform case sensitive search (when checked)</source>
-        <translation type="unfinished">Maiuskula/minuskulak ezberdintzen egin bilaketa (hautaturik dagoenean)</translation>
-    </message>
-    <message>
-        <source>String not found</source>
-        <translation type="unfinished">Katea ez da aurkitu</translation>
-    </message>
-    <message>
-        <source><p>No log files found. Press the <b>Refresh</b> button to rescan the log folder <nobr><b>%1</b></nobr>.</p></source>
-        <translation type="unfinished"><p>Ez da erregistro fitxategirik aurkitu. Sakatu <b>Freskatu</b> botoia erregistro karpeta berriz arakatzeko <nobr><b>%1</b></nobr>.</p></translation>
-    </message>
-    <message>
-        <source>Save VirtualBox Log As</source>
-        <translation type="unfinished">VirtualBox Erregistroa Gorde Honela</translation>
-    </message>
-    <message>
-        <source>%1 - VirtualBox Log Viewer</source>
-        <translation type="unfinished">%1 - VirtualBox Erregistro ikustatzailea</translation>
-    </message>
     <message>
-        <source>&Refresh</source>
-        <translation type="unfinished">F&reskatu</translation>
-    </message>
-    <message>
-        <source>&Save</source>
-        <translation type="unfinished">&Gorde</translation>
+        <location line="+5"/>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Gonbidatu Gehigarriak</translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Itxi</translation>
+        <location line="+1"/>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Gonbidatu SE Mota</translation>
     </message>
-</context>
-<context>
-    <name>UIWizard</name>
     <message>
-        <source>&Expert Mode</source>
-        <translation type="unfinished"></translation>
+        <location line="+11"/>
+        <source>Storage Statistics</source>
+        <translation type="unfinished">Biltegi Estatistikak</translation>
     </message>
     <message>
-        <source>Switch to <nobr><b>Expert Mode</b></nobr>, a one-page dialog for experienced users.</source>
-        <translation type="unfinished"></translation>
+        <location line="+72"/>
+        <source>No Storage Devices</source>
+        <translation type="unfinished">Ez dago Biltegi Gailurik</translation>
     </message>
     <message>
-        <source>&Guided Mode</source>
-        <translation type="unfinished"></translation>
+        <location line="+14"/>
+        <source>Network Statistics</source>
+        <translation type="unfinished">Sare Estatistikak</translation>
     </message>
     <message>
-        <source>Switch to <nobr><b>Guided Mode</b></nobr>, a step-by-step dialog with detailed explanations.</source>
-        <translation type="unfinished"></translation>
+        <location line="+18"/>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Ez dago Sare Egokitzailerik</translation>
     </message>
 </context>
 <context>
-    <name>UIWizardCloneVD</name>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Dynamically allocated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Fixed size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Split into files of less than 2GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1_copy</source>
-        <comment>copied virtual hard drive name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard disk to copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>Please select the virtual hard disk file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a virtual hard disk file to copy...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New hard disk to create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard disk to &copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&New hard disk to create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIWizardCloneVM</name>
-    <message>
-        <source>Linked Base for %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clone Virtual Machine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 Clone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New machine name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>Please choose a name for the new virtual machine. The new machine will be a clone of the machine <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked a new unique MAC address will be assigned to all configured network cards.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Reinitialize the MAC address of all network cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clone type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>If you create a <b>Linked clone</b> then a new snapshot will be created in the original virtual machine as part of the cloning process.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Full clone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Linked clone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Snapshots</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>Please choose which parts of the snapshot tree should be cloned with the machine.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>If you choose <b>Current machine state</b>, the new machine will reflect the current state of the original machine and will have no snapshots.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>If you choose <b>Current snapshot tree branch</b>, the new machine will reflect the current state of the original machine and will have matching snapshots for all snapshots in the tree branch starting at the current state in the original machine.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>If you choose <b>Everything</b>, the new machine will reflect the current state of the original machine and will have matching snapshots for all snapshots in the original machine.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &machine state</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &snapshot tree branch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Everything</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New machine &name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Full Clone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Linked Clone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIWizardExportApp</name>
-    <message>
-        <source>Checking files ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing files ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exporting Appliance ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export Virtual Appliance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restore Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Virtual machines to export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>Please select the virtual machines that should be added to the appliance. You can select more than one. Please note that these machines have to be turned off before they can be exported.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Appliance settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose where to create the virtual appliance. You can create it on your own computer, on the Sun Cloud service or on an S3 storage server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&This computer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sun &Cloud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Simple Storage System (S3)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Appliance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Hostname:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Bucket:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&File:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Virtualization Format Archive (%1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Virtualization Format (%1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write in legacy OVF 0.9 format for compatibility with other virtualization products.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create a Manifest file for automatic data integrity checks on import.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write &Manifest file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is the descriptive information which will be added to the virtual appliance.  You can change it by double clicking on individual lines.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Virtual &machines to export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Appliance &settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Local Filesystem </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose a file to export the virtual appliance to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F&ormat:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OVF 0.9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OVF 1.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OVF 2.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write in standard OVF 1.0 format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write in new experimental OVF 2.0 format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Storage settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIWizardExportAppPageBasic3</name>
-    <message>
-        <source><p>Please choose a filename to export the OVF/OVA to.</p><p>If you use an <i>ova</i> extension, then all the files will be combined into one Open Virtualization Format Archive.</p><p>If you use an <i>ovf</i> extension, several files will be written separately.</p><p>Other extensions are not allowed.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please complete the additional fields like the username, password and the bucket, and provide a filename for the OVF target.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please complete the additional fields like the username, password, hostname and the bucket, and provide a filename for the OVF target.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIWizardExportAppPageExpert</name>
-    <message>
-        <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIWizardFirstRun</name>
-    <message>
-        <source>Select start-up disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished">Abiarazi</translation>
-    </message>
-    <message>
-        <source><p>Please select a virtual optical disk file or a physical optical drive containing a disk to start your new virtual machine from.</p><p>The disk should be suitable for starting a computer from and should contain the operating system you wish to install on the virtual machine if you want to do that now. The disk will be ejected from the virtual drive automatically next time you switch the virtual machine off, but you can also do this yourself if needed u [...]
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>Please select a virtual optical disk file or a physical optical drive containing a disk to start your new virtual machine from.</p><p>The disk should be suitable for starting a computer from. As this virtual machine has no hard drive you will not be able to install an operating system on it at the moment.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a virtual optical disk file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIWizardImportApp</name>
-    <message>
-        <source>Restore Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Appliance to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>VirtualBox currently supports importing appliances saved in the Open Virtualization Format (OVF). To continue, select the file to import below.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Virtualization Format (%1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Appliance settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>These are the virtual machines contained in the appliance and the suggested settings of the imported VirtualBox machines. You can change many of the properties shown by double-clicking on the items and disable others using the check boxes below.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import Virtual Appliance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a virtual appliance file to import...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose a virtual appliance file to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIWizardNewVD</name>
-    <message>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Dynamically allocated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Fixed size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Split into files of less than 2GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><nobr>%1 (%2 B)</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File location and size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File &location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File &size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the size of the virtual hard disk in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard disk.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIWizardNewVM</name>
-    <message>
-        <source>Create Virtual Machine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name and operating system</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Memory size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>Select the amount of memory (RAM) in megabytes to be allocated to the virtual machine.</p><p>The recommended memory size is <b>%1</b> MB.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Memory size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>If you wish you can add a virtual hard disk to the new machine. You can either create a new hard disk file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard disk is <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Do not add a virtual hard disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Create a virtual hard disk now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Use an existing virtual hard disk file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VBoxAboutDlg</name>
-    <message>
-        <source>VirtualBox - About</source>
-        <translation>VirtualBox - Honi Buruz</translation>
-    </message>
-    <message>
-        <source><qt>VirtualBox Graphical User Interface Version %1<br>
-%2</qt></source>
-        <translation type="obsolete"><qt>VirtualBox Erabiltzaile Interfaze Grafikoa %1 Bertsioa<br>
-%2</qt></translation>
-    </message>
-    <message>
-        <source>VirtualBox Graphical User Interface</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Version %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VBoxAboutNonOSEDlg</name>
-    <message>
-        <source>VirtualBox - About</source>
-        <translation type="obsolete">VirtualBox - Honi Buruz</translation>
-    </message>
-</context>
-<context>
-    <name>VBoxAddNIDialog</name>
-    <message>
-        <source>Add Host Interface</source>
-        <translation type="obsolete">Ostalari interfaze bat gehitu</translation>
-    </message>
-    <message>
-        <source>Interface Name</source>
-        <translation type="obsolete">Interfaze Izena</translation>
-    </message>
-    <message>
-        <source>Descriptive name of the new network interface</source>
-        <translation type="obsolete">Sare interfaze berriaren izen azalkorra</translation>
-    </message>
-    <message>
-        <source>&OK</source>
-        <translation type="obsolete">Ad&os</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
-    </message>
-</context>
-<context>
-    <name>VBoxAddSFDialog</name>
-    <message>
-        <source>Add Share</source>
-        <translation type="obsolete">Gehitu Partekatzea</translation>
-    </message>
-    <message>
-        <source>Edit Share</source>
-        <translation type="obsolete">Editatu Partekatzea</translation>
-    </message>
-    <message>
-        <source>Select a folder to share</source>
-        <translation type="obsolete">Partekatzeko karpeta bat hautatu</translation>
-    </message>
-    <message>
-        <source>Folder Path</source>
-        <translation type="obsolete">Karpeta Bidea</translation>
-    </message>
-    <message>
-        <source>Folder Name</source>
-        <translation type="obsolete">Karpeta Izena</translation>
-    </message>
-    <message>
-        <source>Holds the path to an existing folder on the host PC.</source>
-        <translation type="obsolete">Ostalari PC-an dagoeneko dagoen karpeta baten bidea bistaratzen du.</translation>
-    </message>
-    <message>
-        <source>Holds the name of the shared folder (as it will be seen by the guest OS).</source>
-        <translation type="obsolete">Partekatutako karpetaren izen bistaratzen du (Ostalari PC-an ikusiko den bezala).</translation>
-    </message>
-    <message>
-        <source>Opens the dialog to select a folder.</source>
-        <translation type="obsolete">Karpeta hauatzeko leihoa irekitzen du.</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
-    </message>
-    <message>
-        <source>&OK</source>
-        <translation type="obsolete">&Ados</translation>
-    </message>
-</context>
-<context>
-    <name>VBoxCloseVMDlg</name>
-    <message>
-        <source>Close Virtual Machine</source>
-        <translation type="obsolete">Makina Birtuala Itxi</translation>
-    </message>
-    <message>
-        <source>You want to:</source>
-        <translation type="obsolete">Hau nahi duzu:</translation>
-    </message>
-    <message>
-        <source>&Save the machine state</source>
-        <translation type="obsolete">Makina egoera &grabatu</translation>
-    </message>
-    <message>
-        <source>Alt+S</source>
-        <translation type="obsolete">Alt+G</translation>
-    </message>
-    <message>
-        <source>&Power off the machine</source>
-        <translation type="obsolete">Makina &Itzali</translation>
-    </message>
-    <message>
-        <source>Alt+P</source>
-        <translation type="obsolete">Alt+I</translation>
-    </message>
-    <message>
-        <source>&Revert to the current snapshot</source>
-        <translation type="obsolete">Uneko Egoe&ra-argazkira Itzuli</translation>
-    </message>
-    <message>
-        <source>Alt+R</source>
-        <translation type="obsolete">Alt+R</translation>
-    </message>
-    <message>
-        <source>Revert the machine state to the state stored in the current snapshot</source>
-        <translation type="obsolete">Uneko egoera egoera-argazkian gordetako egoerara itzuli makina</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Laguntza</translation>
-    </message>
-    <message>
-        <source>F1</source>
-        <translation type="obsolete">F1</translation>
-    </message>
-    <message>
-        <source>&OK</source>
-        <translation type="obsolete">Ad&os</translation>
-    </message>
-    <message>
-        <source>Alt+O</source>
-        <translation type="obsolete">Alt+O</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
-    </message>
-</context>
-<context>
-    <name>VBoxConsoleWnd</name>
-    <message>
-        <source>VirtualBox OSE</source>
-        <translation type="obsolete">VirtualBox OSE</translation>
-    </message>
-    <message>
-        <source>innotek VirtualBox</source>
-        <translation type="obsolete">innotek VirtualBox</translation>
-    </message>
-    <message>
-        <source>&Fullscreen Mode</source>
-        <translation type="obsolete">&Panataila Osoko Modua</translation>
-    </message>
-    <message>
-        <source>Switch to fullscreen mode</source>
-        <translation type="obsolete">Panataila oso modura aldatu</translation>
-    </message>
-    <message>
-        <source>Mouse Integration</source>
-        <comment>enable/disable...</comment>
-        <translation type="obsolete">Sagu integrazioa</translation>
-    </message>
-    <message>
-        <source>Auto-resize Guest Display</source>
-        <comment>enable/disable...</comment>
-        <translation type="obsolete">Automatikoki Tamaina Aldatu Bezero Pantaila</translation>
-    </message>
-    <message>
-        <source>Auto-resize &Guest Display</source>
-        <translation type="obsolete">Automatikoki Tamaina Aldatu &Bezero Pantaila</translation>
-    </message>
-    <message>
-        <source>Automatically resize the guest display when the window is resized (requires Guest Additions)</source>
-        <translation type="obsolete">Automatikoki tamainaz aldatu bezero pantaila leihoa tamaina aldatzean (Bezero Gehigarriak behar du)</translation>
-    </message>
-    <message>
-        <source>&Adjust Window Size</source>
-        <translation type="obsolete">Leiho Tamaina &Doitu</translation>
-    </message>
-    <message>
-        <source>Adjust window size and position to best fit the guest display</source>
-        <translation type="obsolete">Leiho tamaina eta kokalekua doitu bezero pantaila hobe sartzeko</translation>
-    </message>
-    <message>
-        <source>&Insert Ctrl-Alt-Del</source>
-        <translation type="obsolete">B&idali Ktrl-Alt-Ezab</translation>
-    </message>
-    <message>
-        <source>Send the Ctrl-Alt-Del sequence to the virtual machine</source>
-        <translation type="obsolete">Ktrl+Alt+Ezab sekuentzia bidali makina birtualera</translation>
-    </message>
-    <message>
-        <source>&Insert Ctrl-Alt-Backspace</source>
-        <translation type="obsolete">B&idali Ktrl-Alt-Atzera-tekla</translation>
-    </message>
-    <message>
-        <source>Send the Ctrl-Alt-Backspace sequence to the virtual machine</source>
-        <translation type="obsolete">Ktrl-Alt-Atzera-tekla sekuentzia bidali makina birtualera</translation>
-    </message>
-    <message>
-        <source>&Reset</source>
-        <translation type="obsolete">Be&rrezarri</translation>
-    </message>
-    <message>
-        <source>Reset the virtual machine</source>
-        <translation type="obsolete">Makina Birtuala berrezarri</translation>
-    </message>
-    <message>
-        <source>ACPI S&hutdown</source>
-        <translation type="obsolete">ACPI It&zalia</translation>
-    </message>
-    <message>
-        <source>Send the ACPI Power Button press event to the virtual machine</source>
-        <translation type="obsolete">ACPI Indar Botoia Gertaera bidali makina birtualera</translation>
-    </message>
-    <message>
-        <source>&Close...</source>
-        <translation type="obsolete">It&xi...</translation>
-    </message>
-    <message>
-        <source>Close the virtual machine</source>
-        <translation type="obsolete">Makina Birtuala itxi</translation>
-    </message>
-    <message>
-        <source>Take &Snapshot...</source>
-        <translation type="obsolete">&Egoera-argazkia egin...</translation>
-    </message>
-    <message>
-        <source>Take a snapshot of the virtual machine</source>
-        <translation type="obsolete">Makina Birtualaren egoera-argazki bat egin</translation>
-    </message>
-    <message>
-        <source>&Floppy Image...</source>
-        <translation type="obsolete">&Diskete irudia...</translation>
-    </message>
-    <message>
-        <source>Mount a floppy image file</source>
-        <translation type="obsolete">Diskete irudi bat muntatu</translation>
-    </message>
-    <message>
-        <source>Unmount F&loppy</source>
-        <translation type="obsolete">Dis&kete Desmuntatu</translation>
-    </message>
-    <message>
-        <source>Unmount the currently mounted floppy disk image files</source>
-        <translation type="obsolete">Muntaturik dagoen diskete medioa desmuntatu</translation>
-    </message>
-    <message>
-        <source>&CD/DVD Image...</source>
-        <translation type="obsolete">&CD/DVD Irudia...</translation>
-    </message>
-    <message>
-        <source>Mount a CD/DVD image file</source>
-        <translation type="obsolete">CD/DVD irudi fitxategi bat muntatu</translation>
-    </message>
-    <message>
-        <source>Unmount C&D/DVD-ROM</source>
-        <translation type="obsolete">C&D/DVD-ROM Desmuntatu</translation>
-    </message>
-    <message>
-        <source>Unmount the currently mounted CD/DVD media</source>
-        <translation type="obsolete">Muntaturik dagoen CD/DVD medioa desmuntatu</translation>
-    </message>
-    <message>
-        <source>Remote Desktop (RDP) Server</source>
-        <comment>enable/disable...</comment>
-        <translation type="obsolete">Urruneko Idazmahai Zerbitzaria (RDP)</translation>
-    </message>
-    <message>
-        <source>Remote Dis&play</source>
-        <translation type="obsolete">Urruneko Pan&taila</translation>
-    </message>
-    <message>
-        <source>Enable or disable remote desktop (RDP) connections to this machine</source>
-        <translation type="obsolete">Urruneko idazmahai (RDP) konexioak gaitu edo ezgaitu maina honetarako</translation>
-    </message>
-    <message>
-        <source>&Shared Folders...</source>
-        <translation type="obsolete">&Partekatutako Karpetak...</translation>
-    </message>
-    <message>
-        <source>Create or modify shared folders</source>
-        <translation type="obsolete">Partekatutako karpetekin aritzeko leihoa ireki</translation>
-    </message>
-    <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">Bezero Gehigarriak &Instalatu...</translation>
-    </message>
-    <message>
-        <source>Mount the Guest Additions installation image</source>
-        <translation type="obsolete">Bezero Gehigarri instalazio irudia muntatu</translation>
-    </message>
-    <message>
-        <source>&Statistics...</source>
-        <translation type="obsolete">E&statistikak...</translation>
-    </message>
-    <message>
-        <source>&Command line...</source>
-        <translation type="obsolete">&Komando lerroa...</translation>
-    </message>
-    <message>
-        <source>&VirtualBox Web Site...</source>
-        <translation type="obsolete">&VirtualBox Web Gunea...</translation>
-    </message>
-    <message>
-        <source>Open the browser and go to the VirtualBox product web site</source>
-        <translation type="obsolete">Nabigatzailea ireki eta VirtualBox produktuaren gunera joan</translation>
-    </message>
-    <message>
-        <source>&About VirtualBox...</source>
-        <translation type="obsolete">VirtualBox - &Honi Buruz...</translation>
-    </message>
-    <message>
-        <source>Show a window with product information</source>
-        <translation type="obsolete">Karpeta hauatzeko leiho bat irekitzen du</translation>
-    </message>
-    <message>
-        <source>&Reset All Warnings</source>
-        <translation type="obsolete">Abisu Guztiak Be&rrezarri</translation>
-    </message>
-    <message>
-        <source>Go back to showing all suppressed warnings and messages</source>
-        <translation type="obsolete">Ezabatutako abisu eta mezu guztiak berriz agertzea eragien du</translation>
-    </message>
-    <message>
-        <source>Mount &Floppy</source>
-        <translation type="obsolete">Dis&ketea Muntatu</translation>
-    </message>
-    <message>
-        <source>Mount &CD/DVD</source>
-        <translation type="obsolete">C&D/DVD-ROM muntatu</translation>
-    </message>
-    <message>
-        <source>&USB Devices</source>
-        <translation type="obsolete">&USB Gailuak</translation>
-    </message>
-    <message>
-        <source>&Devices</source>
-        <translation type="obsolete">&Gailuak</translation>
-    </message>
-    <message>
-        <source>De&bug</source>
-        <translation type="obsolete">Ara&zpena</translation>
-    </message>
-    <message>
-        <source>&Help</source>
-        <translation type="obsolete">&Laguntza</translation>
-    </message>
-    <message>
-        <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source>
-        <translation type="obsolete">Bezero pantaila automatikoki tamainaz aldatzeko funtzioa gaiturik (<img src=:/auto_resize_on_16px.png/>) edo ezgaiturik (<img src=:/auto_resize_off_16px.png/>) dagoen erakusten du. Kontutan izan funtzio honek Bezero Gehigarriak sistema eragile bezeroan instalaturik egotea behar duela.</translation>
-    </message>
-    <message>
-        <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_ [...]
-        <translation type="obsolete">Bezeroaren sistema eragileak sagu markatzailea kapturatzen duen erakusten du:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;markatzailea ez da kapturatzen</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;markatzailea kapturatzen da</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;sagu integrazioa (MI) gaiturik dago</nobr>< [...]
-    </message>
-    <message>
-        <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source>
-        <translation type="obsolete">Ezarririk dagoen Ostalari tekla erakusten du.<br>Tekla honek, bakarrik sakatzean, sagu eta teklatu kapturatze egoera aldatzen . du. Menu nagusitik ekintzak azkar abiarazteko erabili daiteke beste tekla batzuekin batera sakatuaz.</translation>
-    </message>
-    <message>
-        <source><hr>The VRDP Server is listening on port %1</source>
-        <translation type="obsolete"><hr>VRDP Zerbitzaria %1 atakan entzuten ari da</translation>
-    </message>
-    <message>
-        <source>&Pause</source>
-        <translation type="obsolete">&Gelditu</translation>
-    </message>
-    <message>
-        <source>Suspend the execution of the virtual machine</source>
-        <translation type="obsolete">Makina Birtualaren exekuzioa gelditu</translation>
-    </message>
-    <message>
-        <source>R&esume</source>
-        <translation type="obsolete">Ja&rraitu</translation>
-    </message>
-    <message>
-        <source>Resume the execution of the virtual machine</source>
-        <translation type="obsolete">Makina birtualaren exekuzioa jarraitu</translation>
-    </message>
-    <message>
-        <source>Disable &Mouse Integration</source>
-        <translation type="obsolete">&Sagu Integrazioa ezgaitu</translation>
-    </message>
-    <message>
-        <source>Temporarily disable host mouse pointer integration</source>
-        <translation type="obsolete">Aldirako ezgaitu sagu markatzaile integrazioa</translation>
-    </message>
-    <message>
-        <source>Enable &Mouse Integration</source>
-        <translation type="obsolete">&Sagu integrazioa gaitu</translation>
-    </message>
-    <message>
-        <source>Enable temporarily disabled host mouse pointer integration</source>
-        <translation type="obsolete">Aldirako ezgaituriko sagu markatzaile integrazioa gaitu</translation>
-    </message>
-    <message>
-        <source>Snapshot %1</source>
-        <translation type="obsolete">%1 egoera-argazkia</translation>
-    </message>
-    <message>
-        <source>Host Drive </source>
-        <translation type="obsolete">Ostalari Gailua </translation>
-    </message>
-    <message>
-        <source>&Machine</source>
-        <translation type="obsolete">&Makina</translation>
-    </message>
-    <message>
-        <source>&Network Adapters</source>
-        <translation type="obsolete">&Sare Moldagailuak</translation>
-    </message>
-    <message>
-        <source>Adapter %1</source>
-        <comment>network</comment>
-        <translation type="obsolete">%1 Moldagailua</translation>
-    </message>
-    <message>
-        <source>Mount the selected physical drive of the host PC</source>
-        <comment>Floppy tip</comment>
-        <translation type="obsolete">Ostalari PC-ko hautaturiko gailu fisikoa muntatu</translation>
-    </message>
-    <message>
-        <source>Disconnect the cable from the selected virtual network adapter</source>
-        <translation type="obsolete">Hautaturiko sare moldagailuaren kablea deskonektatu</translation>
-    </message>
-    <message>
-        <source>Connect the cable to the selected virtual network adapter</source>
-        <translation type="obsolete">Hautaturiko sare moldagailuaren kablea konektatu</translation>
-    </message>
-    <message>
-        <source>Seam&less Mode</source>
-        <translation type="obsolete">Gardenta&sun Modua</translation>
-    </message>
-    <message>
-        <source>Switch to seamless desktop integration mode</source>
-        <comment>Garden?? Ez dut argi esannahai</comment>
-        <translation type="obsolete">Idazmahai integrazio garden modura aldatu</translation>
-    </message>
-    <message>
-        <source><qt><nobr>Indicates the activity of the floppy disk image files:</nobr>%1</qt></source>
-        <comment>Floppy tooltip</comment>
-        <translation type="obsolete"><qt><nobr>Diskete medioaren aktibitatea erakusten du:</nobr>%1</qt></translation>
-    </message>
-    <message>
-        <source><br><nobr><b>Host Drive</b>: %1</nobr></source>
-        <comment>Floppy tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Ostalari Gailua</b>: %1</nobr></translation>
-    </message>
-    <message>
-        <source><br><nobr><b>Image</b>: %1</nobr></source>
-        <comment>Floppy tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Irudia</b>: %1</nobr></translation>
-    </message>
-    <message>
-        <source><br><nobr><b>No media mounted</b></nobr></source>
-        <comment>Floppy tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Ez dago medio muntaturik</b></nobr></translation>
-    </message>
-    <message>
-        <source><qt><nobr>Indicates the activity of the CD/DVD media:</nobr>%1</qt></source>
-        <comment>DVD-ROM tooltip</comment>
-        <translation type="obsolete"><qt><nobr>CD/DVD medioaren aktibitatea erakusten du:</nobr>%1</qt></translation>
-    </message>
-    <message>
-        <source><qt><nobr>Indicates activity on the the virtual hard disks:</nobr>%1</qt></source>
-        <comment>HDD tooltip</comment>
-        <translation type="obsolete"><qt><nobr>Disko gogor birtualen aktibitatea erakusten du:</nobr>%1</qt></translation>
-    </message>
-    <message>
-        <source><br><nobr><b>No hard disks attached</b></nobr></source>
-        <comment>HDD tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Ez dago disko gogorrik erantsirik</b></nobr></translation>
-    </message>
-    <message>
-        <source><qt><nobr>Indicates the activity of the network interfaces:</nobr>%1</qt></source>
-        <comment>Network adapters tooltip</comment>
-        <translation type="obsolete"><qt><nobr>Sare interfazeen aktibitatea erakusten du:</nobr>%1</qt></translation>
-    </message>
-    <message>
-        <source><br><nobr><b>Adapter %1 (%2)</b>: cable %3</nobr></source>
-        <comment>Network adapters tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Moldagailua: %1 (%2)</b>: kablea %3</nobr></translation>
-    </message>
-    <message>
-        <source>connected</source>
-        <comment>Network adapters tooltip</comment>
-        <translation type="obsolete">konektatuta</translation>
-    </message>
-    <message>
-        <source>disconnected</source>
-        <comment>Network adapters tooltip</comment>
-        <translation type="obsolete">deskonektatuta</translation>
-    </message>
-    <message>
-        <source><br><nobr><b>All network adapters are disabled</b></nobr></source>
-        <comment>Network adapters tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Sare moldagailu guztiak ezgaiturik daude</b></nobr></translation>
-    </message>
-    <message>
-        <source><qt><nobr>Indicates the activity of the attached USB devices:</nobr>%1</qt></source>
-        <comment>USB device tooltip</comment>
-        <translation type="obsolete"><qt><nobr>Erantsiriko USB gailuen aktibitatea erakusten du:</nobr>%1</qt></translation>
-    </message>
-    <message>
-        <source><br><nobr><b>No USB devices attached</b></nobr></source>
-        <comment>USB device tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Ez dago USB gailurik erantsirik</b></nobr></translation>
-    </message>
-    <message>
-        <source><br><nobr><b>USB Controller is disabled</b></nobr></source>
-        <comment>USB device tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>USB Kontrolatzailea ezgaiturik dago</b></nobr></translation>
-    </message>
-    <message>
-        <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source>
-        <translation type="obsolete">Urruneko Pantaila (VRDP Zerbitzaria) gaiturik dagoen (<img src=:/vrdp_16px.png/>) ala ez (<img src=:/vrdp_disabled_16px.png/>) erakusten du.</translation>
-    </message>
-    <message>
-        <source><qt><nobr>Indicates the activity of the machineof the machine'sapos;s shared folders: shared folders:</nobr>%1</qt></source>
-        <comment>Shared folders tooltip</comment>
-        <translation type="obsolete"><qt><nobr>Partekatutako karpeten aktibitatea ezartzen du:</nobr>%1</qt></translation>
-    </message>
-    <message>
-        <source><br><nobr><b>No shared folders</b></nobr></source>
-        <comment>Shared folders tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Ez dago partekatutako karpetarik</b></nobr></translation>
-    </message>
-    <message>
-        <source>Switch to seamless desktop integration mode</source>
-        <translation type="obsolete">Idazmahai integrazio garden modura aldatu</translation>
-    </message>
-    <message>
-        <source>&Contents...</source>
-        <translation type="obsolete">&Edukiak...</translation>
-    </message>
-    <message>
-        <source>F1</source>
-        <translation type="obsolete">F1</translation>
-    </message>
-    <message>
-        <source>Show the online help contents</source>
-        <translation type="obsolete">Sare bidezko laguntza edukia bistarazi</translation>
-    </message>
-    <message>
-        <source><br><nobr><b>Host Drive</b>: %1</nobr></source>
-        <comment>DVD-ROM tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Ostalari Gailua</b>: %1</nobr></translation>
-    </message>
-    <message>
-        <source><br><nobr><b>Image</b>: %1</nobr></source>
-        <comment>DVD-ROM tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Irudia</b>: %1</nobr></translation>
-    </message>
-    <message>
-        <source><br><nobr><b>No media mounted</b></nobr></source>
-        <comment>DVD-ROM tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Ez dago medio muntaturik</b></nobr></translation>
-    </message>
-    <message>
-        <source>Mount the selected physical drive of the host PC</source>
-        <comment>CD/DVD tip</comment>
-        <translation type="obsolete">Ostalari PC-ko hautaturiko gailu fisikoa muntatu</translation>
-    </message>
-    <message>
-        <source>&Statistics...</source>
-        <comment>debug action</comment>
-        <translation type="obsolete">E&statistikak...</translation>
-    </message>
-    <message>
-        <source>No supported devices connected to the host PC</source>
-        <translation type="obsolete">Ez dago onartutako gailurik konektaturik ostalari PC-ra</translation>
-    </message>
-</context>
-<context>
-    <name>VBoxDiskImageManagerDlg</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Izena</translation>
-    </message>
-    <message>
-        <source>Virtual Size</source>
-        <translation type="obsolete">Tamaina Birtuala</translation>
-    </message>
-    <message>
-        <source>Actual Size</source>
-        <translation type="obsolete">Uneko Tamaina</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamaina</translation>
-    </message>
-    <message>
-        <source>Virtual Disk Manager</source>
-        <translation type="obsolete">Disko Birtual Kudeatzailea</translation>
-    </message>
-    <message>
-        <source>&Hard Disks</source>
-        <translation type="obsolete">Disko &Gogorrak</translation>
-    </message>
-    <message>
-        <source>&CD/DVD Images</source>
-        <translation type="obsolete">&CD/DVD Irudiak</translation>
-    </message>
-    <message>
-        <source>&Floppy Images</source>
-        <translation type="obsolete">&Diskete irudiak</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">Laguntza</translation>
-    </message>
-    <message>
-        <source>F1</source>
-        <translation type="obsolete">F1</translation>
-    </message>
-    <message>
-        <source>Invoke dialog's help</source>
-        <translation type="obsolete">Leiho laguntza deitzen du</translation>
-    </message>
-    <message>
-        <source>&OK</source>
-        <translation type="obsolete">&Ados</translation>
-    </message>
-    <message>
-        <source>Alt+O</source>
-        <translation type="obsolete">ALt+A</translation>
-    </message>
-    <message>
-        <source>Accept dialog</source>
-        <translation type="obsolete">Liehoa onartu</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
-    </message>
-    <message>
-        <source>Cancel dialog</source>
-        <translation type="obsolete">Utzi leihoa</translation>
-    </message>
-    <message>
-        <source>--</source>
-        <comment>no info</comment>
-        <translation type="obsolete">--</translation>
-    </message>
-    <message>
-        <source>&New...</source>
-        <translation type="obsolete">&Berria...</translation>
-    </message>
-    <message>
-        <source>&Add...</source>
-        <translation type="obsolete">&Gehitu...</translation>
-    </message>
-    <message>
-        <source>R&emove</source>
-        <translation type="obsolete">K&endu</translation>
-    </message>
-    <message>
-        <source>Re&lease</source>
-        <translation type="obsolete">Argi&taratu</translation>
-    </message>
-    <message>
-        <source>Re&fresh</source>
-        <translation type="obsolete">&Freskatu</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Berria</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Gehitu</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Kendu</translation>
-    </message>
-    <message>
-        <source>Release</source>
-        <translation type="obsolete">Atera</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Freskatu</translation>
-    </message>
-    <message>
-        <source>Ctrl+N</source>
-        <translation type="obsolete">Ktrl+N</translation>
-    </message>
-    <message>
-        <source>Ctrl+A</source>
-        <translation type="obsolete">Ktrl+A</translation>
-    </message>
-    <message>
-        <source>Ctrl+D</source>
-        <translation type="obsolete">Ktrl+D</translation>
-    </message>
-    <message>
-        <source>Ctrl+L</source>
-        <translation type="obsolete">Ktrl+L</translation>
-    </message>
-    <message>
-        <source>Ctrl+R</source>
-        <translation type="obsolete">Ktrl+R</translation>
-    </message>
-    <message>
-        <source>&Actions</source>
-        <translation type="obsolete">&Ekintzak</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Kokalekuak</translation>
-    </message>
-    <message>
-        <source>Disk Type</source>
-        <translation type="obsolete">Disko Mota</translation>
-    </message>
-    <message>
-        <source>Storage Type</source>
-        <translation type="obsolete">Biltegiratze Mota</translation>
-    </message>
-    <message>
-        <source>Attached to</source>
-        <translation type="obsolete">Honi erantsia</translation>
-    </message>
-    <message>
-        <source>Snapshot</source>
-        <translation type="obsolete">Egoera-argazkia</translation>
-    </message>
-    <message>
-        <source>Checking accessibility</source>
-        <translation type="obsolete">Eskuragarritasuna egiaztatzen</translation>
-    </message>
-    <message>
-        <source><nobr><b>%1</b></nobr><br>Checking accessibility...</source>
-        <comment>HDD</comment>
-        <translation type="obsolete"><nobr><b>%1</b></nobr><br>Eskuragarritasuna egiaztatzen...</translation>
-    </message>
-    <message>
-        <source><nobr><b>%1</b></nobr><br><nobr>Disk type:&nbsp;&nbsp;%2</nobr><br><nobr>Storage type:&nbsp;&nbsp;%3</nobr></source>
-        <translation type="obsolete"><nobr><b>%1</b></nobr><br><nobr>Disko mota:&nbsp;&nbsp;%2</nobr><br><nobr>Biltegiratze mota:&nbsp;&nbsp;%3</nobr></translation>
-    </message>
-    <message>
-        <source><br><nobr>Attached to:&nbsp;&nbsp;%1</nobr></source>
-        <comment>HDD</comment>
-        <translation type="obsolete"><br><nobr>Non erantsia:&nbsp;&nbsp;%1</nobr></translation>
-    </message>
-    <message>
-        <source><br><nobr>Snapshot:&nbsp;&nbsp;%5</nobr></source>
-        <comment>HDD</comment>
-        <translation type="obsolete"><br><nobr>Egoera-argazkia:&nbsp;&nbsp;%5</nobr></translation>
-    </message>
-    <message>
-        <source><nobr><b>%1</b></nobr><br>Error checking accessibility of disk image files</source>
-        <comment>HDD</comment>
-        <translation type="obsolete"><nobr><b>%1</b></nobr><br>Errorea medio eskuragarritasuna egiaztatzen</translation>
-    </message>
-    <message>
-        <source><nobr><b>%1</b></nobr><br>%2</source>
-        <comment>HDD</comment>
-        <translation type="obsolete"><nobr><b>%1</b></nobr><br>%2</translation>
-    </message>
-    <message>
-        <source><nobr><b>%1</b></nobr></source>
-        <comment>CD/DVD/Floppy</comment>
-        <translation type="obsolete"><nobr><b>%1</b></nobr></translation>
-    </message>
-    <message>
-        <source>The image file is not accessible</source>
-        <comment>CD/DVD/Floppy</comment>
-        <translation type="obsolete">Irudi fitxategia ez dago eskuragarri</translation>
-    </message>
-    <message>
-        <source>&Select</source>
-        <translation type="obsolete">&Hautatu</translation>
-    </message>
-    <message>
-        <source>All hard disk images (*.vdi; *.vmdk);;Virtual Disk images (*.vdi);;VMDK images (*.vmdk);;All files (*)</source>
-        <translation type="obsolete">Disko gogor irudi guztiak (*.vdi; *.vmdk);;Disko Birtual irudiak (*.vdi);;VMDK irudiak (*.vmdk);;Fitxategi guztiak (*)</translation>
-    </message>
-    <message>
-        <source>Select a hard disk image file</source>
-        <translation type="obsolete">Disko gogor irudi fitxategia hautatu</translation>
-    </message>
-    <message>
-        <source>Select a CD/DVD disk image file</source>
-        <translation type="obsolete">Hautatu CD/DVD disko irudi fitxategi bat</translation>
-    </message>
-    <message>
-        <source>Select a floppy disk image files</source>
-        <translation type="obsolete">Hautatu diskete irudi fitxategi bat</translation>
-    </message>
-    <message>
-        <source>Create a new virtual hard disk</source>
-        <translation type="obsolete">Sortu disko birtual berri bat</translation>
-    </message>
-    <message>
-        <source>Add (register) an existing image file</source>
-        <translation type="obsolete">Gehitu (erregistratu) dagoen irudi fitxategi bat</translation>
-    </message>
-    <message>
-        <source>Remove (unregister) the selected media</source>
-        <translation type="obsolete">Ezabatu (erregistroa kendu) hautatutako irudi fitxategia</translation>
-    </message>
-    <message>
-        <source>Release the selected media by detaching it from the machine</source>
-        <translation type="obsolete">Atera hautatutako medioa berau makinatik kentzen</translation>
-    </message>
-    <message>
-        <source>Refresh the list of disk image files</source>
-        <translation type="obsolete">Medio zerrenda freskatu</translation>
-    </message>
-    <message>
-        <source>CD/DVD images (*.iso);;All files (*)</source>
-        <translation type="obsolete">CD/DVD irudiak (*.iso);;Fitxategi guztiak (*)</translation>
-    </message>
-    <message>
-        <source>Floppy images (*.img);;All files (*)</source>
-        <translation type="obsolete">Diskete irudiak (*.img);;Fitxategi guztiak (*)</translation>
-    </message>
-    <message>
-        <source><nobr><b>%1</b></nobr><br>Checking accessibility...</source>
-        <comment>CD/DVD/Floppy</comment>
-        <translation type="obsolete"><nobr><b>%1</b></nobr><br>Eskuragarritasuna egiaztatzen...</translation>
-    </message>
-    <message>
-        <source><br><nobr>Attached to:&nbsp;&nbsp;%1</nobr></source>
-        <comment>CD/DVD/Floppy</comment>
-        <translation type="obsolete"><br><nobr>Non erantsia:&nbsp;&nbsp;%1</nobr></translation>
-    </message>
-    <message>
-        <source><nobr><b>%1</b></nobr><br>Error checking accessibility of disk image files</source>
-        <comment>CD/DVD/Floppy</comment>
-        <translation type="obsolete"><nobr><b>%1</b></nobr><br>Errorea medio eskuragarritasuna egiaztatzen</translation>
-    </message>
-    <message>
-        <source><nobr><b>%1</b></nobr><br>%2</source>
-        <translation type="obsolete"><nobr><b>%1</b></nobr><br>%2</translation>
-    </message>
-</context>
-<context>
-    <name>VBoxEmptyFileSelector</name>
-    <message>
-        <source>Choose...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VBoxFilePathSelectorWidget</name>
-    <message>
-        <source><reset to default></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><not selected></source>
-        <translation type="unfinished"><ez hautaturik></translation>
-    </message>
-    <message>
-        <source>Please use the <b>Other...</b> item from the drop-down list to select a path.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished">Berrezarri</translation>
-    </message>
-    <message>
-        <source>Resets the folder path to the default value.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Resets the file path to the default value.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Displays a window to select a different folder.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Displays a window to select a different file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holds the folder path.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holds the file path.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VBoxGLSettingsDlg</name>
-    <message>
-        <source>General</source>
-        <translation type="obsolete">Orokorra</translation>
-    </message>
-    <message>
-        <source>Language</source>
-        <translation type="obsolete"> Hizkuntza </translation>
-    </message>
-    <message>
-        <source>USB</source>
-        <translation type="obsolete">USB</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="obsolete">Sarea</translation>
-    </message>
-</context>
-<context>
-    <name>VBoxGLSettingsInput</name>
-    <message>
-        <source>Holds the key used as a Host Key in the VM window. Activate the entry field and press a new Host Key. Note that alphanumeric, cursor movement and editing keys cannot be used.</source>
-        <translation type="obsolete">MB leihoan Ostalari Tekla bezala erabilitakoa tekla erakusten du. Eremua gaitu eta Ostalari Tekla berria sakatu. Kontutan izan alfazenbakizkoak, kurtsore mugimenduak eta edizio teklak ezin direla Ostalari tekla bezala erabili.</translation>
-    </message>
-    <message>
-        <source>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</source>
-        <translation type="obsolete">Markaturik dagoenean, teklatua automatikoki kapturatuko da MB leiho aktibatzen den bakoitzean. Teklatua kapturatzen denean, tekla sakatze guztiak (Alt-TAb bezalako sistemakoak barne) makina birtualera bidaliko da.</translation>
-    </message>
-</context>
-<context>
-    <name>VBoxGlobal</name>
-    <message>
-        <source>Differencing</source>
-        <comment>hard disk</comment>
-        <translation type="obsolete">Ezberdintzen</translation>
-    </message>
-    <message>
-        <source>Unknown device %1:%2</source>
-        <comment>USB device details</comment>
-        <translation>%1 gailu ezezaguna:%2</translation>
-    </message>
-    <message>
-        <source><nobr>Vendor ID: %1</nobr><br><nobr>Product ID: %2</nobr><br><nobr>Revision: %3</nobr></source>
-        <comment>USB device tooltip</comment>
-        <translation><nobr>Saltzaile ID-a: %1</nobr><br><nobr>Produktu ID-a: %2</nobr><br><nobr>Bertsioa: %3</nobr></translation>
-    </message>
-    <message>
-        <source><br><nobr>Serial No. %1</nobr></source>
-        <comment>USB device tooltip</comment>
-        <translation><br><nobr>Serie Zb. %1</nobr></translation>
-    </message>
-    <message>
-        <source><br><nobr>State: %1</nobr></source>
-        <comment>USB device tooltip</comment>
-        <translation><br><nobr>Egoera: %1</nobr></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <comment>details report</comment>
-        <translation>Izena</translation>
-    </message>
-    <message>
-        <source>OS Type</source>
-        <comment>details report</comment>
-        <translation>SE mota</translation>
-    </message>
-    <message>
-        <source>Base Memory</source>
-        <comment>details report</comment>
-        <translation>Oinarri Memoria</translation>
-    </message>
-    <message>
-        <source><nobr>%3 MB</nobr></source>
-        <comment>details report</comment>
-        <translation type="obsolete"><nobr>%3 MB</nobr></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <comment>details report</comment>
-        <translation>Orokorra</translation>
-    </message>
-    <message>
-        <source>Video Memory</source>
-        <comment>details report</comment>
-        <translation>Bideo Memoria</translation>
-    </message>
-    <message>
-        <source><nobr>%4 MB</nobr></source>
-        <comment>details report</comment>
-        <translation type="obsolete"><nobr>%4 MB</nobr></translation>
-    </message>
-    <message>
-        <source>Boot Order</source>
-        <comment>details report</comment>
-        <translation>Abio Ordena</translation>
-    </message>
-    <message>
-        <source>ACPI</source>
-        <comment>details report</comment>
-        <translation>ACPI</translation>
-    </message>
-    <message>
-        <source>I/O APIC</source>
-        <comment>details report</comment>
-        <translation>I/O APIC</translation>
-    </message>
-    <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not Attached</source>
-        <comment>details report (HDDs)</comment>
-        <translation type="obsolete">Ez erantsia</translation>
-    </message>
-    <message>
-        <source>Hard Disks</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Disko Gogorrak</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details report (ACPI)</comment>
-        <translation>Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (ACPI)</comment>
-        <translation>Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Not mounted</source>
-        <comment>details report (floppy)</comment>
-        <translation type="obsolete">Ez muntaturik</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <comment>details report (floppy)</comment>
-        <translation type="obsolete">Irudia</translation>
-    </message>
-    <message>
-        <source>Host Drive</source>
-        <comment>details report (floppy)</comment>
-        <translation type="obsolete">Ostalari Gailua</translation>
-    </message>
-    <message>
-        <source>Floppy</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Disketea</translation>
-    </message>
-    <message>
-        <source>CD/DVD</source>
-        <comment>details report</comment>
-        <translation type="obsolete">CD/DVD</translation>
-    </message>
-    <message>
-        <source>Adapter</source>
-        <comment>details report (audio)</comment>
-        <translation type="obsolete">Moldagailua</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <comment>details report</comment>
-        <translation>Audioa</translation>
-    </message>
-    <message>
-        <source>Adapter %1</source>
-        <comment>details report (network)</comment>
-        <translation>%1 Moldagailua</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <comment>details report</comment>
-        <translation>Sarea</translation>
-    </message>
-    <message>
-        <source>Device Filters</source>
-        <comment>details report (USB)</comment>
-        <translation>Gailu Iragazkiak</translation>
-    </message>
-    <message>
-        <source>%1 (%2 active)</source>
-        <comment>details report (USB)</comment>
-        <translation>%1 (%2 aktibo)</translation>
-    </message>
-    <message>
-        <source>VRDP Server Port</source>
-        <comment>details report (VRDP)</comment>
-        <translation type="obsolete">VRDP Zerbitzari Ataka</translation>
-    </message>
-    <message>
-        <source>%1</source>
-        <comment>details report (VRDP)</comment>
-        <translation type="obsolete">%1</translation>
-    </message>
-    <message>
-        <source>Remote Display</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Huruneko Pantaila</translation>
-    </message>
-    <message>
-        <source>Opening URLs is not implemented yet.</source>
-        <translation type="obsolete">URL irekitzea ez dago inplementaturik oraindik.</translation>
-    </message>
-    <message>
-        <source>Powered Off</source>
-        <comment>MachineState</comment>
-        <translation>Itzalia</translation>
-    </message>
-    <message>
-        <source>Saved</source>
-        <comment>MachineState</comment>
-        <translation>Gordea</translation>
-    </message>
-    <message>
-        <source>Aborted</source>
-        <comment>MachineState</comment>
-        <translation>Abortatua</translation>
-    </message>
-    <message>
-        <source>Running</source>
-        <comment>MachineState</comment>
-        <translation>Martxan</translation>
-    </message>
-    <message>
-        <source>Paused</source>
-        <comment>MachineState</comment>
-        <translation>Gelditurik</translation>
-    </message>
-    <message>
-        <source>Starting</source>
-        <comment>MachineState</comment>
-        <translation>Abiarazten</translation>
-    </message>
-    <message>
-        <source>Stopping</source>
-        <comment>MachineState</comment>
-        <translation>Gelditzen</translation>
-    </message>
-    <message>
-        <source>Saving</source>
-        <comment>MachineState</comment>
-        <translation>Gordetzen</translation>
-    </message>
-    <message>
-        <source>Restoring</source>
-        <comment>MachineState</comment>
-        <translation>Berrezartzen</translation>
-    </message>
-    <message>
-        <source>Discarding</source>
-        <comment>MachineState</comment>
-        <translation type="obsolete">Baztertzen</translation>
-    </message>
-    <message>
-        <source>Closed</source>
-        <comment>SessionState</comment>
-        <translation type="obsolete">Itxia</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <comment>SessionState</comment>
-        <translation type="obsolete">Irekia</translation>
-    </message>
-    <message>
-        <source>Spawning</source>
-        <comment>SessionState</comment>
-        <translation>Abiarazten</translation>
-    </message>
-    <message>
-        <source>Closing</source>
-        <comment>SessionState</comment>
-        <translation type="obsolete">Ixten</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>DeviceType</comment>
-        <translation>Batez</translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <comment>DeviceType</comment>
-        <translation>Disko gogorrak</translation>
-    </message>
-    <message>
-        <source>Primary</source>
-        <comment>DiskControllerType</comment>
-        <translation type="obsolete">Lehen mailakoa</translation>
-    </message>
-    <message>
-        <source>Secondary</source>
-        <comment>DiskControllerType</comment>
-        <translation type="obsolete">Bigarren mailakoa</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <comment>DiskType</comment>
-        <translation type="obsolete">Arrunta</translation>
-    </message>
-    <message>
-        <source>Immutable</source>
-        <comment>DiskType</comment>
-        <translation type="obsolete">Aldaezina</translation>
-    </message>
-    <message>
-        <source>Writethrough</source>
-        <comment>DiskType</comment>
-        <translation type="obsolete">Idatzihola</translation>
-    </message>
-    <message>
-        <source>Virtual Disk Image</source>
-        <comment>DiskStorageType</comment>
-        <translation type="obsolete">Disko Birtual Irudia</translation>
-    </message>
-    <message>
-        <source>iSCSI</source>
-        <comment>DiskStorageType</comment>
-        <translation type="obsolete">iSCSI</translation>
-    </message>
-    <message>
-        <source>VMDK Image</source>
-        <comment>DiskStorageType</comment>
-        <translation type="obsolete">VMDK Irudia</translation>
-    </message>
-    <message>
-        <source>Null</source>
-        <comment>VRDPAuthType</comment>
-        <translation type="obsolete">Nulua</translation>
-    </message>
-    <message>
-        <source>External</source>
-        <comment>VRDPAuthType</comment>
-        <translation type="obsolete">Kanpokoa</translation>
-    </message>
-    <message>
-        <source>Guest</source>
-        <comment>VRDPAuthType</comment>
-        <translation type="obsolete">Bezeroa</translation>
-    </message>
-    <message>
-        <source>Ignore</source>
-        <comment>USBFilterActionType</comment>
-        <translation type="obsolete">Alde batetara utzi</translation>
-    </message>
-    <message>
-        <source>Hold</source>
-        <comment>USBFilterActionType</comment>
-        <translation type="obsolete">Eskuratu</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <comment>DiskControllerDevice</comment>
-        <translation type="obsolete">Nagusia</translation>
-    </message>
-    <message>
-        <source>Slave</source>
-        <comment>DiskControllerDevice</comment>
-        <translation type="obsolete">Morroia</translation>
-    </message>
-    <message>
-        <source>Device&nbsp;%1</source>
-        <comment>DiskControllerDevice</comment>
-        <translation type="obsolete">&nbsp;%1 Gailua</translation>
-    </message>
-    <message>
-        <source>Null Audio Driver</source>
-        <comment>AudioDriverType</comment>
-        <translation>Audio Kontrolatzaile Hutsa</translation>
-    </message>
-    <message>
-        <source>Windows Multimedia</source>
-        <comment>AudioDriverType</comment>
-        <translation>Windows Multimedia</translation>
-    </message>
-    <message>
-        <source>OSS Audio Driver</source>
-        <comment>AudioDriverType</comment>
-        <translation>OSS Audio Kontrolatzailea</translation>
-    </message>
-    <message>
-        <source>ALSA Audio Driver</source>
-        <comment>AudioDriverType</comment>
-        <translation>ALSA Audio Kontrolatzailea</translation>
-    </message>
-    <message>
-        <source>Windows DirectSound</source>
-        <comment>AudioDriverType</comment>
-        <translation>Windows DirectSound</translation>
-    </message>
-    <message>
-        <source>CoreAudio</source>
-        <comment>AudioDriverType</comment>
-        <translation>CoreAudio</translation>
-    </message>
-    <message>
-        <source>Intel PRO/1000 MT Server (82545EM)</source>
-        <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not attached</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation>Ez erantsia</translation>
-    </message>
-    <message>
-        <source>NAT</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation>NAT</translation>
-    </message>
-    <message>
-        <source>Host Interface</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation type="obsolete">Ostalari Interfazea</translation>
-    </message>
-    <message>
-        <source>Internal Network</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation>Barne Sarea</translation>
-    </message>
-    <message>
-        <source>Not supported</source>
-        <comment>USBDeviceState</comment>
-        <translation>Ez da onartzen</translation>
-    </message>
-    <message>
-        <source>Unavailable</source>
-        <comment>USBDeviceState</comment>
-        <translation>Erabilezina</translation>
-    </message>
-    <message>
-        <source>Busy</source>
-        <comment>USBDeviceState</comment>
-        <translation>Okupatua</translation>
-    </message>
-    <message>
-        <source>Available</source>
-        <comment>USBDeviceState</comment>
-        <translation>Erabilgarri</translation>
-    </message>
-    <message>
-        <source>Held</source>
-        <comment>USBDeviceState</comment>
-        <translation>Mantendua</translation>
-    </message>
-    <message>
-        <source>Captured</source>
-        <comment>USBDeviceState</comment>
-        <translation>Hartua</translation>
-    </message>
-    <message>
-        <source><i>Checking...</i></source>
-        <comment>hard disk</comment>
-        <translation type="obsolete"><i>Egiaztatzen...</i></translation>
-    </message>
-    <message>
-        <source><i>Inaccessible</i></source>
-        <comment>hard disk</comment>
-        <translation type="obsolete"><i>Eskuraezina</i></translation>
-    </message>
-    <message>
-        <source>Host To Guest</source>
-        <comment>ClipboardType</comment>
-        <translation>Ostalaritik Bezerora</translation>
-    </message>
-    <message>
-        <source>Guest To Host</source>
-        <comment>ClipboardType</comment>
-        <translation>Bezerotik Ostalarira</translation>
-    </message>
-    <message>
-        <source>Bidirectional</source>
-        <comment>ClipboardType</comment>
-        <translation>Bi zentzuetakoa</translation>
-    </message>
-    <message>
-        <source>Select a directory</source>
-        <translation type="obsolete">Hautatu direktorio bat</translation>
-    </message>
-    <message>
-        <source>Select a file</source>
-        <translation type="obsolete">Hautatu fitxategi bat</translation>
-    </message>
-    <message>
-        <source>Port %1</source>
-        <comment>details report (serial ports)</comment>
-        <translation>%1 ataka</translation>
-    </message>
-    <message>
-        <source>Serial Ports</source>
-        <comment>details report</comment>
-        <translation>Serie Atakak</translation>
-    </message>
-    <message>
-        <source>USB</source>
-        <comment>details report</comment>
-        <translation>USB</translation>
-    </message>
-    <message>
-        <source>Shared Folders</source>
-        <comment>details report (shared folders)</comment>
-        <translation>Partekatutako Karpetak</translation>
-    </message>
-    <message>
-        <source>Stuck</source>
-        <comment>MachineState</comment>
-        <translation type="obsolete">Trabatu</translation>
-    </message>
-    <message>
-        <source>Disconnected</source>
-        <comment>PortMode</comment>
-        <translation>Deskonektaturik</translation>
-    </message>
-    <message>
-        <source>Host Pipe</source>
-        <comment>PortMode</comment>
-        <translation>Ostalari Tutua</translation>
-    </message>
-    <message>
-        <source>Host Device</source>
-        <comment>PortMode</comment>
-        <translation>Ostalari Gailua</translation>
-    </message>
-    <message>
-        <source>PIIX3</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PIIX4</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ICH6</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AHCI</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lsilogic</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>BusLogic</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User-defined</source>
-        <comment>serial port</comment>
-        <translation>Erabiltzaileak-ezarria</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details report (I/O APIC)</comment>
-        <translation type="unfinished">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (I/O APIC)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Not mounted</source>
-        <comment>details report (DVD)</comment>
-        <translation type="obsolete">Ez muntaturik</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <comment>details report (DVD)</comment>
-        <translation type="obsolete">Irudia</translation>
-    </message>
-    <message>
-        <source>Host Drive</source>
-        <comment>details report (DVD)</comment>
-        <translation type="obsolete">Ostalari Gailua</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (audio)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Bridged adapter, %1</source>
-        <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host-only adapter, '%1'</source>
-        <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (network)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (serial ports)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (USB)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>%1</source>
-        <comment>details report (shadef folders)</comment>
-        <translation type="obsolete">%1</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>details report (shared folders)</comment>
-        <translation type="unfinished">Batez</translation>
-    </message>
-    <message>
-        <source>Shared Folders</source>
-        <comment>details report</comment>
-        <translation type="unfinished">Partekatutako Karpetak</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (VRDP)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Floppy</source>
-        <comment>DeviceType</comment>
-        <translation type="unfinished">Disketea</translation>
-    </message>
-    <message>
-        <source>CD/DVD</source>
-        <comment>DeviceType</comment>
-        <translation type="obsolete">CD/DVD</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <comment>DeviceType</comment>
-        <translation type="unfinished">Sarea</translation>
-    </message>
-    <message>
-        <source>Bridged Adapter</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host-only Adapter</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>ClipboardType</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>VT-x/AMD-V</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PAE/NX</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details report (PAE/NX)</comment>
-        <translation type="unfinished">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (PAE/NX)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Host Driver</source>
-        <comment>details report (audio)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Controller</source>
-        <comment>details report (audio)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal network, '%1'</source>
-        <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port %1</source>
-        <comment>details report (parallel ports)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (parallel ports)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Parallel Ports</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB</source>
-        <comment>DeviceType</comment>
-        <translation type="unfinished">USB</translation>
-    </message>
-    <message>
-        <source>Shared Folder</source>
-        <comment>DeviceType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IDE</source>
-        <comment>StorageBus</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SATA</source>
-        <comment>StorageBus</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI</source>
-        <comment>StorageBus</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Primary</source>
-        <comment>StorageBusChannel</comment>
-        <translation type="obsolete">Lehen mailakoa</translation>
-    </message>
-    <message>
-        <source>Secondary</source>
-        <comment>StorageBusChannel</comment>
-        <translation type="obsolete">Bigarren mailakoa</translation>
-    </message>
-    <message>
-        <source>Master</source>
-        <comment>StorageBusDevice</comment>
-        <translation type="obsolete">Nagusia</translation>
-    </message>
-    <message>
-        <source>Slave</source>
-        <comment>StorageBusDevice</comment>
-        <translation type="obsolete">Morroia</translation>
-    </message>
-    <message>
-        <source>Solaris Audio</source>
-        <comment>AudioDriverType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PulseAudio</source>
-        <comment>AudioDriverType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ICH AC97</source>
-        <comment>AudioControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SoundBlaster 16</source>
-        <comment>AudioControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PCnet-PCI II (Am79C970A)</source>
-        <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PCnet-FAST III (Am79C973)</source>
-        <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Intel PRO/1000 MT Desktop (82540EM)</source>
-        <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Intel PRO/1000 T Server (82543GC)</source>
-        <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><nobr>Vendor ID: %1</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><nobr>Product ID: %2</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><nobr>Revision: %3</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><nobr>Product: %4</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><nobr>Manufacturer: %5</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><nobr>Serial No.: %1</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><nobr>Port: %1</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><nobr>State: %1</nobr></source>
-        <comment>USB filter tooltip</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adapter %1</source>
-        <comment>network</comment>
-        <translation type="obsolete">%1 Moldagailua</translation>
-    </message>
-    <message>
-        <source><br><nobr>Attached to:&nbsp;&nbsp;%1</nobr></source>
-        <comment>medium</comment>
-        <translation type="obsolete"><br><nobr>Non erantsia:&nbsp;&nbsp;%1</nobr></translation>
-    </message>
-    <message>
-        <source>Checking...</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inaccessible</source>
-        <comment>medium</comment>
-        <translation type="unfinished">Eskuraezina</translation>
-    </message>
-    <message>
-        <source>3D Acceleration</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details report (3D Acceleration)</comment>
-        <translation type="unfinished">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (3D Acceleration)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Setting Up</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Differencing</source>
-        <comment>DiskType</comment>
-        <translation type="unfinished">Ezberdintzen</translation>
-    </message>
-    <message>
-        <source><nobr>%1 MB</nobr></source>
-        <comment>details report</comment>
-        <translation type="unfinished"><nobr>%4 MB</nobr> {1 ?}</translation>
-    </message>
-    <message>
-        <source>Processor(s)</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><nobr>%1</nobr></source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (VRDP Server)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Raw File</source>
-        <comment>PortMode</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details report (2D Video Acceleration)</comment>
-        <translation type="unfinished">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (2D Video Acceleration)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>2D Video Acceleration</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not Attached</source>
-        <comment>details report (Storage)</comment>
-        <translation type="unfinished">Ez erantsia</translation>
-    </message>
-    <message>
-        <source>Storage</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Teleported</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guru Meditation</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Teleporting</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taking Live Snapshot</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Teleporting Paused VM</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restoring Snapshot</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deleting Snapshot</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Floppy</source>
-        <comment>StorageBus</comment>
-        <translation type="unfinished">Disketea</translation>
-    </message>
-    <message>
-        <source>Paravirtualized Network (virtio-net)</source>
-        <comment>NetworkAdapterType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I82078</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Empty</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host Drive '%1'</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host Drive %1 (%2)</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p style=white-space:pre>Type (Format):  %1 (%2)</p></source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>Attached to:  %1</p></source>
-        <comment>image</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><i>Not Attached</i></source>
-        <comment>image</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><i>Checking accessibility...</i></source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to check accessibility of disk image files.</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><b>No disk image file selected</b></source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can also change this while the machine is running.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><b>No disk image files available</b></source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n year(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n month(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n day(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minute(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n second(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Screens</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SAS</source>
-        <comment>StorageBus</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>LsiLogic SAS</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>B</source>
-        <comment>size suffix Bytes</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KB</source>
-        <comment>size suffix KBytes=1024 Bytes</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <comment>size suffix MBytes=1024 KBytes</comment>
-        <translation type="unfinished">MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <comment>size suffix GBytes=1024 MBytes</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TB</source>
-        <comment>size suffix TBytes=1024 GBytes</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PB</source>
-        <comment>size suffix PBytes=1024 TBytes</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Nested Paging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown device</source>
-        <comment>USB device details</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Desktop Server Port</source>
-        <comment>details report (VRDE Server)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Desktop Server</source>
-        <comment>details report (VRDE Server)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (VRDE Server)</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>hard disk</source>
-        <translation type="obsolete">disko gogorra</translation>
-    </message>
-    <message>
-        <source>All files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fault Tolerant Syncing</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unlocked</source>
-        <comment>SessionState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Locked</source>
-        <comment>SessionState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unlocking</source>
-        <comment>SessionState</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Null</source>
-        <comment>AuthType</comment>
-        <translation type="unfinished">Nulua</translation>
-    </message>
-    <message>
-        <source>External</source>
-        <comment>AuthType</comment>
-        <translation type="unfinished">Kanpokoa</translation>
-    </message>
-    <message>
-        <source>Guest</source>
-        <comment>AuthType</comment>
-        <translation type="unfinished">Bezeroa</translation>
-    </message>
-    <message>
-        <source>Intel HD Audio</source>
-        <comment>AudioControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PIIX3</source>
-        <comment>ChipsetType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ICH9</source>
-        <comment>ChipsetType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <comment>size suffix MBytes=1024KBytes</comment>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>Execution Cap</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><nobr>%1%</nobr></source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Generic, '%1'</source>
-        <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Generic Driver</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adapter %1</source>
-        <translation type="unfinished">%1 Moldagailua</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>DragAndDropType</comment>
-        <translation type="unfinished">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Host To Guest</source>
-        <comment>DragAndDropType</comment>
-        <translation type="unfinished">Ostalaritik Bezerora</translation>
-    </message>
-    <message>
-        <source>Guest To Host</source>
-        <comment>DragAndDropType</comment>
-        <translation type="unfinished">Bezerotik Ostalarira</translation>
-    </message>
-    <message>
-        <source>Bidirectional</source>
-        <comment>DragAndDropType</comment>
-        <translation type="unfinished">Bi zentzuetakoa</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <comment>MediumType</comment>
-        <translation type="unfinished">Arrunta</translation>
-    </message>
-    <message>
-        <source>Immutable</source>
-        <comment>MediumType</comment>
-        <translation type="unfinished">Aldaezina</translation>
-    </message>
-    <message>
-        <source>Writethrough</source>
-        <comment>MediumType</comment>
-        <translation type="unfinished">Idatzihola</translation>
-    </message>
-    <message>
-        <source>Shareable</source>
-        <comment>MediumType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Readonly</source>
-        <comment>MediumType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multi-attach</source>
-        <comment>MediumType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dynamically allocated differencing storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed size storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dynamically allocated storage split into files of less than 2GB</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dynamically allocated differencing storage split into files of less than 2GB</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed size storage split into files of less than 2GB</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dynamically allocated compressed storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dynamically allocated differencing compressed storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed size ESX storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed size storage on raw disk</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deny</source>
-        <comment>NetworkAdapterPromiscModePolicy</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow VMs</source>
-        <comment>NetworkAdapterPromiscModePolicy</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow All</source>
-        <comment>NetworkAdapterPromiscModePolicy</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ignore</source>
-        <comment>USBDeviceFilterAction</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hold</source>
-        <comment>USBDeviceFilterAction</comment>
-        <translation type="unfinished">Eskuratu</translation>
-    </message>
-    <message>
-        <source>UDP</source>
-        <comment>NATProtocol</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TCP</source>
-        <comment>NATProtocol</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IDE Primary Master</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IDE Primary Slave</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IDE Secondary Master</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IDE Secondary Slave</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SATA Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SAS Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Floppy Device %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished">Orokorra</translation>
-    </message>
-    <message>
-        <source>Preview</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished">Audioa</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished">Sarea</translation>
-    </message>
-    <message>
-        <source>Serial ports</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parallel ports</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished">USB</translation>
-    </message>
-    <message>
-        <source>Shared folders</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose a virtual optical disk file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All virtual optical disk files (%1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose a virtual floppy disk file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All virtual floppy disk files (%1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VDI (VirtualBox Disk Image)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VMDK (Virtual Machine Disk)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VHD (Virtual Hard Disk)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HDD (Parallels Hard Disk)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QED (QEMU enhanced disk)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QCOW (QEMU Copy-On-Write)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details report (Unrestricted Execution)</comment>
-        <translation type="obsolete">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details report (Unrestricted Execution)</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Unrestricted Execution</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PS/2 Mouse</source>
-        <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB Mouse</source>
-        <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PS/2 and USB Mouse</source>
-        <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>unrestricted execution</comment>
-        <translation type="obsolete">Gaiturik</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>unrestricted execution</comment>
-        <translation type="obsolete">Ezgaiturik</translation>
-    </message>
-    <message>
-        <source>Unrestricted Execution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB Tablet</source>
-        <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB Multi-Touch Tablet</source>
-        <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NAT Network</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NAT network, '%1'</source>
-        <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished">USB</translation>
-    </message>
-    <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>off</source>
-        <comment>guest monitor status</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Batez</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Lehenetsia</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>UIVMListView</name>
     <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <location filename="../src/selector/UIVMItem.cpp" line="+164"/>
+        <location line="+12"/>
+        <location filename="../src/selector/graphics/details/UIGMachinePreview.cpp" line="+3"/>
+        <source>Inaccessible</source>
+        <translation>Eskuraezina</translation>
     </message>
     <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
+        <comment>VM tooltip (name, last state change, session state)</comment>
+        <translation><nobr>%1<br></nobr><nobr>%2 -> %3-tik</nobr><br><nobr>Saioa %4</nobr></translation>
     </message>
     <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <location line="+12"/>
+        <source><nobr><b>%1</b><br></nobr><nobr>Inaccessible since %2</nobr></source>
+        <comment>Inaccessible VM tooltip (name, last state change)</comment>
+        <translation><nobr><b>%1</b><br></nobr><nobr>Eskuraezina %2-tik</nobr></translation>
     </message>
+</context>
+<context>
+    <name>UIVMLogViewer</name>
     <message>
-        <source>Active</source>
-        <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished"></translation>
+        <location filename="../src/UIVMLogViewer.cpp" line="+171"/>
+        <source>Close the search panel</source>
+        <translation>Itxi bilaketa panela</translation>
     </message>
     <message>
-        <source>Inactive</source>
-        <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <location line="+370"/>
+        <source>&Find</source>
+        <translation>&Bilatu</translation>
     </message>
     <message>
-        <source>Active</source>
-        <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished"></translation>
+        <location line="-369"/>
+        <source>Enter a search string here</source>
+        <translation>Sartu bilaketa kate bat hemen</translation>
     </message>
     <message>
-        <source>Inactive</source>
-        <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>&Previous</source>
+        <translation>&Aurrekoa</translation>
     </message>
     <message>
-        <source>Active</source>
-        <comment>details report (Unrestricted Execution)</comment>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Search for the previous occurrence of the string</source>
+        <translation>Bilatu katearen aurreko gertaera</translation>
     </message>
     <message>
-        <source>Inactive</source>
-        <comment>details report (Unrestricted Execution)</comment>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>&Next</source>
+        <translation>&Hurrengoa</translation>
     </message>
     <message>
-        <source>Taking Snapshot</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Search for the next occurrence of the string</source>
+        <translation>Bilatu katearen hurrengo gertaera</translation>
     </message>
     <message>
-        <source>Taking Online Snapshot</source>
-        <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>C&ase Sensitive</source>
+        <translation>Be&reizi Hizki Larri-xeheak</translation>
     </message>
     <message>
-        <source>KVM</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Perform case sensitive search (when checked)</source>
+        <translation>Hizki larri-xeheak bereiziz bilatzen du (hautatutakoan)</translation>
     </message>
     <message>
-        <source>Optical</source>
-        <comment>DeviceType</comment>
-        <translation type="unfinished"></translation>
+        <location line="+2"/>
+        <source>String not found</source>
+        <translation>Katea ez da aurkitu</translation>
     </message>
     <message>
-        <source>TCP</source>
-        <comment>PortMode</comment>
-        <translation type="unfinished"></translation>
+        <location line="+309"/>
+        <source><p>No log files found. Press the <b>Refresh</b> button to rescan the log folder <nobr><b>%1</b></nobr>.</p></source>
+        <translation><p>Ez da ohar agiririk aurkitu. Sakatu <b>Berritu</b> botoia <nobr><b>%1</b></nobr> ohar agiritegia berriro mihatzeko.</p></translation>
     </message>
     <message>
-        <source>OHCI</source>
-        <comment>USBControllerType</comment>
-        <translation type="unfinished"></translation>
+        <location line="+33"/>
+        <source>Save VirtualBox Log As</source>
+        <translation>Gorde VirtualBox Oharra Honela</translation>
     </message>
     <message>
-        <source>EHCI</source>
-        <comment>USBControllerType</comment>
-        <translation type="unfinished"></translation>
+        <location line="+14"/>
+        <source>%1 - VirtualBox Log Viewer</source>
+        <translation>%1 - VirtualBox Ohar Ikusgailua</translation>
     </message>
     <message>
-        <source>xHCI</source>
-        <comment>USBControllerType</comment>
-        <translation type="unfinished"></translation>
+        <location line="+4"/>
+        <source>&Refresh</source>
+        <translation>B&erritu</translation>
     </message>
     <message>
-        <source>User interface</source>
-        <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>&Save</source>
+        <translation>&Gorde</translation>
     </message>
     <message>
-        <source>(Optical Drive)</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Close</source>
+        <translation>Itxi</translation>
     </message>
+</context>
+<context>
+    <name>UIVMPreviewWindow</name>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <source>Update Disabled</source>
+        <translation type="obsolete">Eguneraketa ezgaituta</translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <source>Every 0.5 s</source>
+        <translation type="obsolete">0.5 seg-tik behin</translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <source>Every 1 s</source>
+        <translation type="obsolete">1 seg-tik behin</translation>
     </message>
     <message>
-        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <source>Every 2 s</source>
+        <translation type="obsolete">2 seg-tik behin</translation>
     </message>
     <message>
-        <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Medium Manager to inspect these files.</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <source>Every 5 s</source>
+        <translation type="obsolete">5 seg-tik behin</translation>
     </message>
     <message>
-        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <source>Every 10 s</source>
+        <translation type="obsolete">10 seg-tik behin</translation>
     </message>
     <message>
-        <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <source>No Preview</source>
+        <translation type="obsolete">Ez dago Aurreikuspenik</translation>
     </message>
 </context>
 <context>
-    <name>VBoxGlobalSettings</name>
+    <name>UIWizard</name>
     <message>
-        <source>'%1 (0x%2)' is an invalid host key code.</source>
-        <translation type="obsolete">'%1 (0x%2)' ostalari gako kode oker bat da.</translation>
+        <source>Hide Description</source>
+        <translation type="obsolete">Ezkutatu Azalpena</translation>
     </message>
     <message>
-        <source>The value '%1' of the key '%2' doesn't match the regexp constraint '%3'.</source>
-        <translation>'%2' gakoaren '%1' balioak ez du '%3' espresio erregular murriztapena betetzen.</translation>
+        <source>Show Description</source>
+        <translation type="obsolete">Erakutsi Azalpena</translation>
     </message>
     <message>
-        <source>Cannot delete the key '%1'.</source>
-        <translation>Ezin da '%1' tekla ezabatu.</translation>
+        <location filename="../src/wizards/UIWizard.cpp" line="+109"/>
+        <source>&Expert Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>'%1' is an invalid host-combination code-sequence.</source>
+        <location line="+1"/>
+        <source>Switch to <nobr><b>Expert Mode</b></nobr>, a one-page dialog for experienced users.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>&Guided Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Switch to <nobr><b>Guided Mode</b></nobr>, a step-by-step dialog with detailed explanations.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>VBoxGlobalSettingsDlg</name>
+    <name>UIWizardCloneVD</name>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategoria</translation>
+        <source>Copy Virtual Hard Drive</source>
+        <translation type="obsolete">Kopiatu Diska Gogor Birtuala</translation>
     </message>
     <message>
-        <source>[id]</source>
-        <translation type="obsolete">[id]</translation>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVD.cpp" line="+119"/>
+        <source>Copy Virtual Hard Disk</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[link]</source>
-        <translation type="obsolete">[lotura]</translation>
+        <location line="+1"/>
+        <source>Copy</source>
+        <translation>Kopiatu</translation>
     </message>
     <message>
-        <source>[name]</source>
-        <translation type="obsolete">[izena]</translation>
+        <source>Hard drive to copy</source>
+        <translation type="obsolete">Diska gogorra kopiara</translation>
     </message>
     <message>
-        <source><i>Select a settings category from the list on the left-hand side and move the mouse over a settings item to get more information<i>.</source>
-        <translation type="obsolete"><i>Hautatu ezarpen kategoria bat ezkerreko zerrendatik eta mugitu sagua elementu baten gainetik argibide gehiago jasotzeko<i>.</translation>
+        <source><p>Please select the virtual hard drive file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
+        <translation type="obsolete"><p>Mesedez hautatu kopiatzea nahi duzun diska gogor birtual agiria jadanik hautaturik ez badago. Zerrendatik ere hautatu dezakezu bat edo erabili zerrendaren ondoko agiritegia ikurra bat hautatzeko.</p></translation>
     </message>
     <message>
-        <source> General </source>
-        <translation type="obsolete"> Orokorra </translation>
+        <source>Choose a virtual hard drive file to copy...</source>
+        <translation type="obsolete">Hautatu diska gogor birtual agiri bat kopiatzeko...</translation>
     </message>
     <message>
-        <source>0</source>
-        <translation type="obsolete">0</translation>
+        <source>Hard drive file type</source>
+        <translation type="obsolete">Diska gogor agiri mota</translation>
     </message>
     <message>
-        <source>#general</source>
-        <translation type="obsolete">#general</translation>
+        <source>Please choose the type of file that you would like to use for the new virtual hard drive. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
+        <translation type="obsolete">Mesedez hautatu diska gogor birtual berrirako erabiltzea nahi duzun agiri mota. Beste birtualizazio software batekin erabili beharrik ez baduzu ezarpen hau aldatu gabe utzi dezakezu.</translation>
     </message>
     <message>
-        <source> Input </source>
-        <translation type="obsolete"> Idatzi </translation>
+        <source>Storage on physical hard drive</source>
+        <translation type="obsolete">Bitegiratu diska gogor fisikoan</translation>
     </message>
     <message>
-        <source>1</source>
-        <translation type="obsolete">1</translation>
+        <source>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
+        <translation type="obsolete">Mesedez hautatu diska gogor birtual berria handitu egin behar den erabileraren arabera (dinamikoki esleitua) edo gehienezko neurrian sortu behar den (neurri zuzendua).</translation>
     </message>
     <message>
-        <source>#input</source>
-        <translation type="obsolete">#input</translation>
+        <source><p>A <b>dynamically allocated</b> hard drive file will only use space on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
+        <translation type="obsolete"><p><b>Dinamikoki esleitutako</b> diska gogor agiriak zure diska gogor fisikoan betetze ahala erabiliko du tokia (gehienezkora arte <b>neurri zuzendua</b>), baina ez da berriro berezgaitasunez murriztuko toki askea gelditzen denean.</p></translation>
     </message>
     <message>
-        <source> USB </source>
-        <translation type="obsolete"> USB </translation>
+        <source><p>A <b>fixed size</b> hard drive file may take longer to create on some systems but is often faster to use.</p></source>
+        <translation type="obsolete"><p>A <b>neurri zuzendua</b> diska gogor agiriak denbora gehiago hartu dezake sortzeko zenbait sistematan baina erabiltzeko azkarragoa da.</p></translation>
     </message>
     <message>
-        <source>2</source>
-        <translation type="obsolete">2</translation>
+        <source><p>You can also choose to <b>split</b> the hard drive file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
+        <translation type="obsolete"><p>Hautatu dezakezu ere diska gogorra agiri anitzetan <b>banantzea</b> bakoitza bi gigabyte arte. Hau erabilgarria da nagusiki makina birtuala USB gailu kengarri batean edo sistema zaharretan biltegiratzea nahi baduzu, hauetako batzuek ezin dute agiri oso handika kudeatu.</translation>
     </message>
     <message>
-        <source>#usb</source>
-        <translation type="obsolete">#usb</translation>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageBasic3.cpp" line="+126"/>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp" line="+243"/>
+        <source>Storage on physical hard disk</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default &Folders</source>
-        <translation type="obsolete">Lehenetsiriko &Karpetak</translation>
+        <location line="+3"/>
+        <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Machines</source>
-        <translation type="obsolete">Makinak</translation>
+        <location line="+2"/>
+        <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>VDI files</source>
-        <translation type="obsolete">VDI fitxategiak</translation>
+        <location line="+3"/>
+        <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
-        <translation type="obsolete">Hautatu</translation>
+        <location line="+2"/>
+        <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="obsolete">&Teklatua</translation>
+        <location line="+4"/>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp" line="+1"/>
+        <source>&Dynamically allocated</source>
+        <translation>&Dinamikoki esleituta</translation>
     </message>
     <message>
-        <source>&Host Key</source>
-        <translation type="obsolete">&Ostalari Gakoa</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp" line="+1"/>
+        <source>&Fixed size</source>
+        <translation>&Neurri zuzendua</translation>
     </message>
     <message>
-        <source>&Auto capture keyboard</source>
-        <translation type="obsolete">&Auto-kapturatu teklatua</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp" line="+1"/>
+        <source>&Split into files of less than 2GB</source>
+        <translation>&Banandu 2 GB baino gutxiagoko agirietan</translation>
     </message>
     <message>
-        <source>Alt+A</source>
-        <translation type="obsolete">Alt+A</translation>
+        <source>Please choose a location for new virtual hard drive file</source>
+        <translation type="obsolete">Mesedez hautatu diska gogor birtual agiriarentzako kokaleku bat</translation>
     </message>
     <message>
-        <source>&USB Device Filters</source>
-        <translation type="obsolete">&USB Gailu Iragazkiak</translation>
+        <source>New hard drive to create</source>
+        <translation type="obsolete">Diska gogor berria sortzeko</translation>
     </message>
     <message>
-        <source>Ins</source>
-        <translation type="obsolete">Ins</translation>
+        <source>Please type the name of the new virtual hard drive file into the box below or click on the folder icon to select a different folder to create the file in.</source>
+        <translation type="obsolete">Mesedez idatzi diska gogor birtual berriarentzako izena beheko kutxan edo klikatu agiritegia ikurrean agiria sortzeko beste agiritegi bat hautatzeko.</translation>
     </message>
     <message>
-        <source>Add Empty (Ins)</source>
-        <translation type="obsolete">Gehitu hutsa (Ins)</translation>
+        <source>Choose a location for new virtual hard drive file...</source>
+        <translation type="obsolete">Hautatu diska gogor birtual agiri berriarentzako kokaleku bat...</translation>
     </message>
     <message>
-        <source>Alt+Ins</source>
-        <translation type="obsolete">Alt+Ins</translation>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageBasic4.cpp" line="+87"/>
+        <source>Please choose a location for new virtual hard disk file</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add From (Alt+Ins)</source>
-        <translation type="obsolete">Gehitu hemendik (Alt+Ins)</translation>
+        <location line="+114"/>
+        <source>New hard disk to create</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Del</source>
-        <translation type="obsolete">Ezab</translation>
+        <location line="+3"/>
+        <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove (Del)</source>
-        <translation type="obsolete">Ezabatu (Ezab)</translation>
+        <location line="+2"/>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp" line="-11"/>
+        <source>Choose a location for new virtual hard disk file...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes the selected USB filter.</source>
-        <translation type="obsolete">Haututako USB iragazkia kentzen du.</translation>
+        <location line="+15"/>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp" line="-60"/>
+        <source>%1_copy</source>
+        <comment>copied virtual hard drive name</comment>
+        <translation>%1_kopia</translation>
     </message>
     <message>
-        <source>Ctrl+Up</source>
-        <translation type="obsolete">Ktrl+Gora</translation>
+        <source>Hard drive to &copy</source>
+        <translation type="obsolete">&Kopiatzeko diska gogorra</translation>
     </message>
     <message>
-        <source>Move Up (Ctrl+Up)</source>
-        <translation type="obsolete">Gora Mugitu (Ktrl-Gora)</translation>
+        <source>&New hard drive to create</source>
+        <translation type="obsolete">&Sortzeko diska gogor berria</translation>
     </message>
     <message>
-        <source>Moves the selected USB filter up.</source>
-        <translation type="obsolete">Haututako USB iragazkia gora mugitzen du.</translation>
+        <source>Hard drive file &type</source>
+        <translation type="obsolete">Diska gogor agiri &mota</translation>
     </message>
     <message>
-        <source>Ctrl+Down</source>
-        <translation type="obsolete">Ktrl+Behera</translation>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageBasic1.cpp" line="+115"/>
+        <source>Hard disk to copy</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Move Down (Ctrl+Down)</source>
-        <translation type="obsolete">Behera Mugitu (Ktrl-+ehera)</translation>
+        <location line="+3"/>
+        <source><p>Please select the virtual hard disk file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Moves the selected USB filter down.</source>
-        <translation type="obsolete">Haututako USB iragazkia behera mugitzen du.</translation>
+        <location line="+3"/>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp" line="+58"/>
+        <source>Choose a virtual hard disk file to copy...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="obsolete">Laguntza</translation>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp" line="+135"/>
+        <source>Hard disk file type</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>F1</source>
-        <translation type="obsolete">F1</translation>
+        <location line="+3"/>
+        <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the dialog help.</source>
-        <translation type="obsolete">Elkarrizketa laguntza bistaratzen du.</translation>
+        <location filename="../src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp" line="-1"/>
+        <source>Hard disk to &copy</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid settings detected</source>
-        <translation type="obsolete">Okerreko ezarpenak atzeman dira</translation>
+        <location line="+2"/>
+        <source>&New hard disk to create</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&OK</source>
-        <translation type="obsolete">Ad&os</translation>
+        <location line="+2"/>
+        <source>Hard disk file &type</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>UIWizardCloneVM</name>
     <message>
-        <source>Alt+O</source>
-        <translation type="obsolete">ALt+O</translation>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVM.cpp" line="+85"/>
+        <source>Linked Base for %1 and %2</source>
+        <translation>Loturatutako Ohina %1 eta %2-rako</translation>
     </message>
     <message>
-        <source>Accepts (saves) changes and closes the dialog.</source>
-        <translation type="obsolete">Onartu (gorde) aldaketak eta elkarrizketa ixten du.</translation>
+        <location line="+86"/>
+        <source>Clone Virtual Machine</source>
+        <translation>Klonatu Makina Birtuala</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <location line="+1"/>
+        <source>Clone</source>
+        <translation>Klonatu</translation>
     </message>
     <message>
-        <source>Cancels changes and closes the dialog.</source>
-        <translation type="obsolete">Aldaketak desegin eta leihoa ixten du.</translation>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageBasic1.cpp" line="+64"/>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp" line="+53"/>
+        <source>%1 Clone</source>
+        <translation>%1 Klona</translation>
     </message>
     <message>
-        <source>VirtualBox Preferences</source>
-        <translation type="obsolete">VirtualBox Hobespenak</translation>
+        <location line="+20"/>
+        <source>New machine name</source>
+        <translation>Makina berriaren izena</translation>
     </message>
     <message>
-        <source>Holds the key used as a Host Key in the VM window. Activate the entry field and press a new Host Key. Note that alphanumeric, cursor movement and editing keys cannot be used.</source>
-        <translation type="obsolete">MB leihoan Ostalari Tekla bezala erabilitakoa tekla erakusten du. Eremua gaitu eta Ostalari Tekla berria sakatu. Kontutan izan alfazenbakizkoak, kurtsore mugimenduak eta edizio teklak ezin direla Ostalari tekla bezala erabili.</translation>
+        <location line="+3"/>
+        <source><p>Please choose a name for the new virtual machine. The new machine will be a clone of the machine <b>%1</b>.</p></source>
+        <translation><p>Mesedez hautatu makina birtual berriarentzako izen bat. Makina berria <b>%1</b> makinaren klon bat izando da.</p></translation>
     </message>
     <message>
-        <source>New Filter %1</source>
-        <comment>usb</comment>
-        <translation type="obsolete">Iragazki Berri %1</translation>
+        <location line="+3"/>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp" line="+81"/>
+        <source>When checked a new unique MAC address will be assigned to all configured network cards.</source>
+        <translation>Hautatutakoan MAC helbide bakarra esleituko zaie itxuratutako sare txartel guztieri.</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="obsolete"> Hizkuntza </translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp" line="+1"/>
+        <source>&Reinitialize the MAC address of all network cards</source>
+        <translation>&Berrabiarazi sare txartel guztien MAC helbidea</translation>
     </message>
     <message>
-        <source>3</source>
-        <translation type="obsolete">3</translation>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageBasic2.cpp" line="+93"/>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp" line="-8"/>
+        <source>Clone type</source>
+        <translation>Klonatu mota</translation>
     </message>
     <message>
-        <source>#language</source>
-        <translation type="obsolete">#language</translation>
+        <location line="+3"/>
+        <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Interface Language</source>
-        <translation type="obsolete">&Interfaze Hizkuntza</translation>
+        <location line="+10"/>
+        <source><p>If you create a <b>Linked clone</b> then a new snapshot will be created in the original virtual machine as part of the cloning process.</p></source>
+        <translation><p><b>Loturaturiko klona</b> sortzen baduzu argazki berri bat sortuko da jatorrizko makina birtualean klonazio aurrerabidearen atal bezala.</p></translation>
     </message>
     <message>
-        <source>Author(s):</source>
-        <translation type="obsolete">Egilea(k):</translation>
+        <location line="+4"/>
+        <source>&Full clone</source>
+        <translation>&Klon osoa</translation>
     </message>
     <message>
-        <source>Language:</source>
-        <translation type="obsolete">Hizkuntza:</translation>
+        <location line="+1"/>
+        <source>&Linked clone</source>
+        <translation>&Loturiko Klona</translation>
     </message>
     <message>
-        <source> (built-in)</source>
-        <comment>Language</comment>
-        <translation type="obsolete"> (barneratua)</translation>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageBasic3.cpp" line="+95"/>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp" line="+3"/>
+        <source>Snapshots</source>
+        <translation>Berehalakoak</translation>
     </message>
     <message>
-        <source><unavailable></source>
-        <comment>Language</comment>
-        <translation type="obsolete"><erabilezina></translation>
+        <location line="+3"/>
+        <source><p>Please choose which parts of the snapshot tree should be cloned with the machine.</p></source>
+        <translation><p>Mesedez hautatu argazki zuhaitzaren zein atal klonatu behar diren makinarekin.</p></translation>
     </message>
     <message>
-        <source><unknown></source>
-        <comment>Author(s)</comment>
-        <translation type="obsolete"><ezezaguna></translation>
+        <location line="+2"/>
+        <source><p>If you choose <b>Current machine state</b>, the new machine will reflect the current state of the original machine and will have no snapshots.</p></source>
+        <translation><p><b>Oraingo makina egoera</b> hautatzen baduzu, makina berriak jatorrizko makinaren uneko egoera isladatuko du eta ez du argazkirik izango.</p></translation>
     </message>
     <message>
-        <source>
-<qt>Lists all available user interface languages. The effective language is
-written in <b>bold</b>. Select <i>Default</i> to reset
-to the system default language.</qt>
-                                    </source>
-        <translation type="obsolete">
-<qt>
-<qt>Interfaze hizkuntza erabilgarrien zerrenda. Erabiltzen
-dena <b>lodian</b> idatzirik dago. Hautatu <i>Lehenetsia</i>
-sistemako lehenetsiriko hizkuntza berrezartzeko.</qt>
-                                    </translation>
+        <location line="+3"/>
+        <source><p>If you choose <b>Current snapshot tree branch</b>, the new machine will reflect the current state of the original machine and will have matching snapshots for all snapshots in the tree branch starting at the current state in the original machine.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
-        <comment>Language</comment>
-        <translation type="obsolete">Lehenetsia</translation>
+        <location line="+5"/>
+        <source><p>If you choose <b>Everything</b>, the new machine will reflect the current state of the original machine and will have matching snapshots for all snapshots in the original machine.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path to the default VDI folder. This folder is used, if not explicitly specified otherwise, when adding existing or creating new virtual hard disks.</source>
-        <translation type="obsolete">Lehenetsiriko VDI karpetaren bidea bistaratzen du. Karpeta hau erabiliko, beste ezer zehazten ez den bitartean, disko gogor birtual sortu edo gehitzerakoan.</translation>
+        <location line="+16"/>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp" line="+1"/>
+        <source>Current &machine state</source>
+        <translation>Oraingo &makinaren egoera</translation>
     </message>
     <message>
-        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Berrezarri makina birtual karpeta bidea lehenetsiriko baliora. Oraingo lehenetsiriko bidea bistaraziko da aldaketak onartu eta leiho hau berriz irekitzean.</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp" line="+1"/>
+        <source>Current &snapshot tree branch</source>
+        <translation>Oraingo &argazki zuhaitz adarra</translation>
     </message>
     <message>
-        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">VDI karpeta bidearen lehenetsiriko balioa berrezartzen du. Uneko lehenetsiriko bidea bistaraziko da aldaketak onartu eta leiho hau berriz irekitzean.</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp" line="+1"/>
+        <source>&Everything</source>
+        <translation>&Dena</translation>
     </message>
     <message>
-        <source>Holds the path to the default virtual machine folder. This folder is used, if not explicitly specified otherwise, when creating new virtual machines.</source>
-        <translation type="obsolete">Lehenetsiriko makina birtual karpetaren bidea bistaratzen du. Karpeta hau erabiliko, beste ezer zehazten ez den bitartean, makina birtualak sortzerakoan.</translation>
+        <location filename="../src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp" line="-7"/>
+        <source>New machine &name</source>
+        <translation>&Makina berriaren izena</translation>
     </message>
     <message>
-        <source>Opens a window to select the default VDI folder.</source>
-        <translation type="obsolete">Lehenetsiriko VDI karpeta hautatzeko leihoa irekitzen du.</translation>
+        <location line="+2"/>
+        <source>&Full Clone</source>
+        <translation>&Klon osoa</translation>
     </message>
     <message>
-        <source>Opens a window to select the default virtual machine folder.</source>
-        <translation type="obsolete">Lehenetsiriko makina birtual karpeta hautatzeko leihoa irekitzen du.</translation>
+        <location line="+1"/>
+        <source>&Linked Clone</source>
+        <translation>&Loturiko Klona</translation>
     </message>
+</context>
+<context>
+    <name>UIWizardExportApp</name>
     <message>
-        <source>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</source>
-        <translation type="obsolete">Markaturik dagoenean, teklatua automatikoki kapturatuko da MB leiho aktibatzen den bakoitzean. Teklatua kapturatzen denean, tekla sakatze guztiak (Alt-TAb bezalako sistemakoak barne) makina birtualera bidaliko da.</translation>
+        <location filename="../src/wizards/exportappliance/UIWizardExportApp.cpp" line="+95"/>
+        <source>Checking files ...</source>
+        <translation>Agiriak egiaztatzen...</translation>
     </message>
     <message>
-        <source>Lists all global USB filters. The checkbox to the left defines whether the particular filter is enabled or not.</source>
-        <translation type="obsolete">USB iragazki orokorrak zerrendatzen ditu. Ezkerreko aukera kutxak iragazki bat gaiturik dagoen edo ez adierazten du.</translation>
+        <location line="+22"/>
+        <source>Removing files ...</source>
+        <translation>Agiriak kentzen...</translation>
     </message>
     <message>
-        <source>Adds a new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="obsolete">Gehitu USB iragazki berri bat eremu guztiak hutsean dituela. Kontutan izan iragazki honek erantsiriko edozein USB gailu aurkituko duela.</translation>
+        <location line="+80"/>
+        <source>Exporting Appliance ...</source>
+        <translation>Makina Birtuala Esportatzen...</translation>
     </message>
     <message>
-        <source>Adds a new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="obsolete">Ostalari ordenagailuari erantsitako hautatutako USB gailuaren eremu balioekin USB iragazki berri bat sortu.</translation>
+        <location line="+92"/>
+        <source>Export Virtual Appliance</source>
+        <translation>Esportatu Makina Birtuala</translation>
     </message>
     <message>
-        <source>V&RDP Authentication Library</source>
-        <translation type="obsolete">V&RDP Autentifikazio Liburutegia</translation>
+        <location line="+1"/>
+        <source>Restore Defaults</source>
+        <translation>Leheneratu Berezkoetara</translation>
     </message>
     <message>
-        <source>Holds the path to the library that provides authentication for Remote Display (VRDP) clients.</source>
-        <translation type="obsolete">Urruneko Pantaila (VRDP) bezeroentzat autentifikazioaz hornitzen duen liburutegiaren bidea erakusten du.</translation>
+        <location line="+1"/>
+        <source>Export</source>
+        <translation>Esportatu</translation>
     </message>
     <message>
-        <source>Opens a window to select the VRDP authentication library file.</source>
-        <translation type="obsolete">VRDP autentifikazio liburutegiaren bidea hautatzeko leihoa irekitzen du.</translation>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp" line="+141"/>
+        <source>Virtual machines to export</source>
+        <translation>Esportatzeko Makina Birtualak</translation>
     </message>
     <message>
-        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Estratifikazio liburutegi fitxategia lehenetsiriko balioan berrezarri. Lehenetsiriko liburutegia erakutsiko da aldaketak onartu eta leiho hau berriz irekitzean.</translation>
+        <location line="+3"/>
+        <source><p>Please select the virtual machines that should be added to the appliance. You can select more than one. Please note that these machines have to be turned off before they can be exported.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Extended Features</source>
-        <translation type="obsolete">&Hedaturiko Ezaugarriak</translation>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp" line="+111"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageBasic4.cpp" line="+110"/>
+        <source>Appliance settings</source>
+        <translation>Makina Birtual ezarpenak</translation>
     </message>
     <message>
-        <source>Enable &VT-x/AMD-V</source>
-        <translation type="obsolete">&VT-x/AMD-V gaitu</translation>
+        <location line="+3"/>
+        <source>Please choose where to create the virtual appliance. You can create it on your own computer, on the Sun Cloud service or on an S3 storage server.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alt+V</source>
-        <translation type="obsolete">Alt+V</translation>
+        <location line="+3"/>
+        <source>Create on</source>
+        <translation>Sortze eguna</translation>
     </message>
     <message>
-        <source>Defines whether virtual machines should try to make use of the host CPU's hardware virtualization extensions such as Intel VT-x and AMD-V by default or not.</source>
-        <translation type="obsolete">Makina birtualek ostalariaren Intel VT-x and AMD-V bezalako cpu-aren hardware birtualizazio hedapenak lehenespen bezala erabili behar dituzten ezartzen du.</translation>
+        <location line="+1"/>
+        <source>&This computer</source>
+        <translation>&Ordenagailu hau</translation>
     </message>
-</context>
-<context>
-    <name>VBoxHardDiskSettings</name>
     <message>
-        <source>Hard Disk</source>
-        <translation type="obsolete">Disko gogorrak</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+228"/>
+        <source>Sun &Cloud</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="obsolete">Disko &Gogorrak</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>&Simple Storage System (S3)</source>
+        <translation>&Biltegi Arrunt Sistema (S3)</translation>
     </message>
     <message>
-        <source>Ins</source>
-        <translation type="obsolete">Ins</translation>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp" line="+296"/>
+        <source>Storage settings</source>
+        <translation>Biltegiratze ezarpenak</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Ezabatu</translation>
+        <location line="+3"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="-8"/>
+        <source>Appliance</source>
+        <translation>Makina Birtuala</translation>
     </message>
-</context>
-<context>
-    <name>VBoxHelpButton</name>
     <message>
-        <source>&Help</source>
-        <translation type="obsolete">&Laguntza</translation>
+        <location line="+2"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+9"/>
+        <source>&Username:</source>
+        <translation>&Erabiltzaile-izena:</translation>
     </message>
-</context>
-<context>
-    <name>VBoxLicenseViewer</name>
     <message>
-        <source>VirtualBox License</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>&Password:</source>
+        <translation>&Sarhitza:</translation>
     </message>
     <message>
-        <source>I &Agree</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>&Hostname:</source>
+        <translation>&Hostalari-izena:</translation>
     </message>
     <message>
-        <source>I &Disagree</source>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>&Bucket:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VBoxLogSearchPanel</name>
     <message>
-        <source>Close the search panel</source>
-        <translation type="obsolete">Bilaketa panela itxi</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>&File:</source>
+        <translation>&Agiria:</translation>
     </message>
     <message>
-        <source>Find </source>
-        <translation type="obsolete">Bilatu </translation>
+        <location line="+2"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+2"/>
+        <source>Please choose a file to export the virtual appliance to</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter a search string here</source>
-        <translation type="obsolete">Bilaketa katea idatzi hemen</translation>
+        <location line="+9"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+9"/>
+        <source>Write in standard OVF 1.0 format.</source>
+        <translation>OVF 1.0 heuskarri estandarrean idatzia.</translation>
     </message>
     <message>
-        <source>&Previous</source>
-        <translation type="obsolete">&Aurrekoa</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>Write in new experimental OVF 2.0 format.</source>
+        <translation>OVF 2.0 heuskarri esperimental berrian idatzia.</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation type="obsolete">Alt+A</translation>
+        <source>Please choose a virtual appliance file</source>
+        <translation type="obsolete">Mesedez hautatu makina birtual agiria</translation>
     </message>
     <message>
-        <source>Search for the previous occurrence of the string</source>
-        <translation type="obsolete">Katearen aurreko errepikatzea bilatu</translation>
+        <location line="-9"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="-9"/>
+        <source>Open Virtualization Format Archive (%1)</source>
+        <translation>Ireki Birtualizazio Heuskarri Artxiboa (%1)</translation>
     </message>
     <message>
-        <source>&Next</source>
-        <translation type="obsolete">&Hurrengoa</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>Open Virtualization Format (%1)</source>
+        <translation>Ireki Birtualizazio Heuskarria (%1)</translation>
     </message>
     <message>
-        <source>Alt+N</source>
-        <translation type="obsolete">Alt+H</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>F&ormat:</source>
+        <translation>&Heuskarria:</translation>
     </message>
     <message>
-        <source>Search for the next occurrence of the string</source>
-        <translation type="obsolete">Katearen hurrengo errepikatzea bilatu</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>OVF 0.9</source>
+        <translation>OVF 0.9</translation>
     </message>
     <message>
-        <source>C&ase Sensitive</source>
-        <translation type="obsolete">Min/M&aius Ezberdindu</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>OVF 1.0</source>
+        <translation>OVF 1.0</translation>
     </message>
     <message>
-        <source>Perform case sensitive search (when checked)</source>
-        <translation type="obsolete">Maiuskula/minuskulak ezberdintzen egin bilaketa (hautaturik dagoenean)</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>OVF 2.0</source>
+        <translation>OVF 2.0</translation>
     </message>
     <message>
-        <source>String not found</source>
-        <translation type="obsolete">Katea ez da aurkitu</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>Write in legacy OVF 0.9 format for compatibility with other virtualization products.</source>
+        <translation>Idatzi ondorena OVF 0.9 heuskarria beste birtualizazio produktuekin bateragarria izateko.</translation>
     </message>
-</context>
-<context>
-    <name>VBoxMediaComboBox</name>
     <message>
-        <source><no hard disk></source>
-        <translation type="obsolete"><disko gogorrik ez></translation>
+        <source>&Write legacy OVF 0.9</source>
+        <translation type="obsolete">&Idatzi ondorena OVF 0.9</translation>
     </message>
     <message>
-        <source>No hard disk</source>
-        <translation type="obsolete">Disko gogorrik ez</translation>
+        <location line="+4"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+4"/>
+        <source>Create a Manifest file for automatic data integrity checks on import.</source>
+        <translation>Sortu Adierazpen agiri bat berezgaitasunezko datu barnerapen egiaztapenerako inportazioan.</translation>
     </message>
-</context>
-<context>
-    <name>VBoxMediaManagerDlg</name>
     <message>
-        <source>&Actions</source>
-        <translation type="unfinished">&Ekintzak</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+1"/>
+        <source>Write &Manifest file</source>
+        <translation>Idaz &Adierazpen agiria</translation>
     </message>
     <message>
-        <source>&New...</source>
-        <translation type="obsolete">&Berria...</translation>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageBasic4.cpp" line="+3"/>
+        <source>This is the descriptive information which will be added to the virtual appliance.  You can change it by double clicking on individual lines.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Add...</source>
-        <translation type="obsolete">&Gehitu...</translation>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="-25"/>
+        <source>Virtual &machines to export</source>
+        <translation>E&sportatzeko makina birtualak</translation>
     </message>
     <message>
-        <source>R&emove</source>
-        <translation type="unfinished">K&endu</translation>
+        <location line="+1"/>
+        <source>Appliance &settings</source>
+        <translation>&Makina birtual ezarpenak</translation>
     </message>
     <message>
-        <source>Re&lease</source>
-        <translation type="unfinished">Argi&taratu</translation>
+        <location line="+1"/>
+        <source>&Destination</source>
+        <translation>&Helmuga</translation>
     </message>
     <message>
-        <source>Re&fresh</source>
-        <translation type="unfinished">&Freskatu</translation>
+        <location line="+1"/>
+        <source>&Storage settings</source>
+        <translation>&Biltegiratze ezarpenak</translation>
     </message>
     <message>
-        <source>Create a new virtual hard disk</source>
-        <translation type="obsolete">Sortu disko birtual berri bat</translation>
+        <location line="+1"/>
+        <source>&Local Filesystem </source>
+        <translation>&Tokiko Agiri-sistema </translation>
     </message>
+</context>
+<context>
+    <name>UIWizardExportAppPageBasic3</name>
     <message>
-        <source>Remove the selected disk image file</source>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp" line="-13"/>
+        <source>Choose a file to export the virtual appliance to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release the selected disk image file by detaching it from the machines</source>
+        <location line="+73"/>
+        <source><p>Please choose a filename to export the OVF/OVA to.</p><p>If you use an <i>ova</i> extension, then all the files will be combined into one Open Virtualization Format Archive.</p><p>If you use an <i>ovf</i> extension, several files will be written separately.</p><p>Other extensions are not allowed.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the list of disk image files</source>
-        <translation type="unfinished">Medio zerrenda freskatu</translation>
+        <location line="+11"/>
+        <source>Please complete the additional fields like the username, password and the bucket, and provide a filename for the OVF target.</source>
+        <translation>Mesedez osatu erabiltzaile-iizena, sarhitza eta ontzia bezalako eremu gehigarriak, eta eman agirizen bat OVF xedearentzat.</translation>
     </message>
     <message>
-        <source>Location</source>
-        <translation type="obsolete">Kokalekuak</translation>
+        <location line="+7"/>
+        <source>Please complete the additional fields like the username, password, hostname and the bucket, and provide a filename for the OVF target.</source>
+        <translation>Mesedez osatu erabiltzaile-iizena, sarhitza, hostalari-izena eta ontzia bezalako eremu gehigarriak, eta eman agirizen bat OVF xedearentzat.</translation>
     </message>
+</context>
+<context>
+    <name>UIWizardExportAppPageExpert</name>
     <message>
-        <source>Attached to</source>
-        <translation type="obsolete">Honi erantsia</translation>
+        <location filename="../src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp" line="+8"/>
+        <source>Choose a file to export the virtual appliance to...</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>UIWizardFirstRun</name>
     <message>
-        <source>Checking accessibility</source>
-        <translation type="unfinished">Eskuragarritasuna egiaztatzen</translation>
+        <location filename="../src/wizards/firstrun/UIWizardFirstRun.cpp" line="+101"/>
+        <source>Select start-up disk</source>
+        <translation>Hautatu Hasiera diska</translation>
     </message>
     <message>
-        <source>&Select</source>
-        <translation type="obsolete">&Hautatu</translation>
+        <location line="+1"/>
+        <source>Start</source>
+        <translation>Hasi</translation>
     </message>
     <message>
-        <source>Select a hard disk image file</source>
-        <translation type="obsolete">Disko gogor irudi fitxategia hautatu</translation>
+        <location filename="../src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp" line="+113"/>
+        <source><p>Please select a virtual optical disk file or a physical optical drive containing a disk to start your new virtual machine from.</p><p>The disk should be suitable for starting a computer from and should contain the operating system you wish to install on the virtual machine if you want to do that now. The disk will be ejected from the virtual drive automatically next time you switch the virtual machine off, but you can also do this yourself if needed u [...]
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CD/DVD images (*.iso);;All files (*)</source>
-        <translation type="obsolete">CD/DVD irudiak (*.iso);;Fitxategi guztiak (*)</translation>
+        <location line="+10"/>
+        <source><p>Please select a virtual optical disk file or a physical optical drive containing a disk to start your new virtual machine from.</p><p>The disk should be suitable for starting a computer from. As this virtual machine has no hard drive you will not be able to install an operating system on it at the moment.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select a CD/DVD disk image file</source>
-        <translation type="obsolete">Hautatu CD/DVD disko irudi fitxategi bat</translation>
+        <location line="+6"/>
+        <source>Choose a virtual optical disk file...</source>
+        <translation>Hautatu diska optiko birtual agiri bat...</translation>
     </message>
+</context>
+<context>
+    <name>UIWizardImportApp</name>
     <message>
-        <source>Floppy images (*.img);;All files (*)</source>
-        <translation type="obsolete">Diskete irudiak (*.img);;Fitxategi guztiak (*)</translation>
+        <location filename="../src/wizards/importappliance/UIWizardImportApp.cpp" line="+116"/>
+        <source>Restore Defaults</source>
+        <translation>Leheneratu Berezkoetara</translation>
     </message>
     <message>
-        <source>Select a floppy disk image files</source>
-        <translation type="obsolete">Hautatu diskete irudi fitxategi bat</translation>
+        <location line="+1"/>
+        <source>Import</source>
+        <translation>Inportatu</translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Attached</i></source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp" line="+66"/>
+        <location filename="../src/wizards/importappliance/UIWizardImportAppPageExpert.cpp" line="+101"/>
+        <source>Appliance to import</source>
+        <translation>Inportatzeko makina birtuala</translation>
     </message>
     <message>
-        <source>--</source>
-        <comment>no info</comment>
-        <translation type="unfinished">--</translation>
+        <location line="+3"/>
+        <source><p>VirtualBox currently supports importing appliances saved in the Open Virtualization Format (OVF). To continue, select the file to import below.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Virtual Media Manager</source>
+        <location line="+3"/>
+        <location filename="../src/wizards/importappliance/UIWizardImportAppPageExpert.cpp" line="+1"/>
+        <source>Choose a virtual appliance file to import...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation type="unfinished">Izena</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/importappliance/UIWizardImportAppPageExpert.cpp" line="+1"/>
+        <source>Please choose a virtual appliance file to import</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Virtual Size</source>
-        <translation type="unfinished">Tamaina Birtuala</translation>
+        <source>Open appliance...</source>
+        <translation type="obsolete">Ireki makina birtuala...</translation>
     </message>
     <message>
-        <source>Actual Size</source>
-        <translation type="unfinished">Uneko Tamaina</translation>
+        <source>Select an appliance to import</source>
+        <translation type="obsolete">Hautatu inportatzeko makina birtuala</translation>
     </message>
     <message>
-        <source>&CD/DVD Images</source>
-        <translation type="obsolete">&CD/DVD Irudiak</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/importappliance/UIWizardImportAppPageExpert.cpp" line="+1"/>
+        <source>Open Virtualization Format (%1)</source>
+        <translation>Ireki Birtualizazio Heuskarria (%1)</translation>
     </message>
     <message>
-        <source>Size</source>
-        <translation type="unfinished">Tamaina</translation>
+        <location filename="../src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp" line="+61"/>
+        <location filename="../src/wizards/importappliance/UIWizardImportAppPageExpert.cpp" line="+1"/>
+        <source>Appliance settings</source>
+        <translation>Makina birtual ezarpenak</translation>
     </message>
     <message>
-        <source>&Floppy Images</source>
-        <translation type="obsolete">&Diskete irudiak</translation>
+        <location line="+3"/>
+        <source>These are the virtual machines contained in the appliance and the suggested settings of the imported VirtualBox machines. You can change many of the properties shown by double-clicking on the items and disable others using the check boxes below.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Attached to</source>
-        <comment>VMM: Virtual Disk</comment>
-        <translation type="obsolete">Honi erantsia</translation>
+        <location filename="../src/wizards/importappliance/UIWizardImportApp.cpp" line="-2"/>
+        <source>Import Virtual Appliance</source>
+        <translation>Inportatu Makina Birtuala</translation>
     </message>
+</context>
+<context>
+    <name>UIWizardNewVD</name>
     <message>
-        <source>Attached to</source>
-        <comment>VMM: CD/DVD Image</comment>
-        <translation type="obsolete">Honi erantsia</translation>
+        <source>Create Virtual Hard Drive</source>
+        <translation type="obsolete">Sortu Diska Gogor Birtuala</translation>
     </message>
     <message>
-        <source>Attached to</source>
-        <comment>VMM: Floppy Image</comment>
-        <translation type="obsolete">Honi erantsia</translation>
+        <location filename="../src/wizards/newvd/UIWizardNewVD.cpp" line="+123"/>
+        <source>Create Virtual Hard Disk</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>hard disk</source>
-        <translation type="obsolete">disko gogorra</translation>
+        <location line="+1"/>
+        <source>Create</source>
+        <translation>Sortu</translation>
     </message>
     <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <source>Hard drive file type</source>
+        <translation type="obsolete">Diska gogor agiri mota</translation>
     </message>
     <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <source>Please choose the type of file that you would like to use for the new virtual hard drive. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
+        <translation type="obsolete">Mesedez hautatu diska gogor berriarentzako erabiltzea nahi duzun agiri mota. Ez baduzu beste birtualizazio software batekin erabili beharrik ezarpen hau aldatugabe utzi dezakezu.</translation>
     </message>
     <message>
-        <source>Format:</source>
-        <translation type="unfinished"></translation>
+        <source>Storage on physical hard drive</source>
+        <translation type="obsolete">Biltegiratu diska gogor fisikoan</translation>
     </message>
     <message>
-        <source>Storage details:</source>
-        <translation type="unfinished"></translation>
+        <source>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
+        <translation type="obsolete">Mesedez hautatu diska gogor berria hazi egin behar den erabili ahala (dinamikoki esleituta) edo gehinezko neurrian sortu behar den (neurri zuzendua).</translation>
     </message>
     <message>
-        <source>Attached to:</source>
-        <translation type="unfinished"></translation>
+        <source><p>A <b>dynamically allocated</b> hard drive file will only use space on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
+        <translation type="obsolete"><p><b>dinamikoki esleituta</b> diska gogor agiri batek bete ahala erabiltzen du tokia zure diska gogor fisikoan (gehinezkora arte <b>neurri zuzendua</b>), baina ez da gutxiagoratuko berriro toki askea gelditzen bada.</p></translation>
     </message>
     <message>
-        <source>&Copy...</source>
-        <translation type="unfinished"></translation>
+        <source><p>A <b>fixed size</b> hard drive file may take longer to create on some systems but is often faster to use.</p></source>
+        <translation type="obsolete"><p>A <b>neurri zuzendua</b> diska gogor agiriak denbora gehiago hartu dezake sortzeko zenbait sistematan baina erabiltzeko azkarragoa da.</p></translation>
     </message>
     <message>
-        <source>&Modify...</source>
-        <translation type="unfinished"></translation>
+        <source><p>You can also choose to <b>split</b> the hard drive file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
+        <translation type="obsolete"><p>Hautatu dezakezu ere diska gogorra agiri anitzetan <b>banantzea</b> bakoitza bi gigabyte arte. Hau erabilgarria da nagusiki makina birtuala USB gailu kengarri batean edo sistema zaharretan biltegiratzea nahi baduzu, hauetako batzuek ezin dute agiri oso handika kudeatu.</translation>
     </message>
     <message>
-        <source>Copy an existing disk image file</source>
+        <location filename="../src/wizards/newvd/UIWizardNewVDPageBasic2.cpp" line="+126"/>
+        <location filename="../src/wizards/newvd/UIWizardNewVDPageExpert.cpp" line="+258"/>
+        <source>Storage on physical hard disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Modify the attributes of the selected disk image file</source>
+        <location line="+3"/>
+        <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <location line="+2"/>
+        <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <location line="+3"/>
+        <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <location line="+2"/>
+        <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VBoxNIList</name>
     <message>
-        <source>VirtualBox Host Interface %1</source>
-        <translation type="obsolete">VirtualBox %1 Ostalari interfazea</translation>
+        <location line="+4"/>
+        <location filename="../src/wizards/newvd/UIWizardNewVDPageExpert.cpp" line="+1"/>
+        <source>&Dynamically allocated</source>
+        <translation>&Dinamikoki esleituta</translation>
     </message>
     <message>
-        <source><p>Do you want to remove the selected host network interface <nobr><b>%1</b>?</nobr></p><p><b>Note:</b> This interface may be in use by one or more network adapters of this or another VM. After it is removed, these adapters will no longer work until you correct their settings by either choosing a different interface name or a different adapter attachment type.</p></source>
-        <translation type="obsolete"><p>Hautaturiko <nobr><b>%1</b></nobr> sare interfazea ezabatu nahi al duzu? </p><p><b>Oharra:</b> Interfaze hau erabilia egon daiteke sare moldagailu bat edo gehiagorengatik beste MB batetan. Ezabatu ondoren sare moldagailu horiek ez dute funtzionatuko ezarpen horiek aldatu arte  edo beste interfaze izen bat hautatuz o moldagailu eranste modu ezberdin bat hautatuaz.</p></translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/newvd/UIWizardNewVDPageExpert.cpp" line="+1"/>
+        <source>&Fixed size</source>
+        <translation>&Neurri zuzendua</translation>
     </message>
     <message>
-        <source>Host &Interfaces</source>
-        <translation type="obsolete">Ostalari &Interfazeak</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/newvd/UIWizardNewVDPageExpert.cpp" line="+1"/>
+        <source>&Split into files of less than 2GB</source>
+        <translation>&Banandu 2 GB baino gutxiagoko agirietan</translation>
     </message>
     <message>
-        <source>Lists all available host interfaces.</source>
-        <translation type="obsolete">Ostalari interfaze erabilgarriak zerrendatzen ditu.</translation>
+        <location filename="../src/wizards/newvd/UIWizardNewVDPageBasic3.cpp" line="+236"/>
+        <source><nobr>%1 (%2 B)</nobr></source>
+        <translation><nobr>%1 %2</nobr></translation>
     </message>
     <message>
-        <source>Adds a new host interface.</source>
-        <translation type="obsolete">Ostalari interfaze berri bat gehitzen du.</translation>
+        <location line="+131"/>
+        <source>File location and size</source>
+        <translation>Agiri kokalekua eta neurria</translation>
     </message>
     <message>
-        <source>Removes the selected host interface.</source>
-        <translation type="obsolete">Hautatutako ostalari interfazea ezabatzen du.</translation>
+        <location line="+3"/>
+        <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VBoxOSTypeSelectorWidget</name>
     <message>
-        <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-        <translation type="obsolete">Makina birtual honetan instalatzea pentsatzen duzun sistema eragilea erakusten du (sistema eragile bezeroa deiturikoa).</translation>
+        <location line="+2"/>
+        <location filename="../src/wizards/newvd/UIWizardNewVDPageExpert.cpp" line="-12"/>
+        <source>Choose a location for new virtual hard disk file...</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VBoxRegistrationDlg</name>
     <message>
-        <source>Connection timed out.</source>
-        <translation type="obsolete">Konexioa denboraz kanpo.</translation>
+        <location line="+1"/>
+        <source>Select the size of the virtual hard disk in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard disk.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <source>Please type the name of the new virtual hard drive file into the box below or click on the folder icon to select a different folder to create the file in.</source>
+        <translation type="obsolete">Mesedez idatzi diska gogor birtual berriarentzako izean beheko kutxan edo klikatu agiritegia ikurrean agiria sortzeko beste agiritegi bat hautatzeko.</translation>
     </message>
-</context>
-<context>
-    <name>VBoxSFDialog</name>
     <message>
-        <source>Shared Folders</source>
-        <translation type="obsolete">Partekatutako Karpetak</translation>
+        <source>Choose a location for new virtual hard drive file...</source>
+        <translation type="obsolete">Hautatu diska gogor birtual agiri berriarentzako kokaleku bat...</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <source>Select the size of the virtual hard drive in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard drive.</source>
+        <translation type="obsolete">Hautatu diska gogor birtualaren neurria megabytetan. Neurri hau makina birtualak diska gogorrean biltegiratu ahalko duen datu kopuruaren muga da.</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="obsolete">Laguntza</translation>
+        <location filename="../src/wizards/newvd/UIWizardNewVDPageExpert.cpp" line="-1"/>
+        <source>File &location</source>
+        <translation>Agiri &kokalekua</translation>
     </message>
     <message>
-        <source>&OK</source>
-        <translation type="obsolete">Ad&os</translation>
+        <location line="+2"/>
+        <source>File &size</source>
+        <translation>Agiri &neurria</translation>
     </message>
-</context>
-<context>
-    <name>VBoxScreenshotViewer</name>
     <message>
-        <source>Screenshot of %1 (%2)</source>
+        <location line="+1"/>
+        <source>Hard disk file &type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to view non-scaled screenshot.</source>
+        <source>Hard drive file &type</source>
+        <translation type="obsolete">Diska gogor agiri &mota</translation>
+    </message>
+    <message>
+        <location filename="../src/wizards/newvd/UIWizardNewVDPageBasic1.cpp" line="+134"/>
+        <source>Hard disk file type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to view scaled screenshot.</source>
+        <location line="+3"/>
+        <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>VBoxSelectorWnd</name>
-    <message>
-        <source>VirtualBox OSE</source>
-        <translation type="obsolete">VirtualBox OSE</translation>
-    </message>
+    <name>UIWizardNewVM</name>
     <message>
-        <source>innotek VirtualBox</source>
-        <translation type="obsolete">innotek VirtualBox</translation>
+        <location filename="../src/wizards/newvm/UIWizardNewVM.cpp" line="+291"/>
+        <source>Create Virtual Machine</source>
+        <translation>Sortu Makina Birtuala</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Xehetasunak</translation>
+        <location line="+1"/>
+        <source>Create</source>
+        <translation>Sortu</translation>
     </message>
     <message>
-        <source>Virtual &Disk Manager...</source>
-        <translation type="obsolete">&Disko Birtual Kudeatzailea...</translation>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageBasic1.cpp" line="+298"/>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageExpert.cpp" line="+227"/>
+        <source>Name and operating system</source>
+        <translation>Izena eta sistema eragilea</translation>
     </message>
     <message>
-        <source>Ctrl+D</source>
-        <translation type="obsolete">Ktrl+D</translation>
+        <location line="+3"/>
+        <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+        <translation>Mesedez hautatu makina birtual berriarentzako azalpen izen bat eta ezartzen saiatzen ari zaren sistema eragile mota. Hautatzen duzun izena VirtualBox-en zehar erabiliko da makina hau ezagutzeko.</translation>
     </message>
     <message>
-        <source>Display the Virtual Disk Manager window</source>
-        <translation type="obsolete">Makina Birtual Kudeaketa leihoa bistazten du</translation>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageBasic2.cpp" line="+132"/>
+        <source>Memory size</source>
+        <translation>Oraimen neurria</translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global settings</comment>
-        <translation type="obsolete">Hobes&penak...</translation>
+        <location line="+5"/>
+        <source><p>Select the amount of memory (RAM) in megabytes to be allocated to the virtual machine.</p><p>The recommended memory size is <b>%1</b> MB.</p></source>
+        <translation><p>Hautatu makina birtualari esleitzeko oroimen (RAM) kopurua megabyte-tan.</p><p>Gomendaturiko oroimen neurria da: <b>%1</b> MB.</p></translation>
     </message>
     <message>
-        <source>Ctrl+G</source>
-        <translation type="obsolete">Ktrl+G</translation>
+        <source>Hard drive</source>
+        <translation type="obsolete">Diska gogorra</translation>
     </message>
     <message>
-        <source>Display the global settings window</source>
-        <translation type="obsolete">Ezarpen orokor leihoa bistarazi</translation>
+        <source><p>If you wish you can add a virtual hard drive to the new machine. You can either create a new hard drive file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard drive is <b>%1</b>.</p></source>
+        <translation type="obsolete"><p>Nahi baduzu diska gogor birtual bat gehitu ahal diozu makina birtual berriari. Diska gogor agiri berri bat ere sortu dezakezu edo hautatu bat zerrendatik edo beste kokaleku batetik agiritegia ikurra erabiliz.</p><p>Biltegiratze ezarpen korapilotsuago bat behar baduzu urrats hau jauzi dezakezu eta aldaketak makinaren ezarpenetatik egin behin sortuta dagoenean.</p><p>Gomendaturiko diska gogor neurria da: <b>%1</ [...]
     </message>
     <message>
-        <source>E&xit</source>
-        <translation type="obsolete">I&rten</translation>
+        <source>Choose a virtual hard drive file...</source>
+        <translation type="obsolete">Hautatu diska gogor birtual agiri bat...</translation>
     </message>
     <message>
-        <source>Ctrl+Q</source>
-        <translation type="obsolete">Ktrl+Q</translation>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageExpert.cpp" line="+1"/>
+        <source>&Memory size</source>
+        <translation>&Oroimen neurria</translation>
     </message>
     <message>
-        <source>Close application</source>
-        <translation type="obsolete">Aplikazioa Itxi</translation>
+        <source>&Do not add a virtual hard drive</source>
+        <translation type="obsolete">&Ez gehitu diska gogor birtual bat</translation>
     </message>
     <message>
-        <source>&New...</source>
-        <translation type="obsolete">&Berria...</translation>
+        <source>&Create a virtual hard drive now</source>
+        <translation type="obsolete">&Sortu diska gogor birtual bat orain</translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="obsolete">Berria</translation>
+        <source>&Use an existing virtual hard drive file</source>
+        <translation type="obsolete">E&rabili badagoen diska gogor birtual agiri bat</translation>
     </message>
     <message>
-        <source>Ctrl+N</source>
-        <translation type="obsolete">Ktrl+N</translation>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageBasic3.cpp" line="+202"/>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageExpert.cpp" line="+4"/>
+        <source>Hard disk</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create a new virtual machine</source>
-        <translation type="obsolete">Makina Birtual Berria Sortu</translation>
+        <location line="+5"/>
+        <source><p>If you wish you can add a virtual hard disk to the new machine. You can either create a new hard disk file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard disk is <b>%1</b>.</p></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Settings...</source>
-        <translation type="obsolete">&Ezarpenak...</translation>
+        <location line="+7"/>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageExpert.cpp" line="+1"/>
+        <source>&Do not add a virtual hard disk</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation type="obsolete">Ezarpenak</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageExpert.cpp" line="+1"/>
+        <source>&Create a virtual hard disk now</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ctrl+S</source>
-        <translation type="obsolete">Ktrl+E</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageExpert.cpp" line="+1"/>
+        <source>&Use an existing virtual hard disk file</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configure the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtuala konfiguratu</translation>
+        <location line="+1"/>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageExpert.cpp" line="+1"/>
+        <source>Choose a virtual hard disk file...</source>
+        <translation type="unfinished">Hautatu diska gogor birtual agiri bat...</translation>
     </message>
+</context>
+<context>
+    <name>VBoxAboutDlg</name>
     <message>
-        <source>&Delete</source>
-        <translation type="obsolete">E&zabatu</translation>
+        <location filename="../src/VBoxAboutDlg.cpp" line="+110"/>
+        <source>VirtualBox - About</source>
+        <translation>VirtualBox - Honi buruz</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Ezabatu</translation>
+        <location line="+1"/>
+        <source>VirtualBox Graphical User Interface</source>
+        <translation>VirtualBox Erabiltzaile Interfaze Grafika</translation>
     </message>
     <message>
-        <source>Delete the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtuala ezabatu</translation>
+        <location line="+4"/>
+        <source>Version %1</source>
+        <translation>Bertsioa %1</translation>
     </message>
+</context>
+<context>
+    <name>VBoxEmptyFileSelector</name>
     <message>
-        <source>D&iscard</source>
-        <translation type="obsolete">Ba&ztertu</translation>
+        <source>&Choose...</source>
+        <translation type="obsolete">&Hautatu...</translation>
     </message>
     <message>
-        <source>Discard</source>
-        <translation type="obsolete">Baztertu</translation>
+        <location filename="../src/widgets/VBoxFilePathSelectorWidget.cpp" line="+730"/>
+        <source>Choose...</source>
+        <translation>Hautatu...</translation>
     </message>
+</context>
+<context>
+    <name>VBoxFilePathSelectorWidget</name>
     <message>
-        <source>Discard the saved state of the selected virtual machine</source>
-        <translation type="obsolete">Baztertu hautatutako makina birtualaren gordetako egoera</translation>
+        <location line="-442"/>
+        <source><reset to default></source>
+        <translation><berrezarri berezkoetan></translation>
     </message>
     <message>
-        <source>&Refresh</source>
-        <translation type="obsolete">F&reskatu</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
+        <translation type="obsolete">Oraingo berezko helburu balioa aldaketak onartu eta elkarrizketa hau berriro irekitakoan erakutsiko da.</translation>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Freskatu</translation>
+        <location line="+1"/>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ctrl+R</source>
-        <translation type="obsolete">Ktrl+R</translation>
+        <location line="+5"/>
+        <source><not selected></source>
+        <translation><hautatu gabe></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtualaren eskuragarritasun egoera freskatu</translation>
+        <location line="+1"/>
+        <source>Please use the <b>Other...</b> item from the drop-down list to select a path.</source>
+        <translation>Mesedez erabili <b>Beste...</b> gai bat hedagarri zerrendatik helburu bat hautatzeko.</translation>
     </message>
     <message>
-        <source>&Contents...</source>
-        <translation type="obsolete">&Edukiak...</translation>
+        <location line="+13"/>
+        <source>Other...</source>
+        <translation>Beste...</translation>
     </message>
     <message>
-        <source>F1</source>
-        <translation type="obsolete">F1</translation>
+        <location line="+4"/>
+        <source>Reset</source>
+        <translation>Berrezarri</translation>
     </message>
     <message>
-        <source>Show the online help contents</source>
-        <translation type="obsolete">Sare bidezko laguntza edukia bistarazi</translation>
+        <location line="+7"/>
+        <source>Displays a window to select a different folder.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&VirtualBox Web Site...</source>
-        <translation type="obsolete">&VirtualBox Web Gunea...</translation>
+        <location line="+9"/>
+        <source>Displays a window to select a different file.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open the browser and go to the VirtualBox product web site</source>
-        <translation type="obsolete">Nabigatzailea ireki eta VirtualBox produktuaren gunera joan</translation>
+        <location line="+186"/>
+        <source>Holds the folder path.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&About VirtualBox...</source>
-        <translation type="obsolete">VirtualBox-ri &Buruz...</translation>
+        <location line="+1"/>
+        <source>Holds the file path.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show a window with product information</source>
-        <translation type="obsolete">Produktu argibideekin leiho bat bistarazi du</translation>
+        <source>Opens a window to select a different folder.</source>
+        <translation type="obsolete">Leiho bat irekitzen du beste agiritegi bat hautatzeko.</translation>
     </message>
     <message>
-        <source>&Reset All Warnings</source>
-        <translation type="obsolete">Abisu Guztiak Be&rrezarri</translation>
+        <source>Opens a window to select a different file.</source>
+        <translation type="obsolete">Leiho bat irekitzen du beste agiri bat hautatzeko.</translation>
     </message>
     <message>
-        <source>Go back to showing all suppressed warnings and messages</source>
-        <translation type="obsolete">Ezabatutako abisu eta mezu guztiak berriz agertzea eragien du</translation>
+        <source>Opens a dialog to select a different folder.</source>
+        <translation type="obsolete">Beste agiritegi bat hautatzeko elkarrizketa bat irekitzen du.</translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="obsolete">&Fitxategia</translation>
+        <location line="-193"/>
+        <source>Resets the folder path to the default value.</source>
+        <translation>Agiritegi helburua berezko balioan berrezartzen du.</translation>
     </message>
     <message>
-        <source>&Help</source>
-        <translation type="obsolete">&Laguntza</translation>
+        <source>Opens a dialog to select a different file.</source>
+        <translation type="obsolete">Beste agiri bat hautatzeko elkarrizketa bat irekitzen du.</translation>
     </message>
     <message>
-        <source>&Snapshots</source>
-        <translation type="obsolete">&Egoera-argazkia</translation>
+        <location line="+9"/>
+        <source>Resets the file path to the default value.</source>
+        <translation>Agiri helburua berezko balioan berrezartzen du.</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation type="obsolete">A&zalpena</translation>
+        <location line="+8"/>
+        <source>&Copy</source>
+        <translation>&Kopiatu</translation>
     </message>
     <message>
-        <source>D&escription *</source>
-        <translation type="obsolete">A&zalpena *</translation>
+        <source>Please type the folder path here.</source>
+        <translation type="obsolete">Mesedez idatzi agiritegi helburua hemen.</translation>
     </message>
     <message>
-        <source>S&how</source>
-        <translation type="obsolete">I&kusi</translation>
+        <source>Please type the file path here.</source>
+        <translation type="obsolete">Mesedez idatzi agiri helburua hemen.</translation>
     </message>
+</context>
+<context>
+    <name>VBoxGlobal</name>
     <message>
-        <source>Show</source>
-        <translation type="obsolete">Ikusi</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-338"/>
+        <source>Unknown device %1:%2</source>
+        <comment>USB device details</comment>
+        <translation>Gailu ezezaguna %1:%2</translation>
     </message>
     <message>
-        <source>Switch to the window of the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtualaren leihora aldatu</translation>
+        <location line="+25"/>
+        <source><nobr>Vendor ID: %1</nobr><br><nobr>Product ID: %2</nobr><br><nobr>Revision: %3</nobr></source>
+        <comment>USB device tooltip</comment>
+        <translation><nobr>Saltzaile ID-a: %1</nobr><br><nobr>Produktu ID-a: %2</nobr><br><nobr>Berrikuspena: %3</nobr></translation>
     </message>
     <message>
-        <source>S&tart</source>
-        <translation type="obsolete">Abiara&zi</translation>
+        <location line="+9"/>
+        <source><br><nobr>Serial No. %1</nobr></source>
+        <comment>USB device tooltip</comment>
+        <translation><br><nobr>Serial Zbk. %1</nobr></translation>
     </message>
     <message>
-        <source>Start</source>
-        <translation type="obsolete">Abiarazi</translation>
+        <location line="+7"/>
+        <source><br><nobr>State: %1</nobr></source>
+        <comment>USB device tooltip</comment>
+        <translation><br><nobr>Egoera: %1</nobr></translation>
     </message>
     <message>
-        <source>Start the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtuala abiarazi</translation>
+        <location line="+111"/>
+        <source>Name</source>
+        <comment>details report</comment>
+        <translation>Izena</translation>
     </message>
     <message>
-        <source>&Machine</source>
-        <translation type="obsolete">&Makina</translation>
+        <location line="+2"/>
+        <source>OS Type</source>
+        <comment>details report</comment>
+        <translation>SE Mota</translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <translation type="obsolete">E&rregistroa Ikusi...</translation>
+        <location line="+45"/>
+        <source>Enabled</source>
+        <comment>details report (I/O APIC)</comment>
+        <translation>Gaituta</translation>
     </message>
     <message>
-        <source>Show Log...</source>
-        <translation type="obsolete">Erregistroa Ikusi...</translation>
+        <location line="+1"/>
+        <source>Disabled</source>
+        <comment>details report (I/O APIC)</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>Ctrl+L</source>
-        <translation type="obsolete">Ktrl+L</translation>
+        <location line="+31"/>
+        <source>Base Memory</source>
+        <comment>details report</comment>
+        <translation>Ohinarri Oroimena</translation>
     </message>
     <message>
-        <source>Show the log files of the selected virtual machine</source>
-        <translation type="obsolete">Hautatutako makina birtualaren erregistro fitxategiak ikusi</translation>
+        <location line="-70"/>
+        <source>General</source>
+        <comment>details report</comment>
+        <translation>Orokorra</translation>
     </message>
     <message>
-        <source>R&esume</source>
-        <translation type="obsolete">Ja&rraitu</translation>
+        <location line="+108"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="-379"/>
+        <source>Video Memory</source>
+        <comment>details report</comment>
+        <translation>Bideo Oroimena</translation>
     </message>
     <message>
-        <source>Resume the execution of the virtual machine</source>
-        <translation type="obsolete">Makina birtualaren exekuzioa jarraitu</translation>
+        <location line="-29"/>
+        <source>Boot Order</source>
+        <comment>details report</comment>
+        <translation>Abiarazpen Hurrenkera</translation>
     </message>
     <message>
-        <source>&Pause</source>
-        <translation type="obsolete">&Gelditu</translation>
+        <location line="+2"/>
+        <source>ACPI</source>
+        <comment>details report</comment>
+        <translation>ACPI</translation>
     </message>
     <message>
-        <source>Suspend the execution of the virtual machine</source>
-        <translation type="obsolete">Makina Birtualaren exekuzioa gelditu</translation>
+        <source>IO APIC</source>
+        <comment>details report</comment>
+        <translation type="obsolete">IO APIC</translation>
     </message>
     <message>
-        <source>Re&fresh</source>
-        <translation type="obsolete">&Freskatu</translation>
+        <location line="-48"/>
+        <source>Enabled</source>
+        <comment>details report (ACPI)</comment>
+        <translation>Gaituta</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Ongietorri VirtualBox-era!</h3><p>Leiho honen ezkerreko zatian ordenagailu honetako makina birtual guztiak daude. Zerrenda orain hutsik dago oraindik ez duzu makina birtualik sortu eta.<img src=:/welcome.png align=right/></p><p>Makina berri bat sortzeko sakatu <b>Berria</b> botoia leihoaren goialdeko tresna-barran nagusian.</p><p><b>%1</b> tekla sakatu dezakezu laguntza eskura [...]
+        <location line="+1"/>
+        <source>Disabled</source>
+        <comment>details report (ACPI)</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>&File</source>
-        <comment>Mac OS X version</comment>
-        <translation type="obsolete">&Fitxategia</translation>
+        <source>Enabled</source>
+        <comment>details report (IO APIC)</comment>
+        <translation type="obsolete">Gaituta</translation>
     </message>
     <message>
-        <source>&File</source>
-        <comment>Non Mac OS X version</comment>
-        <translation type="obsolete">&Fitxategia</translation>
+        <source>Disabled</source>
+        <comment>details report (IO APIC)</comment>
+        <translation type="obsolete">Ezgaituta</translation>
     </message>
     <message>
-        <source>&Add...</source>
-        <translation type="obsolete">&Gehitu...</translation>
+        <location line="+216"/>
+        <source>Disabled</source>
+        <comment>details report (audio)</comment>
+        <translation>Ezgaituta</translation>
     </message>
-</context>
-<context>
-    <name>VBoxSettingsDialog</name>
     <message>
-        <source>Settings</source>
-        <translation type="obsolete">Ezarpenak</translation>
+        <location line="+6"/>
+        <source>Audio</source>
+        <comment>details report</comment>
+        <translation>Audioa</translation>
     </message>
-</context>
-<context>
-    <name>VBoxSharedFoldersSettings</name>
     <message>
-        <source>Name</source>
-        <translation type="obsolete">Izena</translation>
+        <location filename="../src/UIVMInfoDialog.cpp" line="-204"/>
+        <source>off</source>
+        <comment>guest monitor status</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation type="obsolete">Bidea</translation>
+        <location line="+26"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+197"/>
+        <source>Active</source>
+        <comment>details report (VT-x/AMD-V)</comment>
+        <translation type="unfinished">Gaituta</translation>
     </message>
     <message>
-        <source>Shared &Folders</source>
-        <translation type="obsolete">Partekatutako &Karpetak</translation>
+        <location line="+1"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+1"/>
+        <source>Inactive</source>
+        <comment>details report (VT-x/AMD-V)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><qt>Lists all shared folders accessible to this machine.
-Use
-<tt>net use x: \\vboxsvr\share</tt>
-to access a shared folder named <i>share</i> from a DOS-like OS, or
-<tt>mount -t vboxsf share mount_point</tt>
-to access it from a Linux OS. This feature requires Guest Additions.</qt></source>
-        <translation type="obsolete"><qt>Makina honetarako eskuragarri dauden partekatutako karpeta guztiak zerrendatzen ditu.
-Erabili
-<tt>net use x: \\vboxsvr\share</tt>
-<i>share</i> izeneko karpeta bat DOS-antzerako SE batetatik, edo
-<tt>mount -t vboxsf share mount_point</tt>
-Linux SE batetatik atzitzeko. Ezaugarri honek Bezero Gehigarriak behar ditu.</qt></translation>
+        <location line="+2"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+5"/>
+        <source>Active</source>
+        <comment>details report (Nested Paging)</comment>
+        <translation type="unfinished">Gaituta</translation>
     </message>
     <message>
-        <source>Adds a new shared folder definition.</source>
-        <translation type="obsolete">Partekatutako karpeta definizio berria gehitzen du.</translation>
+        <location line="+1"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+1"/>
+        <source>Inactive</source>
+        <comment>details report (Nested Paging)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes the selected shared folder definition.</source>
-        <translation type="obsolete">Hautatutako partekatutako karpeta definizioa ezabatzen du.</translation>
+        <location line="+2"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+5"/>
+        <source>Active</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="unfinished">Gaituta</translation>
     </message>
     <message>
-        <source> Machine Folders</source>
-        <translation type="obsolete"> Makina Karpetak</translation>
+        <location line="+1"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+1"/>
+        <source>Inactive</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> Transient Folders</source>
-        <translation type="obsolete"> Karpeta Mugikorrak</translation>
+        <location line="+54"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-165"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+25"/>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Name:&nbsp;&nbsp;%1</nobr><br><nobr>Path:&nbsp;&nbsp;%2</nobr></source>
-        <translation type="obsolete"><nobr>Izena:&nbsp;&nbsp;%1</nobr><br><nobr>Bidea:&nbsp;&nbsp;%2</nobr></translation>
+        <location line="+173"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="+205"/>
+        <source>Adapter %1</source>
+        <comment>details report (network)</comment>
+        <translation>Egokitzailea %1</translation>
     </message>
     <message>
-        <source>Edits the selected shared folder definition.</source>
-        <translation type="obsolete">Hautatutako karpeta definizioa editatzen du.</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="+9"/>
+        <source>Disabled</source>
+        <comment>details report (network)</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>VBoxSharedFoldersSettings</source>
-        <comment>don't translate</comment>
-        <translation type="obsolete">VBoxPartekatutakoKarpetaEzarpenak</translation>
+        <location line="+8"/>
+        <source>Network</source>
+        <comment>details report</comment>
+        <translation>Sarea</translation>
     </message>
     <message>
-        <source>Ins</source>
-        <translation type="obsolete">Ins</translation>
+        <location line="+109"/>
+        <source>Device Filters</source>
+        <comment>details report (USB)</comment>
+        <translation>Gailu Iragazkiak</translation>
     </message>
     <message>
-        <source>Add a new shared folder (Ins)</source>
-        <translation type="obsolete">Partekatauko karpeta bat gehitu (Ins)</translation>
+        <location line="+1"/>
+        <source>%1 (%2 active)</source>
+        <comment>details report (USB)</comment>
+        <translation>%1 (%2 gaituta)</translation>
     </message>
     <message>
-        <source>Space</source>
-        <translation type="obsolete">Lekua</translation>
+        <location line="-11"/>
+        <source>Disabled</source>
+        <comment>details report (USB)</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>Edit the selected shared folder (Space)</source>
-        <translation type="obsolete">Hautatutako partekatutako karpeta editatu (Lekua)</translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="+141"/>
+        <source>Powered Off</source>
+        <comment>MachineState</comment>
+        <translation>Itzalita</translation>
     </message>
     <message>
-        <source>Del</source>
-        <translation type="obsolete">Ezab</translation>
+        <location line="+1"/>
+        <source>Saved</source>
+        <comment>MachineState</comment>
+        <translation>Gordeta</translation>
     </message>
     <message>
-        <source>Remove the selected shared folder (Del)</source>
-        <translation type="obsolete">Ezabatu hautatutako partekatutako karpeta (Ezab)</translation>
+        <location line="+1"/>
+        <source>Aborted</source>
+        <comment>MachineState</comment>
+        <translation>Utzita</translation>
     </message>
-</context>
-<context>
-    <name>VBoxSnapshotDetailsDlg</name>
     <message>
-        <source>VBoxSnapshotDetailsDlg</source>
-        <translation type="obsolete">VBoxEgoeraArgazkiXehetasunLeihoa</translation>
+        <location line="+2"/>
+        <source>Running</source>
+        <comment>MachineState</comment>
+        <translation>Ekinean</translation>
     </message>
     <message>
-        <source> Snapshot Details </source>
-        <translation type="obsolete"> Egoera-argazki Xehetasunak </translation>
+        <location line="+1"/>
+        <source>Paused</source>
+        <comment>MachineState</comment>
+        <translation>Pausatuta</translation>
     </message>
     <message>
-        <source>&Name</source>
-        <translation type="obsolete">Ize&na</translation>
+        <location line="+3"/>
+        <source>Taking Snapshot</source>
+        <comment>MachineState</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Description</source>
-        <translation type="obsolete">A&zalpena</translation>
+        <location line="+1"/>
+        <source>Taking Online Snapshot</source>
+        <comment>MachineState</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Machine Details</source>
-        <translation type="obsolete">&Makina Xehetasunak</translation>
+        <location line="+2"/>
+        <source>Starting</source>
+        <comment>MachineState</comment>
+        <translation>Abiatzen</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="obsolete">Laguntza</translation>
+        <location line="+1"/>
+        <source>Stopping</source>
+        <comment>MachineState</comment>
+        <translation>Gelditzen</translation>
     </message>
     <message>
-        <source>F1</source>
-        <translation type="obsolete">F1</translation>
+        <location line="+1"/>
+        <source>Saving</source>
+        <comment>MachineState</comment>
+        <translation>Gordetzen</translation>
     </message>
     <message>
-        <source>&OK</source>
-        <translation type="obsolete">Ad&os</translation>
+        <location line="+1"/>
+        <source>Restoring</source>
+        <comment>MachineState</comment>
+        <translation>Leheneratzen</translation>
     </message>
     <message>
-        <source>Alt+O</source>
-        <translation type="obsolete">ALt+O</translation>
+        <location line="+25"/>
+        <source>Spawning</source>
+        <comment>SessionState</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <location line="+12"/>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Ezer ez</translation>
     </message>
     <message>
-        <source>Details of %1 (%2)</source>
-        <translation>%1 (%2)-ren xehetasunak</translation>
+        <location line="+1"/>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Berezkoa</translation>
     </message>
     <message>
-        <source>Click to enlarge the screenshot.</source>
+        <location line="+1"/>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Name:</source>
+        <location line="+1"/>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Taken:</source>
+        <location line="+1"/>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Description:</source>
+        <location line="+1"/>
+        <source>KVM</source>
+        <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&etails:</source>
-        <translation type="unfinished"></translation>
+        <location line="+11"/>
+        <source>None</source>
+        <comment>DeviceType</comment>
+        <translation>Ezer ez</translation>
     </message>
-</context>
-<context>
-    <name>VBoxSnapshotsWgt</name>
     <message>
-        <source>[snapshot]</source>
-        <translation type="obsolete">[egoera-argazkiak]</translation>
+        <location line="+1"/>
+        <source>Floppy</source>
+        <comment>DeviceType</comment>
+        <translation>Disketea</translation>
     </message>
     <message>
-        <source>VBoxSnapshotsWgt</source>
-        <translation>VBoxSnapshotsWgt</translation>
+        <source>CD/DVD-ROM</source>
+        <comment>DeviceType</comment>
+        <translation type="obsolete">CD/DVD-ROM</translation>
     </message>
     <message>
-        <source>snapshotActionGroup</source>
-        <translation type="obsolete">egoera-argazkiEkintzaTaldea</translation>
+        <location line="+2"/>
+        <source>Hard Disk</source>
+        <comment>DeviceType</comment>
+        <translation>Diska Gogorra</translation>
     </message>
     <message>
-        <source>Discard Snapshot</source>
-        <translation type="obsolete">Baztertu Egoera-argazkia</translation>
+        <location line="+1"/>
+        <source>Network</source>
+        <comment>DeviceType</comment>
+        <translation>Sarea</translation>
     </message>
     <message>
-        <source>&Discard Snapshot</source>
-        <translation type="obsolete">&Baztertu Egoera-argazkia</translation>
+        <location line="+214"/>
+        <location line="+163"/>
+        <source>Null Audio Driver</source>
+        <comment>AudioDriverType</comment>
+        <translation>Null Audio Gidagailua</translation>
     </message>
     <message>
-        <source>Ctrl+Shift+D</source>
-        <translation type="obsolete">Ktrl+Shift+D</translation>
+        <location line="-162"/>
+        <location line="+163"/>
+        <source>Windows Multimedia</source>
+        <comment>AudioDriverType</comment>
+        <translation>Windows Multimedia</translation>
     </message>
     <message>
-        <source>curStateActionGroup</source>
-        <translation type="obsolete">unekoEgoeraEkintzaTaldea</translation>
+        <location line="-162"/>
+        <location line="+163"/>
+        <source>OSS Audio Driver</source>
+        <comment>AudioDriverType</comment>
+        <translation>OSS Audio Gidagailua</translation>
     </message>
     <message>
-        <source>Take Snapshot</source>
-        <translation type="obsolete">Egoera-argazki bat egin</translation>
+        <location line="-162"/>
+        <location line="+163"/>
+        <source>ALSA Audio Driver</source>
+        <comment>AudioDriverType</comment>
+        <translation>ALSA Audio Gidagailua</translation>
     </message>
     <message>
-        <source>Take &Snapshot</source>
-        <translation type="unfinished">Egoera-arga&zki bat egin</translation>
+        <location line="-162"/>
+        <location line="+163"/>
+        <source>Windows DirectSound</source>
+        <comment>AudioDriverType</comment>
+        <translation>Windows DirectSound</translation>
     </message>
     <message>
-        <source>Discard Current Snapshot and State</source>
-        <translation type="obsolete">Baztertu Uneko Egoera-argazkia eta Egoera</translation>
+        <location line="-162"/>
+        <location line="+163"/>
+        <source>CoreAudio</source>
+        <comment>AudioDriverType</comment>
+        <translation>CoreAudio</translation>
     </message>
     <message>
-        <source>D&iscard Current Snapshot and State</source>
-        <translation type="obsolete">Ba&ztertu Uneko Egoera-argazkia eta Egoera</translation>
+        <location line="-276"/>
+        <source>Not attached</source>
+        <comment>NetworkAttachmentType</comment>
+        <translation>Erantsi gabe</translation>
     </message>
     <message>
-        <source>Show Details</source>
-        <translation type="obsolete">Ikusi Xehetasunak</translation>
+        <source>CD/DVD</source>
+        <comment>DeviceType</comment>
+        <translation type="obsolete">CD/DVD</translation>
     </message>
     <message>
-        <source>S&how Details</source>
-        <translation type="unfinished">Ikusi Xe&hetasunak</translation>
+        <location line="+1"/>
+        <source>NAT</source>
+        <comment>NetworkAttachmentType</comment>
+        <translation>NAT</translation>
     </message>
     <message>
-        <source>Space</source>
-        <translation type="obsolete">Lekua</translation>
+        <location line="+2"/>
+        <source>Internal Network</source>
+        <comment>NetworkAttachmentType</comment>
+        <translation>Barneko Sarea</translation>
     </message>
     <message>
-        <source>Current State (changed)</source>
-        <comment>Current State (Modified)</comment>
-        <translation>Uneko Egoera (aldatua)</translation>
+        <location line="+77"/>
+        <source>Not supported</source>
+        <comment>USBDeviceState</comment>
+        <translation>Sostengatu gabea</translation>
     </message>
     <message>
-        <source>Current State</source>
-        <comment>Current State (Unmodified)</comment>
-        <translation>Uneko Egoera</translation>
+        <location line="+1"/>
+        <source>Unavailable</source>
+        <comment>USBDeviceState</comment>
+        <translation>Eskuraezina</translation>
     </message>
     <message>
-        <source>The current state differs from the state stored in the current snapshot</source>
-        <translation>Uneko egoera egoera-argazkian gordetakoren ezberdina da</translation>
+        <location line="+1"/>
+        <source>Busy</source>
+        <comment>USBDeviceState</comment>
+        <translation>Lanpetuta</translation>
     </message>
     <message>
-        <source>The current state is identical to the state stored in the current snapshot</source>
-        <translation>Uneko egoera egoera-argazkian gordetakoren berdina da</translation>
+        <location line="+1"/>
+        <source>Available</source>
+        <comment>USBDeviceState</comment>
+        <translation>Eskuragarri</translation>
     </message>
     <message>
-        <source> (current, </source>
-        <comment>Snapshot details</comment>
-        <translation> (uneko, </translation>
+        <location line="+1"/>
+        <source>Held</source>
+        <comment>USBDeviceState</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>online)</source>
-        <comment>Snapshot details</comment>
-        <translation>linean)</translation>
+        <location line="+1"/>
+        <source>Captured</source>
+        <comment>USBDeviceState</comment>
+        <translation>Hartuta</translation>
     </message>
     <message>
-        <source>offline)</source>
-        <comment>Snapshot details</comment>
-        <translation>lineaz kanpo)</translation>
+        <location line="-178"/>
+        <source>Disabled</source>
+        <comment>ClipboardType</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>Taken at %1</source>
-        <comment>Snapshot (time)</comment>
-        <translation>%1 hartzen</translation>
+        <location line="+1"/>
+        <source>Host To Guest</source>
+        <comment>ClipboardType</comment>
+        <translation>Hostalaritik Gonbidatura</translation>
     </message>
     <message>
-        <source>Taken on %1</source>
-        <comment>Snapshot (date + time)</comment>
-        <translation>%1-ean hartua</translation>
+        <location line="+1"/>
+        <source>Guest To Host</source>
+        <comment>ClipboardType</comment>
+        <translation>Gonbidatutik Hostalarira</translation>
     </message>
     <message>
-        <source>%1 since %2</source>
-        <comment>Current State (time or date + time)</comment>
-        <translation>%1 %2-tik</translation>
+        <location line="+1"/>
+        <source>Bidirectional</source>
+        <comment>ClipboardType</comment>
+        <translation>Binorabidekoa</translation>
     </message>
     <message>
-        <source>Snapshot %1</source>
-        <translation>%1 egoera-argazkia</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-70"/>
+        <source>Port %1</source>
+        <comment>details report (serial ports)</comment>
+        <translation>Ataka %1</translation>
     </message>
     <message>
-        <source>Discard the selected snapshot of the virtual machine</source>
-        <translation type="obsolete">Baztertu hautatutako egoera-argazkia makina birtualetik</translation>
+        <location line="+9"/>
+        <source>Disabled</source>
+        <comment>details report (serial ports)</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>Ctrl+Shift+S</source>
-        <translation type="obsolete">Ktrl+Shift+S</translation>
+        <location line="+8"/>
+        <source>Serial Ports</source>
+        <comment>details report</comment>
+        <translation>Serieko Atakak</translation>
     </message>
     <message>
-        <source>Take a snapshot of the current virtual machine state</source>
-        <translation type="unfinished">Uneko makina birtual egoeraren egoera-argazki bat egin</translation>
+        <location line="+72"/>
+        <source>USB</source>
+        <comment>details report</comment>
+        <translation>USB</translation>
     </message>
     <message>
-        <source>Revert to Current Snapshot</source>
-        <translation type="obsolete">Uneko Egoera-argazkira Itzuli</translation>
+        <location line="+13"/>
+        <source>Shared Folders</source>
+        <comment>details report (shared folders)</comment>
+        <translation>Elkarbanatutako Agiritegiak</translation>
     </message>
     <message>
-        <source>&Revert to Current Snapshot</source>
-        <translation type="obsolete">Uneko Egoe&ra-argazkira Itzuli</translation>
+        <location line="+5"/>
+        <source>None</source>
+        <comment>details report (shared folders)</comment>
+        <translation>Ezer ez</translation>
     </message>
     <message>
-        <source>Ctrl+Shift+R</source>
-        <translation type="obsolete">Ktrl+Shift+R</translation>
+        <location line="+6"/>
+        <source>Shared Folders</source>
+        <comment>details report</comment>
+        <translation>Elkarbanatutako Agiritegiak</translation>
     </message>
     <message>
-        <source>Restore the virtual machine state from the state stored in the current snapshot</source>
-        <translation type="obsolete">Makina birtuala uneko egoera-argazkian gordetako egoerara itzuli</translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="+142"/>
+        <location line="+190"/>
+        <source>Disconnected</source>
+        <comment>PortMode</comment>
+        <translation>Etenda</translation>
     </message>
     <message>
-        <source>Ctrl+Shift+B</source>
-        <translation type="obsolete">Ktrl+Shift+B</translation>
+        <location line="-189"/>
+        <location line="+190"/>
+        <source>Host Pipe</source>
+        <comment>PortMode</comment>
+        <translation>Hostalari Hodia</translation>
     </message>
     <message>
-        <source>Discard the current snapshot and revert the machine to the state it had before the snapshot was taken</source>
-        <translation type="obsolete">Uneko egoera-argazkia baztertu eta makina egoera-argazkia egin baino lehen zuen egoerara itzuli</translation>
+        <location line="-189"/>
+        <location line="+190"/>
+        <source>Host Device</source>
+        <comment>PortMode</comment>
+        <translation>Hostalari Gailua</translation>
     </message>
     <message>
-        <source>Show the details of the selected snapshot</source>
-        <translation type="obsolete">Hautatutako egoera-argazkiaren xehetasunak ikusi</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="+688"/>
+        <source>User-defined</source>
+        <comment>serial port</comment>
+        <translation>Erabiltzaileak-zehaztuta</translation>
     </message>
     <message>
-        <source> (%1)</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/UIVMInfoDialog.cpp" line="-176"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-1055"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="-9"/>
+        <source>VT-x/AMD-V</source>
+        <comment>details report</comment>
+        <translation>VT-x/AMD-V</translation>
     </message>
     <message>
-        <source>&Restore Snapshot</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-5"/>
+        <source>PAE/NX</source>
+        <comment>details report</comment>
+        <translation>PAE/NX</translation>
     </message>
     <message>
-        <source>&Delete Snapshot</source>
-        <translation type="unfinished"></translation>
+        <location line="-32"/>
+        <source>Enabled</source>
+        <comment>details report (VT-x/AMD-V)</comment>
+        <translation>Gaituta</translation>
     </message>
     <message>
-        <source> (%1 ago)</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Disabled</source>
+        <comment>details report (VT-x/AMD-V)</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>&Clone...</source>
-        <translation type="unfinished"></translation>
+        <source>Enabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Gaituta</translation>
     </message>
     <message>
-        <source>Restore selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <source>Disabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Ezgaituta</translation>
     </message>
     <message>
-        <source>Delete selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/UIVMInfoDialog.cpp" line="+2"/>
+        <source>Unrestricted Execution</source>
+        <comment>details report</comment>
+        <translation>Mugagabeko Exekuzioa</translation>
     </message>
     <message>
-        <source>Display a window with selected snapshot details</source>
-        <translation type="unfinished"></translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-9"/>
+        <source>Enabled</source>
+        <comment>details report (PAE/NX)</comment>
+        <translation>Gaituta</translation>
     </message>
     <message>
-        <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <location line="+1"/>
+        <source>Disabled</source>
+        <comment>details report (PAE/NX)</comment>
+        <translation>Ezgaituta</translation>
     </message>
-</context>
-<context>
-    <name>VBoxSwitchMenu</name>
     <message>
-        <source>Disable</source>
-        <translation type="obsolete">Ezgaitu</translation>
+        <location line="+38"/>
+        <source>I/O APIC</source>
+        <comment>details report</comment>
+        <translation>S/I APIC</translation>
     </message>
     <message>
-        <source>Enable</source>
-        <translation type="obsolete">Gaitu</translation>
+        <location line="+109"/>
+        <source>(Optical Drive)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 %2</source>
-        <translation type="obsolete">%1 %2</translation>
+        <location line="+52"/>
+        <source>Host Driver</source>
+        <comment>details report (audio)</comment>
+        <translation>Hostalari Gidagailua</translation>
     </message>
-</context>
-<context>
-    <name>VBoxTakeSnapshotDlg</name>
     <message>
-        <source>Take Snapshot of Virtual Machine</source>
-        <translation>Makina Birtualaren Egoera-argazki bat egin</translation>
+        <location line="+3"/>
+        <source>Controller</source>
+        <comment>details report (audio)</comment>
+        <translation>Kontrolatzailea</translation>
     </message>
     <message>
-        <source>Snapshot &Name</source>
-        <translation>Egoera-argazki Ize&na</translation>
+        <location line="+44"/>
+        <source>NAT network, '%1'</source>
+        <comment>details report (network)</comment>
+        <translation>NAT sarea, '%1'</translation>
     </message>
     <message>
-        <source>Snapshot &Description</source>
-        <translation>Egoera-argazki A&zalpena</translation>
+        <location line="+90"/>
+        <source>Port %1</source>
+        <comment>details report (parallel ports)</comment>
+        <translation>Ataka %1</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="obsolete">Laguntza</translation>
+        <location line="+9"/>
+        <source>Disabled</source>
+        <comment>details report (parallel ports)</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>F1</source>
-        <translation type="obsolete">F1</translation>
+        <location line="+9"/>
+        <source>Parallel Ports</source>
+        <comment>details report</comment>
+        <translation>Ataka Kidetuak</translation>
     </message>
     <message>
-        <source>&OK</source>
-        <translation type="obsolete">Ad&os</translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="-349"/>
+        <source>USB</source>
+        <comment>DeviceType</comment>
+        <translation>USB</translation>
     </message>
     <message>
-        <source>Alt+O</source>
-        <translation type="obsolete">Alt+O</translation>
+        <location line="+1"/>
+        <source>Shared Folder</source>
+        <comment>DeviceType</comment>
+        <translation>Elkarbanatutako Agiritegiak</translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
-    </message>
-    <message numerus="yes">
-        <source>Warning: You are taking a snapshot of a running machine which has %n immutable image(s) attached to it. As long as you are working from this snapshot the immutable image(s) will not be reset to avoid loss of data.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
+        <location line="+257"/>
+        <source>IDE</source>
+        <comment>StorageBus</comment>
+        <translation>IDE</translation>
     </message>
     <message>
-        <source>Snapshot %1</source>
-        <translation type="unfinished">%1 egoera-argazkia</translation>
+        <location line="+1"/>
+        <source>SATA</source>
+        <comment>StorageBus</comment>
+        <translation>SATA</translation>
     </message>
-</context>
-<context>
-    <name>VBoxUSBFilterSettings</name>
     <message>
-        <source>VBoxUSBFilterSettings</source>
-        <comment>don't translate</comment>
-        <translation type="obsolete">VBoxUSBIragazkiEzarpenak</translation>
+        <location line="-38"/>
+        <location line="+163"/>
+        <source>Solaris Audio</source>
+        <comment>AudioDriverType</comment>
+        <translation>Solaris Audioa</translation>
     </message>
     <message>
-        <source>&Name</source>
-        <translation type="obsolete">Ize&na</translation>
+        <location line="-164"/>
+        <location line="+163"/>
+        <source>PulseAudio</source>
+        <comment>AudioDriverType</comment>
+        <translation>PulseAudio</translation>
     </message>
     <message>
-        <source>Holds the filter name.</source>
-        <translation type="obsolete">Iragazki izena bistarazten du.</translation>
+        <location line="-151"/>
+        <location line="+164"/>
+        <source>ICH AC97</source>
+        <comment>AudioControllerType</comment>
+        <translation>ICH AC97</translation>
     </message>
     <message>
-        <source>&Manufacturer</source>
-        <translation type="obsolete">&Egilea</translation>
+        <location line="-163"/>
+        <location line="+164"/>
+        <source>SoundBlaster 16</source>
+        <comment>AudioControllerType</comment>
+        <translation>SoundBlaster 16</translation>
     </message>
     <message>
-        <source>Pro&duct</source>
-        <translation type="obsolete">Pro&duktua</translation>
+        <location line="-275"/>
+        <source>PCnet-PCI II (Am79C970A)</source>
+        <comment>NetworkAdapterType</comment>
+        <translation>PCnet-PCI II (Am79C970A)</translation>
     </message>
     <message>
-        <source>&Serial No.</source>
-        <translation type="obsolete">&Serie Zenbakia.</translation>
+        <location line="+1"/>
+        <source>PCnet-FAST III (Am79C973)</source>
+        <comment>NetworkAdapterType</comment>
+        <translation>PCnet-FAST III (Am79C973)</translation>
     </message>
     <message>
-        <source>R&emote</source>
-        <translation type="obsolete">Urrun&ekoa</translation>
+        <location line="+1"/>
+        <source>Intel PRO/1000 MT Desktop (82540EM)</source>
+        <comment>NetworkAdapterType</comment>
+        <translation>Intel PRO/1000 MT Mahaigain (82540EM)</translation>
     </message>
     <message>
-        <source>&Action</source>
-        <translation type="obsolete">&Ekintza</translation>
+        <location line="+1"/>
+        <source>Intel PRO/1000 T Server (82543GC)</source>
+        <comment>NetworkAdapterType</comment>
+        <translation>Intel PRO/1000 T Zerbitzaria (82543GC)</translation>
     </message>
     <message>
-        <source>&Vendor ID</source>
-        <translation type="obsolete">&Saltzaile ID-a</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-502"/>
+        <source><nobr>Vendor ID: %1</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Saltzaile ID-a: %1</nobr></translation>
     </message>
     <message>
-        <source>&Product ID</source>
-        <translation type="obsolete">&Produktu ID-a</translation>
+        <location line="+5"/>
+        <source><nobr>Product ID: %2</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Produktu ID-a: %2</nobr></translation>
     </message>
     <message>
-        <source>&Revision</source>
-        <translation type="obsolete">&Bertsioa</translation>
+        <location line="+5"/>
+        <source><nobr>Revision: %3</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Berrikuspena: %3</nobr></translation>
     </message>
     <message>
-        <source>Por&t</source>
-        <translation type="obsolete">&Ataka</translation>
+        <location line="+5"/>
+        <source><nobr>Product: %4</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Produktua: %4</nobr></translation>
     </message>
     <message>
-        <source>Any</source>
-        <comment>remote</comment>
-        <translation type="obsolete">Edozein</translation>
+        <location line="+5"/>
+        <source><nobr>Manufacturer: %5</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Ekoizlea: %5</nobr></translation>
     </message>
     <message>
-        <source>Yes</source>
-        <comment>remote</comment>
-        <translation type="obsolete">Bai</translation>
+        <location line="+5"/>
+        <source><nobr>Serial No.: %1</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Serial Zbk.: %1</nobr></translation>
     </message>
     <message>
-        <source>No</source>
-        <comment>remote</comment>
-        <translation type="obsolete">Ez</translation>
-    </message>
-    <message>
-        <source><qt>Defines the manufacturer filter as an
-<i>exact match</i> string. An empty string will match any
-value.</qt></source>
-        <translation type="obsolete"><qt>Manufakturadore iragazkia ezarri
-<i>parekatze zehatz</i> kate bat bezala- Kate huts batek edozein
-baliorekin parekatzea beteko du</qt></translation>
-    </message>
-    <message>
-        <source><qt>Defines the product name filter as an
-<i>exact match</i> string. An empty string will match any
-value.</qt></source>
-        <translation type="obsolete"><qt>Produktu izen iragazkia ezarri
-<i>parekatze zehatz</i> kate bat bezala- Kate huts batek edozein
-baliorekin parekatzea beteko du</qt></translation>
-    </message>
-    <message>
-        <source><qt>Defines the serial number filter as an
-<i>exact match</i> string. An empty string will match any
-value.</qt></source>
-        <translation type="obsolete"><qt>Serie zenbaki iragazkia ezarri
-<i>parekatze zehatz</i> kate bat bezala- Kate huts batek edozein
-baliorekin parekatzea beteko du</qt></translation>
-    </message>
-    <message>
-        <source><qt>Defines whether this filter applies
-to USB devices attached locally to the host computer (<i>No</i>),
-to a VRDP client's computer (<i>Yes</i>),
-or both (<i>Any</i>).</qt></source>
-        <translation type="obsolete"><qt>Iragazki hau lokalki erantsiritako USB
-gailuetan  nola ezarriko den ezartzen du:
-Ostalari ordenagailuan (<i>Ez</i>),
-VRFP bezeroaren ordenagailuan (<i>Bai</i>),
-edo bietan (<i>Edozein</i>).</qt></translation>
-    </message>
-    <message>
-        <source><qt>Defines an action performed by the host
-computer when a matching device is attached: give it up to the host OS
-(<i>Ignore</i>) or grab it for later usage by virtual machines
-(<i>Hold</i>).</qt></source>
-        <translation type="obsolete"><qt>Iragazkia betetzen duen gailu bat eransterakoan ostalari ordenagailuak egingo duen ekintza ezartzen du(<i>Baztertu</i>) edo eskuratu gero makina birtualek erabiltzeko
-(<i>Eskuratu</i>).</qt></translation>
-    </message>
-    <message>
-        <source><qt>Defines the vendor ID filter. The
-<i>exact match</i> string format is <tt>XXXX</tt> where
-<tt>X</tt> is a hexadecimal digit. An empty string will match any
-value.</qt></source>
-        <translation type="obsolete"><qt>Saltzaile ID iragazkia ezartzen du.
-<i>parekatze zehatz</i> kate formatua <tt>XXXX</tt> da, non
-<tt>X</tt> digito hamaseitar bat den. Kate hutsak edozein
-balio bilatuko du.</qt></translation>
-    </message>
-    <message>
-        <source><qt>Defines the product ID filter. The
-<i>exact match</i> string format is <tt>XXXX</tt> where
-<tt>X</tt> is a hexadecimal digit. An empty string will match any
-value.</qt></source>
-        <translation type="obsolete"><qt>Produktu ID iragazkia ezartzen du.
-<i>parekatze zehatz</i> kate formatua <tt>XXXX</tt> da, non
-<tt>X</tt> digito hamaseitar bat den. Kate hutsak edozein
-balio bilatuko du.</qt></translation>
-    </message>
-    <message>
-        <source><qt>Defines the host USB port filter as an
-<i>exact match</i> string. An empty string will match any
-value.</qt></source>
-        <translation type="obsolete"><qt>Ostalari USB iragazkia ezartzen du.
-<i>parekatze zehatz</i> kate bat bezala.
-Kate hutsak edozein balio bilatuko du.</qt></translation>
+        <location line="+5"/>
+        <source><nobr>Port: %1</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Ataka: %1</nobr></translation>
     </message>
-</context>
-<context>
-    <name>VBoxUSBMenu</name>
     <message>
-        <source><no devices available></source>
-        <comment>USB devices</comment>
-        <translation><ez dago gailu erabilgarririk></translation>
+        <location line="+7"/>
+        <source><nobr>State: %1</nobr></source>
+        <comment>USB filter tooltip</comment>
+        <translation><nobr>Egoera: %1</nobr></translation>
     </message>
     <message>
-        <source>No supported devices connected to the host PC</source>
-        <comment>USB device tooltip</comment>
-        <translation>Ez dago onartutako gailurik konektaturik ostalari PC-ra</translation>
+        <location filename="../src/medium/UIMedium.cpp" line="+505"/>
+        <source>Checking...</source>
+        <comment>medium</comment>
+        <translation>Egiaztatzen...</translation>
     </message>
-</context>
-<context>
-    <name>VBoxVMDescriptionPage</name>
     <message>
-        <source>No description. Press the Edit button below to add it.</source>
-        <translation type="obsolete">Azalpenik ez. Editatu botoia sakatu berau gehitzeko.</translation>
+        <location line="+4"/>
+        <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="+18"/>
+        <source>Inaccessible</source>
+        <comment>medium</comment>
+        <translation>Eskuraezina</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editatu</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="+194"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="-207"/>
+        <source>3D Acceleration</source>
+        <comment>details report</comment>
+        <translation>3D Bizkorpena</translation>
     </message>
     <message>
-        <source>Edit (Ctrl+E)</source>
-        <translation type="obsolete">Editatu (Ktrl+E)</translation>
+        <location line="-4"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="-3"/>
+        <source>Enabled</source>
+        <comment>details report (3D Acceleration)</comment>
+        <translation>Gaituta</translation>
     </message>
     <message>
-        <source>Ctrl+E</source>
-        <translation type="obsolete">Ktrl+E</translation>
+        <location line="+1"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+1"/>
+        <source>Disabled</source>
+        <comment>details report (3D Acceleration)</comment>
+        <translation>Ezgaituta</translation>
     </message>
-</context>
-<context>
-    <name>VBoxVMDetailsView</name>
     <message>
-        <source>The selected virtual machine is <i>inaccessible</i>. Please inspect the error message shown below and press the <b>Refresh</b> button if you want to repeat the accessibility check:</source>
-        <translation type="obsolete">Hautaturiko makina birtuala <i>eskuraezina</i> dago. Mesedez arakatu beheko errore mezua eta <b>Freskatu</b> sakatu eskuragarritasun proba errepikatu nahi baduzu:</translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="-175"/>
+        <source>Setting Up</source>
+        <comment>MachineState</comment>
+        <translation>Ezarrita</translation>
     </message>
-</context>
-<context>
-    <name>VBoxVMListBox</name>
     <message>
-        <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
-        <comment>VM tooltip (name, last state change, session state)</comment>
-        <translation type="obsolete"><nobr>%1<br></nobr><nobr>%2 %3-tik</nobr><br><nobr>%4 saioa</nobr></translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="+1017"/>
+        <source>Differencing</source>
+        <comment>DiskType</comment>
+        <translation>Bereizlea</translation>
     </message>
     <message>
-        <source><nobr><b>%1</b><br></nobr><nobr>Inaccessible since %2</nobr></source>
-        <comment>Inaccessible VM tooltip (name, last state change)</comment>
-        <translation type="obsolete"><nobr><b>%1</b><br></nobr><nobr>Eskuraezina %2 -tik</nobr></translation>
+        <location filename="../src/UIVMInfoDialog.cpp" line="-1"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-1052"/>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation>Nested Orrialdeztapena</translation>
     </message>
     <message>
-        <source>Inaccessible</source>
-        <translation type="obsolete">Eskuraezina</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-33"/>
+        <source>Enabled</source>
+        <comment>details report (Nested Paging)</comment>
+        <translation>Gaituta</translation>
     </message>
-</context>
-<context>
-    <name>VBoxVMLogViewer</name>
     <message>
-        <source>Log Viewer</source>
-        <translation type="obsolete">Erregistro ikustatzailea</translation>
+        <location line="+1"/>
+        <source>Disabled</source>
+        <comment>details report (Nested Paging)</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>&Save</source>
-        <translation type="obsolete">&Gorde</translation>
+        <location line="+224"/>
+        <source>Internal network, '%1'</source>
+        <comment>details report (network)</comment>
+        <translation>Barneko Sarea, '%1'</translation>
     </message>
     <message>
-        <source>Alt+S</source>
-        <translation type="obsolete">Alt+G</translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="+310"/>
+        <source>SCSI</source>
+        <comment>StorageBus</comment>
+        <translation>SCSI</translation>
     </message>
     <message>
-        <source>&Refresh</source>
-        <translation type="obsolete">F&reskatu</translation>
+        <location line="+17"/>
+        <location line="+150"/>
+        <source>PIIX3</source>
+        <comment>StorageControllerType</comment>
+        <translation>PIIX3</translation>
     </message>
     <message>
-        <source>Alt+R</source>
-        <translation type="obsolete">ALt+R</translation>
+        <location line="-149"/>
+        <location line="+150"/>
+        <source>PIIX4</source>
+        <comment>StorageControllerType</comment>
+        <translation>PIIX4</translation>
     </message>
     <message>
-        <source>%1 - VirtualBox Log Viewer</source>
-        <translation type="obsolete">%1 - VirtualBox Erregistro ikustatzailea</translation>
+        <location line="-149"/>
+        <location line="+150"/>
+        <source>ICH6</source>
+        <comment>StorageControllerType</comment>
+        <translation>ICH6</translation>
     </message>
     <message>
-        <source><p>No log files found. Press the <b>Refresh</b> button to rescan the log folder <nobr><b>%1</b></nobr>.</p></source>
-        <translation type="obsolete"><p>Ez da erregistro fitxategirik aurkitu. Sakatu <b>Freskatu</b> botoia erregistro karpeta berriz arakatzeko <nobr><b>%1</b></nobr>.</p></translation>
+        <location line="-153"/>
+        <location line="+150"/>
+        <source>AHCI</source>
+        <comment>StorageControllerType</comment>
+        <translation>AHCI</translation>
     </message>
     <message>
-        <source>Save VirtualBox Log As</source>
-        <translation type="obsolete">VirtualBox Erregistroa Gorde Honela</translation>
+        <location line="-152"/>
+        <location line="+150"/>
+        <source>Lsilogic</source>
+        <comment>StorageControllerType</comment>
+        <translation>Lsilogic</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="obsolete">Laguntza</translation>
+        <location line="-149"/>
+        <location line="+150"/>
+        <source>BusLogic</source>
+        <comment>StorageControllerType</comment>
+        <translation>BusLogic</translation>
     </message>
     <message>
-        <source>F1</source>
-        <translation type="obsolete">F1</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-3"/>
+        <source>Bridged adapter, %1</source>
+        <comment>details report (network)</comment>
+        <translation>Zubi egokitzailea, %1</translation>
     </message>
     <message>
-        <source>&Find</source>
-        <translation type="obsolete">&Bilatu</translation>
+        <location line="+6"/>
+        <source>Host-only adapter, '%1'</source>
+        <comment>details report (network)</comment>
+        <translation>Hostalaria-bakarrik Egokitzailea, '%1'</translation>
     </message>
     <message>
-        <source>Alt+F</source>
-        <translation type="obsolete">ALt+B</translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="-299"/>
+        <source>Intel PRO/1000 MT Server (82545EM)</source>
+        <comment>NetworkAdapterType</comment>
+        <translation>Intel PRO/1000 MT Zerbitzaria (82545EM)</translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">Itxi</translation>
+        <location line="-19"/>
+        <source>Bridged Adapter</source>
+        <comment>NetworkAttachmentType</comment>
+        <translation>Zubi Egokitzailea</translation>
     </message>
-</context>
-<context>
-    <name>VBoxVMNetworkSettings</name>
     <message>
-        <source>VBoxVMNetworkSettings</source>
-        <translation type="obsolete">VBOXMBSareEzarpenak</translation>
+        <location line="+2"/>
+        <source>Host-only Adapter</source>
+        <comment>NetworkAttachmentType</comment>
+        <translation>Hostalaria-bakarrik Egokitzailea</translation>
     </message>
     <message>
-        <source>&Enable Network Adapter</source>
-        <translation type="obsolete">&Gaitu Sare Moldagailua</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-213"/>
+        <location line="+38"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="-19"/>
+        <source><nobr>%1 MB</nobr></source>
+        <comment>details report</comment>
+        <translation><nobr>%1 MB</nobr></translation>
     </message>
     <message>
-        <source>&Attached to</source>
-        <translation type="obsolete">&Hemen erantsia</translation>
+        <location line="-36"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+243"/>
+        <source>Processor(s)</source>
+        <comment>details report</comment>
+        <translation>Prozesagailua(k)</translation>
     </message>
     <message>
-        <source>&MAC Address</source>
-        <translation type="obsolete">&MAC Helbidea</translation>
+        <location line="+1"/>
+        <source><nobr>%1</nobr></source>
+        <comment>details report</comment>
+        <translation><nobr>%1</nobr></translation>
     </message>
     <message>
-        <source>&Generate</source>
-        <translation type="obsolete">&Sortu</translation>
+        <location line="+23"/>
+        <source>System</source>
+        <comment>details report</comment>
+        <translation>Sistema</translation>
     </message>
     <message>
-        <source>Alt+G</source>
-        <translation type="obsolete">ALT+S</translation>
+        <location line="+62"/>
+        <source>Display</source>
+        <comment>details report</comment>
+        <translation>Erakutsi</translation>
     </message>
     <message>
-        <source>Generates a new random MAC address.</source>
-        <translation type="obsolete">Ausazko MAC berri bat sortzen du.</translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="+51"/>
+        <location line="+190"/>
+        <source>Raw File</source>
+        <comment>PortMode</comment>
+        <translation>Raw Agiria</translation>
     </message>
     <message>
-        <source>Ca&ble Connected</source>
-        <translation type="obsolete">Ka&blea Konektaturik</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-27"/>
+        <source>Enabled</source>
+        <comment>details report (2D Video Acceleration)</comment>
+        <translation>Gaituta</translation>
     </message>
     <message>
-        <source>Alt+B</source>
-        <translation type="obsolete">Alt+B</translation>
+        <location line="+1"/>
+        <source>Disabled</source>
+        <comment>details report (2D Video Acceleration)</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>Host Interface Settings</source>
-        <translation type="obsolete">Ostalari Interfaze Ezarpenak</translation>
+        <location line="+3"/>
+        <source>2D Video Acceleration</source>
+        <comment>details report</comment>
+        <translation>2D Bideo Bizkorpena</translation>
     </message>
     <message>
-        <source>&Interface Name</source>
-        <translation type="obsolete">&Interfaze Izena</translation>
+        <location line="+87"/>
+        <source>Not Attached</source>
+        <comment>details report (Storage)</comment>
+        <translation>Erantsi gabe</translation>
     </message>
     <message>
-        <source>&File Descriptor</source>
-        <translation type="obsolete">&Fitxategi Deskriptorea</translation>
+        <location line="+8"/>
+        <source>Storage</source>
+        <comment>details report</comment>
+        <translation>Biltegia</translation>
     </message>
     <message>
-        <source>&Setup Application</source>
-        <translation type="obsolete">Aplikazio &Konfigurazioa</translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="-419"/>
+        <source>Teleported</source>
+        <comment>MachineState</comment>
+        <translation>Teleramana</translation>
     </message>
     <message>
-        <source>Select</source>
-        <translation type="obsolete">Hautatu</translation>
+        <location line="+3"/>
+        <source>Guru Meditation</source>
+        <comment>MachineState</comment>
+        <translation>Guru Meditation</translation>
     </message>
     <message>
-        <source>&Terminate Application</source>
-        <translation type="obsolete">Aplikazioa &Amaitu</translation>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>Teleporting</source>
+        <comment>MachineState</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select TAP setup application</source>
-        <translation type="obsolete">Hautatu TAP konfigurazio aplikazioa</translation>
+        <location line="-6"/>
+        <source>Taking Live Snapshot</source>
+        <comment>MachineState</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select TAP terminate application</source>
-        <translation type="obsolete">Hautatu TAP amaiera aplikazioa</translation>
+        <location line="+5"/>
+        <source>Teleporting Paused VM</source>
+        <comment>MachineState</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, plugs this virtual network adapter into the virtual machine.</source>
-        <translation type="obsolete">Aukeratua dagoenean, sare moldagailu birtual hau eransten du makina birtualean.</translation>
+        <location line="+5"/>
+        <source>Restoring Snapshot</source>
+        <comment>MachineState</comment>
+        <translation type="unfinished">Berehalakoa Leheneratzen</translation>
     </message>
     <message>
-        <source>Controls how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="obsolete">Ostalari SE-ren sare errealera konektatzeko moldagailu birtualak modua kontrolatzen du.</translation>
+        <location line="-2"/>
+        <location line="+1"/>
+        <location line="+2"/>
+        <source>Deleting Snapshot</source>
+        <comment>MachineState</comment>
+        <translation>Berehalakoa Ezabatzen</translation>
     </message>
     <message>
-        <source>Holds the MAC address of this adapter. It contains exactly 12 characters chosen from {0-9,A-F}.</source>
-        <translation type="obsolete">Moldagai honen MAC helbidea bistaratzen du. Zehazki 12 karaktere ditu {0-9,A-F} tartetik.</translation>
+        <location line="+312"/>
+        <source>Floppy</source>
+        <comment>StorageBus</comment>
+        <translation>Disketea</translation>
     </message>
     <message>
-        <source>Indicates whether the virtual network cable is plugged in on machine startup or not.</source>
-        <translation type="obsolete">Abiaraztean sare kable birtuala konektaturik dagoen erakusten du.</translation>
+        <location line="-133"/>
+        <source>Paravirtualized Network (virtio-net)</source>
+        <comment>NetworkAdapterType</comment>
+        <translation>Parabirtualizatutako Sarea (virtio-net)</translation>
     </message>
     <message>
-        <source>Holds the name of the host interface selected for this adapter.</source>
-        <translation type="obsolete">Moldagai honetako hautaturiko interfazearen ostalari izena bistaratzen du.</translation>
+        <location line="+152"/>
+        <location line="+150"/>
+        <source>I82078</source>
+        <comment>StorageControllerType</comment>
+        <translation>I82078</translation>
     </message>
     <message>
-        <source>Holds the TAP interface name.</source>
-        <translation type="obsolete">TAP interfaze izena bistaratzen du.</translation>
+        <location filename="../src/medium/UIMedium.cpp" line="-362"/>
+        <source>Empty</source>
+        <comment>medium</comment>
+        <translation>Hutsik</translation>
     </message>
     <message>
-        <source>Holds the command executed to set up the TAP interface.</source>
-        <translation type="obsolete">TAP interfazea konfiguratzeko exekutatutako komandoa bistaratzen du.</translation>
+        <location line="+45"/>
+        <source>Host Drive '%1'</source>
+        <comment>medium</comment>
+        <translation>Hostalari Gidagailua '%1'</translation>
     </message>
     <message>
-        <source>Selects the setup application.</source>
-        <translation type="obsolete">Konfigurazio aplikazioa Hautatzen du.</translation>
+        <location line="+2"/>
+        <source>Host Drive %1 (%2)</source>
+        <comment>medium</comment>
+        <translation>Hostalari Gidagailua %1 (%2)</translation>
     </message>
     <message>
-        <source>Holds the command executed to terminate the TAP interface.</source>
-        <translation type="obsolete">TAP interfazea amaitzeko exekutatutako komandoa bistaratzen du.</translation>
+        <location line="+164"/>
+        <source><p style=white-space:pre>Type (Format):  %1 (%2)</p></source>
+        <comment>medium</comment>
+        <translation><p style=white-space:pre>Mota (Heuskarria):  %1 (%2)</p></translation>
     </message>
     <message>
-        <source>Selects the terminate application.</source>
-        <translation type="obsolete">Hautatu amaiera aplikazioa.</translation>
+        <location line="+3"/>
+        <source><p>Attached to:  %1</p></source>
+        <comment>image</comment>
+        <translation><p>Erantsita hona:  %1</p></translation>
     </message>
-</context>
-<context>
-    <name>VBoxVMParallelPortSettings</name>
     <message>
-        <source>Port &Number</source>
-        <translation type="obsolete">Ataka Ze&nbakia</translation>
+        <location line="+1"/>
+        <source><i>Not Attached</i></source>
+        <comment>image</comment>
+        <translation><i>Erantsi Gabe</i></translation>
     </message>
     <message>
-        <source>&IRQ</source>
-        <translation type="obsolete">&IRQ</translation>
+        <location line="+5"/>
+        <source><i>Checking accessibility...</i></source>
+        <comment>medium</comment>
+        <translation><i>Sarbidetasun egiaztatzen...</i></translation>
     </message>
     <message>
-        <source>I/O Po&rt</source>
-        <translation type="obsolete">I/O A&taka</translation>
+        <location line="+13"/>
+        <source>Failed to check accessibility of disk image files.</source>
+        <comment>medium</comment>
+        <translation>Hutsegitea diska irudiko agirietarako sarbidea egiaztatzerakoan.</translation>
     </message>
     <message>
-        <source>Port &Path</source>
-        <translation type="obsolete">Ataka &Bidea</translation>
+        <location line="+28"/>
+        <source><b>No disk image file selected</b></source>
+        <comment>medium</comment>
+        <translation><b>Ez da diska irudi agiririk hautatu</b></translation>
     </message>
-</context>
-<context>
-    <name>VBoxVMSerialPortSettings</name>
     <message>
-        <source>VBoxVMSerialPortSettings</source>
-        <translation type="obsolete">VBoxVMSerieAtakaEzarpenak</translation>
+        <location line="+2"/>
+        <source><b>No disk image files available</b></source>
+        <comment>medium</comment>
+        <translation><b>Ez dago diska irudi agiririk eskuragarri</b></translation>
     </message>
     <message>
-        <source>&Enable Serial Port</source>
-        <translation type="obsolete">&Gaitu Serie Ataka</translation>
+        <location line="+1"/>
+        <source>You can create or add disk image files in the virtual machine settings.</source>
+        <translation>Diska irudi agiriak makina birtualaren ezarpenetan sortu edo gehitu ditzakezu.</translation>
     </message>
     <message>
-        <source>When checked, enables the given serial port of the virtual machine.</source>
-        <translation type="obsolete">Hautaturik dagoenean, makina birtualaren emandako serie ataka gaitu.</translation>
+        <source>Failed to check media accessibility.</source>
+        <comment>medium</comment>
+        <translation type="obsolete">Hutsegitea multimedia sarbidea egiaztatzerakoan.</translation>
     </message>
     <message>
-        <source>Port &Number</source>
-        <translation type="obsolete">Ataka Ze&nbakia</translation>
+        <location line="-2"/>
+        <source>You can also change this while the machine is running.</source>
+        <translation>Hau makina ekinean dagoela ere aldatu dezakezu.</translation>
     </message>
     <message>
-        <source>Selects the serial port number. You can choose one of the standard serial ports or select <b>User-defined</b> and specify port parameters manually.</source>
-        <translation type="obsolete">Serie ataka zenbakia bistarazi. Serie ataka estandarretako bat hautatu edo <b>Erabiltzaileak-definituriko</b> bat eta ataka parametroak eskuz ezarri.</translation>
+        <source><b>No media available</b></source>
+        <comment>medium</comment>
+        <translation type="obsolete"><b>Ez dago multimediarik eskuragarri</b></translation>
     </message>
     <message>
-        <source>&IRQ</source>
-        <translation type="obsolete">&IRQ</translation>
+        <source>You can create media images using the virtual media manager.</source>
+        <translation type="obsolete">Multimedia irudiak sortu ditzakezu multimedia birtual kudeatzailea erabiliz.</translation>
     </message>
     <message>
-        <source>Holds the IRQ number of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> is enabled for this virtual machine.</source>
-        <translation type="obsolete">Serie ataka honen IRQ zenbakia bistarazi. Balio erabilgarriak zenbaki osoak <tt>0</tt> eta <tt>255</tt> artean. <tt>15</tt> baina balioa handiagoak erabiltzeko <b>I/O APIC</b> gaiturik egon behar da makina birtual honetan.</translation>
+        <location line="+12"/>
+        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>I/O Po&rt</source>
-        <translation type="obsolete">I/O A&taka</translation>
+        <location line="+76"/>
+        <source>Encrypted</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the base I/O port address of this serial port. This should be a whole number between <tt>0</tt> and <tt>0xFFFF</tt>.</source>
-        <translation type="obsolete">Serie ataka honen oinarri S/I helbidea bistaratzen du. Balio erabilgarria zenbaki osoak <tt>0</tt> eta <tt>0xFFFF</tt> tartean.</translation>
+        <location line="+88"/>
+        <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Medium Manager to inspect these files.</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port &Mode</source>
-        <translation type="obsolete">Ataka &Modua</translation>
+        <location line="+16"/>
+        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Controls the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="obsolete">Serie ataka honen funtzionamendu modua kontrolatzen du. <b>Deskonektaturik</b> hautatuaz gero, bezero SE-ak serie ataka ikusiko du baina ezingo du berarekin lan egin.</translation>
+    <message numerus="yes">
+        <location filename="../src/globals/VBoxGlobal.h" line="+197"/>
+        <source>%n year(s)</source>
+        <translation>
+            <numerusform>%n urte</numerusform>
+            <numerusform>%n urte</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>&Create Pipe</source>
-        <translation type="obsolete">&Sortu Kanalizazioa</translation>
+    <message numerus="yes">
+        <location line="+5"/>
+        <source>%n month(s)</source>
+        <translation>
+            <numerusform>%n hilabete</numerusform>
+            <numerusform>%n hilabete</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Alt+C</source>
-        <translation type="obsolete">Alt+S</translation>
+    <message numerus="yes">
+        <location line="+5"/>
+        <source>%n day(s)</source>
+        <translation>
+            <numerusform>%n egun</numerusform>
+            <numerusform>%n egun</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>If checked, the pipe specified in the <b>Port Path</b> field will be created by the virtual machine when it starts. Otherwise, the virtual machine will assume that the pipe exists and try to use it.</source>
-        <translation type="obsolete">Markaturik badago, <b>Ataka Bidean</b> ezarritako kanalizazioa sortuko da makina birtualean abiaraztean. Bestela makina birtuala dagoen kanalizazioa erabiltzen saiatuko da.</translation>
+    <message numerus="yes">
+        <location line="+5"/>
+        <source>%n hour(s)</source>
+        <translation>
+            <numerusform>%n ordu</numerusform>
+            <numerusform>%n ordu</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Port &Path</source>
-        <translation type="obsolete">Ataka &Bidea</translation>
+    <message numerus="yes">
+        <location line="+5"/>
+        <source>%n minute(s)</source>
+        <translation>
+            <numerusform>%n minutu</numerusform>
+            <numerusform>%n minutu</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Holds the path to the serial port's pipe on the host when the port is working in <b>Host Pipe</b> mode, or the host serial device name when the port is working in <b>Host Device</b> mode.</source>
-        <translation type="obsolete">Ostalarian Serial atakarako kanalizazioaren bidea erakusten du ataka <b>Ostalari Kanalizazio</b> moduan funtzionatzean, edo serie ataka izena atakak <b>Ostalari Gailua</b> moduan funtzinoatzean.</translation>
+    <message numerus="yes">
+        <location line="+5"/>
+        <source>%n second(s)</source>
+        <translation>
+            <numerusform>%n segundu</numerusform>
+            <numerusform>%n segundu</numerusform>
+        </translation>
     </message>
-</context>
-<context>
-    <name>VBoxVMSettingsCD</name>
     <message>
-        <source>CD/DVD image file is not selected</source>
-        <translation type="obsolete">CD/DVD irudi fitxategia ez dago hautatuta</translation>
+        <source>(CD/DVD)</source>
+        <translation type="obsolete">(CD/DVD)</translation>
     </message>
     <message>
-        <source>When checked, mounts the specified media to the CD/DVD drive of the virtual machine. Note that the CD/DVD drive is always connected to the Secondary Master IDE controller of the machine.</source>
-        <translation type="obsolete">Markaturik dagoenean, ezarritako euskarria makina birtualeko CD/DVD gailuan muntatzen du. Kontutan izan CD/DVD gailua beti bigarren IDE kontrolagailuaren ataka nagusian konektaturik dagoela.</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-114"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="-233"/>
+        <source>Screens</source>
+        <comment>details report</comment>
+        <translation>Ikusleihoak</translation>
     </message>
     <message>
-        <source>&Mount CD/DVD Drive</source>
-        <translation type="obsolete">&Muntatu CD/DVD Gailua</translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="-168"/>
+        <source>SAS</source>
+        <comment>StorageBus</comment>
+        <translation>SAS</translation>
     </message>
     <message>
-        <source>Mounts the specified CD/DVD drive to the virtual CD/DVD drive.</source>
-        <translation type="obsolete">Ezarritako CD/DVD gailua CD/DVD gailu birtualean muntatzen du.</translation>
+        <location line="+19"/>
+        <location line="+150"/>
+        <source>LsiLogic SAS</source>
+        <comment>StorageControllerType</comment>
+        <translation>LsiLogic SAS</translation>
     </message>
     <message>
-        <source>Host CD/DVD &Drive</source>
-        <translation type="obsolete">Ostalari CD/DVD &Gailua</translation>
+        <location filename="../src/converter/UIConverterBackendGlobal.cpp" line="+76"/>
+        <location line="+19"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="+1602"/>
+        <location line="+32"/>
+        <source>B</source>
+        <comment>size suffix Bytes</comment>
+        <translation>B</translation>
     </message>
     <message>
-        <source>Lists host CD/DVD drives available to insert to the virtual machine.</source>
-        <translation type="obsolete">Makina birtualean muntatzeko erabilgarri dauden ostalariaren CD/DVD gailuak zerrendatzen ditu.</translation>
+        <location line="-18"/>
+        <location line="+19"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-31"/>
+        <location line="+33"/>
+        <source>KB</source>
+        <comment>size suffix KBytes=1024 Bytes</comment>
+        <translation>KB</translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <location line="+19"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-32"/>
+        <location line="+34"/>
+        <location filename="../src/widgets/UIApplianceEditorWidget.cpp" line="-642"/>
+        <location line="+193"/>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageBasic2.cpp" line="+4"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <location filename="../src/wizards/newvm/UIWizardNewVMPageExpert.cpp" line="-7"/>
+        <location line="+1"/>
+        <location line="+1"/>
+        <source>MB</source>
+        <comment>size suffix MBytes=1024 KBytes</comment>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>When checked, allows the guest to send ATAPI commands directly to the host drive which makes it possible to use CD/DVD writers connected to the host inside the VM. Note that writing audio CD inside the VM is not yet supported.</source>
-        <translation type="obsolete">Markaturik dagoenean, bezeroari ATAPI komandoak zuzenean ostalariaren gailura bidaltzeko aukera ematen du, honek ostalarira konektatutako CD/DVD idazleak MB bidez erabiltzea posible egiten du. Kontutan izan audio CD-ak MB barnetik grabatzea ez dela onartzen oraindik.</translation>
+        <location line="-18"/>
+        <location line="+19"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-33"/>
+        <location line="+35"/>
+        <source>GB</source>
+        <comment>size suffix GBytes=1024 MBytes</comment>
+        <translation>GB</translation>
     </message>
     <message>
-        <source>Mounts the specified CD/DVD image to the virtual CD/DVD drive.</source>
-        <translation type="obsolete">Muntatu ezarritako CD/DVD irudia CD/DVD gailu birtualean.</translation>
+        <location line="-18"/>
+        <location line="+19"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-34"/>
+        <location line="+36"/>
+        <source>TB</source>
+        <comment>size suffix TBytes=1024 GBytes</comment>
+        <translation>TB</translation>
     </message>
     <message>
-        <source>&ISO Image File</source>
-        <translation type="obsolete">&ISO Irudi Fitxategia</translation>
+        <location line="-18"/>
+        <location line="+19"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-35"/>
+        <location line="+37"/>
+        <source>PB</source>
+        <comment>size suffix PBytes=1024 TBytes</comment>
+        <translation>PB</translation>
     </message>
     <message>
-        <source>Holds the image file to mount to the virtual CD/DVD drive and allows to quickly select a different image.</source>
-        <translation type="obsolete">CD/DVD gailu birtualean muntatu behar den irudi fitxategia erakusten du eta beste irudi bat bizkor hautatzeko aukera ematen du.</translation>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Gaituta</translation>
     </message>
     <message>
-        <source>Invokes the Virtual Disk Manager to select a CD/DVD image to mount.</source>
-        <translation type="obsolete">Disko Birtual Kudeatzailea deitzen du muntatzeko CD/DVD irudi bat hautatzeko.</translation>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Ezgaituta</translation>
     </message>
-</context>
-<context>
-    <name>VBoxVMSettingsDlg</name>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategoria</translation>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+219"/>
+        <source>Nested Paging</source>
+        <translation>Nested Orrialdeztapena</translation>
     </message>
     <message>
-        <source>[id]</source>
-        <translation type="obsolete">[id]</translation>
+        <location line="+1"/>
+        <source>Unrestricted Execution</source>
+        <translation>Mugagabeko Exekuzioa</translation>
     </message>
     <message>
-        <source>[link]</source>
-        <translation type="obsolete">[lotura]</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-1931"/>
+        <source>Unknown device</source>
+        <comment>USB device details</comment>
+        <translation>Gailu ezezaguna</translation>
     </message>
     <message>
-        <source>[name]</source>
-        <translation type="obsolete">[izena]</translation>
+        <location filename="../src/UIVMInfoDialog.cpp" line="+5"/>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="+316"/>
+        <source>Remote Desktop Server Port</source>
+        <comment>details report (VRDE Server)</comment>
+        <translation>Hurruneko Mahaigain Zerbitzari Ataka</translation>
     </message>
     <message>
-        <source>VBoxVMSettingsDlg</source>
-        <translation type="obsolete">VBoxMBEzarpenLeihoa</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="+4"/>
+        <source>Remote Desktop Server</source>
+        <comment>details report (VRDE Server)</comment>
+        <translation>Hurruneko Mahaigain Zerbitzaria</translation>
     </message>
     <message>
-        <source><i>Select a settings category from the list on the left-hand side and move the mouse over a settings item to get more information<i>.</source>
-        <translation type="obsolete"><i>Hautatu ezarpen kategoria bat ezkerreko zerrendatik eta mugitu sagua elementu baten gainetik argibide gehiago jasotzeko<i>.</translation>
+        <location line="+1"/>
+        <source>Disabled</source>
+        <comment>details report (VRDE Server)</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source> General </source>
-        <translation type="obsolete"> Orokorra </translation>
+        <location line="+439"/>
+        <source>Please choose a virtual hard disk file</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0</source>
-        <translation type="obsolete">0</translation>
+        <location line="+1"/>
+        <source>All virtual hard disk files (%1)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>#general</source>
-        <translation type="obsolete">#general</translation>
+        <location line="+50"/>
+        <source>All files (*)</source>
+        <translation>Agiri guztiak (*)</translation>
     </message>
     <message>
-        <source> Hard Disks </source>
-        <translation type="obsolete"> Disko Gogorrak </translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="-486"/>
+        <source>Fault Tolerant Syncing</source>
+        <comment>MachineState</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1</source>
-        <translation type="obsolete">1</translation>
+        <location line="+20"/>
+        <source>Unlocked</source>
+        <comment>SessionState</comment>
+        <translation>Desblokeatuta</translation>
     </message>
     <message>
-        <source>#hdds</source>
-        <translation type="obsolete">#hdds</translation>
+        <location line="+1"/>
+        <source>Locked</source>
+        <comment>SessionState</comment>
+        <translation>Blokeatuta</translation>
     </message>
     <message>
-        <source> Floppy </source>
-        <translation type="obsolete"> Disketeak </translation>
+        <location line="+2"/>
+        <source>Unlocking</source>
+        <comment>SessionState</comment>
+        <translation>Desblokeatzen</translation>
     </message>
     <message>
-        <source>2</source>
-        <translation type="obsolete">2</translation>
+        <location line="+29"/>
+        <source>Optical</source>
+        <comment>DeviceType</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>#floppy</source>
-        <translation type="obsolete">#floppy</translation>
+        <location line="+248"/>
+        <location line="+165"/>
+        <source>Null</source>
+        <comment>AuthType</comment>
+        <translation>Null</translation>
     </message>
     <message>
-        <source> CD/DVD </source>
-        <translation type="obsolete"> CD/DVD_ROM </translation>
+        <location line="-164"/>
+        <location line="+165"/>
+        <source>External</source>
+        <comment>AuthType</comment>
+        <translation>Kanpokoa</translation>
     </message>
     <message>
-        <source>3</source>
-        <translation type="obsolete">3</translation>
+        <location line="-164"/>
+        <location line="+165"/>
+        <source>Guest</source>
+        <comment>AuthType</comment>
+        <translation>Gonbidatua</translation>
     </message>
     <message>
-        <source>#dvd</source>
-        <translation type="obsolete">#dvd</translation>
+        <location line="-178"/>
+        <location line="+164"/>
+        <source>Intel HD Audio</source>
+        <comment>AudioControllerType</comment>
+        <translation>Intel HD Audio</translation>
     </message>
     <message>
-        <source> Audio </source>
-        <translation type="obsolete"> Audioa </translation>
+        <location line="-105"/>
+        <source>PIIX3</source>
+        <comment>ChipsetType</comment>
+        <translation>PIIX3</translation>
     </message>
     <message>
-        <source>4</source>
-        <translation type="obsolete">4</translation>
+        <location line="+1"/>
+        <source>ICH9</source>
+        <comment>ChipsetType</comment>
+        <translation>ICH9</translation>
     </message>
     <message>
-        <source>#audio</source>
-        <translation type="obsolete">#audio</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="-565"/>
+        <location filename="../src/runtime/UIIndicatorsPool.cpp" line="+1"/>
+        <source>Execution Cap</source>
+        <comment>details report</comment>
+        <translation>Exekuzio Muga</translation>
     </message>
     <message>
-        <source> Network </source>
-        <translation type="obsolete"> Sarea </translation>
+        <location line="+1"/>
+        <source><nobr>%1%</nobr></source>
+        <comment>details report</comment>
+        <translation><nobr>%1%</nobr></translation>
     </message>
     <message>
-        <source>5</source>
-        <translation type="obsolete">5</translation>
+        <location line="+210"/>
+        <source>Generic, '%1'</source>
+        <comment>details report (network)</comment>
+        <translation>Generikoa, '%1'</translation>
     </message>
     <message>
-        <source>#network</source>
-        <translation type="obsolete">#network</translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="-184"/>
+        <source>Generic Driver</source>
+        <comment>NetworkAttachmentType</comment>
+        <translation>Gidagailu Generikoa</translation>
     </message>
     <message>
-        <source> USB </source>
-        <translation type="obsolete"> USB </translation>
+        <location filename="../src/settings/machine/UIMachineSettingsNetwork.cpp" line="-162"/>
+        <source>Adapter %1</source>
+        <translation>Egokitzailea %1</translation>
     </message>
     <message>
-        <source>6</source>
-        <translation type="obsolete">6</translation>
+        <location filename="../src/converter/UIConverterBackendCOM.cpp" line="-84"/>
+        <source>Disabled</source>
+        <comment>DragAndDropType</comment>
+        <translation>Ezgaituta</translation>
     </message>
     <message>
-        <source>#usb</source>
-        <translation type="obsolete">#usb</translation>
+        <location line="+1"/>
+        <source>Host To Guest</source>
+        <comment>DragAndDropType</comment>
+        <translation>Hostalaritik Gonbidatura</translation>
     </message>
     <message>
-        <source> Remote Display </source>
-        <translation type="obsolete"> Urruneko Pantaila </translation>
+        <location line="+1"/>
+        <source>Guest To Host</source>
+        <comment>DragAndDropType</comment>
+        <translation>Gonbidatutik Hostalarira</translation>
     </message>
     <message>
-        <source>7</source>
-        <translation type="obsolete">7</translation>
+        <location line="+1"/>
+        <source>Bidirectional</source>
+        <comment>DragAndDropType</comment>
+        <translation>Binorabidekoa</translation>
     </message>
     <message>
-        <source>#vrdp</source>
-        <translation type="obsolete">#vrdp</translation>
+        <location line="+11"/>
+        <source>PS/2 Mouse</source>
+        <comment>PointingHIDType</comment>
+        <translation>PS/2 Sagua</translation>
     </message>
     <message>
-        <source> Shared Folders </source>
-        <translation type="obsolete"> Partekatutako Karpetak </translation>
+        <location line="+1"/>
+        <source>USB Mouse</source>
+        <comment>PointingHIDType</comment>
+        <translation>USB Sagua</translation>
     </message>
     <message>
-        <source>8</source>
-        <translation type="obsolete">8</translation>
+        <location line="+1"/>
+        <source>USB Tablet</source>
+        <comment>PointingHIDType</comment>
+        <translation>USB Tableta</translation>
     </message>
     <message>
-        <source>#sfolders</source>
-        <translation type="obsolete">#sfolders</translation>
+        <location line="+1"/>
+        <source>PS/2 and USB Mouse</source>
+        <comment>PointingHIDType</comment>
+        <translation>PS/2 eta USB Sagua</translation>
     </message>
     <message>
-        <source>&Identification</source>
-        <translation type="obsolete">&Identifikazioa</translation>
+        <location line="+1"/>
+        <source>USB Multi-Touch Tablet</source>
+        <comment>PointingHIDType</comment>
+        <translation>USB Multi-Ikutu Tableteta</translation>
     </message>
     <message>
-        <source>&Name</source>
-        <translation type="obsolete">&Izena</translation>
+        <location line="+11"/>
+        <source>Normal</source>
+        <comment>MediumType</comment>
+        <translation>Arrunta</translation>
     </message>
     <message>
-        <source>Holds the name of the virtual machine.</source>
-        <translation type="obsolete">Makina birtualaren izena bistaratzen du.</translation>
+        <location line="+1"/>
+        <source>Immutable</source>
+        <comment>MediumType</comment>
+        <translation>Aldaezina</translation>
     </message>
     <message>
-        <source>OS &Type</source>
-        <translation type="obsolete">SE mo&ta</translation>
+        <location line="+1"/>
+        <source>Writethrough</source>
+        <comment>MediumType</comment>
+        <translation>Idaz-igaropena</translation>
     </message>
     <message>
-        <source>Base &Memory Size</source>
-        <translation type="obsolete">Oinarri &Memoria Tamaina</translation>
+        <location line="+1"/>
+        <source>Shareable</source>
+        <comment>MediumType</comment>
+        <translation>Elkarbanagarria</translation>
     </message>
     <message>
-        <source>Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start.</source>
-        <translation type="obsolete">Makina Birtualari ezarritako memoria kantitatea ezartzen du. Gehiegi ezarriaz gero, makina agian ez da abiaraziko.</translation>
+        <location line="+1"/>
+        <source>Readonly</source>
+        <comment>MediumType</comment>
+        <translation>Irakurtzekoa-bakarrik</translation>
     </message>
     <message>
-        <source><</source>
-        <translation type="obsolete"><</translation>
+        <location line="+1"/>
+        <source>Multi-attach</source>
+        <comment>MediumType</comment>
+        <translation>Eranskin-anitz</translation>
     </message>
     <message>
-        <source>=</source>
-        <translation type="obsolete">=</translation>
+        <location line="+13"/>
+        <source>Dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation>Esleitu biltegia dinamikoki</translation>
     </message>
     <message>
-        <source>></source>
-        <translation type="obsolete">></translation>
+        <location line="+2"/>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
+        <location line="+2"/>
+        <source>Dynamically allocated differencing storage</source>
+        <comment>MediumVariant</comment>
+        <translation>Dinamikoki esleturiko biltegiratze ezberdintasuna</translation>
     </message>
     <message>
-        <source>&Video Memory Size</source>
-        <translation type="obsolete">&Bideo Memoria Tamaina</translation>
+        <location line="+2"/>
+        <source>Fixed size storage</source>
+        <comment>MediumVariant</comment>
+        <translation>Biltegiratze neurri zuzendua</translation>
     </message>
     <message>
-        <source>Controls the amount of video memory provided to the virtual machine.</source>
-        <translation type="obsolete">Makina birtualari ezarritako bideo memoria kontrolatzen du.</translation>
+        <location line="+2"/>
+        <source>Dynamically allocated storage split into files of less than 2GB</source>
+        <comment>MediumVariant</comment>
+        <translation>Dinamikoki esleituriko biltegi bananketa 2GB baino gutxiagoko agirietan</translation>
     </message>
     <message>
-        <source>&Basic</source>
-        <translation type="obsolete">&Basikoa</translation>
+        <location line="+2"/>
+        <source>Dynamically allocated differencing storage split into files of less than 2GB</source>
+        <comment>MediumVariant</comment>
+        <translation>Dinamikoki esleituriko biltegi bananketa aldea 2GB baino gutxiagoko agirietan</translation>
     </message>
     <message>
-        <source>Select</source>
-        <translation type="obsolete">Hautatu</translation>
+        <location line="+2"/>
+        <source>Fixed size storage split into files of less than 2GB</source>
+        <comment>MediumVariant</comment>
+        <translation>Zuzendutako neurria biltegi bananketa 2GB baino gutxiagoko agirietan</translation>
     </message>
     <message>
-        <source>Selects the snapshot folder path.</source>
-        <translation type="obsolete">Egoera-argazki karpeta bidea hautatzen du.</translation>
+        <location line="+2"/>
+        <source>Dynamically allocated compressed storage</source>
+        <comment>MediumVariant</comment>
+        <translation>Dinamikoki esleturiko biltegiratze konprimitua</translation>
     </message>
     <message>
-        <source>Reset</source>
-        <translation type="obsolete">Berrezarri</translation>
+        <location line="+2"/>
+        <source>Dynamically allocated differencing compressed storage</source>
+        <comment>MediumVariant</comment>
+        <translation>Dinamikoki esleturiko biltegiratze konprimitu ezberdintasuna</translation>
     </message>
     <message>
-        <source>Extended Features</source>
-        <translation type="obsolete">Hedaturiko Ezaugarriak</translation>
+        <location line="+2"/>
+        <source>Fixed size ESX storage</source>
+        <comment>MediumVariant</comment>
+        <translation>ESX biltegiratze neurri zuzendua</translation>
     </message>
     <message>
-        <source>Enable A&CPI</source>
-        <translation type="obsolete">A&CPI Gaitu</translation>
+        <location line="+2"/>
+        <source>Fixed size storage on raw disk</source>
+        <comment>MediumVariant</comment>
+        <translation>Biltegiratze neurri zuzendua raw diskan</translation>
     </message>
     <message>
-        <source>Alt+C</source>
-        <translation type="obsolete">Alt+C</translation>
+        <location line="+18"/>
+        <source>NAT Network</source>
+        <comment>NetworkAttachmentType</comment>
+        <translation>NAT Sarea</translation>
     </message>
     <message>
-        <source>Enable IO A&PIC</source>
-        <translation type="obsolete">IO A&PIC gaitu</translation>
+        <location line="+30"/>
+        <source>Deny</source>
+        <comment>NetworkAdapterPromiscModePolicy</comment>
+        <translation>Ukatu</translation>
     </message>
     <message>
-        <source>Alt+P</source>
-        <translation type="obsolete">Alt+P</translation>
+        <location line="+2"/>
+        <source>Allow VMs</source>
+        <comment>NetworkAdapterPromiscModePolicy</comment>
+        <translation>Ahalbidetu MB-ak</translation>
     </message>
     <message>
-        <source>Boo&t Order</source>
-        <translation type="obsolete">A&bio Ordena</translation>
+        <location line="+2"/>
+        <source>Allow All</source>
+        <comment>NetworkAdapterPromiscModePolicy</comment>
+        <translation>Ahalbidetu Denak</translation>
     </message>
     <message>
-        <source>&Advanced</source>
-        <translation type="obsolete">&Aurreratua</translation>
+        <location line="+16"/>
+        <location line="+190"/>
+        <source>TCP</source>
+        <comment>PortMode</comment>
+        <translation type="unfinished">TCP</translation>
     </message>
     <message>
-        <source>&Description</source>
-        <translation type="obsolete">A&zalpena</translation>
+        <location line="-179"/>
+        <source>OHCI</source>
+        <comment>USBControllerType</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Primary Master</source>
-        <translation type="obsolete">&Lehen Mailako Nagusia</translation>
+        <location line="+1"/>
+        <source>EHCI</source>
+        <comment>USBControllerType</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><not selected></source>
-        <translation type="obsolete"><ez hautaturik></translation>
+        <location line="+1"/>
+        <source>xHCI</source>
+        <comment>USBControllerType</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>P&rimary Slave</source>
-        <translation type="obsolete">Lehen Mailako Mo&rroia</translation>
+        <location line="+27"/>
+        <location line="+162"/>
+        <source>Ignore</source>
+        <comment>USBDeviceFilterAction</comment>
+        <translation>Ezikusi</translation>
     </message>
     <message>
-        <source>&Secondary (IDE 1) Slave</source>
-        <translation type="obsolete">&Bigarren Morroia (IDE 1)</translation>
+        <location line="-161"/>
+        <location line="+162"/>
+        <source>Hold</source>
+        <comment>USBDeviceFilterAction</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mount Floppy Drive</source>
-        <translation type="obsolete">&Muntatu Diskete Gailua</translation>
+        <location line="-101"/>
+        <location line="+19"/>
+        <location line="+150"/>
+        <source>USB</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>Host Floppy &Drive</source>
-        <translation type="obsolete">Ostalari Diskete &Gailua</translation>
+        <location line="-127"/>
+        <source>UDP</source>
+        <comment>NATProtocol</comment>
+        <translation>UDP</translation>
     </message>
     <message>
-        <source>Alt+D</source>
-        <translation type="obsolete">Alt+D</translation>
+        <location line="+1"/>
+        <source>TCP</source>
+        <comment>NATProtocol</comment>
+        <translation>TCP</translation>
     </message>
     <message>
-        <source>Mounts the specified host Floppy drive to the virtual Floppy drive.</source>
-        <translation type="obsolete">Hautatutako ostalari diekete gailua muntatu Diskete gailu birtualean.</translation>
+        <location filename="../src/converter/UIConverterBackendGlobal.cpp" line="+29"/>
+        <location line="+102"/>
+        <source>IDE Primary Master</source>
+        <comment>StorageSlot</comment>
+        <translation>IDE Lehen Nagusia</translation>
     </message>
     <message>
-        <source>&Image File</source>
-        <translation type="obsolete">&Irudi fitxategia</translation>
+        <location line="-100"/>
+        <location line="+101"/>
+        <source>IDE Primary Slave</source>
+        <comment>StorageSlot</comment>
+        <translation>IDE Lehen Esklabua</translation>
     </message>
     <message>
-        <source>Alt+I</source>
-        <translation type="obsolete">Alt+I</translation>
+        <location line="-99"/>
+        <location line="+100"/>
+        <source>IDE Secondary Master</source>
+        <comment>StorageSlot</comment>
+        <translation>IDE Bigarren Nagusia</translation>
     </message>
     <message>
-        <source>Mounts the specified Floppy image to the virtual Floppy drive.</source>
-        <translation type="obsolete">Muntatu hautatutako diskete irudia diskete gailu birtualean.</translation>
+        <location line="-98"/>
+        <location line="+99"/>
+        <source>IDE Secondary Slave</source>
+        <comment>StorageSlot</comment>
+        <translation>IDE Bigarren Esklabua</translation>
     </message>
     <message>
-        <source>&Mount CD/DVD Drive</source>
-        <translation type="obsolete">&Muntatu CD/DVD Gailua</translation>
+        <location line="-83"/>
+        <location line="+84"/>
+        <source>SATA Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation>SATA Ataka %1</translation>
     </message>
     <message>
-        <source>Host CD/DVD &Drive</source>
-        <translation type="obsolete">Ostalari CD/DVD &Gailua</translation>
+        <location line="-68"/>
+        <location line="+69"/>
+        <source>SCSI Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation>SCSI Ataka %1</translation>
     </message>
     <message>
-        <source>Mounts the specified CD/DVD drive to the virtual CD/DVD drive.</source>
-        <translation type="obsolete">Ezarritako CD/DVD gailua CD/DVD gailu birtualean muntatzen du.</translation>
+        <location line="-53"/>
+        <location line="+54"/>
+        <source>SAS Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation>SAS Ataka %1</translation>
     </message>
     <message>
-        <source>&ISO Image File</source>
-        <translation type="obsolete">&ISO Irudi Fitxategia</translation>
+        <location line="-38"/>
+        <location line="+39"/>
+        <source>Floppy Device %1</source>
+        <comment>StorageSlot</comment>
+        <translation>Diskete Gailua %1</translation>
     </message>
     <message>
-        <source>Mounts the specified CD/DVD image to the virtual CD/DVD drive.</source>
-        <translation type="obsolete">Muntatu ezarritako CD/DVD irudia CD/DVD gailu birtualean.</translation>
+        <location line="-23"/>
+        <location line="+24"/>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Enable Audio</source>
-        <translation type="obsolete">Audioa &Gailtu</translation>
+        <location line="+630"/>
+        <location line="+30"/>
+        <source>General</source>
+        <comment>DetailsElementType</comment>
+        <translation>Orokorra</translation>
     </message>
     <message>
-        <source>Host Audio &Driver</source>
-        <translation type="obsolete">Ostalari Audio &Kontrolagailua</translation>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Preview</source>
+        <comment>DetailsElementType</comment>
+        <translation>Aurreikuspena</translation>
     </message>
     <message>
-        <source>Enable &USB Controller</source>
-        <translation type="obsolete">Gaitu &USB Kontrolatzailea</translation>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>System</source>
+        <comment>DetailsElementType</comment>
+        <translation>Sistema</translation>
     </message>
     <message>
-        <source>Alt+U</source>
-        <translation type="obsolete">Alt+U</translation>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Display</source>
+        <comment>DetailsElementType</comment>
+        <translation>Erakutsi</translation>
     </message>
     <message>
-        <source>USB Device &Filters</source>
-        <translation type="obsolete">USB Gailu &Iragazkiak</translation>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Storage</source>
+        <comment>DetailsElementType</comment>
+        <translation>Biltegia</translation>
     </message>
     <message>
-        <source>Ins</source>
-        <translation type="obsolete">Ins</translation>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Audio</source>
+        <comment>DetailsElementType</comment>
+        <translation>Audioa</translation>
     </message>
     <message>
-        <source>Add Empty (Ins)</source>
-        <translation type="obsolete">Gehitu Hutsik (Ins)</translation>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Network</source>
+        <comment>DetailsElementType</comment>
+        <translation>Sarea</translation>
     </message>
     <message>
-        <source>Alt+Ins</source>
-        <translation type="obsolete">Alt+Ins</translation>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Serial ports</source>
+        <comment>DetailsElementType</comment>
+        <translation>Serieko Atakak</translation>
     </message>
     <message>
-        <source>Add From (Alt+Ins)</source>
-        <translation type="obsolete">Gehitu hemendik (Alt+Ins)</translation>
+        <location line="-28"/>
+        <location line="+30"/>
+        <source>Parallel ports</source>
+        <comment>DetailsElementType</comment>
+        <translation>Ataka Kidetuak</translation>
     </message>
     <message>
-        <source>Del</source>
-        <translation type="obsolete">Ezab</translation>
+        <location line="-28"/>
+        <location line="+30"/>
+        <source>USB</source>
+        <comment>DetailsElementType</comment>
+        <translation>USB</translation>
     </message>
     <message>
-        <source>Remove (Del)</source>
-        <translation type="obsolete">Ezabatu (Ezab)</translation>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Shared folders</source>
+        <comment>DetailsElementType</comment>
+        <translation>Elkarbanatutako Agiritegiak</translation>
     </message>
     <message>
-        <source>Removes the selected USB filter.</source>
-        <translation type="obsolete">Hautatutako USB Iragazkia ezabatzen du.</translation>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>User interface</source>
+        <comment>DetailsElementType</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ctrl+Up</source>
-        <translation type="obsolete">Ktrl+Gora</translation>
+        <location line="-29"/>
+        <location line="+30"/>
+        <source>Description</source>
+        <comment>DetailsElementType</comment>
+        <translation>Azalpena</translation>
     </message>
     <message>
-        <source>Move Up (Ctrl+Up)</source>
-        <translation type="obsolete">Mugitu Gora (Ktrl+Gora)</translation>
+        <source>Please choose a virtual hard drive file</source>
+        <translation type="obsolete">Mesedez hautatu diska gogor agiri birtual bat</translation>
     </message>
     <message>
-        <source>Moves the selected USB filter up.</source>
-        <translation type="obsolete">Haututako USB iragazkia gora mugitzen du.</translation>
+        <source>All virtual hard drive files (%1)</source>
+        <translation type="obsolete">Diska gogor birtual agiri guztiak (%1)</translation>
     </message>
     <message>
-        <source>Ctrl+Down</source>
-        <translation type="obsolete">Ktrl+Behera</translation>
+        <location filename="../src/globals/VBoxGlobal.cpp" line="+315"/>
+        <source>Please choose a virtual optical disk file</source>
+        <translation>Mesedez hautatu diska optiko birtual agiri bat</translation>
     </message>
     <message>
-        <source>Move Down (Ctrl+Down)</source>
-        <translation type="obsolete">Mugitu Behera (Ktrl+Behera)</translation>
+        <location line="+1"/>
+        <source>All virtual optical disk files (%1)</source>
+        <translation>Diska optiko birtual agiri guztiak (%1)</translation>
     </message>
     <message>
-        <source>Moves the selected USB filter down.</source>
-        <translation type="obsolete">Haututako USB iragazkia behera mugitzen du.</translation>
+        <location line="+11"/>
+        <source>Please choose a virtual floppy disk file</source>
+        <translation>Mesedez hautatu diskete diska birtual agiri bat</translation>
     </message>
     <message>
-        <source>&Enable VRDP Server</source>
-        <translation type="obsolete">&Gaitu VRDP Zerbitzaria</translation>
+        <location line="+1"/>
+        <source>All virtual floppy disk files (%1)</source>
+        <translation>Disketa birtual agiri guztiak (%1)</translation>
     </message>
     <message>
-        <source>Defines the VRDP authentication method.</source>
-        <translation type="obsolete">VRDP autentifikazio metodoa ezartzen du.</translation>
+        <location line="+1967"/>
+        <source>VDI (VirtualBox Disk Image)</source>
+        <translation>VDI (VirtualBox Diska Irudia)</translation>
     </message>
     <message>
-        <source>Specifies the timeout for guest authentication, in milliseconds.</source>
-        <translation type="obsolete">Bezero autentifikazioen denbora-muga ezartzen du, milisegundotan.</translation>
+        <location line="+2"/>
+        <source>VMDK (Virtual Machine Disk)</source>
+        <translation>VMDK (Makina Birtual Diska)</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="obsolete">Laguntza</translation>
+        <location line="+2"/>
+        <source>VHD (Virtual Hard Disk)</source>
+        <translation>VHD (Diska Gogor Birtuala)</translation>
     </message>
     <message>
-        <source>F1</source>
-        <translation type="obsolete">F1</translation>
+        <location line="+2"/>
+        <source>HDD (Parallels Hard Disk)</source>
+        <translation>HDD (Diska Gogor Kidetuak)</translation>
     </message>
     <message>
-        <source>Holds the dialog help.</source>
-        <translation type="obsolete">Leiho laguntza erakusten du.</translation>
+        <location line="+2"/>
+        <source>QED (QEMU enhanced disk)</source>
+        <translation>QED (QEMU diska hobetua)</translation>
     </message>
     <message>
-        <source>Invalid settings detected</source>
-        <translation type="obsolete">Okerreko ezarpena atzeman da</translation>
+        <location line="+2"/>
+        <source>QCOW (QEMU Copy-On-Write)</source>
+        <translation>QCOW (QEMU Kopiatu-Eta-Idatzi)</translation>
     </message>
     <message>
-        <source>&OK</source>
-        <translation type="obsolete">Ad&os</translation>
+        <source>Please choose a location for new virtual hard drive file</source>
+        <translation type="obsolete">Mesedez hautatu diska gogor birtual agiri berriarentzako kokaleku bat</translation>
     </message>
     <message>
-        <source>Alt+O</source>
-        <translation type="obsolete">Alt O</translation>
+        <location filename="../src/wizards/newvd/UIWizardNewVDPageBasic3.cpp" line="-275"/>
+        <source>Please choose a location for new virtual hard disk file</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>VBoxGlobalSettings</name>
     <message>
-        <source>Accepts (saves) changes and closes the dialog.</source>
-        <translation type="obsolete">Onartu (gorde) aldaketak eta elkarrizketa ixten du.</translation>
+        <location filename="../src/VBoxGlobalSettings.cpp" line="+267"/>
+        <source>The value '%1' of the key '%2' doesn't match the regexp constraint '%3'.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Utzi</translation>
+        <location line="-9"/>
+        <source>Cannot delete the key '%1'.</source>
+        <translation>Ezin da '%1' tekla ezabatu.</translation>
     </message>
     <message>
-        <source>Cancels changes and closes the dialog.</source>
-        <translation type="obsolete">Aldaketak baztertu eta leihoa ixten du.</translation>
+        <location line="-124"/>
+        <source>'%1' is an invalid host-combination code-sequence.</source>
+        <translation>'%1' hostalari-konbinazio kode-sekuentzia baliogabe bat da.</translation>
     </message>
+</context>
+<context>
+    <name>VBoxLicenseViewer</name>
     <message>
-        <source>When checked, attaches the specified virtual hard disk to the Master slot of the Primary IDE controller.</source>
-        <translation type="obsolete">Markaturik dagoenean, ezarritako disko gogor birtuala lehenengo IDE kontrolatzailearen ataka nagusian erantsiko da.</translation>
+        <location filename="../src/VBoxLicenseViewer.cpp" line="+96"/>
+        <source>VirtualBox License</source>
+        <translation>VirtualBox Baimena</translation>
     </message>
     <message>
-        <source>When checked, attaches the specified virtual hard disk to the Slave slot of the Primary IDE controller.</source>
-        <translation type="obsolete">Markaturik dagoenean, ezarritako disko gogor birtuala lehenengo IDE kontrolatzailearen ataka morroian erantsiko da.</translation>
+        <location line="+2"/>
+        <source>I &Agree</source>
+        <translation>&Onartzen dut</translation>
     </message>
     <message>
-        <source>When checked, attaches the specified virtual hard disk to the Slave slot of the Secondary IDE controller.</source>
-        <translation type="obsolete">Markaturik dagoenean, ezarritako disko gogor birtuala bigarren IDE kontrolatzailearen ataka morroian erantsiko da.</translation>
+        <location line="+1"/>
+        <source>I &Disagree</source>
+        <translation>&Ez dut Onartzen</translation>
     </message>
+</context>
+<context>
+    <name>VBoxMediaManagerDlg</name>
     <message>
-        <source>Holds the virtual hard disk to attach to this IDE slot and allows to quickly select a different hard disk.</source>
-        <translation type="obsolete">IDE ataka honetan erantsiriko disko gogor birtuala erakusten du eta beste disko bat bizkor hautatzeko aukera ematen du.</translation>
+        <location filename="../src/medium/UIMediumManager.cpp" line="-51"/>
+        <source>&Actions</source>
+        <translation>&Ekintzak</translation>
     </message>
     <message>
-        <source>When checked, mounts the specified media to the CD/DVD drive of the virtual machine. Note that the CD/DVD drive is always connected to the Secondary Master IDE controller of the machine.</source>
-        <translation type="obsolete">Markaturik dagoenean, ezarritako euskarria makina birtualeko CD/DVD gailuan muntatzen du. Kontutan izan CD/DVD gailua beti bigarren IDE kontrolagailuaren ataka nagusian konektaturik dagoela.</translation>
+        <source>&New...</source>
+        <translation type="obsolete">&Berria...</translation>
     </message>
     <message>
-        <source>Holds the image file to mount to the virtual CD/DVD drive and allows to quickly select a different image.</source>
-        <translation type="obsolete">CD/DVD gailu birtualean muntatu behar den irudi fitxategia erakusten du eta beste irudi bat bizkor hautatzeko aukera ematen du.</translation>
+        <source>&Add...</source>
+        <translation type="obsolete">&Gehitu...</translation>
     </message>
     <message>
-        <source>When checked, mounts the specified media to the Floppy drive of the virtual machine.</source>
-        <translation type="obsolete">Markaturik dagoenean, ezarritako euskarria makina birtualeko diskete gailuan muntatzen du.</translation>
+        <location line="+17"/>
+        <source>R&emove</source>
+        <translation>&Kendu</translation>
     </message>
     <message>
-        <source>Holds the image file to mount to the virtual Floppy drive and allows to quickly select a different image.</source>
-        <translation type="obsolete">Diskete gailu birtualean muntatu behar den irudi fitxategia erakusten du eta beste irudi bat bizkor hautatzeko aukera ematen du.</translation>
+        <location line="+6"/>
+        <source>Re&lease</source>
+        <translation>&Argitaratu</translation>
     </message>
     <message>
-        <source>When checked, a virtual PCI audio card will be plugged into the virtual machine and will communicate with the host audio system using the specified driver.</source>
-        <translation type="obsolete">Markaturik dagoenean, PCI audio txartel birtuala makina birtualean erantsirik dago eta ezarritako kontrolatzailea erabiliko ostalariaren audio txartelarekin harremanetan jartzeko.</translation>
+        <location line="+6"/>
+        <source>Re&fresh</source>
+        <translation>&Berritu</translation>
     </message>
     <message>
-        <source>When checked, the VM will act as a Remote Desktop Protocol (RDP) server, allowing remote clients to connect and operate the VM (when it is running) using a standard RDP client.</source>
-        <translation type="obsolete">Markaturik dagoenean, makina birtuala Urruneko Idazmahai Protokolo (RDP) zerbitzari birtuala gaituko du, bezeroei makina birtualera (martxan dagoenean) RDP bezero estandar bat erabiliaz konektatzeko aukera emanez.</translation>
+        <location line="+85"/>
+        <source>Checking accessibility</source>
+        <translation>Sarbidetasuna egiaztatzen</translation>
     </message>
     <message>
-        <source><qt>%1&nbsp;MB</qt></source>
-        <translation type="obsolete"><qt>%1&nbsp;MB</qt></translation>
+        <source>All files (*)</source>
+        <translation type="obsolete">Agiri guztiak (*)</translation>
     </message>
     <message>
-        <source><not attached></source>
-        <comment>hard disk</comment>
-        <translation type="obsolete"><ez erantsia></translation>
+        <location line="-235"/>
+        <location line="+44"/>
+        <location line="+33"/>
+        <source><i>Not&nbsp;Attached</i></source>
+        <translation><i>Not&nbsp;Erantsita</i></translation>
     </message>
     <message>
-        <source> - Settings</source>
-        <translation type="obsolete"> - Ezarpenak</translation>
+        <location line="+649"/>
+        <source>--</source>
+        <comment>no info</comment>
+        <translation>--</translation>
     </message>
     <message>
-        <source>New Filter %1</source>
-        <comment>usb</comment>
-        <translation type="obsolete">%1 Iragazki Berria</translation>
+        <location line="-609"/>
+        <source>Virtual Media Manager</source>
+        <translation>Multimedia Birtual Kudeatzailea</translation>
     </message>
     <message>
-        <source>&Shared Clipboard</source>
-        <translation type="obsolete">&Partekatutako Arbela</translation>
+        <location line="-114"/>
+        <source><i>Not&nbsp;Encrypted</i></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&napshot Folder</source>
-        <translation type="obsolete">E&goera-argazki Karpeta</translation>
+        <location line="+125"/>
+        <source>Copy an existing disk image file</source>
+        <translation>Kopiatu dagoen diska irudi agiri bat</translation>
     </message>
     <message>
-        <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-        <translation type="obsolete">Makina birtual honetan instalatzea pentsatzen duzun sistema eragilea erakusten du (sistema eragile bezeroa deiturikoa).</translation>
+        <location line="+6"/>
+        <source>Modify the attributes of the selected disk image file</source>
+        <translation>Aldatu hautaturiko diska irudi agiriaren ezaugarriak</translation>
     </message>
     <message>
-        <source><qt>When checked, the virtual machine will support
-the Advanced Configuration and Power Management Interface (ACPI). <b>Note:</b> don't disable
-this feature after having installed a Windows guest operating system!</qt></source>
-        <translation type="obsolete"><qt>Markaturik dagoenean, makina birtualak Indar Kudeaketa
-eta Konfigurazio Aurreratua (ACPI) onartuko du. <b>Oharra:</b> ez ezgaitu
-ezaugarri hau windows bezero sistema eragile bat instalatu ondoren!</qt></translation>
+        <location line="+6"/>
+        <source>Remove the selected disk image file</source>
+        <translation>Kendu hautaturiko diska irudi agiria</translation>
     </message>
     <message>
-        <source><qt>When checked, the virtual machine will support
-the Input Output APIC (I/O APIC), which may slightly decrease performance. <b>Note:</b> don't disable
-this feature after having installed a Windows guest operating system!</qt></source>
-        <translation type="obsolete"><qt>Markaturik dagoenean, makina birtualak Sarrera Irteera
-APIC (I/O APIC) onartuko du, honek makina birtualaren
-funtzionamendua asko geldotuko du.<b>Oharra:</b> ez ezgaitu
-ezaugarri hau windows bezero sistema eragile bat instalatu ondoren!</qt></translation>
+        <location line="+6"/>
+        <source>Release the selected disk image file by detaching it from the machines</source>
+        <translation>Askatu hautaturiko diska irudi agiria hura makinetatik deserantsiz</translation>
     </message>
     <message>
-        <source>Selects which clipboard data will be copied between the guest and the host OS. This feature requires Guest Additions to be installed in the guest OS.</source>
-        <translation type="obsolete">Bezero eta ostalariaren sistema eragileen arteko arbela partekatzeko modua ezartzen du. Kontutan izan honek Bezero Gehigarriak sistema eragile bezeroan instalaturik egotea behar duela.</translation>
+        <location line="+6"/>
+        <source>Refresh the list of disk image files</source>
+        <translation>Berritu diska irudi agiri zerrenda</translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of disk space.</source>
-        <translation type="obsolete">Makina birtual honen egoera-argazkiak gordeko diren bidea erakusten du. Kontutan izan egoera-argazkiek disko leku asko erabili dezaketela.</translation>
+        <location line="+27"/>
+        <location line="+25"/>
+        <location line="+16"/>
+        <source>Name</source>
+        <translation>Izena</translation>
     </message>
     <message>
-        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Egoera-argazki karpeta bidea lehenetsiriko balioan berrezartzen du. Uneko lehenetsiriko bidea erakutsiko da aldaketak onartu eta leiho hau berriz irekitzean.</translation>
+        <location line="-40"/>
+        <source>Virtual Size</source>
+        <translation>Neurri Birtuala</translation>
     </message>
     <message>
-        <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
-        <translation type="obsolete">Makina birtualaren azalpena erakusten du. Azalpenen eremua instalaturiko bezero sistemaren eragileari edo konfigurazioari buruz iruzkinak egiteko da erabilgarria.</translation>
+        <location line="+1"/>
+        <source>Actual Size</source>
+        <translation>Oraingo Neurria</translation>
     </message>
     <message>
-        <source>Invokes the Virtual Disk Manager to create a new or select an existing virtual hard disk to attach.</source>
-        <translation type="obsolete">Eransteko disko gogor birtual bat sortu edo daudenen arteak aukeratzeko Disko Gogor Kudeatzaile irekitzen du.</translation>
+        <location line="+15"/>
+        <source>Encrypted with key:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists host Floppy drives available to insert to the virtual machine.</source>
-        <translation type="obsolete">Makina birtualean muntatzeko erabilgarri dauden ostalariaren diskete gailuak zerrendatzen ditu.</translation>
+        <location line="+2"/>
+        <location line="+16"/>
+        <location line="+16"/>
+        <source>UUID:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invokes the Virtual Disk Manager to select a Floppy image to mount.</source>
-        <translation type="obsolete">Disko Birtual Kudeatzailea deitzen du muntatzeko Diskete irudi bat hautatzeko.</translation>
+        <location line="-25"/>
+        <location line="+16"/>
+        <source>Size</source>
+        <translation>Neurria</translation>
     </message>
     <message>
-        <source>Lists host CD/DVD drives available to insert to the virtual machine.</source>
-        <translation type="obsolete">Makina birtualean muntatzeko erabilgarri dauden ostalariaren CD/DVD gailuak zerrendatzen ditu.</translation>
+        <location line="-35"/>
+        <source>Type:</source>
+        <translation>Mota:</translation>
     </message>
     <message>
-        <source>Invokes the Virtual Disk Manager to select a CD/DVD image to mount.</source>
-        <translation type="obsolete">Disko Birtual Kudeatzailea deitzen du muntatzeko CD/DVD irudi bat hautatzeko.</translation>
+        <location line="+2"/>
+        <location line="+22"/>
+        <location line="+16"/>
+        <source>Location:</source>
+        <translation>Kokalekua:</translation>
     </message>
     <message>
-        <source><qt>Controls the audio output driver. The <b>Null Audio Driver</b>
-makes the guest see an audio card, however every access to it will be ignored.</qt></source>
-        <translation type="obsolete"><qt>Audio irteera kontrolagailua kontrolatzen du. <b>Audio Kontrolagailu Nuluak</b>
-bezeroak audio txartela ikustea eragiten du baina sortzen duen edozein irteera baztertu egingo da.</qt></translation>
+        <location line="-36"/>
+        <source>Format:</source>
+        <translation>Heuskarria:</translation>
     </message>
     <message>
-        <source>When checked, enables the virtual USB controller of this machine.</source>
-        <translation type="obsolete">Markaturik dagoenean, makina honetako USB kontrolatzaile birtuala gaitzen du.</translation>
+        <location line="+2"/>
+        <source>Storage details:</source>
+        <translation>Biltegi xehetasunak:</translation>
     </message>
     <message>
-        <source>Lists all USB filters of this machine. The checkbox to the left defines whether the particular filter is enabled or not.</source>
-        <translation type="obsolete">Makina honetako USB iragazkiak zerrendatzen ditu. Ezkerreko aukera kutxak iragazki jakin bat gaiturik dagoen edo ez ezartzen du.</translation>
+        <location line="+2"/>
+        <location line="+18"/>
+        <location line="+16"/>
+        <source>Attached to:</source>
+        <translation>Hona Erantsita:</translation>
     </message>
     <message>
-        <source>Adds a new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="obsolete">Gehitu USB iragazki berri bat eremu guztiak hutsean dituela. Kontutan izan iragazki honek erantsiriko edoizen USB gailu aurkituko duela.</translation>
+        <location line="-102"/>
+        <source>&Copy...</source>
+        <translation>&Kopiatu...</translation>
     </message>
     <message>
-        <source>Adds a new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="obsolete">Ostalari ordenagailuari erantsitako hautatutako USB gailuaren eremu balioekin USB iragazki berri bat sortu.</translation>
+        <location line="+6"/>
+        <source>&Modify...</source>
+        <translation>&Aldatu...</translation>
     </message>
     <message>
-        <source>Adapter %1</source>
-        <comment>network</comment>
-        <translation type="obsolete">%1 Moldagailua</translation>
+        <source>Create a new virtual hard drive</source>
+        <translation type="obsolete">Sortu diska gogor birtual berri bat</translation>
     </message>
+</context>
+<context>
+    <name>VBoxMiniToolBar</name>
     <message>
-        <source>Host &Interfaces</source>
-        <translation type="obsolete">Ostalari &Interfazeak</translation>
+        <source>Always show the toolbar</source>
+        <translation type="obsolete">Betik erakutsi tresnabarra</translation>
     </message>
     <message>
-        <source>Lists all available host interfaces.</source>
-        <translation type="obsolete">Ostalari interfaze erabilgarriak zerrendatzen ditu.</translation>
+        <source>Exit Full Screen or Seamless Mode</source>
+        <translation type="obsolete">Irten Ikusleiho Osotik edo Irudizko Modutik</translation>
     </message>
     <message>
-        <source>Adds a new host interface.</source>
-        <translation type="obsolete">Ostalari interfaze berri bat gehitzen du.</translation>
+        <source>Close VM</source>
+        <translation type="obsolete">Itxi MB-a</translation>
     </message>
     <message>
-        <source>Removes the selected host interface.</source>
-        <translation type="obsolete">Hautatutako ostalari interfazea ezabatzen du.</translation>
+        <source>Minimize Window</source>
+        <translation type="obsolete">Txikiengotu Leihoa</translation>
     </message>
+</context>
+<context>
+    <name>VBoxScreenshotViewer</name>
     <message>
-        <source><No suitable interfaces></source>
-        <translation type="obsolete"><inerfaze ez erabilgarriak></translation>
+        <location filename="../src/VBoxSnapshotDetailsDlg.cpp" line="+203"/>
+        <source>Screenshot of %1 (%2)</source>
+        <translation>Ikusleiho-argazkiak %1 (%2)</translation>
     </message>
     <message>
-        <source>Add</source>
-        <translation type="obsolete">Gehitu</translation>
+        <location line="+36"/>
+        <source>Click to view non-scaled screenshot.</source>
+        <translation>Klikatu ez-neurriratutako ikusleiho-argazkia ikusteko.</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation type="obsolete">Kendu</translation>
+        <location line="+7"/>
+        <source>Click to view scaled screenshot.</source>
+        <translation>Klikatu neurriratutako ikusleiho-argazkia ikusteko.</translation>
     </message>
+</context>
+<context>
+    <name>VBoxSnapshotDetailsDlg</name>
     <message>
-        <source>VirtualBox Host Interface %1</source>
-        <translation type="obsolete">VirtualBox %1 Ostalari interfazea</translation>
+        <location line="-112"/>
+        <source>Details of %1 (%2)</source>
+        <translation>Xehetasunak %1 (%2)</translation>
     </message>
     <message>
-        <source><p>Do you want to remove the selected host network interface <nobr><b>%1</b>?</nobr></p><p><b>Note:</b> This interface may be in use by one or more network adapters of this or another VM. After it is removed, these adapters will no longer work until you correct their settings by either choosing a different interface name or a different adapter attachment type.</p></source>
-        <translation type="obsolete"><p>Hautaturiko <nobr><b>%1</b></nobr> sare interfazea ezabatu nahi al duzu? </p><p><b>Oharra:</b> Interfaze hau erabilia egon daiteke sare moldagailu bat edo gehiagorengatik beste MB batetan. Ezabatu ondoren sare moldagailu horiek ez dute funtzionatuko ezarpen horiek aldatu arte  edo beste interfaze izen bat hautatuz o moldagailu eranste modu ezberdin bat hautatuaz.</p></translation>
+        <location line="+2"/>
+        <source>Click to enlarge the screenshot.</source>
+        <translation>Klikatu ikusleiho-argazkia handitzeko.</translation>
     </message>
     <message>
-        <source>9</source>
-        <translation type="obsolete">9</translation>
+        <location filename="../src/VBoxSnapshotDetailsDlg.ui" line="+32"/>
+        <source>&Name:</source>
+        <translation>&Izena:</translation>
     </message>
     <message>
-        <source> Serial Ports </source>
-        <translation type="obsolete"> Serie Atakak </translation>
+        <location line="+39"/>
+        <source>Taken:</source>
+        <translation>Hartua:</translation>
     </message>
     <message>
-        <source>#serialPorts</source>
-        <translation type="obsolete">#serialPorts</translation>
+        <location line="+20"/>
+        <source>&Description:</source>
+        <translation>&Azalpena:</translation>
     </message>
     <message>
-        <source>Enable &VT-x/AMD-V</source>
-        <translation type="obsolete">&VT-x/AMD-V gaitu</translation>
+        <location line="+29"/>
+        <source>D&etails:</source>
+        <translation>&Xehetasunak:</translation>
     </message>
+</context>
+<context>
+    <name>VBoxSnapshotsWgt</name>
     <message>
-        <source>Alt+V</source>
-        <translation type="obsolete">Alt+V</translation>
+        <location filename="../src/selector/VBoxSnapshotsWgt.ui" line="+26"/>
+        <source>VBoxSnapshotsWgt</source>
+        <translation>VBoxArgazkiWgta</translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will try to make use of the host CPU's hardware virtualization extensions such as Intel VT-x and AMD-V. The grayed checkbox state means that this setting is determined by the value of the global setting.</source>
-        <translation type="obsolete">Markaturik dagoenean makina birtuala VT-X eta AMD-X bezalako ostalariaren CPU-aren birtualizazio hedapenak erabiltzen saiatuko da. Aukera kutxa grisean badago ezarpena hau ezarpen orokorrek ezartzen dute.</translation>
+        <location filename="../src/selector/VBoxSnapshotsWgt.cpp" line="+175"/>
+        <source>Current State (changed)</source>
+        <comment>Current State (Modified)</comment>
+        <translation>Oraingo Egoera (aldatuta)</translation>
     </message>
     <message>
-        <source>Other &Settings</source>
-        <translation type="obsolete">Beste &Ezarpenak</translation>
+        <location line="+1"/>
+        <source>Current State</source>
+        <comment>Current State (Unmodified)</comment>
+        <translation>Oraingo Egoera</translation>
     </message>
     <message>
-        <source>&Remember Media Mounted at Runtime</source>
-        <translation type="obsolete">&Gogoratu Exekutatzean Muntaturiko Euskarria</translation>
+        <location line="+2"/>
+        <source>The current state differs from the state stored in the current snapshot</source>
+        <translation>Oraingo egoera oraingo berehalakoan biltegiratutako egoeraren ezberdina da</translation>
     </message>
     <message>
-        <source>Alt+R</source>
-        <translation type="obsolete">Alt+G</translation>
+        <location line="+2"/>
+        <source>The current state is identical to the state stored in the current snapshot</source>
+        <translation>Oraingo egoera oraingo berehalakoan biltegiratutako egoeraren berdina da</translation>
     </message>
     <message>
-        <source>If checked, any CD/DVD or floppy disks inserted into or removed from the virtual drives while the machine is running will be remembered.</source>
-        <translation type="obsolete">Markaturik badago, Muntaturiko CD/DVD edo diskete euskarrietan eginiko edozein aldaketa gorde egingo da, abiarazteen artean muntaturiko medioen konfigurazioa mantentzeko.</translation>
+        <location line="+108"/>
+        <source> (current, </source>
+        <comment>Snapshot details</comment>
+        <translation> (orain, </translation>
     </message>
     <message>
-        <source>O&ther</source>
-        <translation type="obsolete">Bes&telakoak</translation>
+        <location line="+3"/>
+        <source>online)</source>
+        <comment>Snapshot details</comment>
+        <translation>online)</translation>
     </message>
     <message>
-        <source>&Enable Passthrough</source>
-        <translation type="obsolete">&Gaitu Bideratzea</translation>
+        <location line="+1"/>
+        <source>offline)</source>
+        <comment>Snapshot details</comment>
+        <translation>lineaz-kanpo)</translation>
     </message>
     <message>
-        <source>Alt+E</source>
-        <translation type="obsolete">Alt+G</translation>
+        <location line="+3"/>
+        <source>Taken at %1</source>
+        <comment>Snapshot (time)</comment>
+        <translation>Hartua %1</translation>
     </message>
     <message>
-        <source>When checked, allows the guest to send ATAPI commands directly to the host drive which makes it possible to use CD/DVD writers connected to the host inside the VM. Note that writing audio CD inside the VM is not yet supported.</source>
-        <translation type="obsolete">Markaturik dagoenean, bezeroari ATAPI komandoak zuzenean ostalariaren gailura bidaltzeko aukera ematen du, honek ostalarira konektatutako CD/DVD idazleak MB bidez erabiltzea posible egiten du. Kontutan izan audio CD-ak MB barnetik grabatzea ez dela onartzen oraindik.</translation>
+        <location line="+2"/>
+        <source>Taken on %1</source>
+        <comment>Snapshot (date + time)</comment>
+        <translation>Hartua %1</translation>
     </message>
     <message>
-        <source>&Server Port </source>
-        <translation type="obsolete">&Zerbitzari Ataka </translation>
+        <location line="+4"/>
+        <source>%1 since %2</source>
+        <comment>Current State (time or date + time)</comment>
+        <translation>%1 %2-tik</translation>
     </message>
     <message>
-        <source>Authentication &Method </source>
-        <translation type="obsolete">Autentifikazio &Metodoa </translation>
+        <location line="+193"/>
+        <source>Restore selected snapshot of the virtual machine</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication &Timeout </source>
-        <translation type="obsolete">Autentifikazio &Denbora-muga </translation>
+        <location line="+1"/>
+        <source>Delete selected snapshot of the virtual machine</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><qt>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero) to reset the port to the default value.</qt></source>
-        <translation type="obsolete"><qt>VRDP zerbitzariaren ataka zenbakia erakusten du. <tt>0</tt> (zero) ezarri ezazu ataka lehenetsiriko baliora berrezartzeko</qt></translation>
+        <location line="+1"/>
+        <source>Display a window with selected snapshot details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Primary Master hard disk is not selected</source>
-        <translation type="obsolete">Lehen Mailako disko gogor nagusia ez dago hautatua</translation>
+        <location line="+2"/>
+        <source>Clone selected virtual machine</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Primary Slave hard disk is not selected</source>
-        <translation type="obsolete">Lehen Mailako disko gogor morroia ez dago hautatua</translation>
+        <location line="+363"/>
+        <source>Snapshot %1</source>
+        <translation>Berehalakoa %1</translation>
     </message>
     <message>
-        <source>Primary Slave hard disk is already attached to a different slot</source>
-        <translation type="obsolete">Lehen Mailako disko gogor morroia dagoeneko beste ataka batetan konektaturik dago</translation>
+        <location line="-370"/>
+        <source>Take &Snapshot</source>
+        <translation>Hartu &Berehalakoa</translation>
     </message>
     <message>
-        <source>Secondary Slave hard disk is not selected</source>
-        <translation type="obsolete">Bigarren Mailako disko gogor morroia ez dago hautatua</translation>
+        <location line="-1"/>
+        <source>S&how Details</source>
+        <translation>&Erakutsi Xehetasunak</translation>
     </message>
     <message>
-        <source>Secondary Slave hard disk is already attached to a different slot</source>
-        <translation type="obsolete">Bigarren Mailako disko gogor morroia dagoeneko beste ataka batetan konektaturik dago</translation>
+        <location line="+7"/>
+        <source>Take a snapshot of the current virtual machine state</source>
+        <translation>Hautu oraingo makina birtualaren egoera argazki bat</translation>
     </message>
     <message>
-        <source>CD/DVD image file is not selected</source>
-        <translation type="obsolete">CD/DVD irudi fitxategia ez dago hautatuta</translation>
+        <source>Show the details of the selected snapshot</source>
+        <translation type="obsolete">Erakutsi hautaturiko berehalakoaren xehetasunak</translation>
     </message>
     <message>
-        <source>Floppy image file is not selected</source>
-        <translation type="obsolete">Diskete irudi fitxategia ez dago hautatuta</translation>
+        <location line="-269"/>
+        <source> (%1)</source>
+        <translation> (%1)</translation>
     </message>
     <message>
-        <source>Incorrect host network interface is selected</source>
-        <translation type="obsolete">Ostalari sare interfaze okerra hautatu da</translation>
+        <location line="+260"/>
+        <source>&Restore Snapshot</source>
+        <translation>&Leheneratu Berehalakoa</translation>
     </message>
     <message>
-        <source>Duplicate port number selected </source>
-        <translation type="obsolete">Bikoizturiko ataka zenbakia hautatu da </translation>
+        <location line="+1"/>
+        <source>&Delete Snapshot</source>
+        <translation>E&zabatu Berehalakoa</translation>
     </message>
     <message>
-        <source>Duplicate port path entered </source>
-        <translation type="obsolete">Bikoizturiko ataka bidea idatzi da </translation>
+        <source>Restore the selected snapshot of the virtual machine</source>
+        <translation type="obsolete">Leheneratu hautaturiko makina birtualaren berehalakoa</translation>
     </message>
     <message>
-        <source>%1 on the <b>%2</b> page.</source>
-        <translation type="obsolete">%1 <b>%2</b> orrialdean.</translation>
+        <source>Delete the selected snapshot of the virtual machine</source>
+        <translation type="obsolete">Ezabatu hautaturiko makina birtualaren berehalakoa</translation>
     </message>
     <message>
-        <source>Port %1</source>
-        <comment>serial ports</comment>
-        <translation type="obsolete">%1 Ataka</translation>
+        <location line="-256"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <location line="+5"/>
+        <source> (%1 ago)</source>
+        <translation> (duela %1)</translation>
     </message>
     <message>
-        <source>00</source>
-        <translation type="obsolete">00</translation>
+        <location line="+244"/>
+        <source>&Clone...</source>
+        <translation>&Klonatu...</translation>
     </message>
     <message>
-        <source>01</source>
-        <translation type="obsolete">01</translation>
+        <source>Clone the selected virtual machine</source>
+        <translation type="obsolete">Klonatu hautaturiko makina birtuala</translation>
     </message>
+</context>
+<context>
+    <name>VBoxTakeSnapshotDlg</name>
     <message>
-        <source>02</source>
-        <translation type="obsolete">02</translation>
+        <location filename="../src/VBoxTakeSnapshotDlg.ui" line="+26"/>
+        <source>Take Snapshot of Virtual Machine</source>
+        <translation>Hartu Makina Birtualaren Argazki bat</translation>
     </message>
     <message>
-        <source>03</source>
-        <translation type="obsolete">03</translation>
+        <location line="+41"/>
+        <source>Snapshot &Name</source>
+        <translation>Berehalako &Izena</translation>
     </message>
     <message>
-        <source>04</source>
-        <translation type="obsolete">04</translation>
+        <location line="+20"/>
+        <source>Snapshot &Description</source>
+        <translation>Argazki &Azalpena</translation>
     </message>
-    <message>
-        <source>05</source>
-        <translation type="obsolete">05</translation>
+    <message numerus="yes">
+        <location filename="../src/VBoxTakeSnapshotDlg.cpp" line="+72"/>
+        <source>Warning: You are taking a snapshot of a running machine which has %n immutable image(s) attached to it. As long as you are working from this snapshot the immutable image(s) will not be reset to avoid loss of data.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>08</source>
-        <translation type="obsolete">08</translation>
+        <location filename="../src/runtime/UIMachineLogic.cpp" line="-221"/>
+        <source>Snapshot %1</source>
+        <translation type="unfinished">Berehalakoa %1</translation>
     </message>
+</context>
+<context>
+    <name>VBoxUSBMenu</name>
     <message>
-        <source>10</source>
-        <translation type="obsolete">10</translation>
+        <location filename="../src/settings/machine/UIMachineSettingsUSB.cpp" line="-764"/>
+        <source><no devices available></source>
+        <comment>USB devices</comment>
+        <translation><ez dago gailurik eskuragarri></translation>
     </message>
     <message>
-        <source>09</source>
-        <translation type="obsolete">09</translation>
+        <location line="+2"/>
+        <source>No supported devices connected to the host PC</source>
+        <comment>USB device tooltip</comment>
+        <translation>Ez dago sostengaturiko gailurik hostalari PG-ra elkarketaturik</translation>
     </message>
+</context>
+<context>
+    <name>VBoxVMInformationDlg</name>
     <message>
-        <source>06</source>
-        <translation type="obsolete">06</translation>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Saio Argibideak</translation>
     </message>
     <message>
-        <source>07</source>
-        <translation type="obsolete">07</translation>
+        <source>&Details</source>
+        <translation type="obsolete">&Xehetasunak</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation type="obsolete">Orokorra</translation>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Runtime</translation>
     </message>
     <message>
-        <source>Hard Disks</source>
-        <translation type="obsolete">Disko Gogorrak</translation>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">DMA Eskualdaketak</translation>
     </message>
     <message>
-        <source>CD/DVD</source>
-        <translation type="obsolete">CD/DVD</translation>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">PIO Eskualdaketak</translation>
     </message>
     <message>
-        <source>Floppy</source>
-        <translation type="obsolete">Disketea</translation>
+        <source>Data Read</source>
+        <translation type="obsolete">Datu Irakurrita</translation>
     </message>
     <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audioa</translation>
+        <source>Data Written</source>
+        <translation type="obsolete">Datu Idatzita</translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Sarea</translation>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Datu Igorrita</translation>
     </message>
     <message>
-        <source>Serial Ports</source>
-        <translation type="obsolete">Serie Atakak</translation>
+        <source>Data Received</source>
+        <translation type="obsolete">Datu Jasota</translation>
     </message>
     <message>
-        <source>USB</source>
-        <translation type="obsolete">USB</translation>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Runtime Ezaugarriak</translation>
     </message>
     <message>
-        <source>Shared Folders</source>
-        <translation type="obsolete">Partekatutako Karpetak</translation>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Ikusleiho Bereizmena</translation>
     </message>
     <message>
-        <source>Remote Display</source>
-        <translation type="obsolete">Huruneko Pantaila</translation>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Ez da Atzeman</translation>
     </message>
-</context>
-<context>
-    <name>VBoxVMSettingsFD</name>
     <message>
-        <source>Floppy image file is not selected</source>
-        <translation type="obsolete">Diskete irudi fitxategia ez dago hautatuta</translation>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Ez da Atzeman</translation>
     </message>
     <message>
-        <source>When checked, mounts the specified media to the Floppy drive of the virtual machine.</source>
-        <translation type="obsolete">Markaturik dagoenean, ezarritako euskarria makina birtualeko diskete gailuan muntatzen du.</translation>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Gonbidatu Gehigarriak</translation>
     </message>
     <message>
-        <source>&Mount Floppy Drive</source>
-        <translation type="obsolete">&Muntatu Diskete Gailua</translation>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Gonbidatu SE Mota</translation>
     </message>
     <message>
-        <source>Mounts the specified host Floppy drive to the virtual Floppy drive.</source>
-        <translation type="obsolete">Hautatutako ostalari diekete gailua muntatu Diskete gailu birtualean.</translation>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Ez dago Sare Egokitzailerik</translation>
     </message>
     <message>
-        <source>Host Floppy &Drive</source>
-        <translation type="obsolete">Ostalari Diskete &Gailua</translation>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBox-MB-Argibide-Elkarrizketa</translation>
     </message>
     <message>
-        <source>Lists host Floppy drives available to insert to the virtual machine.</source>
-        <translation type="obsolete">Makina birtualean muntatzeko erabilgarri dauden ostalariaren diskete gailuak zerrendatzen ditu.</translation>
+        <source>Configuration &Details</source>
+        <translation type="obsolete">Itxurapen &Xehetasunak</translation>
     </message>
     <message>
-        <source>Mounts the specified Floppy image to the virtual Floppy drive.</source>
-        <translation type="obsolete">Muntatu hautatutako diskete irudia diskete gailu birtualean.</translation>
+        <source>&Runtime Information</source>
+        <translation type="obsolete">&Runtime Argibideak</translation>
     </message>
     <message>
-        <source>Holds the image file to mount to the virtual Floppy drive and allows to quickly select a different image.</source>
-        <translation type="obsolete">Diskete gailu birtualean muntatu behar den irudi fitxategia erakusten du eta beste irudi bat bizkor hautatzeko aukera ematen du.</translation>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Biltegi Estatistikak</translation>
     </message>
     <message>
-        <source>Invokes the Virtual Disk Manager to select a Floppy image to mount.</source>
-        <translation type="obsolete">Disko Birtual Kudeatzailea deitzen du muntatzeko Diskete irudi bat hautatzeko.</translation>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Ez dago Biltegi Gailurik</translation>
     </message>
-</context>
-<context>
-    <name>VBoxVMSettingsVRDP</name>
     <message>
-        <source>When checked, the VM will act as a Remote Desktop Protocol (RDP) server, allowing remote clients to connect and operate the VM (when it is running) using a standard RDP client.</source>
-        <translation type="obsolete">Markaturik dagoenean, makina birtuala Urruneko Idazmahai Protokolo (RDP) zerbitzari birtuala gaituko du, bezeroei makina birtualera (martxan dagoenean) RDP bezero estandar bat erabiliaz konektatzeko aukera emanez.</translation>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Sare Estatistikak</translation>
     </message>
     <message>
-        <source>&Enable VRDP Server</source>
-        <translation type="obsolete">&Gaitu VRDP Zerbitzaria</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Ez dago Eskuragarri</translation>
     </message>
     <message>
-        <source>Defines the VRDP authentication method.</source>
-        <translation type="obsolete">VRDP autentifikazio metodoa ezartzen du.</translation>
+        <source>Clipboard Mode</source>
+        <translation type="obsolete">Gako Modua</translation>
     </message>
     <message>
-        <source>Specifies the timeout for guest authentication, in milliseconds.</source>
-        <translation type="obsolete">Bezero autentifikazioen denbora-muga ezartzen du, milisegundotan.</translation>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">Arrastatu-eta-Askatu Modua</translation>
     </message>
 </context>
 </TS>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
index 4cafb59..55c2de1 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
@@ -220,7 +220,7 @@
         <translation>ایجاد یک ضبط وضعیت ماشین مجازی</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">نمایش پنجره اطلاعات جلسه</translation>
     </message>
     <message>
@@ -292,11 +292,11 @@
         <translation type="obsolete">ایجاد یا ویرایش پوشه های اشتراکی</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">نصب افزون&ه مهمان...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation>نصب افزون&ه مهمان...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">بارگیری ایمیج نصب افزونه مهمان</translation>
     </message>
     <message>
@@ -702,120 +702,127 @@
         <translation type="obsolete">کشیدن 'و' رهاکردن</translation>
     </message>
     <message>
+        <source>Save the machine state of the virtual machine</source>
+        <translation type="obsolete">ذخیره وضعیت ماشین ِ،ماشین مجازی</translation>
+    </message>
+    <message>
         <source>Power off the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>قطع برق ماشین مجازی</translation>
     </message>
     <message>
         <source>&Network Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&تنظیمات شبکه...</translation>
     </message>
     <message>
         <source>&Shared Folders Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>تنظیمات پوشه های &اشتراکی...</translation>
     </message>
     <message>
         <source>R&emote Display</source>
-        <translation type="unfinished"></translation>
+        <translation>&نمایش ریموت</translation>
+    </message>
+    <message>
+        <source>Toggle remote desktop (RDP) connections to this machine</source>
+        <translation type="obsolete">ضامن ارتباطات ریموت دسکتاپ (RDP) به این ماشین</translation>
     </message>
     <message>
         <source>&Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>&ضبط ویدئو</translation>
+    </message>
+    <message>
+        <source>Toggle video capture</source>
+        <translation type="obsolete">ضامن ضبط ویدیو</translation>
     </message>
     <message>
         <source>&Video Capture Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&تنظیمات ضبط ویدئو...</translation>
     </message>
     <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
+        <source>Configure video capture settings</source>
+        <translation type="obsolete">پیکربندی تنظیمات ضبط ویدئو</translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
+        <source>&Logging...</source>
+        <comment>debug action</comment>
+        <translation type="obsolete">&وقایع نگاری...</translation>
     </message>
     <message>
-        <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <source>Popup Menu</source>
+        <translation>منوی پرشی</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <comment>new</comment>
+        <translation type="obsolete">نصب افزون&ه مهمان...</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">بارگیری ایمیج نصب افزونه مهمان</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&Webcams</source>
+        <translation>&وب کم ها</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">شبکه</translation>
     </message>
     <message>
-        <source>&Status Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&فایل</translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">شبکه</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">اولو&یت ها...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">نمایش و&قایع...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&فایل</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -835,175 +842,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">اولو&یت ها...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
+        <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
+        <source>&Hard Disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
+        <source>&USB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">نمایش و&قایع...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1042,10 +1049,18 @@
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">وب کمی متصل نشده است</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
+        <translation type="unfinished">وب کم پشتیبانی شده ای به رایانه میزبان متصل نشده است</translation>
+    </message>
+    <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1065,7 +1080,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1073,7 +1088,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1097,15 +1112,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1117,11 +1144,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1129,7 +1156,7 @@
         <translation type="unfinished">تازه& کردن</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1173,15 +1200,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1190,27 +1217,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1232,6 +1240,17 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -2028,7 +2047,7 @@
     <message>
         <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
         <comment>details (network)</comment>
-        <translation>درایور کلی، '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation type="obsolete">درایور کلی، '%1' {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -2048,31 +2067,31 @@
     <message>
         <source>Video Capture File</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>فیل ضبط ویدیو</translation>
     </message>
     <message>
         <source>Video Capture Attributes</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>صفات ضبط ویدیو</translation>
     </message>
     <message>
         <source>Video Capture</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>ضبط ویدیو</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished">غیرفعال شده</translation>
+        <translation>غیرفعال شده</translation>
     </message>
     <message>
         <source>NAT Network, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>شبکه NAT، '%1'</translation>
     </message>
     <message>
         <source>Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>اندازه فریم: %1x%2, نرخ فریم: %3فریم بر ثانیه, نرخ بیت: %4کیلوبایت بر ثانیه</translation>
     </message>
     <message>
         <source>Minimal Paravirtualization</source>
@@ -2090,19 +2109,64 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <translation type="unfinished">فعال شده</translation>
+    </message>
+    <message>
         <source>[Optical Drive]</source>
         <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>USB Controller</source>
         <comment>details (usb)</comment>
         <translation type="unfinished">کنترلر یو اِس بی</translation>
     </message>
     <message>
+        <source>Menu-bar</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Enabled</source>
-        <comment>details (user interface/Unscaled HiDPI Video Output)</comment>
-        <translation type="obsolete">فعال شده</translation>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">فعال شده</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">غیرفعال شده</translation>
+    </message>
+    <message>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>details (user interface/status-bar)</comment>
+        <translation type="unfinished">فعال شده</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
+        <translation type="unfinished">غیرفعال شده</translation>
     </message>
     <message>
         <source>Mini-toolbar Position</source>
@@ -2129,51 +2193,6 @@
         <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished">غیرفعال شده</translation>
     </message>
-    <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
-        <translation type="unfinished">فعال شده</translation>
-    </message>
-    <message>
-        <source>Menu-bar</source>
-        <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">فعال شده</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">غیرفعال شده</translation>
-    </message>
-    <message>
-        <source>Status-bar</source>
-        <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished">فعال شده</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished">غیرفعال شده</translation>
-    </message>
 </context>
 <context>
     <name>UIGMachinePreview</name>
@@ -2320,7 +2339,7 @@
     </message>
     <message>
         <source>&Extension Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>&بسته افزونه</translation>
     </message>
     <message>
         <source>Add Package</source>
@@ -2378,8 +2397,28 @@
         <translation type="obsolete">غیر&فعالسازی محافظ صفحه نمایش میزبان</translation>
     </message>
     <message>
+        <source>&Dock and Menubar:</source>
+        <translation type="obsolete">&داک و نوار منو:</translation>
+    </message>
+    <message>
+        <source>Auto-Show in Fullscreen</source>
+        <translation type="obsolete">نمایش خودکار در تمام صفحه</translation>
+    </message>
+    <message>
+        <source>When checked, the host dock and menu bar will be shown when the virtual machine is in fullscreen mode.</source>
+        <translation type="obsolete">وقتیکه انتخاب شده،داک میزبان و نوار منو وقتیکه ماشین در حالت تمام صفحه است نشان داده خواهد شد.</translation>
+    </message>
+    <message>
+        <source>&Host Screensaver:</source>
+        <translation type="obsolete">محافظ صفحه نمایش میزبان&:</translation>
+    </message>
+    <message>
         <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
-        <translation type="unfinished"></translation>
+        <translation>وقتیکه انتخاب شده،محافظ صفحه نمایش میزبان هرگاه ماشین مجازی در اجرا هست غیرفعال خواهد شد.</translation>
+    </message>
+    <message>
+        <source>Disable When Running Virtual Machines</source>
+        <translation type="obsolete">زمانیکه در حال اجرای ماشین های مجازی هست غیرفعال کن</translation>
     </message>
     <message>
         <source>Host Screensaver:</source>
@@ -2418,19 +2457,27 @@
     </message>
     <message>
         <source>Host Key Combination</source>
-        <translation type="unfinished"></translation>
+        <translation>کلید ترکیبی میزبان</translation>
     </message>
     <message>
         <source>Some items have the same shortcuts assigned.</source>
-        <translation type="unfinished"></translation>
+        <translation>به برخی از موارد همین کلید های میانبر اختصاص یافته است.</translation>
     </message>
     <message>
         <source>&VirtualBox Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>مدیر &ویرچوال باکس</translation>
     </message>
     <message>
         <source>Virtual &Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>&ماشین مجازی</translation>
+    </message>
+    <message>
+        <source>Lists all the available shortcuts which can be configured.</source>
+        <translation type="obsolete">لیست همه میانبرهای موجود که میتواند پیکربندی شود.</translation>
+    </message>
+    <message>
+        <source>Enter a sequence to filter the shortcut list.</source>
+        <translation type="obsolete">یک دنباله برای فیلتر لیست میانبر وارد کنید</translation>
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
@@ -2497,7 +2544,7 @@
     </message>
     <message>
         <source>&Interface Languages</source>
-        <translation type="unfinished"></translation>
+        <translation>&رابط زبان</translation>
     </message>
 </context>
 <context>
@@ -2528,7 +2575,7 @@
     </message>
     <message>
         <source>DHCP upper address bound of <b>%1</b> is wrong</source>
-        <translation type="obsolete">محدوده آدرس بالاتر تر DHCP <b>%1</b> اشتباه است</translation>
+        <translation type="obsolete">محدوده آدرس بالاتر DHCP <b>%1</b> اشتباه است</translation>
     </message>
     <message>
         <source>Adapter</source>
@@ -2640,116 +2687,128 @@
     </message>
     <message>
         <source>&NAT Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>&شبکه های NAT</translation>
     </message>
     <message>
         <source>Lists all available NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>لیست تمام شبکه های NAT .</translation>
     </message>
     <message>
         <source>&Host-only Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>شبکه های& فقط-میزبان</translation>
     </message>
     <message>
         <source>No new name specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>هیچ نام جدیدی برای شبکه NAT که قبلا <b>%1</b> نامیده می شد تعیین نشده است.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>هیچ CIDR برای شبکه NAT  <b>%1</b> تعیین نشده است.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>هیچ CIDR برای شبکه NAT که قبلا <b>%1</b> نامیده میشد تعیین نشده است.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>مقدار CIDR نامعتبر (<i>%1</i>) برای شبکه the <b>%2</b> تعیین شده است.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>مقدار CIDR نامعتبر (<i>%1</i>) برای شبکه NAT که قبلا <b>%2</b> نامیده می شد تعیین شده است.</translation>
     </message>
     <message>
         <source>Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>نام شبکه</translation>
     </message>
     <message>
         <source>[empty]</source>
-        <translation type="unfinished"></translation>
+        <translation>[خالی]</translation>
     </message>
     <message>
         <source>%1 (renamed from %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (تغییرنام داد به %2)</translation>
     </message>
     <message>
         <source>Old Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>نام قدیمی شبکه</translation>
     </message>
     <message>
         <source>New Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>نام جدید شبکه</translation>
     </message>
     <message>
         <source>Network CIDR</source>
-        <translation type="unfinished"></translation>
+        <translation>شبکه CIDR</translation>
     </message>
     <message>
         <source>Supports DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>پشتیبانی از DHCP</translation>
     </message>
     <message>
         <source>yes</source>
-        <translation type="unfinished"></translation>
+        <translation>بله</translation>
     </message>
     <message>
         <source>no</source>
-        <translation type="unfinished"></translation>
+        <translation>خیر</translation>
     </message>
     <message>
         <source>Supports IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>پشتیبانی از IPv6</translation>
     </message>
     <message>
         <source>Default IPv6 route</source>
-        <translation type="unfinished"></translation>
+        <translation>مسیر پیش فرض IPv6</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>رابط میزبان <b>%1</b> اکنون آدرس IPv4 معتبر ندارد.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 network mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>رابط میزبان <b>%1</b> اکنون مسک شبکه IPv4 معتبر ندارد.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv6 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>رابط میزبان <b>%1</b> اکنون آدرس IPv6 معتبر ندارد.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>رابط میزبان <b>%1</b> اکنون آدرس سرور DHCP معتبر ندارد.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>رابط میزبان <b>%1</b> اکنون سرور ماسک DHCP معتبر ندارد.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server lower address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>رابط میزبان <b>%1</b> محدوده آدرس سرور پایین تر DHCP معتبر ندارد.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server upper address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>رابط میزبان <b>%1</b> محدوده آدرس بالاتر سرور DHCP معتبر ندارد.</translation>
     </message>
     <message>
         <source>The name <b>%1</b> is being used for several NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>نام <b>%1</b> درحال استفاده برای چندین شبکه NAT میباشد.</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>NAT network</comment>
-        <translation type="unfinished">فعال</translation>
+        <translation>فعال</translation>
+    </message>
+    <message>
+        <source>&Add NAT network</source>
+        <translation type="obsolete">&افزودن شبکه NAT</translation>
+    </message>
+    <message>
+        <source>&Remove NAT network</source>
+        <translation type="obsolete">&حذف شبکه NAT</translation>
+    </message>
+    <message>
+        <source>&Edit NAT network</source>
+        <translation type="obsolete">&ویرایش شبکه NAT</translation>
     </message>
     <message>
         <source>Add NAT Network</source>
@@ -2899,15 +2958,15 @@
     <name>UIGlobalSettingsNetworkDetailsHost</name>
     <message>
         <source>Host-only Network Details</source>
-        <translation type="unfinished">جزئیات شبکه فقط-میزبان</translation>
+        <translation>جزئیات شبکه فقط-میزبان</translation>
     </message>
     <message>
         <source>&Adapter</source>
-        <translation type="unfinished">&آداپتور</translation>
+        <translation>&آداپتور</translation>
     </message>
     <message>
         <source>Manual &Configuration</source>
-        <translation type="unfinished">پیکربندی &دستی</translation>
+        <translation>پیکربندی &دستی</translation>
     </message>
     <message>
         <source>Use manual configuration for this host-only network adapter.</source>
@@ -2915,43 +2974,43 @@
     </message>
     <message>
         <source>&IPv4 Address:</source>
-        <translation type="unfinished">آد&رس IPv4:</translation>
+        <translation>آد&رس IPv4:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 address for this adapter.</source>
-        <translation type="unfinished">آدرس میزبان IPv4 برای این آداپتور نشان میدهد.</translation>
+        <translation>آدرس میزبان IPv4 برای این آداپتور نشان میدهد.</translation>
     </message>
     <message>
         <source>IPv4 Network &Mask:</source>
-        <translation type="unfinished">ماسک ش&بکه IPv4:</translation>
+        <translation>ماسک ش&بکه IPv4:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 network mask for this adapter.</source>
-        <translation type="unfinished">ماسک شبکه میزبان IPv4 برای این آداپتور نشان میدهد.</translation>
+        <translation>ماسک شبکه میزبان IPv4 برای این آداپتور نشان میدهد.</translation>
     </message>
     <message>
         <source>I&Pv6 Address:</source>
-        <translation type="unfinished">آدرس I&Pv6:</translation>
+        <translation>آدرس I&Pv6:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">آدرس میزبان IPv6 برای این آداپتور اگر IPv6 پشتیبانی شده باشد را نشان میدهد.</translation>
+        <translation>آدرس میزبان IPv6 برای این آداپتور اگر IPv6 پشتیبانی شده باشد را نشان میدهد.</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &Length:</source>
-        <translation type="unfinished">طول ماسک ش&بکه IPv6:</translation>
+        <translation>طول ماسک ش&بکه IPv6:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">طول پیشوند ماسک شبکه میزبان IPv6 برای این آداپتور اگر  IPv6 پشتیبانی شده باشد را نشان میدهد.</translation>
+        <translation>طول پیشوند ماسک شبکه میزبان IPv6 برای این آداپتور اگر  IPv6 پشتیبانی شده باشد را نشان میدهد.</translation>
     </message>
     <message>
         <source>&DHCP Server</source>
-        <translation type="unfinished">سر&ور DHCP</translation>
+        <translation>سر&ور DHCP</translation>
     </message>
     <message>
         <source>&Enable Server</source>
-        <translation type="unfinished">فعالسازی &سرور</translation>
+        <translation>فعالسازی &سرور</translation>
     </message>
     <message>
         <source>Indicates whether the DHCP Server is enabled on machine startup or not.</source>
@@ -2959,42 +3018,42 @@
     </message>
     <message>
         <source>Server Add&ress:</source>
-        <translation type="unfinished">آدرس سرور&:</translation>
+        <translation>آدرس سرور&:</translation>
     </message>
     <message>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">آدرس سرور دی اِچ سی پی خدماتی شبکه وابسته سازی شده با آداپتور فقط-میزبان را نشان میدهد.</translation>
+        <translation>آدرس سرور دی اِچ سی پی خدماتی شبکه وابسته سازی شده با آداپتور فقط-میزبان را نشان میدهد.</translation>
     </message>
     <message>
         <source>Server &Mask:</source>
-        <translation type="unfinished">ماسک &سرور:</translation>
+        <translation>ماسک &سرور:</translation>
     </message>
     <message>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">ماسک شبکه سرور دی اِچ سی پی خدماتی شبکه وابسته سازی شده با این اداپتور فقط-میزبان را نشان میدهد.</translation>
+        <translation>ماسک شبکه سرور دی اِچ سی پی خدماتی شبکه وابسته سازی شده با این اداپتور فقط-میزبان را نشان میدهد.</translation>
     </message>
     <message>
         <source>&Lower Address Bound:</source>
-        <translation type="unfinished">محدوده آدر&س پایین تر:</translation>
+        <translation>محدوده آدر&س پایین تر:</translation>
     </message>
     <message>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">محدوده آدرس پایین تر ارائه شده توسط سرور دی اِچ سی پی خدماتی شبکه وابسته سازی شده با این آداپتور فقط-میزبان را نشان میدهد.</translation>
+        <translation>محدوده آدرس پایین تر ارائه شده توسط سرور دی اِچ سی پی خدماتی شبکه وابسته سازی شده با این آداپتور فقط-میزبان را نشان میدهد.</translation>
     </message>
     <message>
         <source>&Upper Address Bound:</source>
-        <translation type="unfinished">محدوده آ&درس بالاتر:</translation>
+        <translation>محدوده آ&درس بالاتر:</translation>
     </message>
     <message>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">محدوده آدرس پایین تر ارائه شده توسط سرور دی اِچ سی پی خدماتی شبکه وابسته سازی شده با این اداپتور فقط-میزبان را نشان میدهد.</translation>
+        <translation>محدوده آدرس پایین تر ارائه شده توسط سرور دی اِچ سی پی خدماتی شبکه وابسته سازی شده با این اداپتور فقط-میزبان را نشان میدهد.</translation>
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3002,43 +3061,59 @@
     <name>UIGlobalSettingsNetworkDetailsNAT</name>
     <message>
         <source>NAT Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>جزئیات شبکه NAT</translation>
     </message>
     <message>
         <source>&Enable Network</source>
-        <translation type="unfinished"></translation>
+        <translation>&فعالسازی شبکه</translation>
+    </message>
+    <message>
+        <source>Enable this NAT network.</source>
+        <translation type="obsolete">فعالسازی این شبکه NAT.</translation>
     </message>
     <message>
         <source>Network &Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>نام &شبکه:</translation>
     </message>
     <message>
         <source>Holds the name for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>نام این شبکه را نگه می دارد.</translation>
     </message>
     <message>
         <source>Network &CIDR:</source>
-        <translation type="unfinished"></translation>
+        <translation>شبکه &CIDR:</translation>
     </message>
     <message>
         <source>Holds the CIDR for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>CIDR  رابرای این شبکه نگه می دارد.</translation>
     </message>
     <message>
         <source>Network Options:</source>
-        <translation type="unfinished"></translation>
+        <translation>گزینه های شبکه:</translation>
     </message>
     <message>
         <source>Supports &DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>پشتیبانی از &DHCP</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports DHCP.</source>
+        <translation type="obsolete">تعیین اینکه آیا این شبکه از DHCP پشتیبانی میکند.</translation>
     </message>
     <message>
         <source>Supports &IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>پشتیبانی از &IPv6</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports IPv6.</source>
+        <translation type="obsolete">تعیین اینکه آیا این شبکه از IPv6 پشتیبانی میکند.</translation>
     </message>
     <message>
         <source>Advertise Default IPv6 &Route</source>
-        <translation type="unfinished"></translation>
+        <translation>اعلان مسیر پیش فرض IPv6&</translation>
+    </message>
+    <message>
+        <source>Determines whether this network should be advertised as the default IPv6 route.</source>
+        <translation type="obsolete">تعیین اینکه آیا شبکه باید مسیر پیش فرض IPv6 را اعلان کند.</translation>
     </message>
     <message>
         <source>Opens a window to manage port forwarding rules.</source>
@@ -3046,7 +3121,7 @@
     </message>
     <message>
         <source>&Port Forwarding</source>
-        <translation type="unfinished">اِرسا&ل پورت</translation>
+        <translation>اِرسا&ل پورت</translation>
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
@@ -3073,15 +3148,15 @@
     <name>UIGlobalSettingsPortForwardingDlg</name>
     <message>
         <source>Port Forwarding Rules</source>
-        <translation type="unfinished">دستورات اِرسال پورت</translation>
+        <translation>دستورات اِرسال پورت</translation>
     </message>
     <message>
         <source>IPv4</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4</translation>
     </message>
     <message>
         <source>IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6</translation>
     </message>
 </context>
 <context>
@@ -3136,11 +3211,11 @@
     </message>
     <message>
         <source>No proxy host is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>میزبان پراکسی اکنون تایین نشده است.</translation>
     </message>
     <message>
         <source>No proxy port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>پورت پراکسی اکنون تعیین نشده است.</translation>
     </message>
     <message>
         <source>Holds the proxy host.</source>
@@ -3217,71 +3292,71 @@
     <name>UIHostComboEditor</name>
     <message>
         <source><key_%1></source>
-        <translation type="unfinished"><key_%1></translation>
+        <translation><key_%1></translation>
     </message>
     <message>
         <source>Left </source>
-        <translation type="unfinished">Left </translation>
+        <translation>Left </translation>
     </message>
     <message>
         <source>Right </source>
-        <translation type="unfinished">Right </translation>
+        <translation>Right </translation>
     </message>
     <message>
         <source>Left Shift</source>
-        <translation type="unfinished">Left Shift</translation>
+        <translation>Left Shift</translation>
     </message>
     <message>
         <source>Right Shift</source>
-        <translation type="unfinished">Right Shift</translation>
+        <translation>Right Shift</translation>
     </message>
     <message>
         <source>Left Ctrl</source>
-        <translation type="unfinished">Left Ctrl</translation>
+        <translation>Left Ctrl</translation>
     </message>
     <message>
         <source>Right Ctrl</source>
-        <translation type="unfinished">Right Ctrl</translation>
+        <translation>Right Ctrl</translation>
     </message>
     <message>
         <source>Left Alt</source>
-        <translation type="unfinished">Left Alt</translation>
+        <translation>Left Alt</translation>
     </message>
     <message>
         <source>Right Alt</source>
-        <translation type="unfinished">Right Alt</translation>
+        <translation>Right Alt</translation>
     </message>
     <message>
         <source>Left WinKey</source>
-        <translation type="unfinished">Left WinKey</translation>
+        <translation>Left WinKey</translation>
     </message>
     <message>
         <source>Right WinKey</source>
-        <translation type="unfinished">Right WinKey</translation>
+        <translation>Right WinKey</translation>
     </message>
     <message>
         <source>Menu key</source>
-        <translation type="unfinished">Menu key</translation>
+        <translation>Menu key</translation>
     </message>
     <message>
         <source>Alt Gr</source>
-        <translation type="unfinished">Alt Gr</translation>
+        <translation>Alt Gr</translation>
     </message>
     <message>
         <source>Caps Lock</source>
-        <translation type="unfinished">Caps Lock</translation>
+        <translation>Caps Lock</translation>
     </message>
     <message>
         <source>Scroll Lock</source>
-        <translation type="unfinished">Scroll Lock</translation>
+        <translation>Scroll Lock</translation>
     </message>
     <message>
         <source>Host+</source>
-        <translation type="unfinished"></translation>
+        <translation>Host+</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>None</translation>
     </message>
 </context>
 <context>
@@ -3352,22 +3427,22 @@
     </message>
     <message>
         <source>Reset shortcut to default</source>
-        <translation type="unfinished"></translation>
+        <translation>ریست میانبر به پیش فرض</translation>
     </message>
     <message>
         <source>Unset shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>عدمتعیین میانبر</translation>
     </message>
 </context>
 <context>
     <name>UIHotKeyTableModel</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished">نام</translation>
+        <translation>نام</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>میانبر</translation>
     </message>
 </context>
 <context>
@@ -3500,23 +3575,24 @@
     </message>
     <message>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>فعالیت ضبط ویدیو را نشان میدهد:</nobr><br>%1</translation>
     </message>
     <message>
         <source><nobr><b>Video capture disabled</b></nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>ضبط ویدئو غیرفعال شده است</b></nobr></translation>
     </message>
     <message>
         <source><nobr><b>Video capture file:</b> %1</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>فایل ضبط ویدیو:</b> %1</nobr></translation>
     </message>
     <message>
         <source>Additional feature status:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="unfinished"></translation>
+        <translation>وضعیت سایر ویژگی ها:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3530,8 +3606,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3584,6 +3659,22 @@
         <source>Select a filename for the screenshot ...</source>
         <translation>یک نام فایل برای ضبط وضعیت انتخاب کنید...</translation>
     </message>
+    <message>
+        <source>No Webcams Connected</source>
+        <translation type="obsolete">وب کمی متصل نشده است</translation>
+    </message>
+    <message>
+        <source>No supported webcams connected to the host PC</source>
+        <translation type="obsolete">وب کم پشتیبانی شده ای به رایانه میزبان متصل نشده است</translation>
+    </message>
+    <message>
+        <source>Connect Network Adapter</source>
+        <translation type="obsolete">اتصال به آداپتور شبکه</translation>
+    </message>
+    <message>
+        <source>Connect Network Adapter %1</source>
+        <translation type="obsolete">اتصال به آداپتور شبکه %1</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsAudio</name>
@@ -3736,122 +3827,134 @@
     </message>
     <message>
         <source>Video &Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>&ضبط ویدئو</translation>
     </message>
     <message>
         <source>When checked, VirtualBox will record the virtual machine session as a video file.</source>
-        <translation type="unfinished"></translation>
+        <translation>وقتیکه انتخاب شده،ویرچوال باکس،جلسه یا وضعیت ماشین مجازی را در فایل ویدیویی ضبط خواهد کرد.</translation>
     </message>
     <message>
         <source>&Enable Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>فعالسازی &ضبط ویدیو</translation>
     </message>
     <message>
         <source>File &Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>&مسیر فایل:</translation>
+    </message>
+    <message>
+        <source>This setting determines the filename VirtualBox uses to save the recorded content.</source>
+        <translation type="obsolete">این گزینه نام فایلی را که ویرچوال باکس برای محتوای ضبط شده استفاده میکند را تعیین میکند.</translation>
     </message>
     <message>
         <source>Frame &Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>اندازه &فریم:</translation>
+    </message>
+    <message>
+        <source>This setting determines the resolution (frame size) of the recorded video.</source>
+        <translation type="obsolete">این تنظیم نسبت دید (اندازه فریم) ویدیو ضبط شده را تعیین میکند.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
+        <translation type="obsolete">این تنظیم نسبت دید <b>اُفقی</b> (عرض فریم) ویدیو ضبط شده را تعیین میکند.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>vertical</b> resolution (frame height) of the recorded video.</source>
+        <translation type="obsolete">این تنظیم نسبت دید <b>عمودی</b> (ارتفاع فریم) ویدیو ضبط شده را تعیین میکند.</translation>
     </message>
     <message>
         <source>&Frame Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>&نرخ فریم:</translation>
+    </message>
+    <message>
+        <source>This setting determines the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
+        <translation type="obsolete">این تنظیم حداکثر تعداد<b>فریم بر ثانیه</b> تعیین میکند. فریم های اضافی رد خواهد شد. کاهش این مقدار باعث افزایش تعداد فریم های رد شده میشود درنهایت حجم فایل کم میشود.</translation>
     </message>
     <message>
         <source>&Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>&کیفیت:</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">این تنظیم <b>کیفیت</b> را تعیین میکند. افزایش این مقدار کیفیت ویدیو را بیشتر میکند اما حجم فایل نیز بیشتر میشود.</translation>
+    </message>
+    <message>
+        <source>This setting determines the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">این تنظیم نرخ بیت را در <b>کیلوبیت بر ثانیه</b> تعیین میکند. افزایش این مقدار کیفیت ویدیو را بیشتر میکند اما حجم فایل نیز بیشتر میشود.</translation>
     </message>
     <message>
         <source>&Screens:</source>
-        <translation type="unfinished"></translation>
+        <translation>&نمایشگرها:</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use hardware graphics acceleration. However the host system does not currently provide this, so you will not be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>ماشین مجازی طوری راه اندازی شده که از سخت افزار شتاب دهنده گرافیکی استفاده کند. هرچند سیستم میزبان اکنون این را ارائه نمیکند، بنابراین شما قادر به اجرای ماشین مجازی نیستید.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to fullscreen or seamless mode.</source>
+        <translation type="obsolete">اکنون ماشین مجازی کمتر از <b>%1</b> حافظه ویدیویی اختصاص داده است.که آن کمترین مقدار موردنیاز برای رفتن به حالت تمام صفحه یا حالت یکپارچه هست.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required for High Definition Video to be played efficiently.</source>
-        <translation type="unfinished"></translation>
+        <translation>اکنون ماشین مجازی کمتر از <b>%1</b> حافظه ویدیویی اختصاص داده است.که آن کمترین مقدار موردنیاز برای ویدیو کیفیت بالا با پخش موثر است.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least b>%1</b>.</source>
+        <translation type="obsolete">ماشین مجازی طوری راه اندازی شده که از سخت افزار شتاب دهنده گرافیکی استفاده کند و سیستم عامل اشارع دارد که آن به ویندوز ویستا به بعد تنظیم شده است. برای بهترین کارایی باید حافظه ویدیویی ماشین را حداقل به b>%1</b> تنظیم کنید.</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use Video Stream Acceleration. As this feature only works with Windows guest systems it will be disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>ماشین مجازی طوری راه اندازی شده که از جریان ویدیو شتاب دهنده استفاده کند. از آنجا که این ویژگی فقط با ویندوز سیستم مهمان کار میکند،آن غیر فعال خواهد شد.</translation>
     </message>
     <message>
         <source>The VRDE server port value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>مقدار پورت سرور VRDE اکنون تعیین شده است.</translation>
     </message>
     <message>
         <source>The VRDE authentication timeout value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>مقدار مدت زمان تایید اعتبار VRDE اکنون تعیین نشده است.</translation>
     </message>
     <message>
         <source>User Defined</source>
-        <translation type="unfinished"></translation>
+        <translation>تعریف شده توسط کاربر</translation>
     </message>
     <message>
         <source>%1 fps</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 فریم بر ثانیه</translation>
     </message>
     <message>
         <source>fps</source>
-        <translation type="unfinished"></translation>
+        <translation>فریم بر ثانیه</translation>
     </message>
     <message>
         <source>low</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>کم</translation>
     </message>
     <message>
         <source>medium</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>متوسط</translation>
     </message>
     <message>
         <source>high</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>بالا</translation>
     </message>
     <message>
         <source>kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>کیلوبیت بر ثانیه</translation>
     </message>
     <message>
         <source>Screen %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">نوارابزار کوچک:</translation>
+        <translation>صفحه نمایش %1</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">اگر انتخاب شده،نوار ابزار کوچک را در حالت تمام صفحه یا یکپارچه نشان میدهد.</translation>
+        <source>Enable video recording for screen %1.</source>
+        <translation type="obsolete">ضبط ویدیو برای صفحه نمایش %1 فعال شود.</translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">نمایش &در تمام صفحه/یکپارچه</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">اگر انتخاب شده، نوارابزار کوچک را در بالای صفحه نشان میدهد،بجای موقعیت پیش فرض آن در پایین صفحه.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">نمایش در &بالای صفحه</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="obsolete">نمایش ریموت اکنون برای این ماشین مجازی فعال شده است. هرچند، نیاز دارد که <b>%1</b> نصب شود. لطفا بسته افزونه را از سایت ویرچوال باکس دانلود نمایید،درغیر اینصورت ماشین مجازی با نمایش ریموت غیرفعال شده اِجرا خواهد شد</translation>
     </message>
     <message>
         <source>&Screen</source>
@@ -3866,15 +3969,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">سه بعدی {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">سه بعدی {200%?}</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3890,10 +3989,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3942,6 +4037,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 مگابایت</translation>
     </message>
@@ -3950,6 +4053,10 @@
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3961,12 +4068,12 @@
         <translation type="obsolete">مسیری که ضبط وضعیت ماشین مجازی در آن ذخیره شده را نشان میدهد.آگاه باشید که ضبط وضعیت فضای دیسک بسیاری استفاده می کند.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&پایه ای</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&پایه ای</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>پی&شرفته</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">پی&شرفته</translation>
     </message>
     <message>
         <source>&Shared Clipboard:</source>
@@ -3981,8 +4088,8 @@
         <translation>پوشه& ضبط وضعیت:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>تو&ضیحات</translation>
+        <source>&Description</source>
+        <translation type="obsolete">تو&ضیحات</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -4025,8 +4132,8 @@
         <translation type="obsolete">شما سیستم عامل 64 بیتی مهمان برای این ماشین مجازی انتخاب کرده اید. همینطور مهمان به سخت افزار مجازی سازی نیاز دارد (VT-x/AMD-V)، این ویزگی خودکار فعال خواهد شد.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation>&کشیدن 'و' رهاکردن:</translation>
+        <source>&Drag'n'Drop:</source>
+        <translation type="obsolete">&کشیدن 'و' رهاکردن:</translation>
     </message>
     <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
@@ -4034,10 +4141,26 @@
     </message>
     <message>
         <source>No name specified for the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>نامی برای ماشین مجازی مشخص نشده است.</translation>
     </message>
     <message>
         <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
+        <translation>سیستم عامل ماشین مجازی اشاره میکند که به نوع 64 بیت تنظیم شده است.سیستم مهمان 64 بیت نیاز به مجازی سازی سخت افزاری دارد،بنابراین اگر شما تغییرات را تایید کنید،آن خودکار فعال خواهد شد.</translation>
+    </message>
+    <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">پی&شرفته</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4057,6 +4180,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4089,16 +4216,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4109,28 +4232,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">سه بعدی {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">سه بعدی {200%?}</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">نوارابزار کوچک:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">اگر انتخاب شده،نوار ابزار کوچک را در حالت تمام صفحه یا یکپارچه نشان میدهد.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">نمایش &در تمام صفحه/یکپارچه</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">اگر انتخاب شده، نوارابزار کوچک را در بالای صفحه نشان میدهد،بجای موقعیت پیش فرض آن در پایین صفحه.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -4140,18 +4255,6 @@
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -4282,35 +4385,35 @@
     </message>
     <message>
         <source>No bridged network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>هیچ آداپتور شبکه پل شده اکنون انتخاب نشده است.</translation>
     </message>
     <message>
         <source>No internal network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>هیچ نام شبکه داخلی اکنون تعیین نشده است.</translation>
     </message>
     <message>
         <source>No host-only network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>هیچ آداپتور شبکه فقط-میزبان انتخاب نشده است.</translation>
     </message>
     <message>
         <source>No generic driver is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>اکنون هیچ درایور اصلی انتخاب نشده است.</translation>
     </message>
     <message>
         <source>No NAT network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>هیچ نام شبکه  NAT اکنون تعیین نشده است.</translation>
     </message>
     <message>
         <source>The MAC address must be 12 hexadecimal digits long.</source>
-        <translation type="unfinished"></translation>
+        <translation>آدرس مک باید 12 رقم هگزادسیمال بلند باشد</translation>
     </message>
     <message>
         <source>The second digit in the MAC address may not be odd as only unicast addresses are allowed.</source>
-        <translation type="unfinished"></translation>
+        <translation>رقم دوم در آدرس مک نباید فرد باشد دراینصور فقط ادرس یونی کست اجازه داده میشود</translation>
     </message>
     <message>
         <source>Holds the name of the NAT network that this network card will be connected to. You can create and remove networks using the global network settings in the virtual machine manager window.</source>
-        <translation type="unfinished"></translation>
+        <translation>نام شبکه NAT که این کارت شبکه به آن متصل شده است را نگه دارید. شما میتوانید توسط تنظیمات سراسری شبکه در پنجره مدیریت ماشین مجازی شبکه راحذف و ایجاد کنید.</translation>
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
@@ -4382,23 +4485,23 @@
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">اکنون IRQ تعیین نشده است.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">اکنون پورت I/O تعیین نشده است.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">دو یا چند پورت تنظیمات مشابه دارند.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">اکنون مسیر پورتی تعیین نشده است.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">اکنون مسیر پورت های تکراری تعیین شده است.</translation>
     </message>
 </context>
 <context>
@@ -4415,6 +4518,26 @@
         <source>Duplicate port path entered </source>
         <translation type="obsolete">مسیر تکراری پورت وارد شده است </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">اکنون IRQ تعیین نشده است.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">اکنون پورت I/O تعیین نشده است.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">دو یا چند پورت تنظیمات مشابه دارند.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">اکنون مسیر پورتی تعیین نشده است.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">اکنون مسیر پورت های تکراری تعیین شده است.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsPortForwardingDlg</name>
@@ -4582,7 +4705,7 @@
     </message>
     <message>
         <source>When checked, the guest OS will try to automatically mount the shared folder on startup.</source>
-        <translation>اگر انتخاب شده باشد،سیستم عامل مهمان سعی میکند در اِستارت آپ پوشه اشتراکی را بارگیری کند.</translation>
+        <translation>وقتیکه انتخاب شده باشد،سیستم عامل مهمان سعی میکند در اِستارت آپ پوشه اشتراکی را بارگیری کند.</translation>
     </message>
     <message>
         <source>&Auto-mount</source>
@@ -4593,6 +4716,10 @@
         <translation type="obsolete">اگر انتخاب شده باشد،این پوشه اشتراکی دائمی خواهد بود.</translation>
     </message>
     <message>
+        <source>Window</source>
+        <translation type="obsolete">پنجره</translation>
+    </message>
+    <message>
         <source>When checked, this shared folder will be permanent.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4661,44 +4788,44 @@
         <translation>آدرس پورت ورودی/خروجی پایه را برای این پورت سریال را نشان میدهد. مقادیر معتبر اعداد صحیح در محدوده ای از <tt>0</tt> به <tt>0xFFFF</tt> هستند.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">اکنون IRQ تعیین نشده است.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">اکنون پورت I/O تعیین نشده است.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">دو یا چند پورت تنظیمات مشابه دارند.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">اکنون مسیر پورتی تعیین نشده است.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">اکنون مسیر پورت های تکراری تعیین شده است.</translation>
     </message>
 </context>
 <context>
@@ -4715,6 +4842,26 @@
         <source>Duplicate port path entered </source>
         <translation type="obsolete">مسیر تکراری پورت وارد شده است </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">اکنون IRQ تعیین نشده است.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">اکنون پورت I/O تعیین نشده است.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">دو یا چند پورت تنظیمات مشابه دارند.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">اکنون مسیر پورتی تعیین نشده است.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">اکنون مسیر پورت های تکراری تعیین شده است.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsStorage</name>
@@ -4948,7 +5095,7 @@
     </message>
     <message>
         <source>Choose a virtual floppy disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation>مجازی فلاپی دیسک یا درایو جسمی درایو مجازی استفاده کنید انتخاب کنید. ماشین مجازی دیسک وارد شده را در درایوی که با اطلاعات در پرونده یا دیسک موجود در درایو جسمی عنوان محتویاتش دید.ماشین مجازی دیسک قرارداده شده در درایو را با داده در فایل یا در درایو فیزیکی بعنوان محتویات دیسک میبیند.</translation>
+        <translation>یک دیسک فلاپی مجازی یا یک درایو فیزیکی برای استفاده با درایو مجازی انتخاب کنید. ماشین مجازی دیسک قرارداده شده در درایو را با داده در فایل یا در درایو فیزیکی بعنوان محتویات دیسک میبیند.</translation>
     </message>
     <message>
         <source>Set up the virtual floppy drive</source>
@@ -5034,55 +5181,23 @@
     </message>
     <message>
         <source>No name is currently specified for the controller at position <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>هیچ نامی اکنون برای کنترلر در موقعیت <b>%1</b> تعیین نشده است.</translation>
     </message>
     <message>
         <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>کنترلردر موقعیت <b>%1</b> همین نام را بعنوان کنترلر در موقعیت <b>%2</b> دارد.</translation>
     </message>
     <message>
         <source>No hard disk is selected for <i>%1</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation>دیسک سختی برای <i>%1</i> انتخاب نشده است.</translation>
     </message>
     <message>
         <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add USB Controller</source>
-        <translation type="unfinished"></translation>
+        <translation><i>%1</i> از دیسکی استفاده میکند که از قبل ضمیمه شده به <i>%2</i>.</translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a virtual optical disk file...</source>
-        <translation type="obsolete">یک فایل دیسک نوری مجازی انتخاب کنید...</translation>
-    </message>
-    <message>
-        <source>Add Optical Drive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Floppy Drive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Optical &Drive:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Encrypted with key:</source>
-        <translation type="unfinished"></translation>
+        <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
+        <translation>ماشین اکنون درحال استفاده کنترلرهای ذخیره ساز بیشتر از %1 تراشه پشتیبانی شده هستید. لطفا نوع تراشه را در صفحه تنظیمات سیستم تغییر دهید یا تعداد کنترلرهای ذخیره ساز زیرین را در صفحه تنظیمات ذخیره ساز کاهش دهید: %2</translation>
     </message>
     <message>
         <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
@@ -5109,7 +5224,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source>&Hot-pluggable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encrypted with key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5134,6 +5258,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Add USB Controller</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Optical Drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Floppy Drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5150,6 +5286,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Optical &Drive:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create New Hard Disk...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5162,7 +5306,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5324,11 +5468,11 @@
     </message>
     <message>
         <source>If checked, an absolute pointing device (a USB tablet) will be supported. Otherwise, only a standard PS/2 mouse will be emulated.</source>
-        <translation type="obsolete">اگر انتخاب شده،یک دستگاه اشاره گر مطلق (یک تبلت یو اِس بی) پشتیبانی خواهد شد. درغیراینصورت، فقط یک ماوس استاندارد PS/2 شبیه سازی خواهد شد.</translation>
+        <translation type="obsolete">اگر انتخاب شده،یک دستگاه اشاره گر حقیقی (یک تبلت یو اِس بی) پشتیبانی خواهد شد. درغیراینصورت، فقط یک ماوس استاندارد PS/2 شبیه سازی خواهد شد.</translation>
     </message>
     <message>
         <source>Enable &absolute pointing device</source>
-        <translation type="obsolete">فعال &سازی دستگاه اشاره گر مطلق</translation>
+        <translation type="obsolete">فعال &سازی دستگاه اشاره گر حقیقی</translation>
     </message>
     <message>
         <source>&Chipset:</source>
@@ -5370,30 +5514,54 @@
     </message>
     <message>
         <source>&Pointing Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>&دستگاه اشاره گر:</translation>
     </message>
     <message>
         <source>Determines whether the emulated pointing device is a standard PS/2 mouse, a USB tablet or a USB multi-touch tablet.</source>
-        <translation type="unfinished"></translation>
+        <translation>هرگاه دستگاه اشاره گر شبیه ساز شده یک ماوس پی اِس/2 استاندارد،یک تبلت یو اِس  بی یا یک تبلت لمسی یو اِس بی را تعیین میکند.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. Not enough memory is left for the host operating system. Please select a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>بیشتر از <b>%1%</b> از حافظه رایانه میزبان را (<b>%2</b>) به ماشین مجازی اختصاص داده اید. حافظه کافی برای سیستم عامل مهمان باقی نمانده است.لطفا مقدار کمتری انتخاب نمایید.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. There might not be enough memory left for the host operating system. Please consider selecting a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>بیشتر از <b>%1%</b> از حافظه رایانه میزبان را (<b>%2</b>) به ماشین مجازی اختصاص داده اید. حافظه کافی برای سیستم عامل مهمان باقی نمانده است.با در نظر گرفتن این مقدار کمتری انتخاب نمایید.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">ویژگی ورودی/خروجی APIC اکنون در بخش مادربرد صفحه سیستم فعال نشده است.این برای پشتیبانی از نوع تراشه ICH9 ضروری هست. اگر تغییرات را تایید و اعمال کنید آن خودکار انجام خواهد شد.</translation>
+    </message>
+    <message>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">شبیه ساز کنترلر یو اِس بی اکنون در صفحه یو اِس بی فعال نشده است. بمنظور پشتیبانی از دستگاه ورودی یو اِس بی به آن نیاز است. اگر تغییرات را تایید کنید آن خودکار انجام خواهد شد..</translation>
     </message>
     <message>
         <source>For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>به دلیل کارایی، تعداد پردازنده مجازی ضمیمه شده به ماشین مجازی نبابید بیشتر از دوبرابر پردازنده فیزیکی در میزبان (<b>%1</b>) باشد. لطفا تعداد پردازنده مجازی را کاهش دهید.</translation>
     </message>
     <message>
         <source>More virtual CPUs are assigned to the virtual machine than the number of physical CPUs on the host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>پردازنده مجازی بیشتری نسبت به تعداد پردازنده فیزیکی سیستم میزبان (<b>%1</b>) به ماشین مجازی اختصاص داده اید. این بیشتر باعث تنزل کارایی ماشین مجازی میشود. لطفا به کاهش پردازنده مجازی توجه کنید.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">ویژگی ورودی/خروجی APIC اکنون در بخش مادربرد صفحه سیستم فعال نشده است.این برای پشتیبانی از بیشتر از یک پردازنده مجازی نیاز است. اگر تغییرات را تایید و اعمال کنید آن خودکار انجام خواهد شد.</translation>
+    </message>
+    <message>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">مجازی سازی سخت افزار اکنون در بخش شتاب دهنده صفحه سیستم فعال نشده است. برای پشتیبانی از بیشتر از یک پردازنده مجازی این ضروری است. اگر تغییرات را تایید و اعمال کنید آن خودکار انجام خواهد شد.</translation>
     </message>
     <message>
         <source>The processor execution cap is set to a low value. This may make the machine feel slow to respond.</source>
+        <translation>درپوش اِجرای پردازنده به مقدار کم تنظیم شده است.این میتواند موجب احساس کندی در عملکرد و پاسخ ماشین داشته باشد.</translation>
+    </message>
+    <message>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5421,14 +5589,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 مگابایت</translation>
     </message>
@@ -5575,31 +5735,35 @@
         <translation type="obsolete">اکنون یو اِس بی 2.0 برای این ماشین فعال شده است. هرچند، این نیاز دارد که <b>%1</b> نصب شده باشد. لطفا بسته افزونه را از سایت ویرچوال باکس دانلود کنید. بعداز این شما قادر به فعال کردن مجدد یو اِس بی 2.0 هستید. آن در این فاصله غیرفعال شده است بجز اینکه شما تغییرات تنظیمات فعلی را لغو کنید.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0 to be able to start the machine.</source>
+        <translation type="obsolete">اکنون یو اِس بی 2.0 برای این ماشین فعال شده است. هرچند، این نیاز دارد که <b>%1</b> نصب شده باشد. لطفا بسته افزونه را از سایت ویرچوال باکس دانلود کنید، یا یو اِس بی 2.0 را غیرفعال کنید تا بتوانید آن را اِجرا کنید.</translation>
+    </message>
+    <message>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5856,14 +6020,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">بستن</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">تعویض</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">بستن</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6137,9 +6301,9 @@
         <translation type="obsolete">دانلود</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">بارگیری</translation>
+        <translation>بارگیری</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -6206,8 +6370,8 @@
         <translation><p>ماشین مجازی گزارش داده که از  <b>یکپارچگی نشانگر ماوس</b> پشتیبانی میکند. این معنی را میدهد که شما به <i>ضبط</i> نشانگر ماوس برای استفاده در سیستم عامل مهمان نیازی ندارید -- همه اقدامات ماوس که اِجرا کرده اید وقتیکه نشانگر ماوس روی صفحه ماشین مجازی هست مستقیما به سیستم عامل مهمان فرستاده میشود. اگر ماوس اکنون ضبط شده است، آن خودکار از ضبط خارج خواهد شد.</p><p>آیکون ماوس در نوار وضعیت شبیه این خواهد یود&nbsp;<img src [...]
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>نسخه جدید ویرچوال باکس منتشر شده است! نسخه <b>%1</b> موجود است در <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>میتوانید این نسخه را توسط این لینک دانلود کنید:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>نسخه جدید ویرچوال باکس منتشر شده است! نسخه <b>%1</b> موجود است در <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>میتوانید این نسخه را توسط این لینک دانلود کنید:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -6282,8 +6446,8 @@
         <translation type="obsolete"><p>یک یا تعداد بیشتری دیسک سخت مجازی، سی دی/دی وی دی یا رسانه فلاپی اکنون قابل دسترسی نیستند. درنتیجه، تا زمانیکه این رسانه ها قابل دسترسی نباشد شما قادر به استفاده از ماشین مجازی نیستید.</p><p>دکمه <b>بررسی</b> را برای بازکردن پنجره مدیر رسانه مجازی فشار دهید و مشاهده کنید کدام رسانه ها قابل دسترسی نیستند، یا دکمه <b>چشمپوشی</b> را برای نادیده گرفتن این پیام فشار دهید.</p></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>یک خطای خطرناک حین اِجرای ماشین مجازی رخ داده و اِجرای ماشین متوقف شده است.</p><p>برای راهنمایی، لطفا بخش انجمن را در <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> ببینید یا با پشتیبانی تماس بگیرید. لطفا محتویات فایل وقایع <tt>VBox.log</tt> و فایل ایمیج <tt>VBox.png</tt> را ارئه دهید، که میتوانید آنها را در دایرکتوری <nobr><b>%1</b></nobr> پیدا کنید، همچ [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>یک خطای خطرناک حین اِجرای ماشین مجازی رخ داده و اِجرای ماشین متوقف شده است.</p><p>برای راهنمایی، لطفا بخش انجمن را در <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> ببینید یا با پشتیبانی تماس بگیرید. لطفا محتویات فایل وقایع <tt>VBox.log</tt> و فایل ایمیج <tt>VBox.png</tt> را ارئه دهید، که میتوانید آنها را در دایرکتوری <nobr><b>%1</b></nobr> پیدا کنید، همچنین توضیح دهید [...]
     </message>
     <message>
         <source>The following files already exist:<br /><br />%1<br /><br />Are you sure you want to replace them? Replacing them will overwrite their contents.</source>
@@ -6621,8 +6785,8 @@
         <translation><p>توجه کنید که واحد ذخیره ساز این رسانه حذف نخواهد شد و امکان استفاده آن در زمان دیگری هم هست.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
-        <translation type="obsolete"><p>افزونه مهمان ویرچوال باکس در ماشین مجازی دردسترس ظاهر نشده است، و پوشه اشتراکی بدون آن قابل استفاده نیست. برای استفاده از پوشه اشتراکی در داخل ماشین مجازی، لطفا افزونه مهمان را نصب کنید اگر آنها نصب نشده است. یا اگر بدرستی کار نمیکند مجددا نصب کنید، گزینه <b>نصب افزونه مهمان</b> را از منوی <b>دستگاه</b> انتخاب کنید. اگر آنها نصب شده اند اما ماشین هنوز بطورکامل شروع نشده است سپس پوشه اشتراکی یک بار در آن دردسترس است.&lt [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
+        <translation><p>افزونه مهمان ویرچوال باکس در ماشین مجازی دردسترس ظاهر نشده است، و پوشه اشتراکی بدون آن قابل استفاده نیست. برای استفاده از پوشه اشتراکی در داخل ماشین مجازی، لطفا افزونه مهمان را نصب کنید اگر آنها نصب نشده است. یا اگر بدرستی کار نمیکند مجددا نصب کنید، گزینه <b>نصب افزونه مهمان</b> را از منوی <b>دستگاه</b> انتخاب کنید. اگر آنها نصب شده اند اما ماشین هنوز بطورکامل شروع نشده است سپس پوشه اشتراکی یک بار در آن دردسترس است.</p></translation>
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
@@ -6911,203 +7075,240 @@
     </message>
     <message>
         <source><p>Cannot start the VirtualBox Manager due to local restrictions.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>به علت محدودیت محلی نمیتوان مدیر ویرچوال باکس را اجرا کرد.</p><p>برنامه حالا بسته خواهد شد.</p></translation>
     </message>
     <message>
         <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>قادر به یافتن فایل زبان برای زبان <b>%1</b> در دایرکتوری زیر نیست: <b><nobr>%2</nobr></b> </p><p>زبان موقتا به زبان پیش فرض سیستم ریست خواهد شد. لطفا به پنجره. <b>اولویت ها</b> بروید که آن را میتوان از منوی <b>فایل</b> در پنجره اصلی برنامه یافت، و یکی از زبان های موجود در صفحه <b>زبان</b> را انتخاب کنید.</p></translation>
     </message>
     <message>
         <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>قادر به بارگیری فایل زبان <b><nobr>%1</nobr></b> نیست. <p>زبان موقتا به زبان توکار برنامه یعنی انگلیسی ریست میشود. لطفا به پنجره <b>اولویت ها</b> بروید که میتوانید آن را از منوی <b>فایل</b> از پنجره اصلی برنامه باز کنید، و یکی از زبانهای موجود را از صفحه <b>زبان</b> انتخاب کنید.</p></translation>
     </message>
     <message>
         <source>There is no virtual machine with the identifier <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>ماشین مجازی با شناسه <b>%1</b> وجود ندارد.</translation>
     </message>
     <message>
         <source>Ignore</source>
-        <translation type="unfinished">چشمپوشی</translation>
+        <translation>چشمپوشی</translation>
     </message>
     <message>
         <source><p>Do you want to remove the NAT network <nobr><b>%1</b>?</nobr></p><p>If this network is in use by one or more virtual machine network adapters these adapters will no longer be usable until you correct their settings by either choosing a different network name or a different adapter attachment type.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>آیا میخواهید شبکه NAT <nobr><b>%1</b> را حذف کنید؟</nobr></p><p> اگر این شبکه بایک یا تعداد بیشتری آداپتور شبکه ماشین مجازی در حال استفاده باشد دیگر قابل استفاده نخواهد بود تا زمانیکه یا نام شبکه متفاوت انتخاب کرده یا نوع ضمیمه آداپتور متفاوت انتخاب کرد.</p></translation>
     </message>
     <message>
         <source>Failed to create NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>موفق به ایجاد شبکه NAT نشد.</translation>
     </message>
     <message>
         <source>Failed to remove NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>موفق به حذف شبکه NAT <b>%1</b> نشد.</translation>
     </message>
     <message>
         <source>Failed to create DHCP server.</source>
-        <translation type="unfinished"></translation>
+        <translation>موفق به ایجاد سرور DHCP نشد.</translation>
     </message>
     <message>
         <source>Failed to remove DHCP server for network interface <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>موفق به حذف سرور DHCP برای رابطه شبکه <b>%1</b> نشد.</translation>
     </message>
     <message>
         <source>Failed to create the host network interface.</source>
-        <translation type="unfinished"></translation>
+        <translation>موفق به ایجاد رابط شبکه میزبان نشد.</translation>
     </message>
     <message>
         <source>Create &new disk</source>
-        <translation type="unfinished">ایجاد دیسک &جدید</translation>
+        <translation>ایجاد دیسک &جدید</translation>
     </message>
     <message>
         <source>&Choose existing disk</source>
-        <translation type="unfinished">انتخاب دی&سک موجود</translation>
+        <translation>انتخاب دی&سک موجود</translation>
     </message>
     <message>
         <source>Leave &empty</source>
-        <translation type="unfinished">خالی &بگذار</translation>
+        <translation>خالی &بگذار</translation>
     </message>
     <message>
         <source>&Choose disk</source>
-        <translation type="unfinished">انتخاب د&یسک</translation>
+        <translation>انتخاب د&یسک</translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>آیا میخواهید دیسک سخت مجازی <nobr><b>%1</b></nobr> ترخیص شود؟ </p><p>این آن را از ماشین مجازی زیر جدا خواهد کرد: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual optical disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>آیا میخواهید دیسک نوری مجازی <nobr><b>%1</b></nobr> را ترخیص کنید؟ </p><p>این آن را از ماشین مجازی زیر جدا خواهد کرد: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual floppy disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>آیا میخواهید دیسک فلاپی مجازی <nobr><b>%1</b></nobr> را ترخیص کنید؟</p><p>این آن را از ماشین مجازی زیر جدا خواهد کرد: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>آیا میخواهید دیسک سخت مجازی <nobr><b>%1</b></nobr> را از لیست فایل های دیسک ایمیج شناخته شده حذف کنید؟</p></translation>
     </message>
     <message>
         <source><p>As this hard disk is inaccessible its image file can not be deleted.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>از آنجا که این دیسک سخت  قابل دسترسی نیست،فایل ایمیج آن را نمیتوان حذف کرد.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual optical disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>آیا میخواهید دیسک نوری مجازی <nobr><b>%1</b></nobr> را از لیست فایل های ایمیج شناخته شده حذف کنید؟</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual floppy disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>آیا میخواهید دیسک فلاپی مجازی <nobr><b>%1</b></nobr> را از لیست فایل های دیسک ایمیج شناخته شده حذف کنید؟</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual optical disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>قادر به قراردادن دیسک نوری مجازی <nobr><b>%1</b></nobr> در ماشین <b>%2</b> نیست.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force insertion of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>آیا میخواهید این دیسک را اجباری قرار دهید؟</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual optical disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>قادر به ایجکت دیسک نوری مجازی <nobr><b>%1</b></nobr> از ماشین <b>%2</b> نیست.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force ejection of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>آیا میخواهید این دیسک را ایجکت اجباری کنید؟</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual floppy disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>قادر به قراردادن دیسک فلاپی مجازی <nobr><b>%1</b></nobr> در ماشین <b>%2</b> نیست.</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual floppy disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>قادر به ایجکت دیسک مجازی فلاپی <nobr><b>%1</b></nobr> از ماشین <b>%2</b> نیست.</p></translation>
+    </message>
+    <message>
+        <source>Failed to open the hard disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">موفق به بازکردن فایل دیسک سخت <nobr><b>%1</b></nobr> نشد.</translation>
+    </message>
+    <message>
+        <source>Failed to open the optical disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">موفق به بازکردن فایل دیسک نوری <nobr><b>%1</b></nobr> نشد.</translation>
+    </message>
+    <message>
+        <source>Failed to open the floppy disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">موفق به بازکردن فایل فلاپی دیسک <nobr><b>%1</b></nobr> نشد.</translation>
+    </message>
+    <message>
+        <source>Failed to close the hard disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">موفق به بستن فایل دیسک سخت <nobr><b>%2</b></nobr> نشد.</translation>
+    </message>
+    <message>
+        <source>Failed to close the optical disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">موفق به بستن فایل دیسک نوری <nobr><b>%2</b></nobr> نشد.</translation>
+    </message>
+    <message>
+        <source>Failed to close the floppy disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">موفق به بستن فایل فلاپی دیسک <nobr><b>%2</b></nobr> نشد.</translation>
     </message>
     <message numerus="yes">
         <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
+        <translation>
             <numerusform><p>این %n ماشین مجازی زیر اکنون در وضعیت ذخیره شده هستند: <b>%1</b></p><p>اگر ادامه دهید وضعیت زمان اِجرای ماشین خروجیگیری شده لغو خواهد شد. سایر ماشین ها تغییر نخواهد کرد.</p></numerusform>
         </translation>
     </message>
     <message>
         <source>Switch</source>
-        <translation type="unfinished">تعویض</translation>
+        <translation>تعویض</translation>
     </message>
     <message>
         <source>Failed to enable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>موفق به فعالسازی سرور ریموت دسکتاپ برای ماشین مجازی <b>%1</b> نشد.</translation>
     </message>
     <message>
         <source>Failed to disable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>موفق به غیرفعالسازی سرور ریموت دسکتاپ برای ماشین مجازی <b>%1</b> نشد.</translation>
     </message>
     <message>
         <source>Failed to enable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>موفق به فعالسازی ضبط ویدیو برای ماشین مجازی <b>%1</b> نشد.</translation>
     </message>
     <message>
         <source>Failed to disable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>موفق به ضبط ویدیو برای ماشین مجازی <b>%1</b> نشد.</translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox Guest Additions</b> disk image file.</p><p>Do you wish to download this disk image file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>نمیتوان فایل دیسک ایمیج <b>افزونه مهمان ویرچوال باکس</b> را یافت.</p><p>آیا میخواهید فایل دیسک ایمیج را از اینترنت دانلود کند؟</p></translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished">دانلود</translation>
+        <translation>دانلود</translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox Guest Additions</b> disk image file from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>آیا میخواهید فایل ایمیج دیسک <b>افزونه مهمان ویرچوال باکس</b> را از <nobr><a href="%1">%1</a></nobr> (حجم %2 بایت) دانلود کنید؟</p></translation>
     </message>
     <message>
         <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>فایل دیسک ایمیج <b>افزونه مهمان ویرچوال باکس</b> با موفقیت <nobr><a href="%1">%1</a></nobr>دانلود شد اما نمیتوان بطور محلی در اینجا ذخیره کرد: <nobr><b>%2</b> </nobr></p><p>لطفا یک مکان دیگر برای ذخیره آن انتخاب کنید.</p></translation>
+    </message>
+    <message>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual CD/DVD drive?</p></source>
+        <translation type="obsolete"><p>فایل دیسک ایمیج <b>افزونه مهمان ویرچوال باکس</b> با موفقیت از <nobr><a href="%1">%1</a></nobr> دانلود شد و بطور محلی بعنوان <nobr><b>%2</b> ذخیره شد.</nobr></p><p>آیا میخواهید این فایل دیسک ایمیج را ثبت کرده و در درایو سی دی/دی وی دی بارگیری کنید؟</p></translation>
+    </message>
+    <message>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no CD/DVD drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <translation type="obsolete"><p>نمیتوان فایل دیسک ایمیج <b>افزونه مهمان ویرچوال باکس</b> را در ماشین مجازی <b>%1</b>قرارداد،زیرا ماشین درایو سی دی یا دی وی دی ندارد. لطفا یک درایو توسط صفحه ذخیره ساز در پنجره تنظیمات ماشین مجازی اضافه کنید.</p></translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>قادر به یافتن <b>راهنمای کاربر ویرچوال باکس</b> <nobr><b>%1</b> نیست</nobr></p><p>آیا میخواهید آن را از اینترنت دانلود کنید؟</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox User Manual</b> from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>آیا میخواهید فایل <b>راهنمای کاربر ویرچوال باکس</b> را از <nobr><a href="%1">%1</a></nobr> (حجم %2 بایت) دانلود کنید؟</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"><p>راهنمای کاربر ویرچوال باکس با موفقیت از <nobr><a href="%1">%2</a></nobr> دانلود شد اما نمیتواند بطور محلی بعنوان <nobr><b>%3</b> ذخیره شود.</nobr></p><p>لطفا برای آن فایل محل دیگری را انتخاب کنید.</p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>راهنمای کاربر ویرچوال باکس با موفقیت از <nobr><a href="%1">%2</a></nobr> دانلود شد اما نمیتواند بطور محلی بعنوان <nobr><b>%3</b> ذخیره شود.</nobr></p><p>لطفا برای آن فایل محل دیگری را انتخاب کنید.</p> {1"?} {1<?} {2<?}</translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p></source>
-        <translation type="unfinished"><p>راهنمای کاربر ویرچوال باکس با موفقیت از <nobr><a href="%1">%2</a></nobr> دانلود شد و بطور محلی بعنوان <nobr><b>%3</b> ذخیره شد.</nobr></p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>راهنمای کاربر ویرچوال باکس با موفقیت از <nobr><a href="%1">%2</a></nobr> دانلود شد و بطور محلی بعنوان <nobr><b>%3</b> ذخیره شد.</nobr></p> {1"?} {1<?} {2<?}</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">بستن</translation>
+        <translation>بستن</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">تأیید</translation>
+        <translation>تأیید</translation>
     </message>
     <message>
         <source>Do not show this message again</source>
-        <translation type="unfinished">این پیام را دیگر نشان نده</translation>
-    </message>
-    <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>این پیام را دیگر نشان نده</translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete"><p>افزونه مهمان ویرچوال باکس در ماشین مجازی دردسترس ظاهر نشده است، و پوشه اشتراکی بدون آن قابل استفاده نیست. برای استفاده از پوشه اشتراکی در داخل ماشین مجازی، لطفا افزونه مهمان را نصب کنید اگر آنها نصب نشده است. یا اگر بدرستی کار نمیکند مجددا نصب کنید، گزینه <b>نصب افزونه مهمان</b> را از منوی <b>دستگاه</b> انتخاب کنید. اگر آنها نصب شده اند اما ماشین هنوز بطورکامل شروع نشده است سپس پوشه اشتراکی یک بار در آن دردسترس است.&lt [...]
     </message>
     <message>
         <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <comment>additions-new</comment>
+        <translation type="obsolete">بارگیری</translation>
     </message>
     <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
-        <translation type="unfinished"></translation>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
+        <translation>موفق به ضمیمه کردن وب کم <b>%1</b> به ماشین مجازی <b>%2</b> نشد.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
+        <translation>موفق به جداسازی وب کم <b>%1</b> از ماشین مجازی <b>%2</b> نشد.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
-        <translation type="unfinished"></translation>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <translation><p>نمایشگر مجازی اکنون به حالت رنگی <b>%1&nbsp;بیت</b> تنظیم شده است. برای کارایی بهتر لطفا آن را به <b>%2&nbsp;بیت</b> تغییر دهید. این معمولا میتواند از قسمت <b>نمایش</b> کنترل پنل سیستم عامل مهمان یا تنظیمات سیستم انجام شود.</p></translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
@@ -7122,115 +7323,115 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7238,19 +7439,19 @@
     <name>UIMiniToolBar</name>
     <message>
         <source>Always show the toolbar</source>
-        <translation type="unfinished">همیشه نمایش نوارابزار</translation>
+        <translation>همیشه نمایش نوارابزار</translation>
     </message>
     <message>
         <source>Minimize Window</source>
-        <translation type="unfinished">کمینه پنجره</translation>
+        <translation>کمینه پنجره</translation>
     </message>
     <message>
         <source>Exit Full Screen or Seamless Mode</source>
-        <translation type="unfinished">خروج ازحالت تمام صفحه یا حالت یکپارچه</translation>
+        <translation>خروج ازحالت تمام صفحه یا حالت یکپارچه</translation>
     </message>
     <message>
         <source>Close VM</source>
-        <translation type="unfinished">بستن ماشین مجازی</translation>
+        <translation>بستن ماشین مجازی</translation>
     </message>
 </context>
 <context>
@@ -7267,8 +7468,8 @@
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation>نا&م:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">نا&م:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -7290,6 +7491,10 @@
         <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
         <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation>
     </message>
+    <message>
+        <source>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -7327,7 +7532,7 @@
     </message>
     <message>
         <source>The network operation failed with the following error: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>عملکرد شبکه یا خطای زیر موفق نشد: %1.</translation>
     </message>
 </context>
 <context>
@@ -7354,34 +7559,34 @@
     <name>UINetworkReplyPrivate</name>
     <message>
         <source>Host not found</source>
-        <translation type="unfinished"></translation>
+        <translation>میزبان یافت نشد</translation>
     </message>
     <message>
         <source>Content access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>دسترسی به محتوا رد شد</translation>
     </message>
     <message>
         <source>Protocol failure</source>
-        <translation type="unfinished"></translation>
+        <translation>پروتکل موفق نشد</translation>
     </message>
     <message>
         <source>Wrong SSL certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>فرمت گواهینامه SSL اشتباه است</translation>
     </message>
     <message>
         <source>SSL authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>تایید اعتبار SSL انجام نشد.</translation>
     </message>
     <message>
         <source>Unknown reason</source>
-        <translation type="unfinished"></translation>
+        <translation>دلیل ناشناخته</translation>
     </message>
 </context>
 <context>
     <name>UIPopupCenter</name>
     <message>
         <source>Click for full details</source>
-        <translation type="unfinished"></translation>
+        <translation>برای جزئیات کامل کلیک کنید</translation>
     </message>
 </context>
 <context>
@@ -7514,18 +7719,14 @@
         <translation>فایل ماشین مجازی (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>به ویرچوال باکس خوش آمدید!</h3><p>بخش راست این پنجره لیستی از همه ماشین های مجازی روی رایانه شما هست. حالا لیست خالی هست زیرا شما هنوز هیچگونه ماشین مجازی ایجاد نکرده اید.</p><p>بمنظور ایجاد ماشین مجازی جدید، دکمه <b>جدید</b> را از نوارابزار اصلی قرارگرفته در بالای پنجره فشار دهید.</p><p> میتوانید کلید <b>%1</b> برای دریافت راهنمای فوری فشاردهید، یا از سایت <a href=http://www.vir [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation><h3>به ویرچوال باکس خوش آمدید!</h3><p>بخش راست این پنجره لیستی از همه ماشین های مجازی روی رایانه شما هست. حالا لیست خالی هست زیرا شما هنوز هیچگونه ماشین مجازی ایجاد نکرده اید.</p><p>بمنظور ایجاد ماشین مجازی جدید، دکمه <b>جدید</b> را از نوارابزار اصلی قرارگرفته در بالای پنجره فشار دهید.</p><p> میتوانید کلید <b>%1</b> برای دریافت راهنمای فوری فشاردهید، یا از سایت <a href=https://www.virtualbox.org> [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation>مدیر</translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -7558,11 +7759,11 @@
     </message>
     <message>
         <source><b>%1</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1</b> صفحه:</translation>
     </message>
     <message>
         <source><b>%1: %2</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1: %2</b> صفحه:</translation>
     </message>
 </context>
 <context>
@@ -7685,6 +7886,10 @@
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">بستن</translation>
     </message>
@@ -7692,10 +7897,6 @@
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -7782,7 +7983,7 @@
     </message>
     <message>
         <source>You want to:</source>
-        <translation>شما میخواهید که:</translation>
+        <translation>چه کاری انجام خواهید داد:</translation>
     </message>
     <message>
         <source><p>Saves the current execution state of the virtual machine to the physical hard disk of the host PC.</p><p>Next time this machine is started, it will be restored from the saved state and continue execution from the same place you saved it at, which will let you continue your work immediately.</p><p>Note that saving the machine state may take a long time, depending on the guest operating system type and the amount of memory you assigned to th [...]
@@ -7844,114 +8045,98 @@
     <name>UIVMInfoDialog</name>
     <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - اطلاعات جلسه</translation>
+        <translation type="unfinished">%1 - اطلاعات جلسه</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">جزئی&ات</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished">جزئیات &پیکربندی</translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">زمان اِ&جرا</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished">&اطلاعات زمان اِجرا</translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>انتقالات DMA</translation>
+        <translation type="unfinished">انتقالات DMA</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>انتقالات PIO</translation>
+        <translation type="unfinished">انتقالات PIO</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>خواندن داده</translation>
+        <translation type="unfinished">خواندن داده</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>نوشتن داده</translation>
+        <translation type="unfinished">نوشتن داده</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>داده اِرسال شده</translation>
+        <translation type="unfinished">داده اِرسال شده</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>داده دریافتی</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>صفات زمان اِجرا</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>وضوح صفحه</translation>
+        <translation type="unfinished">داده دریافتی</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>تشخیص داده نشده است</translation>
+        <translation type="unfinished">تشخیص داده نشده است</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>تشخیص داده نشده است</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>افزونه مهمان</translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation>نوع سیستم عامل مهمان</translation>
+        <translation type="unfinished">تشخیص داده نشده است</translation>
     </message>
     <message>
-        <source>No Network Adapters</source>
-        <translation>هیچ آداپتور شبکه ندارد</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">موجود نیست</translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">صفات زمان اِجرا</translation>
     </message>
     <message>
-        <source>Storage Statistics</source>
-        <translation>آمار ذخیره ساز</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">وضوح صفحه</translation>
     </message>
     <message>
-        <source>No Storage Devices</source>
-        <translation>دستگاه ذخیره ساز ندارد</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network Statistics</source>
-        <translation>آمار شبکه</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished">حالت کلیپ برد</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>موجود نیست</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clipboard Mode</source>
-        <translation>حالت کلیپ برد</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">افزونه مهمان</translation>
     </message>
     <message>
-        <source>Drag'n'Drop Mode</source>
-        <translation type="obsolete">حالت کشیدن 'و' رهاکردن</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">نوع سیستم عامل مهمان</translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
+        <source>Storage Statistics</source>
+        <translation type="unfinished">آمار ذخیره ساز</translation>
     </message>
     <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
+        <source>No Storage Devices</source>
+        <translation type="unfinished">دستگاه ذخیره ساز ندارد</translation>
     </message>
     <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <source>Network Statistics</source>
+        <translation type="unfinished">آمار شبکه</translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">هیچ آداپتور شبکه ندارد</translation>
     </message>
 </context>
 <context>
@@ -8132,7 +8317,7 @@
     </message>
     <message>
         <source>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="obsolete">لطفا انتخاب کنید چه موقع فایل درایو سخت مجازی جدید باید بزرگ شود بمهان اندازه که استفاده شده است (پویا اختصاص داده شده) یا آن باید در حداکثر حجم ایجاد شود (حجم ثابت شده).</translation>
+        <translation type="obsolete">لطفا انتخاب کنید چه موقع فایل درایو سخت مجازی جدید باید بزرگ شود به همان اندازه که استفاده شده است (پویا اختصاص داده شده) یا آن باید در حداکثر حجم ایجاد شود (حجم ثابت شده).</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard drive file will only use space on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
@@ -8499,39 +8684,39 @@
     </message>
     <message>
         <source>Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>تنظیمات ذخیره ساز</translation>
     </message>
     <message>
         <source>Please choose a file to export the virtual appliance to</source>
-        <translation type="unfinished"></translation>
+        <translation>لطفا یک فایل برای خروجیگیری وسیله مجازی انتخاب کنید</translation>
     </message>
     <message>
         <source>F&ormat:</source>
-        <translation type="unfinished"></translation>
+        <translation>&فرمت:</translation>
     </message>
     <message>
         <source>OVF 0.9</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 0.9</translation>
     </message>
     <message>
         <source>OVF 1.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 1.0</translation>
     </message>
     <message>
         <source>OVF 2.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 2.0</translation>
     </message>
     <message>
         <source>Write in standard OVF 1.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>نوشتن در فرمت استاندارد OVF 1.0.</translation>
     </message>
     <message>
         <source>Write in new experimental OVF 2.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>نوشتن در فرمت آزمایشی OVF 2.0 .</translation>
     </message>
     <message>
         <source>&Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>&تنظیمات ذخیره ساز</translation>
     </message>
 </context>
 <context>
@@ -8550,14 +8735,14 @@
     </message>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>یک فایل برای خروجیگیری ماشین مجازی انتخاب کنید</translation>
     </message>
 </context>
 <context>
     <name>UIWizardExportAppPageExpert</name>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>یک فایل برای خروجیگیری ماشین مجازی انتخاب کنید</translation>
     </message>
 </context>
 <context>
@@ -8623,19 +8808,19 @@
     </message>
     <message>
         <source>These are the virtual machines contained in the appliance and the suggested settings of the imported VirtualBox machines. You can change many of the properties shown by double-clicking on the items and disable others using the check boxes below.</source>
-        <translation>اینها ماشین های مجازی شامل در وسیله و تنظیمات پیشنهاد شده ماشین های مجازی واردشده هستند.میتوانید بسیاری از مشخصات نمایش داده شده را بادومرتبه کلیک روی آیتم تغییر دهید و بقیه را توسط جک باکس زیر غیرفعال کنید.</translation>
+        <translation>اینها ماشین های مجازی شامل در وسیله و تنظیمات پیشنهاد شده ماشین های مجازی واردشده هستند.میتوانید بسیاری از مشخصات نمایش داده شده را بادومرتبه کلیک روی آیتم تغییر دهید و بقیه را توسط چک باکس زیر غیرفعال کنید.</translation>
     </message>
     <message>
         <source>Import Virtual Appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>وارد کردن یک وسیله مجازی</translation>
     </message>
     <message>
         <source>Choose a virtual appliance file to import...</source>
-        <translation type="unfinished"></translation>
+        <translation>یک وسیله مجازی برای وارد کردن انتخاب کنید...</translation>
     </message>
     <message>
         <source>Please choose a virtual appliance file to import</source>
-        <translation type="unfinished"></translation>
+        <translation>لطفا یک فایل وسیله مجازی برای وارد کردن انتخاب کنید</translation>
     </message>
 </context>
 <context>
@@ -8662,7 +8847,7 @@
     </message>
     <message>
         <source>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="obsolete">لطفا انتخاب کنید چه موقع فایل درایو سخت مجازی جدید باید بزرگ شود بمهان اندازه که استفاده شده است (پویا اختصاص داده شده) یا آن باید در حداکثر حجم ایجاد شود (حجم ثابت شده).</translation>
+        <translation type="obsolete">لطفا انتخاب کنید چه موقع فایل درایو سخت مجازی جدید باید بزرگ شود به همان اندازه که استفاده شده است (پویا اختصاص داده شده) یا آن باید در حداکثر حجم ایجاد شود (حجم ثابت شده).</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard drive file will only use space on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
@@ -8891,7 +9076,7 @@
     </message>
     <message>
         <source>Choose...</source>
-        <translation type="unfinished"></translation>
+        <translation>انتخاب کنید...</translation>
     </message>
 </context>
 <context>
@@ -8901,8 +9086,8 @@
         <translation><ریست به پیش فرض></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">مقدار مسیر پیش فرض واقعی بعداز پذیرفتن تغییرات و بازکردن دوباره این پنجره نمایش داده میشود.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation>مقدار مسیر پیش فرض واقعی بعداز پذیرفتن تغییرات و بازکردن دوباره این پنجره نمایش داده میشود.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -8950,7 +9135,8 @@
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">مقدار مسیر پیش فرض واقعی بعداز پذیرفتن تغییرات و بازکردن دوباره این پنجره نمایش داده میشود.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -9752,7 +9938,7 @@
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">ضمیمه کردن این دیسک سخت بطور غیرمستقیم توسط یک دیسک سخت متفاوت ایجاد شده جدید اِجرا شده است.</translation>
+        <translation>ضمیمه کردن این دیسک سخت بطور غیرمستقیم توسط یک دیسک سخت متفاوت ایجاد شده جدید اِجرا شده است.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -9762,7 +9948,7 @@
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">این دیسک سخت پایه غیرمستقیم ضمیمه شده توسط دیسک سخت متفاوت زیر:</translation>
+        <translation>این دیسک سخت پایه غیرمستقیم ضمیمه شده توسط دیسک سخت متفاوت زیر:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -10261,46 +10447,46 @@
     <message>
         <source>Unrestricted Execution</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>اِجرای بدون محدودیت</translation>
     </message>
     <message>
         <source>PS/2 Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PS/2 Mouse</translation>
     </message>
     <message>
         <source>USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>موس یو اِس بی</translation>
     </message>
     <message>
         <source>USB Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>تبلت یو اِس بی</translation>
     </message>
     <message>
         <source>PS/2 and USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>ماوس پی اِس/2 و یو اِس بی</translation>
     </message>
     <message>
         <source>USB Multi-Touch Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>تبلت چند لمسی یو اِس بی</translation>
     </message>
     <message>
         <source>NAT Network</source>
         <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
+        <translation>شبکه NAT</translation>
     </message>
     <message>
         <source>NAT network, '%1'</source>
         <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>شبکه NAT، '%1'</translation>
     </message>
     <message>
         <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>شما میتوانید فایل های ایمیج دیسک را در تنظیمات ماشین مجازی اضافه یا ایجاد نمائیید.</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -10314,7 +10500,7 @@
     </message>
     <message>
         <source>Unrestricted Execution</source>
-        <translation type="unfinished"></translation>
+        <translation>اِجرای بدون محدودیت</translation>
     </message>
     <message>
         <source>USB</source>
@@ -10322,51 +10508,11 @@
         <translation type="unfinished">یو اِس بی</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">پیش فرض</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished">فعال</translation>
@@ -10397,6 +10543,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -10407,6 +10558,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">پیش فرض</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -10417,6 +10593,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -10437,6 +10618,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -10446,16 +10632,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -10618,15 +10804,15 @@
         <translation type="obsolete">ایجاد یک درایو سخت مجازی جدید</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10852,4 +11038,110 @@
         <translation>دستگاه پشتیبانی شده ای به رایانه میزبان متصل نشده است</translation>
     </message>
 </context>
+<context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - اطلاعات جلسه</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">جزئی&ات</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">زمان اِ&جرا</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">انتقالات DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">انتقالات PIO</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">خواندن داده</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">نوشتن داده</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">داده اِرسال شده</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">داده دریافتی</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">صفات زمان اِجرا</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">وضوح صفحه</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">تشخیص داده نشده است</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">تشخیص داده نشده است</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">افزونه مهمان</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">نوع سیستم عامل مهمان</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">هیچ آداپتور شبکه ندارد</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">آمار ذخیره ساز</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">دستگاه ذخیره ساز ندارد</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">آمار شبکه</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">موجود نیست</translation>
+    </message>
+    <message>
+        <source>Clipboard Mode</source>
+        <translation type="obsolete">حالت کلیپ برد</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">حالت کشیدن 'و' رهاکردن</translation>
+    </message>
+    <message>
+        <source>Configuration &Details</source>
+        <translation type="obsolete">جزئیات &پیکربندی</translation>
+    </message>
+    <message>
+        <source>&Runtime Information</source>
+        <translation type="obsolete">&اطلاعات زمان اِجرا</translation>
+    </message>
+</context>
 </TS>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
index 2967d74..d9a96f8 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
@@ -345,7 +345,7 @@
         <translation type="obsolete">Näytä &tietoikkuna</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Näytä tietoja istunnosta</translation>
     </message>
     <message>
@@ -413,11 +413,11 @@
         <translation type="obsolete">Valitse, sallitaanko tähän virtuaalikoneeseen RDP-etätyöpöytäyhteydet</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Asenna asiakaslisäosat...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="unfinished">&Asenna asiakaslisäosat...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Liitä asiakaslisäosien asennuslevykuva</translation>
     </message>
     <message>
@@ -687,92 +687,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">&Asenna asiakaslisäosat...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Liitä asiakaslisäosien asennuslevykuva</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
+        <source>&Webcams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Verkko</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Tiedosto</translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="unfinished">&Näppäimistö</translation>
-    </message>
-    <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Verkko</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Asetukset...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Näytä &loki...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Tiedosto</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -788,175 +774,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Asetukset...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <source>&Keyboard</source>
+        <translation type="unfinished">&Näppäimistö</translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <source>&Hard Disks</source>
+        <translation type="unfinished">&Kiintolevyt</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="unfinished">&Kiintolevyt</translation>
+        <source>&USB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Näytä &loki...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1002,6 +988,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create new virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1018,7 +1012,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1026,7 +1020,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1050,15 +1044,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Start selected virtual machines with option of continuing in background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1070,11 +1076,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1082,7 +1088,7 @@
         <translation type="unfinished">Pä&ivitä</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1126,15 +1132,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1143,33 +1149,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Käytössä</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1192,6 +1173,18 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -2415,11 +2408,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
-        <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
         <translation type="unfinished">Laitesuodattimet</translation>
@@ -2479,88 +2467,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (user interface/Unscaled HiDPI Video Output)</comment>
-        <translation type="obsolete">Käytössä</translation>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <translation type="unfinished">Käytössä</translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
-        <translation type="unfinished">Ei käytössä</translation>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">Käytössä</translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">Ei käytössä</translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished">Käytössä</translation>
     </message>
     <message>
-        <source>Menu-bar</source>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
+        <translation type="unfinished">Ei käytössä</translation>
+    </message>
+    <message>
+        <source>Mini-toolbar Position</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Käytössä</translation>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Ei käytössä</translation>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
+        <source>Mini-toolbar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished">Käytössä</translation>
-    </message>
-    <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished">Ei käytössä</translation>
     </message>
 </context>
@@ -3522,7 +3510,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4193,7 +4181,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4207,8 +4196,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4443,18 +4431,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4467,15 +4443,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4491,10 +4463,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4543,6 +4511,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4551,6 +4527,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4578,8 +4558,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Näytä polku, jonne tämän virtuaalikoneen palautuspisteet tallennetaan. Huomaa, että palautuspisteet voivat viedä paljon levytilaa.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Perus</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Perus</translation>
     </message>
     <message>
         <source>Identification</source>
@@ -4622,8 +4602,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Säätää virtuaalikoneen videomuistin määrää.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Lisäasetukset</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Lisäasetukset</translation>
     </message>
     <message>
         <source>Boo&t Order:</source>
@@ -4718,8 +4698,8 @@ p, li { white-space: pre-wrap; }
         <translation>P&alautuspisteiden kansio:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Kuvaus</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Kuvaus</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -4762,10 +4742,6 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Ota &3D-kiihdytys käyttöön</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4778,6 +4754,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
+        <translation type="unfinished">Ku&vaus</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4794,6 +4786,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4826,16 +4822,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4846,35 +4838,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show at &Top of Screen</source>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allows to modify VM status-bar contents.</source>
+        <source>Show in &Full-screen/Seamless</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Full-screen/Seamless</source>
+        <source>Show at &Top of Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5050,7 +5034,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>A&dvanced</source>
-        <translation type="unfinished">&Lisäasetukset</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&Cable Connected</source>
@@ -5555,23 +5539,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5851,59 +5835,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Controller: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No name is currently specified for the controller at position <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No hard disk is selected for <i>%1</i>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add USB Controller</source>
+        <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Controller: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>No name is currently specified for the controller at position <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>No hard disk is selected for <i>%1</i>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5931,7 +5887,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source>&Hot-pluggable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encrypted with key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5956,6 +5921,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Add USB Controller</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Optical Drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Floppy Drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5972,6 +5949,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Optical &Drive:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create New Hard Disk...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5984,7 +5969,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6163,35 +6148,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6337,31 +6322,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"><nobr>Tila: %1</nobr></translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6610,14 +6595,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Sulje</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Vaihda</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Sulje</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6949,15 +6934,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete"><p>Kielitiedostoa <b><nobr>%1</nobr></b> ei voitu ladata.</p><p>Kieli on väliaikaisesti asetettu oletusarvoon Englanti. Siirry VirtualBoxin pääikkunan <b>File</b>-valikon kohtaan <b>Preferences</b>, josta voit valita jonkun olemassaolevista kielistä <b>Language</b>-sivulta.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Virtuaalikoneeseen asennetut VirtualBoxin asiakaslisäosat ovat liian vanhoja: asennettu versio on %1, ja vaadittu versio on %2. Jotkut ominaisuudet, jotka vaativat lisäosien toiminnan,kuten hiiren integrointi ja näytön koon automaattinen vaihto, lakkaavat luultavasti toimimasta oikein.</p><p>Päivitä asiakslisäosat uusimpaan versioon valitsemalla <b>Laitteet</b>-valikosta kohta <b>Asenna asiakaslisäosat...</b&g [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Virtuaalikoneeseen asennetut VirtualBoxin asiakaslisäosat ovat vanhentuneet: asennettu versio on %1, ja vaadittu versio on %2. Jotkut ominaisuudet, jotka vaativat lisäosien toiminnan,kuten hiiren integrointi ja näytön koon automaattinen vaihto, lakkaavat luultavasti toimimasta oikein.</p><p>Päivitä asiakslisäosat uusimpaan versioon valitsemalla <b>Laitteet</b>-valikosta kohta <b>Asenna asiakaslisäosat...</b&gt [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Virtuaalikoneeseen asennetut VirtualBoxin asiakaslisäosat ovat liian uusia tälle VirtualBoxin versiolle: asennettu versio on %1, ja vaadittu versio on %2. Uudempien lisäosien version käyttäminen vanhemman VirtualBoxin kanssa ei ole tuettu.</p><p>Asenna asiakslisäosat tähän versioon valitsemalla <b>Laitteet</b>-valikosta kohta <b>Asenna asiakaslisäosat...</b>.</p></translation>
     </message>
     <message>
@@ -7081,9 +7066,9 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Nouda</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Liitä</translation>
+        <translation type="unfinished">Liitä</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -7239,8 +7224,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Näytä tietoja tuotteesta ikkunassa</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Uusi versio VirtualBoxista on julkaistu! Versio <b>%1</b> on saatavilla sivulta <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Voit noutaa tämän version seuraavasta linkistä: </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>Uusi versio VirtualBoxista on julkaistu! Versio <b>%1</b> on saatavilla sivulta <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Voit noutaa tämän version seuraavasta linkistä: </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -7396,8 +7381,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&Korvaa</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Tapahtui kriittinen virhe suoritettaessa virtuaalikonetta, ja virtuaalikoneen suoritus on keskeytetty.</p><p>Jos tarvitset apua ongelmassa, lue lisää yhteisöosiosta sivulta <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> tai etsi yhteystiedot tukisopimuksestasi. Toimita vikaraportin mukana lokitiedostosi sisältö <tt>VBox.log</tt> sekä levykuvatiedosto <tt>VBox.png</tt>, jotka löy [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Tapahtui kriittinen virhe suoritettaessa virtuaalikonetta, ja virtuaalikoneen suoritus on keskeytetty.</p><p>Jos tarvitset apua ongelmassa, lue lisää yhteisöosiosta sivulta <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> tai etsi yhteystiedot tukisopimuksestasi. Toimita vikaraportin mukana lokitiedostosi sisältö <tt>VBox.log</tt> sekä levykuvatiedosto <tt>VBox.png</tt>, jotka löydät kansiosta  [...]
     </message>
     <message>
         <source>hard disk</source>
@@ -7996,32 +7981,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Insert</source>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Liitä</translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8037,115 +8014,115 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8196,8 +8173,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished">&Nimi:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Nimi:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -8219,6 +8196,10 @@ p, li { white-space: pre-wrap; }
         <source>Selects 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>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -8993,18 +8974,14 @@ Kaikki VirtualBoxin komponentit käyttävät sitä koneen tunnistukseen.</p&g
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Tervetuloa VirtualBoxiin!</h3><p>Oikealla olevasta tilasta näet kaikki tällä tietokoneella olevat virtuaalikoneet. Luettelo on nyt tyhjä, koska et ole vielä luonut yhtäkään virtuaalikonetta.<img src=:/welcome.png align=right/></p><p>Jos haluat luoda uuden virtuaalikoneen, napsauta nappia <b>Uusi</b> ikkunan yläosassa olevasta työkalupalkista.</p><p>Voit lukea ohjeita painamalla <b>% [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="unfinished"><h3>Tervetuloa VirtualBoxiin!</h3><p>Oikealla olevasta tilasta näet kaikki tällä tietokoneella olevat virtuaalikoneet. Luettelo on nyt tyhjä, koska et ole vielä luonut yhtäkään virtuaalikonetta.<img src=:/welcome.png align=right/></p><p>Jos haluat luoda uuden virtuaalikoneen, napsauta nappia <b>Uusi</b> ikkunan yläosassa olevasta työkalupalkista.</p><p>Voit lukea ohjeita painamalla <b&gt [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -9164,6 +9141,10 @@ Kaikki VirtualBoxin komponentit käyttävät sitä koneen tunnistukseen.</p&g
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Sulje</translation>
     </message>
@@ -9171,10 +9152,6 @@ Kaikki VirtualBoxin komponentit käyttävät sitä koneen tunnistukseen.</p&g
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -9270,8 +9247,8 @@ Kaikki VirtualBoxin komponentit käyttävät sitä koneen tunnistukseen.</p&g
         <translation type="obsolete">Yhteenveto</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Uusi versio VirtualBoxista on julkaistu! Versio <b>%1</b> on saatavilla osoitteesta <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Voit noutaa uuden version seuraavasta linkistä:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>Uusi versio VirtualBoxista on julkaistu! Versio <b>%1</b> on saatavilla osoitteesta <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Voit noutaa uuden version seuraavasta linkistä:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -9362,167 +9339,99 @@ Kaikki VirtualBoxin komponentit käyttävät sitä koneen tunnistukseen.</p&g
 <context>
     <name>UIVMInfoDialog</name>
     <message>
-        <source>&Close</source>
-        <translation type="obsolete">&Sulje</translation>
-    </message>
-    <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - tietoja istunnosta</translation>
+        <translation type="unfinished">%1 - tietoja istunnosta</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Yksityiskohdat</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">&Suoritusympäristö</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>DMA-siirrot</translation>
+        <translation type="unfinished">DMA-siirrot</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>PIO-siirrot</translation>
+        <translation type="unfinished">PIO-siirrot</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Luettu tieto</translation>
+        <translation type="unfinished">Luettu tieto</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Kirjoitettu tieto</translation>
+        <translation type="unfinished">Kirjoitettu tieto</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Lähetetty tieto</translation>
+        <translation type="unfinished">Lähetetty tieto</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Vastaanotettu tieto</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Käytössä</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Ei käytössä</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Suoritusympäristön ominaisuudet</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Näytön tarkkuus</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">CD/DVD-tilastot</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Verkkosovittimen tilastot</translation>
-    </message>
-    <message>
-        <source>Not attached</source>
-        <translation type="obsolete">Ei liitetty</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Versio %1.%2</translation>
+        <translation type="unfinished">Vastaanotettu tieto</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Ei havaittu</translation>
+        <translation type="unfinished">Ei havaittu</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Ei havaittu</translation>
+        <translation type="unfinished">Ei havaittu</translation>
     </message>
     <message>
-        <source>Guest Additions</source>
-        <translation>Asiakaskoneen lisäosat</translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation>Asiakaskäyttöjärjestelmän tyyppi</translation>
-    </message>
-    <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Kiintolevytilastot</translation>
-    </message>
-    <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Ei kiintolevyjä</translation>
-    </message>
-    <message>
-        <source>No Network Adapters</source>
-        <translation>Ei verkkosovittimia</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Käytössä</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Ei käytössä</translation>
-    </message>
-    <message>
-        <source>Nested Paging</source>
-        <translation type="obsolete">Sisäkkäinen sivutus</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Suoritusympäristön ominaisuudet</translation>
     </message>
     <message>
-        <source>Storage Statistics</source>
-        <translation type="unfinished"></translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Näytön tarkkuus</translation>
     </message>
     <message>
-        <source>No Storage Devices</source>
+        <source>VM Uptime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network Statistics</source>
+        <source>Clipboard Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Sisäkkäinen sivutus</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation type="unfinished"></translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Asiakaskoneen lisäosat</translation>
     </message>
     <message>
-        <source>Clipboard Mode</source>
-        <translation type="unfinished"></translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Asiakaskäyttöjärjestelmän tyyppi</translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
+        <source>Storage Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Runtime Information</source>
+        <source>No Storage Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>VM Uptime</source>
+        <source>Network Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Ei verkkosovittimia</translation>
     </message>
 </context>
 <context>
@@ -10586,11 +10495,11 @@ Version %1</source>
         <translation type="obsolete">Avaa jaettujen kansioiden käsittelyikkuna</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">&Asenna asiakaslisäosat...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Liitä asiakaslisäosien asennuslevykuva</translation>
     </message>
     <message>
@@ -10889,7 +10798,7 @@ Version %1</source>
         <translation type="obsolete">Näytä &tietoikkuna</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Näytä tietoja istunnosta</translation>
     </message>
     <message>
@@ -11185,8 +11094,8 @@ Version %1</source>
         <translation><palauta oletusarvo></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Todellinen oletuspolun arvo näytetään, kun muutokset on hyväksytty ja tämä ikkuna avataan uudestaan.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished">Todellinen oletuspolun arvo näytetään, kun muutokset on hyväksytty ja tämä ikkuna avataan uudestaan.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -11234,7 +11143,8 @@ Version %1</source>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Todellinen oletuspolun arvo näytetään, kun muutokset on hyväksytty ja tämä ikkuna avataan uudestaan.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -12414,6 +12324,16 @@ Version %1</source>
         <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
         <source>%n year(s)</source>
         <translation type="unfinished">
@@ -12971,51 +12891,11 @@ Version %1</source>
         <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Ei mitään</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Oletus</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished"></translation>
@@ -13046,6 +12926,11 @@ Version %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -13056,6 +12941,31 @@ Version %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Ei mitään</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Oletus</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -13066,6 +12976,11 @@ Version %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished"></translation>
@@ -13086,17 +13001,17 @@ Version %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>User interface</source>
-        <comment>DetailsElementType</comment>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Optical Drive)</source>
+        <source>User interface</source>
+        <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>(Optical Drive)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13108,7 +13023,7 @@ Version %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
+        <source>Encrypted</source>
         <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -13118,11 +13033,6 @@ Version %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Please choose a location for new virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13720,15 +13630,15 @@ Version %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -13828,8 +13738,8 @@ Version %1</source>
         <translation type="obsolete">Yhteyden kättely ei onnistunut.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Täytä tämä rekisteröintikaavake, jolla kerrot meille käyttäväsi VirtualBoxia ja jolla voit lisäksi halutessasi rekisteröityä vastaanottamaan uutisia ja päivityksiä VirtualBoxiin liittyen.</p><p>Anna koko nimesi, käyttäen vain ASCII-merkistöä, sekä sähköpostiosoitteesi alla oleviin kenttiin. Huomaa, että Sun Microsystems käyttää näitä tietoja vain kerätäkseen tuoteen käyttötilastoja ja VirtualBoxin uutiskirjeen lähettämiseen. Sun M [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Täytä tämä rekisteröintikaavake, jolla kerrot meille käyttäväsi VirtualBoxia ja jolla voit lisäksi halutessasi rekisteröityä vastaanottamaan uutisia ja päivityksiä VirtualBoxiin liittyen.</p><p>Anna koko nimesi, käyttäen vain ASCII-merkistöä, sekä sähköpostiosoitteesi alla oleviin kenttiin. Huomaa, että Sun Microsystems käyttää näitä tietoja vain kerätäkseen tuoteen käyttötilastoja ja VirtualBoxin uutiskirjeen lähettämiseen. Sun M [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -14126,8 +14036,8 @@ Version %1</source>
         <translation type="obsolete">Keskeytä virtuaalikoneen suoritus</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Tervetuloa VirtualBoxiin!</h3><p>Oikealla olevasta tilasta näet kaikki tällä tietokoneella olevat virtuaalikoneet. Luettelo on nyt tyhjä, koska et ole vielä luonut yhtäkään virtuaalikonetta.<img src=:/welcome.png align=right/></p><p>Jos haluat luoda uuden virtuaalikoneen, napsauta nappia <b>Uusi</b> ikkunan yläosassa olevasta työkalupalkista.</p><p>Voit lukea ohjeita painamalla <b>% [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Tervetuloa VirtualBoxiin!</h3><p>Oikealla olevasta tilasta näet kaikki tällä tietokoneella olevat virtuaalikoneet. Luettelo on nyt tyhjä, koska et ole vielä luonut yhtäkään virtuaalikonetta.<img src=:/welcome.png align=right/></p><p>Jos haluat luoda uuden virtuaalikoneen, napsauta nappia <b>Uusi</b> ikkunan yläosassa olevasta työkalupalkista.</p><p>Voit lukea ohjeita painamalla <b>% [...]
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
@@ -14746,6 +14656,135 @@ to access it from a Linux OS. This feature requires Guest Additions.</qt><
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>&Close</source>
+        <translation type="obsolete">&Sulje</translation>
+    </message>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - tietoja istunnosta</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Yksityiskohdat</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Suoritusympäristö</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">DMA-siirrot</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">PIO-siirrot</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Luettu tieto</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Kirjoitettu tieto</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Lähetetty tieto</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Vastaanotettu tieto</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Käytössä</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="obsolete">Ei käytössä</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Suoritusympäristön ominaisuudet</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Näytön tarkkuus</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">CD/DVD-tilastot</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Verkkosovittimen tilastot</translation>
+    </message>
+    <message>
+        <source>Not attached</source>
+        <translation type="obsolete">Ei liitetty</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Versio %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Ei havaittu</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Ei havaittu</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Asiakaskoneen lisäosat</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Asiakaskäyttöjärjestelmän tyyppi</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Kiintolevytilastot</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Ei kiintolevyjä</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Ei verkkosovittimia</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Käytössä</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Ei käytössä</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <translation type="obsolete">Sisäkkäinen sivutus</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Sisäkkäinen sivutus</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMListBox</name>
     <message>
         <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
index 21aa2e1..0616134 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
@@ -91,6 +91,10 @@
         <source>The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or there is a permission problem with /dev/vboxdrv. Please reinstall the kernel module by executing<br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>as root. If it is available in your distribution, you should install the DKMS package first. This package keeps track of Linux kernel changes and recompiles the vboxdrv kernel module if necess [...]
         <translation>Le pilote du noyau Linux de VirtualBox (vboxdrv) n'est soit pas chargé ou il y a un problème de permission sur /dev/vboxdrv. Veuillez réinstaller le module noyau en éxécutant<br><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/> en tant qu'administrateur. S'il n'est pas disponible pour votre distribution, vous devriez installer d'abord le paquet DKMS. Ce paquet garde la trace des [...]
     </message>
+    <message>
+        <source>Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps</source>
+        <translation type="obsolete">Taille de l'image : %1x%2, Taux de raffraîchissement de l'image : %3 ips, Taux de débit : %4kbps</translation>
+    </message>
 </context>
 <context>
     <name>QIArrowSplitter</name>
@@ -864,120 +868,129 @@
         <translation type="obsolete">Glisser-Déposer</translation>
     </message>
     <message>
+        <source>Save the machine state of the virtual machine</source>
+        <translation type="obsolete">Sauvegarder l'état de la machine virtuelle</translation>
+    </message>
+    <message>
         <source>Power off the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Éteindre la machine virtuelle</translation>
     </message>
     <message>
         <source>&Network Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Réglages &réseau...</translation>
     </message>
     <message>
         <source>&Shared Folders Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Réglages des dossier&s partagés...</translation>
     </message>
     <message>
         <source>R&emote Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Affichag&e distant</translation>
+    </message>
+    <message>
+        <source>Toggle remote desktop (RDP) connections to this machine</source>
+        <translation type="obsolete">Permuter les connexions de bureau distant (RDP) à cette machine</translation>
     </message>
     <message>
         <source>&Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Capture &vidéo</translation>
     </message>
     <message>
-        <source>&Video Capture Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Toggle video capture</source>
+        <translation type="obsolete">Permuter la capture vidéo</translation>
     </message>
     <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
+        <source>&Video Capture Settings...</source>
+        <translation>Réglages de la capture &vidéo...</translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
+        <source>Configure video capture settings</source>
+        <translation type="obsolete">Configurer les réglages de capture vidéo</translation>
     </message>
     <message>
-        <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <source>&Logging...</source>
+        <comment>debug action</comment>
+        <translation type="obsolete">Journa&lisation...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Popup Menu</source>
+        <translation>Menu contextuel</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Show Session Information Window</source>
+        <translation type="obsolete">Afficher la fenêtre d'information de session</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&Webcams</source>
+        <translation>&Webcams</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation>&Insérer l'image CD des Additions Invité...</translation>
     </message>
     <message>
-        <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <translation type="obsolete">Insère le fichier d'image disque des Additions Invité dans le lecteur virtuel</translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Réseau</translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Fichier</translation>
     </message>
     <message>
-        <source>&Keyboard</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard Settings...</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Réseau</translation>
+        <source>Display the Network Operations Manager window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
-        <translation type="unfinished"></translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Paramètres...</translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Afficher le &journal...</translation>
+        <source>Display the global preferences window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Fichier</translation>
+        <source>&Save State</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -997,175 +1010,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Paramètres...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
+        <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
+        <source>&Hard Disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
+        <source>&USB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Afficher le &journal...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1204,10 +1217,18 @@
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucune Webcam connectée</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
+        <translation type="unfinished">Aucune Webcam supportée connectée</translation>
+    </message>
+    <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1227,7 +1248,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1235,7 +1256,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1259,15 +1280,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1279,15 +1312,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1331,15 +1364,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1348,33 +1381,15 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Activer</translation>
-    </message>
+    <name>UIActonPool</name>
     <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
+        <source>Popup Menu</source>
+        <translation type="obsolete">Menu contextuel</translation>
     </message>
 </context>
 <context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1397,6 +1412,18 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -1430,7 +1457,7 @@
     </message>
     <message>
         <source>Description</source>
-        <translation>Description</translation>
+        <translation>Déscription</translation>
     </message>
     <message>
         <source>License</source>
@@ -2901,7 +2928,7 @@
     <message>
         <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
         <comment>details (network)</comment>
-        <translation>Pilote générique, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation type="obsolete">Pilote générique, '%1' {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -2921,31 +2948,31 @@
     <message>
         <source>Video Capture File</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Fichier de capture vidéo</translation>
     </message>
     <message>
         <source>Video Capture Attributes</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Attributs de la capture vidéo</translation>
     </message>
     <message>
         <source>Video Capture</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Capture vidéo</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Désactivée</translation>
     </message>
     <message>
         <source>NAT Network, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Réseau NAT, '%1'</translation>
     </message>
     <message>
         <source>Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>Taille de l'image : %1x%2, Taux de raffraîchissement de l'image : %3 ips, Taux de débit : %4kbps</translation>
     </message>
     <message>
         <source>Minimal Paravirtualization</source>
@@ -2963,54 +2990,34 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">Contrôleur USB</translation>
-    </message>
-    <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
-        <comment>details (user interface)</comment>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
-        <translation type="unfinished"></translation>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">Contrôleur USB</translation>
     </message>
     <message>
         <source>Menu-bar</source>
@@ -3042,6 +3049,31 @@
         <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details (user interface/mini-toolbar)</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UIGDetailsUpdateThreadAudio</name>
@@ -3309,7 +3341,7 @@
     </message>
     <message>
         <source>&Extension Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Paquetages d'&extension</translation>
     </message>
     <message>
         <source>Add Package</source>
@@ -3375,8 +3407,29 @@
         <translation type="obsolete">Désactiver l'é&conomiseur d'écran hôte</translation>
     </message>
     <message>
+        <source>&Dock and Menubar:</source>
+        <translation type="obsolete">&Dock et Barre de menu :</translation>
+    </message>
+    <message>
+        <source>Auto-Show in Fullscreen</source>
+        <translatorcomment>[BM]Needs to be checked</translatorcomment>
+        <translation type="obsolete">Plein écran automatique</translation>
+    </message>
+    <message>
+        <source>When checked, the host dock and menu bar will be shown when the virtual machine is in fullscreen mode.</source>
+        <translation type="obsolete">Si cochée, le dock et la barre de menu de l'hôte seront affichés lorsque la machine virtuelle est mode plein écran.</translation>
+    </message>
+    <message>
+        <source>&Host Screensaver:</source>
+        <translation type="obsolete">Economiseur d'écran de l'&hôte :</translation>
+    </message>
+    <message>
         <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
-        <translation type="unfinished"></translation>
+        <translation>Si cochée, l'économiseur d'écran de l'hôte sera désactivé lorsque qu'une machine virtuelle est en fonctionnement.</translation>
+    </message>
+    <message>
+        <source>Disable When Running Virtual Machines</source>
+        <translation type="obsolete">Désactiver pendant le fonctionnement de machines virtuelles</translation>
     </message>
     <message>
         <source>Host Screensaver:</source>
@@ -3423,19 +3476,27 @@
     </message>
     <message>
         <source>Host Key Combination</source>
-        <translation type="unfinished"></translation>
+        <translation>Combinaison de touches hôte</translation>
     </message>
     <message>
         <source>Some items have the same shortcuts assigned.</source>
-        <translation type="unfinished"></translation>
+        <translation>Plusieurs éléments ont les mêmes raccourci assignés.</translation>
     </message>
     <message>
         <source>&VirtualBox Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestionnaire &VirtualBox</translation>
     </message>
     <message>
         <source>Virtual &Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>&Machine virtuelle</translation>
+    </message>
+    <message>
+        <source>Lists all the available shortcuts which can be configured.</source>
+        <translation type="obsolete">Liste tous les raccourcis disponibles qui peuvent être configurés.</translation>
+    </message>
+    <message>
+        <source>Enter a sequence to filter the shortcut list.</source>
+        <translation type="obsolete">Entrer une séquence de filtrage de la liste de raccourcis.</translation>
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
@@ -3502,7 +3563,7 @@
     </message>
     <message>
         <source>&Interface Languages</source>
-        <translation type="unfinished"></translation>
+        <translation>Langues de l'&interface</translation>
     </message>
 </context>
 <context>
@@ -3659,116 +3720,131 @@
     </message>
     <message>
         <source>&NAT Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>Réseaux &NAT</translation>
     </message>
     <message>
         <source>Lists all available NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste tous les réseaux NAT disponibles.</translation>
     </message>
     <message>
         <source>&Host-only Networks</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>[BM]Must match with other translation of host-only elsewhere, yet to be checked.</translatorcomment>
+        <translation>Réseau &hôte uniquement</translation>
     </message>
     <message>
         <source>No new name specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun nouveau nom spécifié pour le réseau NAT précédemment nommé <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun CIDR spécifié pour le réseau NAT <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun CIDR spécifié pour le réseau NAT précédemment nommé <b>%1</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le CIDR spécifié (<i>%1</i>) pour le réseau NAT <b>%2</> est invalide.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>[BM]Called as in named could be then translated by nommé. Actual translation makes sense at this stage.</translatorcomment>
+        <translation>Le CIDR spécifié (<i>%1</i>) pour le réseau NAT appelé auparavant <b>%2</> est invalide.</translation>
     </message>
     <message>
         <source>Network Name</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>[BM]Or Nom de réseau, if context is a network settings dialog for example.</translatorcomment>
+        <translation>Nom du réseau</translation>
     </message>
     <message>
         <source>[empty]</source>
-        <translation type="unfinished"></translation>
+        <translation>[vide]</translation>
     </message>
     <message>
         <source>%1 (renamed from %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (renommé depuis %2)</translation>
     </message>
     <message>
         <source>Old Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Précédent nom de réseau</translation>
     </message>
     <message>
         <source>New Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nouveau nom de réseau</translation>
     </message>
     <message>
         <source>Network CIDR</source>
-        <translation type="unfinished"></translation>
+        <translation>Réseau CIDR</translation>
     </message>
     <message>
         <source>Supports DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Supporte le DHCP</translation>
     </message>
     <message>
         <source>yes</source>
-        <translation type="unfinished"></translation>
+        <translation>oui</translation>
     </message>
     <message>
         <source>no</source>
-        <translation type="unfinished"></translation>
+        <translation>non</translation>
     </message>
     <message>
         <source>Supports IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Supporte l'IPv6</translation>
     </message>
     <message>
         <source>Default IPv6 route</source>
-        <translation type="unfinished"></translation>
+        <translation>Route IPv6 par défaut</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'interface hôte <b>%1</b> ne dispose pas actuellement d'adresse IPv4 valide.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 network mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'interface hôte <b>%1</b> n'a pas actuellement de masque de réseau IPv4 valide.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv6 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'interface hôte <b>%1</b> ne dispose pas actuellement d'adresse IPv6 valide.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'interface hôte <b>%1</b> n'a pas actuellement d'adresse de serveur DHCP valide.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'interface hôte <b>%1</b> n'a pas actuellement de masque d'adresse de serveur DHCP valide.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server lower address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'interface hôte <b>%1</b> ne dispose pas actuellement de limite inférieure d'adresse de serveur DHCP valide.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server upper address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'interface hôte <b>%1</b> ne dispose pas actuellement de limite supérieure d'adresse de serveur DHCP valide.</translation>
     </message>
     <message>
         <source>The name <b>%1</b> is being used for several NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le nom <b>%1</b> est actuellement utilisé pour plusieurs réseaux NAT.</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>NAT network</comment>
-        <translation type="unfinished">Active</translation>
+        <translation>Actif</translation>
+    </message>
+    <message>
+        <source>&Add NAT network</source>
+        <translation type="obsolete">&Ajouter un réseau NAT</translation>
+    </message>
+    <message>
+        <source>&Remove NAT network</source>
+        <translation type="obsolete">&Retirer le réseau NAT</translation>
+    </message>
+    <message>
+        <source>&Edit NAT network</source>
+        <translation type="obsolete">&Éditer le réseau NAT</translation>
     </message>
     <message>
         <source>Add NAT Network</source>
@@ -3918,15 +3994,15 @@
     <name>UIGlobalSettingsNetworkDetailsHost</name>
     <message>
         <source>Host-only Network Details</source>
-        <translation type="unfinished">Détails du réseau privé hôte</translation>
+        <translation>Détails du réseau privé hôte</translation>
     </message>
     <message>
         <source>&Adapter</source>
-        <translation type="unfinished">&Interface</translation>
+        <translation>C&arte</translation>
     </message>
     <message>
         <source>Manual &Configuration</source>
-        <translation type="unfinished">&Configuration manuelle</translation>
+        <translation>&Configuration manuelle</translation>
     </message>
     <message>
         <source>Use manual configuration for this host-only network adapter.</source>
@@ -3934,86 +4010,86 @@
     </message>
     <message>
         <source>&IPv4 Address:</source>
-        <translation type="unfinished">Adresse &IPv4 :</translation>
+        <translation>Adresse &IPv4 :</translation>
     </message>
     <message>
         <source>Holds the host IPv4 address for this adapter.</source>
-        <translation type="unfinished">Affiche l'adresse IPv4 hôte pour cette interface.</translation>
+        <translation>Affiche l'adresse IPv4 hôte pour cette carte.</translation>
     </message>
     <message>
         <source>IPv4 Network &Mask:</source>
-        <translation type="unfinished">&Masque réseau IPv4 :</translation>
+        <translation>&Masque réseau IPv4 :</translation>
     </message>
     <message>
         <source>Holds the host IPv4 network mask for this adapter.</source>
-        <translation type="unfinished">Affiche le masque réseau IPv4 hôte pour cette interface.</translation>
+        <translation>Affiche le masque réseau IPv4 hôte pour cette carte.</translation>
     </message>
     <message>
         <source>I&Pv6 Address:</source>
-        <translation type="unfinished">Adresse I&Pv6 :</translation>
+        <translation>Adresse I&Pv6 :</translation>
     </message>
     <message>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Affiche l'adresse IPv6 hôte pour cette interface si l'IPv6 est supporté.</translation>
+        <translation>Affiche l'adresse IPv6 hôte pour cette carte si l'IPv6 est supporté.</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &Length:</source>
-        <translation type="unfinished">&Longueur du masque réseau IPv6 :</translation>
+        <translation>&Longueur du masque réseau IPv6 :</translation>
     </message>
     <message>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Affiche la longueur du préfixe du masque réseau IPv6 pour cette interface si l'IPv6 est supporté.</translation>
+        <translation>Affiche la longueur du préfixe du masque réseau IPv6 pour cette carte si l'IPv6 est supporté.</translation>
     </message>
     <message>
         <source>&DHCP Server</source>
-        <translation type="unfinished">Serveur &DHCP</translation>
+        <translation>Serveur &DHCP</translation>
     </message>
     <message>
         <source>&Enable Server</source>
-        <translation type="unfinished">&Activer le serveur</translation>
+        <translation>&Activer le serveur</translation>
     </message>
     <message>
         <source>Indicates whether the DHCP Server is enabled on machine startup or not.</source>
-        <translation type="obsolete">Indique si le serveur DHCP est activé au démarrage de la machine.</translation>
+        <translation type="obsolete">Indique si le serveur DHCP est activé au démarrage de la machine ou non.</translation>
     </message>
     <message>
         <source>Server Add&ress:</source>
-        <translation type="unfinished">Ad&resse du serveur :</translation>
+        <translation>Ad&resse du serveur :</translation>
     </message>
     <message>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Affiche l'adresse du serveur DHCP du réseau associé à cette interface de réseau privé hôte.</translation>
+        <translation>Affiche l'adresse du serveur DHCP du réseau associé à cette carte de réseau privé hôte.</translation>
     </message>
     <message>
         <source>Server &Mask:</source>
-        <translation type="unfinished">&Masque serveur :</translation>
+        <translation>&Masque serveur :</translation>
     </message>
     <message>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Affiche le masque réseau du serveur DHCP du réseau associé à cette interface de réseau privé hôte.</translation>
+        <translation>Affiche le masque réseau du serveur DHCP du réseau associé à cette carte de réseau privé hôte.</translation>
     </message>
     <message>
         <source>&Lower Address Bound:</source>
-        <translation type="unfinished">&Limite inférieure des adresses :</translation>
+        <translation>&Limite inférieure des adresses :</translation>
     </message>
     <message>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Affiche la limite inférieure de la plage d'adresses du serveur DHCP du réseau associé à cette interface de réseau privé hôte.</translation>
+        <translation>Affiche la limite inférieure de la plage d'adresses du serveur DHCP du réseau associé à cette carte de réseau privé hôte.</translation>
     </message>
     <message>
         <source>&Upper Address Bound:</source>
-        <translation type="unfinished">Limite s&upérieure des adresses :</translation>
+        <translation>Limite s&upérieure des adresses :</translation>
     </message>
     <message>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Affiche la limite supérieure de la plage d'adresses du serveur DHCP du réseau associé à cette interface de réseau privé hôte.</translation>
+        <translation>Affiche la limite supérieure de la plage d'adresses du serveur DHCP du réseau associé à cette carte de réseau privé hôte.</translation>
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4021,43 +4097,59 @@
     <name>UIGlobalSettingsNetworkDetailsNAT</name>
     <message>
         <source>NAT Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Détails de réseau NAT</translation>
     </message>
     <message>
         <source>&Enable Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Activ&er le réseau</translation>
+    </message>
+    <message>
+        <source>Enable this NAT network.</source>
+        <translation type="obsolete">Activer ce réseau NAT.</translation>
     </message>
     <message>
         <source>Network &Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Nom de réseau :</translation>
     </message>
     <message>
         <source>Holds the name for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contient le nom de ce réseau.</translation>
     </message>
     <message>
         <source>Network &CIDR:</source>
-        <translation type="unfinished"></translation>
+        <translation>&CIDR du réseau :</translation>
     </message>
     <message>
         <source>Holds the CIDR for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contient le CIDR pour ce réseau.</translation>
     </message>
     <message>
         <source>Network Options:</source>
-        <translation type="unfinished"></translation>
+        <translation>Options réseau :</translation>
     </message>
     <message>
         <source>Supports &DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Supporte le &DHCP</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports DHCP.</source>
+        <translation type="obsolete">Détermine si ce réseau supporte le DHCP.</translation>
     </message>
     <message>
         <source>Supports &IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Supporte l'&IPv6</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports IPv6.</source>
+        <translation type="obsolete">Détermine si ce réseau supporte l'IPv6.</translation>
     </message>
     <message>
         <source>Advertise Default IPv6 &Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Annoncer la &route IPv6 par défaut</translation>
+    </message>
+    <message>
+        <source>Determines whether this network should be advertised as the default IPv6 route.</source>
+        <translation type="obsolete">Détermine si ce réseau doit être annoncé comme la route IPv6 par défaut.</translation>
     </message>
     <message>
         <source>Opens a window to manage port forwarding rules.</source>
@@ -4065,7 +4157,7 @@
     </message>
     <message>
         <source>&Port Forwarding</source>
-        <translation type="unfinished">Redirection de &ports</translation>
+        <translation>Redirection de &ports</translation>
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
@@ -4092,15 +4184,15 @@
     <name>UIGlobalSettingsPortForwardingDlg</name>
     <message>
         <source>Port Forwarding Rules</source>
-        <translation type="unfinished">Règles de redirection de ports</translation>
+        <translation>Règles de redirection de ports</translation>
     </message>
     <message>
         <source>IPv4</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4</translation>
     </message>
     <message>
         <source>IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6</translation>
     </message>
 </context>
 <context>
@@ -4155,11 +4247,11 @@
     </message>
     <message>
         <source>No proxy host is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun hôte proxy actuellement spécifié.</translation>
     </message>
     <message>
         <source>No proxy port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun port proxy actuellement spécifié.</translation>
     </message>
     <message>
         <source>Holds the proxy host.</source>
@@ -4236,71 +4328,71 @@
     <name>UIHostComboEditor</name>
     <message>
         <source><key_%1></source>
-        <translation type="unfinished"><Touche_%1></translation>
+        <translation><touche_%1></translation>
     </message>
     <message>
         <source>Left </source>
-        <translation type="unfinished">Gauche </translation>
+        <translation>Gauche </translation>
     </message>
     <message>
         <source>Right </source>
-        <translation type="unfinished">Droite </translation>
+        <translation>Droite </translation>
     </message>
     <message>
         <source>Left Shift</source>
-        <translation type="unfinished">Maj gauche</translation>
+        <translation>Maj. gauche</translation>
     </message>
     <message>
         <source>Right Shift</source>
-        <translation type="unfinished">Maj droite</translation>
+        <translation>Maj. droite</translation>
     </message>
     <message>
         <source>Left Ctrl</source>
-        <translation type="unfinished">Ctrl gauche</translation>
+        <translation>Ctrl gauche</translation>
     </message>
     <message>
         <source>Right Ctrl</source>
-        <translation type="unfinished">Ctrl droite</translation>
+        <translation>Ctrl droite</translation>
     </message>
     <message>
         <source>Left Alt</source>
-        <translation type="unfinished">Alt gauche</translation>
+        <translation>Alt gauche</translation>
     </message>
     <message>
         <source>Right Alt</source>
-        <translation type="unfinished">Alt droite</translation>
+        <translation>Alt droite</translation>
     </message>
     <message>
         <source>Left WinKey</source>
-        <translation type="unfinished">Windows gauche</translation>
+        <translation>Windows gauche</translation>
     </message>
     <message>
         <source>Right WinKey</source>
-        <translation type="unfinished">Windows droite</translation>
+        <translation>Windows droite</translation>
     </message>
     <message>
         <source>Menu key</source>
-        <translation type="unfinished">Touche menu</translation>
+        <translation>Touche menu</translation>
     </message>
     <message>
         <source>Alt Gr</source>
-        <translation type="unfinished">Alt Gr</translation>
+        <translation>Alt Gr</translation>
     </message>
     <message>
         <source>Caps Lock</source>
-        <translation type="unfinished">Verr Maj</translation>
+        <translation>Verrouillage Majuscules</translation>
     </message>
     <message>
         <source>Scroll Lock</source>
-        <translation type="unfinished">Arrêt défil</translation>
+        <translation>Arrêt défilement</translation>
     </message>
     <message>
         <source>Host+</source>
-        <translation type="unfinished"></translation>
+        <translation>Hôte+</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun(e)</translation>
     </message>
 </context>
 <context>
@@ -4488,22 +4580,23 @@
     </message>
     <message>
         <source>Reset shortcut to default</source>
-        <translation type="unfinished"></translation>
+        <translation>Réinitialiser le raccourci par défaut</translation>
     </message>
     <message>
         <source>Unset shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Supprimer le raccourci</translation>
     </message>
 </context>
 <context>
     <name>UIHotKeyTableModel</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Kept as Latin Alias on Macs ;-)</translatorcomment>
+        <translation>Raccourci</translation>
     </message>
 </context>
 <context>
@@ -4694,23 +4787,24 @@
     </message>
     <message>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Indique l'activité de la capture vidéo : </nobr><br>%1</translation>
     </message>
     <message>
         <source><nobr><b>Video capture disabled</b></nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Capture vidéo désactivée</b></nobr></translation>
     </message>
     <message>
         <source><nobr><b>Video capture file:</b> %1</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Fichier de capture vidéo : </b>%1</nobr></translation>
     </message>
     <message>
         <source>Additional feature status:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="unfinished"></translation>
+        <translation>Status de la fonctionalité supplémentaire : <br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4724,8 +4818,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4798,6 +4891,14 @@
         <source>Select a filename for the screenshot ...</source>
         <translation>Choisissez un nom de fichier pour la capture d'écran ...</translation>
     </message>
+    <message>
+        <source>No Webcams Connected</source>
+        <translation type="obsolete">Aucune Webcam connectée</translation>
+    </message>
+    <message>
+        <source>No supported webcams connected to the host PC</source>
+        <translation type="obsolete">Aucune Webcam supportée connectée</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsAudio</name>
@@ -4955,122 +5056,130 @@
     </message>
     <message>
         <source>Video &Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>&Capture vidéo</translation>
     </message>
     <message>
         <source>When checked, VirtualBox will record the virtual machine session as a video file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Si cochée, VirtualBox enregistrera la session de machine virtuelle dans un fichier vidéo.</translation>
     </message>
     <message>
         <source>&Enable Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Activ&er la capture vidéo</translation>
     </message>
     <message>
         <source>File &Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Chemin du fichier :</translation>
+    </message>
+    <message>
+        <source>This setting determines the filename VirtualBox uses to save the recorded content.</source>
+        <translation type="obsolete">Ce paramètre détermine le nom du fichier que VirtualBox utilise pour le contenu enregistré.</translation>
     </message>
     <message>
         <source>Frame &Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Taille de l'image :</translation>
+    </message>
+    <message>
+        <source>This setting determines the resolution (frame size) of the recorded video.</source>
+        <translation type="obsolete">Ce paramètre détermine la résolution (taille d'image) de la vidéo enregistrée.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
+        <translation type="obsolete">Ce paramètre détermine la résolution <b>horizontale</b> (largeur d'image) de la vidéo enregistrée.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>vertical</b> resolution (frame height) of the recorded video.</source>
+        <translation type="obsolete">Ce paramètre détermine la résolution <b>verticale</b> (hauteur d'image) de la vidéo enregistrée.</translation>
     </message>
     <message>
         <source>&Frame Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Images par seconde :</translation>
+    </message>
+    <message>
+        <source>This setting determines the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
+        <translation type="obsolete">Ce paramètre détermine le nombre maximum d'<b>images par seconde</b>. Les images supplémentaires seront ignorées. La réduction de cette valeur augmentera le nombre d'images ignorées et réduira la taille du fichier.</translation>
     </message>
     <message>
         <source>&Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Qualité :</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Ce paramètre détermine la <b>qualité</b>. L'augementation de cette valeur améliorera le rendu de la vidéo au prix d'une taille de fichier plus grande.</translation>
+    </message>
+    <message>
+        <source>This setting determines the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Ce paramètre détermine le débit en <b>kilobits par seconde</b>. L'augementation de cette valeur améliorera le rendu de la vidéo au prix d'une taille de fichier plus grande.</translation>
     </message>
     <message>
         <source>&Screens:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecran&s :</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use hardware graphics acceleration. However the host system does not currently provide this, so you will not be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>La machine virtuelle est paramètrée pour utiliser l'accélaration graphique matérielle. Cependant le système hôte ne propose actuellement pas cette fonctionnalité. Vous ne pourrez donc pas démarrer la machine.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to fullscreen or seamless mode.</source>
+        <translation type="obsolete">Moins de <b>%1</b> de la mémoire vidéo est actuellement alloué à la machine virtuelle, ce qui est le minimum nécessaire pour basculer en mode plein écran ou en mode intégré.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required for High Definition Video to be played efficiently.</source>
-        <translation type="unfinished"></translation>
+        <translation>Moins de <b>%1</b> de la mémoire vidéo est actuellement alloué à la machine virtuelle, ce qui est le minimum recquis pour la reproduction efficace de la vidéo HD.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least b>%1</b>.</source>
+        <translation type="obsolete">La machine virtuelle est paramétrée pour utiliser l'accélération graphique et l'indicateur de système d'exploitation est réglé sur Windows Vista ou ultérieur. Pour de meilleures performances, vous devriez régler la mémoire vidéo de la machine à au moins <b>%1</b>.</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use Video Stream Acceleration. As this feature only works with Windows guest systems it will be disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>La machine virtuelle est paramètrée pour utiliser l'accélération des flux vidéo. Dans le mesure où cette fonctionnalité ne s'applique qu'aux systèmes invités Windows, elle sera désactivée.</translation>
     </message>
     <message>
         <source>The VRDE server port value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>La valeur du port du serveur VRDE n'est actuellement pas spécifiée.</translation>
     </message>
     <message>
         <source>The VRDE authentication timeout value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>La valeur du délai d'authentification n'est actuellement pas spécifiée.</translation>
     </message>
     <message>
         <source>User Defined</source>
-        <translation type="unfinished"></translation>
+        <translation>Défini par l'utilisateur</translation>
     </message>
     <message>
         <source>%1 fps</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ips</translation>
     </message>
     <message>
         <source>fps</source>
-        <translation type="unfinished"></translation>
+        <translation>ips</translation>
     </message>
     <message>
         <source>low</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>basse</translation>
     </message>
     <message>
         <source>medium</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>moyenne</translation>
     </message>
     <message>
         <source>high</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>haute</translation>
     </message>
     <message>
         <source>kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>kbps</translation>
     </message>
     <message>
         <source>Screen %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecran %1</translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Barre d'outils compacte :</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Si cette case est cochée la barre d'outils compacte sera affichée en modes plein écran et intégré.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">A&fficher en plein écran/mode intégré</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Si cette case est cochée la barre d'outils compacte sera affichée en haut de l'écran, plutôt qu'en bas comme par défaut.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Afficher en hau&t de l'écran</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Enable video recording for screen %1.</source>
+        <translation type="obsolete">Activer l'enregistrement vidéo pour l'écran %1.</translation>
     </message>
     <message>
         <source>&Screen</source>
@@ -5085,15 +5194,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">3D  {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D  {200%?}</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5109,10 +5214,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5161,6 +5262,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 Mo</translation>
     </message>
@@ -5169,6 +5278,10 @@
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5180,8 +5293,8 @@
         <translation type="obsolete">Affiche le dossier dans lequel les instantanés de cette machine virtuelle seront sauvegardés. Sachez que les instantanés peuvent prendre beaucoup de place.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Simple</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Simple</translation>
     </message>
     <message>
         <source>&Name:</source>
@@ -5192,8 +5305,8 @@
         <translation type="obsolete">Affiche le nom de la machine virtuelle.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Avancé</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Avancé</translation>
     </message>
     <message>
         <source>&Shared Clipboard:</source>
@@ -5208,8 +5321,8 @@
         <translation>Dossier des i&nstantanés :</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Description</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Description</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5252,8 +5365,8 @@
         <translation type="obsolete">vous avez choisi un système de type 64 bit pour cette machine virtuelle. Comme la virtualisation matérielle de l'hôte (VT-x/AMD-V) est nécessaire pour un tel invité, elle sera automatiquement activée.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation>&Glisser-Déposer :</translation>
+        <source>&Drag'n'Drop:</source>
+        <translation type="obsolete">&Glisser-Déposer :</translation>
     </message>
     <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
@@ -5261,13 +5374,29 @@
     </message>
     <message>
         <source>No name specified for the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun nom spécifié pour la machine virtuelle.</translation>
     </message>
     <message>
         <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
+        <translation>L'indicateur de système d'exploitation virtuel est défini sur le type 64 bits. Les systèmes invités 64 bits nécessitent la virtualisation matérielle, elle sera donc automatiquement activée si vous confirmez les modifications.</translation>
+    </message>
+    <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">A&vancé</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>D&escription</source>
+        <translation type="unfinished">D&escription</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5284,6 +5413,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5316,16 +5449,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5336,28 +5465,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">3D  {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D  {200%?}</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Barre d'outils compacte :</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Si cette case est cochée la barre d'outils compacte sera affichée en modes plein écran et intégré.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">A&fficher en plein écran/mode intégré</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Si cette case est cochée la barre d'outils compacte sera affichée en haut de l'écran, plutôt qu'en bas comme par défaut.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -5367,18 +5488,6 @@
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -5517,35 +5626,35 @@
     </message>
     <message>
         <source>No bridged network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun adaptateur de réseau ponté actuellement sélectionné.</translation>
     </message>
     <message>
         <source>No internal network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun nom de réseau interne actuellement spécifié.</translation>
     </message>
     <message>
         <source>No host-only network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun nom d'adaptateur réseau hôte uniquement actuellement spécifié.</translation>
     </message>
     <message>
         <source>No generic driver is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun pilote générique actuellement spécifié.</translation>
     </message>
     <message>
         <source>The MAC address must be 12 hexadecimal digits long.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'adresse MAC doit avoir 12 chiffres héxadécimaux de longueur.</translation>
     </message>
     <message>
         <source>The second digit in the MAC address may not be odd as only unicast addresses are allowed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le deuxième chiffre dans l'adresse MAC ne peut être impair car seules les adresses unicast sont autorisées.</translation>
     </message>
     <message>
         <source>No NAT network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun nom de réseau NAT actuellement spécifié.</translation>
     </message>
     <message>
         <source>Holds the name of the NAT network that this network card will be connected to. You can create and remove networks using the global network settings in the virtual machine manager window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contient le nom du réseau NAT auquel cette carte réseau sera connectée. Vous pouvez créer et supprimer des réseau en utilisant les paramètres globaux de réseau dans la fenêtre du gestionnaire de machine virtuelle.</translation>
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
@@ -5617,19 +5726,19 @@
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucune IRQ actuellement spécifiée.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun port E/S actuellement spécifié.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Plusieurs ports ont les mêmes paramètres.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun chemin de port actuellement spécifié.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
@@ -5650,6 +5759,27 @@
         <source>Duplicate port path entered </source>
         <translation type="obsolete">Le chemin du port choisi fait doublon </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translatorcomment>[BM]Interuption is femine in French</translatorcomment>
+        <translation type="obsolete">Aucune IRQ actuellement spécifiée.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">Aucun port E/S actuellement spécifié.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Plusieurs ports ont les mêmes paramètres.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">Aucun chemin de port actuellement spécifié.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">Plusieurs chemins de port sont actuellement en double.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsPortForwardingDlg</name>
@@ -5833,6 +5963,10 @@
         <translation type="obsolete">Si cette case est cochée le dossier partagé sera créé de façon permanente.</translation>
     </message>
     <message>
+        <source>Window</source>
+        <translation type="obsolete">Fenêtre</translation>
+    </message>
+    <message>
         <source>When checked, this shared folder will be permanent.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5901,40 +6035,40 @@
         <translation>Affiche l'adresse E/S de ce port série. Celle-ci doit être un nombre entier compris entre <tt>0</tt> et <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucune IRQ actuellement spécifiée.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun port E/S actuellement spécifié.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Plusieurs ports ont les mêmes paramètres.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aucun chemin de port actuellement spécifié.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
@@ -5955,6 +6089,26 @@
         <source>Duplicate port path entered </source>
         <translation type="obsolete">Le chemin du port choisi fait doublon </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">Aucune IRQ actuellement spécifiée.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">Aucun port E/S actuellement spécifié.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Plusieurs ports ont les mêmes paramètres.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">Aucun chemin de port actuellement spécifié.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">Les chemins de port spécifié sont actuellement en double.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsStorage</name>
@@ -5984,7 +6138,7 @@
     </message>
     <message>
         <source>No hard disk is selected for <i>%1</i>.</source>
-        <translation type="unfinished">Aucun disque dur n'est affecté à <i>%1</i>.</translation>
+        <translation>Aucun disque dur n'est affecté à <i>%1</i>.</translation>
     </message>
     <message>
         <source><i>%1</i> uses a medium that is already attached to <i>%2</i>.</source>
@@ -6319,46 +6473,46 @@
     </message>
     <message>
         <source>No name is currently specified for the controller at position <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucun nom n'est actuellement spécifié pour le contrôleur à la position <b>%1</b>.</translation>
     </message>
     <message>
         <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le contrôleur à la position <b>%1</b> a le même nom que le contrôleur à la position <b>%2</b>.</translation>
     </message>
     <message>
         <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>%1</i> utilise un disque qui déjà attaché à <i>%2</i>.</translation>
     </message>
     <message>
         <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>La machine dispose actuellement de plus de contrôleurs de stockage assigné qu'un chipset %1 ne le supporte. Veuillez changer le type de chipset dans les paramètres Système ou réduire le nombre de contrôleurs de stockage suivants dans la page des paramètres Stockage : %2</translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk file...</source>
-        <translation type="obsolete">Choisissez un fichier de disque optique virtuel...</translation>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6366,68 +6520,65 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Disque virtuel</translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source>Add USB Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Disque virtuel</translation>
-    </message>
-    <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6443,7 +6594,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6655,30 +6806,54 @@
     </message>
     <message>
         <source>&Pointing Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>Système de &pointage : </translation>
     </message>
     <message>
         <source>Determines whether the emulated pointing device is a standard PS/2 mouse, a USB tablet or a USB multi-touch tablet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Détermine si le système de pointage émulé est une souris PS/2 standard, une tablette USB ou une tablette multi-touch.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. Not enough memory is left for the host operating system. Please select a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Plus de <b>%1%</b> de mémoire de l'ordinateur hôte (<b>%2</b>) est assigné à la machine virtuelle. Il ne reste plus assez de mémoire pour le système d'exploitation hôte. Veuillez choisir une quantité moins élevée.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. There might not be enough memory left for the host operating system. Please consider selecting a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Plus de <b>%1%</b> de mémoire de l'ordinateur hôte (<b>%2</b>) est assigné à la machine virtuelle. Il pourrait ne plus rester assez de mémoire pour le système d'exploitation hôte. Veuillez choisir une quantité moins élevée.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">La fonctionnalité E/S APIC n'est actuellement pas activée dans la section Carte-mère de la page Système. Cela est nécessaire afin de pouvoir supporter un chipset de type ICH9. Cela sera fait automatiquement si vous confirmez vos changements.</translation>
+    </message>
+    <message>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">L'émulation de contrôleur USB n'est actuellement pas activée sur la page des réglages USB. Cela est nécessaire afin de pouvoir supporter un système d'entrée USB émulé. Cela sera fait automatiquement si vous confirmez vos changements.</translation>
     </message>
     <message>
         <source>For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pour des raisons de performance, le nombre de processeurs virtuels alloués à la machine virtuelle ne peut être supérieure au double du nombre de processeurs physiques sur l'hôte (<b>%1</b>). Veuillez réduire le nombre de processeurs virtuels.</translation>
     </message>
     <message>
         <source>More virtual CPUs are assigned to the virtual machine than the number of physical CPUs on the host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le nombre de processeurs virtuels alloués à la machine virtuelle est supérieure au nombre de processeurs physiques sur l'hôte (<b>%1</b>). Veuillez considérer la réduction du nombre de processeurs virtuels.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">La fonctionnalité E/S APIC n'est actuellement pas activée dans la section Carte-mère de la page Système. Cela est nécessaire afin de pouvoir supporter un chipset de type ICH9. Cela sera fait automatiquement si vous confirmez vos changements.</translation>
+    </message>
+    <message>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">La virtualisation matérielle n'est actuellement pas activée dans la section Accélération de la page de réglages Système. Cela sera fait automatiquement si vous confirmez vos changements.</translation>
     </message>
     <message>
         <source>The processor execution cap is set to a low value. This may make the machine feel slow to respond.</source>
+        <translation>Le limiteur d'exécution du procésseur est réglé sur une valeur basse. Cela pourrait rendre la machine peu répondante.</translation>
+    </message>
+    <message>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6706,14 +6881,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 Mo</translation>
     </message>
@@ -6865,31 +7032,35 @@
         <translation type="obsolete">USB 2.0 est activée pour cette machine virtuelle, mais ceci nécessite que l'extension <b>%1</b> soit installée. Veuillez installer l'extension à partir du site de téléchargement VirtualBox. Vous pourrez alors réactiver USB 2.0. En attendant, la fonctionnalité sera désactivée si vous n'annulez pas les changements actuels.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0 to be able to start the machine.</source>
+        <translation type="obsolete">L'USB 2.0 est actuellement activé pour cette machine virtuelle. L'installation de <b>%1</b> est cependant requise. Veuillez installer le pack d'extension depuis le site de téléchargement VirtualBox ou desactiver l'USB 2.0 afin de pouvoir démarrer la machine.</translation>
+    </message>
+    <message>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7146,12 +7317,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Fermer</translation>
+        <source>Switch</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch</source>
-        <translation type="unfinished">Basculer</translation>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
     </message>
     <message>
         <source>Enable Menu Bar</source>
@@ -7518,7 +7689,7 @@
     <message>
         <source>Check</source>
         <comment>inaccessible media message box</comment>
-        <translation>Tester</translation>
+        <translation>Vérifier</translation>
     </message>
     <message>
         <source>Switch</source>
@@ -7622,8 +7793,8 @@
         <translation type="obsolete">Affiche dans une fenêtre des informations sur ce produit</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Une nouvelle version de VirtualBox est disponible ! La version <b>%1</b> est disponible sur <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Vous pouvez télécharger cette version en utilisant le lien suivant : </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>Une nouvelle version de VirtualBox est disponible ! La version <b>%1</b> est disponible sur <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Vous pouvez télécharger cette version en utilisant le lien suivant : </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -7703,11 +7874,11 @@
     </message>
     <message>
         <source><p>One or more virtual hard disks, CD/DVD or floppy disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="obsolete"><p>Un ou plusieurs disques durs virtuels, CD, DVD, ou disquettes ne sont pas pas accessibles pour l'instant. Vous ne pourrez démarrer de machines virtuelles qui les utilisent tant qu'ils ne seront pas accessibles.</p><p>Cliquez sur <b>Ouvrir</b> pour ouvrir le Gestionnaire de médias virtuels et voir quels médias sont inaccessibles, ou bien sur <b>Ignorer</b> pour ignorer ce message.</p></translation>
+        <translation type="obsolete"><p>Un ou plusieurs disques durs virtuels, CD, DVD, ou disquettes ne sont pas pas accessibles pour l'instant. Vous ne pourrez démarrer de machines virtuelles qui les utilisent tant qu'ils ne seront pas accessibles.</p><p>Cliquez sur <b>Vérifier</b> pour ouvrir le Gestionnaire de médias virtuels et voir quels médias sont inaccessibles, ou bien sur <b>Ignorer</b> pour ignorer ce message.</p></tran [...]
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Une erreur critique est survenue pendant l'exécution de la machine virtuelle et cette dernière a été arrêtée.</p><p>Pour obtenir de l'aide vous pouvez vous rendre dans la section Community de <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> ou consulter votre contrat de support. Postez le fichier journal <tt>VBox.log</tt> et le fichier image <tt>VBox.png</tt> que vous tr [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Une erreur critique est survenue pendant l'exécution de la machine virtuelle et cette dernière a été arrêtée.</p><p>Pour obtenir de l'aide vous pouvez vous rendre dans la section Community de <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> ou consulter votre contrat de support. Postez le fichier journal <tt>VBox.log</tt> et le fichier image <tt>VBox.png</tt> que vous trouverez dans l [...]
     </message>
     <message>
         <source>Could not access USB on the host system, because neither the USB file system (usbfs) nor the DBus and hal services are currently available. If you wish to use host USB devices inside guest systems, you must correct this and restart VirtualBox.</source>
@@ -8450,204 +8621,240 @@
     </message>
     <message>
         <source><p>Cannot start the VirtualBox Manager due to local restrictions.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Impossible de démarrer le Gestionnaire VirtualBox en raisons de restrictions locales.</p><p>Cette application va maintenant s'arrêter.</p></translation>
     </message>
     <message>
         <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p> Impossible de trouver le fichier de langue pour la langue <b>%1</b> dans le dossier <b><nobr>%2</b>.</p><p>La langue va temporairement être remise à la langue par défaut du système. Veuillez sélectionner une des langues disponibles sur la page <b>Langue</b> dans la fenêtre des <b>Préférences</b> accessible depuis le menu <b>Fichier</b> de la fenêtre du Gestionnaire VirtualBox.< [...]
     </message>
     <message>
         <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p> Impossible de charger le fichier de langue pour la langue <b><nobr>%1</nobr></b>.</p><p>La langue va temporairement être réglée sur Anglais (intégré). Veuillez sélectionner une des langues disponibles sur la page <b>Langue</b> dans la fenêtre des <b>Préférences</b> accessible depuis le menu <b>Fichier</b> de la fenêtre du Gestionnaire VirtualBox.</p></translation>
     </message>
     <message>
         <source>There is no virtual machine with the identifier <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aucune machine virtuelle pour l'identifiant <b>%1</b>.</translation>
     </message>
     <message>
         <source>Ignore</source>
-        <translation type="unfinished">Ignorer</translation>
+        <translation>Ignorer</translation>
     </message>
     <message>
         <source>Failed to create NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Echec de la création du réseau NAT.</translation>
     </message>
     <message>
         <source>Failed to remove NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Echec la suppresion du réseau NAT <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create DHCP server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Echec de la création du serveur DHCP.</translation>
     </message>
     <message>
         <source>Failed to remove DHCP server for network interface <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Echec de la suppresion du serveur DHCP pour l'interface réseau <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create the host network interface.</source>
-        <translation type="unfinished"></translation>
+        <translation>Echec de la création de l'interface du réseau hôte.</translation>
     </message>
     <message>
         <source>Create &new disk</source>
-        <translation type="unfinished">Créer un &nouveau disque</translation>
+        <translation>Créer un &nouveau disque</translation>
     </message>
     <message>
         <source>&Choose existing disk</source>
-        <translation type="unfinished">&Choisir un disque existant</translation>
+        <translation>&Choisir un disque existant</translation>
     </message>
     <message>
         <source>Leave &empty</source>
-        <translation type="unfinished">Laisser &vide</translation>
+        <translation>Laisser &vide</translation>
     </message>
     <message>
         <source>&Choose disk</source>
-        <translation type="unfinished">&Choisir un disque</translation>
+        <translation>&Choisir un disque</translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Êtes-vous sûr de vouloir libérer le disque dur virtuel <nobr><b>%1</b></nobr> ?</p><p>Celà le libérera de la ou des machine(s) virtuelle(s) suivante(s) : <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual optical disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Êtes-vous sûr de vouloir libérer le lecteur de disque optique virtuel <nobr><b>%1</b></nobr> ?</p><p>Celà le libérera de la ou des machine(s) virtuelle(s) suivante(s) : <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual floppy disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Êtes-vous sûr de vouloir libérer le lecteur de disquette virtuel <nobr><b>%1</b></nobr> ?</p><p>Celà le libérera de la ou des machine(s) virtuelle(s) suivante(s) : <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Êtes-vous sûr de vouloir libérer le disque dur virtuel <nobr><b>%1</b></nobr> de liste des fichiers d'image disque connus ?</p></translation>
     </message>
     <message>
         <source><p>As this hard disk is inaccessible its image file can not be deleted.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Ce disque dur étant inaccessible, son fichier image ne peut être effacé.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual optical disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Êtes-vous sûr de vouloir libérer le disque optique virtuel <nobr><b>%1</b></nobr> de liste des fichiers d'image disque connus ?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual floppy disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Êtes-vous sûr de vouloir libérer le lecteur de disquette virtuel <nobr><b>%1</b></nobr> de liste des fichiers d'image disque connus ?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual optical disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Impossible d'insérer le disque optique virtuel <nobr><b>%1</b>dans la machine <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force insertion of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Souhaitez-vous essayer de forcer l'insertion du disque ?</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual optical disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Impossible d'éjecter le disque optique virtuel <nobr><b>%1</b></nobr> de la machine <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force ejection of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Souhaitez-vous essayer l'éjection de force du disque ?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual floppy disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Impossible d'insérer la disquette virtuelle <nobr><b>%1</b>dans la machine <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual floppy disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Impossible d'éjecter la disquette virtuelle <nobr><b>%1</b></nobr> de la machine <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source>Failed to open the hard disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Echec de l'ouverture du fichier de disque dur <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the optical disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Echec de l'ouverture du fichier de disque optique <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the floppy disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Echec de l'ouverture du fichier de disquette <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the hard disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Echec de la fermeture du fichier de disque dur <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the optical disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Echec de la fermeture du fichier de disque optique <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the floppy disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Echec de la fermeture du fichier de disquette virtuelle <nobr><b>%2</b></nobr>.</translation>
     </message>
     <message numerus="yes">
         <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><p>La machine virtuelle suivante est actuellement en état sauvegardé : <b>%1</b></p><p>Si vous continuez, l'état d'exécution de la machine exportée sera supprimé. La ou les autres machines ne seront pas modifiées.</p></numerusform>
+            <numerusform><p>Les %n machines virtuelles suivantes sont actuellement en état sauvegardé : <b>%1</b></p><p>Si vous continuez, l'état d'exécution des machines exportées sera supprimé. La ou les autres machines ne seront pas modifiées.</p></numerusform>
         </translation>
     </message>
     <message>
         <source>Switch</source>
-        <translation type="unfinished">Basculer</translation>
+        <translation>Permuter</translation>
     </message>
     <message>
         <source>Failed to enable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Echec de l'activation du serveur de bureau distant pour la machine virtuelle <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Echec de la désactivation du serveur de bureau distant pour la machine virtuelle <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to enable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Echec de l'activation de la capture vidéo pour la machine virtuelle <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Echec de la désactivation de la capture vidéo pour la machine virtuelle <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox Guest Additions</b> disk image file.</p><p>Do you wish to download this disk image file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Impossible de trouver le fichier d'image disque des <b>Additions Invités VirtualBox</b>.</p>Souhaitez-vous télécharger ce fichier depuis l'Internet ?</p></translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished">Téléchargement</translation>
+        <translation>Télécharger</translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox Guest Additions</b> disk image file from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Êtes-vous sûr de vouloir télécharger l'image disque des <b>Additions Invité VirtualBox</b> depuis <nobr><a href="%1">%1</a></nobr> (taille %2 octets) ?</p></translation>
     </message>
     <message>
         <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Le fichier d'image disque <b>Additions Invité VirtualBox</b> a bien été téléchargé depuis <nobr><a href="%1">%1</a></nobr> mais n'a pas être enregistré localement en tant que <nobr><b>%2</b>.</nobr></p><p>Veuillez choisir un autre emplacement pour ce fichier.</p></translation>
+    </message>
+    <message>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual CD/DVD drive?</p></source>
+        <translation type="obsolete"><p>Le fichier d'image disque <b>Additions Invité VirtualBox</b> a bien été téléchargé depuis <nobr><a href="%1">%1</a></nobr> et enregistré localement en tant que <nobr><b>%2</b>.</nobr></p><p>Souhaitez-vous consigner ce fichier d'image disque et l'insérer dans le lecteur de CD/DVD virtuel ?</p></translation>
+    </message>
+    <message>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no CD/DVD drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <translation type="obsolete"><p>Impossible d'insérer le fichier d'image disque <b>Additions Invité VirtualBox</b> dans la machine virtuelle <b>%1</b> : la machine n'a pas de lecteur CD/DVD. Veuillez ajouter un lecteur en utilisant la page stockage de la fenêtre des réglages de la machine virtuelle.</p></translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Impossible de trouver le <b>Manuel de l'utilisateur de VirtualBox</b>.<nobr><b>%1</b> Souhaitez-vous le télécharger depuis l'Internet ?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox User Manual</b> from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Êtes-vous sûr de vouloir télécharger le <b>Manuel de l'Utilisateur VirtualBox</b> depuis <a href="%1">%1</a></nobr> (taille %2 octets) ?</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"><p>Le guide de l'utilisateur de VirtualBox a été téléchargé a partir de <nobr><a href="%1">%2</a></nobr> mais ne peut pas être enregistré sous <nobr><b>%3</b>.</nobr></p><p>Veuillez choisir un autre emplacement pour le fichier.</p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>Le guide de l'utilisateur de VirtualBox a été téléchargé à partir de <nobr><a href="%1">%1</a></nobr> mais ne peut pas être enregistré sous <nobr><b>%2</b>.</nobr></p><p>Veuillez choisir un autre emplacement pour le fichier.</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p></source>
-        <translation type="unfinished"><p>Le guide de l'utilisateur de VirtualBox a été téléchargé a partir de <nobr><a href="%1">%2</a></nobr> et enregistré sous <nobr><b>%3</b>.</nobr></p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>Le guide de l'utilisateur de VirtualBox a été téléchargé à partir de <nobr><a href="%1">%1</a></nobr> et enregistré sous <nobr><b>%2b>.</nobr></p></translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Fermer</translation>
+        <translation>Fermer</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">Ok</translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Do not show this message again</source>
-        <translation type="unfinished">Ne plus afficher ce message</translation>
+        <translation>Ne plus afficher ce message</translation>
     </message>
     <message>
         <source><p>Do you want to remove the NAT network <nobr><b>%1</b>?</nobr></p><p>If this network is in use by one or more virtual machine network adapters these adapters will no longer be usable until you correct their settings by either choosing a different network name or a different adapter attachment type.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Souhaitez-vous hôter le réseau NAT <nobr><b>%1</b> ?</nobr></p><p>Si ce réseau en cours d'utilisation par une ou plusieurs adaptateurs réseau de machine virtuelle, ces adaptateurs ne seront plus utilisable tant que vous ne saisissez pas des paramètres corects ou ne choisissiez un nom d'adaptateur ou un type  d'adaptateur réseau.</p></translation>
     </message>
     <message>
         <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Échec de la connexion de la webcam <b>%1</b> à la machine virtuelle <b>%2</b>.</translation>
     </message>
     <message>
         <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Échec de la déconnexion de la webcam <b>%1</b> à la machine virtuelle <b>%2</b>.</translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Les Additions Invités VirtualBox semblent ne pas être actives sur cette machine virtuelle. De ce fait les dossiers partagés ne peuvent pas être utilisés. Pour utiliser les dossiers partagés dans cette machine virtuelle, installez les Additions Invités, ou bien réinstallez-les si elles ne fonctionnent pas correctement en choisissant <b>Installer les Additions Invités...</b> dans le menu <b>Périphériques</b>. Si elles sont installés et  [...]
     </message>
     <message>
         <source>Insert</source>
         <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <translation>Insérer</translation>
     </message>
     <message>
         <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>L'écran virtuel est actuellement réglé sur un mode coleur <b>%1&nbsp;bit</b>. Pour de meilleures performances, veuillez l'ajuster sur <b>%2&nbsp;bit</b>. Cela peut généralement être fait depuis la section <b>Affichage</b> du paneau de configuration ou des préférences systemes du système d'exploitation hôte.</p></translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
@@ -8662,115 +8869,115 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8834,19 +9041,19 @@
     <name>UIMiniToolBar</name>
     <message>
         <source>Always show the toolbar</source>
-        <translation type="unfinished">Toujours afficher la barre d'outils</translation>
+        <translation>Toujours afficher la barre d'outils</translation>
     </message>
     <message>
         <source>Minimize Window</source>
-        <translation type="unfinished">Minimiser la fenêtre</translation>
+        <translation>Minimiser la fenêtre</translation>
     </message>
     <message>
         <source>Exit Full Screen or Seamless Mode</source>
-        <translation type="unfinished">Quitter le mode plein écran ou intégré</translation>
+        <translation>Quitter le mode plein écran ou intégré</translation>
     </message>
     <message>
         <source>Close VM</source>
-        <translation type="unfinished">Fermer la machine</translation>
+        <translation>Fermer la machine</translation>
     </message>
 </context>
 <context>
@@ -8863,8 +9070,8 @@
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation>&Nom : </translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Nom : </translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -8886,6 +9093,10 @@
         <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
         <translation>Affiche le type du système d'exploitation (dit système d'exploitation invité) que vous allez installer dans cette machine virtuelle.</translation>
     </message>
+    <message>
+        <source>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -8923,7 +9134,7 @@
     </message>
     <message>
         <source>The network operation failed with the following error: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>L'opération réseau a échoué avec l'erreur suivante : %1.</translation>
     </message>
 </context>
 <context>
@@ -8950,27 +9161,27 @@
     <name>UINetworkReplyPrivate</name>
     <message>
         <source>Host not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Hôte introuvable</translation>
     </message>
     <message>
         <source>Content access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Accès au contenu refusé</translation>
     </message>
     <message>
         <source>Protocol failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Défaillance de protocole</translation>
     </message>
     <message>
         <source>Wrong SSL certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>Mauvais format de certificat SSL</translation>
     </message>
     <message>
         <source>SSL authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Défaillance d'authentification SSL</translation>
     </message>
     <message>
         <source>Unknown reason</source>
-        <translation type="unfinished"></translation>
+        <translation>Raison inconnue</translation>
     </message>
 </context>
 <context>
@@ -9429,7 +9640,7 @@ And the size is not necessarily "in megabytes", the slider chooses the
     <name>UIPopupCenter</name>
     <message>
         <source>Click for full details</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliquez pour afficher tous les détails</translation>
     </message>
 </context>
 <context>
@@ -9562,18 +9773,14 @@ And the size is not necessarily "in megabytes", the slider chooses the
         <translation>Fichiers machine virtuelle (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Bienvenue dans VirtualBox !</h3><p>La partie gauche de cette fenêtre affiche la liste des machines virtuelles de votre ordinateur. Cette liste est vide car vous n'avez pas encore créé de machine virtuelle.<img src=:/welcome.png align=right/></p><p>Pour créer une nouvelle machine virtuelle cliquez sur le bouton <b>Créer</b> en haut de cette liste.</p><p>Vous pouvez appuyer sur <b&g [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation><h3>Bienvenue dans VirtualBox !</h3><p>La partie gauche de cette fenêtre affiche la liste des machines virtuelles de votre ordinateur. Cette liste est vide car vous n'avez pas encore créé de machine virtuelle.<img src=:/welcome.png align=right/></p><p>Pour créer une nouvelle machine virtuelle cliquez sur le bouton <b>Créer</b> en haut de cette liste.</p><p>Vous pouvez appuyer sur <b>%1</b> p [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation>- Gestionnaire de machines</translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -9610,11 +9817,11 @@ And the size is not necessarily "in megabytes", the slider chooses the
     </message>
     <message>
         <source><b>%1</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation>Page <b>%1</b> :</translation>
     </message>
     <message>
         <source><b>%1: %2</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation>Page <b>%1:%2</b> :</translation>
     </message>
 </context>
 <context>
@@ -9761,6 +9968,10 @@ And the size is not necessarily "in megabytes", the slider chooses the
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Fermer</translation>
     </message>
@@ -9768,10 +9979,6 @@ And the size is not necessarily "in megabytes", the slider chooses the
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -9868,8 +10075,8 @@ And the size is not necessarily "in megabytes", the slider chooses the
         <translation type="obsolete">Récapitulatif</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Une nouvelle version de VirtualBox est disponible ! La version <b>%1</b> est disponible sur <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Vous pouvez télécharger cette version en cliquant sur le lien suivant : </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>Une nouvelle version de VirtualBox est disponible ! La version <b>%1</b> est disponible sur <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Vous pouvez télécharger cette version en cliquant sur le lien suivant : </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -9961,120 +10168,98 @@ And the size is not necessarily "in megabytes", the slider chooses the
     <name>UIVMInfoDialog</name>
     <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Détails de la session</translation>
+        <translation type="unfinished">%1 - Détails de la session</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Détails</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished">&Détails de configuration</translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">&Propriétés et statistiques</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished">Info&rmations d'exécution</translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>Transferts DMA</translation>
+        <translation type="unfinished">Transferts DMA</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>Transferts PIO </translation>
+        <translation type="unfinished">Transferts PIO </translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Données lues</translation>
+        <translation type="unfinished">Données lues</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Données écrites</translation>
+        <translation type="unfinished">Données écrites</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Données transmise</translation>
+        <translation type="unfinished">Données transmise</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Données reçues</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Propriétés</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Résolution de l'écran</translation>
+        <translation type="unfinished">Données reçues</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Non détectées</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Non détecté</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>Additions invité</translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation>Type de système invité</translation>
-    </message>
-    <message>
-        <source>No Network Adapters</source>
-        <translation>Pas de cartes réseau</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translatorcomment>Again, mistake?</translatorcomment>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Non disponible</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">Non disponible</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Propriétés</translation>
     </message>
     <message>
-        <source>Storage Statistics</source>
-        <translation>Statistiques du stockage</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Résolution de l'écran</translation>
     </message>
     <message>
-        <source>No Storage Devices</source>
-        <translation>Aucun périphérique de stockage</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network Statistics</source>
-        <translation>Statistiques du réseau</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished">Mode du presse-papier</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>Non disponible</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clipboard Mode</source>
-        <translation>Mode du presse-papier</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Additions invité</translation>
     </message>
     <message>
-        <source>Drag'n'Drop Mode</source>
-        <translation type="obsolete">Mode du Glisser-Deposer</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
+        <source>Storage Statistics</source>
+        <translation type="unfinished">Statistiques du stockage</translation>
     </message>
     <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
+        <source>No Storage Devices</source>
+        <translation type="unfinished">Aucun périphérique de stockage</translation>
     </message>
     <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <source>Network Statistics</source>
+        <translation type="unfinished">Statistiques du réseau</translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Pas de cartes réseau</translation>
     </message>
 </context>
 <context>
@@ -10658,39 +10843,39 @@ And the size is not necessarily "in megabytes", the slider chooses the
     </message>
     <message>
         <source>Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Paramètres de stockage</translation>
     </message>
     <message>
         <source>Please choose a file to export the virtual appliance to</source>
-        <translation type="unfinished"></translation>
+        <translation>Veuillez choisir un fichier vers lequel exporter l'application virtuelle</translation>
     </message>
     <message>
         <source>F&ormat:</source>
-        <translation type="unfinished"></translation>
+        <translation>F&ormat :</translation>
     </message>
     <message>
         <source>OVF 0.9</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 0.9</translation>
     </message>
     <message>
         <source>OVF 1.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 1.0</translation>
     </message>
     <message>
         <source>OVF 2.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 2.0</translation>
     </message>
     <message>
         <source>Write in standard OVF 1.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer au format OVF 1.0 standard.</translation>
     </message>
     <message>
         <source>Write in new experimental OVF 2.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Enregistrer dans le nouveau format expérimental OVF 2.0.</translation>
     </message>
     <message>
         <source>&Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Paramètres de &stockage</translation>
     </message>
 </context>
 <context>
@@ -10709,14 +10894,15 @@ And the size is not necessarily "in megabytes", the slider chooses the
     </message>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Choisissez un fichier vers lequel exporter l'application virtuelle...</translation>
     </message>
 </context>
 <context>
     <name>UIWizardExportAppPageExpert</name>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>[BM]Appliance has several translations in French (Appareil, Instrument, Application). None is actually fully satisfying.</translatorcomment>
+        <translation>Choisissez un fichier sur lequel exporter l'application virtuelle...</translation>
     </message>
 </context>
 <context>
@@ -10786,15 +10972,15 @@ And the size is not necessarily "in megabytes", the slider chooses the
     </message>
     <message>
         <source>Import Virtual Appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer l'application virtuelle</translation>
     </message>
     <message>
         <source>Choose a virtual appliance file to import...</source>
-        <translation type="unfinished"></translation>
+        <translation>Choisir un fichier d'application virtuelle à importer...</translation>
     </message>
     <message>
         <source>Please choose a virtual appliance file to import</source>
-        <translation type="unfinished"></translation>
+        <translation>Veuillez choisir un fichier d'application virtuelle à importer</translation>
     </message>
 </context>
 <context>
@@ -11097,7 +11283,7 @@ And the size is not necessarily "in megabytes", the slider chooses the
     </message>
     <message>
         <source>Choose...</source>
-        <translation type="unfinished"></translation>
+        <translation>Choisir...</translation>
     </message>
 </context>
 <context>
@@ -11156,7 +11342,7 @@ And the size is not necessarily "in megabytes", the slider chooses the
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <translation>La valeur du chemin par défaut actuelle sera affichée une fois les changements acceptés et cette fenêtre réouverte.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -12161,7 +12347,7 @@ And the size is not necessarily "in megabytes", the slider chooses the
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Ce disque sera connecté indirectement, en créant un nouveau disque dur différentiel.</translation>
+        <translation>Ce disque sera connecté indirectement, en créant un nouveau disque dur différentiel.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -12171,7 +12357,7 @@ And the size is not necessarily "in megabytes", the slider chooses the
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Ce disque dur de base est connecté indirectement à travers le disque dur différentiel suivant :</translation>
+        <translation>Ce disque dur de base est connecté indirectement à travers le disque dur différentiel suivant :</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -12722,7 +12908,7 @@ And the size is not necessarily "in megabytes", the slider chooses the
     <message>
         <source>Description</source>
         <comment>DetailsElementType</comment>
-        <translation>Description</translation>
+        <translation>Déscription</translation>
     </message>
     <message>
         <source>Please choose a virtual hard drive file</source>
@@ -12777,62 +12963,72 @@ And the size is not necessarily "in megabytes", the slider chooses the
         <translation type="obsolete">Choisissez un emplacement pour le nouveau fichier de disque dur virtuel</translation>
     </message>
     <message>
+        <source>Enabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Activée</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Désactivée</translation>
+    </message>
+    <message>
         <source>Unrestricted Execution</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>Exécution sans restriction</translation>
     </message>
     <message>
         <source>PS/2 Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Souris PS/2</translation>
     </message>
     <message>
         <source>USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Souris USB</translation>
     </message>
     <message>
         <source>PS/2 and USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Souris PS/2 et USB</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>unrestricted execution</comment>
+        <translation type="obsolete">Activée</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>unrestricted execution</comment>
+        <translation type="obsolete">Désactivée</translation>
     </message>
     <message>
         <source>Unrestricted Execution</source>
-        <translation type="unfinished"></translation>
+        <translation>Exécution sans restriction</translation>
     </message>
     <message>
         <source>USB Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tablette USB</translation>
     </message>
     <message>
         <source>USB Multi-Touch Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tablette USB Multi-Touch</translation>
     </message>
     <message>
         <source>NAT Network</source>
         <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Réseau NAT</translation>
     </message>
     <message>
         <source>NAT network, '%1'</source>
         <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Réseau NAT, '%1'</translation>
     </message>
     <message>
         <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished">USB</translation>
-    </message>
-    <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
+        <translation>Vous pouvez créer ou ajouter des fichiers d'image disque dans les réglages de la machine virtuelle.</translation>
     </message>
     <message>
         <source>off</source>
@@ -12840,78 +13036,73 @@ And the size is not necessarily "in megabytes", the slider chooses the
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
+        <source>Active</source>
+        <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
+        <source>Inactive</source>
+        <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Par défaut</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
+        <source>Active</source>
+        <comment>details report (Nested Paging)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
+        <source>Inactive</source>
+        <comment>details report (Nested Paging)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
+        <source>Active</source>
+        <comment>details report (Unrestricted Execution)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
+        <source>Inactive</source>
+        <comment>details report (Unrestricted Execution)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active</source>
-        <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished">Active</translation>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Inactive</source>
-        <comment>details report (VT-x/AMD-V)</comment>
+        <source>Taking Snapshot</source>
+        <comment>MachineState</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active</source>
-        <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished">Active</translation>
+        <source>Taking Online Snapshot</source>
+        <comment>MachineState</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Inactive</source>
-        <comment>details report (Nested Paging)</comment>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active</source>
-        <comment>details report (Unrestricted Execution)</comment>
-        <translation type="unfinished">Active</translation>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Par défaut</translation>
     </message>
     <message>
-        <source>Inactive</source>
-        <comment>details report (Unrestricted Execution)</comment>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Taking Snapshot</source>
-        <comment>MachineState</comment>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Taking Online Snapshot</source>
-        <comment>MachineState</comment>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12925,6 +13116,11 @@ And the size is not necessarily "in megabytes", the slider chooses the
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -12945,6 +13141,16 @@ And the size is not necessarily "in megabytes", the slider chooses the
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">USB</translation>
+    </message>
+    <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -12954,16 +13160,16 @@ And the size is not necessarily "in megabytes", the slider chooses the
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13271,15 +13477,15 @@ And the size is not necessarily "in megabytes", the slider chooses the
         <translation type="obsolete">Crée un nouveau disque dur virtuel</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -13417,8 +13623,8 @@ And the size is not necessarily "in megabytes", the slider chooses the
         <translation type="obsolete">Suspendre l'exécution de la machine virtuelle</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Bienvenue dans VirtualBox !</h3><p>La partie gauche de cette fenêtre affiche la liste des machines virtuelles de votre ordinateur. Cette liste est vide car vous n'avez pas encore créé de machine virtuelle.<img src=:/welcome.png align=right/></p><p>Pour créer une nouvelle machine virtuelle cliquez sur le bouton <b>Créer</b> en haut de cette liste.</p><p>Vous pouvez appuyer sur <b&g [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Bienvenue dans VirtualBox !</h3><p>La partie gauche de cette fenêtre affiche la liste des machines virtuelles de votre ordinateur. Cette liste est vide car vous n'avez pas encore créé de machine virtuelle.<img src=:/welcome.png align=right/></p><p>Pour créer une nouvelle machine virtuelle cliquez sur le bouton <b>Créer</b> en haut de cette liste.</p><p>Vous pouvez appuyer sur <b&g [...]
     </message>
     <message>
         <source>Log</source>
@@ -13875,6 +14081,118 @@ And the size is not necessarily "in megabytes", the slider chooses the
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Détails de la session</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Détails</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Propriétés et statistiques</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">Transferts DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">Transferts PIO </translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Données lues</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Données écrites</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Données transmise</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Données reçues</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Propriétés</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Résolution de l'écran</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Non détectées</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Non détecté</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Additions invité</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Type de système invité</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Pas de cartes réseau</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translatorcomment>Again, mistake?</translatorcomment>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">Non disponible</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Statistiques du stockage</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Aucun périphérique de stockage</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Statistiques du réseau</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Non disponible</translation>
+    </message>
+    <message>
+        <source>Clipboard Mode</source>
+        <translation type="obsolete">Mode du presse-papier</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">Mode du Glisser-Deposer</translation>
+    </message>
+    <message>
+        <source>Configuration &Details</source>
+        <translation type="obsolete">&Détails de configuration</translation>
+    </message>
+    <message>
+        <source>&Runtime Information</source>
+        <translation type="obsolete">Info&rmations d'exécution</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMLogViewer</name>
     <message>
         <source>Log Viewer</source>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
index f333d94..c69156d 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
@@ -308,7 +308,7 @@
         <translation type="obsolete">Diálogo da i&nformación da sesión</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Mostrar o diálogo da información da sesión</translation>
     </message>
     <message>
@@ -384,11 +384,11 @@
         <translation type="obsolete">Activar ou desactivar as conexións de escritorio remoto a esta máquina</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Instalar os aplicativos para o sistema operativo convidado...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="unfinished">&Instalar os aplicativos para o sistema operativo convidado...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Montar a imaxe de instalación dos aplicativos para o sistema operativo convidado</translation>
     </message>
     <message>
@@ -662,92 +662,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">&Instalar os aplicativos para o sistema operativo convidado...</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Montar a imaxe de instalación dos aplicativos para o sistema operativo convidado</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
+        <source>&Webcams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Rede</translation>
     </message>
     <message>
-        <source>&Status Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Ficheiro</translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Rede</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Preferencias...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Mostrar re&xistro...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Ficheiro</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -763,175 +749,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Preferencias...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
+        <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
+        <source>&Hard Disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
+        <source>&USB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Mostrar re&xistro...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -977,6 +963,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create new virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -993,7 +987,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1001,7 +995,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1025,15 +1019,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1045,11 +1051,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1057,7 +1063,7 @@
         <translation type="unfinished">Actuali&zar</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1101,15 +1107,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1118,28 +1124,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Activar</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1162,6 +1148,18 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -2588,11 +2586,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
-        <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
         <translation type="unfinished">Filtros do dispositivo</translation>
@@ -2652,88 +2645,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">Controlador USB</translation>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (user interface/Unscaled HiDPI Video Output)</comment>
-        <translation type="obsolete">Activado</translation>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <translation type="unfinished">Activado</translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">Controlador USB</translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
-        <translation type="unfinished">Desactivado</translation>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">Activado</translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">Desactivado</translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished">Activado</translation>
     </message>
     <message>
-        <source>Menu-bar</source>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
+        <translation type="unfinished">Desactivado</translation>
+    </message>
+    <message>
+        <source>Mini-toolbar Position</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Activado</translation>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Desactivado</translation>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
+        <source>Mini-toolbar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished">Activado</translation>
-    </message>
-    <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished">Desactivado</translation>
     </message>
 </context>
@@ -3695,7 +3688,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4371,7 +4364,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4385,8 +4379,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4633,30 +4626,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Barra de ferramentas pequena:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Se está marcada, mostra a barra de ferramentas pequena nos modos fluído e de pantalla completa.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Mostrar en modo de &Pantalla completa/Fluído</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4673,19 +4642,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, guest screen contents will not be scaled up to compensate for high host screen resolutions.</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use &Unscaled HiDPI Output</source>
+        <source>When checked, guest screen contents will not be scaled up to compensate for high host screen resolutions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Acceleration:</source>
+        <source>Use &Unscaled HiDPI Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
+        <source>Acceleration:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4737,6 +4706,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4745,6 +4722,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4756,8 +4737,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Mostra o camiño onde se almacenaran as instantáneas desta máquina virtual. Nota que as instantáneas poden ocupar bastante espazo en disco. </translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Básico</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Básico</translation>
     </message>
     <message>
         <source>&Name:</source>
@@ -4768,8 +4749,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Mostrar o nome da máquina virtual.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Avanzado</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Avanzado</translation>
     </message>
     <message>
         <source>&Shared Clipboard:</source>
@@ -4784,8 +4765,8 @@ p, li { white-space: pre-wrap; }
         <translation>Cartafol da i&nstantánea:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Descrición</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Descrición</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -4820,10 +4801,6 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">seleccionou un sistema operativo convidado de tipo 64-bit para esta máquina virtual. Tales convidados requiren hardware de virtualización (VT-x/AMD-V) co que esta característica activarase automaticamente.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4836,6 +4813,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
+        <translation type="unfinished">D&escrición</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4852,6 +4845,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4884,16 +4881,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4908,31 +4901,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Barra de ferramentas pequena:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Se está marcada, mostra a barra de ferramentas pequena nos modos fluído e de pantalla completa.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Mostrar en modo de &Pantalla completa/Fluído</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allows to modify VM status-bar contents.</source>
+        <source>Show in &Full-screen/Seamless</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Full-screen/Seamless</source>
+        <source>Show at &Top of Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4993,7 +4978,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>A&dvanced</source>
-        <translation type="unfinished">&Avanzado</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holds the MAC address of this adapter. It contains exactly 12 characters chosen from {0-9,A-F}. Note that the second character must be an even digit.</source>
@@ -5443,23 +5428,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5763,96 +5748,97 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Imaxe</translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Imaxe</translation>
+        <source>Add USB Controller</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5868,7 +5854,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6086,35 +6072,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6260,31 +6246,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"><nobr>Estado: %1</nobr></translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6533,14 +6519,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Pechar</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Cambiar</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Pechar</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6780,15 +6766,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete"><p>Non foi posíbel cargar o ficheiro de idioma <b><nobr>%1</nobr></b>. <p>O idioma restabelecerase temporalmente a Inglés (integrado). Vaia ao diálogo <b>Preferencias</b> que pode abrir desde o menú <b>Ficheiro</b> da xanela principal de VirtualBox e seleccione un dos idiomas existentes na sección <b>Idioma</b>.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Os aplicativos para o sistema operativo convidado de VirtualBox instalados no sistema operativo convidado son antigos: a versión instalada é a %1 e requírese a versión %2. Algunhas características que requiren dos aplicativos para o sistema operativo convidado (a integración do rato, o redimensionamento automático da pantalla do convidado) probablemente deixarán de traballar de maneira correcta.</p><p>Actualice os aplicativos para [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Os aplicativos para o sistema operativo convidado de VirtualBox instalados no sistema operativo convidado están desactualizados: a versión instalada é a %1 e requírese a versión %2. Algunhas características que requiren dos aplicativos para o sistema operativo convidado (a integración do rato, o redimensionamento automático da pantalla do convidado) poden non traballar como se espera.</p><p>Recoméndase actualizar os aplicativos pa [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Os aplicativos para o sistema operativo convidado de VirtualBox instalados no sistema operativo convidado son demasiado recentes: a versión instalada é a %1 e requírese a versión %2.</p><p>Non é compatíbel o uso dunha versión máis nova dos aplicativos para o sistema operativo convidado cunha versión máis vella de VirtualBox. Instale a versión actual dos aplicativos para o sistema operativo convidado elixindo <b>Instalar os a [...]
     </message>
     <message>
@@ -6885,9 +6871,9 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Descargar</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Montar</translation>
+        <translation type="unfinished">Montar</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -7033,8 +7019,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Mostrar un diálogo con información do produto</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Unha nova versión de VirtualBox foi publicada! A versión <b>%1</b> está dispoñíbel en <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Pode descargar esta versión directamente desde esta ligazón:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>Unha nova versión de VirtualBox foi publicada! A versión <b>%1</b> está dispoñíbel en <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Pode descargar esta versión directamente desde esta ligazón:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -7164,8 +7150,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">S&obrescribir</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Ocorreu un erro crítico mentres se executaba a máquina virtual e se detivo a súa execución.</p><p>Para obter axuda, consulte a sección Comunidade en <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> ou ao servizo de asistencia que teña contratado. Proporcione os contidos do ficheiro de rexistro <tt>VBox.log</tt> e o ficheiro de imaxe <tt>VBox.png</tt>, os cales pode localizar no ca [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Ocorreu un erro crítico mentres se executaba a máquina virtual e se detivo a súa execución.</p><p>Para obter axuda, consulte a sección Comunidade en <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> ou ao servizo de asistencia que teña contratado. Proporcione os contidos do ficheiro de rexistro <tt>VBox.log</tt> e o ficheiro de imaxe <tt>VBox.png</tt>, os cales pode localizar no cartafol <nob [...]
     </message>
     <message>
         <source>hard disk</source>
@@ -7869,32 +7855,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Insert</source>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Montar</translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7910,115 +7888,115 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8088,8 +8066,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished">&Nome:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Nome:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -8111,6 +8089,10 @@ p, li { white-space: pre-wrap; }
         <source>Selects 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>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -8773,18 +8755,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Dámoslle a benvida a VirtualBox.</h3><p>A parte esquerda desta xanela destínase a mostrar unha lista de todas as máquinas virtuais do seu computador. Neste intre a lista está baleira porque aínda non creou ningunha máquina virtual.<img src=:/welcome.png align=right/></p><p>Para crear unha nova máquina virtual prema no botón <b>Novo</b> da barra de ferramentas localizada na parte superior da xanela pr [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="unfinished"><h3>Dámoslle a benvida a VirtualBox.</h3><p>A parte esquerda desta xanela destínase a mostrar unha lista de todas as máquinas virtuais do seu computador. Neste intre a lista está baleira porque aínda non creou ningunha máquina virtual.<img src=:/welcome.png align=right/></p><p>Para crear unha nova máquina virtual prema no botón <b>Novo</b> da barra de ferramentas localizada na parte superior da xanela  [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -8948,6 +8926,10 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Pechar</translation>
     </message>
@@ -8955,10 +8937,6 @@ p, li { white-space: pre-wrap; }
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -9054,8 +9032,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Resumo</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Unha nova versión de VirtualBox foi publicada! A versión <b>%1</b> está dispoñíbel en <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Pode descargar esta versión directamente desde esta ligazón:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>Unha nova versión de VirtualBox foi publicada! A versión <b>%1</b> está dispoñíbel en <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Pode descargar esta versión directamente desde esta ligazón:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -9147,150 +9125,98 @@ p, li { white-space: pre-wrap; }
     <name>UIVMInfoDialog</name>
     <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Información de sesión</translation>
+        <translation type="unfinished">%1 - Información de sesión</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Detalles</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">&Tempo de execución</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>Transferencia DMA</translation>
+        <translation type="unfinished">Transferencia DMA</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>Transferencia PIO</translation>
+        <translation type="unfinished">Transferencia PIO</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Datos lidos</translation>
+        <translation type="unfinished">Datos lidos</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Datos escritos</translation>
+        <translation type="unfinished">Datos escritos</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Datos transmitidos</translation>
-    </message>
-    <message>
-        <source>Data Received</source>
-        <translation>Datos recibidos</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Atributos de tempo de execución</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Resolución da pantalla</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">Estatísticas do CD/DVD</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Estatísticas do adaptador de rede</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Versión %1.%2</translation>
-    </message>
-    <message>
-        <source>Not Detected</source>
-        <comment>guest additions</comment>
-        <translation>Non se detectou</translation>
-    </message>
-    <message>
-        <source>Not Detected</source>
-        <comment>guest os type</comment>
-        <translation>Non se detectou</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>Os aplicativos para o sistema operativo convidado</translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation>Tipo do sistema operativo convidado</translation>
-    </message>
-    <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Estatísticas do disco ríxido</translation>
-    </message>
-    <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Sen discos ríxidos</translation>
+        <translation type="unfinished">Datos transmitidos</translation>
     </message>
     <message>
-        <source>No Network Adapters</source>
-        <translation>Sen adaptadores de rede</translation>
+        <source>Data Received</source>
+        <translation type="unfinished">Datos recibidos</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Activado</translation>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="unfinished">Non se detectou</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Desactivado</translation>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="unfinished">Non se detectou</translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <translation type="obsolete">Paxinación aniñada</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Atributos de tempo de execución</translation>
     </message>
     <message>
-        <source>Storage Statistics</source>
-        <translation type="unfinished"></translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Resolución da pantalla</translation>
     </message>
     <message>
-        <source>No Storage Devices</source>
+        <source>VM Uptime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network Statistics</source>
+        <source>Clipboard Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Paxinación aniñada</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation type="unfinished"></translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Os aplicativos para o sistema operativo convidado</translation>
     </message>
     <message>
-        <source>Clipboard Mode</source>
-        <translation type="unfinished"></translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Tipo do sistema operativo convidado</translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
+        <source>Storage Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Runtime Information</source>
+        <source>No Storage Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>VM Uptime</source>
+        <source>Network Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Sen adaptadores de rede</translation>
     </message>
 </context>
 <context>
@@ -10219,11 +10145,11 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Crear ou modificar cartafoles compartidos</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">&Instalar os aplicativos para o sistema operativo convidado...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Montar a imaxe de instalación dos aplicativos para o sistema operativo convidado</translation>
     </message>
     <message>
@@ -10438,7 +10364,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Diálogo da i&nformación da sesión</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Mostrar o diálogo da información da sesión</translation>
     </message>
     <message>
@@ -10517,8 +10443,8 @@ p, li { white-space: pre-wrap; }
         <translation><restabelecer predefinidos></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">O valor do camiño predefinido actual mostrarase despois de aceptar os cambios e ó abrir novamente este diálogo.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished">O valor do camiño predefinido actual mostrarase despois de aceptar os cambios e ó abrir novamente este diálogo.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -10566,7 +10492,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">O valor do camiño predefinido actual mostrarase despois de aceptar os cambios e ó abrir novamente este diálogo.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -11609,6 +11536,16 @@ p, li { white-space: pre-wrap; }
         <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
         <source>%n year(s)</source>
         <translation type="unfinished">
@@ -12166,51 +12103,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Ningún</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Predefinido</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished"></translation>
@@ -12241,6 +12138,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -12251,6 +12153,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Ningún</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Predefinido</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -12261,6 +12188,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished"></translation>
@@ -12281,17 +12213,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>User interface</source>
-        <comment>DetailsElementType</comment>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Optical Drive)</source>
+        <source>User interface</source>
+        <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>(Optical Drive)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12303,7 +12235,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
+        <source>Encrypted</source>
         <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -12313,11 +12245,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Please choose a location for new virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12608,15 +12535,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -12685,8 +12612,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Seleccione país/territorio</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
-        <translation type="obsolete"><p>Cubra este formulario de rexistro para permitirnos saber que emprega VirtualBox e, opcionalmente, telo informado sobre as novas e actualizacións de VirtualBox.</p><p>Empregue caracteres latinos para cubrir os campos de abaixo. Nota que Sun Microsystems soamente empregará esta información para obter estatísticas de uso do produto e para enviarlle boletíns de novas. En particular, Sun Microsystems nunca pasará os seus datos a tercei [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
+        <translation type="obsolete"><p>Cubra este formulario de rexistro para permitirnos saber que emprega VirtualBox e, opcionalmente, telo informado sobre as novas e actualizacións de VirtualBox.</p><p>Empregue caracteres latinos para cubrir os campos de abaixo. Nota que Sun Microsystems soamente empregará esta información para obter estatísticas de uso do produto e para enviarlle boletíns de novas. En particular, Sun Microsystems nunca pasará os seus datos a tercei [...]
     </message>
     <message>
         <source>I &already have a Sun Online account:</source>
@@ -12887,8 +12814,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Suspender a execución da máquina virtual</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Dámoslle a benvida a VirtualBox.</h3><p>A parte esquerda desta xanela destínase a mostrar unha lista de todas as máquinas virtuais do seu computador. Neste intre a lista está baleira porque aínda non creou ningunha máquina virtual.<img src=:/welcome.png align=right/></p><p>Para crear unha nova máquina virtual prema no botón <b>Novo</b> da barra de ferramentas localizada na parte superior da xanela pr [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Dámoslle a benvida a VirtualBox.</h3><p>A parte esquerda desta xanela destínase a mostrar unha lista de todas as máquinas virtuais do seu computador. Neste intre a lista está baleira porque aínda non creou ningunha máquina virtual.<img src=:/welcome.png align=right/></p><p>Para crear unha nova máquina virtual prema no botón <b>Novo</b> da barra de ferramentas localizada na parte superior da xanela pr [...]
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
@@ -13252,6 +13179,119 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Información de sesión</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Detalles</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Tempo de execución</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">Transferencia DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">Transferencia PIO</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Datos lidos</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Datos escritos</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Datos transmitidos</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Datos recibidos</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Atributos de tempo de execución</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Resolución da pantalla</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">Estatísticas do CD/DVD</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Estatísticas do adaptador de rede</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Versión %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Non se detectou</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Non se detectou</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Os aplicativos para o sistema operativo convidado</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Tipo do sistema operativo convidado</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Estatísticas do disco ríxido</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Sen discos ríxidos</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Sen adaptadores de rede</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Activado</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Desactivado</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <translation type="obsolete">Paxinación aniñada</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Paxinación aniñada</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMLogViewer</name>
     <message>
         <source>Log Viewer</source>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
index 02bfc78..e29e1aa 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
@@ -364,7 +364,7 @@
         <translation type="obsolete">Munkamenet i&nformációk</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Munkamenet információk megjelenítése</translation>
     </message>
     <message>
@@ -456,11 +456,11 @@
         <translation type="obsolete">Engedélyezed vagy tiltod az RDP kapcsolatokat ehhez a géphez</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Integrációs szolgáltatások telepítése...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation>&Integrációs szolgáltatások telepítése...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Integrációs szolgáltatások telepítő CD-kép felcsatolása</translation>
     </message>
     <message>
@@ -952,120 +952,127 @@
         <translation type="obsolete">Fogd és vidd</translation>
     </message>
     <message>
+        <source>Save the machine state of the virtual machine</source>
+        <translation type="obsolete">A virtuális gép állapotának mentése</translation>
+    </message>
+    <message>
         <source>Power off the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>A viruális gép kikapcsolása</translation>
     </message>
     <message>
         <source>&Network Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Hálózati beállítások...</translation>
     </message>
     <message>
         <source>&Shared Folders Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Megosztott mappák beállítá&sai...</translation>
     </message>
     <message>
         <source>R&emote Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Távoli kép&ernyő</translation>
+    </message>
+    <message>
+        <source>Toggle remote desktop (RDP) connections to this machine</source>
+        <translation type="obsolete">RDP kapcsolatok ki/bekapcsolása ehhez a géphez</translation>
     </message>
     <message>
         <source>&Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>&Videó felvétele</translation>
+    </message>
+    <message>
+        <source>Toggle video capture</source>
+        <translation type="obsolete">Videófelvétel-kapcsoló</translation>
     </message>
     <message>
         <source>&Video Capture Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Videófelvétel beállításai...</translation>
     </message>
     <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
+        <source>Configure video capture settings</source>
+        <translation type="obsolete">Videófelvétel beállításainak módosítása</translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
+        <source>Popup Menu</source>
+        <translation>Felugró menü</translation>
     </message>
     <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">&Integrációs szolgáltatások telepítése...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Integrációs szolgáltatások telepítő CD-kép felcsatolása</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Show Session Information Window</source>
+        <comment>new</comment>
+        <translation type="obsolete">Munkamenet információk megjelenítése</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&Webcams</source>
+        <translation>&Webkamerák</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Hálózat</translation>
     </message>
     <message>
-        <source>&Status Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Fájl</translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="unfinished">&Billentyűzet</translation>
+        <source>Minimize active window</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Hálózat</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Beállítások...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Nap&ló mutatása...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Fájl</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1081,175 +1088,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Beállítások...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <source>&Keyboard</source>
+        <translation type="unfinished">&Billentyűzet</translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <source>&Hard Disks</source>
+        <translation type="unfinished">&Merevlemezek</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="unfinished">&Merevlemezek</translation>
+        <source>&USB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Nap&ló mutatása...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1288,10 +1295,18 @@
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nincs webkamera csatlakoztatva</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
+        <translation type="unfinished">Nincs támogatott webkamera a gazda PC-hez csatlakoztatva</translation>
+    </message>
+    <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1311,7 +1326,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1319,7 +1334,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1343,15 +1358,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1363,11 +1390,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1375,7 +1402,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1419,15 +1446,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1436,32 +1463,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Engedélyez</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1483,6 +1486,17 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -3294,7 +3308,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
         <comment>details (network)</comment>
-        <translation>Általános meghajtó, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation type="obsolete">Általános meghajtó, '%1' {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -3314,31 +3328,31 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Video Capture File</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Videófelvétel fájl</translation>
     </message>
     <message>
         <source>Video Capture Attributes</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Videófelvétel attribútumok</translation>
     </message>
     <message>
         <source>Video Capture</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Videó felvétele</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished">Letiltva</translation>
+        <translation>Letiltva</translation>
     </message>
     <message>
         <source>NAT Network, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>NAT hálózat, '%1'</translation>
     </message>
     <message>
         <source>Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>Méret: %1x%2, frissitési ráta: %3fps, bitráta: %4kbps</translation>
     </message>
     <message>
         <source>Minimal Paravirtualization</source>
@@ -3356,88 +3370,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">USB vezérlő</translation>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (user interface/Unscaled HiDPI Video Output)</comment>
-        <translation type="obsolete">Engedélyezve</translation>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <translation type="unfinished">Engedélyezve</translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">USB vezérlő</translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">Engedélyezve</translation>
+    </message>
+    <message>
         <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished">Letiltva</translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished">Engedélyezve</translation>
     </message>
     <message>
-        <source>Menu-bar</source>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
+        <translation type="unfinished">Letiltva</translation>
+    </message>
+    <message>
+        <source>Mini-toolbar Position</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Engedélyezve</translation>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Letiltva</translation>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
+        <source>Mini-toolbar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished">Engedélyezve</translation>
-    </message>
-    <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished">Letiltva</translation>
     </message>
 </context>
@@ -3778,7 +3792,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Extension Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Kit&erjesztő csomagok</translation>
     </message>
     <message>
         <source>Add Package</source>
@@ -3860,8 +3874,28 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Gazda képernyővédőjének kikapc&solása</translation>
     </message>
     <message>
+        <source>&Dock and Menubar:</source>
+        <translation type="obsolete">&Dock és menüsor:</translation>
+    </message>
+    <message>
+        <source>Auto-Show in Fullscreen</source>
+        <translation type="obsolete">Automatikus teljes képernyő</translation>
+    </message>
+    <message>
+        <source>When checked, the host dock and menu bar will be shown when the virtual machine is in fullscreen mode.</source>
+        <translation type="obsolete">Ha engedélyezed, a gazda dock és menüsor megjelenik, mikor a virtuális gép teljes képernyős módban van.</translation>
+    </message>
+    <message>
+        <source>&Host Screensaver:</source>
+        <translation type="obsolete">Gazda &képernyővédő:</translation>
+    </message>
+    <message>
         <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ha engedélyezed, a gazda képernyővédője ki lesz kapcsolva, mikoregy virtuális gép fut.</translation>
+    </message>
+    <message>
+        <source>Disable When Running Virtual Machines</source>
+        <translation type="obsolete">Kikapcsol, mikor virtuális gép fut</translation>
     </message>
     <message>
         <source>Host Screensaver:</source>
@@ -3908,19 +3942,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Host Key Combination</source>
-        <translation type="unfinished"></translation>
+        <translation>Gazda-billentyűkombináció</translation>
     </message>
     <message>
         <source>Some items have the same shortcuts assigned.</source>
-        <translation type="unfinished"></translation>
+        <translation>Néhány elemhez ugyanaz a hivatkozás van társítva.</translation>
     </message>
     <message>
         <source>&VirtualBox Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>&VirtualBox kezelő</translation>
     </message>
     <message>
         <source>Virtual &Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtuális &gép</translation>
+    </message>
+    <message>
+        <source>Lists all the available shortcuts which can be configured.</source>
+        <translation type="obsolete">Minden elérhető és konfigurált hivatkozást listázása.</translation>
+    </message>
+    <message>
+        <source>Enter a sequence to filter the shortcut list.</source>
+        <translation type="obsolete">Add meg a szűrési kritériumot a hivatkozási listához.</translation>
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
@@ -3987,7 +4029,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Interface Languages</source>
-        <translation type="unfinished"></translation>
+        <translation>Felület nyelve&i</translation>
     </message>
 </context>
 <context>
@@ -4144,116 +4186,128 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&NAT Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>&NAT hálózatok</translation>
     </message>
     <message>
         <source>Lists all available NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Minden elérhető NAT hálózat listázása.</translation>
     </message>
     <message>
         <source>&Host-only Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Host-only hálózatok</translation>
     </message>
     <message>
         <source>No new name specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nincs új név megadva az eddig <b>%1</b> nevű NAT hálózatnak.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nincs CIDR megadva a NAT hálózathoz: <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nincs CIDR megadva az eddig <b>%1</b> nevű NAT hálózatnak.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Érvénytelen CIDR van megadva (<i>%1</i>) a NAT hálózathoz: <b>%2</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Érvénytelen CIDR van megadva (<i>%1</i>) az eddig <b>%2</b> nevű NAT hálózatnak.</translation>
     </message>
     <message>
         <source>Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Hálózat neve</translation>
     </message>
     <message>
         <source>[empty]</source>
-        <translation type="unfinished"></translation>
+        <translation>[üres]</translation>
     </message>
     <message>
         <source>%1 (renamed from %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (korábban %2)</translation>
     </message>
     <message>
         <source>Old Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Régi hálózati név</translation>
     </message>
     <message>
         <source>New Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Új hálózati név</translation>
     </message>
     <message>
         <source>Network CIDR</source>
-        <translation type="unfinished"></translation>
+        <translation>Hálózati CIDR</translation>
     </message>
     <message>
         <source>Supports DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>DHCP támogatás</translation>
     </message>
     <message>
         <source>yes</source>
-        <translation type="unfinished"></translation>
+        <translation>igen</translation>
     </message>
     <message>
         <source>no</source>
-        <translation type="unfinished"></translation>
+        <translation>nem</translation>
     </message>
     <message>
         <source>Supports IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6 támogatás</translation>
     </message>
     <message>
         <source>Default IPv6 route</source>
-        <translation type="unfinished"></translation>
+        <translation>Alapértelmezett IPv6 útvonal</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>A gazda interfésznek jelenleg nincs érvényes IPv4 címe: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 network mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>A gazda interfésznek jelenleg nincs érvényes IPv4 hálózati maszkja: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv6 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>A gazda interfésznek jelenleg nincs érvényes IPv6 címe: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>A gazda interfésznek jelenleg nincs érvényes DHCP szerver címe: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>A gazda interfésznek jelenleg nincs érvényes DHCP szerver maszkja: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server lower address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>A gazda interfésznek jelenleg nincs érvényes DHCP szerver alsó címhatára: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server upper address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>A gazda interfésznek jelenleg nincs érvényes DHCP szerver felső címhatára: <b>%1</b>.</translation>
     </message>
     <message>
         <source>The name <b>%1</b> is being used for several NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>A nevet számos NAT hálózat használja: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>NAT network</comment>
-        <translation type="unfinished">Aktív</translation>
+        <translation>Aktív</translation>
+    </message>
+    <message>
+        <source>&Add NAT network</source>
+        <translation type="obsolete">N&AT hálózat hozzáadása</translation>
+    </message>
+    <message>
+        <source>&Remove NAT network</source>
+        <translation type="obsolete">NA&T hálózat eltávolítása</translation>
+    </message>
+    <message>
+        <source>&Edit NAT network</source>
+        <translation type="obsolete">NAT hálózat sz&erkesztése</translation>
     </message>
     <message>
         <source>Add NAT Network</source>
@@ -4403,15 +4457,15 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsNetworkDetailsHost</name>
     <message>
         <source>Host-only Network Details</source>
-        <translation type="unfinished">Host-only hálózat részletei</translation>
+        <translation>Host-only hálózat részletei</translation>
     </message>
     <message>
         <source>&Adapter</source>
-        <translation type="unfinished">Kárty&a</translation>
+        <translation>Kárty&a</translation>
     </message>
     <message>
         <source>Manual &Configuration</source>
-        <translation type="unfinished">&Kézi beállítás</translation>
+        <translation>&Kézi beállítás</translation>
     </message>
     <message>
         <source>Use manual configuration for this host-only network adapter.</source>
@@ -4419,43 +4473,43 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&IPv4 Address:</source>
-        <translation type="unfinished">&IPv4 cím:</translation>
+        <translation>&IPv4 cím:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 address for this adapter.</source>
-        <translation type="unfinished">A gazda IPv4 címe ehhez a kártyához.</translation>
+        <translation>A gazda IPv4 címe ehhez a kártyához.</translation>
     </message>
     <message>
         <source>IPv4 Network &Mask:</source>
-        <translation type="unfinished">IPv4 hálózati &maszk:</translation>
+        <translation>IPv4 hálózati &maszk:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 network mask for this adapter.</source>
-        <translation type="unfinished">A gazda IPv4 hálózati maszkja ehhez a kártyához.</translation>
+        <translation>A gazda IPv4 hálózati maszkja ehhez a kártyához.</translation>
     </message>
     <message>
         <source>I&Pv6 Address:</source>
-        <translation type="unfinished">I&Pv6 cím:</translation>
+        <translation>I&Pv6 cím:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">A gazda IPv6 címe ehhez a kártyához, ha az IPv6 támogatott.</translation>
+        <translation>A gazda IPv6 címe ehhez a kártyához, ha az IPv6 támogatott.</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &Length:</source>
-        <translation type="unfinished">IPv6 há&lózati maszk hossza:</translation>
+        <translation>IPv6 há&lózati maszk hossza:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">A gazda IPv6 hálózati maszkjának hossza ehhez a kártyához, ha IPv6 támogatott.</translation>
+        <translation>A gazda IPv6 hálózati maszkjának hossza ehhez a kártyához, ha IPv6 támogatott.</translation>
     </message>
     <message>
         <source>&DHCP Server</source>
-        <translation type="unfinished">&DHCP szerver</translation>
+        <translation>&DHCP szerver</translation>
     </message>
     <message>
         <source>&Enable Server</source>
-        <translation type="unfinished">Sz&erver bekapcsolása</translation>
+        <translation>Sz&erver bekapcsolása</translation>
     </message>
     <message>
         <source>Indicates whether the DHCP Server is enabled on machine startup or not.</source>
@@ -4463,42 +4517,42 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Server Add&ress:</source>
-        <translation type="unfinished">Sze&rver címe:</translation>
+        <translation>Sze&rver címe:</translation>
     </message>
     <message>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Ehhez a host-only kártyához tartozó  DHCP szerver címe.</translation>
+        <translation>Ehhez a host-only kártyához tartozó  DHCP szerver címe.</translation>
     </message>
     <message>
         <source>Server &Mask:</source>
-        <translation type="unfinished">Szerver &maszkja:</translation>
+        <translation>Szerver &maszkja:</translation>
     </message>
     <message>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Ehhez a host-only kártyához tartozó  DHCP szerver hálózati maszkja.</translation>
+        <translation>Ehhez a host-only kártyához tartozó  DHCP szerver hálózati maszkja.</translation>
     </message>
     <message>
         <source>&Lower Address Bound:</source>
-        <translation type="unfinished">A&lsó címhatár:</translation>
+        <translation>A&lsó címhatár:</translation>
     </message>
     <message>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">A DHCP szerver által, ehhez a host-only kártyával kiosztható alsó címhatár.</translation>
+        <translation>A DHCP szerver által, ehhez a host-only kártyával kiosztható alsó címhatár.</translation>
     </message>
     <message>
         <source>&Upper Address Bound:</source>
-        <translation type="unfinished">Felső &címhatár:</translation>
+        <translation>Felső &címhatár:</translation>
     </message>
     <message>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">A DHCP szerver által, ehhez a host-only kártyával kiosztható felső címhatár.</translation>
+        <translation>A DHCP szerver által, ehhez a host-only kártyával kiosztható felső címhatár.</translation>
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4506,43 +4560,59 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsNetworkDetailsNAT</name>
     <message>
         <source>NAT Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>NAT hálózat részletei</translation>
     </message>
     <message>
         <source>&Enable Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Hálózat b&ekapcsolása</translation>
+    </message>
+    <message>
+        <source>Enable this NAT network.</source>
+        <translation type="obsolete">Ezen NAT hálózat bekapcsolása.</translation>
     </message>
     <message>
         <source>Network &Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hálózat &neve:</translation>
     </message>
     <message>
         <source>Holds the name for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezen hálózat neve.</translation>
     </message>
     <message>
         <source>Network &CIDR:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hálózati &CIDR:</translation>
     </message>
     <message>
         <source>Holds the CIDR for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezen hálózat CIDR-je.</translation>
     </message>
     <message>
         <source>Network Options:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hálózati beállításak:</translation>
     </message>
     <message>
         <source>Supports &DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>&DHCP támogatás</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports DHCP.</source>
+        <translation type="obsolete">Meghatározza a hálózati DHCP támogatását.</translation>
     </message>
     <message>
         <source>Supports &IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation> &IPv6 támogatás</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports IPv6.</source>
+        <translation type="obsolete">Meghatározza a hálózati IPv6 támogatását.</translation>
     </message>
     <message>
         <source>Advertise Default IPv6 &Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Alapé&rtelmezett IPv6 útvonal meghirdetése</translation>
+    </message>
+    <message>
+        <source>Determines whether this network should be advertised as the default IPv6 route.</source>
+        <translation type="obsolete">Meghatározza, hogy a hálózat alapértelmezett IPv6 útvonalnak van-e meghirdetve.</translation>
     </message>
     <message>
         <source>Opens a window to manage port forwarding rules.</source>
@@ -4550,7 +4620,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Port Forwarding</source>
-        <translation type="unfinished">&Port továbbítása</translation>
+        <translation>&Port továbbítása</translation>
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
@@ -4577,15 +4647,15 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsPortForwardingDlg</name>
     <message>
         <source>Port Forwarding Rules</source>
-        <translation type="unfinished">Port továbbítási szabályok</translation>
+        <translation>Port továbbítási szabályok</translation>
     </message>
     <message>
         <source>IPv4</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4</translation>
     </message>
     <message>
         <source>IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6</translation>
     </message>
 </context>
 <context>
@@ -4640,11 +4710,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No proxy host is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jelenleg nincs gazda proxy megadva.</translation>
     </message>
     <message>
         <source>No proxy port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jelenleg nincs proxy port megadva.</translation>
     </message>
     <message>
         <source>Holds the proxy host.</source>
@@ -4721,71 +4791,71 @@ p, li { white-space: pre-wrap; }
     <name>UIHostComboEditor</name>
     <message>
         <source><key_%1></source>
-        <translation type="unfinished"><key_%1></translation>
+        <translation><key_%1></translation>
     </message>
     <message>
         <source>Left </source>
-        <translation type="unfinished">Bal </translation>
+        <translation>Bal </translation>
     </message>
     <message>
         <source>Right </source>
-        <translation type="unfinished">Jobb </translation>
+        <translation>Jobb </translation>
     </message>
     <message>
         <source>Left Shift</source>
-        <translation type="unfinished">Bal Shift</translation>
+        <translation>Bal Shift</translation>
     </message>
     <message>
         <source>Right Shift</source>
-        <translation type="unfinished">Jobb Shift</translation>
+        <translation>Jobb Shift</translation>
     </message>
     <message>
         <source>Left Ctrl</source>
-        <translation type="unfinished">Bal Ctrl</translation>
+        <translation>Bal Ctrl</translation>
     </message>
     <message>
         <source>Right Ctrl</source>
-        <translation type="unfinished">Jobb Ctrl</translation>
+        <translation>Jobb Ctrl</translation>
     </message>
     <message>
         <source>Left Alt</source>
-        <translation type="unfinished">Bal Alt</translation>
+        <translation>Bal Alt</translation>
     </message>
     <message>
         <source>Right Alt</source>
-        <translation type="unfinished">Jobb Alt</translation>
+        <translation>Jobb Alt</translation>
     </message>
     <message>
         <source>Left WinKey</source>
-        <translation type="unfinished">Bal Windows</translation>
+        <translation>Bal Windows</translation>
     </message>
     <message>
         <source>Right WinKey</source>
-        <translation type="unfinished">Jobb Windows</translation>
+        <translation>Jobb Windows</translation>
     </message>
     <message>
         <source>Menu key</source>
-        <translation type="unfinished">Menü gomb</translation>
+        <translation>Menü gomb</translation>
     </message>
     <message>
         <source>Alt Gr</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt Gr</translation>
     </message>
     <message>
         <source>Caps Lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Caps Lock</translation>
     </message>
     <message>
         <source>Scroll Lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Scroll Lock</translation>
     </message>
     <message>
         <source>Host+</source>
-        <translation type="unfinished"></translation>
+        <translation>Gazda+</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Nincs</translation>
     </message>
 </context>
 <context>
@@ -4944,22 +5014,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Reset shortcut to default</source>
-        <translation type="unfinished"></translation>
+        <translation>Gyorsbillentyű alapértelmezettre</translation>
     </message>
     <message>
         <source>Unset shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Gyorsbillentyű visszavonása</translation>
     </message>
 </context>
 <context>
     <name>UIHotKeyTableModel</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Név</translation>
+        <translation>Név</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Gyorsbillentyű</translation>
     </message>
 </context>
 <context>
@@ -5198,23 +5268,24 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Jelzi a videófelvételi aktivitást:</nobr><br>%1</translation>
     </message>
     <message>
         <source><nobr><b>Video capture disabled</b></nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Videófelvétel letiltva</b></nobr></translation>
     </message>
     <message>
         <source><nobr><b>Video capture file:</b> %1</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Videófelvételi fájl:</b> %1</nobr></translation>
     </message>
     <message>
         <source>Additional feature status:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="unfinished"></translation>
+        <translation>Kiegészítő szolgáltatás állapota:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5228,8 +5299,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5306,6 +5376,14 @@ p, li { white-space: pre-wrap; }
         <source>Select a filename for the screenshot ...</source>
         <translation>Válassz nevet a képernyőmentésnek ...</translation>
     </message>
+    <message>
+        <source>No Webcams Connected</source>
+        <translation type="obsolete">Nincs webkamera csatlakoztatva</translation>
+    </message>
+    <message>
+        <source>No supported webcams connected to the host PC</source>
+        <translation type="obsolete">Nincs támogatott webkamera a gazda PC-hez csatlakoztatva</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsAudio</name>
@@ -5467,122 +5545,130 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Video &Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>&Videófelvétel</translation>
     </message>
     <message>
         <source>When checked, VirtualBox will record the virtual machine session as a video file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ha engedélyezed, a VirtualBox videófájlba rögzíti a virtuális gép munkamenetét.</translation>
     </message>
     <message>
         <source>&Enable Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Videófelvétel b&ekapcsolása</translation>
     </message>
     <message>
         <source>File &Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Fájl elérési útja:</translation>
+    </message>
+    <message>
+        <source>This setting determines the filename VirtualBox uses to save the recorded content.</source>
+        <translation type="obsolete">Megadja a fájl nevét, amit a VirtualBox a felvett tartalom mentésére használ.</translation>
     </message>
     <message>
         <source>Frame &Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Keretméret:</translation>
+    </message>
+    <message>
+        <source>This setting determines the resolution (frame size) of the recorded video.</source>
+        <translation type="obsolete">A beállítás megadja a rögzített videó felbontását (keretméret).</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
+        <translation type="obsolete">A beállítás megadja a rögzített videó <b>vízszintes</b> felbontását (keret szélessége).</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>vertical</b> resolution (frame height) of the recorded video.</source>
+        <translation type="obsolete">A beállítás megadja a rögzített videó <b>függőleges</b> felbontását (keret magassága).</translation>
     </message>
     <message>
         <source>&Frame Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Frame Rate:</translation>
+    </message>
+    <message>
+        <source>This setting determines the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
+        <translation type="obsolete">A beállítás megadja a <b>képkockák másodpercenkénti</b> maximális számát. A további képkockák ki lesznek hagyva. Ezen érték csökkentése megnöveli a kihagyandó képkockák számát, és csökkenti a fájlméretet.</translation>
     </message>
     <message>
         <source>&Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Minőség:</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">A beállítás határozza meg a <b>minőséget</b>. Az érték növelésével a videó jobban fog kinézni, és a fájlméret is nőni fog.</translation>
+    </message>
+    <message>
+        <source>This setting determines the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">A beállítás határozza meg a bitsebességet <b>kilobit/másodpercben</b>. Az érték növelésével a videó jobban fog kinézni, és a fájlméret is nőni fog.</translation>
     </message>
     <message>
         <source>&Screens:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ké&pernyők:</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use hardware graphics acceleration. However the host system does not currently provide this, so you will not be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>A virtuális gép a hardveres grafikai gyorsító használatára van beállítva. Azonban a gazdarendszer ezt nem biztosítja, így a gép nem képes elindulni.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to fullscreen or seamless mode.</source>
+        <translation type="obsolete">A virtuális gépen kevesebb, mint <b>%1</b> videómemóriát adtál meg, ami nem éri el a teljes képernyőhöz vagy az asztal-integrációs módhoz szükséges minimális értéket.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required for High Definition Video to be played efficiently.</source>
-        <translation type="unfinished"></translation>
+        <translation>A virtuális gépen kevesebb, mint <b>%1</b> videómemóriát adtál meg, pedig ez a minimum, ami a nagyfelbontású videók lejátszásához szükséges.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least b>%1</b>.</source>
+        <translation type="obsolete">A virtuális gép a gardveres gafikus gyorsító használatása, és az operációs rendszer Windows Vistára vagy újabbra van állítva. A legjobb teljesítmény érdekében, a videómemória ajánlott minimuma: <b>%1</b>.</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use Video Stream Acceleration. As this feature only works with Windows guest systems it will be disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>A virtuális gép a videó adatfolyam gyorsítását használja. Mivel ez a szolgáltatás csak Windows vendégrendszerrel működik, így ki lesz kapcsolva.</translation>
     </message>
     <message>
         <source>The VRDE server port value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>A VRDE szerver-port értéke jelenleg nincs megadva.</translation>
     </message>
     <message>
         <source>The VRDE authentication timeout value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>A VRDE azonosítási időtúllépés értéke jelenleg nincs megadva.</translation>
     </message>
     <message>
         <source>User Defined</source>
-        <translation type="unfinished"></translation>
+        <translation>Egyéni</translation>
     </message>
     <message>
         <source>%1 fps</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 fps</translation>
     </message>
     <message>
         <source>fps</source>
-        <translation type="unfinished"></translation>
+        <translation>fps</translation>
     </message>
     <message>
         <source>low</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>alacsony</translation>
     </message>
     <message>
         <source>medium</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>közepes</translation>
     </message>
     <message>
         <source>high</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>magas</translation>
     </message>
     <message>
         <source>kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>kbps</translation>
     </message>
     <message>
         <source>Screen %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 képernyő</translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Mini eszköztár:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Ha engedélyezed, a Mini eszköztár meg fog jelenni teljes képernyős és asztal-integrációs módban.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Jelenjen meg &teljes képernyőn</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Ha engedélyezed, a Mini ToolBar a képernyő tetején fog megjelenni, és nem az alján, ahol alapértelmezetten megjelenik.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Legyen a képernyő &tetején</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Enable video recording for screen %1.</source>
+        <translation type="obsolete">Videó rögzítésének engedélyezése a képernyőn: %1.</translation>
     </message>
     <message>
         <source>&Screen</source>
@@ -5597,15 +5683,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5621,10 +5703,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5673,6 +5751,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 MB</translation>
     </message>
@@ -5681,6 +5767,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5696,8 +5786,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">A gépről készített pillanatképek útvonala. A pillanatképek egy picit sok helyet foglalnak el.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Alap</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Alap</translation>
     </message>
     <message>
         <source>Identification</source>
@@ -5736,8 +5826,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Megadhatod a virtuális gép videó-memóriájának méretét.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>H&aladó</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">H&aladó</translation>
     </message>
     <message>
         <source>Boo&t Order:</source>
@@ -5820,8 +5910,8 @@ p, li { white-space: pre-wrap; }
         <translation>Pilla&natkép mappa:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>L&eírás</translation>
+        <source>&Description</source>
+        <translation type="obsolete">L&eírás</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5909,8 +5999,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">egy 64 bites vendégrendszert választottál ehhez a géphez. Ezek a rendszerek igényik a hardvervirtualizációt (VT-x/AMD-V), így ez a tulajdonság automatikusan engedélyezve lesz.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation>Fog&d és vidd:</translation>
+        <source>&Drag'n'Drop:</source>
+        <translation type="obsolete">Fog&d és vidd:</translation>
     </message>
     <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
@@ -5918,13 +6008,29 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No name specified for the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nincs megadva név a vituális géphez.</translation>
     </message>
     <message>
         <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
+        <translation>A virtuális gép operációs rendszere 64bitesre van állítva. A 64bites vendégrendszerhez hardveres virtualizáció szükséges, így ezt automatikusan engedélyezve lesz, ha elfogadod a változásokat.</translation>
+    </message>
+    <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">H&aladó</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>D&escription</source>
+        <translation type="unfinished">L&eírás</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5941,6 +6047,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5973,16 +6083,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5993,28 +6099,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Mini eszköztár:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Ha engedélyezed, a Mini eszköztár meg fog jelenni teljes képernyős és asztal-integrációs módban.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Jelenjen meg &teljes képernyőn</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Ha engedélyezed, a Mini ToolBar a képernyő tetején fog megjelenni, és nem az alján, ahol alapértelmezetten megjelenik.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -6024,18 +6122,6 @@ p, li { white-space: pre-wrap; }
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -6252,35 +6338,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No bridged network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jelenleg nincs bridge-elt hálózati kártya kiválasztva.</translation>
     </message>
     <message>
         <source>No internal network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jelenleg nincs belső hálózati név megadva.</translation>
     </message>
     <message>
         <source>No host-only network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jelenleg nincs host-only hálózati kártya kiválasztva.</translation>
     </message>
     <message>
         <source>No generic driver is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jelenleg nincs általános meghajtó kiválasztva.</translation>
     </message>
     <message>
         <source>The MAC address must be 12 hexadecimal digits long.</source>
-        <translation type="unfinished"></translation>
+        <translation>A MAC címnek 12 hexadecimális számnak kell lennie.</translation>
     </message>
     <message>
         <source>The second digit in the MAC address may not be odd as only unicast addresses are allowed.</source>
-        <translation type="unfinished"></translation>
+        <translation>A MAC cím második számjegye talán nem valós, mert csak unicast címek engedélyezettek.</translation>
     </message>
     <message>
         <source>No NAT network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jelenleg nincs NAT hálózati név megadva.</translation>
     </message>
     <message>
         <source>Holds the name of the NAT network that this network card will be connected to. You can create and remove networks using the global network settings in the virtual machine manager window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Add meg aNAT hálózat nevét, amelyhez ez a hálózati kártya csatlakozni fog. Létrehozhatsz vagy törölhetsz hálózatokat a virtuális gép kezelése ablakon belül a globális hálózati beállítások használatával.</translation>
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
@@ -6402,23 +6488,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Jelenleg nincs IRQ megadva.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Jelenleg nincs I/O port megadva.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kettő vagy több portnak ugyanazok a beállításai.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Jelenleg nincs port elérési út megadva.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Jelenleg duplikált port elérési út van megadva.</translation>
     </message>
 </context>
 <context>
@@ -6435,6 +6521,26 @@ p, li { white-space: pre-wrap; }
         <source>Duplicate port path entered </source>
         <translation type="obsolete">Kétszer van ugyanaz az útvonal megadva </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">Jelenleg nincs IRQ megadva.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">Jelenleg nincs I/O port megadva.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Kettő vagy több portnak ugyanazok a beállításai.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">Jelenleg nincs port elérési út megadva.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">Jelenleg duplikált port elérési út van megadva.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsPortForwardingDlg</name>
@@ -6629,6 +6735,10 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Ha engedélyezed, ez a megosztott mappa végleges lesz.</translation>
     </message>
     <message>
+        <source>Window</source>
+        <translation type="obsolete">Ablak</translation>
+    </message>
+    <message>
         <source>When checked, this shared folder will be permanent.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6709,44 +6819,44 @@ p, li { white-space: pre-wrap; }
         <translation>A soros port I/O báziscíme. Bármely cím érvényes <tt>0</tt> és <tt>0xFFFF</tt> között.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Jelenleg nincs IRQ megadva.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Jelenleg nincs I/O port megadva.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kettő vagy több portnak ugyanazok a beállításai.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Jelenleg nincs port elérési út megadva.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Jelenleg duplikált port elérési út van megadva.</translation>
     </message>
 </context>
 <context>
@@ -6763,6 +6873,26 @@ p, li { white-space: pre-wrap; }
         <source>Duplicate port path entered </source>
         <translation type="obsolete">Kétszer van ugyanaz az útvonal megadva </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">Jelenleg nincs IRQ megadva.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">Jelenleg nincs I/O port megadva.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Kettő vagy több portnak ugyanazok a beállításai.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">Jelenleg nincs port elérési út megadva.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">Jelenleg duplikált port elérési út van megadva.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsStorage</name>
@@ -6856,7 +6986,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No hard disk is selected for <i>%1</i>.</source>
-        <translation type="unfinished">Nincs merevlemez kiválasztva a(z) <i>%1</i> géphez.</translation>
+        <translation>Nincs merevlemez kiválasztva a géphez: <i>%1</i>.</translation>
     </message>
     <message>
         <source><i>%1</i> uses a medium that is already attached to <i>%2</i>.</source>
@@ -7192,46 +7322,46 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No name is currently specified for the controller at position <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nincs név adva a vezérlőhöz ezen a helyen: <b>%1</b>.</translation>
     </message>
     <message>
         <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>A(z) <b>%1</b> helyen levő vezérlő olyan nevet használ, amit már használ egy vezérlő ezen a helyen: <b>%2</b>.</translation>
     </message>
     <message>
         <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>%1</i> olyan merevlemezt használ, mely már ide van csatolva: <i>%2</i>.</translation>
     </message>
     <message>
         <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>A géphez jelenleg több vezérlőt használsz, mint amit a lapkakészlet támogat:  %1. Válassz másik lapkakészlet-típust a beállítások Rendszer lapján, vagy csökkentsd a vezérlők számát a beállítások Tároló lapján: %2</translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk file...</source>
-        <translation type="obsolete">Virtuális optikai lemez választása...</translation>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7239,68 +7369,65 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Képfájl</translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source>Add USB Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Képfájl</translation>
-    </message>
-    <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7316,7 +7443,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7549,30 +7676,54 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Pointing Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Mutatóeszköz:</translation>
     </message>
     <message>
         <source>Determines whether the emulated pointing device is a standard PS/2 mouse, a USB tablet or a USB multi-touch tablet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Meghatározza, hogy az emulált mutatóeszköz szabványos PS/2-es egér, USB-s tablet, vagy USB-s többérintéses tablet.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. Not enough memory is left for the host operating system. Please select a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>A gazda rendszer memóriájának (<b>%2</b>) több, mint <b>%1%</b>-át rendelted a virtuális géphez. Így túl kevés marad a gazda operációs rendszernek. Adj kevesebb memóriát a virtuális gépnek.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. There might not be enough memory left for the host operating system. Please consider selecting a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>A gazda rendszer memóriájának (<b>%2</b>) több, mint <b>%1%</b>-át rendelted a virtuális géphez. Így túl kevés marad a gazda operációs rendszernek, ami problémákat okozhat. Adj kevesebb memóriát a virtuális gépnek.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">Az I/O APIC szolgáltatás jelenleg nincs bekapcsolva a Rendszer lapon Alaplap részében. Szükség van rá az ICH9 lapkakészlet támogatásához. Automatikusan bekapcsolódik, ha eelfogadod a változtatásokat.</translation>
+    </message>
+    <message>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">Az USB vezérlő emulációja jelenleg nincs bekapcsolva az USB lapon. Az USB-s beviteli eszközök támogatásátához ban rá szükség. Automatikusan bekapcsolódik, ha eelfogadod a változtatásokat.</translation>
     </message>
     <message>
         <source>For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Teljesítménybeli problémák miatt,a virtuális géphez társított virtuális processzorok száma nem lehet nagyobb, mint a fizikai processzorok számának duplája a gazda számítógépen (<b>%1</b>). Csökkentsd le a virtuális processzorok számát.</translation>
     </message>
     <message>
         <source>More virtual CPUs are assigned to the virtual machine than the number of physical CPUs on the host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Több virtuális processzort társítottál a virtuális géphez, mint a gazda rendszer fizikai processzora (<b>%1</b>). Ez valószínűleg csökkenteni fogja a virtuális gép teljesítményét. Fontold meg a virtuális processzorok számának csökkentését.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">Az I/O APIC szolgáltatás jelenleg nincs bekapcsolva a Rendszer lapon Alaplap részében. Szükség van rá az egynél több virtuális processzor támogatásához. Automatikusan bekapcsolódik, ha eelfogadod a változtatásokat.</translation>
+    </message>
+    <message>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">A hardveres virtualizáció jelenleg nincs bekapcsolva a Rendszer lap Gyorsítás részében. Szükség van rá az egynél több virtuális processzor támogatásához. Automatikusan bekapcsolódik, ha eelfogadod a változtatásokat.</translation>
     </message>
     <message>
         <source>The processor execution cap is set to a low value. This may make the machine feel slow to respond.</source>
+        <translation>A processzor végrehajtási csúcsát túl acsonyra állítottad. Ez lassíthatja a virtuális gép reakcióidejét.</translation>
+    </message>
+    <message>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7600,14 +7751,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 MB</translation>
     </message>
@@ -7758,31 +7901,35 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Az USB 2.0 jelenleg be van kapcsolva a virtuális gépen. Azonban ehhez a következőnek telepítve kell lennie: <b><nobr>%1</nobr></b>.</p><p>A VirtualBox oldaláról letöltve telepítsd fel a Kiterjesztő csomagot. Ezután újra be engedélyezni tudod az USB 2.0-t. Addig ki lesz kapcsolva, hacsak meg nem szakítod a beállítások módosítását.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0 to be able to start the machine.</source>
+        <translation type="obsolete">Az USB 2.0 jelenleg be van kapcsolva a virtuális gépen. Azonban ehhez a következőnek telepítve kell lennie: <b>%1</b>.A VirtualBox oldaláról letöltve telepítsd fel a Kiterjesztő csomagot, vagy kapcsold ki az USB 2.0-t, hogy a gép el tudjon indulni.</translation>
+    </message>
+    <message>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8039,14 +8186,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Bezárás</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Átváltás</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Bezárás</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8285,15 +8432,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete"><p>A nyelvi fájl nem tölthető be: <b><nobr>%1</nobr></b>. <p>A nyelv ideiglenesen visszaáll angolra (beépítet). A Virtualbox ablakában, a <b>Fájl</b>menün belül válaszd a <b>Beállítások</b> menüpontot, és a <b>Nyelv</b> oldalon válassz egy nyelvet.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>A vendég rendszerre telepített VirtualBox Integrációs szolgáltatások túl régiiek: telepített verzió: %1, ajánlott verzió: %2. Néhány, Integrációs szolgáltatást igénylő funkció (egér-integráció, vendég képernyőjének átméretezése) valószínűleg nem fog helyesen működni.</p><p>Az <b>Eszközök</b> menüből, az <b>Integrációs szolgáltatások telepítése</b> menüpont kiválasztásával frissítsd az Integrációs szolgáltat [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>A vendég rendszerre telepített VirtualBox Integrációs szolgáltatások elavultak: telepített verzió: %1, ajánlott verzió: %2. Néhány, Integrációs szolgáltatást igénylő funkció (egér-integráció, vendég képernyőjének átméretezése) valószínűleg nem fog helyesen működni.</p><p>Az <b>Eszközök</b> menüből, az <b>Integrációs szolgáltatások telepítése</b> menüpont kiválasztásával frissítsd az Integrációs szolgáltatás [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>A vendég rendszerre telepített VirtualBox Integrációs szolgáltatások túl újak a VirtualBox ezen verziójához: telepített verzió: %1, ajánlott verzió: %2.</p><p>Régi VirtualBoxon nem támogatott egy újabb Additions használata. <p>Az <b>Eszközök</b> menüből, az <b>Integrációs szolgáltatások telepítése</b> menüpont kiválasztásával telepítsd fel az Integrációs szolgáltatások aktuális verzióját.</p></t [...]
     </message>
     <message>
@@ -8422,9 +8569,9 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Letöltés</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Csatolás</translation>
+        <translation>Csatolás</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -8580,8 +8727,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Egy ablak mutatása a termékinformációkkal</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Elérhető a VirtualBox egy újabb verziója! A(z) <b>%1</b> -s verzió elérhető a <a href="http://www.virtualbox.org/">virtualbox.org</a> weboldalon.</p><p>Közvetlenül pedig erről a linkről töltheted le:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>Elérhető a VirtualBox egy újabb verziója! A(z) <b>%1</b> -s verzió elérhető a <a href="https://www.virtualbox.org/">virtualbox.org</a> weboldalon.</p><p>Közvetlenül pedig erről a linkről töltheted le:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -8711,8 +8858,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">F&elülírás</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Kritikus hiba lépett fel a virtuális gép futása során és a gép leállt.</p><p>Segítségért látogass el a <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> közösségi részlegébe vagy a támogatási oldalra. Mellékeld a <tt>VBox.log</tt> naplófájl tartalmát és a <tt>VBox.png</tt> képet, melyeket a(z) <nobr><b>%1</b></nobr> mappában megtalálsz, ahogy annak a leírásá [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Kritikus hiba lépett fel a virtuális gép futása során és a gép leállt.</p><p>Segítségért látogass el a <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> közösségi részlegébe vagy a támogatási oldalra. Mellékeld a <tt>VBox.log</tt> naplófájl tartalmát és a <tt>VBox.png</tt> képet, melyeket a(z) <nobr><b>%1</b></nobr> mappában megtalálsz, ahogy annak a leírását is, mit csin [...]
     </message>
     <message>
         <source>hard disk</source>
@@ -9127,7 +9274,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Nem sikerült a floppy eszközt (<nobr><b>%1</b></nobr>) leválasztani a(z) <i>%2</i> foglalatról, ezen a virtuális gépen: <b>%3</b>.</translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully started then s [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="obsolete"><p>Úgy tűnik a VirtualBox Integrációs szolgáltatások nem érhetők el a virtuális gépen, és nélküle a megosztott mappák nem használhatók. A virtuális gépen belüli megosztott mappák használatához telepítsd fel az Integrációs szolgáltatásokat, ha nincsenek telepítve, vagy ha csak nem működnek helyesen, az <b>Eszközök</b> menüben az <b>Integrációs szolgáltatások telepítése...</b> választásával. Ha telepítve vannak, de a gép ne [...]
     </message>
     <message numerus="yes">
@@ -9185,8 +9332,8 @@ p, li { white-space: pre-wrap; }
         <translation><p>Ne feledd, hogy ezen médium tárolóegysége nem lesz törölve és így később is hozzá lehet adni a listához.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
-        <translation type="obsolete"><p>Úgy tűnik a VirtualBox Integrációs szolgáltatások nem érhetők el a virtuális gépen, és nélküle a megosztott mappák nem használhatók. A virtuális gépen belüli megosztott mappák használatához telepítsd fel az Integrációs szolgáltatásokat, ha nincsenek telepítve, vagy ha csak nem működnek helyesen, az <b>Eszközök</b> menüben az <b>Integrációs szolgáltatások telepítése...</b> választásával. Ha telepítve vannak, de a gép ne [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
+        <translation><p>Úgy tűnik, a VirtualBox Integrációs szolgáltatások nem érhetők el a virtuális gépen, és nélküle a megosztott mappák nem használhatók. A virtuális gépen belüli megosztott mappák használatához telepítsd fel az Integrációs szolgáltatásokat, ha nincsenek telepítve, vagy ha csak nem működnek helyesen, az <b>Eszközök</b> menüben az <b>Integrációs szolgáltatások telepítése...</b> választásával. Ha telepítve vannak, a megosztott mappák elérhe [...]
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
@@ -9492,203 +9639,240 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Cannot start the VirtualBox Manager due to local restrictions.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>A VirtualBox kezelő helyi korlátozások miatt nem tud elindulni.</p><p>A progmram most leáll-</p></translation>
     </message>
     <message>
         <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>A(z) <b>%1</b> nyelv fájlja nem található a mappában: <b><nobr>%2</nobr></b>.</p><p>A nyelv ideiglenesen visszaáll a rendszer alapértelmezett nyelvére. A Virtualbox kezelő ablakában, a <b>Fájl</b>menün belül, válaszd a <b>Beállítások</b> menüpontot, és a <b>Nyelv</b> oldalon válassz egy elérhető nyelvet.</p></translation>
     </message>
     <message>
         <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>A nyelvi fájl nem tölthető be: <b><nobr>%1</nobr></b>. <p>A nyelv ideiglenesen visszaáll angolra (beépített). A Virtualbox kezelő ablakában, a <b>Fájl</b>menün belül, válaszd a <b>Beállítások</b> menüpontot, és a <b>Nyelv</b> oldalon válassz egy elérhető nyelvet.</p></translation>
     </message>
     <message>
         <source>There is no virtual machine with the identifier <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nincs ilyen nevű virtuális gép: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Ignore</source>
-        <translation type="unfinished">Kihagy</translation>
+        <translation>Kihagy</translation>
     </message>
     <message>
         <source>Failed to create NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>A NAT hálózat létrehozása sikertelen.</translation>
     </message>
     <message>
         <source>Failed to remove NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>A NAT hálózat eltávolítása sikertelen: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create DHCP server.</source>
-        <translation type="unfinished"></translation>
+        <translation>A DHCP szerver létrehozása sikertelen.</translation>
     </message>
     <message>
         <source>Failed to remove DHCP server for network interface <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>A hálózati kártya (<b>%1</b>) DHCP szerverének eltávolítása sikertelen.</translation>
     </message>
     <message>
         <source>Failed to create the host network interface.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gazda hálózati kártya létrehozása sikertelen.</translation>
     </message>
     <message>
         <source>Create &new disk</source>
-        <translation type="unfinished">Ú&j lemez létrehozása</translation>
+        <translation>Ú&j lemez létrehozása</translation>
     </message>
     <message>
         <source>&Choose existing disk</source>
-        <translation type="unfinished">Létező merevlemez &használata</translation>
+        <translation>Létező merevlemez &használata</translation>
     </message>
     <message>
         <source>Leave &empty</source>
-        <translation type="unfinished">Ür&esen hagy</translation>
+        <translation>Ür&esen hagy</translation>
     </message>
     <message>
         <source>&Choose disk</source>
-        <translation type="unfinished">Lemez &választása</translation>
+        <translation>Lemez &választása</translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Biztos elengeded a virtuális merevlemezt: <nobr><b>%1</b></nobr>?</p><p>Le fog választódni a következő virtuális gép(ek)ről: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual optical disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Biztos elengeded a virtuálisoptikai lemezt: <nobr><b>%1</b></nobr>?</p><p>Le fog választódni a következő virtuális gép(ek)ről: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual floppy disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Biztos elengeded a virtuális floppyt: <nobr><b>%1</b></nobr>?</p><p>Le fog választódni a következő virtuális gép(ek)ről: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Biztos törölni akarod a virtuális merevlemezt az ismert médiumok listájáról: <nobr><b>%1</b></nobr> ?</p></translation>
     </message>
     <message>
         <source><p>As this hard disk is inaccessible its image file can not be deleted.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Mivel ez a merevlemez elérhetetlen, a lemezfájl sem törölhető.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual optical disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Biztos törölni akarod a virtuális optikai lemezt az ismert médiumok listájáról: <nobr><b>%1</b></nobr> ?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual floppy disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Biztos törölni akarod a virtuális floppy lemezt az ismert médiumok listájáról: <nobr><b>%1</b></nobr> ?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual optical disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>A virtuális optikai lemez <nobr>(<b>%1</b>)</nobr> nem helyezhető be a gépbe: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force insertion of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Szereznéd erőszakkal behelyezni a lemezt?</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual optical disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>A virtuális optikai lemez <nobr>(<b>%1</b>)</nobr> nem adható ki a gépből: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force ejection of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Szereznéd erőszakkal kiadatni a lemezt?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual floppy disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>A virtuális floppy lemez <nobr>(<b>%1</b>)</nobr> nem helyezhető be a gépbe: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual floppy disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>A virtuális floppy lemez <nobr>(<b>%1</b>)</nobr> nem adható ki a gépből: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source>Failed to open the hard disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">A merevlemez megnyitása sikertelen: <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the optical disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Az optikai lemez megnyitása sikertelen: <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the floppy disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">A floppy fájl megnyitása sikertelen: <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the hard disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">A merevlemez bezárása sikertelen: <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the optical disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Az optikai lemez bezárása sikertelen: <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the floppy disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">A floppy lemez bezárása sikertelen: <nobr><b>%2</b></nobr>.</translation>
     </message>
     <message numerus="yes">
         <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><p>A virtuális gépek (%n) jelenleg mentett állapotban vannak: <b>%1</b>.</p><p>Ha folytatod, az exportált gép futási állapota elveszik. A létező gépek nem módosulnak.</p></numerusform>
         </translation>
     </message>
     <message>
         <source>Switch</source>
-        <translation type="unfinished">Átváltás</translation>
+        <translation>Átváltás</translation>
     </message>
     <message>
         <source>Failed to enable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>A távoli asztal szerver bekapcsolása sikertelen a virtuális géphez: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>A távoli asztal szerver kikapcsolása sikertelen a virtuális géphez: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to enable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>A videórögzítés bekapcsolása sikertelen a virtuális géphez: <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>A videórögzítés kikapcsolása sikertelen a virtuális géphez: <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox Guest Additions</b> disk image file.</p><p>Do you wish to download this disk image file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Nem található a <b>VirtualBox Integrációs szolgáltatások </b> lemezkép fájl. <nobr></p><p>Letöltöd a lemezkép fájlt az internetről?</p></translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished">Letöltés</translation>
+        <translation>Letöltés</translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox Guest Additions</b> disk image file from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Biztos le akarod tölteni a <b>VirtualBox Integrációs szolgáltatások</b> lemezkép fájlt innen: <nobr><a href="%1">%1</a></nobr> (mérete %2 byte)?</p></translation>
     </message>
     <message>
         <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>A <b>VirtualBox Integrációs szolgáltatások</b> lemezkép fájl sikeresen letöltődött a <nobr><a href="%1">%1</a></nobr> helyről, de nem lett lementve, mint <nobr><b>%2</b>.</nobr></p><p>Kérlek, válassz másik helyet a fájlnak.</p></translation>
+    </message>
+    <message>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual CD/DVD drive?</p></source>
+        <translation type="obsolete"><p>A VirtualBox Integrációs szolgáltatások lemezkép fájl sikeresen letöltődött a <nobr><a href="%1">%1</a></nobr> helyről és el lett mentve: <nobr><b>%2</b>.</nobr></p><p>Szeretnéd regisztrálni a lemezkép fájlt és berakni a virtuális CD/DVD meghajtóba?</p></translation>
+    </message>
+    <message>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no CD/DVD drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <translation type="obsolete"><p>Nem lehet a <b>VirtualBox integrációs szolgáltatások</b> telepítőlemezét felcsatolni a(z) <b>%1</b> virtuális gépre, mert a gép nem rendelkezik CD/DVD meghajtóval. Adj egyet hozzá a virtuális gép beállításainál a Tároló lapon.</p></translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Nem található a <b>VirtualBox felhasználói kézikönyv </b>: <nobr><b>%1</b>.</nobr></p><p>Letöltöd az internetről?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox User Manual</b> from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Biztos le akarod tölteni a <b>VirtualBox Felhasználói kézikönyvet</b> innen: <nobr><a href="%1">%1</a></nobr> (%2 byte)?</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"><p>A VirtualBox Felhasználói kézikönyv sikresen letöltődött innen: <nobr><a href="%1">%2</a></nobr> de nem lett helyikeg elmentve, mint <nobr><b>%3</b>.</nobr></p><p>Válassz a fájl számára másik helyet.</p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>A VirtualBox Felhasználói kézikönyv sikeresen letöltődött innen: <nobr><a href="%1">%1</a></nobr> de nem lett helyileg elmentve, mint <nobr><b>%2</b>.</nobr></p><p>Válassz a fájl számára másik helyet.</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p></source>
-        <translation type="unfinished"><p>A VirtualBox Felhasználói kézikönyv sikresen letöltődött innen: <nobr><a href="%1">%2</a></nobr> és el lett mentve mint <nobr><b>%3</b>.</nobr></p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>A VirtualBox Felhasználói kézikönyv sikeresen letöltődött innen: <nobr><a href="%1">%1</a></nobr> és el lett mentve mint <nobr><b>%2</b>.</nobr></p></translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Bezárás</translation>
+        <translation>Bezárás</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">Ok</translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Do not show this message again</source>
-        <translation type="unfinished">Ne mutassa ezt az üzenetet újra</translation>
+        <translation>Ne mutassa ezt az üzenetet újra</translation>
     </message>
     <message>
         <source><p>Do you want to remove the NAT network <nobr><b>%1</b>?</nobr></p><p>If this network is in use by one or more virtual machine network adapters these adapters will no longer be usable until you correct their settings by either choosing a different network name or a different adapter attachment type.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>El akarod távolítani a NAT hálózatot: <nobr><b>%1</b>?</nobr></p><p>Ha ezt a hálózatot egy vagy több virtuális gép hálózati kártyája is használja, ezen kártyák nem használhatók majd, míg nem módosítod a beállításaikat, egy másik hálózati nevet vagy másik adaptertípust választva.</b></translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete"><p>Úgy tűnik a VirtualBox Integrációs szolgáltatások nem érhetők el a virtuális gépen, és nélküle a megosztott mappák nem használhatók. A virtuális gépen belüli megosztott mappák használatához telepítsd fel az Integrációs szolgáltatásokat, ha nincsenek telepítve, vagy ha csak nem működnek helyesen, az <b>Eszközök</b> menüben az <b>Integrációs szolgáltatások telepítése...</b> választásával. Ha telepítve vannak, de a gép ne [...]
     </message>
     <message>
         <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Csatolás</translation>
     </message>
     <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
-        <translation type="unfinished"></translation>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
+        <translation>Webkamera (<b>%1</b>) csatlakoztatása sikertelen a virtuális géphez: <b>%2</b>.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
+        <translation>Webkamera (<b>%1</b>) leválasztása sikertelen a virtuális gépről: <b>%2</b>.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
-        <translation type="unfinished"></translation>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <translation><p>A virtuális képernyő jelenleg <b>%1&nbsp;bit</b> színmódra van beállítva. A jobb teljesítmény érdekében, állítsd át <b>%2&nbsp;bitre</b>. Ez alapesetben megtehető a vendég operációs rendszer Vezérlőpult vagy Rendszerbeállítások. <b>Képernyő</b> részében.</p></translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
@@ -9703,115 +9887,115 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9875,19 +10059,19 @@ p, li { white-space: pre-wrap; }
     <name>UIMiniToolBar</name>
     <message>
         <source>Always show the toolbar</source>
-        <translation type="unfinished">Mindig látsszon az eszköztár</translation>
+        <translation>Mindig látsszon az eszköztár</translation>
     </message>
     <message>
         <source>Minimize Window</source>
-        <translation type="unfinished">Ablak kis méretre</translation>
+        <translation>Ablak kis méretre</translation>
     </message>
     <message>
         <source>Exit Full Screen or Seamless Mode</source>
-        <translation type="unfinished">Kilépés a teljes képernyős vagy asztal-integrációs módból</translation>
+        <translation>Kilépés a teljes képernyős vagy asztal-integrációs módból</translation>
     </message>
     <message>
         <source>Close VM</source>
-        <translation type="unfinished">Virtuális gép bezárása</translation>
+        <translation>Virtuális gép bezárása</translation>
     </message>
 </context>
 <context>
@@ -9904,8 +10088,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation>&Név:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Név:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -9927,6 +10111,10 @@ p, li { white-space: pre-wrap; }
         <source>Selects 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>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -9964,7 +10152,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The network operation failed with the following error: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>A hálózati művelet a következő hiba miatt sikertelen: %1.</translation>
     </message>
 </context>
 <context>
@@ -9991,27 +10179,27 @@ p, li { white-space: pre-wrap; }
     <name>UINetworkReplyPrivate</name>
     <message>
         <source>Host not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Gazda nem található</translation>
     </message>
     <message>
         <source>Content access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Tartalom elérése tiltott</translation>
     </message>
     <message>
         <source>Protocol failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Protokoll hiba</translation>
     </message>
     <message>
         <source>Wrong SSL certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>Rossz SSL tanúsítvány formátum</translation>
     </message>
     <message>
         <source>SSL authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>SSL hitelesítési hiba</translation>
     </message>
     <message>
         <source>Unknown reason</source>
-        <translation type="unfinished"></translation>
+        <translation>Ismeretlen ok</translation>
     </message>
 </context>
 <context>
@@ -10915,7 +11103,7 @@ esetleg a <b>Létező</b> gombbal a Virtuális lemezkezelőből.<
     <name>UIPopupCenter</name>
     <message>
         <source>Click for full details</source>
-        <translation type="unfinished"></translation>
+        <translation>Kattintsd ide a részletekhez</translation>
     </message>
 </context>
 <context>
@@ -11052,18 +11240,14 @@ esetleg a <b>Létező</b> gombbal a Virtuális lemezkezelőből.<
         <translation>Virtuális gép fájlok (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Üdvözöl a VirtualBox!</h3><p>Az ablak bal oldali részében a virtuális gépeid listáját látod. Ez jelenleg üres, mivel még nem készítettél egyetlen virtuális gépet sem.<img src=:/welcome.png align=right/></p><p>Új virtuális gép létrehozásához kattints az <b>Új</b> gombra az eszköztáron, az ablak tetején.</p><p>Az <b>%1</b> billentyű megnyomásával azonnali segítséget kérhetsz, va [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation><h3>Üdvözöl a VirtualBox!</h3><p>Az ablak bal oldali részében a virtuális gépeid listáját látod. Ez jelenleg üres, mivel még nem készítettél egyetlen virtuális gépet sem.<img src=:/welcome.png align=right/></p><p>Új virtuális gép létrehozásához kattints az <b>Új</b> gombra az eszköztáron, az ablak tetején.</p><p>Az <b>%1</b> billentyű megnyomásával azonnali segítséget kérhetsz, vagy látogass el a [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation>Kezelő</translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -11100,11 +11284,11 @@ esetleg a <b>Létező</b> gombbal a Virtuális lemezkezelőből.<
     </message>
     <message>
         <source><b>%1</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1</b>. oldal:</translation>
     </message>
     <message>
         <source><b>%1: %2</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1: %2</b> oldal:</translation>
     </message>
 </context>
 <context>
@@ -11251,6 +11435,10 @@ esetleg a <b>Létező</b> gombbal a Virtuális lemezkezelőből.<
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Bezárás</translation>
     </message>
@@ -11258,10 +11446,6 @@ esetleg a <b>Létező</b> gombbal a Virtuális lemezkezelőből.<
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -11373,8 +11557,8 @@ esetleg a <b>Létező</b> gombbal a Virtuális lemezkezelőből.<
         <translation type="obsolete">Összegzés</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Elérhető a VirtualBox egy újabb verziója! A(z) <b>%1</b> -s verzió elérhető a <a href="http://www.virtualbox.org/">virtualbox.org</a> weboldalon.</p><p>Közvetlenül pedig erről a linkről töltheted le:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>Elérhető a VirtualBox egy újabb verziója! A(z) <b>%1</b> -s verzió elérhető a <a href="https://www.virtualbox.org/">virtualbox.org</a> weboldalon.</p><p>Közvetlenül pedig erről a linkről töltheted le:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -11466,167 +11650,98 @@ esetleg a <b>Létező</b> gombbal a Virtuális lemezkezelőből.<
     <name>UIVMInfoDialog</name>
     <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Munkamenet információk</translation>
+        <translation type="unfinished">%1 - Munkamenet információk</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Részletek</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished">&Konfigurációs részletek</translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">&Futtatókörnyezet</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished">Futásidő info&rmációk</translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>DMA átvitelek</translation>
+        <translation type="unfinished">DMA átvitelek</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>PIO átvitelek</translation>
+        <translation type="unfinished">PIO átvitelek</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Olvasott adat</translation>
+        <translation type="unfinished">Olvasott adat</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Írt adat</translation>
+        <translation type="unfinished">Írt adat</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Küldött adat</translation>
+        <translation type="unfinished">Küldött adat</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Fogadott adat</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Engedélyezve</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Letiltva</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Futtatókörnyezet paraméterei</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Felbontás</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">CD/DVD statisztika</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Hálózati adapter statisztika</translation>
-    </message>
-    <message>
-        <source>Not attached</source>
-        <translation type="obsolete">Nincs csatolva</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Verzió: %1.%2</translation>
+        <translation type="unfinished">Fogadott adat</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Nem található</translation>
+        <translation type="unfinished">Nem található</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Nem található</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>Integrációs szolgáltatások</translation>
+        <translation type="unfinished">Nem található</translation>
     </message>
     <message>
-        <source>Guest OS Type</source>
-        <translation>Vendég OS típusa</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Nem érhető el</translation>
     </message>
     <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Merevlemez statisztika</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Futtatókörnyezet paraméterei</translation>
     </message>
     <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Nincsenek merevlemezek</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Felbontás</translation>
     </message>
     <message>
-        <source>No Network Adapters</source>
-        <translation>Nincsenek hálózati adapterek</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Engedélyezve</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished">Vágólap mód</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Letiltva</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <translation type="obsolete">Memóriavirtualizáció</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Integrációs szolgáltatások</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">Nem érhető el</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Vendég OS típusa</translation>
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation>Tároló statisztika</translation>
+        <translation type="unfinished">Tároló statisztika</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
-        <translation>Nincsenek tárolóeszközök</translation>
+        <translation type="unfinished">Nincsenek tárolóeszközök</translation>
     </message>
     <message>
         <source>Network Statistics</source>
-        <translation>Hálózati statisztika</translation>
-    </message>
-    <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Memóriavirtualizáció</translation>
-    </message>
-    <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>Nem érhető el</translation>
-    </message>
-    <message>
-        <source>Clipboard Mode</source>
-        <translation>Vágólap mód</translation>
-    </message>
-    <message>
-        <source>Drag'n'Drop Mode</source>
-        <translation type="obsolete">Fogd és vidd mód</translation>
-    </message>
-    <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hálózati statisztika</translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Nincsenek hálózati adapterek</translation>
     </message>
 </context>
 <context>
@@ -12206,39 +12321,39 @@ esetleg a <b>Létező</b> gombbal a Virtuális lemezkezelőből.<
     </message>
     <message>
         <source>Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Tároló beállítások</translation>
     </message>
     <message>
         <source>Please choose a file to export the virtual appliance to</source>
-        <translation type="unfinished"></translation>
+        <translation>Válassz egy fájlt, a virtuális gép exportálásához</translation>
     </message>
     <message>
         <source>F&ormat:</source>
-        <translation type="unfinished"></translation>
+        <translation>F&ormátum:</translation>
     </message>
     <message>
         <source>OVF 0.9</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 0.9</translation>
     </message>
     <message>
         <source>OVF 1.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 1.0</translation>
     </message>
     <message>
         <source>OVF 2.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 2.0</translation>
     </message>
     <message>
         <source>Write in standard OVF 1.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Szabványos OVF 1.0 formátumba írás.</translation>
     </message>
     <message>
         <source>Write in new experimental OVF 2.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Új, kísérleti  OVF 2.0 formátumba írás.</translation>
     </message>
     <message>
         <source>&Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Tároló beállítá&sok</translation>
     </message>
 </context>
 <context>
@@ -12257,14 +12372,14 @@ esetleg a <b>Létező</b> gombbal a Virtuális lemezkezelőből.<
     </message>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Válassz egy fájlt, a virtuális gép exportálásához...</translation>
     </message>
 </context>
 <context>
     <name>UIWizardExportAppPageExpert</name>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Válassz egy fájlt, a virtuális gép exportálásához...</translation>
     </message>
 </context>
 <context>
@@ -12334,15 +12449,15 @@ esetleg a <b>Létező</b> gombbal a Virtuális lemezkezelőből.<
     </message>
     <message>
         <source>Import Virtual Appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtuális gép importálása</translation>
     </message>
     <message>
         <source>Choose a virtual appliance file to import...</source>
-        <translation type="unfinished"></translation>
+        <translation>Válassz egy fájlt, a virtuális gép importálásához...</translation>
     </message>
     <message>
         <source>Please choose a virtual appliance file to import</source>
-        <translation type="unfinished"></translation>
+        <translation>Válassz egy fájlt, a virtuális gép importálásához</translation>
     </message>
 </context>
 <context>
@@ -12953,11 +13068,11 @@ Verzió %1</translation>
         <translation type="obsolete">Ablak megnyitása az megosztott mappák beállításához</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">&Integrációs szolgáltatások telepítése...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Integrációs szolgáltatások telepítő CD-kép felcsatolása</translation>
     </message>
     <message>
@@ -13289,7 +13404,7 @@ Verzió %1</translation>
         <translation type="obsolete">Munkamenet i&nformációk</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Munkamenet információk megjelenítése</translation>
     </message>
     <message>
@@ -13745,7 +13860,7 @@ Verzió %1</translation>
     </message>
     <message>
         <source>Choose...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kiválaszt...</translation>
     </message>
 </context>
 <context>
@@ -13755,8 +13870,8 @@ Verzió %1</translation>
         <translation><alapértelmezettre állítás></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Az aktuális alapértelmezés akkor lesz kijelezve, ha a változásokat elfogadod, és ezt az ablakot újra megnyitod.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation>Az aktuális alapértelmezés akkor lesz kijelezve, ha a változásokat elfogadod, és ezt az ablakot újra megnyitod.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -13804,7 +13919,8 @@ Verzió %1</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Az aktuális alapértelmezés akkor lesz kijelezve, ha a változásokat elfogadod, és ezt az ablakot újra megnyitod.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -15056,7 +15172,7 @@ Verzió %1</translation>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Ezen merevlemez csatlakoztatása egy új különbözeti lemez készítését fogja okozni.</translation>
+        <translation>Ezen merevlemez csatlakoztatása egy új különbözeti lemez készítését fogja okozni.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -15066,7 +15182,7 @@ Verzió %1</translation>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Ez az alap merevlemez a következő különbözeti lemezzel lesz csatlakoztatva:</translation>
+        <translation>Ez az alap merevlemez a következő különbözeti lemezzel lesz csatlakoztatva:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -15679,22 +15795,22 @@ Verzió %1</translation>
     <message>
         <source>Unrestricted Execution</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>Korlátlan végrehajtás</translation>
     </message>
     <message>
         <source>PS/2 Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PS/2 egér</translation>
     </message>
     <message>
         <source>USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB egér</translation>
     </message>
     <message>
         <source>PS/2 and USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PS/2 és USB egér</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -15708,31 +15824,31 @@ Verzió %1</translation>
     </message>
     <message>
         <source>Unrestricted Execution</source>
-        <translation type="unfinished"></translation>
+        <translation>Korlátlan végrehajtás</translation>
     </message>
     <message>
         <source>USB Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB tablet</translation>
     </message>
     <message>
         <source>USB Multi-Touch Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB többérintéses tablet</translation>
     </message>
     <message>
         <source>NAT Network</source>
         <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
+        <translation>NAT hálózat</translation>
     </message>
     <message>
         <source>NAT network, '%1'</source>
         <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Nat hálózat, '%1'</translation>
     </message>
     <message>
         <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Képfájlokat a virtuális média menedzserrel hozhatsz létre vagy adhatsz hozzá.</translation>
     </message>
     <message>
         <source>USB</source>
@@ -15740,51 +15856,11 @@ Verzió %1</translation>
         <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Alapértelmezett</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished">Aktív</translation>
@@ -15815,6 +15891,11 @@ Verzió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -15825,6 +15906,31 @@ Verzió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Alapértelmezett</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -15835,6 +15941,11 @@ Verzió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -15855,6 +15966,11 @@ Verzió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -15864,16 +15980,16 @@ Verzió %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -16150,11 +16266,11 @@ to the system default language.</qt>
         <translation type="obsolete">Megmutatja az aktuális alapértelmezett VDI mappát. Ez a mappa az alapértelmezés, ha nem ad meg mappát új virtuális lemez készítésekor/regisztrálásakor.</translation>
     </message>
     <message>
-        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Az alapértelmezett virtuális gép mappa értékét gyári alapbeállításra állítja vissza. Az új érték a változások elfogadása és az ablak újranyitása után jelenik meg.</translation>
     </message>
     <message>
-        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Az alapértelmezett VDI mappa értékét gyári alapbeállításra állítja vissza. Az új érték a változások elfogadása és az ablak újranyitása után jelenik meg.</translation>
     </message>
     <message>
@@ -16203,7 +16319,7 @@ to the system default language.</qt>
         <translation type="obsolete">Megnyit egy ablakot a VRDP azonosítási könyvtár kiválasztásához.</translation>
     </message>
     <message>
-        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">A jogosultság-kezelő könyvtárát visszaállítja az alapértelmezettre. Az alapértelmezett könyvtár a változtatások elfogadása után és ezen ablak újranyitása után fog látszani.</translation>
     </message>
     <message>
@@ -16537,15 +16653,15 @@ to the system default language.</qt>
         <translation type="obsolete">Új virtuális merevlemez készítése</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -16640,8 +16756,8 @@ to the system default language.</qt>
         <translation type="obsolete">VirtualBox regisztrálása</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
-        <translation type="obsolete"><p>Kérlek, töltsd ki ezt a regisztrációs űrlapot, hogy tudjuk azt, hogy a felhasználóink táborába tartozol, valamint, hogy informálhassunk téged a különböző hírekről, újdonságokról.</p><p>Add meg speciális karakterek nélkül a neved, illetve az e-mail címedet. Az Innotek cég az adataidat kizárólag statisztikai célokra, és a te informálásodra használja, harmadik fél számára ki nem adja. A személyes adatok felhasználásának és kezeléséne [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
+        <translation type="obsolete"><p>Kérlek, töltsd ki ezt a regisztrációs űrlapot, hogy tudjuk azt, hogy a felhasználóink táborába tartozol, valamint, hogy informálhassunk téged a különböző hírekről, újdonságokról.</p><p>Add meg speciális karakterek nélkül a neved, illetve az e-mail címedet. Az Innotek cég az adataidat kizárólag statisztikai célokra, és a te informálásodra használja, harmadik fél számára ki nem adja. A személyes adatok felhasználásának és kezeléséne [...]
     </message>
     <message>
         <source>&Name</source>
@@ -16688,8 +16804,8 @@ to the system default language.</qt>
         <translation type="obsolete">A kapcsolódási próbálkozás sikertelen volt.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Kérlek töltsd ki ezt a regisztrációs űrlapot, hogy tudjuk, hogy használod a VirtualBox-ot. Ha akarod, a friss VirtualBox-os hírekről és frissítésekről is értesítünk.</p><p>Add meg a nevedet ékezet nélkül, és az e-mail címedet az alábbi mezőkben. A Sun Microsystems ezeket az adatokat csakis statisztikai célokra és hírlevél küldésére használja. Természetesen a Sun Microsystems vállalja, hogy harmadik fél számára ezeket az adatokat n [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Kérlek töltsd ki ezt a regisztrációs űrlapot, hogy tudjuk, hogy használod a VirtualBox-ot. Ha akarod, a friss VirtualBox-os hírekről és frissítésekről is értesítünk.</p><p>Add meg a nevedet ékezet nélkül, és az e-mail címedet az alábbi mezőkben. A Sun Microsystems ezeket az adatokat csakis statisztikai célokra és hírlevél küldésére használja. Természetesen a Sun Microsystems vállalja, hogy harmadik fél számára ezeket az adatokat n [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -16708,8 +16824,8 @@ to the system default language.</qt>
         <translation type="obsolete">Válassz országot/területet</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
-        <translation type="obsolete"><p>Kérlek, töltsd ki ezt a regisztrációs űrlapot, hogy tudjuk azt, hogy a felhasználóink táborába tartozol, valamint, hogy informálhassunk téged a különböző hírekről, újdonságokról.</p><p>Add meg speciális karakterek nélkül a neved, illetve az e-mail címedet. A Sun Microsystems az adataidat kizárólag statisztikai célokra, és a te informálásodra használja, harmadik fél számára ki nem adja. A személyes adatok felhasználásának és kezelé [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
+        <translation type="obsolete"><p>Kérlek, töltsd ki ezt a regisztrációs űrlapot, hogy tudjuk azt, hogy a felhasználóink táborába tartozol, valamint, hogy informálhassunk téged a különböző hírekről, újdonságokról.</p><p>Add meg speciális karakterek nélkül a neved, illetve az e-mail címedet. A Sun Microsystems az adataidat kizárólag statisztikai célokra, és a te informálásodra használja, harmadik fél számára ki nem adja. A személyes adatok felhasználásának és kezelé [...]
     </message>
     <message>
         <source>I &already have a Sun Online account:</source>
@@ -17046,8 +17162,8 @@ to the system default language.</qt>
         <translation type="obsolete">Átmenetileg felfüggeszti a virtuális gép működését</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Üdvözöl a VirtualBox!</h3><p>Az ablak bal oldali részében a virtuális gépeid listáját látod. Ez jelenleg üres, hiszen most indítod ezt a programot először.<img src=:/welcome.png align=right/></p><p>Új virtuális gép létrehozásához kattints az <b>Új</b> gombra az eszköztáron.</p><p>Az <b>%1</b> billentyű megnyomásával azonnali segítséget kérhetsz, vagy látogass el a <a href=h [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Üdvözöl a VirtualBox!</h3><p>Az ablak bal oldali részében a virtuális gépeid listáját látod. Ez jelenleg üres, hiszen most indítod ezt a programot először.<img src=:/welcome.png align=right/></p><p>Új virtuális gép létrehozásához kattints az <b>Új</b> gombra az eszköztáron.</p><p>Az <b>%1</b> billentyű megnyomásával azonnali segítséget kérhetsz, vagy látogass el a <a href=h [...]
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
@@ -17819,6 +17935,165 @@ value.</qt></source>
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Munkamenet információk</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Részletek</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Futtatókörnyezet</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">DMA átvitelek</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">PIO átvitelek</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Olvasott adat</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Írt adat</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Küldött adat</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Fogadott adat</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Engedélyezve</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="obsolete">Letiltva</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Futtatókörnyezet paraméterei</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Felbontás</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">CD/DVD statisztika</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Hálózati adapter statisztika</translation>
+    </message>
+    <message>
+        <source>Not attached</source>
+        <translation type="obsolete">Nincs csatolva</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Verzió: %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Nem található</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Nem található</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Integrációs szolgáltatások</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Vendég OS típusa</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Merevlemez statisztika</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Nincsenek merevlemezek</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Nincsenek hálózati adapterek</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Engedélyezve</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Letiltva</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <translation type="obsolete">Memóriavirtualizáció</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">Nem érhető el</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Tároló statisztika</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Nincsenek tárolóeszközök</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Hálózati statisztika</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Memóriavirtualizáció</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Nem érhető el</translation>
+    </message>
+    <message>
+        <source>Clipboard Mode</source>
+        <translation type="obsolete">Vágólap mód</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">Fogd és vidd mód</translation>
+    </message>
+    <message>
+        <source>Configuration &Details</source>
+        <translation type="obsolete">&Konfigurációs részletek</translation>
+    </message>
+    <message>
+        <source>&Runtime Information</source>
+        <translation type="obsolete">Futásidő info&rmációk</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMListBox</name>
     <message>
         <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
@@ -18667,7 +18942,7 @@ Input Output APIC (I/O APIC), amely egy picit visszafogja a virtuális gép telj
         <translation type="obsolete">A gépről készített pillanatképek útvonala. A pillanatképek egy picit sok helyet foglalnak el.</translation>
     </message>
     <message>
-        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">A pillanatképek mappáját az alapértelmezettre állítja vissza. Az új érték a változások elfogadása és az ablak újranyitása után jelenik meg.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
index d2bedec..4db2425 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
@@ -93,7 +93,7 @@
     </message>
     <message>
         <source>Incompatible Qt Library Error</source>
-        <translation>Kesalahan inkompatibilitas Qt Library</translation>
+        <translation>Kesalahan inkompatibilitas Pustaka Qt</translation>
     </message>
     <message>
         <source>VirtualBox - Error In %1</source>
@@ -105,7 +105,7 @@
     </message>
     <message>
         <source>Please try reinstalling VirtualBox.</source>
-        <translation>Coba instal ulang VirtualBox.</translation>
+        <translation>Harap pasang ulang VirtualBox.</translation>
     </message>
     <message>
         <source>Make sure the kernel module has been loaded successfully.</source>
@@ -129,11 +129,11 @@
     </message>
     <message>
         <source>The VirtualBox kernel modules do not match this version of VirtualBox. The installation of VirtualBox was apparently not successful. Please try completely uninstalling and reinstalling VirtualBox.</source>
-        <translation>Modul kernel VirtualBox tak cocok dengan versi VirtualBox ini. Instalasi VirtualBox sepertinya tak sukses. Silakan coba membongkar seluruhnya dan menginstal ulang VirtualBox.</translation>
+        <translation>Modul kernel VirtualBox tak cocok dengan versi VirtualBox ini. Instalasi VirtualBox sepertinya tak sukses. Silakan coba membongkar seluruhnya dan memasang ulang VirtualBox.</translation>
     </message>
     <message>
         <source>The VirtualBox kernel modules do not match this version of VirtualBox. The installation of VirtualBox was apparently not successful. Executing<br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>may correct this. Make sure that you do not mix the OSE version and the PUEL version of VirtualBox.</source>
-        <translation>Modul kernel VirtualBox tak cocok dengan versi VirtualBox ini. Instalasi VirtualBox sepertinya tak sukses. Menjalankan <br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>mungkin memperbaiki hal ini. Pastikan bahwa Anda tak mencampur VirtualBox versi OSE dan versi PUEL.</translation>
+        <translation>Modul kernel VirtualBox tidak cocok dengan versi VirtualBox ini. Instalasi VirtualBox sepertinya tak sukses. Menjalankan <br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>mungkin memperbaiki hal ini. Pastikan bahwa Anda tak mencampur VirtualBox versi OSE dan versi PUEL.</translation>
     </message>
     <message>
         <source>This error means that the kernel driver was either not able to allocate enough memory or that some mapping operation failed.</source>
@@ -141,7 +141,7 @@
     </message>
     <message>
         <source>The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or there is a permission problem with /dev/vboxdrv. Please reinstall the kernel module by executing<br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>as root. If it is available in your distribution, you should install the DKMS package first. This package keeps track of Linux kernel changes and recompiles the vboxdrv kernel module if necess [...]
-        <translation>Driver VirtualBox untuk kernel Linux (vboxdrv) mungkin tak dimuat atau ada masalah ijin dengan /dev/vboxdrv. Silakan instal ulang modul kernel dengan menjalankan<br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>sebagai root. Bila tersedia untuk distribusi Anda, Anda mesti terlebih dahulu memasang paket DKMS. Paket ini mencatat perubahan kernel Linux dan mengkompail ulang modul kernel vboxdrv bila di [...]
+        <translation>Driver VirtualBox untuk kernel Linux (vboxdrv) mungkin tidak dimuat atau ada masalah ijin dengan /dev/vboxdrv. Silakan pasang ulang modul kernel dengan menjalankan<br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>sebagai root. Bila tersedia untuk distribusi Anda, Anda mesti terlebih dahulu memasang paket DKMS. Paket ini mencatat perubahan kernel Linux dan mengkompail ulang modul kernel vboxdrv bila  [...]
     </message>
 </context>
 <context>
@@ -163,7 +163,7 @@
     </message>
     <message>
         <source>Select a file</source>
-        <translation>Pilih sebuah file</translation>
+        <translation>Pilih sebuah berkas</translation>
     </message>
 </context>
 <context>
@@ -223,7 +223,7 @@
     </message>
     <message>
         <source>Copy all errors to the clipboard</source>
-        <translation>Salin semua error ke clipboard</translation>
+        <translation>Salin semua kesalahan ke papan klip</translation>
     </message>
     <message>
         <source>Copy</source>
@@ -293,7 +293,7 @@
     </message>
     <message>
         <source>Automatically resize the guest display when the window is resized (requires Guest Additions)</source>
-        <translation type="obsolete">Resize tampilan guest secara otomatis saat window diresize (membutuhkan Guest Additions)</translation>
+        <translation type="obsolete">Ubah ukuran tampilan guest secara otomatis saat jendela diubah ukurannya (membutuhkan Guest Additions)</translation>
     </message>
     <message>
         <source>&Adjust Window Size</source>
@@ -301,15 +301,15 @@
     </message>
     <message>
         <source>Adjust window size and position to best fit the guest display</source>
-        <translation>Sesuaikan ukuran dan posisi windows untuk tampilan terbaik pada display guest</translation>
+        <translation>Atur ukuran dan posisi windows agar paling pas dengan tampilan guest</translation>
     </message>
     <message>
         <source>Disable &Mouse Integration</source>
-        <translation type="obsolete">Matikan Integrasi &Mouse</translation>
+        <translation type="obsolete">Nonaktifkan Integrasi &Tetikus</translation>
     </message>
     <message>
         <source>Temporarily disable host mouse pointer integration</source>
-        <translation type="obsolete">Mematikan sementara integrasi mouse pointer pada host</translation>
+        <translation type="obsolete">Mematikan sementara integrasi penunjuk tetikus pada host</translation>
     </message>
     <message>
         <source>Enable &Mouse Integration</source>
@@ -321,11 +321,11 @@
     </message>
     <message>
         <source>&Insert Ctrl-Alt-Del</source>
-        <translation type="obsolete">&Insert Ctrl+Alt+Del</translation>
+        <translation type="obsolete">S&isipkan Ctrl+Alt+Del</translation>
     </message>
     <message>
         <source>Send the Ctrl-Alt-Del sequence to the virtual machine</source>
-        <translation type="obsolete">Kirim sekuens Ctrl+Alt+Del pada mesin virtual</translation>
+        <translation type="obsolete">Kirim urutan Ctrl+Alt+Del ke mesin virtual</translation>
     </message>
     <message>
         <source>&Insert Ctrl-Alt-Backspace</source>
@@ -333,7 +333,7 @@
     </message>
     <message>
         <source>Send the Ctrl-Alt-Backspace sequence to the virtual machine</source>
-        <translation type="obsolete">Kirim sekuens Ctrl+Alt+Backspace pada mesin virtual</translation>
+        <translation type="obsolete">Kirim urutan Ctrl+Alt+Backspace ke mesin virtual</translation>
     </message>
     <message>
         <source>Take &Snapshot...</source>
@@ -341,19 +341,19 @@
     </message>
     <message>
         <source>Take a snapshot of the virtual machine</source>
-        <translation>Ambil Snapshot mesin virtual</translation>
+        <translation>Ambil snapshot mesin virtual</translation>
     </message>
     <message>
         <source>Session I&nformation Dialog</source>
         <translation type="obsolete">Dialog I&nformasi Sesi </translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
-        <translation type="obsolete">Tampilkan Dialog Informasi Sesi </translation>
+        <source>Show Session Information Window</source>
+        <translation type="obsolete">Tampilkan Jendela Informasi Sesi </translation>
     </message>
     <message>
         <source>&Pause</source>
-        <translation>&Pause</translation>
+        <translation>&Istirahat</translation>
     </message>
     <message>
         <source>Suspend the execution of the virtual machine</source>
@@ -377,7 +377,7 @@
     </message>
     <message>
         <source>ACPI Sh&utdown</source>
-        <translation></translation>
+        <translation>ACPI Sh&utdown</translation>
     </message>
     <message>
         <source>ACPI S&hutdown</source>
@@ -385,7 +385,7 @@
     </message>
     <message>
         <source>Send the ACPI Power Button press event to the virtual machine</source>
-        <translation type="obsolete">Kirim Tombol Power ACPI event pada mesin virtual </translation>
+        <translation type="obsolete">Kirim kejadian penekanan Tombol Power ACPI ke mesin virtual </translation>
     </message>
     <message>
         <source>&Close...</source>
@@ -393,19 +393,31 @@
     </message>
     <message>
         <source>Close the virtual machine</source>
-        <translation>Tutup Mesin Virtual</translation>
+        <translation>Tutup mesin virtual</translation>
     </message>
     <message>
         <source>&View</source>
-        <translation></translation>
+        <translation>&Tilik</translation>
     </message>
     <message>
         <source>&Devices</source>
-        <translation>&Device</translation>
+        <translation>&Perangkat</translation>
+    </message>
+    <message>
+        <source>&CD/DVD Devices</source>
+        <translation type="obsolete">Perangkat &CD/DVD</translation>
+    </message>
+    <message>
+        <source>&Floppy Devices</source>
+        <translation type="obsolete">Device &Floppy</translation>
     </message>
     <message>
         <source>&USB Devices</source>
-        <translation type="obsolete">Device &USB</translation>
+        <translation type="obsolete">Perangkat &USB</translation>
+    </message>
+    <message>
+        <source>Change the settings of network adapters</source>
+        <translation type="obsolete">Ubah pengaturan adaptor jaringan</translation>
     </message>
     <message>
         <source>&Shared Folders...</source>
@@ -413,19 +425,19 @@
     </message>
     <message>
         <source>Create or modify shared folders</source>
-        <translation type="obsolete">Buka dialog untuk beroperasi pada folder yang di share</translation>
+        <translation type="obsolete">Buat atau ubah folder bersama</translation>
     </message>
     <message>
         <source>Enable or disable remote desktop (RDP) connections to this machine</source>
         <translation type="obsolete">Menyalakan atau mematikan koneksi remote desktop (RDP) pada mesin ini</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Install Guest Additions...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation>Masukkan &image CD Guest Addition...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
-        <translation type="obsolete">Pasang Guest Additions pada image instalasi</translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <translation type="obsolete">Masukkan berkas disk Guest Addition ke dalam drive virtual</translation>
     </message>
     <message>
         <source>De&bug</source>
@@ -439,7 +451,7 @@
     <message>
         <source>&Command Line...</source>
         <comment>debug action</comment>
-        <translation>&Command Line...</translation>
+        <translation>&Baris Perintah...</translation>
     </message>
     <message>
         <source>&Logging...</source>
@@ -452,15 +464,15 @@
     </message>
     <message>
         <source>Dock Icon</source>
-        <translation></translation>
+        <translation>Ikon Dok</translation>
     </message>
     <message>
         <source>Show Monitor Preview</source>
-        <translation></translation>
+        <translation>Tampilkan Pratinjau Monitor</translation>
     </message>
     <message>
         <source>Show Application Icon</source>
-        <translation></translation>
+        <translation>Tampilkan Ikon Aplikasi</translation>
     </message>
     <message>
         <source>Enable remote desktop (RDP) connections to this machine</source>
@@ -473,11 +485,11 @@
     </message>
     <message>
         <source>Switch to &Fullscreen</source>
-        <translation type="obsolete">Beralih ke &Fullscreen</translation>
+        <translation type="obsolete">Beralih ke &Layar Penuh</translation>
     </message>
     <message>
         <source>Switch between normal and fullscreen mode</source>
-        <translation type="obsolete">Bertukar antara mode normal dan fullscreen</translation>
+        <translation type="obsolete">Bertukar antara mode normal dan layar penuh</translation>
     </message>
     <message>
         <source>Switch to Seam&less Mode</source>
@@ -513,81 +525,93 @@
     </message>
     <message>
         <source>Show the log files of the selected virtual machine</source>
-        <translation type="obsolete">Tampilkan file log pada mesin virtual terpilih</translation>
+        <translation type="obsolete">Tampilkan berkas log mesin virtual yang dipilih</translation>
     </message>
     <message>
         <source>&Contents...</source>
-        <translation type="unfinished">&Isi...</translation>
+        <translation>&Isi...</translation>
     </message>
     <message>
         <source>Show help contents</source>
-        <translation type="unfinished"></translation>
+        <translation>Tampilkan isi bantuan</translation>
     </message>
     <message>
         <source>Open the browser and go to the VirtualBox product web site</source>
-        <translation type="unfinished">Buka browser dan pergi ke website produk VirtualBox</translation>
+        <translation>Buka peramban dan pergi ke situs web produk VirtualBox</translation>
     </message>
     <message>
         <source>Go back to showing all suppressed warnings and messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Kembali menampilkan semua peringatan dan pesan yang disembunyikan</translation>
     </message>
     <message>
         <source>&Network Operations Manager...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ma&najer Operasi Jaringan...</translation>
+    </message>
+    <message>
+        <source>Show Network Operations Manager</source>
+        <translation type="obsolete">Tampilkan Manajer Operasi Jaringan</translation>
     </message>
     <message>
         <source>Check for a new VirtualBox version</source>
-        <translation type="unfinished">Periksa keberadaan versi baru VirtualBox</translation>
+        <translation>Periksa keberadaan versi baru VirtualBox</translation>
     </message>
     <message>
         <source>&About VirtualBox...</source>
-        <translation type="unfinished"></translation>
+        <translation>Tent&ang VirtualBox...</translation>
     </message>
     <message>
         <source>Show a window with product information</source>
-        <translation type="obsolete">Tunjukkan dialog dengan informasi produk</translation>
+        <translation type="obsolete">Tampilkan jendela dengan informasi produk</translation>
     </message>
     <message>
         <source>Take Sn&apshot...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ambil Snapshot...</translation>
     </message>
     <message>
         <source>Take Screensh&ot...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ambil Cuplikan &Layar...</translation>
+    </message>
+    <message>
+        <source>Take a screenshot of the virtual machine</source>
+        <translation type="obsolete">Ambil cuplikan layar dari mesin virtual</translation>
+    </message>
+    <message>
+        <source>Ins&ert Ctrl-Alt-Backspace</source>
+        <translation type="obsolete">S&isipkan Ctrl+Alt+Backspace</translation>
     </message>
     <message>
         <source>&File</source>
         <comment>Mac OS X version</comment>
-        <translation type="unfinished">&File</translation>
+        <translation>&Berkas</translation>
     </message>
     <message>
         <source>&File</source>
         <comment>Non Mac OS X version</comment>
-        <translation type="unfinished">&File</translation>
+        <translation>&Berkas</translation>
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
-        <translation type="unfinished">Manajer Media &Virtual...</translation>
+        <translation>Manajer Media &Virtual...</translation>
     </message>
     <message>
         <source>Display the Virtual Media Manager window</source>
-        <translation type="unfinished">Menampilkan dialog Manajer Disk Virtual</translation>
+        <translation>Menampilkan jendela Manajer Media Virtual</translation>
     </message>
     <message>
         <source>&Import Appliance...</source>
-        <translation type="unfinished">&Impor Appliance...</translation>
+        <translation>&Impor Appliance...</translation>
     </message>
     <message>
         <source>Import an appliance into VirtualBox</source>
-        <translation type="unfinished">Mengimpor suatu appliance ke dalam VirtualBox</translation>
+        <translation>Mengimpor suatu appliance ke dalam VirtualBox</translation>
     </message>
     <message>
         <source>&Export Appliance...</source>
-        <translation type="unfinished">&Ekspor Appliance...</translation>
+        <translation>&Ekspor Appliance...</translation>
     </message>
     <message>
         <source>Export one or more VirtualBox virtual machines as an appliance</source>
-        <translation type="unfinished">Mengekspor satu atau lebih mesin virtual VirtualBox sebagai appliance</translation>
+        <translation>Mengekspor satu atau lebih mesin virtual VirtualBox sebagai appliance</translation>
     </message>
     <message>
         <source>&Preferences...</source>
@@ -596,31 +620,35 @@
     </message>
     <message>
         <source>Display the global settings window</source>
-        <translation type="obsolete">Buka dialog setting global</translation>
+        <translation type="obsolete">Tampilkan jendela pengaturan global</translation>
     </message>
     <message>
         <source>E&xit</source>
-        <translation type="unfinished">&Keluar</translation>
+        <translation>&Keluar</translation>
     </message>
     <message>
         <source>Close application</source>
-        <translation type="unfinished">Tutup aplikasi</translation>
+        <translation>Tutup aplikasi</translation>
     </message>
     <message>
         <source>&Group</source>
-        <translation type="unfinished"></translation>
+        <translation>&Grup</translation>
     </message>
     <message>
         <source>Create a new virtual machine</source>
-        <translation type="obsolete">Ciptakan Mesin Virtual Baru</translation>
+        <translation type="obsolete">Ciptakan mesin virtual baru</translation>
     </message>
     <message>
         <source>Add an existing virtual machine</source>
         <translation type="obsolete">Tambahkan mesin virtual yang telah ada</translation>
     </message>
     <message>
+        <source>Rename the selected virtual machine group</source>
+        <translation type="obsolete">Ubah nama grup mesin virtual yang dipilih</translation>
+    </message>
+    <message>
         <source>S&tart</source>
-        <translation type="unfinished">M&ulai</translation>
+        <translation>M&ulai</translation>
     </message>
     <message>
         <source>Start the selected virtual machine</source>
@@ -628,15 +656,19 @@
     </message>
     <message>
         <source>S&how</source>
-        <translation type="unfinished">T&ampilkan</translation>
+        <translation>T&ampilkan</translation>
     </message>
     <message>
         <source>Switch to the window of the selected virtual machine</source>
         <translation type="obsolete">Beralih pada jendela mesin virtual terpilih</translation>
     </message>
     <message>
+        <source>Re&fresh...</source>
+        <translation type="obsolete">Sega&rkan...</translation>
+    </message>
+    <message>
         <source>Refresh the accessibility state of the selected virtual machine</source>
-        <translation type="obsolete">Me-refresh keadaan akesibilitas pada mesin virtual terpilih</translation>
+        <translation type="obsolete">Menyegarkan keadaan akesibilitas pada mesin virtual yang dipilih</translation>
     </message>
     <message>
         <source>Show in Finder</source>
@@ -660,19 +692,23 @@
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition file in the File Manager</source>
-        <translation type="obsolete">Menampilkan file Definisi Mesin VirtualBox di dalam Manajer Berkas</translation>
+        <translation type="obsolete">Menampilkan berkas Definisi Mesin VirtualBox di dalam Manajer Berkas</translation>
     </message>
     <message>
         <source>&New...</source>
-        <translation type="unfinished">&Baru...</translation>
+        <translation>&Baru...</translation>
     </message>
     <message>
         <source>&Add...</source>
-        <translation type="unfinished">T&ambah...</translation>
+        <translation>T&ambah...</translation>
+    </message>
+    <message>
+        <source>Add a new group based on the items selected</source>
+        <translation type="obsolete">Tambahkan grup baru berdasarkan butir-butir yang dipilih</translation>
     </message>
     <message>
         <source>Cl&one...</source>
-        <translation type="unfinished">K&lon...</translation>
+        <translation>K&lon...</translation>
     </message>
     <message>
         <source>Clone the selected virtual machine</source>
@@ -680,7 +716,7 @@
     </message>
     <message>
         <source>&Remove...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Hapus...</translation>
     </message>
     <message>
         <source>Remove the selected virtual machine</source>
@@ -688,7 +724,11 @@
     </message>
     <message>
         <source>Discard</source>
-        <translation type="unfinished">Abaikan</translation>
+        <translation>Buang</translation>
+    </message>
+    <message>
+        <source>D&iscard saved state...</source>
+        <translation type="obsolete">Buang keadaan yang d&isimpan...</translation>
     </message>
     <message>
         <source>Discard the saved state of the selected virtual machine</source>
@@ -704,7 +744,7 @@
     </message>
     <message>
         <source>Create Shortcut on Desktop</source>
-        <translation type="obsolete">Buat Shortcut pada Desktop</translation>
+        <translation type="obsolete">Buat Pintasan pada Desktop</translation>
     </message>
     <message>
         <source>Creates an Shortcut file to the VirtualBox Machine Definition file on your Desktop.</source>
@@ -712,163 +752,237 @@
     </message>
     <message>
         <source>&Close</source>
-        <translation type="unfinished">&Tutup</translation>
+        <translation>&Tutup</translation>
     </message>
     <message>
         <source>Show &Log...</source>
-        <translation type="unfinished">Tampilkan &Log...</translation>
+        <translation>Tampilkan &Log...</translation>
     </message>
     <message>
         <source>&VirtualBox Web Site...</source>
-        <translation type="unfinished">Website &VirtualBox...</translation>
+        <translation>Situs Web &VirtualBox...</translation>
     </message>
     <message>
         <source>&Reset All Warnings</source>
-        <translation type="unfinished">&Reset Semua Peringatan</translation>
+        <translation>&Reset Semua Peringatan</translation>
     </message>
     <message>
         <source>C&heck for Updates...</source>
-        <translation type="unfinished">&Periksa Update...</translation>
+        <translation>&Periksa Pemutakhiran...</translation>
     </message>
     <message>
         <source>Rena&me Group...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ubah Na&ma Grup...</translation>
+    </message>
+    <message>
+        <source>Sort the items of the selected virtual machine group alphabetically</source>
+        <translation type="obsolete">Urutkan butir-butir grup mesin virtual yang dipilih secara alfabet</translation>
+    </message>
+    <message>
+        <source>Remove the selected virtual machines</source>
+        <translation type="obsolete">Hapus mesin virtual yang dipilih</translation>
+    </message>
+    <message>
+        <source>Start the selected virtual machines</source>
+        <translation type="obsolete">Mulai jalankan mesin virtual yang dipilih</translation>
+    </message>
+    <message>
+        <source>Switch to the windows of the selected virtual machines</source>
+        <translation type="obsolete">Berpindah ke jendela mesin virtual yang dipilih</translation>
+    </message>
+    <message>
+        <source>Suspend the execution of the selected virtual machines</source>
+        <translation type="obsolete">Tahan eksekusi mesin virtual yang dipilih</translation>
+    </message>
+    <message>
+        <source>Reset the selected virtual machines</source>
+        <translation type="obsolete">Reset mesin virtual yang dipilih</translation>
+    </message>
+    <message>
+        <source>Discard the saved state of the selected virtual machines</source>
+        <translation type="obsolete">Buang keadaan tersimpan pada mesin virtual terpilih</translation>
+    </message>
+    <message>
+        <source>Show the VirtualBox Machine Definition file in Finder</source>
+        <translation type="obsolete">Tampilkan berkas Definisi Mesin VirtualBox di dalam Finder</translation>
+    </message>
+    <message>
+        <source>Show the VirtualBox Machine Definition file in Explorer</source>
+        <translation type="obsolete">Tampilkan berkas Definisi Mesin VirtualBox di dalam Explorer</translation>
+    </message>
+    <message>
+        <source>Creates an alias file to the VirtualBox Machine Definition file on your desktop</source>
+        <translation type="obsolete">Membuat berkas alias ke berkas Definisi Mesin VirtualBox pada desktop Anda</translation>
+    </message>
+    <message>
+        <source>Creates an shortcut file to the VirtualBox Machine Definition file on your desktop</source>
+        <translation type="obsolete">Membuat suatu berkas pintasan ke berkas Definisi Mesin VirtualBox pada desktop Anda</translation>
+    </message>
+    <message>
+        <source>Save State</source>
+        <translation type="obsolete">Simpan Keadaan</translation>
+    </message>
+    <message>
+        <source>Save the machine state of the selected virtual machines</source>
+        <translation type="obsolete">Simpan keadaan mesin dari mesin virtual yang dipilih</translation>
+    </message>
+    <message>
+        <source>Send the ACPI Power Button press event to the selected virtual machines</source>
+        <translation type="obsolete">Kirim kejadian penekanan Tombol Power ACPI ke mesin virtual yang dipilih</translation>
     </message>
     <message>
         <source>Po&wer Off</source>
-        <translation type="unfinished"></translation>
+        <translation>Matikan &Daya</translation>
+    </message>
+    <message>
+        <source>Power off the selected virtual machines</source>
+        <translation type="obsolete">Matikan mesin virtual yang dipilih</translation>
     </message>
     <message>
         <source>&New Machine...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mesi&n Baru...</translation>
     </message>
     <message>
         <source>&Add Machine...</source>
-        <translation type="unfinished"></translation>
+        <translation>T&ambah Mesin...</translation>
+    </message>
+    <message>
+        <source>&Ungroup...</source>
+        <translation type="obsolete">Bongkar Gr&up...</translation>
+    </message>
+    <message>
+        <source>Ungroup items of the selected virtual machine group</source>
+        <translation type="obsolete">Bongkar grup dari mesin virtual yang dipilih</translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="obsolete">Urutkan</translation>
     </message>
     <message>
         <source>Gro&up</source>
-        <translation type="unfinished"></translation>
+        <translation>Gr*up</translation>
+    </message>
+    <message>
+        <source>Sort the group of the first selected machine alphabetically</source>
+        <translation type="obsolete">Urutkan grup dari mesin yang dipilih pertama secara alfabet</translation>
     </message>
     <message>
         <source>Shared &Clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Papan Klip Ber&sama</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop</source>
+        <translation type="obsolete">Drag'n'Drop</translation>
+    </message>
+    <message>
+        <source>Save the machine state of the virtual machine</source>
+        <translation type="obsolete">Simpan keadaan mesin dari mesin virtual</translation>
     </message>
     <message>
         <source>Power off the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Matikan mesin virtual</translation>
     </message>
     <message>
         <source>&Network Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pengatura&n Jaringan...</translation>
     </message>
     <message>
         <source>&Shared Folders Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pengaturan Folder Ber&sama...</translation>
     </message>
     <message>
         <source>R&emote Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamp&ilan Jarak Jauh</translation>
     </message>
     <message>
         <source>&Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Tangkapan &Video</translation>
     </message>
     <message>
         <source>&Video Capture Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pengaturan Tangkapan &Video...</translation>
     </message>
     <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
+        <source>Configure video capture settings</source>
+        <translation type="obsolete">Tata pengaturan penangkapan video</translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
+        <source>Popup Menu</source>
+        <translation>Menu Popup</translation>
     </message>
     <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">&Insert Guest Additions CD image...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Pasang Guest Additions pada image instalasi</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&Webcams</source>
+        <translation>&Webcam</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Jaringan</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar</source>
+        <source>&File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="unfinished">&Keyboard</translation>
-    </message>
-    <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Jaringan</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Preferensi...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Tampilkan &Log...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&File</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -884,175 +998,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Preferensi...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <source>&Keyboard</source>
+        <translation type="unfinished">&Keyboard</translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <source>&Hard Disks</source>
+        <translation type="unfinished">&Hard Disk</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="unfinished">&Hard Disk</translation>
+        <source>&USB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Tampilkan &Log...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1071,7 +1185,7 @@
     </message>
     <message>
         <source>Preview Monitor %1</source>
-        <translation type="unfinished">Pratinjau Monitor %1</translation>
+        <translation type="unfinished">Pemantauan Pratinjau %1</translation>
     </message>
     <message>
         <source>&Connect Network Adapter</source>
@@ -1083,18 +1197,26 @@
     </message>
     <message>
         <source>No USB Devices Connected</source>
-        <translation type="unfinished">Tidak Ada Device USB Tersambung</translation>
+        <translation type="unfinished">Tidak Ada Perangkat USB Tersambung</translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
-        <translation type="unfinished">Tidak ada device yang terdukung terkoneksi pada PC host</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tidak Ada Webcam Yang Tersambung</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
+        <translation type="unfinished">Tidak ada webcam yang didukung yang terhubung ke PC host</translation>
+    </message>
+    <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1114,7 +1236,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1122,7 +1244,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1146,15 +1268,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1166,19 +1300,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re&fresh</source>
-        <translation type="unfinished">Re&fresh</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1222,15 +1356,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1239,32 +1373,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Nyalakan</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1286,6 +1396,17 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -1375,7 +1496,7 @@
     </message>
     <message>
         <source>Unknown Hardware Item</source>
-        <translation>Item Hardware Tak Dikenal</translation>
+        <translation>Item Perangkat Keras Yang Tak Dikenal</translation>
     </message>
     <message>
         <source>MB</source>
@@ -1944,7 +2065,7 @@
     </message>
     <message>
         <source>The selected virtual machine is <i>inaccessible</i>. Please inspect the error message shown below and press the <b>Refresh</b> button if you want to repeat the accessibility check:</source>
-        <translation>Mesin virtual yang dipilih <i>tidak dapat diakses</i>. Mohon periksa pesan kesalahan yang ditunjukkan di bawah ini dan tekan tombol <b>Refresh</b> bila Anda ingin mengulang pemeriksaan aksesibilitas:</translation>
+        <translation>Mesin virtual yang dipilih <i>tidak dapat diakses</i>. Mohon periksa pesan kesalahan yang ditunjukkan di bawah ini dan tekan tombol <b>Segarkan</b> bila Anda ingin mengulang pemeriksaan aksesibilitas:</translation>
     </message>
     <message>
         <source>General</source>
@@ -2031,7 +2152,7 @@
     <name>UIDnDHandler</name>
     <message>
         <source>Dropping data ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Menjatuhkan data ...</translation>
     </message>
     <message>
         <source>Retrieving data ...</source>
@@ -2039,6 +2160,13 @@
     </message>
 </context>
 <context>
+    <name>UIDnDMimeData</name>
+    <message>
+        <source>Dropping data ...</source>
+        <translation type="obsolete">Menjatuhkan data ...</translation>
+    </message>
+</context>
+<context>
     <name>UIDownloader</name>
     <message>
         <source>Cancel</source>
@@ -2074,11 +2202,11 @@
     </message>
     <message>
         <source>Looking for %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mencari %1...</translation>
     </message>
     <message>
         <source>Downloading %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mengunduh %1...</translation>
     </message>
 </context>
 <context>
@@ -2105,29 +2233,29 @@
     </message>
     <message>
         <source>VirtualBox Guest Additions</source>
-        <translation type="unfinished"></translation>
+        <translation>Guest Additions VirtualBox</translation>
     </message>
 </context>
 <context>
     <name>UIDownloaderExtensionPack</name>
     <message>
         <source>Select folder to save %1 to</source>
-        <translation>Pilih folder untuk menyimpan %1</translation>
+        <translation>Pilih folder tempat menyimpan %1</translation>
     </message>
     <message>
         <source>VirtualBox Extension Pack</source>
-        <translation type="unfinished"></translation>
+        <translation>Extension Pack VirtualBox</translation>
     </message>
 </context>
 <context>
     <name>UIDownloaderUserManual</name>
     <message>
         <source>Select folder to save User Manual to</source>
-        <translation>Pilih folder untuk menyimpan Manual Pengguna</translation>
+        <translation>Pilih folder tempat menyimpan Manual Pengguna</translation>
     </message>
     <message>
         <source>VirtualBox User Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Manual Pengguna VirtualBox</translation>
     </message>
 </context>
 <context>
@@ -2464,66 +2592,66 @@
     <message>
         <source><b>%1</b></source>
         <comment>Group item tool-tip / Group name</comment>
-        <translation type="unfinished"></translation>
+        <translation><b>%1</b></translation>
     </message>
     <message numerus="yes">
         <source>%n group(s)</source>
         <comment>Group item tool-tip / Group info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n grup</numerusform>
         </translation>
     </message>
     <message>
         <source><nobr>%1</nobr></source>
         <comment>Group item tool-tip / Group info wrapper</comment>
-        <translation type="unfinished"><nobr>%1</nobr></translation>
+        <translation><nobr>%1</nobr></translation>
     </message>
     <message numerus="yes">
         <source>%n machine(s)</source>
         <comment>Group item tool-tip / Machine info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n mesin</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>(%n running)</source>
         <comment>Group item tool-tip / Running machine info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>(%n berjalan)</numerusform>
         </translation>
     </message>
     <message>
         <source><nobr>%1</nobr></source>
         <comment>Group item tool-tip / Machine info wrapper</comment>
-        <translation type="unfinished"><nobr>%1</nobr></translation>
+        <translation><nobr>%1</nobr></translation>
     </message>
     <message>
         <source><nobr>%1 %2</nobr></source>
         <comment>Group item tool-tip / Machine info wrapper, including running</comment>
-        <translation type="unfinished"><nobr>%1</nobr> {1 %2<?}</translation>
+        <translation><nobr>%1 %2</nobr></translation>
     </message>
     <message>
         <source>Collapse group</source>
-        <translation type="unfinished"></translation>
+        <translation>Runtuhkan grup</translation>
     </message>
     <message>
         <source>Expand group</source>
-        <translation type="unfinished"></translation>
+        <translation>Kembangkan grup</translation>
     </message>
     <message>
         <source>Enter group</source>
-        <translation type="unfinished"></translation>
+        <translation>Masuk grup</translation>
     </message>
     <message>
         <source>Exit group</source>
-        <translation type="unfinished"></translation>
+        <translation>Keluar grup</translation>
     </message>
 </context>
 <context>
     <name>UIGChooserModel</name>
     <message>
         <source>New group</source>
-        <translation type="unfinished"></translation>
+        <translation>Grup baru</translation>
     </message>
 </context>
 <context>
@@ -2531,62 +2659,67 @@
     <message>
         <source>Name</source>
         <comment>details (general)</comment>
-        <translation type="unfinished">Nama</translation>
+        <translation>Nama</translation>
     </message>
     <message>
         <source>Groups</source>
         <comment>details (general)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Grup</translation>
     </message>
     <message>
         <source>%1 MB</source>
         <comment>details</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>Processors</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Prosesor</translation>
+        <translation>Prosesor</translation>
     </message>
     <message>
         <source>%1%</source>
         <comment>details</comment>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>VT-x/AMD-V</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">VT-x/AMD-V</translation>
+        <translation>VT-x/AMD-V</translation>
     </message>
     <message>
         <source>PAE/NX</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">PAE/NX</translation>
+        <translation>PAE/NX</translation>
     </message>
     <message>
         <source>Acceleration</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Akselerasi</translation>
+        <translation>Akselerasi</translation>
     </message>
     <message>
         <source>Screens</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">Layar</translation>
+        <translation>Layar</translation>
     </message>
     <message>
         <source>3D</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">3D</translation>
+        <translation>3D</translation>
     </message>
     <message>
         <source>Acceleration</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">Akselerasi</translation>
+        <translation>Akselerasi</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (display/vrde/VRDE server)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dinonaktifkan</translation>
+    </message>
+    <message>
+        <source>[CD/DVD]</source>
+        <comment>details (storage)</comment>
+        <translation type="obsolete">[CD/DVD]</translation>
     </message>
     <message>
         <source>Not attached</source>
@@ -2596,12 +2729,12 @@
     <message>
         <source>Controller</source>
         <comment>details (audio)</comment>
-        <translation type="unfinished">Pengendali</translation>
+        <translation>Pengendali</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (audio)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Bridged adapter, %1</source>
@@ -2631,181 +2764,181 @@
     <message>
         <source>Adapter %1</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Adaptor %1</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (network/adapter)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Port %1</source>
         <comment>details (serial)</comment>
-        <translation type="unfinished">Port %1</translation>
+        <translation>Port %1</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (serial)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Port %1</source>
         <comment>details (parallel)</comment>
-        <translation type="unfinished">Port %1</translation>
+        <translation>Port %1</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (parallel)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>%1 (%2 active)</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished">%1 (%2 aktif)</translation>
+        <translation>%1 (%2 aktif)</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>None</source>
         <comment>details (shared folders)</comment>
-        <translation type="unfinished">Tidak Ada</translation>
+        <translation>Tidak Ada</translation>
     </message>
     <message>
         <source>None</source>
         <comment>details (description)</comment>
-        <translation type="unfinished">Tidak Ada</translation>
+        <translation>Tidak Ada</translation>
     </message>
     <message>
         <source>Operating System</source>
         <comment>details (general)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Sistem Operasi</translation>
     </message>
     <message>
         <source>Information Inaccessible</source>
         <comment>details</comment>
-        <translation type="unfinished"></translation>
+        <translation>Informasi Tidak Bisa Diakses</translation>
     </message>
     <message>
         <source>Base Memory</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Memori Dasar</translation>
+        <translation>Memori Dasar</translation>
     </message>
     <message>
         <source>Execution Cap</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Cap Eksekusi</translation>
+        <translation>Batas Eksekusi</translation>
     </message>
     <message>
         <source>Boot Order</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Urutan Boot</translation>
+        <translation>Urutan Boot</translation>
     </message>
     <message>
         <source>Nested Paging</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Paging Bertingkat</translation>
+        <translation>Paging Bertingkat</translation>
     </message>
     <message>
         <source>Video Memory</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">Memori Video</translation>
+        <translation>Memori Video</translation>
     </message>
     <message>
         <source>2D Video</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">Video 2D</translation>
+        <translation>Video 2D</translation>
     </message>
     <message>
         <source>Remote Desktop Server Port</source>
         <comment>details (display/vrde)</comment>
-        <translation type="unfinished">Port Server Remote Desktop</translation>
+        <translation>Port Server Remote Desktop</translation>
     </message>
     <message>
         <source>Remote Desktop Server</source>
         <comment>details (display/vrde)</comment>
-        <translation type="unfinished">Server Remote Desktop</translation>
+        <translation>Server Remote Desktop</translation>
     </message>
     <message>
         <source>Not Attached</source>
         <comment>details (storage)</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Host Driver</source>
         <comment>details (audio)</comment>
-        <translation type="unfinished">Driver Host</translation>
+        <translation>Driver Host</translation>
     </message>
     <message>
         <source>Bridged Adapter, %1</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Adaptor Ter-bridge, %1</translation>
     </message>
     <message>
         <source>Internal Network, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jaringan Internal, '%1'</translation>
     </message>
     <message>
         <source>Host-only Adapter, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Adaptor Hanya-host, '%1'</translation>
     </message>
     <message>
         <source>Generic Driver, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Driver Generik, '%1'</translation>
     </message>
     <message>
         <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Driver Generik, '%1' {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished">Filter Device</translation>
+        <translation>Penyaring Perangkat</translation>
     </message>
     <message>
         <source>USB Controller Inaccessible</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Pengendali USB Tidak Bisa Diakses</translation>
     </message>
     <message>
         <source>Shared Folders</source>
         <comment>details (shared folders)</comment>
-        <translation type="unfinished">Folder yang di Share</translation>
+        <translation>Folder Bersama</translation>
     </message>
     <message>
         <source>Video Capture File</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Berkas Tangkapan Video</translation>
     </message>
     <message>
         <source>Video Capture Attributes</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Atribut Tangkapan Video</translation>
     </message>
     <message>
         <source>Video Capture</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tangkapan Video</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>NAT Network, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jaringan NAT, '%1'</translation>
     </message>
     <message>
         <source>Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukuran Frame: %1x%2, Laju Frame: %3fps, Laju Bit: %4kbps</translation>
     </message>
     <message>
         <source>Minimal Paravirtualization</source>
@@ -2813,48 +2946,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hyper-V Paravirtualization</source>
-        <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KVM Paravirtualization</source>
-        <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">Pengendali USB</translation>
-    </message>
-    <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini-toolbar</source>
-        <comment>details (user interface)</comment>
+        <source>Hyper-V Paravirtualization</source>
+        <comment>details (system)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <source>KVM Paravirtualization</source>
+        <comment>details (system)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2873,6 +2971,21 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">Pengendali USB</translation>
+    </message>
+    <message>
         <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
@@ -2902,6 +3015,31 @@
         <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details (user interface/mini-toolbar)</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UIGDetailsUpdateThreadAudio</name>
@@ -3089,23 +3227,23 @@
     </message>
     <message>
         <source>Every 0.5 s</source>
-        <translation type="unfinished">Setiap 0,5 d</translation>
+        <translation>Setiap 0,5 d</translation>
     </message>
     <message>
         <source>Every 1 s</source>
-        <translation type="unfinished">Setiap 1 d</translation>
+        <translation>Setiap 1 d</translation>
     </message>
     <message>
         <source>Every 2 s</source>
-        <translation type="unfinished">Setiap 2 d</translation>
+        <translation>Setiap 2 d</translation>
     </message>
     <message>
         <source>Every 5 s</source>
-        <translation type="unfinished">Setiap 5 d</translation>
+        <translation>Setiap 5 d</translation>
     </message>
     <message>
         <source>Every 10 s</source>
-        <translation type="unfinished">Setiap 10 d</translation>
+        <translation>Setiap 10 d</translation>
     </message>
     <message>
         <source>No Preview</source>
@@ -3113,53 +3251,61 @@
     </message>
     <message>
         <source>Update disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Pemutakhiran dinonaktifkan</translation>
     </message>
     <message>
         <source>No preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidak ada pratinjau</translation>
     </message>
 </context>
 <context>
     <name>UIGlobalSettingsDisplay</name>
     <message>
         <source>Maximum Guest Screen &Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukuran Layar Guest Mak&simum:</translation>
     </message>
     <message>
         <source>&Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Lebar:</translation>
+    </message>
+    <message>
+        <source>Specifies the maximum width which we would like the guest to use.</source>
+        <translation type="obsolete">Menyatakan lebar maksimum yang kita inginkan untuk dipakai oleh guest.</translation>
     </message>
     <message>
         <source>&Height:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Tinggi:</translation>
+    </message>
+    <message>
+        <source>Specifies the maximum height which we would like the guest to use.</source>
+        <translation type="obsolete">Menyatakan tinggi maksimum yang kita inginkan untuk dipakai oleh guest.</translation>
     </message>
     <message>
         <source>Automatic</source>
         <comment>Maximum Guest Screen Size</comment>
-        <translation type="unfinished"></translation>
+        <translation>Otomatis</translation>
     </message>
     <message>
         <source>Suggest a reasonable maximum screen size to the guest. The guest will only see this suggestion when guest additions are installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Menyarankan ukuran layar maksimum yang layak ke guest. Guest hanya akan melihat saran ini ketika guest addition dipasang.</translation>
     </message>
     <message>
         <source>None</source>
         <comment>Maximum Guest Screen Size</comment>
-        <translation type="unfinished">Tidak Ada</translation>
+        <translation>Tidak Ada</translation>
     </message>
     <message>
         <source>Do not attempt to limit the size of the guest screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jangan mencoba membatasi ukuran layar guest.</translation>
     </message>
     <message>
         <source>Hint</source>
         <comment>Maximum Guest Screen Size</comment>
-        <translation type="unfinished"></translation>
+        <translation>Arahan</translation>
     </message>
     <message>
         <source>Suggest a maximum screen size to the guest. The guest will only see this suggestion when guest additions are installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Menyarankan ukuran layar maksimum ke guest. Guest hanya akan melihat saran ini ketika guest addition dipasang.</translation>
     </message>
     <message>
         <source>Machine Windows:</source>
@@ -3190,7 +3336,7 @@
     </message>
     <message>
         <source>Lists all installed packages.</source>
-        <translation>Tampilkan semua paket terinstall.</translation>
+        <translation>Tampilkan semua paket terpasang.</translation>
     </message>
     <message>
         <source>Active</source>
@@ -3214,11 +3360,11 @@
     </message>
     <message>
         <source>Select an extension package file</source>
-        <translation>Pilih sebuah file paket ekstensi</translation>
+        <translation>Pilih sebuah berkas paket ekstensi</translation>
     </message>
     <message>
         <source>Extension package files (%1)</source>
-        <translation>File paket ekstensi (%1)</translation>
+        <translation>Berkas paket ekstensi (%1)</translation>
     </message>
     <message>
         <source>Extensions</source>
@@ -3226,7 +3372,7 @@
     </message>
     <message>
         <source>&Extension Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Paket &Ekstensi</translation>
     </message>
     <message>
         <source>Add Package</source>
@@ -3253,19 +3399,19 @@
     </message>
     <message>
         <source>Holds the path to the default virtual machine folder. This folder is used, if not explicitly specified otherwise, when creating new virtual machines.</source>
-        <translation>Tampilkan path ke folder default mesin virtual. Folder ini digunakan, bila nilai lain tidak dinyatakan secara eksplisit, saat menciptakan mesin virtual baru.</translation>
+        <translation>Menyimpan path ke folder baku mesin virtual. Folder ini digunakan, bila nilai lain tidak dinyatakan secara eksplisit, saat menciptakan mesin virtual baru.</translation>
     </message>
     <message>
         <source>Holds the path to the library that provides authentication for Remote Display (VRDP) clients.</source>
-        <translation>Tampilkan path ke library yang menyediakan otentikasi untuk klien Remote Display (VRDP).</translation>
+        <translation type="unfinished">Menyimpan path ke pustaka yang menyediakan otentikasi untuk klien Tampilan Jarak Jauh (VRDP).</translation>
     </message>
     <message>
         <source>Default &Machine Folder:</source>
-        <translation>Folder Default &Mesin:</translation>
+        <translation>Folder Baku &Mesin:</translation>
     </message>
     <message>
         <source>V&RDP Authentication Library:</source>
-        <translation>Library Otentikasi V&RDP:</translation>
+        <translation>Pustaka Otentikasi V&RDP:</translation>
     </message>
     <message>
         <source>When checked, the application will provide an icon with the context menu in the system tray.</source>
@@ -3288,8 +3434,28 @@
         <translation type="obsolete">Matikan &ScreenSaver Host</translation>
     </message>
     <message>
+        <source>&Dock and Menubar:</source>
+        <translation type="obsolete">&Dok dan Bilah Menu:</translation>
+    </message>
+    <message>
+        <source>Auto-Show in Fullscreen</source>
+        <translation type="obsolete">Tampilkan Otomatis dalam Layar Penuh</translation>
+    </message>
+    <message>
+        <source>When checked, the host dock and menu bar will be shown when the virtual machine is in fullscreen mode.</source>
+        <translation type="obsolete">Saat ditandai, dok host dan bilah menu akan ditampilkan ketika sebuah mesin virtual sedang dalam mode layar penuh.</translation>
+    </message>
+    <message>
+        <source>&Host Screensaver:</source>
+        <translation type="obsolete">&ScreenSaver Host:</translation>
+    </message>
+    <message>
         <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
-        <translation type="unfinished"></translation>
+        <translation>Saat ditandai, screensaver host akan dinonaktifkan ketika sebuah mesin virtual sedang berjalan.</translation>
+    </message>
+    <message>
+        <source>Disable When Running Virtual Machines</source>
+        <translation type="obsolete">Nonaktifkan Ketika Menjalankan Mesin Virtual</translation>
     </message>
     <message>
         <source>Host Screensaver:</source>
@@ -3312,11 +3478,11 @@
     </message>
     <message>
         <source>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</source>
-        <translation>Saat tertandai, keyboard secara otomatis tertangkap setiap kali window VM diaktifkan. Saat keyboard ditangkap, semua tekanan tombol (termasuk untuk sistem seperti Alt+Tab) diarahkan ke VM.</translation>
+        <translation>Saat tertandai, papan tik secara otomatis ditangkap setiap kali jendela VM diaktifkan. Saat papan tik ditangkap, semua ketukan tombol (termasuk untuk sistem seperti Alt+Tab) diarahkan ke VM.</translation>
     </message>
     <message>
         <source>&Auto Capture Keyboard</source>
-        <translation>Otom&atis Tangkap Keyboard</translation>
+        <translation>Otom&atis Tangkap Papan Tik</translation>
     </message>
     <message>
         <source>Reset host combination</source>
@@ -3328,19 +3494,27 @@
     </message>
     <message>
         <source>Host Key Combination</source>
-        <translation type="unfinished"></translation>
+        <translation>Kombinasi Tombol Host</translation>
     </message>
     <message>
         <source>Some items have the same shortcuts assigned.</source>
-        <translation type="unfinished"></translation>
+        <translation>Beberapa butir memiliki pengaturan pintasan yang sama.</translation>
     </message>
     <message>
         <source>&VirtualBox Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Manajer &VirtualBox</translation>
     </message>
     <message>
         <source>Virtual &Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>&Mesin Virtual</translation>
+    </message>
+    <message>
+        <source>Lists all the available shortcuts which can be configured.</source>
+        <translation type="obsolete">Menampilkan daftar semua pintasan yang tersedia, yang dapat ditata.</translation>
+    </message>
+    <message>
+        <source>Enter a sequence to filter the shortcut list.</source>
+        <translation type="obsolete">Masukkan suatu urutan untuk menyaring daftar pintasan.</translation>
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
@@ -3356,7 +3530,7 @@
     <message>
         <source> (built-in)</source>
         <comment>Language</comment>
-        <translation> (built-in)</translation>
+        <translation> (bawaan)</translation>
     </message>
     <message>
         <source><unavailable></source>
@@ -3371,7 +3545,7 @@
     <message>
         <source>Default</source>
         <comment>Language</comment>
-        <translation>Default</translation>
+        <translation>Baku</translation>
     </message>
     <message>
         <source>Language:</source>
@@ -3383,7 +3557,7 @@
     </message>
     <message>
         <source>Lists all available user interface languages. The effective language is written in <b>bold</b>. Select <i>Default</i> to reset to the system default language.</source>
-        <translation>Menampilkan daftar semua bahasa antarmuka yang tersedia. Bahasa yang efektif dicetak <b>tebal</b>. Pilih <i>Default</i> untuk me-reset ke bahasa default sistem.</translation>
+        <translation>Menampilkan daftar semua bahasa antarmuka yang tersedia. Bahasa yang efektif dicetak <b>tebal</b>. Pilih <i>Baku</i> untuk mengembalikan ke bahasa baku sistem.</translation>
     </message>
     <message>
         <source>Name</source>
@@ -3399,15 +3573,15 @@
     </message>
     <message>
         <source>Author</source>
-        <translation>Pencipta</translation>
+        <translation>Penulis</translation>
     </message>
     <message>
         <source>Author(s):</source>
-        <translation>Pencipta:</translation>
+        <translation>Penulis:</translation>
     </message>
     <message>
         <source>&Interface Languages</source>
-        <translation type="unfinished"></translation>
+        <translation>Bahasa &Antar Muka</translation>
     </message>
 </context>
 <context>
@@ -3492,12 +3666,12 @@
     <message>
         <source>Enabled</source>
         <comment>server</comment>
-        <translation>Diaktifkan</translation>
+        <translation>Difungsikan</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>server</comment>
-        <translation>Dimatikan</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Address</source>
@@ -3530,7 +3704,7 @@
     </message>
     <message>
         <source>&Edit host-only network</source>
-        <translation type="obsolete">&Edit jaringan hanya-host</translation>
+        <translation type="obsolete">&Sunting jaringan hanya-host</translation>
     </message>
     <message>
         <source>&Host-only Networks:</source>
@@ -3546,120 +3720,132 @@
     </message>
     <message>
         <source>Networking</source>
-        <translation>Jaringan</translation>
+        <translation>Jejaring</translation>
     </message>
     <message>
         <source>&NAT Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>Jaringan &NAT</translation>
     </message>
     <message>
         <source>Lists all available NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tampilkan semua jaringan NAT yang tersedia.</translation>
     </message>
     <message>
         <source>&Host-only Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>Jaringan &Hanya-host</translation>
     </message>
     <message>
         <source>No new name specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidak ada nama baru yang dinyatakan bagi jaringan NAT yang sebelumnya bernama <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidak ada CIDR yang dinyatakan bagi jaringan NAT <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidak ada CIDR yang dinyatakan bagi jaringan NAT yang sebelumnya bernama <b>%1</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>CIDR yang tidak valid (<i>%1</i>) dinyatakan bagi jaringan NAT <b>%2</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>CIDR yang tidak valid (<i>%1</i>) dinyatakan bagi jaringan NAT yang sebelumnya bernama <b>%2</b>.</translation>
     </message>
     <message>
         <source>Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nama Jaringan</translation>
     </message>
     <message>
         <source>[empty]</source>
-        <translation type="unfinished"></translation>
+        <translation>[kosong]</translation>
     </message>
     <message>
         <source>%1 (renamed from %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (ganti nama dari %2)</translation>
     </message>
     <message>
         <source>Old Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nama Jaringan Lama</translation>
     </message>
     <message>
         <source>New Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nama Jaringan Baru</translation>
     </message>
     <message>
         <source>Network CIDR</source>
-        <translation type="unfinished"></translation>
+        <translation>CIDR Jaringan</translation>
     </message>
     <message>
         <source>Supports DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Mendukung DHCP</translation>
     </message>
     <message>
         <source>yes</source>
-        <translation type="unfinished"></translation>
+        <translation>ya</translation>
     </message>
     <message>
         <source>no</source>
-        <translation type="unfinished"></translation>
+        <translation>tidak</translation>
     </message>
     <message>
         <source>Supports IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Mendukung IPv6</translation>
     </message>
     <message>
         <source>Default IPv6 route</source>
-        <translation type="unfinished"></translation>
+        <translation>Rute IPv6 baku</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Antar muka host <b>%1</b> saat ini tidak memiliki alamat IPv4 yang valid.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 network mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>Antar muka host <b>%1</b> saat ini tidak memiliki mask jaringan IPv4 yang valid.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv6 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Antar muka host <b>%1</b> saat ini tidak memiliki alamat IPv6 yang valid.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Antar muka host <b>%1</b> saat ini tidak memiliki alamat server DHCP yang valid.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>Antar muka host <b>%1</b> saat ini tidak memiliki mask server DHCP yang valid.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server lower address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>Antar muka host <b>%1</b> saat ini tidak memiliki batas bawah alamat server DHCP yang valid.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server upper address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>Antar muka host <b>%1</b> saat ini tidak memiliki batas atas alamat server DHCP yang valid.</translation>
     </message>
     <message>
         <source>The name <b>%1</b> is being used for several NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nama <b>%1</b> sedang dipakai oleh beberapa jaringan NAT.</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>NAT network</comment>
-        <translation type="unfinished">Aktif</translation>
+        <translation>Aktif</translation>
+    </message>
+    <message>
+        <source>&Add NAT network</source>
+        <translation type="obsolete">T&ambah jaringan NAT</translation>
+    </message>
+    <message>
+        <source>&Remove NAT network</source>
+        <translation type="obsolete">&Hapus jaringan NAT</translation>
+    </message>
+    <message>
+        <source>&Edit NAT network</source>
+        <translation type="obsolete">&Sunting jaringan NAT</translation>
     </message>
     <message>
         <source>Add NAT Network</source>
@@ -3809,15 +3995,15 @@
     <name>UIGlobalSettingsNetworkDetailsHost</name>
     <message>
         <source>Host-only Network Details</source>
-        <translation type="unfinished">Rincian Jaringan Hanya-host</translation>
+        <translation>Rincian Jaringan Hanya-host</translation>
     </message>
     <message>
         <source>&Adapter</source>
-        <translation type="unfinished">&Adaptor</translation>
+        <translation>&Adaptor</translation>
     </message>
     <message>
         <source>Manual &Configuration</source>
-        <translation type="unfinished">&Konfigurasi Manual</translation>
+        <translation>&Konfigurasi Manual</translation>
     </message>
     <message>
         <source>Use manual configuration for this host-only network adapter.</source>
@@ -3825,43 +4011,43 @@
     </message>
     <message>
         <source>&IPv4 Address:</source>
-        <translation type="unfinished">Alamat &IPv4:</translation>
+        <translation>Alamat &IPv4:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 address for this adapter.</source>
-        <translation type="unfinished">Tampilkan alamat IPv4 host bagi adaptor ini.</translation>
+        <translation>Menyimpan alamat IPv4 host bagi adaptor ini.</translation>
     </message>
     <message>
         <source>IPv4 Network &Mask:</source>
-        <translation type="unfinished">&Mask Jaringan IPv4:</translation>
+        <translation>&Mask Jaringan IPv4:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 network mask for this adapter.</source>
-        <translation type="unfinished">Tampilkan mask jaringan IPv4 host bagi adaptor ini.</translation>
+        <translation>Tampilkan mask jaringan IPv4 host bagi adaptor ini.</translation>
     </message>
     <message>
         <source>I&Pv6 Address:</source>
-        <translation type="unfinished">Alamat I&Pv6:</translation>
+        <translation>Alamat I&Pv6:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Tampilkan alamat IPv6 host bagi adaptor ini bila IPv6 didukung.</translation>
+        <translation>Menyimpan alamat IPv6 host bagi adaptor ini bila IPv6 didukung.</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &Length:</source>
-        <translation type="unfinished">&Panjang Mask Jaringan IPv6:</translation>
+        <translation>&Panjang Mask Jaringan IPv6:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Tampilkan panjang prefiks mask jaringan IPv6 host bagi adaptor ini bila IPv6 didukung.</translation>
+        <translation>Menyimpan panjang prefiks mask jaringan IPv6 host bagi adaptor ini bila IPv6 didukung.</translation>
     </message>
     <message>
         <source>&DHCP Server</source>
-        <translation type="unfinished">Server &DHCP</translation>
+        <translation>Server &DHCP</translation>
     </message>
     <message>
         <source>&Enable Server</source>
-        <translation type="unfinished">Aktifkan S&erver</translation>
+        <translation>Fungsikan S&erver</translation>
     </message>
     <message>
         <source>Indicates whether the DHCP Server is enabled on machine startup or not.</source>
@@ -3869,42 +4055,42 @@
     </message>
     <message>
         <source>Server Add&ress:</source>
-        <translation type="unfinished">Alamat Se&rver:</translation>
+        <translation>Alamat Se&rver:</translation>
     </message>
     <message>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Tampilkan alamat server DHCP yang melayani jaringan yang diasosiasikan dengan adaptor hanya-host ini.</translation>
+        <translation>Menyimpan alamat server DHCP yang melayani jaringan yang diasosiasikan dengan adaptor hanya-host ini.</translation>
     </message>
     <message>
         <source>Server &Mask:</source>
-        <translation type="unfinished">&Mask Server:</translation>
+        <translation>&Mask Server:</translation>
     </message>
     <message>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Tampilkan mask jaringan dari server DHCP yang melayani jaringan yang diasosiasikan dengan adaptor hanya-host ini.</translation>
+        <translation>Menyimpan mask jaringan dari server DHCP yang melayani jaringan yang diasosiasikan dengan adaptor hanya-host ini.</translation>
     </message>
     <message>
         <source>&Lower Address Bound:</source>
-        <translation type="unfinished">Batas Bawah A&lamat:</translation>
+        <translation>Batas Bawah A&lamat:</translation>
     </message>
     <message>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Tampilkan batas bawah alamat yang ditawarkan oleh server DHCP yang melayani jaringan yang diasosiasikan dengan adaptor hanya-host ini.</translation>
+        <translation>Menyimpan batas bawah alamat yang ditawarkan oleh server DHCP yang melayani jaringan yang diasosiasikan dengan adaptor hanya-host ini.</translation>
     </message>
     <message>
         <source>&Upper Address Bound:</source>
-        <translation type="unfinished">Batas &Atas Alamat:</translation>
+        <translation>Batas &Atas Alamat:</translation>
     </message>
     <message>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Tampilkan batas atas alamat yang ditawarkan oleh server DHCP yang melayani jaringan yang diasosiasikan dengan adaptor hanya-host ini.</translation>
+        <translation>Menyimpan batas atas alamat yang ditawarkan oleh server DHCP yang melayani jaringan yang diasosiasikan dengan adaptor hanya-host ini.</translation>
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3912,51 +4098,67 @@
     <name>UIGlobalSettingsNetworkDetailsNAT</name>
     <message>
         <source>NAT Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Rincian Jaringan NAT</translation>
     </message>
     <message>
         <source>&Enable Network</source>
-        <translation type="unfinished"></translation>
+        <translation>&Fungsikan Jaringan</translation>
+    </message>
+    <message>
+        <source>Enable this NAT network.</source>
+        <translation type="obsolete">Fungsikan jaringan NAT ini.</translation>
     </message>
     <message>
         <source>Network &Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Nama Jaringan:</translation>
     </message>
     <message>
         <source>Holds the name for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Menyimpan nama bagi jaringan ini.</translation>
     </message>
     <message>
         <source>Network &CIDR:</source>
-        <translation type="unfinished"></translation>
+        <translation>&CIDR Jaringan:</translation>
     </message>
     <message>
         <source>Holds the CIDR for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Menyimpan CIDR bagi jaringan ini.</translation>
     </message>
     <message>
         <source>Network Options:</source>
-        <translation type="unfinished"></translation>
+        <translation>Opsi Jaringan:</translation>
     </message>
     <message>
         <source>Supports &DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Mendukung &DHCP</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports DHCP.</source>
+        <translation type="obsolete">Menentukan apakan jaringan ini mendukung DHCP.</translation>
     </message>
     <message>
         <source>Supports &IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Mendukung &IPv6</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports IPv6.</source>
+        <translation type="obsolete">Menentukan apakah jaringan ini mendukung IPv6.</translation>
     </message>
     <message>
         <source>Advertise Default IPv6 &Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Umumkan &Rute IPv6 Baku</translation>
+    </message>
+    <message>
+        <source>Determines whether this network should be advertised as the default IPv6 route.</source>
+        <translation type="obsolete">Menentukan apakah jaringan ini mesti diumumkan sebagai rute baku IPv6.</translation>
     </message>
     <message>
         <source>Opens a window to manage port forwarding rules.</source>
-        <translation type="obsolete">Buka dialog untuk mengelola aturan penerusan port.</translation>
+        <translation type="obsolete">Membuka jendela untuk mengelola aturan penerusan port.</translation>
     </message>
     <message>
         <source>&Port Forwarding</source>
-        <translation type="unfinished">Penerusan &Port</translation>
+        <translation>Penerusan &Port</translation>
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
@@ -3983,26 +4185,26 @@
     <name>UIGlobalSettingsPortForwardingDlg</name>
     <message>
         <source>Port Forwarding Rules</source>
-        <translation type="unfinished">Aturan Penerusan Port</translation>
+        <translation>Aturan Penerusan Port</translation>
     </message>
     <message>
         <source>IPv4</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4</translation>
     </message>
     <message>
         <source>IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6</translation>
     </message>
 </context>
 <context>
     <name>UIGlobalSettingsProxy</name>
     <message>
         <source>When checked, VirtualBox will use the proxy settings supplied for tasks like downloading Guest Additions from the network or checking for updates.</source>
-        <translation>Bila ditandai, VirtualBox akan memakai pengaturan proksi yang diberikan untuk tugas seperti men-download Guest Addition dari jaringan atau memeriksa update.</translation>
+        <translation>Bila ditandai, VirtualBox akan memakai pengaturan proksi yang diberikan untuk tugas seperti menunduh Guest Addition dari jaringan atau memeriksa pemutakhiran.</translation>
     </message>
     <message>
         <source>&Enable Proxy</source>
-        <translation>&Nyalakan proksi</translation>
+        <translation>&Fungsikan Proksi</translation>
     </message>
     <message>
         <source>Ho&st:</source>
@@ -4046,11 +4248,11 @@
     </message>
     <message>
         <source>No proxy host is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Host proksi saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>No proxy port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Port proksi saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>Holds the proxy host.</source>
@@ -4069,7 +4271,7 @@
     </message>
     <message>
         <source>&Check for Updates</source>
-        <translation>&Periksa update</translation>
+        <translation>&Periksa Pemutakhiran</translation>
     </message>
     <message>
         <source>&Once per:</source>
@@ -4077,7 +4279,7 @@
     </message>
     <message>
         <source>Specifies how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="obsolete">Nyatakan seberapa sering pemeriksaan versi baru mesti dilakukan. Perhatikan bahwa bila Anda ingin mematikan pemeriksaan ini sepenuhnya, kosongkan saja kotak contreng di atas.</translation>
+        <translation type="obsolete">Menyatakan seberapa sering pemeriksaan versi baru mesti dilakukan. Perhatikan bahwa bila Anda ingin mematikan pemeriksaan ini sepenuhnya, kosongkan saja kotak contreng di atas.</translation>
     </message>
     <message>
         <source>Next Check:</source>
@@ -4089,11 +4291,11 @@
     </message>
     <message>
         <source><p>Choose this if you only wish to be notified about stable updates to VirtualBox.</p></source>
-        <translation><p>Pilih ini bila Anda hanya menghendaki untuk diberitahu tentang update stabil atas VirtualBox.</p></translation>
+        <translation><p>Pilih ini bila Anda hanya menghendaki untuk diberitahu tentang pemutakhiran stabil atas VirtualBox.</p></translation>
     </message>
     <message>
         <source>&Stable Release Versions</source>
-        <translation>Versi rilis &stabil</translation>
+        <translation>Versi Rilis &Stabil</translation>
     </message>
     <message>
         <source><p>Choose this if you wish to be notified about all new VirtualBox releases.</p></source>
@@ -4101,7 +4303,7 @@
     </message>
     <message>
         <source>&All New Releases</source>
-        <translation>Semu&a rilis baru</translation>
+        <translation>Semu&a Rilis Baru</translation>
     </message>
     <message>
         <source><p>Choose this to be notified about all new VirtualBox releases and pre-release versions of VirtualBox.</p></source>
@@ -4109,7 +4311,7 @@
     </message>
     <message>
         <source>All New Releases and &Pre-Releases</source>
-        <translation>Semua rilis baru dan &prarilis</translation>
+        <translation>Semua Rilis Baru dan &Prarilis</translation>
     </message>
     <message>
         <source>Selects how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
@@ -4127,71 +4329,71 @@
     <name>UIHostComboEditor</name>
     <message>
         <source><key_%1></source>
-        <translation type="unfinished"><key_%1></translation>
+        <translation><key_%1></translation>
     </message>
     <message>
         <source>Left </source>
-        <translation type="unfinished">Kiri </translation>
+        <translation>Kiri </translation>
     </message>
     <message>
         <source>Right </source>
-        <translation type="unfinished">Kanan </translation>
+        <translation>Kanan </translation>
     </message>
     <message>
         <source>Left Shift</source>
-        <translation type="unfinished">Shift Kiri</translation>
+        <translation>Shift Kiri</translation>
     </message>
     <message>
         <source>Right Shift</source>
-        <translation type="unfinished">Shift Kanan</translation>
+        <translation>Shift Kanan</translation>
     </message>
     <message>
         <source>Left Ctrl</source>
-        <translation type="unfinished">Ctrl Kiri</translation>
+        <translation>Ctrl Kiri</translation>
     </message>
     <message>
         <source>Right Ctrl</source>
-        <translation type="unfinished">Ctrl Kanan</translation>
+        <translation>Ctrl Kanan</translation>
     </message>
     <message>
         <source>Left Alt</source>
-        <translation type="unfinished">Alt Kiri</translation>
+        <translation>Alt Kiri</translation>
     </message>
     <message>
         <source>Right Alt</source>
-        <translation type="unfinished">Alt Kanan</translation>
+        <translation>Alt Kanan</translation>
     </message>
     <message>
         <source>Left WinKey</source>
-        <translation type="unfinished">Tombol Windows Kiri</translation>
+        <translation>Tombol Windows Kiri</translation>
     </message>
     <message>
         <source>Right WinKey</source>
-        <translation type="unfinished">Tombol Windows Kanan</translation>
+        <translation>Tombol Windows Kanan</translation>
     </message>
     <message>
         <source>Menu key</source>
-        <translation type="unfinished">Tombol Menu</translation>
+        <translation>Tombol Menu</translation>
     </message>
     <message>
         <source>Alt Gr</source>
-        <translation type="unfinished">Alt Gr</translation>
+        <translation>Alt Gr</translation>
     </message>
     <message>
         <source>Caps Lock</source>
-        <translation type="unfinished">Caps Lock</translation>
+        <translation>Caps Lock</translation>
     </message>
     <message>
         <source>Scroll Lock</source>
-        <translation type="unfinished">Scroll Lock</translation>
+        <translation>Scroll Lock</translation>
     </message>
     <message>
         <source>Host+</source>
-        <translation type="unfinished"></translation>
+        <translation>Host+</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished">Tidak Ada</translation>
+        <translation>Tidak Ada</translation>
     </message>
 </context>
 <context>
@@ -4378,22 +4580,22 @@
     </message>
     <message>
         <source>Reset shortcut to default</source>
-        <translation type="unfinished"></translation>
+        <translation>Reset pintasan ke baku</translation>
     </message>
     <message>
         <source>Unset shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Nirtata pintasan</translation>
     </message>
 </context>
 <context>
     <name>UIHotKeyTableModel</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Nama</translation>
+        <translation>Nama</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Pintasan</translation>
     </message>
 </context>
 <context>
@@ -4449,11 +4651,11 @@
     <name>UIImportLicenseViewer</name>
     <message>
         <source><b>The virtual system "%1" requires that you agree to the terms and conditions of the software license agreement shown below.</b><br /><br />Click <b>Agree</b> to continue or click <b>Disagree</b> to cancel the import.</source>
-        <translation><b>Sistem virtual "%1" menuntut Anda setuju dengan syarat dan ketentuan dari persetujuan lisensi software yang ditunjukkan di bawah.</b><br /><br />Klik <b>Setuju</b> untuk melanjutkan atau klik <b>Tidak Setuju</b> untuk membatalkan impor.</translation>
+        <translation><b>Sistem virtual "%1" menuntut Anda setuju dengan syarat dan ketentuan dari perjanjian lisensi perangkat lunak yang ditunjukkan di bawah.</b><br /><br />Klik <b>Setuju</b> untuk melanjutkan atau klik <b>Tidak Setuju</b> untuk membatalkan impor.</translation>
     </message>
     <message>
         <source>Software License Agreement</source>
-        <translation>Persetujuan Lisensi Software</translation>
+        <translation>Perjanjian Lisensi Perangkat Lunak</translation>
     </message>
     <message>
         <source>&Disagree</source>
@@ -4477,7 +4679,7 @@
     </message>
     <message>
         <source>Save license to file...</source>
-        <translation>Simpan lisensi ke file...</translation>
+        <translation>Simpan lisensi ke berkas...</translation>
     </message>
 </context>
 <context>
@@ -4485,27 +4687,27 @@
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the virtual hard disks:</nobr>%1</p></source>
         <comment>HDD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>Mengindikasikan aktifitas media hard disk virtual:</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>Mengindikasikan aktivitas media hard disk virtual:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the CD/DVD devices:</nobr>%1</p></source>
         <comment>CD/DVD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>Mengindikasikan aktifitas media CD/DVD:</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>Mengindikasikan aktivitas perangkat CD/DVD:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy devices:</nobr>%1</p></source>
         <comment>FD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>Mengindikasikan aktifitas media floppy:</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>Mengindikasikan aktivitas perangkat floppy:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the network interfaces:</nobr>%1</p></source>
         <comment>Network adapters tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>Mengindikasikan aktifitas antarmuka jaringan:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Mengindikasikan aktivitas antarmuka jaringan:</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr></source>
         <comment>Network adapters tooltip</comment>
-        <translation><br><nobr><b>Adapter %1 (%2)</b>: %3 kabel %4</nobr></translation>
+        <translation><br><nobr><b>Adaptor %1 (%2)</b>: %3 kabel %4</nobr></translation>
     </message>
     <message>
         <source>connected</source>
@@ -4520,32 +4722,32 @@
     <message>
         <source><br><nobr><b>All network adapters are disabled</b></nobr></source>
         <comment>Network adapters tooltip</comment>
-        <translation><br><nobr><b>Semua adapter jaringan dimatikan</b></nobr></translation>
+        <translation><br><nobr><b>Semua adaptor jaringan dinonaktifkan</b></nobr></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the attached USB devices:</nobr>%1</p></source>
         <comment>USB device tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>Mengindikasikan aktifitas device USB terpasang:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Mengindikasikan aktivitas perangkat USB yang terpasang:</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>No USB devices attached</b></nobr></source>
         <comment>USB device tooltip</comment>
-        <translation><br><nobr><b>Tidak ada device USB terpasang</b></nobr></translation>
+        <translation><br><nobr><b>Tidak ada perangkat USB yang terpasang</b></nobr></translation>
     </message>
     <message>
         <source><br><nobr><b>USB Controller is disabled</b></nobr></source>
         <comment>USB device tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>Kontroler USB dimatikan</b></nobr></translation>
+        <translation type="obsolete"><br><nobr><b>Pengendali USB dinonaktifkan</b></nobr></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the machine's shared folders:</nobr>%1</p></source>
         <comment>Shared folders tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>Mengindikasikan aktifitas folder yang dishare:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Mengindikasikan aktivitas folder bersama:</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>No shared folders</b></nobr></source>
         <comment>Shared folders tooltip</comment>
-        <translation><br><nobr><b>Tidak ada folder yang dishare</b></nobr></translation>
+        <translation><br><nobr><b>Tidak ada folder dipakai bersama</b></nobr></translation>
     </message>
     <message>
         <source><hr>The VRDP Server is listening on port %1</source>
@@ -4554,15 +4756,15 @@
     <message>
         <source><br><nobr><b>%1:</b>&nbsp;%2</nobr></source>
         <comment>Virtualization Stuff LED</comment>
-        <translation></translation>
+        <translation><br><nobr><b>%1:</b>&nbsp;%2</nobr></translation>
     </message>
     <message>
         <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_ [...]
-        <translation>Mengindikasikan apakah mouse pointer host tertangkap oleh sistem operasi guest:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer tidak tertangkap</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer tertangkap</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;integrasi mouse (MI) Menyala</nobr><br><nobr><img src=:/mous [...]
+        <translation>Mengindikasikan apakah penunjuk tetikus host ditangkap oleh sistem operasi guest:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer tidak ditangkap</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer ditangkap</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;integrasi tetikus (MI) Menyala</nobr><br><nobr><img src=:/mo [...]
     </message>
     <message>
         <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source>
-        <translation type="obsolete">Mengindikasikan apakah keyboard tertangkap oleh Sistem Operasi guest (<img src=:/hostkey_captured_16px.png/>) atau tidak (<img src=:/hostkey_16px.png/>).</translation>
+        <translation type="obsolete">Mengindikasikan apakah papan tik ditangkap oleh Sistem Operasi guest (<img src=:/hostkey_captured_16px.png/>) atau tidak (<img src=:/hostkey_16px.png/>).</translation>
     </message>
     <message>
         <source>Indicates whether the Remote Desktop Server is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source>
@@ -4579,23 +4781,24 @@
     </message>
     <message>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Mengindikasikan aktivitas penangkapan video:</nobr><br>%1</translation>
     </message>
     <message>
         <source><nobr><b>Video capture disabled</b></nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Penangkapan video dinonaktifkan</b></nobr></translation>
     </message>
     <message>
         <source><nobr><b>Video capture file:</b> %1</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Berkas tangkapan video: </b> %1</nobr></translation>
     </message>
     <message>
         <source>Additional feature status:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="unfinished"></translation>
+        <translation>Status fitur tambahan: <br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4609,8 +4812,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4622,7 +4824,7 @@
     <name>UILineTextEdit</name>
     <message>
         <source>&Edit</source>
-        <translation>&Edit</translation>
+        <translation>&Sunting</translation>
     </message>
 </context>
 <context>
@@ -4637,7 +4839,7 @@
     </message>
     <message>
         <source>Preview Monitor %1</source>
-        <translation type="obsolete">Pratinjau Monitor %1</translation>
+        <translation type="obsolete">Pemantauan Pratinjau %1</translation>
     </message>
     <message>
         <source>Snapshot %1</source>
@@ -4661,15 +4863,23 @@
     </message>
     <message>
         <source>No USB Devices Connected</source>
-        <translation type="obsolete">Tidak Ada Device USB Tersambung</translation>
+        <translation type="obsolete">Tidak Ada Perangkat USB Tersambung</translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
-        <translation type="obsolete">Tidak ada device yang terdukung terkoneksi pada PC host</translation>
+        <translation type="obsolete">Tidak ada perangkat yang didukung yang terhubung ke PC host</translation>
     </message>
     <message>
         <source>Select a filename for the screenshot ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pilih sebuah nama berkas untuk cuplikan layar ...</translation>
+    </message>
+    <message>
+        <source>No Webcams Connected</source>
+        <translation type="obsolete">Tidak Ada Webcam Yang Tersambung</translation>
+    </message>
+    <message>
+        <source>No supported webcams connected to the host PC</source>
+        <translation type="obsolete">Tidak ada webcam yang didukung yang terhubung ke PC host</translation>
     </message>
 </context>
 <context>
@@ -4680,7 +4890,7 @@
     </message>
     <message>
         <source>Enable &Audio</source>
-        <translation>&Nyalakan Suara</translation>
+        <translation>Fungsik&an Suara</translation>
     </message>
     <message>
         <source>Host Audio &Driver:</source>
@@ -4739,7 +4949,7 @@
     </message>
     <message>
         <source>Enable &3D Acceleration</source>
-        <translation>Aktifkan Akselerasi &3D</translation>
+        <translation>Fungsikan Akselerasi &3D</translation>
     </message>
     <message>
         <source>&Remote Display</source>
@@ -4747,11 +4957,11 @@
     </message>
     <message>
         <source>When checked, the VM will act as a Remote Desktop Protocol (RDP) server, allowing remote clients to connect and operate the VM (when it is running) using a standard RDP client.</source>
-        <translation>Saat tertandai, VM akan bertindak sebagai server Remote Desktop Protocol (RDP), mengijinkan client jarak jauh untuk terhubung dan mengendalikan VM (saat berjalan) menggunakan client RDP standar.</translation>
+        <translation>Saat tertandai, VM akan bertindak sebagai server Remote Desktop Protocol (RDP), mengijinkan client jarak jauh untuk terhubung dan mengoperasikan VM (saat berjalan) menggunakan klien RDP standar.</translation>
     </message>
     <message>
         <source>&Enable Server</source>
-        <translation>Aktifkan S&erver</translation>
+        <translation>Fungsikan S&erver</translation>
     </message>
     <message>
         <source>Server &Port:</source>
@@ -4767,11 +4977,11 @@
     </message>
     <message>
         <source>Authentication &Timeout:</source>
-        <translation>&Timeout Otentikasi:</translation>
+        <translation>&Tenggat Waktu Otentikasi:</translation>
     </message>
     <message>
         <source>Specifies the timeout for guest authentication, in milliseconds.</source>
-        <translation type="obsolete">Menyatakan timeout untuk otentikasi guest, dalam milidetik.</translation>
+        <translation type="obsolete">Menyatakan tenggat waktu untuk otentikasi guest, dalam milidetik.</translation>
     </message>
     <message>
         <source>you have assigned less than <b>%1</b> of video memory which is the minimum amount required for HD Video to be played efficiently.</source>
@@ -4783,7 +4993,7 @@
     </message>
     <message>
         <source>Enable &2D Video Acceleration</source>
-        <translation>Aktifkan Akselerasi Video &2D</translation>
+        <translation>Fungsikan Akselerasi Video &2D</translation>
     </message>
     <message>
         <source>The VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
@@ -4823,122 +5033,130 @@
     </message>
     <message>
         <source>Video &Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>&Tangkapan Video</translation>
     </message>
     <message>
         <source>When checked, VirtualBox will record the virtual machine session as a video file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Saat tertandai, VirtualBox akan merekam sesi mesin virtual sebagai suatu berkas video.</translation>
     </message>
     <message>
         <source>&Enable Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Fungsikan P&enangkapan Video</translation>
     </message>
     <message>
         <source>File &Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Path Berkas:</translation>
+    </message>
+    <message>
+        <source>This setting determines the filename VirtualBox uses to save the recorded content.</source>
+        <translation type="obsolete">Pengaturan ini menentukan nama berkas yang dipakai oleh VirtualBox untuk menyimpan isi rekaman.</translation>
     </message>
     <message>
         <source>Frame &Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ukuran Frame:</translation>
+    </message>
+    <message>
+        <source>This setting determines the resolution (frame size) of the recorded video.</source>
+        <translation type="obsolete">Pengaturan ini menentukan resolusi (ukuran frame) dari video rekaman.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
+        <translation type="obsolete">Pengaturan ini menentukan resolusi <b>horisontal</b> (lebar frame) dari video rekaman.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>vertical</b> resolution (frame height) of the recorded video.</source>
+        <translation type="obsolete">Pengaturan ini menentukan resolusi <b>vertikal</b> (tinggi frame) dari video rekaman.</translation>
     </message>
     <message>
         <source>&Frame Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>Laju &Frame:</translation>
+    </message>
+    <message>
+        <source>This setting determines the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
+        <translation type="obsolete">Pengaturan ini menentukan cacah maksimum <b>frame per detik</b>. Frame tambahan akan dilewati. Mengurangi nilai ini akan menaikkan banyaknya frame yang dilewati dan mengurangi ukuran berkas.</translation>
     </message>
     <message>
         <source>&Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Kualitas:</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Pengaturan ini menentukan <b>kualitas</b>. Menaikkan nilai ini akan membuat video nampak lebih baik tapi ukuran berkas meningkat.</translation>
+    </message>
+    <message>
+        <source>This setting determines the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Pengaturan ini menentukan laju bit dalam <b>kilobit per detik</b>. Menaikkan nilai ini akan membuat video nampak lebih baik tapi ukuran berkas meningkat.</translation>
     </message>
     <message>
         <source>&Screens:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Layar:</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use hardware graphics acceleration. However the host system does not currently provide this, so you will not be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mesin virtual disiapkan untuk memakai akselerasi grafis perangkat keras. Namun sistem host saat ini tidak menyediakannya, sehingga Anda tidak akan bisa mulai menjalankan mesin.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to fullscreen or seamless mode.</source>
+        <translation type="obsolete">Mesin virtual saat ini diberi memori video kurang dari <b>%1</b> yang merupakan jumlah minimum yang diperlukan untuk bertukar ke mode layar penuh atau seamless.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required for High Definition Video to be played efficiently.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mesin virtual saat ini diberi memori video kurang dari <b>%1</b> yang merupakan jumlah minimum yang diperlukan bagi High Definition Video untuk diputar secara efisien.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least b>%1</b>.</source>
+        <translation type="obsolete">Mesin virtual disiapkan untuk memakai akselerasi grafis perangkat keras dan arahan sistem operasi ditata ke Windows Vista atau setelahnya. Untuk kinerja terbaik Anda mesti menata memori video mesin paling tidak <b>%1</b>.</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use Video Stream Acceleration. As this feature only works with Windows guest systems it will be disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mesin virtual disiapkan untuk memakai Akselerasi Stream Video. Karena fitur ini hanya bekerja dengan sistem guest Windows itu akan dinonaktifkan.</translation>
     </message>
     <message>
         <source>The VRDE server port value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nilai port server VRDE saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>The VRDE authentication timeout value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nilai tenggat waktu otentikasi VRDE saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>User Defined</source>
-        <translation type="unfinished"></translation>
+        <translation>Didefinisikan Oleh Pengguna</translation>
     </message>
     <message>
         <source>%1 fps</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 fps</translation>
     </message>
     <message>
         <source>fps</source>
-        <translation type="unfinished"></translation>
+        <translation>fps</translation>
     </message>
     <message>
         <source>low</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>rendah</translation>
     </message>
     <message>
         <source>medium</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>sedang</translation>
     </message>
     <message>
         <source>high</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>tinggi</translation>
     </message>
     <message>
         <source>kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>kbps</translation>
     </message>
     <message>
         <source>Screen %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">ToolBar Mini:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Bila ditandai, menampilkan ToolBar Mini dalam mode Fullscreen dan Seamless.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Tampilkan Dalam &Fullscreen/Seamless</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Bila ditandai, menampilkan ToolBar Mini di puncak layar, bukan di posisi default di dasar layar.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">&Tampilkan Di Puncak Layar</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Layar %1</translation>
     </message>
     <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Enable video recording for screen %1.</source>
+        <translation type="obsolete">Fungsikan perekaman video bagi layar %1.</translation>
     </message>
     <message>
         <source>&Screen</source>
@@ -4953,15 +5171,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4977,10 +5191,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5017,26 +5227,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Controls the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <source>Controls the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Holds the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 MB</translation>
     </message>
     <message>
         <source>%1%</source>
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5049,11 +5271,11 @@
     </message>
     <message>
         <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of disk space.</source>
-        <translation type="obsolete">Tampilkan path dimana snapshot dari mesin virtual akan disimpan. Sadari bahwa snapshot dapat menghabiskan banyak ruang disk.</translation>
+        <translation type="obsolete">Menyimpan path tempat snapshot dari mesin virtual akan disimpan. Sadari bahwa snapshot dapat menghabiskan banyak ruang disk.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Dasar</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Dasar</translation>
     </message>
     <message>
         <source>&Name:</source>
@@ -5096,8 +5318,8 @@
         <translation type="obsolete">Mengendalikan jumlah memori video yang tersedia bagi mesin virtual.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>Tingkat L&anjut</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">Tingkat L&anjut</translation>
     </message>
     <message>
         <source>Defines the boot device order. Use the checkboxes on the left to enable or disable individual boot devices. Move items up and down to change the device order.</source>
@@ -5133,11 +5355,11 @@
     </message>
     <message>
         <source>&Shared Clipboard:</source>
-        <translation>Clipboard yang di-&Share:</translation>
+        <translation>Papan Klip Ber&sama:</translation>
     </message>
     <message>
         <source>Selects which clipboard data will be copied between the guest and the host OS. This feature requires Guest Additions to be installed in the guest OS.</source>
-        <translation>Memilih data clipboard mana yang akan disalin diantara OS guest dan host. Fitur ini membutuhkan Guest Additions terinstall pada OS guest.</translation>
+        <translation>Memilih data clipboard mana yang akan disalin di antara OS guest dan host. Fitur ini membutuhkan Guest Additions terpasang pada OS guest.</translation>
     </message>
     <message>
         <source>Defines the type of the virtual IDE controller. Depending on this value, VirtualBox will provide different virtual IDE hardware devices to the guest OS.</source>
@@ -5148,20 +5370,20 @@
         <translation>Folder S&napshot:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Deskripsi</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Deskripsi</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
-        <translation>Menampilkan deskripsi mesin virtual. Field deskripsi berguna untuk memberikan komentar pada detail konfigurasi dari OS guest terinstal.</translation>
+        <translation>Menyimpan deskripsi mesin virtual. Field deskripsi berguna untuk memberikan komentar pada detail konfigurasi dari OS guest yang terpasang.</translation>
     </message>
     <message>
         <source>If checked, any CD/DVD or floppy disks inserted into or removed from the virtual drives while the machine is running will be remembered.</source>
-        <translation type="obsolete">Saat tertandai, perubahan apapun pada media CD/DVD atau Floppy terpasang yang dilakukan saat eksekusi mesin akan disimpan dalam file setting guna menjaga konfigurasi media termuat diantara penjalanan.</translation>
+        <translation type="obsolete">Saat tertandai, sebarang CD/DVD atau disk floppy yang disisipkan ke atau dilepas dari drive virtual ketika mesin sedang berjalan akan diingat.</translation>
     </message>
     <message>
         <source>Removable Media:</source>
-        <translation type="obsolete">Media Removable:</translation>
+        <translation type="obsolete">Media Lepas Pasang:</translation>
     </message>
     <message>
         <source>&Remember Runtime Changes</source>
@@ -5169,19 +5391,19 @@
     </message>
     <message>
         <source>Mini ToolBar:</source>
-        <translation type="obsolete">ToolBar Mini:</translation>
+        <translation type="obsolete">Bilah Alat Mini:</translation>
     </message>
     <message>
         <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Bila ditandai, menampilkan ToolBar Mini dalam mode Fullscreen dan Seamless.</translation>
+        <translation type="obsolete">Bila ditandai, menampilkan Bilah Alat Mini dalam mode Layar Penuh dan Seamless.</translation>
     </message>
     <message>
         <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Tampilkan Dalam &Fullscreen/Seamless</translation>
+        <translation type="obsolete">Tampilkan Dalam Layar &Penuh/Seamless</translation>
     </message>
     <message>
         <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Bila ditandai, menampilkan ToolBar Mini di puncak layar, bukan di posisi default di dasar layar.</translation>
+        <translation type="obsolete">Bila ditandai, menampilkan Bilah Alat Mini di puncak layar, bukan pada posisi baku di dasar layar.</translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -5192,22 +5414,38 @@
         <translation type="obsolete">Anda telah memilih tipe OS guest 64-bit bagi VM ini. Karena guest seperti itu memerlukan virtualisasi hardware (VT-x/AMD-V), maka fitur ini akan otomatis diaktifkan.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation type="unfinished"></translation>
+        <source>&Drag'n'Drop:</source>
+        <translation type="obsolete">&Drag'n'Drop:</translation>
     </message>
     <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
-        <translation type="unfinished"></translation>
+        <translation>Memilih data mana yang akan disalin di antara OS guest dan host oleh drag'n'drop. Fitur ini membutuhkan Guest Additions terpasang pada OS guest.</translation>
     </message>
     <message>
         <source>No name specified for the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidak ada nama yang dinyatakan bagi mesin virtual.</translation>
     </message>
     <message>
         <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
+        <translation>Arahan sistem operasi mesin virtual ditata ke tipe 64 bit. Sistem guest 64 bit memerlukan virtualisasi perangkat keras, sehingga ini akan difungsikan secara otomatis bila Anda mengkonfirmasi perubahan.</translation>
+    </message>
+    <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">Tingkat L&anjut</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>D&escription</source>
+        <translation type="unfinished">D&eskripsi</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5224,6 +5462,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5256,16 +5498,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5276,28 +5514,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
-        <translation type="unfinished">ToolBar Mini:</translation>
+        <translation type="unfinished">Bilah Alat Mini:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Bila ditandai, menampilkan ToolBar Mini dalam mode Fullscreen dan Seamless.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Tampilkan Dalam &Fullscreen/Seamless</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Bila ditandai, menampilkan ToolBar Mini di puncak layar, bukan di posisi default di dasar layar.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -5307,18 +5537,6 @@
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -5336,11 +5554,11 @@
     </message>
     <message>
         <source>&Enable Network Adapter</source>
-        <translation>&Aktifkan Adaptor Jaringan</translation>
+        <translation>&Fungsikan Adaptor Jaringan</translation>
     </message>
     <message>
         <source>Selects the type of the virtual network adapter. Depending on this value, VirtualBox will provide different network hardware to the virtual machine.</source>
-        <translation>Memilih tipe adaptor jaringan virtual. Bergantung pada nilai tersebut, VirtualBox akan menyediakan hardware jaringan yang berbeda bagi mesin virtual.</translation>
+        <translation>Memilih tipe adaptor jaringan virtual. Bergantung pada nilai tersebut, VirtualBox akan menyediakan perangkat keras jaringan yang berbeda bagi mesin virtual.</translation>
     </message>
     <message>
         <source>&Attached to:</source>
@@ -5356,7 +5574,7 @@
     </message>
     <message>
         <source>Holds the MAC address of this adapter. It contains exactly 12 characters chosen from {0-9,A-F}. Note that the second character must be an even digit.</source>
-        <translation>Menampilkan alamat MAC dari adaptor ini. Ia berisi tepat 12 karakter dipilih dari {0-9,A-F}. Perhatikan bahwa karakter kedua harus digit genap.</translation>
+        <translation>Menyimpan alamat MAC dari adaptor ini. Ia berisi tepat 12 karakter dipilih dari {0-9,A-F}. Perhatikan bahwa karakter kedua harus digit genap.</translation>
     </message>
     <message>
         <source>Generates a new random MAC address.</source>
@@ -5447,11 +5665,11 @@
     </message>
     <message>
         <source>&Cable Connected</source>
-        <translation>Ka&bel terhubung</translation>
+        <translation>Ka&bel Tersambung</translation>
     </message>
     <message>
         <source>Opens a window to manage port forwarding rules.</source>
-        <translation type="obsolete">Buka dialog untuk mengelola aturan penerusan port.</translation>
+        <translation type="obsolete">Buka jendela untuk mengelola aturan penerusan port.</translation>
     </message>
     <message>
         <source>&Port Forwarding</source>
@@ -5495,39 +5713,39 @@
     </message>
     <message>
         <source>&MAC Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Alamat &MAC:</translation>
     </message>
     <message>
         <source>No bridged network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidak ada adaptor jaringan ter-bridge yang saat ini dipilih.</translation>
     </message>
     <message>
         <source>No internal network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nama jaringan internal saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>No host-only network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidak ada adaptor jaringan hanya-host saat ini yang dipilih.</translation>
     </message>
     <message>
         <source>No generic driver is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidak ada driver generik yang saat ini dipilih.</translation>
     </message>
     <message>
         <source>The MAC address must be 12 hexadecimal digits long.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alamat MAC mesti sepanjang 12 dijit heksadesimal.</translation>
     </message>
     <message>
         <source>The second digit in the MAC address may not be odd as only unicast addresses are allowed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dijit kedua dalam alamat MAC tidak boleh ganjil karena hanya alamt unicast yang diijinkan.</translation>
     </message>
     <message>
         <source>No NAT network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nama jaringan NAT saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>Holds the name of the NAT network that this network card will be connected to. You can create and remove networks using the global network settings in the virtual machine manager window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Menyimpan nama jaringan NAT tempat akan terhubungnya kartu jaringan ini. Anda dapat membuat dan menghapus jaringan memakai pengaturan jaringan global dalam jendela manajer mesin virtual.</translation>
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
@@ -5589,7 +5807,7 @@
     </message>
     <message>
         <source>&Enable Parallel Port</source>
-        <translation>Nyalakan Port Paral&el</translation>
+        <translation>Fungsikan Port Paral&el</translation>
     </message>
     <message>
         <source>Port &Number:</source>
@@ -5597,7 +5815,7 @@
     </message>
     <message>
         <source>Holds the parallel port number. You can choose one of the standard parallel ports or select <b>User-defined</b> and specify port parameters manually.</source>
-        <translation>Tampilkan nomor port paralel. Anda dapat memilih satu dari port paralel standar atau pilih <b>Didefinisikan pengguna</b> dan menyatakan parameter port secara manual.</translation>
+        <translation>Menyimpan nomor port paralel. Anda dapat memilih satu dari port paralel standar atau pilih <b>Didefinisikan pengguna</b> dan menyatakan parameter port secara manual.</translation>
     </message>
     <message>
         <source>&IRQ:</source>
@@ -5621,35 +5839,35 @@
     </message>
     <message>
         <source>Holds the host parallel device name.</source>
-        <translation>Tampilkan nama device paralel milik host.</translation>
+        <translation>Menyimpan nama device paralel milik host.</translation>
     </message>
     <message>
         <source>Holds the IRQ number of this parallel port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> setting is enabled for this virtual machine.</source>
-        <translation>Tampilkan nomor IRQ dari port paralel ini. Ini mesti berupa bilangan bulat antara <tt>0</tt> dan <tt>255</tt>. Nilai lebih dari <tt>15</tt> hanya bisa digunakan bila pengaturan <b>I/O APIC</b> dinyalakan untuk mesin virtual ini.</translation>
+        <translation>Menyimpan nomor IRQ dari port paralel ini. Ini mesti berupa bilangan bulat antara <tt>0</tt> dan <tt>255</tt>. Nilai lebih dari <tt>15</tt> hanya bisa digunakan bila pengaturan <b>I/O APIC</b> dinyalakan untuk mesin virtual ini.</translation>
     </message>
     <message>
         <source>Holds the base I/O port address of this parallel port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source>
-        <translation>Tampilkan alamat dasar port I/O dari port paralel ini. Nilai yang valid adalah bilangan bulat dalam jangkauan <tt>0</tt> hingga <tt>0xFFFF</tt>.</translation>
+        <translation>Menyimpan alamat dasar port I/O dari port paralel ini. Nilai yang valid adalah bilangan bulat dalam jangkauan <tt>0</tt> hingga <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">IRQ saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Port I/O saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dua port atau lebih memiliki pengaturan yang sama.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Path port saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Saat ini ada path port yang duplikat.</translation>
     </message>
 </context>
 <context>
@@ -5666,6 +5884,26 @@
         <source>Duplicate port path entered </source>
         <translation type="obsolete">Path port duplikat dimasukkan </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">IRQ saat ini tidak dinyatakan.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">Port I/O saat ini tidak dinyatakan.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Dua port atau lebih memiliki pengaturan yang sama.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">Path port saat ini tidak dinyatakan.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">Saat ini ada path port yang duplikat.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsPortForwardingDlg</name>
@@ -5702,15 +5940,15 @@
     <name>UIMachineSettingsSF</name>
     <message>
         <source>Adds a new shared folder definition.</source>
-        <translation type="obsolete">Menambahkan sebuah definisi baru folder yang di share.</translation>
+        <translation type="obsolete">Menambahkan sebuah definisi baru folder bersama.</translation>
     </message>
     <message>
         <source>Edits the selected shared folder definition.</source>
-        <translation type="obsolete">Edit definisi folder yang di share yang dipilih.</translation>
+        <translation type="obsolete">Sunting definisi folder bersama yang dipilih.</translation>
     </message>
     <message>
         <source>Removes the selected shared folder definition.</source>
-        <translation type="obsolete">Hapus definisi folder yang di share yang dipilih.</translation>
+        <translation type="obsolete">Menghapus definisi folder bersama yang dipilih.</translation>
     </message>
     <message>
         <source> Machine Folders</source>
@@ -5730,7 +5968,7 @@
     </message>
     <message>
         <source>Lists all shared folders accessible to this machine. Use 'net use x: \\vboxsvr\share' to access a shared folder named <i>share</i> from a DOS-like OS, or 'mount -t vboxsf share mount_point' to access it from a Linux OS. This feature requires Guest Additions.</source>
-        <translation>Tampilkan daftar semua folder yang di share yang dapat diakses oleh mesin ini. Gunakan 'net use x: \\vboxsvr\share' untuk mengakses sebuah folder yang di share bernama <i>share</i> dari OS serupa DOS atau 'mount -t vboxsf share titik_mount_point' dari OS Linux. Fitur ini membutuhkan Guest Additions.</translation>
+        <translation>Menampilkan daftar semua folder bersama yang dapat diakses oleh mesin ini. Gunakan 'net use x: \\vboxsvr\share' untuk mengakses sebuah folder bersama bernama <i>share</i> dari OS serupa DOS atau 'mount -t vboxsf share titik_kait' dari OS Linux. Fitur ini membutuhkan Guest Additions.</translation>
     </message>
     <message>
         <source>Name</source>
@@ -5746,15 +5984,15 @@
     </message>
     <message>
         <source>&Add Shared Folder</source>
-        <translation type="obsolete">T&ambah Folder Yang Di-Share</translation>
+        <translation type="obsolete">T&ambah Folder Bersama</translation>
     </message>
     <message>
         <source>&Edit Shared Folder</source>
-        <translation type="obsolete">&Edit Folder Yang Di-Share</translation>
+        <translation type="obsolete">&Sunting Folder Bersama</translation>
     </message>
     <message>
         <source>&Remove Shared Folder</source>
-        <translation type="obsolete">Hapus Folde&r Yang Di-Share</translation>
+        <translation type="obsolete">Hapus Folde&r Bersama</translation>
     </message>
     <message>
         <source>&Folders List</source>
@@ -5762,7 +6000,7 @@
     </message>
     <message>
         <source>Auto-mount</source>
-        <translation>Mount Otomatis</translation>
+        <translation>Kaitkan Otomatis</translation>
     </message>
     <message>
         <source>Yes</source>
@@ -5797,11 +6035,11 @@
     <name>UIMachineSettingsSFDetails</name>
     <message>
         <source>Add Share</source>
-        <translation>Tambahkan Share</translation>
+        <translation>Tambahkan Berbagi Pakai</translation>
     </message>
     <message>
         <source>Edit Share</source>
-        <translation>Edit Share</translation>
+        <translation>Sunting Berbagi Pakai</translation>
     </message>
     <message>
         <source>Dialog</source>
@@ -5817,11 +6055,11 @@
     </message>
     <message>
         <source>Holds the name of the shared folder (as it will be seen by the guest OS).</source>
-        <translation>Tampilkan nama dari folder yang di share (sebagaimana terlihat oleh OS guest).</translation>
+        <translation>Menyimpan nama dari folder yang dipakai bersama (sebagaimana terlihat oleh OS guest).</translation>
     </message>
     <message>
         <source>When checked, the guest OS will not be able to write to the specified shared folder.</source>
-        <translation>Saat ditandai, OS guest tidak akan dapat menulis ke folder yang di-share yang dinyatakan.</translation>
+        <translation>Saat ditandai, OS guest tidak akan dapat menulis ke folder bersama yang dinyatakan.</translation>
     </message>
     <message>
         <source>&Read-only</source>
@@ -5833,15 +6071,19 @@
     </message>
     <message>
         <source>When checked, the guest OS will try to automatically mount the shared folder on startup.</source>
-        <translation>Saat ditandai, OS guest akan mencoba me-mount secara otomatis, folder yang di-share, saat startup.</translation>
+        <translation>Saat ditandai, OS guest akan mencoba mengait secara otomatis folder bersama saat awal mula.</translation>
     </message>
     <message>
         <source>&Auto-mount</source>
-        <translation>Mount otom&atis</translation>
+        <translation>Kaitkan otom&atis</translation>
     </message>
     <message>
         <source>If checked, this shared folder will be permanent.</source>
-        <translation type="obsolete">Bila ditandai, folder yang di-share ini akan permanen.</translation>
+        <translation type="obsolete">Bila ditandai, folder bersama ini akan permanen.</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation type="obsolete">Jendela</translation>
     </message>
     <message>
         <source>When checked, this shared folder will be permanent.</source>
@@ -5857,11 +6099,11 @@
     </message>
     <message>
         <source>When checked, enables the given serial port of the virtual machine.</source>
-        <translation>Saat ditandai, nyalakan port serial yang diberikan pada mesin virtual.</translation>
+        <translation>Saat ditandai, memfungsikan port serial yang diberikan pada mesin virtual.</translation>
     </message>
     <message>
         <source>&Enable Serial Port</source>
-        <translation>Nyalakan Port S&erial</translation>
+        <translation>Fungsikan Port S&erial</translation>
     </message>
     <message>
         <source>Port &Number:</source>
@@ -5869,7 +6111,7 @@
     </message>
     <message>
         <source>Selects the serial port number. You can choose one of the standard serial ports or select <b>User-defined</b> and specify port parameters manually.</source>
-        <translation>Tampilkan nomor port serial. Anda dapat memilih satu dari port serial standar atau pilih <b>Didefinisikan oleh pengguna</b> dan menyatakan parameter port secara manual.</translation>
+        <translation>Pilih nomor port serial. Anda dapat memilih satu dari port serial standar atau pilih <b>Didefinisikan oleh pengguna</b> dan menyatakan parameter port secara manual.</translation>
     </message>
     <message>
         <source>&IRQ:</source>
@@ -5897,7 +6139,7 @@
     </message>
     <message>
         <source>If checked, the pipe specified in the <b>Port Path</b> field will be created by the virtual machine when it starts. Otherwise, the virtual machine will assume that the pipe exists and try to use it.</source>
-        <translation type="obsolete">BIla ditandai, pipa yang disebutkan dalam field <b>Path Port</b> akan diciptakan oleh mesin virtual saat ia mulai menyala. Jika tidak, mesin virtual akan menganggap pipa ada dan mencoba menggunakannya.</translation>
+        <translation type="obsolete">BIla ditandai, pipa yang disebutkan dalam ruas <b>Path Port</b> akan diciptakan oleh mesin virtual saat mulai menyala. Jika tidak, mesin virtual akan menganggap pipa ada dan mencoba menggunakannya.</translation>
     </message>
     <message>
         <source>&Create Pipe</source>
@@ -5905,7 +6147,7 @@
     </message>
     <message>
         <source>Holds the path to the serial port's pipe on the host when the port is working in <b>Host Pipe</b> mode, or the host serial device name when the port is working in <b>Host Device</b> mode.</source>
-        <translation type="obsolete">Tampilkan path ke pipa port serial pada host saat port bekerja pada mode <b>Pipa Host</a>, atau nama device serial host saat port bekerja pada mode <b>Device Host</b>.</translation>
+        <translation type="obsolete">Menyimpan path ke pipa port serial pada host saat port bekerja pada mode <b>Pipa Host</a>, atau nama perangkat serial host saat port bekerja pada mode <b>Device Host</b>.</translation>
     </message>
     <message>
         <source>Port/File &Path:</source>
@@ -5913,51 +6155,51 @@
     </message>
     <message>
         <source>Holds the IRQ number of this serial port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> setting is enabled for this virtual machine.</source>
-        <translation>Tampilkan nomor IRQ dari port serial ini. Ini mesti berupa bilangan bulat antara <tt>0</tt> dan <tt>255</tt>. Nilai lebih dari <tt>15</tt> hanya bisa digunakan bila pengaturan <b>I/O APIC</b> dinyalakan untuk mesin virtual ini.</translation>
+        <translation>Menyimpan nomor IRQ dari port serial ini. Ini mesti berupa bilangan bulat antara <tt>0</tt> dan <tt>255</tt>. Nilai lebih dari <tt>15</tt> hanya bisa digunakan bila pengaturan <b>I/O APIC</b> dinyalakan untuk mesin virtual ini.</translation>
     </message>
     <message>
         <source>Holds the base I/O port address of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source>
-        <translation>Tampilkan alamat dasar port I/O dari port paralel ini. Nilai yang valid adalah bilangan bulat dalam jangkauan <tt>0</tt> hingga <tt>0xFFFF</tt>.</translation>
+        <translation>Menyimpan alamat dasar port I/O dari port paralel ini. Nilai yang valid adalah bilangan bulat dalam jangkauan <tt>0</tt> hingga <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">IRQ saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Port I/O saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Dua port atau lebih memiliki pengaturan yang sama.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Path port saat ini tidak dinyatakan.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Saat ini ada path port yang duplikat.</translation>
     </message>
 </context>
 <context>
@@ -5974,6 +6216,26 @@
         <source>Duplicate port path entered </source>
         <translation type="obsolete">Path port duplikat dimasukkan </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">IRQ saat ini tidak dinyatakan.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">Port I/O saat ini tidak dinyatakan.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Dua port atau lebih memiliki pengaturan yang sama.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">Path port saat ini tidak dinyatakan.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">Saat ini ada path port yang duplikat.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsStorage</name>
@@ -6011,7 +6273,7 @@
     </message>
     <message>
         <source><nobr>Expand/Collapse&nbsp;Item</nobr></source>
-        <translation type="obsolete"><nobr>Kembangkan/Ringkaskan&nbsp:Item</nobr></translation>
+        <translation type="obsolete"><nobr>Kembangkan/Ringkaskan&nbsp;Butir</nobr></translation>
     </message>
     <message>
         <source><nobr>Add&nbsp;Hard&nbsp;Disk</nobr></source>
@@ -6019,11 +6281,11 @@
     </message>
     <message>
         <source><nobr>Add&nbsp;CD/DVD&nbsp;Device</nobr></source>
-        <translation type="obsolete"><nobr>Tambah&nbsp;Device&nbsp;CD/DVD</nobr></translation>
+        <translation type="obsolete"><nobr>Tambah&nbsp;Perangkat&nbsp;CD/DVD</nobr></translation>
     </message>
     <message>
         <source><nobr>Add&nbsp;Floppy&nbsp;Device</nobr></source>
-        <translation type="obsolete"><nobr>Tambah&nbsp;Device&nbsp;Floppy</nobr></translation>
+        <translation type="obsolete"><nobr>Tambah&nbsp;Perangkat&nbsp;Floppy</nobr></translation>
     </message>
     <message>
         <source><i>%1</i> uses a medium that is already attached to <i>%2</i>.</source>
@@ -6063,11 +6325,11 @@
     </message>
     <message>
         <source>Add CD/DVD Device</source>
-        <translation type="obsolete">Tambah Device CD/DVD</translation>
+        <translation type="obsolete">Tambah Perangkat CD/DVD</translation>
     </message>
     <message>
         <source>Add Floppy Device</source>
-        <translation type="obsolete">Tambah Device Floppy</translation>
+        <translation type="obsolete">Tambah Perangkat Floppy</translation>
     </message>
     <message>
         <source>Remove Attachment</source>
@@ -6079,7 +6341,7 @@
     </message>
     <message>
         <source>Removes the controller highlighted in the Storage Tree.</source>
-        <translation type="obsolete">Hapus pengendali yang di-highlight pada Pohon Penyimpanan.</translation>
+        <translation type="obsolete">Hapus pengendali yang disorot pada Pohon Penyimpanan.</translation>
     </message>
     <message>
         <source>Adds a new attachment to the Storage Tree using currently selected controller as parent.</source>
@@ -6087,7 +6349,7 @@
     </message>
     <message>
         <source>Removes the attachment highlighted in the Storage Tree.</source>
-        <translation type="obsolete">Hapus cantolan yang di-highlight dalam Pohon Penyimpanan.</translation>
+        <translation type="obsolete">Hapus cantolan yang disorot dalam Pohon Penyimpanan.</translation>
     </message>
     <message>
         <source>IDE Controller</source>
@@ -6115,7 +6377,7 @@
     </message>
     <message>
         <source>Contains all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="obsolete">Memuat semua pengendali penyimpanan bagi mesin ini dan image virtual serta drive host ditancapkan ke mereka.</translation>
+        <translation type="obsolete">Memuat semua pengendali penyimpanan bagi mesin ini dan image virtual serta drive host yang ditancapkan ke mereka.</translation>
     </message>
     <message>
         <source>Information</source>
@@ -6211,11 +6473,11 @@
     </message>
     <message>
         <source>Choose or create a virtual hard disk file. The virtual machine will see the data in the file as the contents of the virtual hard disk.</source>
-        <translation>Pilih atau ciptakan file hard disk virtual. Mesin virtual akan melihat data dalam file sebagai isi hard disk virtual.</translation>
+        <translation>Pilih atau ciptakan berkas hard disk virtual. Mesin virtual akan melihat data dalam berkas sebagai isi hard disk virtual.</translation>
     </message>
     <message>
         <source>Set up the virtual hard disk</source>
-        <translation type="obsolete">Set up hard disk virtual</translation>
+        <translation type="obsolete">Siapkan hard disk virtual</translation>
     </message>
     <message>
         <source>CD/DVD &Drive:</source>
@@ -6223,11 +6485,11 @@
     </message>
     <message>
         <source>Choose a virtual CD/DVD disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation type="obsolete">Pilih disk CD/DVD virtual atau drive fisik untuk dipakai dengan drive virtual. Mesin virtual akan melihat suatu disk disisipkan ke dalam drive dengan data dalam file atau pada disk dalam drive fisik sebagai isinya.</translation>
+        <translation type="obsolete">Pilih disk CD/DVD virtual atau drive fisik untuk dipakai dengan drive virtual. Mesin virtual akan melihat suatu disk disisipkan ke dalam drive dengan data dalam berkas atau pada disk dalam drive fisik sebagai isinya.</translation>
     </message>
     <message>
         <source>Set up the virtual CD/DVD drive</source>
-        <translation type="obsolete">Set up drive CD/DVD virtual</translation>
+        <translation type="obsolete">Siapkan drive CD/DVD virtual</translation>
     </message>
     <message>
         <source>Floppy &Drive:</source>
@@ -6235,11 +6497,11 @@
     </message>
     <message>
         <source>Choose a virtual floppy disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation>Pilih disk floppy virtual atau drive fisik untuk dipakai dengan drive virtual. Mesin virtual akan melihat suatu disk disisipkan ke dalam drive dengan data dalam file atau pada disk dalam drive fisik sebagai isinya.</translation>
+        <translation>Pilih disk floppy virtual atau drive fisik untuk dipakai dengan drive virtual. Mesin virtual akan melihat suatu disk disisipkan ke dalam drive dengan data dalam berkas atau pada disk dalam drive fisik sebagai isinya.</translation>
     </message>
     <message>
         <source>Set up the virtual floppy drive</source>
-        <translation type="obsolete">Set up drive floppy virtual</translation>
+        <translation type="obsolete">Siapkan drive floppy virtual</translation>
     </message>
     <message>
         <source>Create a new hard disk...</source>
@@ -6247,11 +6509,11 @@
     </message>
     <message>
         <source>Choose a virtual hard disk file...</source>
-        <translation type="obsolete">Pilih file hard disk virtual...</translation>
+        <translation type="obsolete">Pilih berkas hard disk virtual...</translation>
     </message>
     <message>
         <source>Choose a virtual CD/DVD disk file...</source>
-        <translation type="obsolete">Pilih sebuah file CD/DVD virtual...</translation>
+        <translation type="obsolete">Pilih sebuah berkas CD/DVD virtual...</translation>
     </message>
     <message>
         <source>Remove disk from virtual drive</source>
@@ -6259,7 +6521,7 @@
     </message>
     <message>
         <source>Choose a virtual floppy disk file...</source>
-        <translation type="obsolete">Pilih sebuah file floppy virtual...</translation>
+        <translation type="obsolete">Pilih sebuah berkas floppy virtual...</translation>
     </message>
     <message>
         <source>When checked the virtual disk will not be removed when the guest system ejects it.</source>
@@ -6271,11 +6533,11 @@
     </message>
     <message>
         <source>When checked the guest system will see the virtual disk as a solid state device.</source>
-        <translation type="obsolete">Saat ditandai, sistem guest akan melihat disk virtual sebagai device solid state.</translation>
+        <translation type="obsolete">Saat ditandai, sistem guest akan melihat disk virtual sebagai perangkat solid state.</translation>
     </message>
     <message>
         <source>&Solid-state Drive</source>
-        <translation>Drive &solid-state</translation>
+        <translation>Drive &Solid-state</translation>
     </message>
     <message>
         <source>Details:</source>
@@ -6317,119 +6579,120 @@
     </message>
     <message>
         <source>Controller: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Pengendali: %1</translation>
     </message>
     <message>
         <source>No name is currently specified for the controller at position <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Saat ini nama tidak dinyatakan bagi pengendali pada posisi <b>%1</b>.</translation>
     </message>
     <message>
         <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pengendali pada posisi <b>%1</b> memakai nama yang sama dengan pengendali pada posisi <b>%2</b>.</translation>
     </message>
     <message>
         <source>No hard disk is selected for <i>%1</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidak ada hard disk yang dipilih bagi <i>%1</i>.</translation>
     </message>
     <message>
         <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>%1</i> menggunakan hard disk yang sudah terpasang pada <i>%2</i>.</translation>
     </message>
     <message>
         <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Mesin kini memiliki pengendali penyimpanan terpasang yang lebih banyak daripada yang didukung oleh chipset %1. Silakan ubah tipe chipset pada halaman pengaturan Sistem atau kurangi cacah pengendali penyimpanan berikut pada halaman pengaturan Penyimpanan: %2</translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Image</translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Image</translation>
+        <source>Add USB Controller</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6445,7 +6708,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6510,7 +6773,7 @@
     </message>
     <message>
         <source>Defines the boot device order. Use the checkboxes on the left to enable or disable individual boot devices. Move items up and down to change the device order.</source>
-        <translation>Menentukan urutan boot device. Gunakan checkbox yang tersedia di sebelah kiri untuk menyalakan atau mematikan boot device secara individual. Naikkan atau turunkan item untuk mengubah urutan device.</translation>
+        <translation>Menentukan urutan perangkat boot. Gunakan kotak contreng yang tersedia di sebelah kiri untuk menyalakan atau mematikan perangkat boot secara individual. Naikkan atau turunkan butir untuk mengubah urutan perangkat.</translation>
     </message>
     <message>
         <source>Move Down (Ctrl-Down)</source>
@@ -6518,7 +6781,7 @@
     </message>
     <message>
         <source>Moves the selected boot device down.</source>
-        <translation>Turunkan boot device yang dipilih.</translation>
+        <translation>Turunkan perangkat boot yang dipilih.</translation>
     </message>
     <message>
         <source>Move Up (Ctrl-Up)</source>
@@ -6526,7 +6789,7 @@
     </message>
     <message>
         <source>Moves the selected boot device up.</source>
-        <translation>Naikkan boot device yang dipilih.</translation>
+        <translation>Naikkan perangkat boot yang dipilih.</translation>
     </message>
     <message>
         <source>Extended Features:</source>
@@ -6534,11 +6797,11 @@
     </message>
     <message>
         <source>When checked, the virtual machine will support the Input Output APIC (I/O APIC), which may slightly decrease performance. <b>Note:</b> don't disable this feature after having installed a Windows guest operating system!</source>
-        <translation>Saat tertandai, mesin virtual akan mendukung Input Output APIC (I/O APIC), yang bisa saja sedikit menurunkan kinerja mesin. <b>Catatan:</b> jangan matikan fitur ini setelah menginstal sebuah sistem operasi guest Windows!</translation>
+        <translation>Saat tertandai, mesin virtual akan mendukung Input Output APIC (I/O APIC), yang bisa saja sedikit menurunkan kinerja mesin. <b>Catatan:</b> jangan nonaktifkan fitur ini setelah memasang sebuah sistem operasi guest Windows!</translation>
     </message>
     <message>
         <source>Enable &I/O APIC</source>
-        <translation>Aktifkan &I/O APIC</translation>
+        <translation>Fungsikan &I/O APIC</translation>
     </message>
     <message>
         <source>&Processor</source>
@@ -6554,7 +6817,7 @@
     </message>
     <message>
         <source>Enable PA&E/NX</source>
-        <translation>Aktifkan PA&E/NX</translation>
+        <translation>Fungsikan PA&E/NX</translation>
     </message>
     <message>
         <source>Acce&leration</source>
@@ -6562,15 +6825,15 @@
     </message>
     <message>
         <source>Hardware Virtualization:</source>
-        <translation>Virtualisasi Hardware:</translation>
+        <translation>Virtualisasi Perangkat Keras:</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will try to make use of the host CPU's hardware virtualization extensions such as Intel VT-x and AMD-V.</source>
-        <translation>Bila ditandai, mesin virtual akan mencoba memakai ekstensi virtualisasi hardware milik CPU host seperti misalnya Intel VT-x dan AMD-V.</translation>
+        <translation>Bila ditandai, mesin virtual akan mencoba memakai ekstensi virtualisasi perangkat keras milik CPU host seperti misalnya Intel VT-x dan AMD-V.</translation>
     </message>
     <message>
         <source>Enable &VT-x/AMD-V</source>
-        <translation>Aktifkan &VT-x/AMD-V</translation>
+        <translation>Fungsikan &VT-x/AMD-V</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will try to make use of the nested paging extension of Intel VT-x and AMD-V.</source>
@@ -6578,12 +6841,12 @@
     </message>
     <message>
         <source>Enable Nested Pa&ging</source>
-        <translation>Aktifkan Pa&ging Bertingkat</translation>
+        <translation>Fungsikan Pa&ging Bertingkat</translation>
     </message>
     <message>
         <source><qt>%1&nbsp;CPUs</qt></source>
         <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="obsolete"><qt>%1&nbsp;CPUs</qt></translation>
+        <translation type="obsolete"><qt>%1&nbsp;CPU</qt></translation>
     </message>
     <message>
         <source>When checked, the guest will support the Extended Firmware Interface (EFI), which is required to boot certain guest OSes. Non-EFI aware OSes will not be able to boot if this option is activated.</source>
@@ -6591,19 +6854,19 @@
     </message>
     <message>
         <source>Enable &EFI (special OSes only)</source>
-        <translation>Aktifkan &EFI (hanya OS khusus)</translation>
+        <translation>Fungsikan &EFI (hanya OS khusus)</translation>
     </message>
     <message>
         <source>If checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="obsolete">Bila ditandai, device RTC akan melaporkan waktu dalam UTC, bila tidak, dalam waktu lokal (host). Unix biasanya mengharapkan jam hardware ditata ke UTC.</translation>
+        <translation type="obsolete">Bila ditandai, perangkat RTC akan melaporkan waktu dalam UTC, bila tidak, dalam waktu lokal (host). Unix biasanya mengharapkan jam perangkat keras ditata ke UTC.</translation>
     </message>
     <message>
         <source>Hardware Clock in &UTC Time</source>
-        <translation>Jam hardware dalam waktu &UTC</translation>
+        <translation>Jam Perangkat Keras dalam Waktu &UTC</translation>
     </message>
     <message>
         <source>Controls the number of virtual CPUs in the virtual machine. You need hardware virtualization support on your host system to use more than one virtual CPU.</source>
-        <translation>Mengendalikan cacah CPU virtual dalam mesin virtual. Anda perlu dukungan virtualisasi hardware pada sistem host Anda untuk memakai lebih dari satu CPU virtual.</translation>
+        <translation>Mengendalikan cacah CPU virtual dalam mesin virtual. Anda perlu dukungan virtualisasi perangkat keras pada sistem host Anda untuk memakai lebih dari satu CPU virtual.</translation>
     </message>
     <message>
         <source>If checked, an absolute pointing device (a USB tablet) will be supported. Otherwise, only a standard PS/2 mouse will be emulated.</source>
@@ -6623,11 +6886,11 @@
     </message>
     <message>
         <source>&Execution Cap:</source>
-        <translation>Cap &Eksekusi:</translation>
+        <translation>Batas &Eksekusi:</translation>
     </message>
     <message>
         <source>Limits the amount of time that each virtual CPU is allowed to run for. Each virtual CPU will be allowed to use up to this percentage of the processing time available on one physical CPU. The execution cap can be disabled by setting it to 100%. Setting the cap too low can make the machine feel slow to respond.</source>
-        <translation>Membatasi lama waktu setiap CPU virtual diijinkan berjalan. Setiap CPU virtual akan diijinkan memakai sampai dengan persentase ini dari waktu pemrosesan yang tersedia pada satu CPU fisik. Cap eksekusi dapat dimatikan dengan menatanya ke 100%. Menata cap terlalu rendah dapat membuat mesin terasa lambat merespon.</translation>
+        <translation>Membatasi lama waktu setiap CPU virtual diijinkan berjalan. Setiap CPU virtual akan diijinkan memakai sampai dengan persentase ini dari waktu pemrosesan yang tersedia pada satu CPU fisik. Batas eksekusi dapat dimatikan dengan menatanya ke 100%. Menata batas terlalu rendah dapat membuat mesin terasa lambat merespon.</translation>
     </message>
     <message>
         <source>you have set the processor execution cap to a low value. This can make the machine feel slow to respond.</source>
@@ -6653,30 +6916,54 @@
     </message>
     <message>
         <source>&Pointing Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>Perangkat &Penunjuk:</translation>
     </message>
     <message>
         <source>Determines whether the emulated pointing device is a standard PS/2 mouse, a USB tablet or a USB multi-touch tablet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Menentukan apakah perangkat penunjuk yang diemulasi adalah tetikus PS/2 standar, tablet USB, atau tablet multi-sentuh USB.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. Not enough memory is left for the host operating system. Please select a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lebih dari <b>%1%</b> dari memori komputer host (<b>%2</b>) diserahkan ke mesin virtual. Memori tersisa tidak cukup untuk sistem operasi host. Silakan pilih nilai yang lebih kecil.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. There might not be enough memory left for the host operating system. Please consider selecting a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lebih dari <b>%1%</b> dari memori komputer host (<b>%2</b>) diserahkan ke mesin virtual. Memori tersisa mungkin tidak cukup untuk sistem operasi host. Harap pertimbangkan untuk memilih nilai yang lebih kecil.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">Fitur I/O APIC saat ini tidak difungsikan dalam bagian Motherboard dari halaman SIstem. Ini diperlukan untuk mendukung chipset bertipe ICH9. Ini akan dilakukan secara otomatis bila Anda mengkonfirmasi perubahan Anda.</translation>
+    </message>
+    <message>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">Emulasi pengendali USB saat ini tidak difungsikan pada halaman USB. Ini diperlukan untuk mendukung perangkat masukan USB teremulasi. Ini akan dilakukan secara otomatis bila Anda mengkonfirmasi perubahan Anda.</translation>
     </message>
     <message>
         <source>For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Untuk alasan kinerja, cacah CPU virtual yang terpasang ke mesin virtual tidak boleh lebih dari dua kali cacah CPU fisik pada host (<b>%1</b>). Harap kurangi cacah CPU virtual.</translation>
     </message>
     <message>
         <source>More virtual CPUs are assigned to the virtual machine than the number of physical CPUs on the host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lebih banyak CPU virtual yang dipasang ke mesin virtual daripada cacah CPU fisik pada sistem host (<b>%1</b>). Ini boleh jadi menurunkan kinerja mesin virtual Anda. Harap pertimbangkan untuk mengurangi cacah CPU virtual.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">Fitur I/O APIC saat ini tidak difungsikan dalam bagian Motherboard dari halaman SIstem. Ini diperlukan untuk mendukung lebih dari satu prosesor virtual. Ini akan dilakukan secara otomatis bila Anda mengkonfirmasi perubahan Anda.</translation>
+    </message>
+    <message>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">Virtualisasi perangkat keras saat ini tidak difungsikan dalam bagian Akselerasi dari halaman SIstem. Ini diperlukan untuk mendukung lebih dari satu prosesor virtual. Ini akan dilakukan secara otomatis bila Anda mengkonfirmasi perubahan Anda.</translation>
     </message>
     <message>
         <source>The processor execution cap is set to a low value. This may make the machine feel slow to respond.</source>
+        <translation>Batas eksekusi prosesor diatur ke nilai yang rendah. Ini mungkin membuat mesin terasa lambat merespon.</translation>
+    </message>
+    <message>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6704,16 +6991,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 MB</translation>
     </message>
     <message>
         <source>%1 CPU</source>
@@ -6738,11 +7017,11 @@
     </message>
     <message>
         <source>A&dd Filter From Device</source>
-        <translation type="obsolete">Tambahkan Filter &Dari Device</translation>
+        <translation type="obsolete">Tambahkan Filter &Dari Perangkat</translation>
     </message>
     <message>
         <source>&Edit Filter</source>
-        <translation type="obsolete">&Edit Filter</translation>
+        <translation type="obsolete">&Sunting Filter</translation>
     </message>
     <message>
         <source>&Remove Filter</source>
@@ -6766,7 +7045,7 @@
     </message>
     <message>
         <source>Edits the selected USB filter.</source>
-        <translation type="obsolete">Edit filter USB yang dipilih.</translation>
+        <translation type="obsolete">Sunting filter USB yang dipilih.</translation>
     </message>
     <message>
         <source>Removes the selected USB filter.</source>
@@ -6791,7 +7070,7 @@
     </message>
     <message>
         <source>Enable &USB Controller</source>
-        <translation>Aktifkan Pengendali &USB</translation>
+        <translation>Fungsikan Pengendali &USB</translation>
     </message>
     <message>
         <source>When checked, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
@@ -6803,11 +7082,11 @@
     </message>
     <message>
         <source>USB Device &Filters</source>
-        <translation>&Filter Device USB</translation>
+        <translation>&Filter Perangkat USB</translation>
     </message>
     <message>
         <source>Lists all USB filters of this machine. The checkbox to the left defines whether the particular filter is enabled or not. Use the context menu or buttons to the right to add or remove USB filters.</source>
-        <translation>Menampilkan semua filter USB dari mesin ini. Checkbox di kiri menentukan apakah filter tertentu diaktifkan atau tidak. Gunakan menu konteks atau tombol di kanan untuk menambah atau menghapus filter USB.</translation>
+        <translation>Menampilkan semua filter USB dari mesin ini. Kotak contreng di kiri menentukan apakah filter tertentu difungsikan atau tidak. Gunakan menu konteks atau tombol di kanan untuk menambah atau menghapus filter USB.</translation>
     </message>
     <message>
         <source>[filter]</source>
@@ -6858,31 +7137,35 @@
         <translation type="obsolete">USB 2.0 kini diaktifkan bagi mesin virtual ini. Namun, ini memerlukan instalasi <b>%1</b>. Silakan instal Extension Pack dari situs download VirtualBox. Setelah ini Anda akan dapat mengaktifkan ulang USB 2.0. Ini akan dimatikan sementara kecuali Anda membatalkan perubahan pengaturan kini.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0 to be able to start the machine.</source>
+        <translation type="obsolete">USB 2.0 saat ini difungsikan bagi mesin virtual ini. Namun, ini memerlukan dipasangnya <b>%1</b>. Harap pasang Extension Pack dari situs unduh VirtualBox atau nonaktifkan USB 2.0 agar bisa memulai mesin.</translation>
+    </message>
+    <message>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6957,7 +7240,7 @@
     </message>
     <message>
         <source>Holds the filter name.</source>
-        <translation>Tampilkan nama filter.</translation>
+        <translation>Menyimpan nama filter.</translation>
     </message>
     <message>
         <source>&Vendor ID:</source>
@@ -6965,7 +7248,7 @@
     </message>
     <message>
         <source>Defines the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="obsolete">Mendefinisikan filter ID vendor. Format string <i>cocok eksak</i> adalah <tt>XXXX</tt> dimana <tt>X</tt> adalah digit heksadesimal. String kosong akan cocok dengan sebarang nilai.</translation>
+        <translation type="obsolete">Mendefinisikan penyaring ID vendor. Format string <i>cocok eksak</i> adalah <tt>XXXX</tt> dimana <tt>X</tt> adalah digit heksadesimal. String kosong akan cocok dengan sebarang nilai.</translation>
     </message>
     <message>
         <source>&Product ID:</source>
@@ -6973,7 +7256,7 @@
     </message>
     <message>
         <source>Defines the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="obsolete">Mendefinisikan filter ID produk. Format string <i>cocok eksak</i> adalah <tt>XXXX</tt> dimana <tt>X</tt> adalah digit heksadesimal. String kosong akan cocok dengan sebarang nilai.</translation>
+        <translation type="obsolete">Mendefinisikan penyaring ID produk. Format string <i>cocok eksak</i> adalah <tt>XXXX</tt> dimana <tt>X</tt> adalah digit heksadesimal. String kosong akan cocok dengan sebarang nilai.</translation>
     </message>
     <message>
         <source>&Revision:</source>
@@ -6981,7 +7264,7 @@
     </message>
     <message>
         <source>Defines the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation type="obsolete">Mendefinisikan filter nomor revisi. Format string <i>cocok eksak</i> adalah <tt>IIFF</tt> dimana <tt>I</tt> adalah digit desimal dari bagian integer dan <tt>F</tt> adalah digit desimal dari bagian pecahan. String kosong akan cocok dengan sebarang nilai.</translation>
+        <translation type="obsolete">Mendefinisikan penyaring nomor revisi. Format string <i>cocok eksak</i> adalah <tt>IIFF</tt> dimana <tt>I</tt> adalah digit desimal dari bagian integer dan <tt>F</tt> adalah digit desimal dari bagian pecahan. String kosong akan cocok dengan sebarang nilai.</translation>
     </message>
     <message>
         <source>&Manufacturer:</source>
@@ -6989,7 +7272,7 @@
     </message>
     <message>
         <source>Defines the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">Mendefinisikan filter pabrikan sebagai suatu string <i>cocok eksak</i>. String kosong akan cocok dengan sebarang nilai.</translation>
+        <translation type="obsolete">Mendefinisikan penyaring pabrikan sebagai suatu string <i>cocok eksak</i>. String kosong akan cocok dengan sebarang nilai.</translation>
     </message>
     <message>
         <source>Pro&duct:</source>
@@ -6997,7 +7280,7 @@
     </message>
     <message>
         <source>Defines the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">Mendefinisikan filter nama produk sebagai suatu string <i>cocok eksak</i>. String kosong akan cocok dengan sebarang nilai.</translation>
+        <translation type="obsolete">Mendefinisikan penyaring nama produk sebagai suatu string <i>cocok eksak</i>. String kosong akan cocok dengan sebarang nilai.</translation>
     </message>
     <message>
         <source>&Serial No.:</source>
@@ -7005,7 +7288,7 @@
     </message>
     <message>
         <source>Defines the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">Mendefinisikan filter nomor seri sebagai suatu string <i>cocok eksak</i>. String kosong akan cocok dengan sebarang nilai.</translation>
+        <translation type="obsolete">Mendefinisikan penyaring nomor seri sebagai suatu string <i>cocok eksak</i>. String kosong akan cocok dengan sebarang nilai.</translation>
     </message>
     <message>
         <source>Por&t:</source>
@@ -7013,7 +7296,7 @@
     </message>
     <message>
         <source>Defines the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">Mendefinisikan filter port USB sebagai suatu string <i>cocok eksak</i>. String kosong akan cocok dengan sebarang nilai.</translation>
+        <translation type="obsolete">Mendefinisikan penyaring port USB sebagai suatu string <i>cocok eksak</i>. String kosong akan cocok dengan sebarang nilai.</translation>
     </message>
     <message>
         <source>R&emote:</source>
@@ -7021,7 +7304,7 @@
     </message>
     <message>
         <source>Defines whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
-        <translation type="obsolete">Menentukan apakah filter ini diterapkan ke device USB yang tersambung secara lokal ke komputer host (<i>Tidak</i>), ke klien VRDP komputer (<i>Ya</i>), atau keduanya (<i>Apa saja</a>).</translation>
+        <translation type="obsolete">Menentukan apakah penyaring ini diterapkan ke device USB yang tersambung secara lokal ke komputer host (<i>Tidak</i>), ke klien VRDP komputer (<i>Ya</i>), atau keduanya (<i>Apa saja</a>).</translation>
     </message>
     <message>
         <source>&Action:</source>
@@ -7033,7 +7316,7 @@
     </message>
     <message>
         <source>USB Filter Details</source>
-        <translation>Rincian Filter USB</translation>
+        <translation>Rincian Penyaring USB</translation>
     </message>
     <message>
         <source>Holds the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
@@ -7072,25 +7355,29 @@
     <name>UIMachineWindow</name>
     <message>
         <source> EXPERIMENTAL build %1r%2 - %3</source>
-        <translation type="unfinished"> build EXPERIMENTAL %1r%2 - %3</translation>
+        <translation> build EKSPERIMEN %1r%2 - %3</translation>
     </message>
 </context>
 <context>
     <name>UIMachineWindowNormal</name>
     <message>
         <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source>
-        <translation>Tunjukkan tombol Host yang sedang ditugaskan.<br>Tombol ini, saat ditekan sendirian, menjungkit keadaan penangkapan keyboard dan mouse. Ia juga dapat digunakan dalam kombinasi dengan kunci lain untuk melakukan tindakan dari dalam menu utama secara cepat.</translation>
+        <translation>Tunjukkan tombol Host yang sedang ditugaskan.<br>Tombol ini, saat ditekan sendirian, menjungkit keadaan penangkapan papan tik dan tetikus. Ia juga dapat digunakan dalam kombinasi dengan tombol lain untuk melakukan tindakan dari dalam menu utama secara cepat.</translation>
     </message>
 </context>
 <context>
     <name>UIMediumManager</name>
     <message>
+        <source>&Hard drives</source>
+        <translation type="obsolete">&Hard disk</translation>
+    </message>
+    <message>
         <source>&Optical disks</source>
-        <translation type="unfinished"></translation>
+        <translation>Cakram &optik</translation>
     </message>
     <message>
         <source>&Floppy disks</source>
-        <translation type="unfinished"></translation>
+        <translation>Cakram &floppy</translation>
     </message>
     <message>
         <source>&Select</source>
@@ -7117,11 +7404,11 @@
     </message>
     <message>
         <source><p>You are about to change the settings of the disk image file <b>%1</b>.</p><p>Please choose one of the following modes and press <b>%2</b> to proceed or <b>%3</b> otherwise.</p></source>
-        <translation></translation>
+        <translation><b>Anda akan mengubah pengaturan berkas image disk <b>%1</b>.</p><p>Harap pilih satu dari mode berikut dan tekan <b>%2</b> untuk melanjutkan atau <b>%3</b> bila tidak.</p></translation>
     </message>
     <message>
         <source>Choose mode:</source>
-        <translation>Pilih tipe medium:</translation>
+        <translation>Pilih mode:</translation>
     </message>
 </context>
 <context>
@@ -7135,14 +7422,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Tutup</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Beralih</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Tutup</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7369,7 +7656,7 @@
     </message>
     <message>
         <source>Failed to create the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) for the virtual machine <b>%3</b>.</source>
-        <translation>Gagal menciptakan sebuah folder yang dishare <b>%1</b> (menunjuk pada <nobr><b>%2</b></nobr>) bagi mesin virtual <b>%3</b>.</translation>
+        <translation>Gagal menciptakan sebuah folder bersama <b>%1</b> (menunjuk pada <nobr><b>%2</b></nobr>) bagi mesin virtual <b>%3</b>.</translation>
     </message>
     <message>
         <source>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</source>
@@ -7462,16 +7749,16 @@
         <translation type="obsolete"><p>Tidak dapat memuat file bahasa <b><nobr>%1</nobr></b>. <p>Bahasa akan sementara di-reset pada bahasa Inggris (built-in). Silahkan melihat dialog <b>Preferensi</b> yang dapat anda buka dari menu <b>File</b> pada jendela utama VirtualBox , dan pilih satu dari bahasa yang tersedia pada halaman, <b>Bahasa</b>.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
-        <translation type="obsolete"><p>VirtualBox Guest Additions terinstall pada Sistem Operasi Guest terlalu tua: versi terinstall adalah %1, versi yang diharapkan adalah %2. Beberapa fitur yang membutuhkan Guest Additions (integrasi mouse, auto-resize tampilan guest) sangat mungkin tidak bekerja dengan semestinya.</p><p>Silahkan update the Guest Additions pada versi saat ini dengan memilih <b>Install Guest Additions</b> dari menu <b>Device</b&gt [...]
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
+        <translation type="obsolete"><p>VirtualBox Guest Additions terinstall pada Sistem Operasi Guest terlalu tua: versi terinstall adalah %1, versi yang diharapkan adalah %2. Beberapa fitur yang membutuhkan Guest Additions (integrasi mouse, auto-resize tampilan guest) sangat mungkin tidak bekerja dengan semestinya.</p><p>Silahkan update the Guest Additions pada versi saat ini dengan memilih <b>Insert Guest Additions CD image</b> dari menu <b>Device& [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
-        <translation type="obsolete"><p>VirtualBox Guest Additions terinstall pada Sistem Operasi Guest terlalu tua: versi terinstall adalah %1, versi yang diharapkan adalah %2. Beberapa fitur yang membutuhkan Guest Additions (integrasi mouse, auto-resize tampilan guest) sangat mungkin tidak bekerja dengan semestinya.</p><p>Anda dianjurkan meng-update the Guest Additions pada versi saat ini  dengan memilih <b>Install Guest Additions</b> dari menu <b>De [...]
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
+        <translation type="obsolete"><p>VirtualBox Guest Additions terinstall pada Sistem Operasi Guest terlalu tua: versi terinstall adalah %1, versi yang diharapkan adalah %2. Beberapa fitur yang membutuhkan Guest Additions (integrasi mouse, auto-resize tampilan guest) sangat mungkin tidak bekerja dengan semestinya.</p><p>Anda dianjurkan meng-update the Guest Additions pada versi saat ini  dengan memilih <b>Insert Guest Additions CD image</b> dari menu &lt [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
-        <translation type="obsolete"><p>VirtualBox Guest Additions terinstall pada Sistem Operasi Guest terlalu baru: versi terinstall adalah %1, versi yang diharapkan adalah %2.</p><p>Menggunakan versi Additions pada versi lebih lama tidak didukung. Anda dianjurkan meng-update the Guest Additions pada versi saat ini  dengan memilih <b>Install Guest Additions</b> dari menu <b>Device</b>.</p></translation>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
+        <translation type="obsolete"><p>VirtualBox Guest Additions terinstall pada Sistem Operasi Guest terlalu baru: versi terinstall adalah %1, versi yang diharapkan adalah %2.</p><p>Menggunakan versi Additions pada versi lebih lama tidak didukung. Anda dianjurkan meng-update the Guest Additions pada versi saat ini  dengan memilih <b>Insert Guest Additions CD image</b> dari menu <b>Device</b>.</p></translation>
     </message>
     <message>
         <source>Failed to change the snapshot folder path of the virtual machine <b>%1<b> to <nobr><b>%2</b></nobr>.</source>
@@ -7514,8 +7801,8 @@
         <translation type="obsolete"><p>Jendela mesin virtual dioptimalkan untuk bekerja pada mode warna <b>%1&nbsp;bit</b> tapi kualitas warna tampilan virtual saat ini di-set pada <b>%2&nbsp;bit</b>.</p><p>Silahkan buka dialog properti tampilan pada Sistem Operasi guest dan pilih sebuah mode warna <b>%3&nbsp;bit</b>, bila tersedia, untuk performa terbaik yang memungkinkan pada subsistem video virtual.</p><p>& [...]
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Kesalahan kritikal telah terjadi saat menjalankan mesin virtual dan eksekusi mesin telah dihentikan.</p><p>Untuk bantuan, silahkan kunjungi bagian Community (Komunitas) <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> atau kontrak pendukung anda. Mohon sediakan isi dari file log file <tt>VBox.log</tt> dan file image <tt>VBox.png</tt>, yang dapat anda temukan pada direktori <nob [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation type="obsolete"><p>Kesalahan kritikal telah terjadi saat menjalankan mesin virtual dan eksekusi mesin telah dihentikan.</p><p>Untuk bantuan, silahkan kunjungi bagian Community (Komunitas) <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> atau kontrak pendukung anda. Mohon sediakan isi dari file log file <tt>VBox.log</tt> dan file image <tt>VBox.png</tt>, yang dapat anda temukan pada direktori <n [...]
     </message>
     <message>
         <source><p>You didn't attach a hard disk to the new virtual machine. The machine will not be able to boot unless you attach a hard disk with a guest operating system or some other bootable media to it later using the machine settings window or the First Run Wizard.</p><p>Do you wish to continue?</p></source>
@@ -7622,9 +7909,9 @@
         <translation type="obsolete">Download</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Pasang</translation>
+        <translation>Pasang</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -7643,7 +7930,7 @@
     <message>
         <source>Check</source>
         <comment>inaccessible media message box</comment>
-        <translation>Cek</translation>
+        <translation>Periksa</translation>
     </message>
     <message>
         <source><p>The following VirtualBox settings files have been automatically converted to the new settings file format version <b>%1</b>.</p><p>However, the results of the conversion were not saved back to disk yet. Please press:</p><ul><li><b>Save</b> to save all auto-converted files now (it will not be possible to use these settings files with an older version of VirtualBox in the future);</li><li><b>Ba [...]
@@ -7792,8 +8079,8 @@
         <translation type="obsolete">Tunjukkan dialog dengan informasi produk</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Sebuah versi baru VirtualBox telah dirlis! Versi <b>%1</b> tersedia di <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Anda dapat mendownload versi ini memakai taut:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>Sebuah versi baru VirtualBox telah dirlis! Versi <b>%1</b> tersedia di <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Anda dapat mendownload versi ini memakai taut:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -7877,8 +8164,8 @@
         <translation type="obsolete">&Keluar</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Kesalahan kritikal telah terjadi saat menjalankan mesin virtual dan eksekusi mesin telah dihentikan.</p><p>Untuk bantuan, silakan kunjungi bagian Community pada <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> atau kontrak pendukung Anda. Mohon sediakan isi dari file log <tt>VBox.log</tt> dan file image <tt>VBox.png</tt>, yang dapat Anda temukan pada direktori <nobr><b&gt [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Kesalahan kritikal telah terjadi saat menjalankan mesin virtual dan eksekusi mesin telah dihentikan.</p><p>Untuk bantuan, silakan kunjungi bagian Community pada <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> atau kontrak pendukung Anda. Mohon sediakan isi dari file log <tt>VBox.log</tt> dan file image <tt>VBox.png</tt>, yang dapat Anda temukan pada direktori <nobr><b>%1</b>& [...]
     </message>
     <message>
         <source>hard disk</source>
@@ -8172,8 +8459,7 @@
     </message>
     <message>
         <source>Delete all files</source>
-        <translatorcomment>Hapus semua file</translatorcomment>
-        <translation></translation>
+        <translation>Hapus semua berkas</translation>
     </message>
     <message>
         <source>Remove only</source>
@@ -8272,8 +8558,12 @@
         <translation><p>Perhatikan bahwa unit penyimpanan medium ini tidak akan dihapus dan dapat dipakai lagi nanti.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
-        <translation type="obsolete"><p>VirtualBox Guest Addition sepertinya tak tak tersedia pada mesin virtual ini, dan folder shared tak dapat dipakai tanpanya. Untuk memakai shared folder di dalam mesin virtual, silakan install Guest Addition bila belum dipasang, atau install ulang bila tidak bekerja dengan benar, dengan memilih <b>Install Guest Addition</b> dari menu <b>Device</b>. Bila sudah dipasang tapi mesin belum dimulai secara penuh maka shared fo [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
+        <translation><p>VirtualBox Guest Addition sepertinya tak tak tersedia pada mesin virtual ini, dan folder shared tak dapat dipakai tanpanya. Untuk memakai shared folder di dalam mesin virtual, silakan install Guest Addition bila belum dipasang, atau install ulang bila tidak bekerja dengan benar, dengan memilih <b>Install Guest Addition</b> dari menu <b>Device</b>. Bila sudah dipasang tapi mesin belum dimulai secara penuh maka shared folder akan tersed [...]
+    </message>
+    <message>
+        <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <translation type="obsolete"><p>Jendela mesin virtual akan ditukar ke mode <b>layar penuh</b>. Anda dapat kembali ke mode windowed kapanpun dengan menekan <b>%1</b>.</p><p>Perhatikan bahwa tombol <i>Host</i> kini didefinisikan sebagai <b>%2</b>.</p><p>Perhatikan bahwa bilah menu utama tersembunyi dalam mode layar penuh. Anda dapat mengaksesnya dengan menekan <b>Host+Home</b>.</p></tran [...]
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>Seamless</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in seamless mode. You can access it by pressing <b>Host+Home</b>.</p></source>
@@ -8464,93 +8754,101 @@
     </message>
     <message>
         <source><p>Failed to initialize COM because the VirtualBox global configuration directory <b><nobr>%1</nobr></b> is not accessible. Please check the permissions of this directory and of its parent directory.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Gagal menginisiasi COM karena direktori konfigurasi global VirtualBox <b><nobr>%1</nobr></b> tidak dapat diakses. Harap periksa ijin direktori ini dan direktori induknya.</p><p>Aplikasi kini akan berakhir.</p></translation>
     </message>
     <message>
         <source><p>You are about to remove following virtual machine items from the machine list:</p><p><b>%1</b></p><p>Do you wish to proceed?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Anda akan menghapus butir mesin virtual berikut dari daftar mesin:</p><p><b>%1</b></p><p>Apakah Anda hendak melanjutkan?</p></translation>
     </message>
     <message>
         <source><p>You are about to remove following inaccessible virtual machines from the machine list:</p><p>%1</p><p>Do you wish to proceed?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Anda akan menghapus mesin virtual berikut yang tidak bisa diakses dari daftar mesin:</p><p><b>%1</b></p><p>Apakah Anda hendak melanjutkan?</p></translation>
     </message>
     <message>
         <source><p>You are about to remove following virtual machines from the machine list:</p><p>%1</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well? Doing this will also remove the files containing the machine's virtual hard disks if they are not in use by another machine.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Anda akan menghapus mesin virtual berikut dari daftar mesin:</p><p><b>%1</b></p><p>Apakah Anda juga hendak menghapus berkas yang memuat mesin virtual dari hard disk Anda? Melakukan ini juga akan menghapus berkas yang memuat hard disk virtual mesin bila mereka tidak dipakai oleh mesin lain.</p></translation>
     </message>
     <message>
         <source><p>You are about to remove following virtual machines from the machine list:</p><p>%1</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Anda akan menghapus mesin virtual berikut dari daftar mesin:</p><p><b>%1</b></p><p>Apakah Anda juga hendak menghapus berkas yang memuat mesin virtual dari hard disk Anda?</p></translation>
     </message>
     <message>
         <source>Do you wish to cancel all current network operations?</source>
-        <translation type="unfinished"></translation>
+        <translation>Apakah Anda hendak membatalkan semua operasi jaringan saat ini?</translation>
     </message>
     <message>
         <source>ACPI Shutdown</source>
         <comment>machine</comment>
-        <translation type="unfinished"></translation>
+        <translation>ACPI Shutdown</translation>
     </message>
     <message>
         <source>Power Off</source>
         <comment>machine</comment>
-        <translation type="unfinished"></translation>
+        <translation>Matikan Daya</translation>
     </message>
     <message>
         <source><p>Cannot remove the machine folder <nobr><b>%1</b>.</nobr></p><p>Please check that this folder really exists and that you have permissions to remove it.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak bisa menghapus folder mesin <nobr><b>%1</b>.</nobr></p><p>Harap periksa apakah folder memang benar ada dan Anda memiliki hak untuk menghapusnya.</p></translation>
     </message>
     <message>
         <source><p>Cannot create the machine folder <b>%1</b> in the parent folder <nobr><b>%2</b>.</nobr></p><p>This folder already exists and possibly belongs to another machine.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak bisa membuat folder mesin <b>%1</b> dalam folder induk <nobr><b>%2</b>.</nobr></p><p>Folder ini telah ada dan mungkin milik mesin lain.</p></translation>
+    </message>
+    <message>
+        <source>You are about to create a new virtual machine without a hard drive. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <translation type="obsolete">Anda hendak membuat suatu mesin virtual baru tanpa hard disk. Anda tidak akan bisa memasang sistem operasi pada mesin sampai Anda menambahkannya. Sementara waktu Anda hanya akan bisa memulai mesin memakai disk optik virtual atau dari jaringan.</translation>
+    </message>
+    <message>
+        <source>Failed to drop data.</source>
+        <translation type="obsolete">Gagal menjatuhkan data.</translation>
     </message>
     <message>
         <source><p>Are you sure you want to discard the saved state of the following virtual machines?</p><p><b>%1</b></p><p>This operation is equivalent to resetting or powering off the machine without doing a proper shutdown of the guest OS.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda yakin ingin membuang keadaan tersimpan dari mesin virtual berikut? </p><p><b>%1</b></p><p>Tindakan ini setara dengan me-reset atau mematikan daya mesin tanpa melakukan shutdown yang benar pada OS guest.</p></translation>
     </message>
     <message>
         <source><p>Do you really want to reset the following virtual machines?</p><p><b>%1</b></p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda benar-benar ingin me-reset mesin virtual berikut?</p><p><b>%1</b></p><p>Ini akan menyebabkan data yang belum disimpan pada aplikasi yang sedang berjalan di dalamnya hilang.</p></translation>
     </message>
     <message>
         <source><p>Do you really want to send an ACPI shutdown signal to the following virtual machines?</p><p><b>%1</b></p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda benar-benar ingin mengirim sinyal shutdown ACPI ke mesin virtual berikut?</p><p><b>%1</b></p></translation>
     </message>
     <message>
         <source><p>Do you really want to power off the following virtual machines?</p><p><b>%1</b></p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda benar-benar ingin mematikan daya mesin virtual berikut?</p><p><b>%1</b></p><p>Ini akan menyebabkan data yang belum disimpan pada aplikasi yang sedang berjalan di dalamnya hilang.</p></translation>
     </message>
     <message>
         <source><p>You are trying to move machine <nobr><b>%1</b></nobr> to group <nobr><b>%2</b></nobr> which already have sub-group <nobr><b>%1</b></nobr>.</p><p>Please resolve this name-conflict and try again.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Anda mencoba memindah mesin <nobr><b>%1</b></nobr>ke grup <nobr><b>%2</b></nobr> yang telah memiliki sub grup <nobr><b>%1</b></nobr>.</p><p>Harap selesaikan konflik nama ini dan mencoba lagi.</p></translation>
     </message>
     <message>
         <source><p>You are trying to move group <nobr><b>%1</b></nobr> to group <nobr><b>%2</b></nobr> which already have another item with the same name.</p><p>Would you like to automatically rename it?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Anda mencoba memindah grup <nobr><b>%1</b></nobr>ke grup <nobr><b>%2</b></nobr> yang telah memiliki butir lain dengan nama yang sama.</p><p>Apakah Anda ingin mengubah namanya secara otomatis?</p></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Ubah nama</translation>
     </message>
     <message>
         <source><p>You are about to restore snapshot <nobr><b>%1</b></nobr>.</p><p>You can create a snapshot of the current state of the virtual machine first by checking the box below; if you do not do this the current state will be permanently lost. Do you wish to proceed?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Anda akan mengembalikan snapshot <nobr><b>%1</b></nobr>.</p><p>Anda dapat terlebih dahulu mencipta sebuah snapshot dari keadaan mesin virtual saat ini dengan mencontreng kotak di bawah, bila Anda tidak melakukan ini maka keadaan sekarang akan hilang selamanya. Apakah Anda hendak melanjutkan?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to restore snapshot <nobr><b>%1</b></nobr>?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda yakin hendak mengembalikan snapshot <nobr><b>%1</b></nobr>?</p></translation>
     </message>
     <message>
         <source>Failed to set groups of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gagal menata grup mesin virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>Could not start the machine <b>%1</b> because the following physical network interfaces were not found:</p><p><b>%2</b></p><p>You can either change the machine's network settings or stop the machine.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak bisa memulai mesin <b>%1</b> karena antar muka jaringan fisik berikut tidak ditemukan:</p><p><b>%2</b></p><p>Anda bisa mengubah pengaturan jaringan mesin atau menghentikan mesin.</p></translation>
     </message>
     <message>
         <source>Change Network Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ubah Pengaturan Jaringan</translation>
     </message>
     <message>
         <source>Close Virtual Machine</source>
@@ -8558,203 +8856,240 @@
     </message>
     <message>
         <source><p>Cannot start the VirtualBox Manager due to local restrictions.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak dapat menjalankan Manajer karena restriksi lokal.</p><p>Aplikasi akan diakhiri sekarang.</p></translation>
     </message>
     <message>
         <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak dapat menemukan berkas bahasa untuk bahasa <b>%1</b> dalam direktori <b><nobr>%2</nobr></b>.</p><p>Bahasa akan sementara di-reset ke bahasa baku sistem. Silakan ke jendela <b>Preferensi</b> yang dapat Anda buka dari menu <b>Berkas</b> di jendela Manajer VirtualBox , dan pilih satu dari bahasa yang tersedia pada halaman <b>Bahasa</b>.</p></translation>
     </message>
     <message>
         <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak dapat memuat berkas bahasa <b><nobr>%1</nobr></b>. <p>Bahasa akan sementara di-reset pada bahasa Inggris (bawaan). Silakan ke jendela <b>Preferensi</b> yang dapat Anda buka dari menu <b>Berkas</b> di jendela Manajer VirtualBox , dan pilih satu dari bahasa yang tersedia pada halaman <b>Bahasa</b>.</p></translation>
     </message>
     <message>
         <source>There is no virtual machine with the identifier <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidak ada mesin virtual dengan identifier <b>%1</b>.</translation>
     </message>
     <message>
         <source>Ignore</source>
-        <translation type="unfinished">Abaikan</translation>
+        <translation>Abaikan</translation>
     </message>
     <message>
         <source>Failed to create NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gagal menciptakan jaringan NAT.</translation>
     </message>
     <message>
         <source>Failed to remove NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gagal menghapus jaringan NAT <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create DHCP server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gagal menciptakan server DHCP.</translation>
     </message>
     <message>
         <source>Failed to remove DHCP server for network interface <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gagal menghapus server DHCP untuk antar muka jaringan <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create the host network interface.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gagal menciptakan antarmuka jaringan host.</translation>
     </message>
     <message>
         <source>Create &new disk</source>
-        <translation type="unfinished">Ciptakan disk &baru</translation>
+        <translation>Ciptaka&n disk baru</translation>
     </message>
     <message>
         <source>&Choose existing disk</source>
-        <translation type="unfinished">&Pilih disk yang telah ada</translation>
+        <translation>&Pilih disk yang telah ada</translation>
     </message>
     <message>
         <source>Leave &empty</source>
-        <translation type="unfinished">Biarkan &kosong</translation>
+        <translation>Biarkan &kosong</translation>
     </message>
     <message>
         <source>&Choose disk</source>
-        <translation type="unfinished">&Pilih disk</translation>
+        <translation>&Pilih disk</translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Apakah Anda yakin hendak merilis hard disk virtual<nobr><b>%1</b></nobr>?</p><p>Ini akan melepaskannya dari mesin virtual berikut: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual optical disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Apakah Anda yakin hendak merilis disk optik virtual<nobr><b>%1</b></nobr>?</p><p>Ini akan melepaskannya dari mesin virtual berikut: <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual floppy disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Apakah Anda yakin hendak merilis disk floppy virtual<nobr><b>%1</b></nobr>?</p><p>Ini akan melepaskannya dari mesin virtual berikut: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda yakin hendak menghapus hard disk virtual <nobr><b>%1</b></nobr> dari daftar berkas image disk yang dikenal?</p></translation>
     </message>
     <message>
         <source><p>As this hard disk is inaccessible its image file can not be deleted.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Karena hard disk ini tidak dapat diakses, berkas imagenya tak dapat dihapus.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual optical disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda yakin hendak menghapus disk optik virtual <nobr><b>%1</b></nobr> dari daftar berkas image disk yang dikenal?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual floppy disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda yakin hendak menghapus disk floppy virtual <nobr><b>%1</b></nobr> dari daftar berkas image disk yang dikenal?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual optical disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak bisa memasang disk optik virtual <nobr><b>%1</b></nobr> ke dalam mesin <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force insertion of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda hendak memaksa pemasangan disk ini?</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual optical disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak bisa mengeluarkan disk optik virtual <nobr><b>%1</b></nobr> dari mesin <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force ejection of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda hendak memaksa mengeluarkan disk ini?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual floppy disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak bisa memasang disk floppy virtual <nobr><b>%1</b></nobr> ke dalam mesin <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual floppy disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak bisa mengeluarkan disk floppy virtual <nobr><b>%1</b></nobr> dari mesin <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source>Failed to open the hard disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Gagal membuka berkas hard disk <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the optical disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Gagal membuka berkas disk optik <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the floppy disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Gagal membuka berkas disk floppy <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the hard disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Gagal menutup berkas hard disk <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the optical disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Gagal menutup berkas disk optik <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the floppy disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Gagal menutup berkas disk floppy <nobr><b>%2</b></nobr>.</translation>
     </message>
     <message numerus="yes">
         <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
+        <translation>
             <numerusform><p>%n mesin virtual berikut kini dalam keadaan disimpan: <b>%1</b></p><p>Bila Anda meneruskan, keadaan runtime dari mesin yang diekspor akan dibuang. Mesin lain tidak akan diubah.</p></numerusform>
         </translation>
     </message>
     <message>
         <source>Switch</source>
-        <translation type="unfinished">Beralih</translation>
+        <translation>Beralih</translation>
     </message>
     <message>
         <source>Failed to enable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gagal memfungsikan server desktop jarak jauh bagi mesin virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gagal menonaktifkan server desktop jarak jauh bagi mesin virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to enable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gagal memfungsikan penangkapan video bagi mesin virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gagal menonaktifkan penangkapan video bagi mesin virtual <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox Guest Additions</b> disk image file.</p><p>Do you wish to download this disk image file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak bisa menemukan berkas image disk <b>VirtualBox Guest Additions</b>.</p><p>Apakah Anda hendak mengunduh berkas ini dari Internet?</p></translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished">Download</translation>
+        <translation>Unduh</translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox Guest Additions</b> disk image file from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda yakin hendak mengunduh berkas image disk <b>VirtualBox Guest Additions</b> dari <nobr><a href="%1">%1</a></nobr> (ukuran %2 byte)?</p></translation>
     </message>
     <message>
         <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Berkas image disk <b>VirtualBox Guest Additions</b> telah sukses diunduh dari <nobr><a href="%1">%1</a></nobr> tapi tidak dapat disimpan secara lokal sebagai <nobr><b>%2</b>.</nobr></p><p>Harap pilih lokasi lain bagi berkas itu.</p></translation>
+    </message>
+    <message>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual CD/DVD drive?</p></source>
+        <translation type="obsolete"><p>Berkas image disk <b>VirtualBox Guest Additions</b> telah sukses diunduh dari <nobr><a href="%1">%1</a></nobr> dan disimpan secara lokal sebagai <nobr><b>%2</b>.</nobr></p><p>Apakah Anda ingin mendaftarkan berkas image disk ini dan memasangnya pada drive CD/DVD virtual?</p></translation>
+    </message>
+    <message>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no CD/DVD drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <translation type="obsolete"><b>Tak bisa menyisipkan berkas image disk <b>VirtualBox Guest Additions</b> ke dalam mesin virtual <b>%1</b>, karena mesin tak memiliki drive CD/DVD. Silakan tambahkan sebuah drive memakai halaman penyimpanan dari dialog pengaturan mesin virtual.</p></translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Tidak bisa menemukan <b>Manual Pengguna VirtualBox</b> <nobr><b>%1</b>.</nobr></p><p>Apakah Anda hendak mengunduh berkas ini dari Internet?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox User Manual</b> from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda yakin hendak mengunduh <b>Manual Pengguna VirtualBox</b> dari <nobr><a href="%1">%1</a></nobr> (ukuran %2 byte)?</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"><p>Manual Pengguna VirtualBox telah sukses didownload dari <nobr><a href="%1">%2</a></nobr> namu tak dapat disimpan secara lokal sebagai <nobr><b>%3</b>.</nobr></p><p>Silakan pilih lokasi lain bagi file itu.</p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>Manual Pengguna VirtualBox telah sukses diunduh dari <nobr><a href="%1">%1</a></nobr> namun tidak dapat disimpan secara lokal sebagai <nobr><b>%2</b>.</nobr></p><p>Silakan pilih lokasi lain bagi berkas itu.</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p></source>
-        <translation type="unfinished"><p>Manual Pengguna VirtualBox telah sukses didownload dari <nobr><a href="%1">%2</a></nobr> dan disimpan secara lokal sebagai <nobr><b>%3</b>.</nobr></p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>Manual Pengguna VirtualBox telah sukses diunduh dari <nobr><a href="%1">%1</a></nobr> dan disimpan secara lokal sebagai <nobr><b>%2</b>.</nobr></p></translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Tutup</translation>
+        <translation>Tutup</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">Ok</translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Do not show this message again</source>
-        <translation type="unfinished">Jangan tampilkan pesan ini lagi</translation>
+        <translation>Jangan tampilkan pesan ini lagi</translation>
     </message>
     <message>
         <source><p>Do you want to remove the NAT network <nobr><b>%1</b>?</nobr></p><p>If this network is in use by one or more virtual machine network adapters these adapters will no longer be usable until you correct their settings by either choosing a different network name or a different adapter attachment type.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Apakah Anda hendak menghapus jaringan NAT <nobr><b>%1</b>?</nobr></p><p>Bila jaringan ini sedang dipakai oleh adaptor jaringan satu mesin virtual atau lebih, adaptor tersebut tidak akan dapat dipakai lagi sampai Anda memperbaiki pengaturan mereka dengan memilih nama jaringan lain atau tipe pencantolan adaptor yang berbeda.</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete"><p>VirtualBox Guest Addition sepertinya tak tak tersedia pada mesin virtual ini, dan folder shared tak dapat dipakai tanpanya. Untuk memakai shared folder di dalam mesin virtual, silakan install Guest Addition bila belum dipasang, atau install ulang bila tidak bekerja dengan benar, dengan memilih <b>Install Guest Addition</b> dari menu <b>Device</b>. Bila sudah dipasang tapi mesin belum dimulai secara penuh maka shared fo [...]
     </message>
     <message>
         <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Pasang</translation>
     </message>
     <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
-        <translation type="unfinished"></translation>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
+        <translation>Gagal menghubungkan webcam <b>%1</b> ke mesin virtual <b>%2</b>.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
+        <translation>Gagal melepas webcam <b>%1</b> dari mesin virtual <b>%2</b>.</translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
-        <translation type="unfinished"></translation>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <translation><p>Layar virtual saat ini ditata ke mode warna <b>%1&nbsp;bit</b>. Untuk kinerja yang lebih baik silakan mengubah ini menjadi <b>%2&nbsp;bit</b>. Biasanya ini dapat dilakukan dari bagian <b>Tampilan</b> dari Panel Kendali atau Pengaturan Sistem sistem operasi guest.</p></translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
@@ -8769,115 +9104,115 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8941,19 +9276,19 @@
     <name>UIMiniToolBar</name>
     <message>
         <source>Always show the toolbar</source>
-        <translation type="unfinished">Selalu tampilkan toolbar</translation>
+        <translation>Selalu tampilkan bilah alat</translation>
     </message>
     <message>
         <source>Minimize Window</source>
-        <translation type="unfinished">Minimalkan Window</translation>
+        <translation>Minimalkan Jendela</translation>
     </message>
     <message>
         <source>Exit Full Screen or Seamless Mode</source>
-        <translation type="unfinished">Keluar Mode Fullscreen atau Seamless</translation>
+        <translation>Keluar Mode Layar Penuh atau Seamless</translation>
     </message>
     <message>
         <source>Close VM</source>
-        <translation type="unfinished">Tutup VM</translation>
+        <translation>Tutup VM</translation>
     </message>
 </context>
 <context>
@@ -8970,27 +9305,31 @@
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished">&Nama:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Nama:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
-        <translation type="unfinished">Tampilkan nama dari mesin virtual.</translation>
+        <translation>Menyimpan nama dari mesin virtual.</translation>
     </message>
     <message>
         <source>&Type:</source>
-        <translation type="unfinished">&Tipe:</translation>
+        <translation>&Tipe:</translation>
     </message>
     <message>
         <source>Selects the operating system family that you plan to install into this virtual machine.</source>
-        <translation type="unfinished">Tampilkan keluarga sistem operasi yang Anda rencanakan untuk diinstal ke mesin virtual ini.</translation>
+        <translation>Pilih keluarga sistem operasi yang Anda rencanakan untuk dipasang ke mesin virtual ini.</translation>
     </message>
     <message>
         <source>&Version:</source>
-        <translation type="unfinished">&Versi:</translation>
+        <translation>&Versi:</translation>
     </message>
     <message>
         <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+        <translation>Pilih tipe sistem operasi yang Anda rencanakan untuk dipasang ke mesin virtual ini (dikenal sebagai sistem operasi guest).</translation>
+    </message>
+    <message>
+        <source>N&ame:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8998,82 +9337,82 @@
     <name>UINetworkManagerDialog</name>
     <message>
         <source>Network Operations Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Manajer Operasi Jaringan</translation>
     </message>
     <message>
         <source>There are no active network operations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidak ada operasi jaringan yang aktif.</translation>
     </message>
     <message>
         <source>&Cancel All</source>
-        <translation type="unfinished"></translation>
+        <translation>&Batalkan Semua</translation>
     </message>
     <message>
         <source>Cancel all active network operations</source>
-        <translation type="unfinished"></translation>
+        <translation>Batalkan semua operasi jaringan yang aktif</translation>
     </message>
     <message>
         <source>Network Operation</source>
-        <translation type="unfinished"></translation>
+        <translation>Operasi Jaringan</translation>
     </message>
     <message>
         <source>Restart network operation</source>
-        <translation type="unfinished"></translation>
+        <translation>Start ulang operasi jaringan</translation>
     </message>
     <message>
         <source>Cancel network operation</source>
-        <translation type="unfinished"></translation>
+        <translation>Batalkan operasi jaringan</translation>
     </message>
     <message>
         <source>The network operation failed with the following error: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Operasi jaringan gagal dengan kesalahan berikut: %1.</translation>
     </message>
 </context>
 <context>
     <name>UINetworkManagerIndicator</name>
     <message>
         <source>Current network operations:</source>
-        <translation type="unfinished"></translation>
+        <translation>Operasi jaringan saat ini:</translation>
     </message>
     <message>
         <source>failed</source>
         <comment>network operation</comment>
-        <translation type="unfinished"></translation>
+        <translation>gagal</translation>
     </message>
     <message>
         <source>(%1 of %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>(%1 dari %2)</translation>
     </message>
     <message>
         <source>Double-click for more information.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik ganda untuk informasi lebih banyak.</translation>
     </message>
 </context>
 <context>
     <name>UINetworkReplyPrivate</name>
     <message>
         <source>Host not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Host tidak ditemukan</translation>
     </message>
     <message>
         <source>Content access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Akses kontek ditolak</translation>
     </message>
     <message>
         <source>Protocol failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Kegagalan protokol</translation>
     </message>
     <message>
         <source>Wrong SSL certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>Format sertifikat SSL salah</translation>
     </message>
     <message>
         <source>SSL authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Otentikasi SSL gagal</translation>
     </message>
     <message>
         <source>Unknown reason</source>
-        <translation type="unfinished"></translation>
+        <translation>Alasan tidak diketahui</translation>
     </message>
 </context>
 <context>
@@ -9775,7 +10114,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     <name>UIPopupCenter</name>
     <message>
         <source>Click for full details</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik untuk rincian lengkap</translation>
     </message>
 </context>
 <context>
@@ -9893,32 +10232,28 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     <name>UISelectorWindow</name>
     <message>
         <source>Show Toolbar</source>
-        <translation type="unfinished">Tampilkan Toolbar</translation>
+        <translation>Tampilkan Bilah Alat</translation>
     </message>
     <message>
         <source>Show Statusbar</source>
-        <translation type="unfinished">Tampilkan Statusbar</translation>
+        <translation>Tampilkan Bilah Status</translation>
     </message>
     <message>
         <source>Select a virtual machine file</source>
-        <translation type="unfinished">Pilih suatu file mesin virtual</translation>
+        <translation>Pilih suatu berkas mesin virtual</translation>
     </message>
     <message>
         <source>Virtual machine files (%1)</source>
-        <translation type="unfinished">File mesin virtual (%1)</translation>
+        <translation>Berkas mesin virtual (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Selamat datang di VirtualBox!</h3><p>Bagian kiri dari jendela ini ditujukan untuk menampilkan daftar dari semua mesin virtual dalam komputer Anda. Daftar ini saat ini kosong karena Anda belum menciptakan mesin virtual apapun.<img src=:/welcome.png align=right/></p><p>Untuk menciptakan mesin virtual baru, tekan tombol <b>Baru</b> pada toolbar utama yang terletak di bagian atas jendela.</p><p& [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation><h3>Selamat datang di VirtualBox!</h3><p>Bagian kiri dari jendela ini adalah daftar dari semua mesin virtual dalam komputer Anda. Daftar ini saat ini kosong karena Anda belum menciptakan mesin virtual apapun.<img src=:/welcome.png align=right/></p><p>Untuk menciptakan mesin virtual baru, tekan tombol <b>Baru</b> pada bilah alat utama yang terletak di bagian atas jendela.</p><p>Anda dapat menekan tombol <b [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
-        <translation type="unfinished">- Manajer</translation>
-    </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
+        <translation>Manajer</translation>
     </message>
 </context>
 <context>
@@ -9929,14 +10264,14 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Updating Guest Additions</source>
-        <translation type="unfinished"></translation>
+        <translation>Memutakhirkan Guest Additions</translation>
     </message>
 </context>
 <context>
     <name>UISettingsDialog</name>
     <message>
         <source><i>Select a settings category from the list on the left-hand side and move the mouse over a settings item to get more information.</i></source>
-        <translation><i>Pilih kategori setting dari daftar pada sisi kiri dan gerakkan mouse di atas sebuah pilihan setting untuk memperoleh informasi tambahan.</i></translation>
+        <translation><i>Pilih kategori pengaturan dari daftar pada sisi kiri dan gerakkan tetikus di atas sebuah butir pengaturan untuk memperoleh informasi tambahan.</i></translation>
     </message>
     <message>
         <source>On the <b>%1</b> page, %2</source>
@@ -9944,7 +10279,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Invalid settings detected</source>
-        <translation>Setting yang tidak valid terdeteksi</translation>
+        <translation>Pengaturan yang tidak valid terdeteksi</translation>
     </message>
     <message>
         <source>Non-optimal settings detected</source>
@@ -9952,15 +10287,15 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Settings</source>
-        <translation type="obsolete">Setting</translation>
+        <translation type="obsolete">Pengaturan</translation>
     </message>
     <message>
         <source><b>%1</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation>Halaman <b>%1</b>:</translation>
     </message>
     <message>
         <source><b>%1: %2</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation>Halaman <b>%1: %2</b>:</translation>
     </message>
 </context>
 <context>
@@ -9975,7 +10310,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Update</source>
-        <translation>Update</translation>
+        <translation>Pemutakhiran</translation>
     </message>
     <message>
         <source>Language</source>
@@ -10003,7 +10338,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Tampilan</translation>
     </message>
     <message>
         <source>Preferences</source>
@@ -10022,7 +10357,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Display</source>
-        <translation>Display</translation>
+        <translation>Tampilan</translation>
     </message>
     <message>
         <source>Storage</source>
@@ -10054,7 +10389,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Shared Folders</source>
-        <translation>Folder yang di Share</translation>
+        <translation>Folder Bersama</translation>
     </message>
     <message>
         <source>%1 - %2</source>
@@ -10066,7 +10401,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Setting</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -10083,6 +10418,10 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Tutup</translation>
     </message>
@@ -10090,16 +10429,12 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
-        <translation>Edit teks</translation>
+        <translation>Sunting teks</translation>
     </message>
     <message>
         <source>&Replace...</source>
@@ -10107,7 +10442,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Replaces the current text with the content of a file.</source>
-        <translation>Ganti teks sekarang dengan isi dari suatu file.</translation>
+        <translation>Ganti teks sekarang dengan isi dari suatu berkas.</translation>
     </message>
     <message>
         <source>Text (*.txt);;All (*.*)</source>
@@ -10115,7 +10450,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Select a file to open...</source>
-        <translation>Pilih sebuah file untuk dibuka...</translation>
+        <translation>Pilih sebuah berkas untuk dibuka...</translation>
     </message>
 </context>
 <context>
@@ -10185,7 +10520,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     <name>UIUpdateStepVirtualBox</name>
     <message>
         <source>Checking for a new VirtualBox version...</source>
-        <translation type="unfinished"></translation>
+        <translation>Memeriksa versi baru VirtualBox...</translation>
     </message>
 </context>
 <context>
@@ -10200,7 +10535,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source><p>Saves the current execution state of the virtual machine to the physical hard disk of the host PC.</p><p>Next time this machine is started, it will be restored from the saved state and continue execution from the same place you saved it at, which will let you continue your work immediately.</p><p>Note that saving the machine state may take a long time, depending on the guest operating system type and the amount of memory you assigned to th [...]
-        <translation><p>Menyimpan keadaan eksekusi mesin virtual pada hard disk fisik dari PC host.</p><p>Saat waktu berikutnya mesin ini dinyalakan, akan dikembalikan dari keadaan yang tersimpan dan melanjutkan eksekusi dari tempat dimana Anda menyimpannya, yang akan memungkinkan Anda melanjutkan pekerjaan Anda seketika.</p><p>Perhatikan bahwa menyimpan keadaan mesin dapat membutuhkan waktu lama, bergantung pada tipe sistem operasi guest dan banyaknya memor [...]
+        <translation><p>Menyimpan keadaan eksekusi mesin virtual pada hard disk fisik dari PC host.</p><p>Saat berikutnya mesin ini dinyalakan, akan dikembalikan dari keadaan yang tersimpan dan melanjutkan eksekusi dari tempat dimana Anda menyimpannya, yang akan memungkinkan Anda melanjutkan pekerjaan Anda seketika.</p><p>Perhatikan bahwa menyimpan keadaan mesin dapat membutuhkan waktu lama, bergantung pada tipe sistem operasi guest dan banyaknya memori yang [...]
     </message>
     <message>
         <source>&Save the machine state</source>
@@ -10232,7 +10567,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>&Restore current snapshot '%1'</source>
-        <translation>&Kembali pada snapshot saat ini '%1'</translation>
+        <translation>&Pulihkan snapshot saat ini '%1'</translation>
     </message>
     <message>
         <source>&Continue running in the background</source>
@@ -10257,162 +10592,99 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
 <context>
     <name>UIVMInfoDialog</name>
     <message>
-        <source>Session Information Dialog</source>
-        <translation type="obsolete">Dialog Informasi Sesi</translation>
-    </message>
-    <message>
-        <source>&Close</source>
-        <translation type="obsolete">&Tutup</translation>
-    </message>
-    <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Informasi Sesi</translation>
-    </message>
-    <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Detail</translation>
-    </message>
-    <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">&Runtime</translation>
-    </message>
-    <message>
-        <source>DMA Transfers</source>
-        <translation>Transfer DMA</translation>
-    </message>
-    <message>
-        <source>PIO Transfers</source>
-        <translation>Transfer PIO</translation>
-    </message>
-    <message>
-        <source>Data Read</source>
-        <translation>Data Terbaca</translation>
-    </message>
-    <message>
-        <source>Data Written</source>
-        <translation>Data Tertulis</translation>
-    </message>
-    <message>
-        <source>Data Transmitted</source>
-        <translation>Data Terkirim</translation>
-    </message>
-    <message>
-        <source>Data Received</source>
-        <translation>Data Diterima</translation>
+        <translation type="unfinished">%1 - Informasi Sesi</translation>
     </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Menyala</translation>
+    <message>
+        <source>Configuration &Details</source>
+        <translation type="unfinished">&Rincian Konfigurasi</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Mati</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished">Informasi &Runtime</translation>
     </message>
     <message>
-        <source>Runtime Attributes</source>
-        <translation>Atribut Runtime</translation>
+        <source>DMA Transfers</source>
+        <translation type="unfinished">Transfer DMA</translation>
     </message>
     <message>
-        <source>Screen Resolution</source>
-        <translation>Resolusi Layar</translation>
+        <source>PIO Transfers</source>
+        <translation type="unfinished">Transfer PIO</translation>
     </message>
     <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">Statistik CD/DVD</translation>
+        <source>Data Read</source>
+        <translation type="unfinished">Data Terbaca</translation>
     </message>
     <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Statistik Adapter Jaringan</translation>
+        <source>Data Written</source>
+        <translation type="unfinished">Data Tertulis</translation>
     </message>
     <message>
-        <source>Not attached</source>
-        <translation type="obsolete">Tidak terpasang</translation>
+        <source>Data Transmitted</source>
+        <translation type="unfinished">Data Terkirim</translation>
     </message>
     <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Versi %1.%2</translation>
+        <source>Data Received</source>
+        <translation type="unfinished">Data Diterima</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Tidak Terdeteksi</translation>
+        <translation type="unfinished">Tidak Terdeteksi</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Tidak Terdeteksi</translation>
+        <translation type="unfinished">Tidak Terdeteksi</translation>
     </message>
     <message>
-        <source>Guest Additions</source>
-        <translation>Guest Additions</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Tidak Tersedia</translation>
     </message>
     <message>
-        <source>Guest OS Type</source>
-        <translation>Tipe Sistem Operasi Guest</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Atribut Runtime</translation>
     </message>
     <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Statistik Hard Disk</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Resolusi Layar</translation>
     </message>
     <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Tidak Ada Hard Disk</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Network Adapters</source>
-        <translation>Tidak Ada Adapter Jaringan</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished">Mode Papan Klip</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Menyala</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Mati</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Guest Additions</translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Tipe OS Guest</translation>
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation>Statistik Penyimpanan</translation>
+        <translation type="unfinished">Statistik Penyimpanan</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
-        <translation>Tidak Ada Device Penyimpanan</translation>
+        <translation type="unfinished">Tidak Ada Perangkat Penyimpanan</translation>
     </message>
     <message>
         <source>Network Statistics</source>
-        <translation>Statistik Jaringan</translation>
-    </message>
-    <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>Tidak Tersedia</translation>
-    </message>
-    <message>
-        <source>Clipboard Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Statistik Jaringan</translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Tidak Ada Adaptor Jaringan</translation>
     </message>
 </context>
 <context>
@@ -10468,67 +10740,67 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     <name>UIVMLogViewer</name>
     <message>
         <source>Close the search panel</source>
-        <translation type="unfinished">Tutup panel pencarian</translation>
+        <translation>Tutup panel pencarian</translation>
     </message>
     <message>
         <source>&Find</source>
-        <translation type="unfinished">&Cari </translation>
+        <translation>&Cari</translation>
     </message>
     <message>
         <source>Enter a search string here</source>
-        <translation type="unfinished">Masukkan string pencarian disini</translation>
+        <translation>Masukkan string pencarian di sini</translation>
     </message>
     <message>
         <source>&Previous</source>
-        <translation type="unfinished">&Sebelumnya</translation>
+        <translation>&Sebelumnya</translation>
     </message>
     <message>
         <source>Search for the previous occurrence of the string</source>
-        <translation type="unfinished">Cari dari string kejadian sebelumnya</translation>
+        <translation>Cari kemunculan string sebelumnya</translation>
     </message>
     <message>
         <source>&Next</source>
-        <translation type="unfinished">La&njut</translation>
+        <translation>Sela&njutnya</translation>
     </message>
     <message>
         <source>Search for the next occurrence of the string</source>
-        <translation type="unfinished">Caru dari string kejadian berikutnya</translation>
+        <translation>Cari kemunculan string selanjutnya</translation>
     </message>
     <message>
         <source>C&ase Sensitive</source>
-        <translation type="unfinished">C&ase Sensitive</translation>
+        <translation>Bed&akan Huruf Besar Kecil</translation>
     </message>
     <message>
         <source>Perform case sensitive search (when checked)</source>
-        <translation type="unfinished">Lakukan pencarian secara case sensitive (bila dipilih)</translation>
+        <translation>Lakukan pencarian yang membedakan huruf besar kecil (bila dipilih)</translation>
     </message>
     <message>
         <source>String not found</source>
-        <translation type="unfinished">String tidak ditemukan</translation>
+        <translation>String tidak ditemukan</translation>
     </message>
     <message>
         <source><p>No log files found. Press the <b>Refresh</b> button to rescan the log folder <nobr><b>%1</b></nobr>.</p></source>
-        <translation type="unfinished"><p>Tidak ada file log ditemukan. Tekan tombol <b>Refresh</b> untuk me-rescan folder log <nobr><b>%1</b></nobr>.</p></translation>
+        <translation><p>Tidak ada file log yang ditemukan. Tekan tombol <b>Segarkan</b> untuk memindai ulang folder log <nobr><b>%1</b></nobr>.</p></translation>
     </message>
     <message>
         <source>Save VirtualBox Log As</source>
-        <translation type="unfinished">Simpan Log VirtualBox Sebagai</translation>
+        <translation>Simpan Log VirtualBox Sebagai</translation>
     </message>
     <message>
         <source>%1 - VirtualBox Log Viewer</source>
-        <translation type="unfinished">%1 -Viewer Log VirtualBox</translation>
+        <translation>%1 -Penilik Log VirtualBox</translation>
     </message>
     <message>
         <source>&Refresh</source>
-        <translation type="unfinished">&Refresh</translation>
+        <translation>Sega&rkan</translation>
     </message>
     <message>
         <source>&Save</source>
-        <translation type="unfinished">&Simpan</translation>
+        <translation>&Simpan</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Tutup</translation>
+        <translation>Tutup</translation>
     </message>
 </context>
 <context>
@@ -10565,6 +10837,14 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
 <context>
     <name>UIWizard</name>
     <message>
+        <source>Hide Description</source>
+        <translation type="obsolete">Sembunyikan Deskripsi</translation>
+    </message>
+    <message>
+        <source>Show Description</source>
+        <translation type="obsolete">Tampilkan Deskripsi</translation>
+    </message>
+    <message>
         <source>&Expert Mode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10584,25 +10864,97 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
 <context>
     <name>UIWizardCloneVD</name>
     <message>
+        <source>Copy Virtual Hard Drive</source>
+        <translation type="obsolete">Salin Hard Disk Virtual</translation>
+    </message>
+    <message>
         <source>Copy</source>
-        <translation type="unfinished">Salin</translation>
+        <translation>Salin</translation>
+    </message>
+    <message>
+        <source>Hard drive to copy</source>
+        <translation type="obsolete">Hard disk yang akan disalin</translation>
+    </message>
+    <message>
+        <source><p>Please select the virtual hard drive file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
+        <translation type="obsolete"><p>Silakan pilih berkas hard disk virtual yang ingin Anda salin bila belum dipilih. Anda dapat memilih dari daftar atau memakai ikon folder di samping daftar untuk memilih salah satu.</p></translation>
+    </message>
+    <message>
+        <source>Choose a virtual hard drive file to copy...</source>
+        <translation type="obsolete">Pilih file hard disk virtual yang akan disalin...</translation>
+    </message>
+    <message>
+        <source>Hard drive file type</source>
+        <translation type="obsolete">Tipe file hard disk</translation>
+    </message>
+    <message>
+        <source>Please choose the type of file that you would like to use for the new virtual hard drive. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
+        <translation type="obsolete">Silakan pilih tipe berkas yang ingin Anda pakai untuk hard disk virtual baru. Bila Anda tak perlu memakainya dengan perangkat lunak virtualisasi lain Anda dapat membiarkan setting ini tak diubah.</translation>
+    </message>
+    <message>
+        <source>Storage on physical hard drive</source>
+        <translation type="obsolete">Penyimpanan pada hard disk fisik</translation>
+    </message>
+    <message>
+        <source>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
+        <translation type="obsolete">Silakan pilih apakah berkas hard disk virtual baru mesti berkembang ketika dipakai (dialokasikan secara dinamik) atau mesti diciptakan pada ukuran maksimumnya (ukuran tetap).</translation>
+    </message>
+    <message>
+        <source><p>A <b>dynamically allocated</b> hard drive file will only use space on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
+        <translation type="obsolete"><p>Berkas hard disk virtual <b>yang dialokasikan secara dinamik</b> hanya akan memakai ruang pada hard disk fisik Anda ketika terisi (sampai dengan suatu <b>ukuran tetap</b> maksimum), walaupun mereka tak akan mengecil lagi secara otomatis ketika ruang di dalamnya dibebaskan.</p></translation>
+    </message>
+    <message>
+        <source><p>A <b>fixed size</b> hard drive file may take longer to create on some systems but is often faster to use.</p></source>
+        <translation type="obsolete"><p>Berkas hard disk virtual <b>ukuran tetap</b> mungkin makan waktu lebih lama untuk diciptakan pada beberapa sistem tapi seringkali lebih cepat dipakainya.</p></translation>
+    </message>
+    <message>
+        <source><p>You can also choose to <b>split</b> the hard drive file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
+        <translation type="obsolete"><p>Anda juga dapat memilih untuk <b>memecah</b> berkas hard disk virtual ke dalam beberapa berkas yang masing-masing berukuran sampai dengan dua giga byte. Ini terutama berguna bila Anda hendak menyimpan mesin virtual pada perangkat USB lepas pasang atau sistem lama, yang mungkin tak bisa menangani berkas sangat besar.</translation>
     </message>
     <message>
         <source>&Dynamically allocated</source>
-        <translation type="unfinished">&Dialokasikan secara dinamis</translation>
+        <translation>&Dialokasikan secara dinamis</translation>
     </message>
     <message>
         <source>&Fixed size</source>
-        <translation type="unfinished">Ukuran &tetap</translation>
+        <translation>Ukuran &tetap</translation>
     </message>
     <message>
         <source>&Split into files of less than 2GB</source>
-        <translation type="unfinished">&Pecah ke dalam file kurang dari 2GB</translation>
+        <translation>&Pecah ke dalam file kurang dari 2GB</translation>
+    </message>
+    <message>
+        <source>Please choose a location for new virtual hard drive file</source>
+        <translation type="obsolete">Silakah pilih lokasi untuk berkas hard disk virtual baru</translation>
+    </message>
+    <message>
+        <source>New hard drive to create</source>
+        <translation type="obsolete">Hard disk baru yang akan dibuat</translation>
+    </message>
+    <message>
+        <source>Please type the name of the new virtual hard drive file into the box below or click on the folder icon to select a different folder to create the file in.</source>
+        <translation type="obsolete">Silakan ketik nama berkas hard disk virtual baru ke kotak di bawah atau klik pada ikon folder untuk memilih folder lain tempat mencipta berkas.</translation>
+    </message>
+    <message>
+        <source>Choose a location for new virtual hard drive file...</source>
+        <translation type="obsolete">Pilih lokasi untuk berkas hard disk virtual baru...</translation>
     </message>
     <message>
         <source>%1_copy</source>
         <comment>copied virtual hard drive name</comment>
-        <translation type="unfinished">salinan_%1</translation>
+        <translation>salinan_%1</translation>
+    </message>
+    <message>
+        <source>Hard drive to &copy</source>
+        <translation type="obsolete">Hard disk yang akan di&salin</translation>
+    </message>
+    <message>
+        <source>&New hard drive to create</source>
+        <translation type="obsolete">Hard disk baru yang aka&n dibuat</translation>
+    </message>
+    <message>
+        <source>Hard drive file &type</source>
+        <translation type="obsolete">&Tipe berkas hard disk</translation>
     </message>
     <message>
         <source>Copy Virtual Hard Disk</source>
@@ -10681,95 +11033,99 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     <name>UIWizardCloneVM</name>
     <message>
         <source>Linked Base for %1 and %2</source>
-        <translation type="unfinished">Basis Tertaut bagi %1 dan %2</translation>
+        <translation>Basis Tertaut bagi %1 dan %2</translation>
     </message>
     <message>
         <source>Clone Virtual Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Buat Klon Mesin Virtual</translation>
     </message>
     <message>
         <source>Clone</source>
-        <translation type="unfinished">Klon</translation>
+        <translation>Klon</translation>
     </message>
     <message>
         <source>%1 Clone</source>
-        <translation type="unfinished">Klon %1</translation>
+        <translation>Klon %1</translation>
     </message>
     <message>
         <source>New machine name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nama mesin baru</translation>
     </message>
     <message>
         <source><p>Please choose a name for the new virtual machine. The new machine will be a clone of the machine <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Harap pilih suatu nama bagi mesin virtual baru. Mesin baru akan berupa klon dari mesin <b>%1</b>.</p></translation>
     </message>
     <message>
         <source>When checked a new unique MAC address will be assigned to all configured network cards.</source>
-        <translation type="unfinished">Saat ditandai, suatu alamat MAC unik yang baru akan diberikan ke semua kartu jaringan yang terkonfigurasi.</translation>
+        <translation>Saat ditandai, suatu alamat MAC unik yang baru akan diberikan ke semua kartu jaringan yang terkonfigurasi.</translation>
     </message>
     <message>
         <source>&Reinitialize the MAC address of all network cards</source>
-        <translation type="unfinished"></translation>
+        <translation>Inisialisasi ulang alamat MAC dari semua kartu ja&ringan</translation>
     </message>
     <message>
         <source>Clone type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipe klon</translation>
+    </message>
+    <message>
+        <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard drive files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard drive files will be tied to the virtual hard drive files of original machine and you will not be able to move the new virtual machi [...]
+        <translation type="obsolete"><p>Harap pilih tipe klon yang hendak Anda buat.</p><p>Bila Anda memilih <b>Klon penuh</b>, suatu salinan eksak (termasuk semua berkas hard disk virtual) dari mesin virtual asli akan dibuat.</p><p>Bila Anda memilih <b>Klon tertaut</b>, suatu mesin baru akan dibuat, tapi berkas hard disk virtual akan diikatkan ke berkas hard disk virtual mesin yang asli, dan Anda tidak akan bisa memindah mesin virtua [...]
     </message>
     <message>
         <source><p>If you create a <b>Linked clone</b> then a new snapshot will be created in the original virtual machine as part of the cloning process.</p></source>
-        <translation type="unfinished"></translation>
+        <translation>Bila Anda memilih <b>Klon tertaut</b> maka suatu snapshot baru akan dibuat dalam mesin virtual asli sebagai bagian dari proses kloning.</p></translation>
     </message>
     <message>
         <source>&Full clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Klon penuh</translation>
     </message>
     <message>
         <source>&Linked clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Klon &tertaut</translation>
     </message>
     <message>
         <source>Snapshots</source>
-        <translation type="unfinished"></translation>
+        <translation>Snapshot</translation>
     </message>
     <message>
         <source><p>Please choose which parts of the snapshot tree should be cloned with the machine.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Silakan pilih bagian mana dari pohon snapshot yang mesti diklon dengan mesin.</p></translation>
     </message>
     <message>
         <source><p>If you choose <b>Current machine state</b>, the new machine will reflect the current state of the original machine and will have no snapshots.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Bila Anda memilih <b>Keadaan mesin kini</b>, mesin baru akan mencerminkan keadaan sekarang dari mesin asli dan tidak akan memiliki snapshot.</p></translation>
     </message>
     <message>
         <source><p>If you choose <b>Current snapshot tree branch</b>, the new machine will reflect the current state of the original machine and will have matching snapshots for all snapshots in the tree branch starting at the current state in the original machine.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Bila Anda memilih <b>Cabang pohon snapshot saat ini</b>, mesin baru akan mencerminkan keadaan sekarang dari mesin asli dan akan memiliki snapshot yang cocok bagi semua snapshot dalam cabang pohon yang dimulai dari keadaan sekarang dalam mesin asli.</p></translation>
     </message>
     <message>
         <source><p>If you choose <b>Everything</b>, the new machine will reflect the current state of the original machine and will have matching snapshots for all snapshots in the original machine.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Bila Anda memilih <b>Semuanya</b>, mesin baru akan mencerminkan keadaan sekarang dari mesin asli dan dan akan memiliki snapshot yang cocok bagi semua snapshot dalam mesin asli.</p></translation>
     </message>
     <message>
         <source>Current &machine state</source>
-        <translation type="unfinished"></translation>
+        <translation>Keadaan &mesin kini</translation>
     </message>
     <message>
         <source>Current &snapshot tree branch</source>
-        <translation type="unfinished"></translation>
+        <translation>Cabang pohon &snapshot saat ini</translation>
     </message>
     <message>
         <source>&Everything</source>
-        <translation type="unfinished"></translation>
+        <translation>S&emuanya</translation>
     </message>
     <message>
         <source>New machine &name</source>
-        <translation type="unfinished"></translation>
+        <translation>&Nama mesin baru</translation>
     </message>
     <message>
         <source>&Full Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>Klon &Penuh</translation>
     </message>
     <message>
         <source>&Linked Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>K&lon Tertaut</translation>
     </message>
     <message>
         <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
@@ -10780,95 +11136,95 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     <name>UIWizardExportApp</name>
     <message>
         <source>Checking files ...</source>
-        <translation type="unfinished">Memeriksa file ...</translation>
+        <translation>Memeriksa berkas ...</translation>
     </message>
     <message>
         <source>Removing files ...</source>
-        <translation type="unfinished">Menghapus file ...</translation>
+        <translation>Menghapus berkas ...</translation>
     </message>
     <message>
         <source>Exporting Appliance ...</source>
-        <translation type="unfinished">Mengekspor Appliance ...</translation>
+        <translation>Mengekspor Appliance ...</translation>
     </message>
     <message>
         <source>Export Virtual Appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>Ekspor Appliance Virtual</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
-        <translation type="unfinished">Kembalikan Default</translation>
+        <translation>Pulihkan Baku</translation>
     </message>
     <message>
         <source>Export</source>
-        <translation type="unfinished">Ekspor</translation>
+        <translation>Ekspor</translation>
     </message>
     <message>
         <source>Virtual machines to export</source>
-        <translation type="unfinished"></translation>
+        <translation>Mesin virtual yang akan diekspor</translation>
     </message>
     <message>
         <source><p>Please select the virtual machines that should be added to the appliance. You can select more than one. Please note that these machines have to be turned off before they can be exported.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Silakan pilih mesin virtual yang mesti ditambahkan ke appliance. Anda dapat memilih lebih dari satu. Perhatikan bahwa mesin-mesin ini mesti dimatikan sebelum dapat diekspor.</p></translation>
     </message>
     <message>
         <source>Appliance settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Pengaturan appliance</translation>
     </message>
     <message>
         <source>Please choose where to create the virtual appliance. You can create it on your own computer, on the Sun Cloud service or on an S3 storage server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Silakan pilih di mana membuat appliance virtual. Anda dapat membuatnya pada komputer Anda sendiri, pada layanan Sun Cloud, atau pada server penyimpanan S3.</translation>
     </message>
     <message>
         <source>Create on</source>
-        <translation type="unfinished"></translation>
+        <translation>Dibuat pada</translation>
     </message>
     <message>
         <source>&This computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Kompu&ter ini</translation>
     </message>
     <message>
         <source>Sun &Cloud</source>
-        <translation type="unfinished">&Cloud Sun</translation>
+        <translation>&Cloud Sun</translation>
     </message>
     <message>
         <source>&Simple Storage System (S3)</source>
-        <translation type="unfinished">&Simple Storage System (S3)</translation>
+        <translation>&Simple Storage System (S3)</translation>
     </message>
     <message>
         <source>Appliance</source>
-        <translation type="unfinished">Appliance</translation>
+        <translation>Appliance</translation>
     </message>
     <message>
         <source>&Username:</source>
-        <translation type="unfinished">Nama pengg&una:</translation>
+        <translation>Nama pengg&una:</translation>
     </message>
     <message>
         <source>&Password:</source>
-        <translation type="unfinished">&Password:</translation>
+        <translation>&Password:</translation>
     </message>
     <message>
         <source>&Hostname:</source>
-        <translation type="unfinished">Nama &host:</translation>
+        <translation>Nama &host:</translation>
     </message>
     <message>
         <source>&Bucket:</source>
-        <translation type="unfinished">&Bucket:</translation>
+        <translation>&Bucket:</translation>
     </message>
     <message>
         <source>&File:</source>
-        <translation type="unfinished">&File:</translation>
+        <translation>&Berkas:</translation>
     </message>
     <message>
         <source>Open Virtualization Format Archive (%1)</source>
-        <translation type="unfinished">Arsip Open Virtualization Format (%1)</translation>
+        <translation>Arsip Open Virtualization Format (%1)</translation>
     </message>
     <message>
         <source>Open Virtualization Format (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Open Virtualization Format (%1)</translation>
     </message>
     <message>
         <source>Write in legacy OVF 0.9 format for compatibility with other virtualization products.</source>
-        <translation type="unfinished">Tulis dalam format legacy OVF 0.9 untuk kompatibilitas dengan produk virtualisasi lain.</translation>
+        <translation>Tulis dalam format legacy OVF 0.9 untuk kompatibilitas dengan produk virtualisasi lain.</translation>
     </message>
     <message>
         <source>&Write legacy OVF 0.9</source>
@@ -10876,135 +11232,135 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Create a Manifest file for automatic data integrity checks on import.</source>
-        <translation type="unfinished">Buat file Manifest untuk pemeriksaan integritas data otomatis saat impor.</translation>
+        <translation>Buat berkas Manifest untuk pemeriksaan integritas data otomatis saat impor.</translation>
     </message>
     <message>
         <source>Write &Manifest file</source>
-        <translation type="unfinished">Tulis file &Manifest</translation>
+        <translation>Tulis berkas &Manifest</translation>
     </message>
     <message>
         <source>This is the descriptive information which will be added to the virtual appliance.  You can change it by double clicking on individual lines.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ini adalah informasi deskriptif yang akan ditambahkan ke appliance virtual. Anda dapat mengubahnya dengan klik ganda pada baris individu.</translation>
     </message>
     <message>
         <source>Virtual &machines to export</source>
-        <translation type="unfinished"></translation>
+        <translation>&Mesin virtual yang akan diekspor</translation>
     </message>
     <message>
         <source>Appliance &settings</source>
-        <translation type="unfinished"></translation>
+        <translation>&Pengaturan appliance</translation>
     </message>
     <message>
         <source>&Destination</source>
-        <translation type="unfinished"></translation>
+        <translation>&Tujuan</translation>
     </message>
     <message>
         <source>&Local Filesystem </source>
-        <translation type="unfinished">Sistem File &Lokal</translation>
+        <translation>Sistem Berkas &Lokal</translation>
     </message>
     <message>
         <source>Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Pengaturan penyimpanan</translation>
     </message>
     <message>
         <source>Please choose a file to export the virtual appliance to</source>
-        <translation type="unfinished"></translation>
+        <translation>Pilih berkas tujuan ekspor appliance virtual</translation>
     </message>
     <message>
         <source>F&ormat:</source>
-        <translation type="unfinished"></translation>
+        <translation>F&ormat:</translation>
     </message>
     <message>
         <source>OVF 0.9</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 0.9</translation>
     </message>
     <message>
         <source>OVF 1.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 1.0</translation>
     </message>
     <message>
         <source>OVF 2.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 2.0</translation>
     </message>
     <message>
         <source>Write in standard OVF 1.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tulis dalam format standar OVF 1.0.</translation>
     </message>
     <message>
         <source>Write in new experimental OVF 2.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tulis dalam format eksperimen OVF 2.0.</translation>
     </message>
     <message>
         <source>&Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>&Pengaturan penyimpanan</translation>
     </message>
 </context>
 <context>
     <name>UIWizardExportAppPageBasic3</name>
     <message>
         <source><p>Please choose a filename to export the OVF/OVA to.</p><p>If you use an <i>ova</i> extension, then all the files will be combined into one Open Virtualization Format Archive.</p><p>If you use an <i>ovf</i> extension, several files will be written separately.</p><p>Other extensions are not allowed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Harap pilih suatu nama berkas tujuan ekspor OVF/OVA.</p><p>Bila Anda memakai ekstensi <i>ova</i>, maka semua berkas akan digabung ke dalam satu Open Virtualization Format Archive.</p><p>Jika Anda memakai ekstensi <i>ovf</i>, beberapa berkas akan ditulis secara terpisah.</p><p>Ekstensi lain tak diijinkan.</p></translation>
     </message>
     <message>
         <source>Please complete the additional fields like the username, password and the bucket, and provide a filename for the OVF target.</source>
-        <translation type="unfinished">Silakan lengkapi field tambahan seperti nama pengguna, password, dan bucket, dan berikan nama file bagi target OVF.</translation>
+        <translation>Silakan lengkapi field tambahan seperti nama pengguna, sandi, serta buket, dan berikan nama berkas bagi target OVF.</translation>
     </message>
     <message>
         <source>Please complete the additional fields like the username, password, hostname and the bucket, and provide a filename for the OVF target.</source>
-        <translation type="unfinished">Silakan lengkapi field tambahan seperti nama pengguna, password, nama host, dan bucket, dan berikan nama file bagi target OVF.</translation>
+        <translation>Silakan lengkapi field tambahan seperti nama pengguna, sandi, nama host, serta buket, dan berikan nama berkas bagi target OVF.</translation>
     </message>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pilih berkas tujuan ekspor appliance virtual...</translation>
     </message>
 </context>
 <context>
     <name>UIWizardExportAppPageExpert</name>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pilih file tujuan ekspor appliance virtual...</translation>
     </message>
 </context>
 <context>
     <name>UIWizardFirstRun</name>
     <message>
         <source>Select start-up disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Pilih disk awal mula</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished">Mulai</translation>
+        <translation>Mulai</translation>
     </message>
     <message>
         <source><p>Please select a virtual optical disk file or a physical optical drive containing a disk to start your new virtual machine from.</p><p>The disk should be suitable for starting a computer from and should contain the operating system you wish to install on the virtual machine if you want to do that now. The disk will be ejected from the virtual drive automatically next time you switch the virtual machine off, but you can also do this yourself if needed u [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Harap pilih berkas disk optik virtual atau drive optik fisik yang memuat suatu disk tempat asal memulai mesin virtual Anda.</p><p>Disk mesti cocok untuk memulai suatu komputer dan mesti memuat sistem operasi yang ingin Anda pasang ke mesin virtual bila Anda ingin melakukannya sekarang. Disk mesti dikeluarkan dari drive virtual secara otomatis kali berikutnya Anda mematikan mesin virtual, tapi Anda juga dapat melakukan ini sendiri bila diperlukan  [...]
     </message>
     <message>
         <source><p>Please select a virtual optical disk file or a physical optical drive containing a disk to start your new virtual machine from.</p><p>The disk should be suitable for starting a computer from. As this virtual machine has no hard drive you will not be able to install an operating system on it at the moment.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Harap pilih berkas disk optik virtual atau drive optik fisik yang memuat suatu disk tempat asal memulai mesin virtual Anda.</p><p>Disk mesti cocok untuk memulai suatu komputer. Karena mesin virtual ini tak memiliki hard disk Anda tidak akan bisa memasang sistem operasi padanya saat ini.</p></translation>
     </message>
     <message>
         <source>Choose a virtual optical disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pilih berkas disk optik virtual...</translation>
     </message>
 </context>
 <context>
     <name>UIWizardImportApp</name>
     <message>
         <source>Restore Defaults</source>
-        <translation type="unfinished">Kembalikan Default</translation>
+        <translation>Pulihkan Baku</translation>
     </message>
     <message>
         <source>Import</source>
-        <translation type="unfinished">Impor</translation>
+        <translation>Impor</translation>
     </message>
     <message>
         <source>Appliance to import</source>
-        <translation type="unfinished"></translation>
+        <translation>Appliance yang akan diimpor</translation>
     </message>
     <message>
         <source><p>VirtualBox currently supports importing appliances saved in the Open Virtualization Format (OVF). To continue, select the file to import below.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>VirtualBox saat ini mendukung pengimporan appliance yang disimpan dalam Open Virtualization Format (OVF). Untuk melanjutkan, pilih berkas yang hendak diimpor di bawah.</p></translation>
     </message>
     <message>
         <source>Select an appliance to import</source>
@@ -11012,62 +11368,110 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Open Virtualization Format (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Open Virtualization Format (%1)</translation>
     </message>
     <message>
         <source>Appliance settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Pengaturan appliance</translation>
     </message>
     <message>
         <source>These are the virtual machines contained in the appliance and the suggested settings of the imported VirtualBox machines. You can change many of the properties shown by double-clicking on the items and disable others using the check boxes below.</source>
-        <translation type="unfinished">Ini adalah mesin virtual yang dimuat di dalam appliance dan tatanan yang disarankan dari mesin VirtualBox yang diimpor. Anda dapat mengubah berbagai properti yang ditampilkan dengan melakukan klik ganda pada butir dan mematikan lainnya dengan memakai check box di bawah.</translation>
+        <translation>Ini adalah mesin virtual yang dimuat di dalam appliance dan tatanan yang disarankan dari mesin VirtualBox yang diimpor. Anda dapat mengubah berbagai properti yang ditampilkan dengan melakukan klik ganda pada butir dan mematikan lainnya dengan memakai kotak contreng di bawah.</translation>
     </message>
     <message>
         <source>Import Virtual Appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>Impor Appliance Virtual</translation>
     </message>
     <message>
         <source>Choose a virtual appliance file to import...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pilih berkas appliance virtual yang hendak diimpor...</translation>
     </message>
     <message>
         <source>Please choose a virtual appliance file to import</source>
-        <translation type="unfinished"></translation>
+        <translation>Harap pilih suatu berkas appliance virtual yang akan diimpor</translation>
     </message>
 </context>
 <context>
     <name>UIWizardNewVD</name>
     <message>
+        <source>Create Virtual Hard Drive</source>
+        <translation type="obsolete">Buat Hard Disk Virtual</translation>
+    </message>
+    <message>
         <source>Create</source>
-        <translation type="unfinished">Buat</translation>
+        <translation>Buat</translation>
+    </message>
+    <message>
+        <source>Hard drive file type</source>
+        <translation type="obsolete">Tipe berkas hard disk</translation>
+    </message>
+    <message>
+        <source>Please choose the type of file that you would like to use for the new virtual hard drive. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
+        <translation type="obsolete">Silakan pilih tipe berkas yang ingin Anda pakai untuk hard disk virtual baru. Bila Anda tak perlu memakainya dengan perangkat lunak virtualisasi lain Anda dapat membiarkan setting ini tak diubah.</translation>
+    </message>
+    <message>
+        <source>Storage on physical hard drive</source>
+        <translation type="obsolete">Penyimpanan pada hard disk fisik</translation>
+    </message>
+    <message>
+        <source>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
+        <translation type="obsolete">Silakan pilih apakah berkas hard disk virtual baru mesti berkembang ketika dipakai (dialokasikan secara dinamik) atau mesti diciptakan pada ukuran maksimumnya (ukuran tetap).</translation>
+    </message>
+    <message>
+        <source><p>A <b>dynamically allocated</b> hard drive file will only use space on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
+        <translation type="obsolete"><p>Berkas hard disk virtual <b>yang dialokasikan secara dinamik</b> hanya akan memakai ruang pada hard disk fisik Anda ketika terisi (sampai dengan suatu <b>ukuran tetap</b> maksimum), walaupun mereka tak akan mengecil lagi secara otomatis ketika ruang di dalamnya dibebaskan.</p></translation>
+    </message>
+    <message>
+        <source><p>A <b>fixed size</b> hard drive file may take longer to create on some systems but is often faster to use.</p></source>
+        <translation type="obsolete"><p>Berkas hard disk virtual <b>berukuran tetap</b> mungkin makan waktu lebih lama untuk diciptakan pada beberapa sistem tapi seringkali lebih cepat dipakainya.</p></translation>
+    </message>
+    <message>
+        <source><p>You can also choose to <b>split</b> the hard drive file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
+        <translation type="obsolete"><p>Anda juga dapat memilih untuk <b>memecah</b> berkas hard disk virtual ke dalam beberapa berkas yang masing-masing berukuran sampai dengan dua giga byte. Ini terutama berguna bila Anda hendak menyimpan mesin virtual pada perangkat USB lepas pasang atau sistem lama, yang mungkin tak bisa menangani berkas sangat besar.</translation>
     </message>
     <message>
         <source>&Dynamically allocated</source>
-        <translation type="unfinished">&Dialokasikan secara dinamis</translation>
+        <translation>&Dialokasikan secara dinamik</translation>
     </message>
     <message>
         <source>&Fixed size</source>
-        <translation type="unfinished">Ukuran &tetap</translation>
+        <translation>Ukuran &tetap</translation>
     </message>
     <message>
         <source>&Split into files of less than 2GB</source>
-        <translation type="unfinished">&Pecah ke dalam file kurang dari 2GB</translation>
+        <translation>&Pecah ke dalam berkas-berkas kurang dari 2GB</translation>
     </message>
     <message>
         <source><nobr>%1 (%2 B)</nobr></source>
-        <translation type="unfinished"><nobr>%1 (%2 B)</nobr></translation>
+        <translation><nobr>%1 (%2 B)</nobr></translation>
     </message>
     <message>
         <source>File location and size</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokasi dan ukuran berkas</translation>
+    </message>
+    <message>
+        <source>Please type the name of the new virtual hard drive file into the box below or click on the folder icon to select a different folder to create the file in.</source>
+        <translation type="obsolete">Silakan ketik nama berkas hard disk virtual baru ke kotak di bawah atau klik pada ikon folder untuk memilih folder lain tempat mencipta berkas.</translation>
+    </message>
+    <message>
+        <source>Choose a location for new virtual hard drive file...</source>
+        <translation type="obsolete">Pilih lokasi untuk berkas hard disk virtual baru...</translation>
+    </message>
+    <message>
+        <source>Select the size of the virtual hard drive in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard drive.</source>
+        <translation type="obsolete">Pilih ukuran image hard disk virtual dalam megabyte. Ukuran ini adalah batas pada banyaknya data berkas yang dapat disimpan oleh mesin virtual pada hard disk.</translation>
     </message>
     <message>
         <source>File &location</source>
-        <translation type="unfinished"></translation>
+        <translation>&Lokasi berkas</translation>
     </message>
     <message>
         <source>File &size</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ukuran berkas</translation>
+    </message>
+    <message>
+        <source>Hard drive file &type</source>
+        <translation type="obsolete">&Tipe berkas hard disk</translation>
     </message>
     <message>
         <source>Create Virtual Hard Disk</source>
@@ -11122,11 +11526,11 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     <name>UIWizardNewVM</name>
     <message>
         <source>Create Virtual Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Ciptakan Mesin Virtual</translation>
     </message>
     <message>
         <source>Create</source>
-        <translation type="unfinished">Buat</translation>
+        <translation>Buat</translation>
     </message>
     <message>
         <source>IDE Controller</source>
@@ -11150,23 +11554,47 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>Name and operating system</source>
-        <translation type="unfinished"></translation>
+        <translation>Nama dan sistem operasi</translation>
     </message>
     <message>
         <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Harap pilih suatu nama yang deskriptif bagi mesin virtual baru dan pilih tipe sistem operasu yang hendak Anda pasang padanya. Nama yang Anda pilih akan dipakai di seluruh VirtualBox untuk mengidentifikasi mesin ini.</translation>
     </message>
     <message>
         <source>Memory size</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukuran memori</translation>
     </message>
     <message>
         <source><p>Select the amount of memory (RAM) in megabytes to be allocated to the virtual machine.</p><p>The recommended memory size is <b>%1</b> MB.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Atur banyaknya memori (RAM) dalam megabyte untuk dialokasikan ke mesin virtual.</p><p>Ukuran memori yang disarankan adalah <b>%1</b> MB.</p></translation>
+    </message>
+    <message>
+        <source>Hard drive</source>
+        <translation type="obsolete">Hard disk</translation>
+    </message>
+    <message>
+        <source><p>If you wish you can add a virtual hard drive to the new machine. You can either create a new hard drive file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard drive is <b>%1</b>.</p></source>
+        <translation type="obsolete"><p>Bila Anda mau Anda dapat menambahkan suatu hard disk virtual ke mesin baru. Anda dapat membuat suatu berkas hard disk baru atau memilih satu dari daftar atau dari lokasi lain memakai ikon folder.</p><p>Bila Anda perlu penyiapan penyimpanan yang lebih rumit Anda dapat melewait langkah ini dan membuat perubahan ke pengaturan mesin setelah mesin dibuat.</p><p>Ukuran hard disk yang disarankan adalah <b>%1</b>.& [...]
+    </message>
+    <message>
+        <source>Choose a virtual hard drive file...</source>
+        <translation type="obsolete">Pilih suatu berkas hard disk virtual...</translation>
     </message>
     <message>
         <source>&Memory size</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukuran &memori</translation>
+    </message>
+    <message>
+        <source>&Do not add a virtual hard drive</source>
+        <translation type="obsolete">Jangan tambahkan hard &disk virtual</translation>
+    </message>
+    <message>
+        <source>&Create a virtual hard drive now</source>
+        <translation type="obsolete">&Buat hard disk virtual sekarang</translation>
+    </message>
+    <message>
+        <source>&Use an existing virtual hard drive file</source>
+        <translation type="obsolete">G&unakan berkas hard disk virtual yang ada</translation>
     </message>
     <message>
         <source>Hard disk</source>
@@ -11207,7 +11635,7 @@ langkah ini dan memasang hard disk pada waktu lain menggunakan dialog Setting Me
     </message>
     <message>
         <source>VirtualBox Graphical User Interface</source>
-        <translation>Antarmuka Pengguna Grafik VirtualBox</translation>
+        <translation>Antarmuka Pengguna Grafis VirtualBox</translation>
     </message>
     <message>
         <source>Version %1</source>
@@ -11524,11 +11952,11 @@ Versi %1</translation>
         <translation type="obsolete">Buka dialog untuk beroperasi pada folder yang di share</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Install Guest Additions...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="obsolete">&Insert Guest Additions CD image...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Pasang Guest Additions pada image instalasi</translation>
     </message>
     <message>
@@ -11815,7 +12243,7 @@ Versi %1</translation>
         <translation type="obsolete">Dialog I&nformasi Sesi </translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Tampilkan Dialog Informasi Sesi </translation>
     </message>
     <message>
@@ -12108,18 +12536,18 @@ Versi %1</translation>
     </message>
     <message>
         <source>Choose...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pilih...</translation>
     </message>
 </context>
 <context>
     <name>VBoxFilePathSelectorWidget</name>
     <message>
         <source><reset to default></source>
-        <translation><reset ke default></translation>
+        <translation><reset ke baku></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Nila path default sebenarnya akan ditampilkan setelah menerima perubahan dan membuka dialog ini lagi.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation>Nila path baku sebenarnya akan ditampilkan setelah menerima perubahan dan membuka dialog ini lagi.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -12127,7 +12555,7 @@ Versi %1</translation>
     </message>
     <message>
         <source>Please use the <b>Other...</b> item from the drop-down list to select a path.</source>
-        <translation>Silakan pakai item <b>Lainnya...</b> dari daftar drop-down untuk memilih suatu path.</translation>
+        <translation>Silakan pakai butir <b>Lainnya...</b> dari daftar drop-down untuk memilih suatu path.</translation>
     </message>
     <message>
         <source>Other...</source>
@@ -12139,19 +12567,19 @@ Versi %1</translation>
     </message>
     <message>
         <source>Opens a window to select a different folder.</source>
-        <translation type="obsolete">Buka dialog untuk memilih folder lain.</translation>
+        <translation type="obsolete">Buka jendela untuk memilih folder lain.</translation>
     </message>
     <message>
         <source>Resets the folder path to the default value.</source>
-        <translation>Reset path folder ke nilai default.</translation>
+        <translation>Reset path folder ke nilai baku.</translation>
     </message>
     <message>
         <source>Opens a window to select a different file.</source>
-        <translation type="obsolete">Buka dialog untuk memilih file lain.</translation>
+        <translation type="obsolete">Buka jendela untuk memilih berkas lain.</translation>
     </message>
     <message>
         <source>Resets the file path to the default value.</source>
-        <translation>Reset path file ke nilai default.</translation>
+        <translation>Reset path berkas ke nilai baku.</translation>
     </message>
     <message>
         <source>&Copy</source>
@@ -12163,11 +12591,12 @@ Versi %1</translation>
     </message>
     <message>
         <source>Please type the file path here.</source>
-        <translation type="obsolete">Silakan ketik path file di sini.</translation>
+        <translation type="obsolete">Silakan ketik path berkas di sini.</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Nila path default sebenarnya akan ditampilkan setelah menerima perubahan dan membuka dialog ini lagi.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -12226,12 +12655,12 @@ Versi %1</translation>
     <message>
         <source>Unknown device %1:%2</source>
         <comment>USB device details</comment>
-        <translation>Device tidak dikenal %1:%2</translation>
+        <translation>Perangkat tidak dikenal %1:%2</translation>
     </message>
     <message>
         <source><nobr>Vendor ID: %1</nobr><br><nobr>Product ID: %2</nobr><br><nobr>Revision: %3</nobr></source>
         <comment>USB device tooltip</comment>
-        <translation><nobr>ID Vendor: %1</nobr><br><nobr>ID Product: %2</nobr><br><nobr>Revisi: %3</nobr></translation>
+        <translation><nobr>ID Vendor: %1</nobr><br><nobr>ID Produk: %2</nobr><br><nobr>Revisi: %3</nobr></translation>
     </message>
     <message>
         <source><br><nobr>Serial No. %1</nobr></source>
@@ -12251,7 +12680,7 @@ Versi %1</translation>
     <message>
         <source>OS Type</source>
         <comment>details report</comment>
-        <translation>Tipe Sistem Operasi</translation>
+        <translation>Tipe OS</translation>
     </message>
     <message>
         <source>Base Memory</source>
@@ -12266,7 +12695,7 @@ Versi %1</translation>
     <message>
         <source>General</source>
         <comment>details report</comment>
-        <translation>Garis Besar</translation>
+        <translation>Umum</translation>
     </message>
     <message>
         <source>Video Memory</source>
@@ -12306,22 +12735,22 @@ Versi %1</translation>
     <message>
         <source>Enabled</source>
         <comment>details report (ACPI)</comment>
-        <translation>Menyala</translation>
+        <translation>Difungsikan</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details report (ACPI)</comment>
-        <translation>Mati</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details report (I/O APIC)</comment>
-        <translation>Menyala</translation>
+        <translation>Difungsikan</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details report (I/O APIC)</comment>
-        <translation>Mati</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Not mounted</source>
@@ -12371,7 +12800,7 @@ Versi %1</translation>
     <message>
         <source>Disabled</source>
         <comment>details report (audio)</comment>
-        <translation>Mati</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Audio</source>
@@ -12381,12 +12810,12 @@ Versi %1</translation>
     <message>
         <source>Adapter %1</source>
         <comment>details report (network)</comment>
-        <translation>Adapter %1</translation>
+        <translation>Adaptor %1</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details report (network)</comment>
-        <translation>Mati</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Network</source>
@@ -12396,7 +12825,7 @@ Versi %1</translation>
     <message>
         <source>Device Filters</source>
         <comment>details report (USB)</comment>
-        <translation>Filter Device</translation>
+        <translation>Penyaring Perangkat</translation>
     </message>
     <message>
         <source>%1 (%2 active)</source>
@@ -12406,7 +12835,7 @@ Versi %1</translation>
     <message>
         <source>Disabled</source>
         <comment>details report (USB)</comment>
-        <translation>Mati</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>VRDP Server Port</source>
@@ -12660,7 +13089,7 @@ Versi %1</translation>
     <message>
         <source>Not supported</source>
         <comment>USBDeviceState</comment>
-        <translation>Tidak terdukung</translation>
+        <translation>Tidak didukung</translation>
     </message>
     <message>
         <source>Unavailable</source>
@@ -12680,12 +13109,12 @@ Versi %1</translation>
     <message>
         <source>Held</source>
         <comment>USBDeviceState</comment>
-        <translation>Terpegang</translation>
+        <translation>Ditahan</translation>
     </message>
     <message>
         <source>Captured</source>
         <comment>USBDeviceState</comment>
-        <translation>Tertangkap</translation>
+        <translation>Ditangkap</translation>
     </message>
     <message>
         <source><i>Checking...</i></source>
@@ -12700,7 +13129,7 @@ Versi %1</translation>
     <message>
         <source>Disabled</source>
         <comment>ClipboardType</comment>
-        <translation>Mati</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Host To Guest</source>
@@ -12733,7 +13162,7 @@ Versi %1</translation>
     <message>
         <source>Disabled</source>
         <comment>details report (serial ports)</comment>
-        <translation>Mati</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Serial Ports</source>
@@ -12748,7 +13177,7 @@ Versi %1</translation>
     <message>
         <source>Shared Folders</source>
         <comment>details report (shared folders)</comment>
-        <translation>Folder yang di Share</translation>
+        <translation>Folder Bersama</translation>
     </message>
     <message>
         <source>%1</source>
@@ -12763,7 +13192,7 @@ Versi %1</translation>
     <message>
         <source>Shared Folders</source>
         <comment>details report</comment>
-        <translation>Folder yang di Share</translation>
+        <translation>Folder Bersama</translation>
     </message>
     <message>
         <source>Stuck</source>
@@ -12783,7 +13212,7 @@ Versi %1</translation>
     <message>
         <source>Host Device</source>
         <comment>PortMode</comment>
-        <translation>Device Host</translation>
+        <translation>Perangkat Host</translation>
     </message>
     <message>
         <source>User-defined</source>
@@ -12808,22 +13237,22 @@ Versi %1</translation>
     <message>
         <source>Enabled</source>
         <comment>details report (VT-x/AMD-V)</comment>
-        <translation>Menyala</translation>
+        <translation>Difungsikan</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details report (VT-x/AMD-V)</comment>
-        <translation>Mati</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details report (PAE/NX)</comment>
-        <translation>Menyala</translation>
+        <translation>Difungsikan</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details report (PAE/NX)</comment>
-        <translation>Mati</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Host Driver</source>
@@ -12843,7 +13272,7 @@ Versi %1</translation>
     <message>
         <source>Disabled</source>
         <comment>details report (parallel ports)</comment>
-        <translation>Mati</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Parallel Ports</source>
@@ -12858,7 +13287,7 @@ Versi %1</translation>
     <message>
         <source>Shared Folder</source>
         <comment>DeviceType</comment>
-        <translation>Folder yang di Share</translation>
+        <translation>Folder Bersama</translation>
     </message>
     <message>
         <source>IDE</source>
@@ -13018,12 +13447,12 @@ Versi %1</translation>
     <message>
         <source>Enabled</source>
         <comment>details report (3D Acceleration)</comment>
-        <translation>Diaktifkan</translation>
+        <translation>Difungsikan</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details report (3D Acceleration)</comment>
-        <translation>Dimatikan</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Setting Up</source>
@@ -13043,12 +13472,12 @@ Versi %1</translation>
     <message>
         <source>Enabled</source>
         <comment>details report (Nested Paging)</comment>
-        <translation>Diaktifkan</translation>
+        <translation>Difungsikan</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details report (Nested Paging)</comment>
-        <translation>Dimatikan</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Internal network, '%1'</source>
@@ -13143,22 +13572,22 @@ Versi %1</translation>
     <message>
         <source>Display</source>
         <comment>details report</comment>
-        <translation>Display</translation>
+        <translation>Tampilan</translation>
     </message>
     <message>
         <source>Raw File</source>
         <comment>PortMode</comment>
-        <translation>File Raw</translation>
+        <translation>Berkas Mentah</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details report (2D Video Acceleration)</comment>
-        <translation>Diaktifkan</translation>
+        <translation>Difungsikan</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details report (2D Video Acceleration)</comment>
-        <translation>Dimatikan</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>2D Video Acceleration</source>
@@ -13168,7 +13597,7 @@ Versi %1</translation>
     <message>
         <source>Not Attached</source>
         <comment>details report (Storage)</comment>
-        <translation>Tidak Disambung</translation>
+        <translation>Tidak Terpasang</translation>
     </message>
     <message>
         <source>Storage</source>
@@ -13303,21 +13732,21 @@ Versi %1</translation>
     <message>
         <source>Failed to check accessibility of disk image files.</source>
         <comment>medium</comment>
-        <translation>Gagal memeriksa aksesibilitas media.</translation>
+        <translation>Gagal memeriksa aksesibilitas berkas image disk.</translation>
     </message>
     <message>
         <source><b>No disk image file selected</b></source>
         <comment>medium</comment>
-        <translation><b>Tak ada medium yang dipilih</b></translation>
+        <translation><b>Tidak ada berkas image disk yang dipilih</b></translation>
     </message>
     <message>
         <source>You can also change this while the machine is running.</source>
-        <translation>Anda juga dapat mengubah ini ketika mesin berjalan.</translation>
+        <translation>Anda juga dapat mengubah ini ketika mesin sedang berjalan.</translation>
     </message>
     <message>
         <source><b>No disk image files available</b></source>
         <comment>medium</comment>
-        <translation><b>Tak ada media yang tersedia</b></translation>
+        <translation><b>Tidak ada berkas image disk yang tersedia</b></translation>
     </message>
     <message>
         <source>You can create disk image files using the virtual media manager.</source>
@@ -13326,17 +13755,17 @@ Versi %1</translation>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Pencantolan hard disk ini akan dilakukan secara tidak langsung menggunakan hard disk pembeda yang baru dibuat.</translation>
+        <translation>Pencantolan hard disk ini akan dilakukan secara tidak langsung menggunakan hard disk pembeda yang baru dibuat.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
         <comment>medium</comment>
-        <translation type="obsolete">Beberapa media dalam rangkaian hard disk ini tak dapat diakses. Silakan pakai Manajer Media Virtual dalam mode <b>Tampilkan Hard Disk Pembeda</b> untuk memeriksa media tersebut.</translation>
+        <translation type="obsolete">Beberapa berkas dalam rangkaian hard disk ini tak dapat diakses. Silakan pakai Manajer Media Virtual dalam mode <b>Tampilkan Hard Disk Pembeda</b> untuk memeriksa berkas-berkas tersebut.</translation>
     </message>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Hard disk dasar ini dicantolkan secara tidak langsung memakai hard disk pembeda berikut:</translation>
+        <translation>Hard disk dasar ini dicantolkan secara tidak langsung memakai hard disk pembeda berikut:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -13376,7 +13805,7 @@ Versi %1</translation>
     </message>
     <message>
         <source>(CD/DVD)</source>
-        <translation type="obsolete">CD/DVD</translation>
+        <translation type="obsolete">(CD/DVD)</translation>
     </message>
     <message>
         <source>Screens</source>
@@ -13445,7 +13874,7 @@ Versi %1</translation>
     <message>
         <source>Unknown device</source>
         <comment>USB device details</comment>
-        <translation>Device tidak dikenal</translation>
+        <translation>Perangkat tidak dikenal</translation>
     </message>
     <message>
         <source>SAS Port %1</source>
@@ -13465,7 +13894,7 @@ Versi %1</translation>
     <message>
         <source>Disabled</source>
         <comment>details report (VRDE Server)</comment>
-        <translation>Dimatikan</translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file</source>
@@ -13497,7 +13926,7 @@ Versi %1</translation>
     </message>
     <message>
         <source>All files (*)</source>
-        <translation>Semua file (*)</translation>
+        <translation>Semua berkas (*)</translation>
     </message>
     <message>
         <source>Fault Tolerant Syncing</source>
@@ -13593,7 +14022,7 @@ Versi %1</translation>
     <message>
         <source>Execution Cap</source>
         <comment>details report</comment>
-        <translation>Cap Eksekusi</translation>
+        <translation>Batas Eksekusi</translation>
     </message>
     <message>
         <source><nobr>%1%</nobr></source>
@@ -13632,325 +14061,347 @@ Versi %1</translation>
     <message>
         <source>Disabled</source>
         <comment>DragAndDropType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dinonaktifkan</translation>
     </message>
     <message>
         <source>Host To Guest</source>
         <comment>DragAndDropType</comment>
-        <translation type="unfinished">Host ke Guest</translation>
+        <translation>Host ke Guest</translation>
     </message>
     <message>
         <source>Guest To Host</source>
         <comment>DragAndDropType</comment>
-        <translation type="unfinished">Guest ke Host</translation>
+        <translation>Guest ke Host</translation>
     </message>
     <message>
         <source>Bidirectional</source>
         <comment>DragAndDropType</comment>
-        <translation type="unfinished">Dua Arah</translation>
+        <translation>Dua Arah</translation>
     </message>
     <message>
         <source>Normal</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Normal</translation>
+        <translation>Normal</translation>
     </message>
     <message>
         <source>Immutable</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Immutable</translation>
+        <translation>Tetap</translation>
     </message>
     <message>
         <source>Writethrough</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Writethrough</translation>
+        <translation>Writethrough</translation>
     </message>
     <message>
         <source>Shareable</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Dapat Di-share</translation>
+        <translation>Dapat Dipakai Bersama</translation>
     </message>
     <message>
         <source>Readonly</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Baca-saja</translation>
+        <translation>Baca-saja</translation>
     </message>
     <message>
         <source>Multi-attach</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Multi-cantol</translation>
+        <translation>Multi-cantol</translation>
     </message>
     <message>
         <source>Dynamically allocated storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished">Penyimpanan yang dialokasikan secara dinamis</translation>
+        <translation>Penyimpanan yang dialokasikan secara dinamis</translation>
     </message>
     <message>
         <source>Dynamically allocated differencing storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Penyimpanan pembeda yang dialokasikan secara dinamis</translation>
     </message>
     <message>
         <source>Fixed size storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished">Penyimpanan ukuran tetap</translation>
+        <translation>Penyimpanan ukuran tetap</translation>
     </message>
     <message>
         <source>Dynamically allocated storage split into files of less than 2GB</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished">Penyimpanan yang dialokasikan secara dinamis memecah ke file berukuran kurang dari 2GB</translation>
+        <translation>Penyimpanan yang dialokasikan secara dinamis memecah ke file berukuran kurang dari 2GB</translation>
     </message>
     <message>
         <source>Dynamically allocated differencing storage split into files of less than 2GB</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Penyimpanan pembeda yang dialokasikan secara dinamis memecah ke file berukuran kurang dari 2GB</translation>
     </message>
     <message>
         <source>Fixed size storage split into files of less than 2GB</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished">Penyimpanan ukuran tetap memecah file berukuran kurang dari 2GB</translation>
+        <translation>Penyimpanan ukuran tetap memecah ke file berukuran kurang dari 2GB</translation>
     </message>
     <message>
         <source>Dynamically allocated compressed storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Penyimpanan terkompresi yang dialokasikan secara dinamis</translation>
     </message>
     <message>
         <source>Dynamically allocated differencing compressed storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Penyimpanan pembeda terkompresi yang dialokasikan secara dinamis</translation>
     </message>
     <message>
         <source>Fixed size ESX storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Penyimpanan ESX ukuran tetap</translation>
     </message>
     <message>
         <source>Fixed size storage on raw disk</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Penyimpanan ukuran tetap pada disk mentah</translation>
     </message>
     <message>
         <source>Deny</source>
         <comment>NetworkAdapterPromiscModePolicy</comment>
-        <translation type="unfinished">Tolak</translation>
+        <translation>Tolak</translation>
     </message>
     <message>
         <source>Allow VMs</source>
         <comment>NetworkAdapterPromiscModePolicy</comment>
-        <translation type="unfinished">Ijinkan VM</translation>
+        <translation>Ijinkan VM</translation>
     </message>
     <message>
         <source>Allow All</source>
         <comment>NetworkAdapterPromiscModePolicy</comment>
-        <translation type="unfinished">Ijinkan Semua</translation>
+        <translation>Ijinkan Semua</translation>
     </message>
     <message>
         <source>Ignore</source>
         <comment>USBDeviceFilterAction</comment>
-        <translation type="unfinished">Abaikan</translation>
+        <translation>Abaikan</translation>
     </message>
     <message>
         <source>Hold</source>
         <comment>USBDeviceFilterAction</comment>
-        <translation type="unfinished">Tahan</translation>
+        <translation>Tahan</translation>
     </message>
     <message>
         <source>UDP</source>
         <comment>NATProtocol</comment>
-        <translation type="unfinished">UDP</translation>
+        <translation>UDP</translation>
     </message>
     <message>
         <source>TCP</source>
         <comment>NATProtocol</comment>
-        <translation type="unfinished">TCP</translation>
+        <translation>TCP</translation>
     </message>
     <message>
         <source>IDE Primary Master</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">IDE Master Primer</translation>
+        <translation>IDE Master Primer</translation>
     </message>
     <message>
         <source>IDE Primary Slave</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">IDE Slave Primer</translation>
+        <translation>IDE Slave Primer</translation>
     </message>
     <message>
         <source>IDE Secondary Master</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">IDE Master Sekunder</translation>
+        <translation>IDE Master Sekunder</translation>
     </message>
     <message>
         <source>IDE Secondary Slave</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">IDE Slave Sekunder</translation>
+        <translation>IDE Slave Sekunder</translation>
     </message>
     <message>
         <source>SATA Port %1</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">SATA Port %1</translation>
+        <translation>SATA Port %1</translation>
     </message>
     <message>
         <source>SCSI Port %1</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">SCSI Port %1</translation>
+        <translation>SCSI Port %1</translation>
     </message>
     <message>
         <source>SAS Port %1</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">SAS Port %1</translation>
+        <translation>SAS Port %1</translation>
     </message>
     <message>
         <source>Floppy Device %1</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">Device Floppy %1</translation>
+        <translation>Device Floppy %1</translation>
     </message>
     <message>
         <source>General</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Umum</translation>
     </message>
     <message>
         <source>Preview</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Pratinjau</translation>
+        <translation>Pratinjau</translation>
     </message>
     <message>
         <source>System</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Sistem</translation>
+        <translation>Sistem</translation>
     </message>
     <message>
         <source>Display</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tampilan</translation>
     </message>
     <message>
         <source>Storage</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Penyimpanan</translation>
+        <translation>Penyimpanan</translation>
     </message>
     <message>
         <source>Audio</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Suara</translation>
+        <translation>Suara</translation>
     </message>
     <message>
         <source>Network</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Jaringan</translation>
+        <translation>Jaringan</translation>
     </message>
     <message>
         <source>Serial ports</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Port serial</translation>
     </message>
     <message>
         <source>Parallel ports</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Port paralel</translation>
     </message>
     <message>
         <source>USB</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">USB</translation>
+        <translation>USB</translation>
     </message>
     <message>
         <source>Shared folders</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Folder bersama</translation>
     </message>
     <message>
         <source>Description</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Deskripsi</translation>
+        <translation>Deskripsi</translation>
+    </message>
+    <message>
+        <source>Please choose a virtual hard drive file</source>
+        <translation type="obsolete">Harap pilih berkas hard disk virtual</translation>
+    </message>
+    <message>
+        <source>All virtual hard drive files (%1)</source>
+        <translation type="obsolete">Semua berkas hard disk virtual (%1)</translation>
     </message>
     <message>
         <source>Please choose a virtual optical disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Harap pilih berkas disk optik virtual</translation>
     </message>
     <message>
         <source>All virtual optical disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Semua berkas disk optik virtual (%1)</translation>
     </message>
     <message>
         <source>Please choose a virtual floppy disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Pilih sebuah berkas disk floppy virtual</translation>
     </message>
     <message>
         <source>All virtual floppy disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Semua berkas disk floppy virtual (%1)</translation>
     </message>
     <message>
         <source>VDI (VirtualBox Disk Image)</source>
-        <translation type="unfinished"></translation>
+        <translation>VDI (VirtualBox Disk Image)</translation>
     </message>
     <message>
         <source>VMDK (Virtual Machine Disk)</source>
-        <translation type="unfinished"></translation>
+        <translation>VMDK (Virtual Machine Disk)</translation>
     </message>
     <message>
         <source>VHD (Virtual Hard Disk)</source>
-        <translation type="unfinished"></translation>
+        <translation>VHD (Virtual Hard Disk)</translation>
     </message>
     <message>
         <source>HDD (Parallels Hard Disk)</source>
-        <translation type="unfinished"></translation>
+        <translation>HDD (Parallels Hard Disk)</translation>
     </message>
     <message>
         <source>QED (QEMU enhanced disk)</source>
-        <translation type="unfinished"></translation>
+        <translation>QED (QEMU enhanced disk)</translation>
     </message>
     <message>
         <source>QCOW (QEMU Copy-On-Write)</source>
-        <translation type="unfinished"></translation>
+        <translation>QCOW (QEMU Copy-On-Write)</translation>
+    </message>
+    <message>
+        <source>Please choose a location for new virtual hard drive file</source>
+        <translation type="obsolete">Harap pilih lokasi untuk berkas hard disk virtual baru</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Difungsikan</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Dinonaktifkan</translation>
     </message>
     <message>
         <source>Unrestricted Execution</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>Eksekusi Tanpa Batas</translation>
     </message>
     <message>
         <source>PS/2 Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tetikus PS/2</translation>
     </message>
     <message>
         <source>USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tetikus USB</translation>
     </message>
     <message>
         <source>PS/2 and USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tetikus PS/2 dan USB</translation>
     </message>
     <message>
         <source>Unrestricted Execution</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksekusi Tanpa Batas</translation>
     </message>
     <message>
         <source>USB Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tablet USB</translation>
     </message>
     <message>
         <source>USB Multi-Touch Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Tablet Multi-Sentuh USB</translation>
     </message>
     <message>
         <source>NAT Network</source>
         <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jaringan NAT</translation>
     </message>
     <message>
         <source>NAT network, '%1'</source>
         <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Jaringan NAT, '%1'</translation>
     </message>
     <message>
         <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Anda dapat membuat atau menambah berkas image disk dalam pengaturan mesin virtual.</translation>
     </message>
     <message>
         <source>USB</source>
@@ -13958,51 +14409,11 @@ Versi %1</translation>
         <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Tidak Ada</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished">Aktif</translation>
@@ -14033,6 +14444,11 @@ Versi %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -14043,6 +14459,31 @@ Versi %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Tidak Ada</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -14053,6 +14494,11 @@ Versi %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -14073,6 +14519,11 @@ Versi %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -14082,16 +14533,16 @@ Versi %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14112,15 +14563,15 @@ Versi %1</translation>
     </message>
     <message>
         <source>The value '%1' of the key '%2' doesn't match the regexp constraint '%3'.</source>
-        <translation>Nilai '%1' dari key '%2' tidak match dengan konstrain regexp '%3'.</translation>
+        <translation>Nilai '%1' dari kunci '%2' tidak cocok dengan batasan regexp '%3'.</translation>
     </message>
     <message>
         <source>Cannot delete the key '%1'.</source>
-        <translation>Tidak dapat menghapus key '%1'.</translation>
+        <translation>Tidak dapat menghapus kunci '%1'.</translation>
     </message>
     <message>
         <source>'%1' is an invalid host-combination code-sequence.</source>
-        <translation>'%1' adalah urutan kode kombinasi host yang tak valid.</translation>
+        <translation>'%1' adalah urutan kode kombinasi host yang tidak valid.</translation>
     </message>
 </context>
 <context>
@@ -14375,11 +14826,11 @@ ke nilai awal bahasa sistem.</qt>
         <translation type="obsolete">Menampilkan path ke nilai awal folder VDI. Folder ini digunakan, bila tidak disebutkan sebaliknya secara eksplisit, saat menambahkan atau menciptakan hard disk virtual baru.</translation>
     </message>
     <message>
-        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Me-reset path folder mesin virtual pada nilai awal. Path default aktual akan ditampilkan setelah menerima perubahan dan membuka dialog ini kembali.</translation>
     </message>
     <message>
-        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Me-reset path folder VDI pada nilai awal. Path default aktual akan ditampilkan setelah menerima perubahan dan membuka dialog ini kembali.</translation>
     </message>
     <message>
@@ -14423,7 +14874,7 @@ ke nilai awal bahasa sistem.</qt>
         <translation type="obsolete">Buka dialog untuk memilih file VRDP authentication library file.</translation>
     </message>
     <message>
-        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Me-reset file authentication library pada nilai awal. Path file library aktual akan ditampilkan setelah menerima perubahan dan membuka dialog ini kembali.</translation>
     </message>
     <message>
@@ -14780,7 +15231,7 @@ ke nilai awal bahasa sistem.</qt>
     </message>
     <message>
         <source>Re&fresh</source>
-        <translation>Re&fresh</translation>
+        <translation>Sega&rkan</translation>
     </message>
     <message>
         <source>Create a new virtual hard disk</source>
@@ -14792,15 +15243,15 @@ ke nilai awal bahasa sistem.</qt>
     </message>
     <message>
         <source>Remove the selected disk image file</source>
-        <translation>Hapus medium yang dipilih</translation>
+        <translation>Hapus berkas image disk yang dipilih</translation>
     </message>
     <message>
         <source>Release the selected disk image file by detaching it from the machines</source>
-        <translation>Lepas medium yang dipilih dengan mencopotnya dari mesin</translation>
+        <translation>Lepas berkas image disk yang dipilih dengan mencopotnya dari mesin-mesin</translation>
     </message>
     <message>
         <source>Refresh the list of disk image files</source>
-        <translation>Refresh daftar media</translation>
+        <translation>Segarkan daftar berkas image disk</translation>
     </message>
     <message>
         <source>Location</source>
@@ -14944,26 +15395,26 @@ ke nilai awal bahasa sistem.</qt>
     </message>
     <message>
         <source>Copy an existing disk image file</source>
-        <translation>Salin media yang ada</translation>
+        <translation>Salin berkas image disk yang ada</translation>
     </message>
     <message>
         <source>Modify the attributes of the selected disk image file</source>
-        <translation>Ubah atribut medium yang dipilih</translation>
+        <translation>Ubah atribut berkas image disk yang dipilih</translation>
     </message>
     <message>
         <source>C&lose</source>
         <translation type="obsolete">&Tutup</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -15039,8 +15490,8 @@ ke nilai awal bahasa sistem.</qt>
         <translation type="obsolete">Dialog Registrasi VirtualBox</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
-        <translation type="obsolete"><p>Mohon isi formulir registrasi ini agar kami dapat mengetahui bahwa anda menggunakan VirtualBox dans ecara opsional, untuk menjaga anda tetap terinformasikan mengenai berita dan update VirtualBox.</p><p>Masukkan nama lengkap anda menggunakan karakter latin dan alamat e-mail anda pada field di bawah. Mohon perhatikan bahwa innotek akan menggunakan informasi ini hanya untuk mengumpulkan statistik penggunaan produkdan mengirimi anda n [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
+        <translation type="obsolete"><p>Mohon isi formulir registrasi ini agar kami dapat mengetahui bahwa anda menggunakan VirtualBox dans ecara opsional, untuk menjaga anda tetap terinformasikan mengenai berita dan update VirtualBox.</p><p>Masukkan nama lengkap anda menggunakan karakter latin dan alamat e-mail anda pada field di bawah. Mohon perhatikan bahwa innotek akan menggunakan informasi ini hanya untuk mengumpulkan statistik penggunaan produkdan mengirimi anda n [...]
     </message>
     <message>
         <source>&Name</source>
@@ -15087,8 +15538,8 @@ ke nilai awal bahasa sistem.</qt>
         <translation type="obsolete">Tidak dapat melakukan handshake koneksi.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Silahkan mengisi formulir registration ini agar dapat memberi tahu kami bahwa anda menggunakan VirtualBox dan, secara opsional, untuk menjaga anda tetap memperoleh informasi tentang berita seputar VirtualBox dan update.</p><p>Masukkan nama lengkap anda menggunakan karakter Latin dan alamat  e-mail anda pada field dibawah ini. Perhatikan bahwa Sun Microsystems akan menggunakan informasi ini hanya untuk mengumpulkan statistik penggu [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Silahkan mengisi formulir registration ini agar dapat memberi tahu kami bahwa anda menggunakan VirtualBox dan, secara opsional, untuk menjaga anda tetap memperoleh informasi tentang berita seputar VirtualBox dan update.</p><p>Masukkan nama lengkap anda menggunakan karakter Latin dan alamat  e-mail anda pada field dibawah ini. Perhatikan bahwa Sun Microsystems akan menggunakan informasi ini hanya untuk mengumpulkan statistik penggu [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -15393,8 +15844,8 @@ ke nilai awal bahasa sistem.</qt>
         <translation type="obsolete">Tahan eksekusi mesin virtual</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Selamat datang di VirtualBox!</h3><p>Bagian kiri dari jendela ini ditujukan untuk menampilkan daftar dari semua mesin virtual dalam komputer Anda. Daftar ini saat ini kosong karena Anda belum menciptakan mesin virtual apapun.<img src=:/welcome.png align=right/></p><p>Untuk menciptakan mesin virtual baru, tekan tombol <b>Baru</b> pada toolbar utama yang terletak di bagian atas jendela.</p><p& [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Selamat datang di VirtualBox!</h3><p>Bagian kiri dari jendela ini ditujukan untuk menampilkan daftar dari semua mesin virtual dalam komputer Anda. Daftar ini saat ini kosong karena Anda belum menciptakan mesin virtual apapun.<img src=:/welcome.png align=right/></p><p>Untuk menciptakan mesin virtual baru, tekan tombol <b>Baru</b> pada toolbar utama yang terletak di bagian atas jendela.</p><p& [...]
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
@@ -15682,11 +16133,11 @@ untuk mengaksesnya dari sebuah SIstem Operasi Linux. Fitur ini membutuhkan Guest
     </message>
     <message>
         <source>Details of %1 (%2)</source>
-        <translation>Detail dari %1 (%2)</translation>
+        <translation>Rincian dari %1 (%2)</translation>
     </message>
     <message>
         <source>Click to enlarge the screenshot.</source>
-        <translation>Klik untuk memperbesar screenshot.</translation>
+        <translation>Klik untuk memperbesar cuplikan layar.</translation>
     </message>
     <message>
         <source>&Name:</source>
@@ -15766,12 +16217,12 @@ untuk mengaksesnya dari sebuah SIstem Operasi Linux. Fitur ini membutuhkan Guest
     <message>
         <source>Current State (changed)</source>
         <comment>Current State (Modified)</comment>
-        <translation>Keadaan Saat ini (berubah)</translation>
+        <translation>Keadaan Saat Ini (berubah)</translation>
     </message>
     <message>
         <source>Current State</source>
         <comment>Current State (Unmodified)</comment>
-        <translation>Keadaan Saat ini</translation>
+        <translation>Keadaan Saat Ini</translation>
     </message>
     <message>
         <source>The current state differs from the state stored in the current snapshot</source>
@@ -15789,12 +16240,12 @@ untuk mengaksesnya dari sebuah SIstem Operasi Linux. Fitur ini membutuhkan Guest
     <message>
         <source>online)</source>
         <comment>Snapshot details</comment>
-        <translation>online)</translation>
+        <translation>daring)</translation>
     </message>
     <message>
         <source>offline)</source>
         <comment>Snapshot details</comment>
-        <translation>offline)</translation>
+        <translation>luring)</translation>
     </message>
     <message>
         <source>Taken at %1</source>
@@ -15865,7 +16316,7 @@ untuk mengaksesnya dari sebuah SIstem Operasi Linux. Fitur ini membutuhkan Guest
     </message>
     <message>
         <source>&Restore Snapshot</source>
-        <translation>&Kembalikan Snapshot</translation>
+        <translation>&Pulihkan Snapshot</translation>
     </message>
     <message>
         <source>&Delete Snapshot</source>
@@ -15873,11 +16324,11 @@ untuk mengaksesnya dari sebuah SIstem Operasi Linux. Fitur ini membutuhkan Guest
     </message>
     <message>
         <source>Restore the selected snapshot of the virtual machine</source>
-        <translation type="obsolete">Kembalikan snapshot dari mesin virtual yang dipilih</translation>
+        <translation type="obsolete">Pulihkan snapshot yang dipilih dari mesin virtual</translation>
     </message>
     <message>
         <source>Delete the selected snapshot of the virtual machine</source>
-        <translation type="obsolete">Hapus snapshot dari mesin virtual yang dipilih</translation>
+        <translation type="obsolete">Hapus snapshot yang dipilih dari mesin virtual</translation>
     </message>
     <message>
         <source> (%1 ago)</source>
@@ -16120,12 +16571,12 @@ dengan nilai apapun.</qt></translation>
     <message>
         <source><no devices available></source>
         <comment>USB devices</comment>
-        <translation><tidak ada device tersedia></translation>
+        <translation><tidak ada perangkat tersedia></translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
         <comment>USB device tooltip</comment>
-        <translation>Tidak ada device yang terdukung terkoneksi pada PC host</translation>
+        <translation>Tidak ada perangkat yang didukung yang terhubung ke PC host</translation>
     </message>
 </context>
 <context>
@@ -16155,6 +16606,163 @@ dengan nilai apapun.</qt></translation>
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>Session Information Dialog</source>
+        <translation type="obsolete">Dialog Informasi Sesi</translation>
+    </message>
+    <message>
+        <source>&Close</source>
+        <translation type="obsolete">&Tutup</translation>
+    </message>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Informasi Sesi</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Detail</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Runtime</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">Transfer DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">Transfer PIO</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Data Terbaca</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Data Tertulis</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Data Terkirim</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Data Diterima</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Menyala</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="obsolete">Mati</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Atribut Runtime</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Resolusi Layar</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">Statistik CD/DVD</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Statistik Adapter Jaringan</translation>
+    </message>
+    <message>
+        <source>Not attached</source>
+        <translation type="obsolete">Tidak terpasang</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Versi %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Tidak Terdeteksi</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Tidak Terdeteksi</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Guest Additions</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Tipe OS Guest</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Statistik Hard Disk</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Tidak Ada Hard Disk</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Tidak Ada Adaptor Jaringan</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Menyala</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Mati</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Statistik Penyimpanan</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Tidak Ada Perangkat Penyimpanan</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Statistik Jaringan</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Tidak Tersedia</translation>
+    </message>
+    <message>
+        <source>Clipboard Mode</source>
+        <translation type="obsolete">Mode Papan Klip</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">Mode Drag'n'Drop</translation>
+    </message>
+    <message>
+        <source>Configuration &Details</source>
+        <translation type="obsolete">&Rincian Konfigurasi</translation>
+    </message>
+    <message>
+        <source>&Runtime Information</source>
+        <translation type="obsolete">Informasi &Runtime</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMListBox</name>
     <message>
         <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
@@ -16975,7 +17583,7 @@ fitur ini setelah menginstall sebuah sistem operasi guest Windows!</qt></t
         <translation type="obsolete">Menampilkan path dimana snapshot dari mesin virtual akan disimpan. Perhatikan bahwa snapshot dapat menghabiskan banyak ruang disk.</translation>
     </message>
     <message>
-        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Me-reset path folder snapshot pada nilai awal. Path default aktual akan ditampilkan setelah menerima perubahan dan membuka dialog ini kembali.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
index 5c53638..acaeaa2 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
@@ -718,7 +718,7 @@
     </message>
     <message>
         <source>Re&fresh</source>
-        <translation type="unfinished">A&ggiorna</translation>
+        <translation>A&ggiorna</translation>
     </message>
     <message>
         <source>Refresh the accessibility state of the selected virtual machine</source>
@@ -1322,308 +1322,308 @@
     </message>
     <message>
         <source>Minimize active window</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimizza la finestra attiva</translation>
     </message>
     <message>
         <source>Display the Network Operations Manager window</source>
-        <translation type="unfinished"></translation>
+        <translation>Visualizza la finestra del gestore delle operazioni di rete</translation>
     </message>
     <message>
         <source>Display a window with product information</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra una finestra con le informazioni sul prodotto</translation>
     </message>
     <message>
         <source>&Preferences...</source>
         <comment>global preferences window</comment>
-        <translation type="unfinished">&Preferenze...</translation>
+        <translation>&Preferenze...</translation>
     </message>
     <message>
         <source>Display the global preferences window</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra la finestra delle impostazioni globali</translation>
     </message>
     <message>
         <source>Display the virtual machine settings window</source>
-        <translation type="unfinished"></translation>
+        <translation>Visualizza la finestra delle impostazioni della macchina virtuale</translation>
     </message>
     <message>
         <source>Display the virtual machine session information window</source>
-        <translation type="unfinished"></translation>
+        <translation>Visualizza la finestra delle informazioni di sessione della macchina virtuale</translation>
     </message>
     <message>
         <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <translation>&Salva stato</translation>
     </message>
     <message>
         <source>Save the state of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva lo stato della macchina virtuale</translation>
     </message>
     <message>
         <source>Send the ACPI Shutdown signal to the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Invia il segnale Shutdown ACPI alla macchina virtuale</translation>
     </message>
     <message>
         <source>&Minimize Window</source>
-        <translation type="unfinished"></translation>
+        <translation>&Minimizza la finestra</translation>
     </message>
     <message>
         <source>Automatically resize the guest display when the window is resized</source>
-        <translation type="unfinished"></translation>
+        <translation>Ridimensiona automaticamente lo schermo del guest quando la finestra viene ridimensionata</translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
-        <translation type="unfinished"></translation>
+        <source>Take guest display screenshot</source>
+        <translation>Acquisisce una scherma dello schermo del guest</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure video capture</source>
+        <translation>Visualizza la finestra delle impostazioni della macchina virtuale per configurare l'acquisizione video</translation>
     </message>
     <message>
         <source>Enable guest display video capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Abilita l'acquisizione video dello schermo del guest</translation>
     </message>
     <message>
         <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Consenti le connessioni di desktop remoto (RDP) a questa macchina</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure menu-bar</source>
+        <translation>Visualizza la finestra per configurare la barra dei menu</translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable menu-bar</source>
+        <translation>Abilita la barra dei menu</translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure status-bar</source>
+        <translation>Visualizza la finestra per configurare la barra di stato</translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable status-bar</source>
+        <translation>Abilita la barra di stato</translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
-        <translation type="unfinished"></translation>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
+        <translation>Visualizza la finestra delle impostazioni globali per configurare le scorciatoie da tastiera</translation>
     </message>
     <message>
         <source>&Insert %1</source>
         <comment>that means send the %1 key sequence to the virtual machine</comment>
-        <translation type="unfinished">&Inserisci %1</translation>
+        <translation>&Inserisci %1</translation>
     </message>
     <message>
         <source>&Hard Disks</source>
-        <translation type="unfinished">&Hard disk</translation>
+        <translation>Disc&hi fissi</translation>
     </message>
     <message>
         <source>&Hard Disk Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Impostazioni dei disc&hi fissi...</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure hard disks</source>
+        <translation>Visualizza la finestra delle impostazioni della macchina virtuale per configurare i dischi fissi</translation>
     </message>
     <message>
         <source>&Network</source>
-        <translation type="unfinished"></translation>
+        <translation>&Rete</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure network adapters</source>
+        <translation>Visualizza la finestra delle impostazioni della macchina virtuale per configurare le schede di rete</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure USB devices</source>
+        <translation>Visualizza la finestra delle impostazioni della macchina virtuale per configurare i dispositivi USB</translation>
     </message>
     <message>
         <source>&Drag and Drop</source>
-        <translation type="unfinished"></translation>
+        <translation>&Trascinamento e rilascio</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure shared folders</source>
+        <translation>Visualizza la finestra delle impostazioni della macchina virtuale per configurare le cartelle condivise</translation>
     </message>
     <message>
         <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci il file del disco delle Guest Additions nel lettore virtuale</translation>
     </message>
     <message>
         <source>%1%</source>
         <comment>scale-factor</comment>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>Enable</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">Abilita</translation>
+        <translation>Abilita</translation>
     </message>
     <message>
         <source>Resize to %1x%2</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">Ridimensiona a %1x%2</translation>
+        <translation>Ridimensiona a %1x%2</translation>
     </message>
     <message>
         <source>Preview Monitor %1</source>
-        <translation type="unfinished">Anteprima monitor %1</translation>
+        <translation>Anteprima monitor %1</translation>
     </message>
     <message>
         <source>&Connect Network Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>&Connetti scheda di rete</translation>
     </message>
     <message>
         <source>Connect Network Adapter &%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Connetti scheda di rete &%1</translation>
     </message>
     <message>
         <source>No USB Devices Connected</source>
-        <translation type="unfinished">Nessun dispositivo USB connesso</translation>
+        <translation>Nessun dispositivo USB connesso</translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun dispositivo supportato è connesso al PC host</translation>
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished">Nessuna webcam connessa</translation>
+        <translation>Nessuna webcam connessa</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
-        <translation type="unfinished">Nessuna webcam supportata è connessa al PC host</translation>
+        <translation>Nessuna webcam supportata è connessa al PC host</translation>
     </message>
     <message>
         <source>Create new virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Crea una nuova macchina virtuale</translation>
     </message>
     <message>
         <source>Add existing virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi una macchina virtuale esistente</translation>
     </message>
     <message>
         <source>Rename selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <translation>Rinomina il gruppo di macchine virtuali selezionato</translation>
     </message>
     <message>
         <source>&Ungroup</source>
-        <translation type="unfinished"></translation>
+        <translation>Separa gr&uppo</translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <source>Ungroup items of selected virtual machine group</source>
+        <translation>Separa gli elementi del gruppo di macchine virtuali selezionato</translation>
     </message>
     <message>
         <source>&Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ordina</translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort items of selected virtual machine group alphabetically</source>
+        <translation>Ordina alfabeticamente il gruppo di macchine virtuali selezionato</translation>
     </message>
     <message>
         <source>Add new group based on selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi un nuovo gruppo basato sulle macchine virtuali selezionate</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Clona la macchina virtuale selezionata</translation>
     </message>
     <message>
         <source>Remove selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi la macchina virtuale selezionata</translation>
     </message>
     <message>
         <source>Start selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Avvia le macchina virtuali selezionate</translation>
     </message>
     <message>
         <source>Switch to the windows of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Passa alla finestre delle macchine virtuali selezionate</translation>
     </message>
     <message>
         <source>Start selected virtual machines in the background</source>
-        <translation type="unfinished"></translation>
+        <translation>Avvia le macchine virtuali selezionate sullo sfondo</translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
-        <translation type="unfinished"></translation>
+        <source>Start selected virtual machines with option of continuing in background</source>
+        <translation>Avvia le macchine virtuali selezionate con la possibilità di proseguire l'esecuzione sullo sfondo</translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Suspend execution of selected virtual machines</source>
+        <translation>Sospendi l'esecuzione delle macchine virtuali</translation>
     </message>
     <message>
         <source>Reset selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Reset delle macchine virtuali selezionate</translation>
     </message>
     <message>
         <source>D&iscard Saved State...</source>
-        <translation type="unfinished"></translation>
+        <translation>S&carta lo stato salvato...</translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Discard saved state of selected virtual machines</source>
+        <translation>Scarta lo stato salvato delle macchine virtuali selezionate</translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Show log files of selected virtual machines</source>
+        <translation>Mostra i file di log delle macchine virtuali selezionate</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Refresh accessibility state of selected virtual machines</source>
+        <translation>Aggiorna lo stato di accessibilità delle macchine virtuali selezionate</translation>
     </message>
     <message>
         <source>S&how in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>M&ostra in Finder</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra i file di definizione delle macchine di VirtualBox in Finder</translation>
     </message>
     <message>
         <source>S&how in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>M&ostra in Explorer</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra i file di definizione delle macchine di VirtualBox in Explorer</translation>
     </message>
     <message>
         <source>S&how in File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>M&ostra nel gestore file</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in the File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra i file di definizione delle macchine di VirtualBox nel gestore file</translation>
     </message>
     <message>
         <source>Cr&eate Alias on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Cr&ea alias sul desktop</translation>
     </message>
     <message>
         <source>Create alias files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Crea alias per i file di definizione delle macchine di VirtualBox sul desktop</translation>
     </message>
     <message>
         <source>Cr&eate Shortcut on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Cr&ea scorciatoia sul desktop</translation>
     </message>
     <message>
         <source>Create shortcut files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Crea le scorciatoie ai file di definizione delle macchine di VirtualBox sul desktop</translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort group of first selected virtual machine alphabetically</source>
+        <translation>Ordina alfabeticamente il gruppo della prima macchina virtuale selezionata</translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Save state of selected virtual machines</source>
+        <translation>Salva lo stato delle macchine virtuali selezionate</translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
+        <translation>Invia il segnale Shutdown ACPI alle macchine virtuali selezionate</translation>
     </message>
     <message>
         <source>Power off selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Spegni le macchine virtuali selezionate</translation>
     </message>
 </context>
 <context>
@@ -1668,24 +1668,24 @@
     <message>
         <source>Status</source>
         <comment>password table field</comment>
-        <translation type="unfinished">Stato</translation>
+        <translation>Stato</translation>
     </message>
     <message>
         <source>ID</source>
         <comment>password table field</comment>
-        <translation type="unfinished">ID</translation>
+        <translation>ID</translation>
     </message>
     <message>
         <source>Password</source>
         <comment>password table field</comment>
-        <translation type="unfinished">Password</translation>
+        <translation>Password</translation>
     </message>
     <message numerus="yes">
         <source><nobr>Used by the following %n hard disk(s):</nobr><br>%1</source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many hard drives are in the tool-tip and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><nobr>Utilizzato dal seguente disco fisso:</nobr><br>%1</numerusform>
+            <numerusform><nobr>Utilizzato dai seguenti %n dischi fissi:</nobr><br>%1</numerusform>
         </translation>
     </message>
 </context>
@@ -1809,19 +1809,19 @@
     </message>
     <message>
         <source>Storage Controller (IDE)</source>
-        <translation type="unfinished"></translation>
+        <translation>Controller di archiviazione (IDE)</translation>
     </message>
     <message>
         <source>Storage Controller (SATA)</source>
-        <translation type="unfinished"></translation>
+        <translation>Controller di archiviazione (SATA)</translation>
     </message>
     <message>
         <source>Storage Controller (SCSI)</source>
-        <translation type="unfinished"></translation>
+        <translation>Controller di archiviazione (SCSI)</translation>
     </message>
     <message>
         <source>Storage Controller (SAS)</source>
-        <translation type="unfinished"></translation>
+        <translation>Controller di archiviazione (SAS)</translation>
     </message>
 </context>
 <context>
@@ -2525,7 +2525,7 @@
     </message>
     <message>
         <source>Retrieving data ...</source>
-        <translation type="unfinished">Recupero dei dati in corso...</translation>
+        <translation>Recupero dei dati in corso...</translation>
     </message>
 </context>
 <context>
@@ -3596,9 +3596,9 @@ p, li { white-space: pre-wrap; }
         <translation>Driver generico, '%1'</translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>Driver generico, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation>Driver generico, '%1' { %2 }</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -4164,15 +4164,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the maximum width which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Specifica la larghezza massima che vogliamo utilizzare per il guest.</translation>
     </message>
     <message>
         <source>Holds the maximum height which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Specifica l'altezza massima che vogliamo utilizzare per il guest.</translation>
     </message>
     <message>
         <source>When checked, machine windows will be raised when the mouse pointer moves over them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, le finestre delle macchine saranno alzate quando il puntatore del mouse le sorvola.</translation>
     </message>
 </context>
 <context>
@@ -4223,19 +4223,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi pacchetto</translation>
     </message>
     <message>
         <source>Remove Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi pacchetto</translation>
     </message>
     <message>
         <source>Adds new package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiunge un nuovo pacchetto.</translation>
     </message>
     <message>
         <source>Removes selected package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuove il pacchetto selezionato.</translation>
     </message>
 </context>
 <context>
@@ -4322,11 +4322,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Host Screensaver:</source>
-        <translation type="unfinished"></translation>
+        <translation>Salvaschermo host:</translation>
     </message>
     <message>
         <source>&Disable When Running Virtual Machines</source>
-        <translation type="unfinished"></translation>
+        <translation>&Disabilita durante l'esecuzione delle macchine virtuali</translation>
     </message>
 </context>
 <context>
@@ -4389,11 +4389,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Elenca tutte le scorciatoie disponibili che possono essere configurate.</translation>
     </message>
     <message>
         <source>Holds a sequence to filter the shortcut list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra un sequenza per filtrare l'elenco delle scorciatoie.</translation>
     </message>
 </context>
 <context>
@@ -4734,51 +4734,51 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi rete con NAT</translation>
     </message>
     <message>
         <source>Remove NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi rete con NAT</translation>
     </message>
     <message>
         <source>Edit NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica rete con NAT</translation>
     </message>
     <message>
         <source>Adds new NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiunge una nuova rete con NAT.</translation>
     </message>
     <message>
         <source>Removes selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuove la rete con NAT.</translation>
     </message>
     <message>
         <source>Edits selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica la rete con NAT.</translation>
     </message>
     <message>
         <source>Add Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi rete solo host</translation>
     </message>
     <message>
         <source>Remove Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi rete solo host</translation>
     </message>
     <message>
         <source>Edit Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica rete solo host</translation>
     </message>
     <message>
         <source>Adds new host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiunge una nuova rete solo host.</translation>
     </message>
     <message>
         <source>Removes selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuove la rete solo host selezionata.</translation>
     </message>
     <message>
         <source>Edits selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica la rete solo host selezionata.</translation>
     </message>
 </context>
 <context>
@@ -4972,11 +4972,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, la configurazione manuale sarà utilizzata per questa scheda di rete.</translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
-        <translation type="unfinished"></translation>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
+        <translation>Se marcata, il server DHCP sarà abilitato per questa rete all'avvio della macchina.</translation>
     </message>
 </context>
 <context>
@@ -5047,23 +5047,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, questa scheda sarà visualizzata.</translation>
     </message>
     <message>
         <source>When checked, this network will support DHCP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, questa rete supporterà il DHCP.</translation>
     </message>
     <message>
         <source>When checked, this network will support IPv6.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, questa rete supporterà l'IPv6.</translation>
     </message>
     <message>
         <source>When checked, this network will be advertised as the default IPv6 route.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, questa rete sarà pubblicata come la rotta predefinita IPv6.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Visualizza una finestra per configurare le regole di inoltro delle porte.</translation>
     </message>
 </context>
 <context>
@@ -5141,11 +5141,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the proxy host.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra l'host del proxy.</translation>
     </message>
     <message>
         <source>Holds the proxy port.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra la porta del proxy.</translation>
     </message>
 </context>
 <context>
@@ -5200,7 +5200,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="unfinished"></translation>
+        <translation>Specifica quanto spesso sarà eseguito il controllo della presenza di nuove versioni. Se si desidera disabilitare completamente questo controllo, è sufficiente deselezionare la precedente casella.</translation>
     </message>
 </context>
 <context>
@@ -5751,11 +5751,11 @@ p, li { white-space: pre-wrap; }
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
         <comment>HDD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Indica l'attività dei dischi fissi:</nobr>%1</p></translation>
     </message>
     <message>
         <source>Indicates whether the host keyboard is captured by the guest OS:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;keyboard is not captured</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;keyboard is captured</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation>Indica se la tastiera dell'host è stata catturata dal sistema operativo del guest:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;tastiera non catturata</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;tastiera catturata</nobr></translation>
     </message>
 </context>
 <context>
@@ -5868,7 +5868,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleziona il driver di uscita audio. Il <b>Driver audio Null</b> fa in modo che il guest veda una scheda audio, ogni accesso a essa sarà comunque ignorato.</translation>
     </message>
 </context>
 <context>
@@ -6182,67 +6182,67 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
+        <translation>Supporto HiDPI:</translation>
     </message>
     <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra il numero di porta del server VRDP. Puoi specificare <tt>0</tt> (zero), per selezionare la porta 3389, la porta standard per RDP.</translation>
     </message>
     <message>
         <source>Selects the VRDP authentication method.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleziona il metodo di autenticazione VRDP.</translation>
     </message>
     <message>
         <source>Holds the timeout for guest authentication, in milliseconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra il timeout per l'autenticazione del guest, in millisecondi.</translation>
     </message>
     <message>
         <source>When checked, multiple simultaneous connections to the VM are permitted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, sono consentite connessioni simultanee multiple alla MV.</translation>
     </message>
     <message>
         <source>Holds the filename VirtualBox uses to save the recorded content.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra il nome del file che VirtualBox utilizza per salvare il contenuto registrato.</translation>
     </message>
     <message>
         <source>Selects the resolution (frame size) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleziona la risoluzione (dimensione dei fotogrammi) del video registrato.</translation>
     </message>
     <message>
         <source>Holds the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra la risoluzione <b>orizzontale</b> (larghezza dei fotogrammi) del video registrato.</translation>
     </message>
     <message>
         <source>Holds the <b>vertical</b> resolution (frame height) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra la risoluzione <b>verticale</b> (altezza dei fotogrammi) del video registrato.</translation>
     </message>
     <message>
         <source>Controls the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Specifica il numero massimo di <b>fotogrammi al secondo</b>. I fotogrammi aggiuntivi saranno ignorati. La riduzione di questo valore aumenterà il numero di fotogrammi ignorati e riduce le dimensioni del file.</translation>
     </message>
     <message>
         <source>Controls the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Specifica la <b>qualità</b>. L'incremento di questo valore migliorerà la resa del video al costo di maggiori dimensioni del file.</translation>
     </message>
     <message>
         <source>Holds the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra il bitrate in <b>kilobit al secondo</b>. L'incremento di questo valore migliorerà la resa del video al costo di maggiori dimensioni del file.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>Alla macchina virtuale è attualmente assegnata meno di <b>%1</b> di memoria video che è la quantità minima richiesta per passare in modalità a schermo intero o trasparente.</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>When checked, enables video recording for screen %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, abilita la registrazione video per lo schermo %1.</translation>
     </message>
 </context>
 <context>
@@ -6578,11 +6578,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleziona il cifrario che deve essere utilizzato per cifrare i dischi delle macchine virtuali.</translation>
     </message>
     <message>
         <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra il percorso dove saranno archiviate le istantanee di questa macchina virtuale. Nota che le istantanee possono occupare molto spazio.</translation>
     </message>
 </context>
 <context>
@@ -6649,15 +6649,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, mostra la barra degli strumenti piccola nelle modalità a schermo intero e trasparente.</translation>
     </message>
     <message>
         <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra a scher&mo intero/trasparente</translation>
     </message>
     <message>
         <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, mostra la barra degli strumenti piccola nella parte superiore dello schermo, invece che nella posizione predefinita, nella parte bassa dello schermo.</translation>
     </message>
 </context>
 <context>
@@ -6944,23 +6944,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleziona il modo in cui questa scheda di rete virtuale è collegata alla rete reale del sistema host.</translation>
     </message>
     <message>
         <source>Shows additional network adapter options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra le opzioni aggiuntive della scheda di rete.</translation>
     </message>
     <message>
         <source>Holds the configuration settings for the network attachment driver. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra le impostazioni di configurazione del driver del collegamento di rete. Le impostazioni dovrebbero essere nella forma <b>nome=valore</b> e dipenderanno dal driver. Utilizza <b>maiusc-invio</b> per aggiungere una nuova voce.</translation>
     </message>
     <message>
         <source>When checked, the virtual network cable is plugged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, collega la scheda di rete virtuale.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Visualizza una finestra per configurare le regole di inoltro delle porte.</translation>
     </message>
 </context>
 <context>
@@ -7122,23 +7122,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">Nessun IRQ specifcato.</translation>
+        <translation>Nessun IRQ è attualmente specificato.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">Nessuna porta di I/O specificata.</translation>
+        <translation>Nessuna porta di I/O è attualmente specificata.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">Due o più porte hanno le stesse impostazioni.</translation>
+        <translation>Due o più porte hanno le stesse impostazioni.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">Nessun percorso della porta è attualmente specificato.</translation>
+        <translation>Nessun percorso della porta è attualmente specificato.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Esistono attualmente percorsi delle porte duplicati.</translation>
+        <translation>Esistono attualmente percorsi duplicati delle porte.</translation>
     </message>
 </context>
 <context>
@@ -7295,27 +7295,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi cartella condivisa</translation>
     </message>
     <message>
         <source>Edit Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica cartella condivisa</translation>
     </message>
     <message>
         <source>Remove Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuovi cartella condivisa</translation>
     </message>
     <message>
         <source>Adds new shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiunge una nuova cartella condivisa.</translation>
     </message>
     <message>
         <source>Edits selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica la cartella condivisa selezionata.</translation>
     </message>
     <message>
         <source>Removes selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuove la cartella condivisa selezionata.</translation>
     </message>
 </context>
 <context>
@@ -7374,7 +7374,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, this shared folder will be permanent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, questa cartella condivisa sarà permanente.</translation>
     </message>
 </context>
 <context>
@@ -7470,31 +7470,31 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleziona la modalità di lavoro di questa porta seriale. Se  selezioni <b>Disconnessa</b>, il sistema Guest rileverà la porta seriale, ma non sarà in grado di utilizzarla.</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, la macchina virtuale assumerà che la pipe o il socket specificato nel campo <b>Percorso/Indirizzo</b> esista e proverà a utilizzarla.Altrimenti, la pipe o il socket saranno creati dalla macchina virtuale al suo avvio.</translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">Nessun IRQ specifcato.</translation>
+        <translation>Nessun IRQ attualmente specificato.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">Nessuna porta di I/O specificata.</translation>
+        <translation>Nessuna porta di I/O attualmente specificata.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">Due o più porte hanno le stesse impostazioni.</translation>
+        <translation>Due o più porte hanno le stesse impostazioni.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">Nessun percorso della porta è attualmente specificato.</translation>
+        <translation>Nessun percorso della porta è attualmente specificato.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Esistono attualmente percorsi delle porte duplicati.</translation>
+        <translation>Esistono attualmente percorsi duplicati delle porte.</translation>
     </message>
 </context>
 <context>
@@ -8026,88 +8026,93 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Elenca tutti i controller di archiviazione per questa macchina, le immagini virtuali e i lettori dell'host collegati.</translation>
     </message>
     <message>
         <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra il nome del controller di archiviazione attualmente selezionato nell'albero di archiviazione.</translation>
     </message>
     <message>
         <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, consente l'utilizzo delle capacità di gestione della cache I/O dell'host.</translation>
     </message>
     <message>
         <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, impedisce la rimozione del disco virtuale quando il sistema guest lo espelle.</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, il sistema guest vedrà il disco virtuale come un dispositivo a stato solido.</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, il sistema guest vedrà il disco virtuale come un dispositivo collegabile a caldo.</translation>
     </message>
     <message>
         <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Scegli il file dell'immagine del disco virtuale...</translation>
     </message>
     <message>
         <source>Image</source>
         <comment>storage image</comment>
-        <translation type="unfinished">Immagine</translation>
+        <translation>Immagine</translation>
     </message>
     <message>
         <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Espande/Contrae&nbsp;elemento.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Aggiunge&nbsp;disco&nbsp;fisso.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Aggiunge&nbsp;lettore&nbsp;ottico.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Aggiunge&nbsp;lettore&nbsp;floppy.</nobr></translation>
     </message>
     <message>
         <source>Adds new storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiunger un nuovo controller di archiviazione.</translation>
     </message>
     <message>
         <source>Removes selected storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuove il controller di archiviazione selezionato.</translation>
     </message>
     <message>
         <source>Adds new storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiunge un nuovo collegamento di archiviazione.</translation>
     </message>
     <message>
         <source>Removes selected storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuove il collegamento di archiviazione selezionato.</translation>
     </message>
     <message>
         <source>Create New Hard Disk...</source>
-        <translation type="unfinished"></translation>
+        <translation>Crea un nuovo disco fisso...</translation>
     </message>
     <message>
         <source>Choose Virtual Hard Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli un disco fisso virtuale...</translation>
     </message>
     <message>
         <source>Choose Virtual Optical Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli un file di disco ottico virtuale...</translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
-        <translation type="unfinished"></translation>
+        <source>Remove Disk from Virtual Drive</source>
+        <translation>Rimuovi disco dal lettore virtuale</translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli un file di disco floppy virtuale...</translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation>Scegli immagine del disco...</translation>
     </message>
 </context>
 <context>
@@ -8403,29 +8408,29 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, il dispositivo RTC riporterà l'ora in UTC, altrimenti in ora locale (host). I sistemi UNIX di solito si aspettano che l'orologio hardware sia impostato in UTC.</translation>
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1 CPU</source>
         <comment>%1 is 1 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPU</translation>
     </message>
     <message>
         <source>%1 CPUs</source>
         <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPU</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
 </context>
 <context>
@@ -8589,63 +8594,63 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, abilita il controller USB OHCI virtuale di questa macchina. Il controller USB OHCI fornisce il supporto a USB 1.0.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, abilita il controller USB EHCI virtuale di questa macchina. Il controller USB EHCI fornisce il supporto a USB 2.0.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcata, abilita il controller USB xHCI virtuale di questa macchina. Il controller USB xHCI fornisce il supporto a USB 3.0.</translation>
     </message>
     <message>
         <source>Add Empty Filter</source>
-        <translation type="unfinished">Aggiungi un filtro vuoto</translation>
+        <translation>Aggiungi filtro vuoto</translation>
     </message>
     <message>
         <source>Add Filter From Device</source>
-        <translation type="unfinished">Aggiungi filtro da dispositivo</translation>
+        <translation>Aggiungi filtro da dispositivo</translation>
     </message>
     <message>
         <source>Edit Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica filtro</translation>
     </message>
     <message>
         <source>Remove Filter</source>
-        <translation type="unfinished">Rimuovi filtro</translation>
+        <translation>Rimuovi filtro</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
-        <translation type="unfinished">Sposta in alto</translation>
+        <translation>Sposta filtro in alto</translation>
     </message>
     <message>
         <source>Move Filter Down</source>
-        <translation type="unfinished">Sposta in basso</translation>
+        <translation>Sposta filtro in basso</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiunge un nuovo filtro USB con tutti i campi impostati inizialmente a stringhe vuote. Nota che un filtro del genere corrisponderà a qualsiasi dispositivo USB collegato.</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiunge un nuovo filtro USB con tutti i campi impostati ai valori del dispositivo USB selezionato, collegato al PC host.</translation>
     </message>
     <message>
         <source>Edits selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica il filtro USB selezionato.</translation>
     </message>
     <message>
         <source>Removes selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuove il filtro USB selezionato.</translation>
     </message>
     <message>
         <source>Moves selected USB filter up.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sposta il filtro USB selezionato verso l'alto.</translation>
     </message>
     <message>
         <source>Moves selected USB filter down.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sposta il filtro USB selezionato verso il basso.</translation>
     </message>
 </context>
 <context>
@@ -8751,35 +8756,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Definisce il filtro ID del venditore. Il formato della stringa di <i>corrispondenza esatta</i> è <tt>XXXX</tt> dove <tt>X</tt> è una cifra esadecimale. Una stringa vuota corrisponderà a qualsiasi valore.</translation>
     </message>
     <message>
         <source>Holds the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Definisce il filtro ID del prodotto. Il formato della stringa di <i>corrispondenza esatta</i> è <tt>XXXX</tt> dove <tt>X</tt> è una cifra esadecimale. Una stringa vuota corrisponderà a qualsiasi valore.</translation>
     </message>
     <message>
         <source>Holds the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Definisce il filtro del numero di revisione. Il formato della stringa di <i>corrispondenza esatta</i> è <tt>IIFF</tt> dove <tt>I</tt> è una cifra decimale della parte intera e <tt>F</tt> è una cifra decimale della parte frazionaria. Una stringa vuota corrisponderà a qualsiasi valore.</translation>
     </message>
     <message>
         <source>Holds the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Definisce il filtro del produttore come una stringa di <i>corrispondenza esatta</i>. Una stringa vuota corrisponderà a qualsiasi valore.</translation>
     </message>
     <message>
         <source>Holds the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Definisce il filtro del nome del prodotto come una stringa di <i>corrispondenza esatta</i>. Una stringa vuota corrisponderà a qualsiasi valore.</translation>
     </message>
     <message>
         <source>Holds the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Definisce il filtro del numero seriale come una stringa di <i>corrispondenza esatta</i>. Una stringa vuota corrisponderà a qualsiasi valore.</translation>
     </message>
     <message>
         <source>Holds the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Definisce il filtro della porta USB dell'host come una stringa di <i>corrispondenza esatta</i>. Una stringa vuota corrisponderà a qualsiasi valore.</translation>
     </message>
     <message>
         <source>Holds whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
-        <translation type="unfinished"></translation>
+        <translation>Definisce se questo filtro si applica ai dispositivi USB collegati localmente al computer host (<i>No</i>), a un computer client VRDP (<i>Sì</i>), o entrambi (<i>Qualsiasi</i>).</translation>
     </message>
 </context>
 <context>
@@ -8824,7 +8829,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Hard disks</source>
-        <translation type="unfinished"></translation>
+        <translation>Disc&hi fissi</translation>
     </message>
 </context>
 <context>
@@ -10810,43 +10815,43 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Uno o più file di immagini di dischi non sono al momento accessibili. Ciò significa che non sarai in grado di operare con le macchine virtuali che utilizzano questi supporti fino a quando non ritorneranno accessibili.</p><p>Premi <b>Controlla</b> per aprire la finestra del gestore supporti virtuali e vedere quali supporti non sono accessibili, o premi <b>Ignora</b> per ignorare questo messaggio.</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Eliminando un'istantanea, le informazioni di stato in essa memorizzate andranno perse, e i dati su disco sparsi sui diversi file immagine creati da VirtualBox insieme all'istantanea saranno riuniti in un singolo file. Tale processo può risultare lungo, e le informazioni nell'istantanea non possono essere ripristinate.</p></p>Sei sicuro di voler eliminare l'istantanea selezionata <b>%1</b>?</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>L'eliminazione dell'istantanea %1 richiederà temporaneamente altro spazio su disco. Nel peggiore dei casi la dimensione dell'immagine %2 crescerà di %3, ma sul filesystem ci sono solo %4 liberi.</p><p>Finire lo spazio durante l'operazione di fusione potrebbe produrre un danneggiamento dell'immagine e della configurazione della MV, ad es. la perdita della MV e dei relativi dati.</p><p>Puoi continuare con l&apos [...]
     </message>
     <message>
         <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Sei sicuro di voler rilasciare il file di immagine del disco <nobr><b>%1</b></nobr>?</p><p>Sarà sganciato dalle seguenti macchine virtuali: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Vuoi eliminare l'unità di archiviazione del disco fisso virtuale <nobr><b>%1</b></nobr>?</p><p>Se selezioni <b>Elimina</b>, l'unità di archiviazione specificata sarà eliminata in modo definitivo. Questa operazione <b>non può essere annullata</b>.</p><p>Se selezioni <b>Mantieni</b>, il disco fisso sarà rimosso solo dall'elenco dei dischi fissi conosciuti, ma l&a [...]
     </message>
     <message>
         <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Apertura del file del file di immagine del disco <nobr><b>%1</b></nobr> non riuscita.</translation>
     </message>
     <message>
         <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiusura del file del file di immagine del disco <nobr><b>%1</b></nobr> non riuscita.</translation>
     </message>
     <message>
         <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Stai creando una nuova macchina virtuale senza un disco fisso. Non potrai installare un sistema operativo sulla macchina fino a quando non ne aggiungerai uno. Nel frattempo, potrai avviare una macchina utilizzando un disco ottico virtuale o dalla rete.</translation>
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>La finestra della macchina virtuale passerà ora alla modalità a <b>schermo intero</b>. Puoi tornare alla modalità a finestra in qualunque momento premendo <b>%1</b>.</p><p>Nota che il tasto <i>Host</i> è attualmente definito come <b>%2</b>.</p><p>Nota inoltre che la barra principale dei menu è nascosta nella modalità a schermo intero. Puoi accedervi premendo <b>Host+Home</b>. [...]
     </message>
     <message>
         <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Impossibile abilitare la modalità a schermo intero a causa della mancanza di memoria video nel sistema guest.</p><p>È necessario configurare la macchina virtuale assegnandole almeno <b>%1</b> di memoria video.</p><p>Premi <b>Ignora</b> per passare comunque alla modalità a  schermo intero oppure premi <b>Annulla</b> per annullare l'operazione.</p></translation>
     </message>
 </context>
 <context>
@@ -12000,55 +12005,55 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.<
     <name>UIPortForwardingTable</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Nome</translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Protocol</source>
-        <translation type="unfinished">Protocollo</translation>
+        <translation>Protocollo</translation>
     </message>
     <message>
         <source>Host IP</source>
-        <translation type="unfinished">IP dell'host</translation>
+        <translation>IP dell'host</translation>
     </message>
     <message>
         <source>Host Port</source>
-        <translation type="unfinished">Porta dell'host</translation>
+        <translation>Porta dell'host</translation>
     </message>
     <message>
         <source>Guest IP</source>
-        <translation type="unfinished">IP del Guest</translation>
+        <translation>IP del guest</translation>
     </message>
     <message>
         <source>Guest Port</source>
-        <translation type="unfinished">Porta del Guest</translation>
+        <translation>Porta del guest</translation>
     </message>
     <message>
         <source>Contains a list of port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Contiene un elenco delle regole di inoltro delle porte.</translation>
     </message>
     <message>
         <source>Add New Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi nuova regola</translation>
     </message>
     <message>
         <source>Copy Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia regola selezionata</translation>
     </message>
     <message>
         <source>Remove Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina regola selezionata</translation>
     </message>
     <message>
         <source>Adds new port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiunge una nuova regola di inoltro delle porte.</translation>
     </message>
     <message>
         <source>Copies selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia la regola di inoltro delle porte selezionata.</translation>
     </message>
     <message>
         <source>Removes selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rimuove la regola di inoltro delle porte selezionata.</translation>
     </message>
 </context>
 <context>
@@ -12370,7 +12375,7 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.<
     </message>
     <message>
         <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"><nobr>Fai <b>clic</b> per commutare la presenza dell'indicatore.</nobr><br><nobr><b>Trascina e rilascia</b> per cambiare la posizione dell'indicatore.</nobr></translation>
+        <translation><nobr>Fai <b>clic</b> per commutare la presenza dell'indicatore.</nobr><br><nobr><b>Trascina e rilascia</b> per cambiare la posizione dell'indicatore.</nobr></translation>
     </message>
 </context>
 <context>
@@ -12920,7 +12925,7 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.<
     </message>
     <message>
         <source>&Fixed size</source>
-        <translation>Dimensione &fissa</translation>
+        <translation>Dimensione speci&ficata</translation>
     </message>
     <message>
         <source>&Split into files of less than 2GB</source>
@@ -12961,75 +12966,75 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.<
     </message>
     <message>
         <source>Copy Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia disco fisso virtuale</translation>
     </message>
     <message>
         <source>Hard disk to copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Disco fisso da copiare</translation>
     </message>
     <message>
         <source><p>Please select the virtual hard disk file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Seleziona il file di disco virtuale che desideri copiare se non è ancora selezionato. Puoi sceglierne uno dall'elenco o utilizzare l'icona della cartella accanto all'elenco per selezionarlo.</p></translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file to copy...</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli un file di disco fisso virtuale da copiare...</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo di file del disco fisso</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli il tipo del file che desideri utilizzare per il nuovo disco fisso virtuale. Se non hai bisogno di utilizzarlo con altri programmi di virtualizzazione, puoi lasciare inalterata questa opzione.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Archiviazione su disco fisso fisico</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli se il nuovo disco fisso virtuale deve crescere in base all'utilizzo (allocato dinamicamente) o se deve essere creato alla dimensione massima (dimensione specificata).</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Un disco fisso virtuale <b>allocato dinamicamente</b> utilizzerà solo lo spazio del disco fisico che si riempe (fino alla massima <b>dimensione specificata</b>), ma non si ridurrà automaticamente se lo spazio viene liberato.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Un file di disco fisso a <b>dimensione specificata</b> richiede normalmente più tempo per la creazione su alcuni sistemi, ma è spesso più veloce nell'utilizzo.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Puoi scegliere anche di <b>dividere</b> il file del disco fisso in diversi file, ognuno della dimensione massima di due gygabyte. È utile principalmente se desideri archiviare la macchina virtuale su dispositivi USB o sistemi datati, alcuni dei quali non sono in grado di gestire file molto grandi.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli una posizione per il nuovo file di disco fisso virtuale</translation>
     </message>
     <message>
         <source>New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuovo disco fisso da creare</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Digita il nome del nuovo disco fisso virtuale nella casella seguente o fai clic sull'icona della cartella per selezionare una cartella di destinazione diversa.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli una posizione per il nuovo file di disco fisso virtuale...</translation>
     </message>
     <message>
         <source>Hard disk to &copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Disco fisso da &copiare</translation>
     </message>
     <message>
         <source>&New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>&Nuovo disco fisso da creare</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>&Tipo di file del disco fisso</translation>
     </message>
 </context>
 <context>
@@ -13132,7 +13137,7 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.<
     </message>
     <message>
         <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Scegli il tipo di clone che desideri creare.</p><p>Se scegli <b>Clone completo</b>, sarà creata una copia esatta (inclusi tutti i file dei dischi virtuali) della macchina di origine.</p><p>Se scegli <b>Clone collegato</b>, sarà creata una nuova macchina, ma i file dei dischi virtuali saranno collegati ai dischi virtuali della macchina di origine e non potrai spostare la nuova macchina virtuale su un altro compu [...]
     </message>
 </context>
 <context>
@@ -13450,7 +13455,7 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.<
     </message>
     <message>
         <source>&Fixed size</source>
-        <translation>Dimensione &fissa</translation>
+        <translation>Dimensione speci&ficata</translation>
     </message>
     <message>
         <source>&Split into files of less than 2GB</source>
@@ -13490,51 +13495,51 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.<
     </message>
     <message>
         <source>Create Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Crea disco fisso virtuale</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo di file del disco fisso</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli il tipo del file che desideri utilizzare per il nuovo disco fisso virtuale. Se non hai bisogno di utilizzarlo con altri programmi di virtualizzazione, puoi lasciare inalterata questa opzione.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Archiviazione su disco fisso fisico</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli se il nuovo disco fisso virtuale deve crescere in base all'utilizzo (allocato dinamicamente) o se deve essere creato alla dimensione massima (dimensione specificata).</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Un file di disco fisso <b>allocato dinamicamente</b> utilizzerà solo lo spazio del disco fisico che si riempe (fino alla massima <b>dimensione specificata</b>), ma non si ridurrà automaticamente se lo spazio viene liberato.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Un file di disco fisso a <b>dimensione specificata</b> richiede normalmente più tempo per la creazione su alcuni sistemi, ma è spesso più veloce nell'utilizzo.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Puoi scegliere anche di <b>dividere</b> il file del disco fisso in diversi file, ognuno della dimensione massima di due gygabyte. È utile principalmente se desideri archiviare la macchina virtuale su dispositivi USB o sistemi datati, alcuni dei quali non sono in grado di gestire file molto grandi.</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Digita il nome del nuovo disco fisso virtuale nella casella seguente o fai clic sull'icona della cartella per selezionare una cartella di destinazione diversa.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli una posizione per il nuovo file di disco fisso virtuale...</translation>
     </message>
     <message>
         <source>Select the size of the virtual hard disk in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleziona la dimensione del disco fisso virtuale in megabyte. Questa dimensione è il limite sul totale dei dati che una macchina virtuale sarà in grado di archiviare su disco.</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>&Tipo di file del disco fisso</translation>
     </message>
 </context>
 <context>
@@ -13625,27 +13630,27 @@ questo passo e collegare hard disk più tardi tramite Impostazioni della MV.<
     </message>
     <message>
         <source>Hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Disco fisso</translation>
     </message>
     <message>
         <source><p>If you wish you can add a virtual hard disk to the new machine. You can either create a new hard disk file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard disk is <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Se lo desideri, puoi aggiungere un disco fisso virtuale alla nuova macchina. Puoi creare un nuovo file di disco fisso, selezionarne uno dall'elenco o da un'altra posizione utilizzando l'icona della cartella.</p><p>Se hai bisogno di una configurazione di archiviazione più complessa, puoi saltare questo passaggio e modificare le impostazioni della macchina dopo averla creata.</p><p>La dimensione consigliata del disco fiss [...]
     </message>
     <message>
         <source>&Do not add a virtual hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Non aggiungere un &disco fisso virtuale</translation>
     </message>
     <message>
         <source>&Create a virtual hard disk now</source>
-        <translation type="unfinished"></translation>
+        <translation>&Crea subito un nuovo disco fisso virtuale</translation>
     </message>
     <message>
         <source>&Use an existing virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>&Usa un file di disco fisso virtuale esistente</translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli un file di disco fisso virtuale...</translation>
     </message>
 </context>
 <context>
@@ -14890,19 +14895,19 @@ Versione %1</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Apre una finestra per selezionare una cartella diversa.</translation>
     </message>
     <message>
         <source>Displays a window to select a different file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Apre una finestra per selezionare un file differente.</translation>
     </message>
     <message>
         <source>Holds the folder path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra il percorso della cartella.</translation>
     </message>
     <message>
         <source>Holds the file path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra il percorso del file.</translation>
     </message>
 </context>
 <context>
@@ -15836,7 +15841,7 @@ Versione %1</translation>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Il collegamento di questo disco fisso sarà eseguito indirettamente utilizzando un nuovo disco differenziale.</translation>
+        <translation>Il collegamento di questo disco fisso sarà eseguito indirettamente utilizzando un nuovo disco fisso differenziale.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -15846,7 +15851,7 @@ Versione %1</translation>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Questo disco fisso di base è collegato indirettamente utilizzando il seguente disco differenziale:</translation>
+        <translation>Questo disco fisso di base è collegato indirettamente utilizzando il seguente disco fisso differenziale:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -16532,7 +16537,7 @@ Versione %1</translation>
     <message>
         <source>Fixed size storage</source>
         <comment>MediumVariant</comment>
-        <translation>Archiviazione a dimensione fissa</translation>
+        <translation>Archiviazione a dimensione specificata</translation>
     </message>
     <message>
         <source>Dynamically allocated storage split into files of less than 2GB</source>
@@ -16547,7 +16552,7 @@ Versione %1</translation>
     <message>
         <source>Fixed size storage split into files of less than 2GB</source>
         <comment>MediumVariant</comment>
-        <translation>Archiviazione a dimensione fissa divisa in file di dimensione inferiore a 2GB</translation>
+        <translation>Archiviazione a dimensione specificata divisa in file di dimensione inferiore a 2GB</translation>
     </message>
     <message>
         <source>Dynamically allocated compressed storage</source>
@@ -16562,12 +16567,12 @@ Versione %1</translation>
     <message>
         <source>Fixed size ESX storage</source>
         <comment>MediumVariant</comment>
-        <translation>Archiviazione ESX a dimensione fissa</translation>
+        <translation>Archiviazione ESX a dimensione specificata</translation>
     </message>
     <message>
         <source>Fixed size storage on raw disk</source>
         <comment>MediumVariant</comment>
-        <translation>Archiviazione su disco raw a dimensione fissa</translation>
+        <translation>Archiviazione su disco raw a dimensione specificata</translation>
     </message>
     <message>
         <source>Deny</source>
@@ -16975,20 +16980,20 @@ Versione %1</translation>
     </message>
     <message>
         <source>Please choose a virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli un file di disco fisso virtuale</translation>
     </message>
     <message>
         <source>All virtual hard disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tutti i file di disco fisso virtuale (%1)</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Medium Manager to inspect these files.</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Alcuni dei file nella catena di dischi fissi non sono accessibili. Utilizza il Gestore supporti virtuali in modalità per ispezionarli.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli una posizione per il nuovo file di disco fisso virtuale</translation>
     </message>
 </context>
 <context>
@@ -18982,19 +18987,19 @@ per accedervi da un sistema Linux. Questa funzionalità richiede Guest Additions
     </message>
     <message>
         <source>Restore selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Ripristina l'istantanea selezionata della macchina virtuale</translation>
     </message>
     <message>
         <source>Delete selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina l'istantanea selezionata della macchina virtuale</translation>
     </message>
     <message>
         <source>Display a window with selected snapshot details</source>
-        <translation type="unfinished"></translation>
+        <translation>Visualizza una finestra con i dettagli dell'istantanea selezionata</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Clona la macchina virtuale selezionata</translation>
     </message>
 </context>
 <context>
@@ -19055,7 +19060,7 @@ per accedervi da un sistema Linux. Questa funzionalità richiede Guest Additions
     </message>
     <message>
         <source>Snapshot %1</source>
-        <translation type="unfinished">Istantanea %1</translation>
+        <translation>Istantanea %1</translation>
     </message>
 </context>
 <context>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
index 459bc9c..e5fd3d1 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
@@ -1210,312 +1210,312 @@
     </message>
     <message>
         <source>Minimize active window</source>
-        <translation type="unfinished"></translation>
+        <translation>アクティブなウィンドウを最小化する</translation>
     </message>
     <message>
         <source>Display the Network Operations Manager window</source>
-        <translation type="unfinished"></translation>
+        <translation>ネットワーク操作マネージャーのウィンドウを表示</translation>
     </message>
     <message>
         <source>Display a window with product information</source>
-        <translation type="unfinished"></translation>
+        <translation>製品情報ウィンドウを表示</translation>
     </message>
     <message>
         <source>&Preferences...</source>
         <comment>global preferences window</comment>
-        <translation type="unfinished">環境設定(&P)...</translation>
+        <translation>環境設定(&P)...</translation>
     </message>
     <message>
         <source>Display the global preferences window</source>
-        <translation type="unfinished"></translation>
+        <translation>環境設定ウィンドウを表示</translation>
     </message>
     <message>
         <source>Display the virtual machine settings window</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシン設定ウィンドウを表示</translation>
     </message>
     <message>
         <source>Display the virtual machine session information window</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンセッション情報ウィンドウを表示</translation>
     </message>
     <message>
         <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <translation>保存状態(&S)</translation>
     </message>
     <message>
         <source>Save the state of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンを保存状態にする</translation>
     </message>
     <message>
         <source>Send the ACPI Shutdown signal to the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンにACPIシャットダウン信号を送信する</translation>
     </message>
     <message>
         <source>&Minimize Window</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィンドウを最小化(&M)</translation>
     </message>
     <message>
         <source>Automatically resize the guest display when the window is resized</source>
-        <translation type="unfinished"></translation>
+        <translation>ウィンドウをリサイズしたとき、ゲストOS画面を自動的にリサイズする</translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
-        <translation type="unfinished"></translation>
+        <source>Take guest display screenshot</source>
+        <translation>ゲストOS画面のスクリーンショットを撮影</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure video capture</source>
+        <translation>ビデオキャプチャーの設定に仮想マシン設定ウィンドウを表示</translation>
     </message>
     <message>
         <source>Enable guest display video capture</source>
-        <translation type="unfinished"></translation>
+        <translation>ゲストOS画面のビデオキャプチャーを有効化</translation>
     </message>
     <message>
         <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <translation>この仮想マシンへのリモートデスクトップ(RDP)接続を許可する</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure menu-bar</source>
+        <translation>メニューバーの設定にウィンドウを表示</translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable menu-bar</source>
+        <translation>メニューバーを有効にする</translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure status-bar</source>
+        <translation>ステータスバーの設定にウィンドウを表示</translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable status-bar</source>
+        <translation>ステータスバーを有効にする</translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
-        <translation type="unfinished"></translation>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
+        <translation>ショートカットの設定に環境設定ウィンドウを表示</translation>
     </message>
     <message>
         <source>&Insert %1</source>
         <comment>that means send the %1 key sequence to the virtual machine</comment>
-        <translation type="unfinished">送信(&I) %1</translation>
+        <translation>送信(&I) %1</translation>
     </message>
     <message>
         <source>&Hard Disks</source>
-        <translation type="unfinished">ハードディスク(&H)</translation>
+        <translation>ハードディスク(&H)</translation>
     </message>
     <message>
         <source>&Hard Disk Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>ハードディスクの設定(&H)...</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure hard disks</source>
+        <translation>ハードディスクの設定に仮想マシン設定ウィンドウを表示</translation>
     </message>
     <message>
         <source>&Network</source>
-        <translation type="unfinished"></translation>
+        <translation>ネットワーク(&N)</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure network adapters</source>
+        <translation>ネットワークアダプタ―の設定に仮想マシン設定ウィンドウを表示</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure USB devices</source>
+        <translation>USBデバイスの設定に仮想マシン設定ウィンドウを表示</translation>
     </message>
     <message>
         <source>&Drag and Drop</source>
-        <translation type="unfinished"></translation>
+        <translation>ドラッグ&ドロップ(&D)</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure shared folders</source>
+        <translation>共有フォルダーの設定に仮想マシン設定ウィンドウを表示</translation>
     </message>
     <message>
         <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Guest Additions ディスクファイルを仮想光学ドライブに挿入します</translation>
     </message>
     <message>
         <source>%1%</source>
         <comment>scale-factor</comment>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>Enable</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">有効</translation>
+        <translation>有効</translation>
     </message>
     <message>
         <source>Resize to %1x%2</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">%1 x %2 にリサイズ</translation>
+        <translation>%1 x %2 にリサイズ</translation>
     </message>
     <message>
         <source>Preview Monitor %1</source>
-        <translation type="unfinished"></translation>
+        <translation>プレビュー ディスプレイ %1</translation>
     </message>
     <message>
         <source>&Connect Network Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>ネットワークアダプターを接続(&C)</translation>
     </message>
     <message>
         <source>Connect Network Adapter &%1</source>
-        <translation type="unfinished"></translation>
+        <translation>ネットワークアダプターを接続 &%1</translation>
     </message>
     <message>
         <source>No USB Devices Connected</source>
-        <translation type="unfinished">USB デバイス 未接続</translation>
+        <translation>USB デバイス未接続</translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
-        <translation type="unfinished"></translation>
+        <translation>ホストPCにサポートしているデバイスが接続されていません</translation>
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished">Webカメラ未接続</translation>
+        <translation>Webカメラ未接続</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
-        <translation type="unfinished">ホストPCにサポートしているWebカメラが接続されていません</translation>
+        <translation>ホストPCにサポートしているWebカメラが接続されていません</translation>
     </message>
     <message>
         <source>Create new virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>新規仮想マシンの作成</translation>
     </message>
     <message>
         <source>Add existing virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>既存の仮想マシンを追加</translation>
     </message>
     <message>
         <source>Rename selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンの名前を変更</translation>
     </message>
     <message>
         <source>&Ungroup</source>
-        <translation type="unfinished"></translation>
+        <translation>グループ解除(&U)</translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <source>Ungroup items of selected virtual machine group</source>
+        <translation>選択した仮想マシングループのグループを解除</translation>
     </message>
     <message>
         <source>&Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>ソート(&S)</translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort items of selected virtual machine group alphabetically</source>
+        <translation>選択した仮想マシングループのアイテムをアルファベット順にソート</translation>
     </message>
     <message>
         <source>Add new group based on selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンに基づいて新しいグループを作成</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンをクローン</translation>
     </message>
     <message>
         <source>Remove selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンを除去</translation>
     </message>
     <message>
         <source>Start selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンを起動</translation>
     </message>
     <message>
         <source>Switch to the windows of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンのウィンドウに切り替え</translation>
     </message>
     <message>
         <source>Start selected virtual machines in the background</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンをバックグラウンドで起動</translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
-        <translation type="unfinished"></translation>
+        <source>Start selected virtual machines with option of continuing in background</source>
+        <translation>仮想マシンを、ウィンドウを閉じてもバックグラウンドで継続できるオプション付きで起動</translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Suspend execution of selected virtual machines</source>
+        <translation>選択した仮想マシンの実行を一時停止する</translation>
     </message>
     <message>
         <source>Reset selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンを再起動</translation>
     </message>
     <message>
         <source>D&iscard Saved State...</source>
-        <translation type="unfinished"></translation>
+        <translation>保存状態を破棄(&I)...</translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Discard saved state of selected virtual machines</source>
+        <translation>選択した仮想マシンを破棄</translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Show log files of selected virtual machines</source>
+        <translation>選択した仮想マシンのログファイルを参照する</translation>
     </message>
     <message>
         <source>Re&fresh</source>
-        <translation type="unfinished">最新の情報に更新(&F)</translation>
+        <translation>最新の情報に更新(&F)</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Refresh accessibility state of selected virtual machines</source>
+        <translation>選択した仮想マシンのアクセス可否状態を最新の情報に更新する</translation>
     </message>
     <message>
         <source>S&how in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>Finderに表示(&H)</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシン定義ファイルをFinderに表示</translation>
     </message>
     <message>
         <source>S&how in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>エクスプローラーに表示(&H)</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシン定義ファイルをエクスプローラーに表示</translation>
     </message>
     <message>
         <source>S&how in File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイルマネージャーで表示(&H)</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in the File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシン定義ファイルをファイルマネージャーに表示</translation>
     </message>
     <message>
         <source>Cr&eate Alias on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>デスクトップにエイリアスを作成(&E)</translation>
     </message>
     <message>
         <source>Create alias files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシン定義ファイルのエイリアスをデスクトップに作成</translation>
     </message>
     <message>
         <source>Cr&eate Shortcut on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>デスクトップにショートカットを作成(&E)</translation>
     </message>
     <message>
         <source>Create shortcut files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシン定義ファイルのショートカットをデスクトップに作成</translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort group of first selected virtual machine alphabetically</source>
+        <translation>選択したグループの仮想マシンをアルファベット順にソートします</translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Save state of selected virtual machines</source>
+        <translation>選択した仮想マシンを保存状態にする</translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
+        <translation>仮想マシンにACPIシャットダウン信号を送信する</translation>
     </message>
     <message>
         <source>Power off selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンを電源オフ</translation>
     </message>
 </context>
 <context>
@@ -1559,23 +1559,23 @@
     <message>
         <source>Status</source>
         <comment>password table field</comment>
-        <translation type="unfinished">パスワード表フィールド</translation>
+        <translation>ステータス</translation>
     </message>
     <message>
         <source>ID</source>
         <comment>password table field</comment>
-        <translation type="unfinished">ID</translation>
+        <translation>ID</translation>
     </message>
     <message>
         <source>Password</source>
         <comment>password table field</comment>
-        <translation type="unfinished">パスワード</translation>
+        <translation>パスワード</translation>
     </message>
     <message numerus="yes">
         <source><nobr>Used by the following %n hard disk(s):</nobr><br>%1</source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many hard drives are in the tool-tip and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><nobr>以下の %n ハードディスクで使用中:</nobr><br>%1</numerusform>
         </translation>
     </message>
 </context>
@@ -1709,19 +1709,19 @@
     </message>
     <message>
         <source>Storage Controller (IDE)</source>
-        <translation type="unfinished"></translation>
+        <translation>ストレージコントローラー (IDE)</translation>
     </message>
     <message>
         <source>Storage Controller (SATA)</source>
-        <translation type="unfinished"></translation>
+        <translation>ストレージコントローラー (SATA)</translation>
     </message>
     <message>
         <source>Storage Controller (SCSI)</source>
-        <translation type="unfinished"></translation>
+        <translation>ストレージコントローラー (SCSI)</translation>
     </message>
     <message>
         <source>Storage Controller (SAS)</source>
-        <translation type="unfinished"></translation>
+        <translation>ストレージコントローラー (SAS)</translation>
     </message>
 </context>
 <context>
@@ -2273,7 +2273,7 @@
     </message>
     <message>
         <source>Retrieving data ...</source>
-        <translation type="unfinished">データを読み出し中...</translation>
+        <translation>データを読み出し中...</translation>
     </message>
 </context>
 <context>
@@ -3220,9 +3220,9 @@ p, li { white-space: pre-wrap; }
         <translation>汎用ドライバー, '%1' </translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>汎用ドライバー, '%1' {&nbsp;%2&nbsp;} </translation>
+        <translation>汎用ドライバー, '%1' { %2 }</translation>
     </message>
     <message>
         <source>NAT Network, '%1'</source>
@@ -3705,15 +3705,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the maximum width which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>ゲストで使用するスクリーンの最大幅を指定してください。</translation>
     </message>
     <message>
         <source>Holds the maximum height which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>ゲストで使用するスクリーンの最大幅を指定してください。</translation>
     </message>
     <message>
         <source>When checked, machine windows will be raised when the mouse pointer moves over them.</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンのウィンドウが、マウスポインターが通過する際にアクティブになるようになります。</translation>
     </message>
 </context>
 <context>
@@ -3764,19 +3764,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add Package</source>
-        <translation type="unfinished"></translation>
+        <translation>パッケージを追加</translation>
     </message>
     <message>
         <source>Remove Package</source>
-        <translation type="unfinished"></translation>
+        <translation>パッケージを除去</translation>
     </message>
     <message>
         <source>Adds new package.</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいパッケージを追加します。</translation>
     </message>
     <message>
         <source>Removes selected package.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したパッケージを除去します。</translation>
     </message>
 </context>
 <context>
@@ -3863,11 +3863,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Host Screensaver:</source>
-        <translation type="unfinished"></translation>
+        <translation>ホストのスクリーンセーバー:</translation>
     </message>
     <message>
         <source>&Disable When Running Virtual Machines</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンの動作時に無効(&D)</translation>
     </message>
 </context>
 <context>
@@ -3930,11 +3930,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>設定できるすべてのショートカット一覧を表示します。</translation>
     </message>
     <message>
         <source>Holds a sequence to filter the shortcut list.</source>
-        <translation type="unfinished"></translation>
+        <translation>検索語を指定してショートカットリストを絞り込みます。</translation>
     </message>
 </context>
 <context>
@@ -4061,7 +4061,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>%1 (renamed from %2)</source>
-        <translation>%1 (%2 から名称変更した)</translation>
+        <translation>%1 (%2 から名称変更)</translation>
     </message>
     <message>
         <source>Old Network Name</source>
@@ -4275,51 +4275,51 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NATネットワークを追加</translation>
     </message>
     <message>
         <source>Remove NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NATネットワークを除去</translation>
     </message>
     <message>
         <source>Edit NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NATネットワークを編集</translation>
     </message>
     <message>
         <source>Adds new NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいNATネットワークを追加します。</translation>
     </message>
     <message>
         <source>Removes selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したNATネットワークを除去します。</translation>
     </message>
     <message>
         <source>Edits selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したNATネットワークを編集します。</translation>
     </message>
     <message>
         <source>Add Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>ホストオンリーネットワークを追加</translation>
     </message>
     <message>
         <source>Remove Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>ホストオンリーネットワークを除去</translation>
     </message>
     <message>
         <source>Edit Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>ホストオンリーネットワークを編集</translation>
     </message>
     <message>
         <source>Adds new host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいホストオンリーネットワークを追加します。</translation>
     </message>
     <message>
         <source>Removes selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したホストオンリーネットワークを除去します。</translation>
     </message>
     <message>
         <source>Edits selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したホストオンリーネットワークを編集します。</translation>
     </message>
 </context>
 <context>
@@ -4513,11 +4513,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>このネットワークアダプターを手動で構成します。</translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
-        <translation type="unfinished"></translation>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
+        <translation>仮想マシンの起動時にこのネットワークのDHCPサーバーが有効になります。</translation>
     </message>
 </context>
 <context>
@@ -4588,23 +4588,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>このネットワークを有効にします。</translation>
     </message>
     <message>
         <source>When checked, this network will support DHCP.</source>
-        <translation type="unfinished"></translation>
+        <translation>このネットワークをDHCPサポートにします。</translation>
     </message>
     <message>
         <source>When checked, this network will support IPv6.</source>
-        <translation type="unfinished"></translation>
+        <translation>このネットワークをIPv6サポートにします。</translation>
     </message>
     <message>
         <source>When checked, this network will be advertised as the default IPv6 route.</source>
-        <translation type="unfinished"></translation>
+        <translation>このネットワークを既定のIPv6ルートとして広告します。</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>ポートフォワーディングのルールを設定するウィンドウを表示します。</translation>
     </message>
 </context>
 <context>
@@ -4682,11 +4682,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the proxy host.</source>
-        <translation type="unfinished"></translation>
+        <translation>プロキシーのホストを指定します。</translation>
     </message>
     <message>
         <source>Holds the proxy port.</source>
-        <translation type="unfinished"></translation>
+        <translation>プロキシーのポートを指定します。</translation>
     </message>
 </context>
 <context>
@@ -4741,7 +4741,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="unfinished"></translation>
+        <translation>アップデートを確認する頻度を選択します。 注:アップデートを確認しない場合は、上部のチェックボックスを空欄にしてください。</translation>
     </message>
 </context>
 <context>
@@ -5282,11 +5282,11 @@ p, li { white-space: pre-wrap; }
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
         <comment>HDD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>アクティブなハードディスクを表示:</nobr>%1</p></translation>
     </message>
     <message>
         <source>Indicates whether the host keyboard is captured by the guest OS:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;keyboard is not captured</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;keyboard is captured</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation>ホストのキーボードがゲストOSにキャプチャーされているかどうかを示します: <br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;キーボードはキャプチャーされていません</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;キーボードはキャプチャーされています</nobr></translation>
     </message>
 </context>
 <context>
@@ -5403,7 +5403,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation type="unfinished"></translation>
+        <translation>オーディオ出力ドライバーを選択します。<b>Null Audio Driver</b>はゲストOSからオーディオカードとして認識されますが、デバイスへのすべてのアクセスは無視されます。</translation>
     </message>
 </context>
 <context>
@@ -5733,67 +5733,67 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
+        <translation>HiDPI サポート:</translation>
     </message>
     <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="unfinished"></translation>
+        <translation>VRDP サーバーのポート番号を指定してください。RDP標準のポート番号(3389)を選択するために<tt>0</tt>(ゼロ)を指定できます。</translation>
     </message>
     <message>
         <source>Selects the VRDP authentication method.</source>
-        <translation type="unfinished"></translation>
+        <translation>VRDP の認証方式を選択してください。</translation>
     </message>
     <message>
         <source>Holds the timeout for guest authentication, in milliseconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>ゲスト認証のタイムアウト値をミリ秒単位で指定してください。</translation>
     </message>
     <message>
         <source>When checked, multiple simultaneous connections to the VM are permitted.</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンへの複数の同時接続を許可します。</translation>
     </message>
     <message>
         <source>Holds the filename VirtualBox uses to save the recorded content.</source>
-        <translation type="unfinished"></translation>
+        <translation>VirtualBoxユーザーが録画したコンテンツのファイル名を指定します。</translation>
     </message>
     <message>
         <source>Selects the resolution (frame size) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>録画するビデオの解像度(フレームサイズ)を選択します。</translation>
     </message>
     <message>
         <source>Holds the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>録画するビデオの <b>横</b> の解像度(フレーム幅)を指定します。</translation>
     </message>
     <message>
         <source>Holds the <b>vertical</b> resolution (frame height) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>録画するビデオの <b>縦</b> の解像度(フレーム高)を指定します。</translation>
     </message>
     <message>
         <source>Controls the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>最大の<b>フレーム毎秒</b>を調整します。追加のフレームはスキップされます。この値を少なくするとスキップするフレームが多くなり、ファイルサイズが小さくなります。</translation>
     </message>
     <message>
         <source>Controls the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation><b>画質</b>を調整します。この値を増やすとビデオの画質が向上し、ファイルサイズが増加します。</translation>
     </message>
     <message>
         <source>Holds the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>ビットレート(<b>キロバイト毎秒</b>)を指定します。この値を大きくするとビデオの画質が向上し、ファイルサイズが増加します。</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンはビデオメモリーが <b>%1</b> よりも少なく割り当てられています。フルスクリーンやシームレスモードに切り替えるのであれば最低でも左記の量を割り当ててください。</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>When checked, enables video recording for screen %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>スクリーン %1 のビデオキャプチャーを有効にします。</translation>
     </message>
 </context>
 <context>
@@ -6117,11 +6117,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンのディスクを暗号化する際に使用する暗号化方式を選択してください。</translation>
     </message>
     <message>
         <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
-        <translation type="unfinished"></translation>
+        <translation>この仮想マシンのスナップショットの保存先パスを指定します。注:スナップショットは多くのディスク容量を消費します。</translation>
     </message>
 </context>
 <context>
@@ -6188,15 +6188,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
+        <translation>フルスクリーンモードまたはシームレスモード時にミニ ツールバーを表示します。</translation>
     </message>
     <message>
         <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
+        <translation>フルスクリーン/シームレスモード時に表示(&F)</translation>
     </message>
     <message>
         <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>ミニツールバーを画面の上部に表示します。デフォルトの位置は画面の下部です。</translation>
     </message>
 </context>
 <context>
@@ -6483,23 +6483,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想アダプターをホストOSの実際のネットワークに割り当てる方式を選択します。</translation>
     </message>
     <message>
         <source>Shows additional network adapter options.</source>
-        <translation type="unfinished"></translation>
+        <translation>追加のネットワークアダプターのオプションを表示します。</translation>
     </message>
     <message>
         <source>Holds the configuration settings for the network attachment driver. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>ネットワーク接続ドライバーの設定を指定してください。設定は <b>name=value</b> の形式である必要があり、ドライバーに依存します。新しくエントリーを追加するには、<b>shift-enter</b> キーを使用してください。</translation>
     </message>
     <message>
         <source>When checked, the virtual network cable is plugged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想ネットワークケーブルを接続します。</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>ポートフォワーディングのルールを設定するウィンドウを表示します。</translation>
     </message>
 </context>
 <context>
@@ -6661,23 +6661,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">現在IRQが指定されていません。</translation>
+        <translation>現在IRQが指定されていません。</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">現在 I/Oポートが指定されていません。</translation>
+        <translation>現在 I/Oポートが指定されていません。</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">2つ以上のポートが同じ設定になっています。</translation>
+        <translation>2つ以上のポートが同じ設定になっています。</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">現在ポートパスが指定されていません。</translation>
+        <translation>現在ポートパスが指定されていません。</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">現在ポートパスが重複して指定されています。</translation>
+        <translation>現在ポートパスが重複して指定されています。</translation>
     </message>
 </context>
 <context>
@@ -6834,27 +6834,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>共有フォルダーを追加</translation>
     </message>
     <message>
         <source>Edit Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>共有フォルダーを編集</translation>
     </message>
     <message>
         <source>Remove Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>共有フォルダーを除去</translation>
     </message>
     <message>
         <source>Adds new shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>新規共有フォルダーを追加します。</translation>
     </message>
     <message>
         <source>Edits selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した共有フォルダーを編集します。</translation>
     </message>
     <message>
         <source>Removes selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した共有フォルダーを除去します。</translation>
     </message>
 </context>
 <context>
@@ -6909,7 +6909,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, this shared folder will be permanent.</source>
-        <translation type="unfinished"></translation>
+        <translation>この共有フォルダーを永続化します。</translation>
     </message>
 </context>
 <context>
@@ -7005,31 +7005,31 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="unfinished"></translation>
+        <translation>このシリアルポートの動作モードを選択します。 <b>[切断]</b>を選択すると、ゲストOSはシリアルポートを検出しますが、それを操作することはできません。</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンは<b>パス/アドレス</b>フィールドで指定したパイプまたはソケットが存在するものと想定し、これを使おうとします。チェックを入れない場合、パイプまたはソケットは仮想マシンの開始時に作成されます。</translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">現在IRQが指定されていません。</translation>
+        <translation>現在IRQが指定されていません。</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">現在 I/Oポートが指定されていません。</translation>
+        <translation>現在 I/Oポートが指定されていません。</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">2つ以上のポートが同じ設定になっています。</translation>
+        <translation>2つ以上のポートが同じ設定になっています。</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">現在ポートパスが指定されていません。</translation>
+        <translation>現在ポートパスが指定されていません。</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">現在ポートパスが重複して指定されています。</translation>
+        <translation>現在ポートパスが重複して指定されています。</translation>
     </message>
 </context>
 <context>
@@ -7565,88 +7565,93 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="unfinished"></translation>
+        <translation>この仮想マシンのすべてのストレージコントローラーと仮想イメージ、割り当てられたホストデバイスのリストです。</translation>
     </message>
     <message>
         <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>ストレージツリーで選択されているストレージコントローラーの名前を指定します。</translation>
     </message>
     <message>
         <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <translation>ホストのI/O キャッシュ機能の使用を許可します。</translation>
     </message>
     <message>
         <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
-        <translation type="unfinished"></translation>
+        <translation>ゲストシステムが取り出ししても、仮想ディスクを除去しません。</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
-        <translation type="unfinished"></translation>
+        <translation>ゲストOSの仮想ディスクをSSDとして扱います。</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
-        <translation type="unfinished"></translation>
+        <translation>ゲストOSの仮想ディスクをホットプラグ可能なデバイスとして扱います。</translation>
     </message>
     <message>
         <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">仮想ディスクイメージファイルの選択...</translation>
     </message>
     <message>
         <source>Image</source>
         <comment>storage image</comment>
-        <translation type="unfinished">イメージ</translation>
+        <translation>イメージ</translation>
     </message>
     <message>
         <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>項目を展開する/折り畳む&nbsp;</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>ハード&nbsp;ディスク&nbsp;の追加</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>光学&nbsp;ドライブ&nbsp;の追加</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>フロッピー&nbsp;ドライブ&nbsp;の追加</nobr></translation>
     </message>
     <message>
         <source>Adds new storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>新しいストレージコントローラーを追加します。</translation>
     </message>
     <message>
         <source>Removes selected storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したストレージコントローラーを除去します。</translation>
     </message>
     <message>
         <source>Adds new storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>新規ストレージの割り当てを追加します。</translation>
     </message>
     <message>
         <source>Removes selected storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したストレージの割り当てを除去します。</translation>
     </message>
     <message>
         <source>Create New Hard Disk...</source>
-        <translation type="unfinished"></translation>
+        <translation>新規ハードディスクの作成...</translation>
     </message>
     <message>
         <source>Choose Virtual Hard Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想ハードディスクファイルを選択...</translation>
     </message>
     <message>
         <source>Choose Virtual Optical Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想光学ディスクファイルを選択...</translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
-        <translation type="unfinished"></translation>
+        <source>Remove Disk from Virtual Drive</source>
+        <translation>仮想ドライブからディスクを除去</translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想フロッピーディスクファイルを選択...</translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation>ディスクイメージを選択...</translation>
     </message>
 </context>
 <context>
@@ -7938,29 +7943,29 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
+        <translation>ハードウェアクロック(RTC)が報告する時刻を協定世界時(UTC)に設定します。チェックがオフの場合はローカルタイム(ホスト時刻)を使用します。通常UnixはハードウェアクロックをUTCとして扱います。</translation>
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1 CPU</source>
         <comment>%1 is 1 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPU</translation>
     </message>
     <message>
         <source>%1 CPUs</source>
         <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPU</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
 </context>
 <context>
@@ -8124,63 +8129,63 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンの仮想USB OHCI コントローラーを有効にします。USB OHCI コントローラーはUSB 1.0 サポートを提供します。</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンの仮想USB EHCI コントローラーを有効にします。USB EHCI コントローラーはUSB 2.0 サポートを提供します。</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想マシンの仮想USB xHCI コントローラーを有効にします。USB xHCI コントローラーはUSB 3.0 サポートを提供します。</translation>
     </message>
     <message>
         <source>Add Empty Filter</source>
-        <translation type="unfinished">空のフィルターを追加</translation>
+        <translation>空のフィルターを追加</translation>
     </message>
     <message>
         <source>Add Filter From Device</source>
-        <translation type="unfinished">デバイスからフィルターを追加</translation>
+        <translation>デバイスからフィルターを追加</translation>
     </message>
     <message>
         <source>Edit Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>フィルターを編集する</translation>
     </message>
     <message>
         <source>Remove Filter</source>
-        <translation type="unfinished">フィルターを除去</translation>
+        <translation>フィルターを除去</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
-        <translation type="unfinished">フィルターを上に移動</translation>
+        <translation>フィルターを上に移動</translation>
     </message>
     <message>
         <source>Move Filter Down</source>
-        <translation type="unfinished">フィルターを下に移動</translation>
+        <translation>フィルターを下に移動</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="unfinished"></translation>
+        <translation>すべてのフィールドが空の新規USB フィルターを追加します。注:このフィルターはすべての接続されたUSB デバイスに適合します。</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="unfinished"></translation>
+        <translation>ホストマシンに接続された、選択したUSB デバイスの値をすべてのフィールドに設定した新規のUSB フィルターを追加します。</translation>
     </message>
     <message>
         <source>Edits selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したUSB フィルターを編集します。</translation>
     </message>
     <message>
         <source>Removes selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したUSB フィルターを除去します。</translation>
     </message>
     <message>
         <source>Moves selected USB filter up.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したUSB フィルターを上に移動します。</translation>
     </message>
     <message>
         <source>Moves selected USB filter down.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したUSB フィルターを下に移動します。</translation>
     </message>
 </context>
 <context>
@@ -8286,35 +8291,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>ベンダーIDフィルターを指定します。<i>完全一致</i>する文字列の形式は<tt>XXXX</tt>で、<tt>X</tt>は16進数です。空の文字列はすべての値と一致します。</translation>
     </message>
     <message>
         <source>Holds the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>プロダクトIDフィルターを指定します。<i>完全一致</i>する文字列の形式は<tt>XXXX</tt>で、<tt>X</tt>は16進数です。空の文字列はすべての値と一致します。</translation>
     </message>
     <message>
         <source>Holds the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>リビジョン番号フィルターを指定します。<i>完全一致</i>する文字列の形式は<tt>IIFF</tt>で、<tt>I</tt>は10進数で整数部、<tt>F</tt>は10進数で小数部です。空の文字列はすべての値と一致します。</translation>
     </message>
     <message>
         <source>Holds the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>完全一致</i>するメーカー フィルターを指定します。空の文字列はすべての値と一致します。</translation>
     </message>
     <message>
         <source>Holds the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>完全一致</i>する製品名フィルターを指定します。空の文字列はすべての値と一致します。</translation>
     </message>
     <message>
         <source>Holds the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>完全一致</i>するシリアル番号フィルターを指定します。空の文字列はすべての値と一致します。</translation>
     </message>
     <message>
         <source>Holds the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>完全一致</i>するホストUSBポートフィルターを指定します。空の文字列はすべての値と一致します。</translation>
     </message>
     <message>
         <source>Holds whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
-        <translation type="unfinished"></translation>
+        <translation>ローカルに接続されたUSB デバイスにこのフィルターを適用するかどうかを指定します。ホストマシン(<i>いいえ</i>)、VRDP クライアントのコンピューター(<i>はい</i>)、両方((<i>任意</i>))。</translation>
     </message>
 </context>
 <context>
@@ -8359,7 +8364,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Hard disks</source>
-        <translation type="unfinished"></translation>
+        <translation>ハードディスク(&H)</translation>
     </message>
 </context>
 <context>
@@ -10271,43 +10276,43 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>一つ以上のディスクイメージファイルに現在アクセスできません。アクセス可能になるまでこれらのメディアを使用する仮想マシンを操作できません。</p><p><b>[確認]</b>ボタンをクリックして仮想メディアマネージャーを起動し、どのメディアにアクセスできないのか確認してください。または<b>[無視]</b>ボタンをクリックして、このメッセージを無視してください。</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>スナップショットを削除すると、スナップショットに格納されている情報は失われ、VirtualBoxがスナップショットと共に作成した複数のディスクデータはひとつのファイルにマージされます。これには長い時間がかかるかもしれません。そしてスナップショットの情報を回復することはできません。</p><p>スナップショット<b>"%1"</b>を削除しますか?。</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>スナップショット %1 の削除には多くのストレージ容量を必要とします。イメージ %2 のサイズは最大で %3 まで増加します。しかし、ディスクの空き容量は %4 しかありません。</p><p>マージ作業中にストレージ容量が不足すると、仮想マシンのデータを失う可能性があります。</p><p>スナップショットの削除を自己責任で続行できます。</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>ディスクメージファイル <nobr><b>%1</b></nobr>を解放しますか?</p><p>次の仮想マシンから取り外します: <b>%2</b></p></translation>
     </message>
     <message>
         <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
-        <translation type="unfinished"></translation>
+        <translation><p>ハードディスク<nobr><b>"%1"</b></nobr>のストレージ装置を削除しますか?</p><p><b>[削除]</b>を選択すると、指定されたストレージ装置は永久に削除されます。この操作は<b>元に戻せません</b>。</p><p><b>[保持]</b>を選択すると、ハードディスクはリストから取り除かれますが、ストレージ装置は後でリストに再度追加できるように、そのまま置かれます。</p></translation>
     </message>
     <message>
         <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>ディスクメージファイル <nobr><b>%1</b></nobr> を開けませんでした。</translation>
     </message>
     <message>
         <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>ディスクイメージファイル <nobr><b>%1</b></nobr> を閉じられませんでした。</translation>
     </message>
     <message>
         <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
-        <translation type="unfinished"></translation>
+        <translation>ハードディスクなしで新しい仮想マシンを作成しようとしています。それを追加するまではオペレーティングシステムをインストールすることはできません。仮想光学ディスクか、ネットワークから起動することしかできないことを意味します。</translation>
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>仮想マシンのウィンドウを"フルスクリーン"モードに切り替えます。<b>%1</b>キーを押すといつでもウィンドウモードに戻ることができます。</p><p>注:<i>ホスト</i>キーは現在<b>%2</b>に割り当てられています。</p><p>注:フルスクリーンモードではメインメニューバーは表示されません。メニューバーにアクセスするには <b>ホスト+Home</b>キーを押してください。</p></translation>
     </message>
     <message>
         <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>ゲストOSのビデオメモリー不足のため、ゲスト画面をフルスクリーンモードに切り替えることができません。</p><p>仮想マシンの設定でビデオメモリーを <b>%1</b>以上に設定してください。</p><p><b>[無視]</b>ボタンをクリックしてフルスクリーンモードに切り換えるか、<b>[キャンセル]</b>ボタンをクリックして操作を取り消してください。</p></translation>
     </message>
 </context>
 <context>
@@ -11229,55 +11234,55 @@ step and attach hard disks later using the VM Settings dialog.</p></source
     <name>UIPortForwardingTable</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished">名前</translation>
+        <translation>名前</translation>
     </message>
     <message>
         <source>Protocol</source>
-        <translation type="unfinished">プロトコル</translation>
+        <translation>プロトコル</translation>
     </message>
     <message>
         <source>Host IP</source>
-        <translation type="unfinished">ホスト IP</translation>
+        <translation>ホスト IP</translation>
     </message>
     <message>
         <source>Host Port</source>
-        <translation type="unfinished">ホスト ポート</translation>
+        <translation>ホストポート</translation>
     </message>
     <message>
         <source>Guest IP</source>
-        <translation type="unfinished">ゲスト IP</translation>
+        <translation>ゲスト IP</translation>
     </message>
     <message>
         <source>Guest Port</source>
-        <translation type="unfinished">ゲスト ポート</translation>
+        <translation>ゲスト ポート</translation>
     </message>
     <message>
         <source>Contains a list of port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>ポートフォワーディング ルールのリストがあります。</translation>
     </message>
     <message>
         <source>Add New Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>新規ルールを追加</translation>
     </message>
     <message>
         <source>Copy Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したルールをコピー</translation>
     </message>
     <message>
         <source>Remove Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したルールを除去</translation>
     </message>
     <message>
         <source>Adds new port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>新規ポートフォワーディング ルールを追加します。</translation>
     </message>
     <message>
         <source>Copies selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したポートフォワーディング ルールをコピーします。</translation>
     </message>
     <message>
         <source>Removes selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したポートフォワーディング ルールを削除します。</translation>
     </message>
 </context>
 <context>
@@ -11599,7 +11604,7 @@ step and attach hard disks later using the VM Settings dialog.</p></source
     </message>
     <message>
         <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"><nobr><b>クリック</b> でインジケーターの表示非表示を切り替えます。</nobr><br><nobr><b>ドラッグ&ドロップ(&D)</b> でインジケーターの場所を変更します。</nobr></translation>
+        <translation><nobr><b>クリック</b> でインジケーターの表示非表示を切り替えます。</nobr><br><nobr><b>ドラッグ&ドロップ(&D)</b> でインジケーターの場所を変更します。</nobr></translation>
     </message>
 </context>
 <context>
@@ -12245,75 +12250,75 @@ step and attach hard disks later using the VM Settings dialog.</p></source
     </message>
     <message>
         <source>Copy Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想ハードディスクをコピー</translation>
     </message>
     <message>
         <source>Hard disk to copy</source>
-        <translation type="unfinished"></translation>
+        <translation>コピーするハードディスク</translation>
     </message>
     <message>
         <source><p>Please select the virtual hard disk file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>選択していない場合、コピーしたい仮想ハードディスクのファイルを選択してください。リストから選択するか、リストの横にあるフォルダーアイコンからも選択できます。</p></translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file to copy...</source>
-        <translation type="unfinished"></translation>
+        <translation>コピーする仮想ハードドディスクのファイルを選択...</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>ハードディスクのファイルタイプ</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>新しい仮想ハードディスクで使用したいファイルのタイプを選択してください。もしほかの仮想ソフトウェアで使用する必要がなければ、設定はそのままにしておいてください。</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>物理ハードディスクにあるストレージ</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>新しい仮想ハードディスクファイルは使用したぶんだけ大きくなるか(可変サイズ)、または最大サイズで作成するか(固定サイズ)を選択してください。</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>可変サイズ</b>のハードディスクファイルは使用した分だけ(<b>固定サイズ</b>を上限として)物理ハードディスクの領域を消費しますが、スペースを開放しても自動的に縮小はしません。</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>固定サイズ</b>のハードディスクファイルはシステムによっては作成に時間がかかるかもしれませんが、使用すると高速です</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>ハードディスクファイルを2GBごとに<b>分割</b>することもできます。仮想マシンをリムーバブルUSBデバイスに作成したい場合や、非常に大きなファイルを扱うことができない古いシステムで便利でしょう。</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>新しい仮想ハードディスクファイルの場所を選択</translation>
     </message>
     <message>
         <source>New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>作成する新しいハードディスク</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>新しい仮想ハードディスクファイルの名前を下のボックスに入力するか、フォルダーアイコンをクリックしてファイルを作成する別のフォルダーを選択してください。</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>新しい仮想ハードディスクファイルの場所を選択...</translation>
     </message>
     <message>
         <source>Hard disk to &copy</source>
-        <translation type="unfinished"></translation>
+        <translation>コピーするハードディスク(&C)</translation>
     </message>
     <message>
         <source>&New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>作成する新しいハードディスク(&N)</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>ハードディスクドライブのファイルタイプ(&T)</translation>
     </message>
 </context>
 <context>
@@ -12416,7 +12421,7 @@ step and attach hard disks later using the VM Settings dialog.</p></source
     </message>
     <message>
         <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
-        <translation type="unfinished"></translation>
+        <translation><p>作成したいクローンのタイプを選択してください。</p><p><b>すべてをクローン</b>を選択すると、元の仮想マシンのコピー(すべての仮想ハードディスクファイルを含む)を抽出して作成します。</p><p><b>リンクしたクローン</b>を選択すると、新しいマシンを作成しますが、仮想ハードディスクファイルは元のマシンに紐づき、元のファイルも同様に移動しないと新しい仮想マシンから異なったコンピューターに移動することができません。</p></translation>
     </message>
 </context>
 <context>
@@ -12774,51 +12779,51 @@ step and attach hard disks later using the VM Settings dialog.</p></source
     </message>
     <message>
         <source>Create Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想ハードディスクの作成</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>ハードディスクのファイルタイプ</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>新しい仮想ハードディスクで使用したいファイルのタイプを選択してください。もしほかの仮想ソフトウェアで使用する必要がなければ、設定はそのままにしておいてください。</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>物理ハードディスクにあるストレージ</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>新しい仮想ハードディスクファイルは使用したぶんだけ大きくなるか(可変サイズ)、または最大サイズで作成するか(固定サイズ)を選択してください。</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>可変サイズ</b>のハードディスクファイルは使用した分だけ(<b>固定サイズ</b>を上限として)物理ハードディスクの領域を消費しますが、スペースを開放しても自動的に縮小はしません。</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>固定サイズ</b>のハードディスクファイルはシステムによっては作成に時間がかかるかもしれませんが、使用すると高速です</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>ハードディスクファイルを2GBごとに<b>分割</b>することもできます。仮想マシンをリムーバブルUSBデバイスに作成したい場合や、非常に大きなファイルを扱うことができない古いシステムで便利でしょう。</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>新しい仮想ハードディスクファイルの名前を下のボックスに入力するか、フォルダーアイコンをクリックしてファイルを作成する別のフォルダーを選択してください。</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>新しい仮想ハードディスクファイルの場所を選択...</translation>
     </message>
     <message>
         <source>Select the size of the virtual hard disk in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想ハードディスクのサイズをメガバイト単位で指定してください。このサイズは仮想マシンがハードディスクに置くことができるファイルデータの上限です。</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>ハードディスクのファイルタイプ(&T)</translation>
     </message>
 </context>
 <context>
@@ -12909,27 +12914,27 @@ step and attach hard disks later using the VM Settings dialog.</p></source
     </message>
     <message>
         <source>Hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>ハードディスク</translation>
     </message>
     <message>
         <source><p>If you wish you can add a virtual hard disk to the new machine. You can either create a new hard disk file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard disk is <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>新しいマシンに仮想ハードディスクを割り当てることができます。その場合は新しいハードディスクファイルを作成するか、リストから選択またはフォルダーアイコンを使用してほかの場所から指定できます。</p><p>複雑なストレージの設定をする場合は、このステップをスキップしてマシンを一度作成してからマシン設定で変更を加えてください。</p><p>必要なハードディスクのサイズは<b>%1</b>です。</p></translation>
     </message>
     <message>
         <source>&Do not add a virtual hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想ハードディスクを追加しない(&D)</translation>
     </message>
     <message>
         <source>&Create a virtual hard disk now</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想ハードディスクを作成する(&C)</translation>
     </message>
     <message>
         <source>&Use an existing virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>すでにある仮想ハードディスクファイルを使用する(&U)</translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想ハードディスクファイルの選択...</translation>
     </message>
 </context>
 <context>
@@ -14080,19 +14085,19 @@ Version %1</source>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>他のフォルダーを選択するウィンドウを表示します。</translation>
     </message>
     <message>
         <source>Displays a window to select a different file.</source>
-        <translation type="unfinished"></translation>
+        <translation>他のファイルを選択するウィンドウを表示します。</translation>
     </message>
     <message>
         <source>Holds the folder path.</source>
-        <translation type="unfinished"></translation>
+        <translation>フォルダーのパスを指定します。</translation>
     </message>
     <message>
         <source>Holds the file path.</source>
-        <translation type="unfinished"></translation>
+        <translation>ファイルのパスを指定します。</translation>
     </message>
 </context>
 <context>
@@ -15769,7 +15774,7 @@ Version %1</source>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">このハードディスクの割り当ては、新規作成された差分ハードディスクの使用により、間接的に実行されます。</translation>
+        <translation>このハードディスクの割り当ては、新規作成された差分ハードディスクの使用により、間接的に実行されます。</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -15779,7 +15784,7 @@ Version %1</source>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">このベースハードディスクは以下の差分ハードディスクを使用して間接的に割り当てられます:</translation>
+        <translation>このベースハードディスクは以下の差分ハードディスクを使用して間接的に割り当てられます:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -16105,20 +16110,20 @@ Version %1</source>
     </message>
     <message>
         <source>Please choose a virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>仮想ハードディスクファイルを選択してください</translation>
     </message>
     <message>
         <source>All virtual hard disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>すべての仮想ハードディスクファイル (%1)</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Medium Manager to inspect these files.</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>ハードディスクチェーン中のいくつかのメディアにアクセスできません。仮想メディアマネージャーを使用して、これらのメディアを確認してください。</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>新しい仮想ハードディスクファイルの場所を選択</translation>
     </message>
 </context>
 <context>
@@ -17909,19 +17914,19 @@ DOS系ゲストOSからアクセスする場合は <tt>net use x:¥¥vboxs
     </message>
     <message>
         <source>Restore selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンのスナップショットに復元</translation>
     </message>
     <message>
         <source>Delete selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンのスナップショットを削除</translation>
     </message>
     <message>
         <source>Display a window with selected snapshot details</source>
-        <translation type="unfinished"></translation>
+        <translation>選択したスナップショットの詳細をウィンドウ表示</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>選択した仮想マシンをクローン</translation>
     </message>
 </context>
 <context>
@@ -17977,7 +17982,7 @@ DOS系ゲストOSからアクセスする場合は <tt>net use x:¥¥vboxs
     </message>
     <message>
         <source>Snapshot %1</source>
-        <translation type="unfinished">スナップショット %1</translation>
+        <translation>スナップショット %1</translation>
     </message>
 </context>
 <context>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
index a936c18..0eeb07d 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
@@ -33,7 +33,7 @@
     <name>QApplication</name>
     <message>
         <source>Executable <b>%1</b> requires Qt %2.x, found Qt %3.</source>
-        <translation>អាច​ប្រតិបត្តិបាន <b>%1</b> ទាមទារ Qt %2.x រក​ឃើញ Qt %3 ។</translation>
+        <translation>អាច​ប្រតិបត្តិបាន <b>%1</b> ទាមទារ Qt %2.x រក​ឃើញ Qt %3 ។</translation>
     </message>
     <message>
         <source>Incompatible Qt Library Error</source>
@@ -49,11 +49,11 @@
     </message>
     <message>
         <source>Please try reinstalling VirtualBox.</source>
-        <translation>វា​អាច​ជួយ​ឲ្យ​ដំឡើង VirtualBox ឡើង​វិញ ។</translation>
+        <translation>វា​អាច​ជួយ​ឲ្យ​ដំឡើង VirtualBox ឡើង​វិញ ។</translation>
     </message>
     <message>
         <source>This error means that the kernel driver was either not able to allocate enough memory or that some mapping operation failed.</source>
-        <translation>កំហុស​នេះ​មាន​ន័យ​ថា កម្មវិធី​បញ្ជា​ខឺណែល​មិនអាច​បម្រុង​ទុក​សតិ​គ្រប់គ្រាន់​ ឬ​បានបរាជ័យ​ក្នុងកា​រ​ផ្គូផ្គង​មួយ​ចំនួន ។</translation>
+        <translation>កំហុស​នេះ​មាន​ន័យ​ថា កម្មវិធី​បញ្ជា​ខឺណែល​មិនអាច​បម្រុង​ទុក​សតិ​គ្រប់គ្រាន់​ ឬ​បានបរាជ័យ​ក្នុងកា​រ​ផ្គូផ្គង​មួយ​ចំនួន ។</translation>
     </message>
     <message>
         <source>The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or there is a permission problem with /dev/vboxdrv. Please reinstall the kernel module by executing<br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS package first. This package keeps track of Linux kernel changes and recompiles the vboxdrv kernel module if necessary.</source>
@@ -61,15 +61,15 @@
     </message>
     <message>
         <source>The VirtualBox kernel modules do not match this version of VirtualBox. The installation of VirtualBox was apparently not successful. Please try completely uninstalling and reinstalling VirtualBox.</source>
-        <translation>ម៉ូ​ឌុល​ខឺ​ណែល​របស់​ VirtualBox មិន​ផ្គូផ្គង​​កំណែ​របស់​ VirtualBox នេះ​ទេ​ ។ ជាក់​ស្តែង​ការ​ដំឡើង VirtualBox ​​​មិន​ទទួល​បាន​ជោគជ័យ​នោះ​ទេ ។ សូម​ព្យាយាម​លុប​​ ហើយ​​ដំឡើង​ VirtualBox ឡើង​វិញ ។</translation>
+        <translation>ម៉ូ​ឌុល​ខឺ​ណែល​របស់​ VirtualBox មិន​ផ្គូផ្គង​​កំណែ​របស់​ VirtualBox នេះ​ទេ​ ។ ជាក់​ស្តែង​ការ​ដំឡើង VirtualBox ​​​មិន​ទទួល​បាន​ជោគជ័យ​នោះ​ទេ ។ សូម​ព្យាយាម​លុប​​ ហើយ​​ដំឡើង​ VirtualBox ឡើង​វិញ ។</translation>
     </message>
     <message>
         <source>The VirtualBox kernel modules do not match this version of VirtualBox. The installation of VirtualBox was apparently not successful. Executing<br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>may correct this. Make sure that you do not mix the OSE version and the PUEL version of VirtualBox.</source>
-        <translation>ម៉ូឌុល​ខឺ​ណែល​របស់​ VirtualBox មិន​ផ្គូផ្គង​កំណែ​របស់​ VirtualBox នេះទេ ។ ជាក់​ស្តែង​ការ​ដំឡើង​របស់​ VirtualBox មិន​ទទួល​បាន​ជោគជ័យ​នោះ​ទេ ។ ការ​ប្រតិបត្តិ​<br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>នេះ​អាច​ត្រឹមត្រូវ​ ។ សូម​ប្រាកដ​ថា​ អ្នក​មិនបញ្ចូល​កំណែ​ OSE និង​​កំណែ​ PUEL របស់​ VirtualBox ចូល​គ្នា​ឡើយ ។</translation>
+        <translation>ម៉ូឌុល​ខឺ​ណែល​របស់​ VirtualBox មិន​ផ្គូផ្គង​កំណែ​របស់​ VirtualBox នេះទេ ។ ជាក់​ស្តែង​ការ​ដំឡើង​របស់​ VirtualBox មិន​ទទួល​បាន​ជោគជ័យ​នោះ​ទេ ។ ការ​ប្រតិបត្តិ​<br/><br/>  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>នេះ​អាច​ត្រឹមត្រូវ​ ។ សូម​ប្រាកដ​ថា​ អ្នក​មិនបញ្ចូល​កំណែ​ OSE និង​​កំណែ​ PUEL របស់​ VirtualBox ចូល​គ្នា​ឡើយ ។</translation>
     </message>
     <message>
         <source>Make sure the kernel module has been loaded successfully.</source>
-        <translation>ប្រាកដ​ថា ​ម៉ូឌុល​ខឺណែល​ត្រូវ​បាន​ផ្ទុក​ដោយ​​ជោគ​ជ័យ​ ។</translation>
+        <translation>ប្រាកដ​ថា ​ម៉ូឌុល​ខឺណែល​ត្រូវ​បាន​ផ្ទុក​ដោយ​​ជោគ​ជ័យ​ ។</translation>
     </message>
     <message>
         <source>VirtualBox - Runtime Error</source>
@@ -77,7 +77,7 @@
     </message>
     <message>
         <source><b>Cannot access the kernel driver!</b><br/><br/></source>
-        <translation><b>មិន​អាច​ដំណើរ​ការ​កម្មវិធី​បញ្ជា​ខឺ​​ណែល​​​បាន​ទេ !</b><br/><br/></translation>
+        <translation><b>មិន​អាច​ដំណើរ​ការ​កម្មវិធី​បញ្ជា​ខឺ​​ណែល​​​បាន​ទេ !</b><br/><br/></translation>
     </message>
     <message>
         <source>Kernel driver not accessible</source>
@@ -122,7 +122,7 @@
     </message>
     <message>
         <source>Could not locate the file on the server (response: %1)</source>
-        <translation type="obsolete">មិនអាច​បម្រុង​ទុក​ឯកសារ​នៅ​លើ​ម៉ាស៊ីន​បម្រើ (ឆ្លើយតប ៖ %1)</translation>
+        <translation type="obsolete">មិនអាច​បម្រុង​ទុក​ឯកសារ​នៅ​លើ​ម៉ាស៊ីន​បម្រើ (ឆ្លើយតប ៖ %1)</translation>
     </message>
 </context>
 <context>
@@ -185,11 +185,11 @@
     </message>
     <message>
         <source><qt>The value of the <b>%1</b> field on the <b>%2</b> page is %3.</qt></source>
-        <translation type="obsolete"><qt>តម្លៃ​របស់​វាល <b>%1</b> នៅ​លើ​ទំព័រ <b>%2</b> គឺ %3 ។</qt></translation>
+        <translation type="obsolete"><qt>តម្លៃ​របស់​វាល <b>%1</b> នៅ​លើ​ទំព័រ <b>%2</b> គឺ %3 ។</qt></translation>
     </message>
     <message>
         <source><qt>One of the values on the <b>%1</b> page is %2.</qt></source>
-        <translation type="obsolete"><qt>តម្លៃ​មួយ​ក្នុង​ចំណោមតម្លៃ​នៅ​លើ​ទំព័រ <b>%1</b> គឺ %2 ។</qt></translation>
+        <translation type="obsolete"><qt>តម្លៃ​មួយ​ក្នុង​ចំណោមតម្លៃ​នៅ​លើ​ទំព័រ <b>%1</b> គឺ %2 ។</qt></translation>
     </message>
 </context>
 <context>
@@ -275,7 +275,7 @@
         <translation type="obsolete">ប្រអប់​ព័ត៌មាន​សម័យ</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">បង្ហាញ​ប្រអប់​ព័ត៌មាន​សម័យ</translation>
     </message>
     <message>
@@ -359,11 +359,11 @@
         <translation type="obsolete">បើក ឬ​បិទ​ការ​តភ្ជាប់​ផ្ទៃតុ​ពី​ចម្ងាយ (RDP) ទៅ​កាន់​ម៉ាស៊ីន​នេះ</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">ដំឡើង​ការ​បន្ថែម​ភ្ញៀវ...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="unfinished">ដំឡើង​ការ​បន្ថែម​ភ្ញៀវ...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">ម៉ោន​រូបភាព​ដំឡើង​បន្ថែម​ភ្ញៀវ</translation>
     </message>
     <message>
@@ -633,92 +633,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">ដំឡើង​ការ​បន្ថែម​ភ្ញៀវ...</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">ម៉ោន​រូបភាព​ដំឡើង​បន្ថែម​ភ្ញៀវ</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
+        <source>&Webcams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">បណ្ដាញ</translation>
     </message>
     <message>
-        <source>&Status Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">ឯកសារ</translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">បណ្ដាញ</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">ចំណូល​ចិត្ត...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">បង្ហាញ​កំណត់​ហេតុ...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">ឯកសារ</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -734,175 +720,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">ចំណូល​ចិត្ត...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
+        <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
+        <source>&Hard Disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
+        <source>&USB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">បង្ហាញ​កំណត់​ហេតុ...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -948,6 +934,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create new virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -964,7 +958,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -972,7 +966,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -996,15 +990,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1016,11 +1022,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1028,7 +1034,7 @@
         <translation type="unfinished">ធ្វើ​ឲ្យ​ស្រស់</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1072,15 +1078,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1089,27 +1095,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">បើក</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1131,6 +1118,17 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -1288,7 +1286,7 @@
     <name>UIDescriptionPagePrivate</name>
     <message>
         <source>No description. Press the Edit button below to add it.</source>
-        <translation type="obsolete">គ្មាន​សេចក្ដី​ពិពណ៌នា​ទេ ។ ចុច​ប៊ុតុង កែសម្រួល​ខា​ងក្រោម​ដើម្បី​បន្ថែម​វា ។</translation>
+        <translation type="obsolete">គ្មាន​សេចក្ដី​ពិពណ៌នា​ទេ ។ ចុច​ប៊ុតុង កែសម្រួល​ខា​ងក្រោម​ដើម្បី​បន្ថែម​វា ។</translation>
     </message>
     <message>
         <source>Edit</source>
@@ -1544,7 +1542,7 @@
     </message>
     <message>
         <source>The selected virtual machine is <i>inaccessible</i>. Please inspect the error message shown below and press the <b>Refresh</b> button if you want to repeat the accessibility check:</source>
-        <translation type="unfinished">ម៉ាស៊ីន​និម្មិត​ដែល​បាន​ជ្រើស​ <i>មិន​អាច​ចូលដំណើរការ​បានទេ</i> ។ សូម​ពិនិត្យ​មើល​សារ​កំហុស​ដែល​បានបង្ហាញ​ខាង​ក្រោម ហើយ​ចុច​ប៊ូតុង <b>ធ្វើ​ឲ្យ​ស្រស់</b> ប្រសិន​បើ​អ្នក​ចង់​ធ្វើការ​ពិនិត្យ​ការ​ចូលដំណើរការ​​ឡើង​វិញ ៖</translation>
+        <translation type="unfinished">ម៉ាស៊ីន​និម្មិត​ដែល​បាន​ជ្រើស​ <i>មិន​អាច​ចូលដំណើរការ​បានទេ</i> ។ សូម​ពិនិត្យ​មើល​សារ​កំហុស​ដែល​បានបង្ហាញ​ខាង​ក្រោម ហើយ​ចុច​ប៊ូតុង <b>ធ្វើ​ឲ្យ​ស្រស់</b> ប្រសិន​បើ​អ្នក​ចង់​ធ្វើការ​ពិនិត្យ​ការ​ចូលដំណើរការ​​ឡើង​វិញ ៖</translation>
     </message>
     <message>
         <source>General</source>
@@ -1597,7 +1595,7 @@
     <name>UIDownloader</name>
     <message>
         <source>The download process has been cancelled by the user.</source>
-        <translation type="obsolete">ដំណើរការ​​ទាញយក​ត្រូវ​បានបោះបង់​ដោយ​អ្នកប្រើ​ ។</translation>
+        <translation type="obsolete">ដំណើរការ​​ទាញយក​ត្រូវ​បានបោះបង់​ដោយ​អ្នកប្រើ​ ។</translation>
     </message>
     <message>
         <source>Looking for %1...</source>
@@ -1624,7 +1622,7 @@
     </message>
     <message>
         <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source>
-        <translation type="obsolete"><p>បាន​បរាជ័យ​ក្នុងកា​ររក្សាទុក​ឯកសារ​ដែលបាន​ទាញ​យក​ជា <nobr><b>%1</b> ។</nobr></p></translation>
+        <translation type="obsolete"><p>បាន​បរាជ័យ​ក្នុងកា​ររក្សាទុក​ឯកសារ​ដែលបាន​ទាញ​យក​ជា <nobr><b>%1</b> ។</nobr></p></translation>
     </message>
     <message>
         <source>Select folder to save Guest Additions image to</source>
@@ -1673,7 +1671,7 @@
     </message>
     <message>
         <source>Please choose a filename to export the OVF to.</source>
-        <translation type="obsolete">សូម​ជ្រើស​ឈ្មោះ​ឯកសារ​​ ដើម្បី​នាំ​ចូល​ OVF ។</translation>
+        <translation type="obsolete">សូម​ជ្រើស​ឈ្មោះ​ឯកសារ​​ ដើម្បី​នាំ​ចូល​ OVF ។</translation>
     </message>
     <message>
         <source>Please complete the additional fields like the username, password and the bucket, and provide a filename for the OVF target.</source>
@@ -1715,9 +1713,9 @@ p, li { white-space: pre-wrap; }
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body>
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">អ្នក​ជំនួយ​កា​រនេះ​នឹង​នាំអ្នក​តាមរយៈ​ដំណើរការ​នាំចេញ​ឧបករណ៍ ។</p>
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ប្រើ​ប៊ូតុង <span style=" font-weight:600;">បន្ទាប់</span> ដើម្បី​ទៅ​កាន់​ទំព័រ​បន្ទាប់​របស់​អ្នក​ជំនួយ​ការ​ ហើយ​ប៊ូតុង <span style=" font-weight:600;">ថយក្រោយ</span> ដើម្បី​ត្រឡប់​ទៅ​ទំព័រ​មុន ។</p>
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">សូម​ជ្រើស​ម៉ាស៊ីន​និម្មិត ដែល​អ្នក​ចង់បាន​ឧបករណ៍ ។ អ្នក​អាចជ្រើស​ច្រើនជាង​មួយ​បាន ។ សូម​ចំណាំថា ម៉ាស៊ីន​ទាំង​នេះ​ត្រូវ​តែ​បិទ មុន​នឹង​ពួកវា​អាច​ត្រូវ​បាន​នាំចេញ ។</p></body></html></translation>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">អ្នក​ជំនួយ​កា​រនេះ​នឹង​នាំអ្នក​តាមរយៈ​ដំណើរការ​នាំចេញ​ឧបករណ៍ ។</p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ប្រើ​ប៊ូតុង <span style=" font-weight:600;">បន្ទាប់</span> ដើម្បី​ទៅ​កាន់​ទំព័រ​បន្ទាប់​របស់​អ្នក​ជំនួយ​ការ​ ហើយ​ប៊ូតុង <span style=" font-weight:600;">ថយក្រោយ</span> ដើម្បី​ត្រឡប់​ទៅ​ទំព័រ​មុន ។</p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">សូម​ជ្រើស​ម៉ាស៊ីន​និម្មិត ដែល​អ្នក​ចង់បាន​ឧបករណ៍ ។ អ្នក​អាចជ្រើស​ច្រើនជាង​មួយ​បាន ។ សូម​ចំណាំថា ម៉ាស៊ីន​ទាំង​នេះ​ត្រូវ​តែ​បិទ មុន​នឹង​ពួកវា​អាច​ត្រូវ​បាន​នាំចេញ ។</p></body></html></translation>
     </message>
     <message>
         <source>< &Back</source>
@@ -1737,7 +1735,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Here you can change additional configuration values of the selected virtual machines. You can modify most of the properties shown by double-clicking on the items.</source>
-        <translation type="obsolete">នៅ​ទី​នេះ អ្នក​​អាច​ប្តូរ​តម្លៃ​​​កំណត់​រចនា​សម្ព័ន្ធ​​​បន្ថែម​របស់​​ម៉ាស៊ីន​និម្មិត​​​ដែល​​បាន​ជ្រើស​ ។ អ្នក​អាច​កែប្រែ​លក្ខណសម្បត្តិ​ភាគច្រើន ដែលបាន​បង្ហាញ​ដោយ​ចុច​ទ្វេរដង​លើ​ធាតុ ។ ។</translation>
+        <translation type="obsolete">នៅ​ទី​នេះ អ្នក​​អាច​ប្តូរ​តម្លៃ​​​កំណត់​រចនា​សម្ព័ន្ធ​​​បន្ថែម​របស់​​ម៉ាស៊ីន​និម្មិត​​​ដែល​​បាន​ជ្រើស​ ។ អ្នក​អាច​កែប្រែ​លក្ខណសម្បត្តិ​ភាគច្រើន ដែលបាន​បង្ហាញ​ដោយ​ចុច​ទ្វេរដង​លើ​ធាតុ ។ ។</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
@@ -1745,7 +1743,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Please specify the target for the OVF export. You can choose between a local file system export, uploading the OVF to the Sun Cloud service or an S3 storage server.</source>
-        <translation type="obsolete">សូម​បញ្ជាក់​គោល​ដៅ​សម្រាប់​នាំ​ចេញ​​ OVF ។ អ្នក​អាច​ជ្រើស​​រវាង​​ការ​នាំ​ចេញ​ប្រព័ន្ធ​ឯកសារ​មូល​ដ្ឋាន​​ ការ​ផ្ទុក​ OVF ឡើង​ទៅ​​កាន់​ Sun អាច​ជា​​សេវា​ ឬម៉ា​ស៊ីន​បម្រើ​ផ្ទុក S3 ។</translation>
+        <translation type="obsolete">សូម​បញ្ជាក់​គោល​ដៅ​សម្រាប់​នាំ​ចេញ​​ OVF ។ អ្នក​អាច​ជ្រើស​​រវាង​​ការ​នាំ​ចេញ​ប្រព័ន្ធ​ឯកសារ​មូល​ដ្ឋាន​​ ការ​ផ្ទុក​ OVF ឡើង​ទៅ​​កាន់​ Sun អាច​ជា​​សេវា​ ឬម៉ា​ស៊ីន​បម្រើ​ផ្ទុក S3 ។</translation>
     </message>
     <message>
         <source>&Local Filesystem </source>
@@ -1769,7 +1767,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&File:</source>
-        <translation type="obsolete">ឯកសារ​ ៖</translation>
+        <translation type="obsolete">ឯកសារ​ ៖</translation>
     </message>
     <message>
         <source>&Bucket:</source>
@@ -1777,7 +1775,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Hostname:</source>
-        <translation type="obsolete">ឈ្មោះ​ម៉ាស៊ីន​ ៖</translation>
+        <translation type="obsolete">ឈ្មោះ​ម៉ាស៊ីន​ ៖</translation>
     </message>
     <message>
         <source>Write in legacy OVF 0.9 format for compatibility with other virtualization products.</source>
@@ -1803,7 +1801,7 @@ p, li { white-space: pre-wrap; }
     <name>UIExportApplianceWzdPage2</name>
     <message>
         <source>Here you can change additional configuration values of the selected virtual machines. You can modify most of the properties shown by double-clicking on the items.</source>
-        <translation type="obsolete">នៅ​ទី​នេះ អ្នក​​អាច​ប្តូរ​តម្លៃ​​​កំណត់​រចនា​សម្ព័ន្ធ​​​បន្ថែម​របស់​​ម៉ាស៊ីន​និម្មិត​​​ដែល​​បាន​ជ្រើស​ ។ អ្នក​អាច​កែប្រែ​លក្ខណសម្បត្តិ​ភាគច្រើន ដែលបាន​បង្ហាញ​ដោយ​ចុច​ទ្វេរដង​លើ​ធាតុ ។ ។</translation>
+        <translation type="obsolete">នៅ​ទី​នេះ អ្នក​​អាច​ប្តូរ​តម្លៃ​​​កំណត់​រចនា​សម្ព័ន្ធ​​​បន្ថែម​របស់​​ម៉ាស៊ីន​និម្មិត​​​ដែល​​បាន​ជ្រើស​ ។ អ្នក​អាច​កែប្រែ​លក្ខណសម្បត្តិ​ភាគច្រើន ដែលបាន​បង្ហាញ​ដោយ​ចុច​ទ្វេរដង​លើ​ធាតុ ។ ។</translation>
     </message>
     <message>
         <source>Appliance Export Settings</source>
@@ -1811,7 +1809,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Please specify the target for the OVF export. You can choose between a local file system export, uploading the OVF to the Sun Cloud service or an S3 storage server.</source>
-        <translation type="obsolete">សូម​បញ្ជាក់​គោល​ដៅ​សម្រាប់​នាំ​ចេញ​​ OVF ។ អ្នក​អាច​ជ្រើស​​រវាង​​ការ​នាំ​ចេញ​ប្រព័ន្ធ​ឯកសារ​មូល​ដ្ឋាន​​ ការ​ផ្ទុក​ OVF ឡើង​ទៅ​​កាន់​ Sun អាច​ជា​​សេវា​ ឬម៉ា​ស៊ីន​បម្រើ​ផ្ទុក S3 ។</translation>
+        <translation type="obsolete">សូម​បញ្ជាក់​គោល​ដៅ​សម្រាប់​នាំ​ចេញ​​ OVF ។ អ្នក​អាច​ជ្រើស​​រវាង​​ការ​នាំ​ចេញ​ប្រព័ន្ធ​ឯកសារ​មូល​ដ្ឋាន​​ ការ​ផ្ទុក​ OVF ឡើង​ទៅ​​កាន់​ Sun អាច​ជា​​សេវា​ ឬម៉ា​ស៊ីន​បម្រើ​ផ្ទុក S3 ។</translation>
     </message>
     <message>
         <source>&Local Filesystem </source>
@@ -1830,7 +1828,7 @@ p, li { white-space: pre-wrap; }
     <name>UIExportApplianceWzdPage3</name>
     <message>
         <source>Please specify the target for the OVF export. You can choose between a local file system export, uploading the OVF to the Sun Cloud service or an S3 storage server.</source>
-        <translation type="obsolete">សូម​បញ្ជាក់​គោល​ដៅ​សម្រាប់​នាំ​ចេញ​​ OVF ។ អ្នក​អាច​ជ្រើស​​រវាង​​ការ​នាំ​ចេញ​ប្រព័ន្ធ​ឯកសារ​មូល​ដ្ឋាន​​ ការ​ផ្ទុក​ OVF ឡើង​ទៅ​​កាន់​ Sun អាច​ជា​​សេវា​ ឬម៉ា​ស៊ីន​បម្រើ​ផ្ទុក S3 ។</translation>
+        <translation type="obsolete">សូម​បញ្ជាក់​គោល​ដៅ​សម្រាប់​នាំ​ចេញ​​ OVF ។ អ្នក​អាច​ជ្រើស​​រវាង​​ការ​នាំ​ចេញ​ប្រព័ន្ធ​ឯកសារ​មូល​ដ្ឋាន​​ ការ​ផ្ទុក​ OVF ឡើង​ទៅ​​កាន់​ Sun អាច​ជា​​សេវា​ ឬម៉ា​ស៊ីន​បម្រើ​ផ្ទុក S3 ។</translation>
     </message>
     <message>
         <source>&Local Filesystem </source>
@@ -1854,7 +1852,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Hostname:</source>
-        <translation type="obsolete">ឈ្មោះ​ម៉ាស៊ីន​ ៖</translation>
+        <translation type="obsolete">ឈ្មោះ​ម៉ាស៊ីន​ ៖</translation>
     </message>
     <message>
         <source>&Bucket:</source>
@@ -1862,7 +1860,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&File:</source>
-        <translation type="obsolete">ឯកសារ​ ៖</translation>
+        <translation type="obsolete">ឯកសារ​ ៖</translation>
     </message>
     <message>
         <source>Write in legacy OVF 0.9 format for compatibility with other virtualization products.</source>
@@ -1901,7 +1899,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Hostname:</source>
-        <translation type="obsolete">ឈ្មោះ​ម៉ាស៊ីន​ ៖</translation>
+        <translation type="obsolete">ឈ្មោះ​ម៉ាស៊ីន​ ៖</translation>
     </message>
     <message>
         <source>&Bucket:</source>
@@ -1909,7 +1907,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&File:</source>
-        <translation type="obsolete">ឯកសារ​ ៖</translation>
+        <translation type="obsolete">ឯកសារ​ ៖</translation>
     </message>
     <message>
         <source>Write in legacy OVF 0.9 format for compatibility with other virtualization products.</source>
@@ -1937,7 +1935,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Please choose a filename to export the OVF to.</source>
-        <translation type="obsolete">សូម​ជ្រើស​ឈ្មោះ​ឯកសារ​​ ដើម្បី​នាំ​ចូល​ OVF ។</translation>
+        <translation type="obsolete">សូម​ជ្រើស​ឈ្មោះ​ឯកសារ​​ ដើម្បី​នាំ​ចូល​ OVF ។</translation>
     </message>
     <message>
         <source>Please complete the additional fields like the username, password and the bucket, and provide a filename for the OVF target.</source>
@@ -1961,7 +1959,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Here you can change additional configuration values of the selected virtual machines. You can modify most of the properties shown by double-clicking on the items.</source>
-        <translation type="obsolete">នៅ​ទី​នេះ អ្នក​​អាច​ប្តូរ​តម្លៃ​​​កំណត់​រចនា​សម្ព័ន្ធ​​​បន្ថែម​របស់​​ម៉ាស៊ីន​និម្មិត​​​ដែល​​បាន​ជ្រើស​ ។ អ្នក​អាច​កែប្រែ​លក្ខណសម្បត្តិ​ភាគច្រើន ដែលបាន​បង្ហាញ​ដោយ​ចុច​ទ្វេរដង​លើ​ធាតុ ។ ។</translation>
+        <translation type="obsolete">នៅ​ទី​នេះ អ្នក​​អាច​ប្តូរ​តម្លៃ​​​កំណត់​រចនា​សម្ព័ន្ធ​​​បន្ថែម​របស់​​ម៉ាស៊ីន​និម្មិត​​​ដែល​​បាន​ជ្រើស​ ។ អ្នក​អាច​កែប្រែ​លក្ខណសម្បត្តិ​ភាគច្រើន ដែលបាន​បង្ហាញ​ដោយ​ចុច​ទ្វេរដង​លើ​ធាតុ ។ ។</translation>
     </message>
 </context>
 <context>
@@ -1972,15 +1970,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>You have started a newly created virtual machine for the first time. This wizard will help you to perform the steps necessary for installing an operating system of your choice onto this virtual machine.</p><p>Use the <b>Next</b> button to go to the next page of the wizard and the <b>Back</b> button to return to the previous page. You can also press <b>Cancel</b> if you want to cancel the execution of this wizard.&lt [...]
-        <translation type="obsolete"><p>អ្នក​បាន​ចាប់ផ្ដើម​ម៉ាស៊ីន​និម្មិត​ដែលបាន​បង្កើត​ថ្មីៗ​ពេល​ដំបូង​បាន​ ។ អ្នក​ជំនួយការ​នេះ​នឹង​ជួយ​អ្នក​ឲ្យ​អនុវត្ត​ជំហាន​ដែល​ចាំបាច់​សម្រាប់ដំឡើង​​ប្រព័ន្ធ​ប្រតិបត្តិការ​នៃ​ជម្រើស​របស់អ្នក​ក្នុង​​ម៉ាស៊ីន​និម្មិត​នេះ ។</p><p>ប្រើ​ប៊ូតុង <b>បន្ទាប់</b> ដើម្បី​ទៅ​កាន់​ទំព័រ​បន្ទាប់​របស់​អ្នក​ជំនួយការ ហើយ​ប៊ូតុង​ <b>ថយក្រោយ</b> ដើម្បីត្រឡប់​ទៅ​ទំព័រ​មុន ។ អ្នកក៏​អាច​ចុច <b>បោះបង់</b> ប្រសិន​បើ​អ្នក​ [...]
+        <translation type="obsolete"><p>អ្នក​បាន​ចាប់ផ្ដើម​ម៉ាស៊ីន​និម្មិត​ដែលបាន​បង្កើត​ថ្មីៗ​ពេល​ដំបូង​បាន​ ។ អ្នក​ជំនួយការ​នេះ​នឹង​ជួយ​អ្នក​ឲ្យ​អនុវត្ត​ជំហាន​ដែល​ចាំបាច់​សម្រាប់ដំឡើង​​ប្រព័ន្ធ​ប្រតិបត្តិការ​នៃ​ជម្រើស​របស់អ្នក​ក្នុង​​ម៉ាស៊ីន​និម្មិត​នេះ ។</p><p>ប្រើ​ប៊ូតុង <b>បន្ទាប់</b> ដើម្បី​ទៅ​កាន់​ទំព័រ​បន្ទាប់​របស់​អ្នក​ជំនួយការ ហើយ​ប៊ូតុង​ <b>ថយក្រោយ</b> ដើម្បីត្រឡប់​ទៅ​ទំព័រ​មុន ។ អ្នកក៏​អាច​ចុច <b>បោះបង់</b> ប្រសិន​បើ​អ្នក​ [...]
     </message>
     <message>
         <source>Welcome to the First Run Wizard!</source>
-        <translation type="obsolete">សូម​ស្វាគមន៍​មកកាន់​អ្នក​ជំនួយកា​រដំបូង !</translation>
+        <translation type="obsolete">សូម​ស្វាគមន៍​មកកាន់​អ្នក​ជំនួយកា​រដំបូង !</translation>
     </message>
     <message>
         <source><p>Select the type of media you would like to use for installation.</p></source>
-        <translation type="obsolete"><p>ជ្រើស​ប្រភេទ​មេឌៀ​ដែល​អ្នក​ចង់​ប្រើ​សម្រាប់​ដំឡើងខាង​ក្រោម ។</p></translation>
+        <translation type="obsolete"><p>ជ្រើស​ប្រភេទ​មេឌៀ​ដែល​អ្នក​ចង់​ប្រើ​សម្រាប់​ដំឡើងខាង​ក្រោម ។</p></translation>
     </message>
     <message>
         <source>Media Type</source>
@@ -1996,7 +1994,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Select the media which contains the setup program of the operating system you want to install. This media must be bootable, otherwise the setup program will not be able to start.</p></source>
-        <translation type="obsolete"><p>ជ្រើស​មេឌៀ​ដែល​មាន​កម្មវិធីរៀបចំ​របស់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​ចង់​ដំឡើង ។ មេឌៀ​នេះ​ត្រូវ​តែ​អាច​ចាប់ផ្ដើម​បាន បើ​មិនដូច្នេះ​ទេ កម្មវិធី​រៀបចំ​នឹង​មិនអាច​ចាប់ផ្ដើម​បានទេ ។</p></translation>
+        <translation type="obsolete"><p>ជ្រើស​មេឌៀ​ដែល​មាន​កម្មវិធីរៀបចំ​របស់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​ចង់​ដំឡើង ។ មេឌៀ​នេះ​ត្រូវ​តែ​អាច​ចាប់ផ្ដើម​បាន បើ​មិនដូច្នេះ​ទេ កម្មវិធី​រៀបចំ​នឹង​មិនអាច​ចាប់ផ្ដើម​បានទេ ។</p></translation>
     </message>
     <message>
         <source>Media Source</source>
@@ -2008,7 +2006,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>You have selected the following media to boot from:</p></source>
-        <translation type="obsolete"><p>អ្នក​បាន​ជ្រើស​មេឌៀ​ដូចខាងក្រោម​ដើម្បី​ចាប់ផ្ដើម ៖</p></translation>
+        <translation type="obsolete"><p>អ្នក​បាន​ជ្រើស​មេឌៀ​ដូចខាងក្រោម​ដើម្បី​ចាប់ផ្ដើម ៖</p></translation>
     </message>
     <message>
         <source>Summary</source>
@@ -2024,23 +2022,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>You have started a newly created virtual machine for the first time. This wizard will help you to perform the steps necessary for booting an operating system of your choice on the virtual machine.</p><p>Note that you will not be able to install an operating system into this virtual machine right now because you did not attach any hard disk to it. If this is not what you want, you can cancel the execution of this wizard, select <b>Settings</b& [...]
-        <translation type="obsolete"><p>អ្នក​បាន​ចាប់ផ្ដើម​ម៉ាស៊ីន​និម្មិត​ដែល​ទើប​បានបង្កើត​ថ្មី​ជា​លើក​ដំបូង ។ អ្នក​ជំនួយ​ការ​នេះ​នឹង​ជួយ​អ្នក​ក្នុងការ​អនុវត្ត​ជំហាន​ដែល​ចាំបាច់​សម្រាប់​ចាប់ផ្ដើម​ប្រព័ន្ធ​ប្រតិបត្តិការ​ជា​ជម្រើស​របស់​អ្នក​នៅ​លើ​ម៉ាស៊ីន​និម្មិត ។</p><p>ចំណាំ​ថា អ្នក​នឹង​មិន​អាច​ដំឡើង​ប្រព័ន្ធ​ប្រតិបត្តិការ​ក្នុង​ម៉ាស៊ីន​និម្មិត​ឥឡូវ​បានទេ ពីព្រោះ​អ្នក​មិន​បាន​ភ្ជាប់​ថាសរឹង​ ។ ប្រសិន​បើ​នេះ​មិនមែន​ជា​អ្វី​ដែល​អ្នក​ចង់​បានទេ អ្នក​អាច​បោះបង់​ប្រតិបត្តិការ [...]
+        <translation type="obsolete"><p>អ្នក​បាន​ចាប់ផ្ដើម​ម៉ាស៊ីន​និម្មិត​ដែល​ទើប​បានបង្កើត​ថ្មី​ជា​លើក​ដំបូង ។ អ្នក​ជំនួយ​ការ​នេះ​នឹង​ជួយ​អ្នក​ក្នុងការ​អនុវត្ត​ជំហាន​ដែល​ចាំបាច់​សម្រាប់​ចាប់ផ្ដើម​ប្រព័ន្ធ​ប្រតិបត្តិការ​ជា​ជម្រើស​របស់​អ្នក​នៅ​លើ​ម៉ាស៊ីន​និម្មិត ។</p><p>ចំណាំ​ថា អ្នក​នឹង​មិន​អាច​ដំឡើង​ប្រព័ន្ធ​ប្រតិបត្តិការ​ក្នុង​ម៉ាស៊ីន​និម្មិត​ឥឡូវ​បានទេ ពីព្រោះ​អ្នក​មិន​បាន​ភ្ជាប់​ថាសរឹង​ ។ ប្រសិន​បើ​នេះ​មិនមែន​ជា​អ្វី​ដែល​អ្នក​ចង់​បានទេ អ្នក​អាច​បោះបង់​ប្រតិបត្តិការ [...]
     </message>
     <message>
         <source><p>Select the type of media you would like to use for booting an operating system.</p></source>
-        <translation type="obsolete"><p>ជ្រើស​ប្រភេទ​មេឌៀ​ដែល​អ្នកចង់​ប្រើ​ដើម្បី​ចាប់ផ្ដើម​ប្រព័ន្ធ​ប្រតិបត្តិការ​ ។</p></translation>
+        <translation type="obsolete"><p>ជ្រើស​ប្រភេទ​មេឌៀ​ដែល​អ្នកចង់​ប្រើ​ដើម្បី​ចាប់ផ្ដើម​ប្រព័ន្ធ​ប្រតិបត្តិការ​ ។</p></translation>
     </message>
     <message>
         <source><p>Select the media that contains the operating system you want to work with. This media must be bootable, otherwise the operating system will not be able to start.</p></source>
-        <translation type="obsolete"><p>ជ្រើស​មេឌៀ​ដែល​មាន​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​ចង់​ធ្វើការ​ជា​មួយ ។ មេឌៀ​នេះ​ត្រូវទេ​អាច​ចាប់ផ្ដើម​បាន បើ​មិន​ដូច្នេះ​ទេ ប្រព័ន្ធ​ប្រតិបត្តិការ​មិនអាច​ចាប់ផ្ដើម​បានទេ ។</p></translation>
+        <translation type="obsolete"><p>ជ្រើស​មេឌៀ​ដែល​មាន​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​ចង់​ធ្វើការ​ជា​មួយ ។ មេឌៀ​នេះ​ត្រូវទេ​អាច​ចាប់ផ្ដើម​បាន បើ​មិន​ដូច្នេះ​ទេ ប្រព័ន្ធ​ប្រតិបត្តិការ​មិនអាច​ចាប់ផ្ដើម​បានទេ ។</p></translation>
     </message>
     <message>
         <source><p>You have selected the following media to boot an operating system from:</p></source>
-        <translation type="obsolete"><p>អ្នក​បាន​ជ្រើស​មេឌៀ​ដូចខាង​ក្រោម​ដើម្បី​ចាប់ផ្ដើម​ប្រព័ន្ធ​ប្រតិបត្តិការ ៖</p></translation>
+        <translation type="obsolete"><p>អ្នក​បាន​ជ្រើស​មេឌៀ​ដូចខាង​ក្រោម​ដើម្បី​ចាប់ផ្ដើម​ប្រព័ន្ធ​ប្រតិបត្តិការ ៖</p></translation>
     </message>
     <message>
         <source><p>If the above is correct, press the <b>Finish</b> button. Once you press it, the selected media will be mounted on the virtual machine and the machine will start execution.</p></source>
-        <translation type="obsolete"><p>ប្រសិន​បើ​ខា​ងលើ​ត្រឹមត្រូវ​ហើយ ចុច​ប៊ូតុង <b>បញ្ចប់</b> ។ នៅពេល​អ្នក​ចុច​វា មេឌៀ​ដែល​បាន​ជ្រើស​នឹង​ត្រូវ​បានម៉ោន​​លើ​ម៉ាស៊ីន​និម្មិត ហើយ​ម៉ាស៊ីន​នឹង​ចាប់ផ្ដើម​ប្រតិបត្តិ ។</p></translation>
+        <translation type="obsolete"><p>ប្រសិន​បើ​ខា​ងលើ​ត្រឹមត្រូវ​ហើយ ចុច​ប៊ូតុង <b>បញ្ចប់</b> ។ នៅពេល​អ្នក​ចុច​វា មេឌៀ​ដែល​បាន​ជ្រើស​នឹង​ត្រូវ​បានម៉ោន​​លើ​ម៉ាស៊ីន​និម្មិត ហើយ​ម៉ាស៊ីន​នឹង​ចាប់ផ្ដើម​ប្រតិបត្តិ ។</p></translation>
     </message>
     <message>
         <source>< &Back</source>
@@ -2077,18 +2075,18 @@ p, li { white-space: pre-wrap; }
     <name>UIFirstRunWzdPage1</name>
     <message>
         <source>Welcome to the First Run Wizard!</source>
-        <translation type="obsolete">សូម​ស្វាគមន៍​មកកាន់​អ្នក​ជំនួយកា​រដំបូង !</translation>
+        <translation type="obsolete">សូម​ស្វាគមន៍​មកកាន់​អ្នក​ជំនួយកា​រដំបូង !</translation>
     </message>
 </context>
 <context>
     <name>UIFirstRunWzdPage2</name>
     <message>
         <source><p>Select the media which contains the setup program of the operating system you want to install. This media must be bootable, otherwise the setup program will not be able to start.</p></source>
-        <translation type="obsolete"><p>ជ្រើស​មេឌៀ​ដែល​មាន​កម្មវិធីរៀបចំ​របស់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​ចង់​ដំឡើង ។ មេឌៀ​នេះ​ត្រូវ​តែ​អាច​ចាប់ផ្ដើម​បាន បើ​មិនដូច្នេះ​ទេ កម្មវិធី​រៀបចំ​នឹង​មិនអាច​ចាប់ផ្ដើម​បានទេ ។</p></translation>
+        <translation type="obsolete"><p>ជ្រើស​មេឌៀ​ដែល​មាន​កម្មវិធីរៀបចំ​របស់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​ចង់​ដំឡើង ។ មេឌៀ​នេះ​ត្រូវ​តែ​អាច​ចាប់ផ្ដើម​បាន បើ​មិនដូច្នេះ​ទេ កម្មវិធី​រៀបចំ​នឹង​មិនអាច​ចាប់ផ្ដើម​បានទេ ។</p></translation>
     </message>
     <message>
         <source><p>Select the media that contains the operating system you want to work with. This media must be bootable, otherwise the operating system will not be able to start.</p></source>
-        <translation type="obsolete"><p>ជ្រើស​មេឌៀ​ដែល​មាន​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​ចង់​ធ្វើការ​ជា​មួយ ។ មេឌៀ​នេះ​ត្រូវទេ​អាច​ចាប់ផ្ដើម​បាន បើ​មិន​ដូច្នេះ​ទេ ប្រព័ន្ធ​ប្រតិបត្តិការ​មិនអាច​ចាប់ផ្ដើម​បានទេ ។</p></translation>
+        <translation type="obsolete"><p>ជ្រើស​មេឌៀ​ដែល​មាន​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​ចង់​ធ្វើការ​ជា​មួយ ។ មេឌៀ​នេះ​ត្រូវទេ​អាច​ចាប់ផ្ដើម​បាន បើ​មិន​ដូច្នេះ​ទេ ប្រព័ន្ធ​ប្រតិបត្តិការ​មិនអាច​ចាប់ផ្ដើម​បានទេ ។</p></translation>
     </message>
     <message>
         <source>Media Source</source>
@@ -2103,11 +2101,11 @@ p, li { white-space: pre-wrap; }
     <name>UIFirstRunWzdPage3</name>
     <message>
         <source><p>You have selected the following media to boot from:</p></source>
-        <translation type="obsolete"><p>អ្នក​បាន​ជ្រើស​មេឌៀ​ដូចខាងក្រោម​ដើម្បី​ចាប់ផ្ដើម ៖</p></translation>
+        <translation type="obsolete"><p>អ្នក​បាន​ជ្រើស​មេឌៀ​ដូចខាងក្រោម​ដើម្បី​ចាប់ផ្ដើម ៖</p></translation>
     </message>
     <message>
         <source><p>You have selected the following media to boot an operating system from:</p></source>
-        <translation type="obsolete"><p>អ្នក​បាន​ជ្រើស​មេឌៀ​ដូចខាង​ក្រោម​ដើម្បី​ចាប់ផ្ដើម​ប្រព័ន្ធ​ប្រតិបត្តិការ ៖</p></translation>
+        <translation type="obsolete"><p>អ្នក​បាន​ជ្រើស​មេឌៀ​ដូចខាង​ក្រោម​ដើម្បី​ចាប់ផ្ដើម​ប្រព័ន្ធ​ប្រតិបត្តិការ ៖</p></translation>
     </message>
     <message>
         <source><p>If the above is correct, press the <b>Finish</b> button. Once you press it, the selected media will be temporarily mounted on the virtual machine and the machine will start execution.</p><p>Please note that when you close the virtual machine, the specified media will be automatically unmounted and the boot device will be set back to the first hard disk.</p><p>Depending on the type of the setup program, you may need to manually  [...]
@@ -2115,7 +2113,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>If the above is correct, press the <b>Finish</b> button. Once you press it, the selected media will be mounted on the virtual machine and the machine will start execution.</p></source>
-        <translation type="obsolete"><p>ប្រសិន​បើ​ខា​ងលើ​ត្រឹមត្រូវ​ហើយ ចុច​ប៊ូតុង <b>បញ្ចប់</b> ។ នៅពេល​អ្នក​ចុច​វា មេឌៀ​ដែល​បាន​ជ្រើស​នឹង​ត្រូវ​បានម៉ោន​​លើ​ម៉ាស៊ីន​និម្មិត ហើយ​ម៉ាស៊ីន​នឹង​ចាប់ផ្ដើម​ប្រតិបត្តិ ។</p></translation>
+        <translation type="obsolete"><p>ប្រសិន​បើ​ខា​ងលើ​ត្រឹមត្រូវ​ហើយ ចុច​ប៊ូតុង <b>បញ្ចប់</b> ។ នៅពេល​អ្នក​ចុច​វា មេឌៀ​ដែល​បាន​ជ្រើស​នឹង​ត្រូវ​បានម៉ោន​​លើ​ម៉ាស៊ីន​និម្មិត ហើយ​ម៉ាស៊ីន​នឹង​ចាប់ផ្ដើម​ប្រតិបត្តិ ។</p></translation>
     </message>
     <message>
         <source>CD/DVD Device</source>
@@ -2422,11 +2420,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
-        <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
         <translation type="unfinished">តម្រង​ឧបករណ៍</translation>
@@ -2486,83 +2479,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">ឧបករណ៍​បញ្ជា​ USB</translation>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">ឧបករណ៍​បញ្ជា​ USB</translation>
+    </message>
+    <message>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Menu-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2827,31 +2825,31 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsGeneral</name>
     <message>
         <source>Holds the path to the default virtual machine folder. This folder is used, if not explicitly specified otherwise, when creating new virtual machines.</source>
-        <translation>បង្ហាញ​ផ្លូវ​ទៅ​កាន់​ថត​ម៉ាស៊ីន​និម្មិត​លំនាំដើម ។ ថត​នេះ​ត្រូវ​បាន​ប្រើ ប្រសិនបើ​មិន​បានបញ្ជាក់ជាក់លាក់​ទេ នៅពេល​បង្កើត​ម៉ាស៊ីន​និម្មិត​ថ្មី ។</translation>
+        <translation>បង្ហាញ​ផ្លូវ​ទៅ​កាន់​ថត​ម៉ាស៊ីន​និម្មិត​លំនាំដើម ។ ថត​នេះ​ត្រូវ​បាន​ប្រើ ប្រសិនបើ​មិន​បានបញ្ជាក់ជាក់លាក់​ទេ នៅពេល​បង្កើត​ម៉ាស៊ីន​និម្មិត​ថ្មី ។</translation>
     </message>
     <message>
         <source>Holds the path to the library that provides authentication for Remote Display (VRDP) clients.</source>
-        <translation>បង្ហាញ​ផ្លូវ​ទៅ​បណ្ណាល័យ ដែល​ផ្ដល់​នូវ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​សម្រាប់​ម៉ាស៊ីន​ភ្ញៀវ​បង្ហាញ​ពី​ចម្ងាយ (​VRDP) ។</translation>
+        <translation>បង្ហាញ​ផ្លូវ​ទៅ​បណ្ណាល័យ ដែល​ផ្ដល់​នូវ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​សម្រាប់​ម៉ាស៊ីន​ភ្ញៀវ​បង្ហាញ​ពី​ចម្ងាយ (​VRDP) ។</translation>
     </message>
     <message>
         <source>Default &Hard Disk Folder:</source>
-        <translation type="obsolete">ថត​ថាសរឹង​លំនាំដើម ៖</translation>
+        <translation type="obsolete">ថត​ថាសរឹង​លំនាំដើម ៖</translation>
     </message>
     <message>
         <source>Default &Machine Folder:</source>
-        <translation>ថត​ម៉ាស៊ីន​លំនាំដើម ៖</translation>
+        <translation>ថត​ម៉ាស៊ីន​លំនាំដើម ៖</translation>
     </message>
     <message>
         <source>V&RDP Authentication Library:</source>
-        <translation>បណ្ណាល័យ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​របស់ VRDP ៖</translation>
+        <translation>បណ្ណាល័យ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​របស់ VRDP ៖</translation>
     </message>
     <message>
         <source>Holds the path to the default hard disk folder. This folder is used, if not explicitly specified otherwise, when adding existing or creating new virtual hard disks.</source>
-        <translation type="obsolete">បង្ហាញ​ផ្លូវ​ទៅ​កាន់​ថត​ថាសរឹង​លំនាំដើម ។ ថត​នេះ​ត្រូ​វបានប្រើ ប្រសិនបើ​គ្មាន​ការ​កំណត់​ជាក់លាក់ នៅពេលបន្ថែម​ថាសរឹង​និម្មិត​ថ្មី​ ឬ​មាន​ស្រាប់ ។</translation>
+        <translation type="obsolete">បង្ហាញ​ផ្លូវ​ទៅ​កាន់​ថត​ថាសរឹង​លំនាំដើម ។ ថត​នេះ​ត្រូ​វបានប្រើ ប្រសិនបើ​គ្មាន​ការ​កំណត់​ជាក់លាក់ នៅពេលបន្ថែម​ថាសរឹង​និម្មិត​ថ្មី​ ឬ​មាន​ស្រាប់ ។</translation>
     </message>
     <message>
         <source>When checked, the application will provide an icon with the context menu in the system tray.</source>
-        <translation type="obsolete">នៅពេល​បាន​គូស​ធីក កម្មវិធី​នឹង​ផ្ដល់​នូវ​រូបតំណាង​ដែល​មាន​ម៉ឺនុយ​បរិបទ​នៅ​ក្នុង​ថាស​ប្រព័ន្ធ ។</translation>
+        <translation type="obsolete">នៅពេល​បាន​គូស​ធីក កម្មវិធី​នឹង​ផ្ដល់​នូវ​រូបតំណាង​ដែល​មាន​ម៉ឺនុយ​បរិបទ​នៅ​ក្នុង​ថាស​ប្រព័ន្ធ ។</translation>
     </message>
     <message>
         <source>&Show System Tray Icon</source>
@@ -2859,7 +2857,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the Dock Icon will reflect the VM window content in realtime.</source>
-        <translation type="obsolete">នៅពេលបានគូស​ធីក រូប​តំណាង​ចូលផែ​នឹង​ជះឥទ្ធិពល​លើ​មាតិកា​បង្អួច​ VM នៅ​ក្នុង realtime ។</translation>
+        <translation type="obsolete">នៅពេលបានគូស​ធីក រូប​តំណាង​ចូលផែ​នឹង​ជះឥទ្ធិពល​លើ​មាតិកា​បង្អួច​ VM នៅ​ក្នុង realtime ។</translation>
     </message>
     <message>
         <source>&Dock Icon Realtime Preview</source>
@@ -2886,15 +2884,15 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsInput</name>
     <message>
         <source>Host &Key:</source>
-        <translation type="obsolete">គ្រាប់ចុច​ម៉ាស៊ីន ៖</translation>
+        <translation type="obsolete">គ្រាប់ចុច​ម៉ាស៊ីន ៖</translation>
     </message>
     <message>
         <source>Holds the key used as a Host Key in the VM window. Activate the entry field and press a new Host Key. Note that alphanumeric, cursor movement and editing keys cannot be used.</source>
-        <translation type="obsolete">បង្ហាញគ្រាប់ចុច​ដែល​បាន​ប្រើ​ជា​គ្រាប់​ចុច​ម៉ាស៊ីន​នៅ​ក្នុង​បង្អួច VM ។ ធ្វើ​ឲ្យ​វាល​ធាតុ​សកម្ម ហើយ​ចុច​គ្រាប់ចុច​ម៉ាស៊ីន​ថ្មី ។ ចំណាំថា​លេខ ចលនា​ទស្សន៍ទ្រនិច និង​គ្រាប់ចុចកែសម្រួល​មិនអាច​ត្រូវ​បាន​ប្រើ​ជា​គ្រាប់ចុច​ម៉ាស៊ីន​ទេ ។</translation>
+        <translation type="obsolete">បង្ហាញគ្រាប់ចុច​ដែល​បាន​ប្រើ​ជា​គ្រាប់​ចុច​ម៉ាស៊ីន​នៅ​ក្នុង​បង្អួច VM ។ ធ្វើ​ឲ្យ​វាល​ធាតុ​សកម្ម ហើយ​ចុច​គ្រាប់ចុច​ម៉ាស៊ីន​ថ្មី ។ ចំណាំថា​លេខ ចលនា​ទស្សន៍ទ្រនិច និង​គ្រាប់ចុចកែសម្រួល​មិនអាច​ត្រូវ​បាន​ប្រើ​ជា​គ្រាប់ចុច​ម៉ាស៊ីន​ទេ ។</translation>
     </message>
     <message>
         <source>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</source>
-        <translation type="unfinished">នៅពេល​បានគូស​ធីក ក្ដារចុច​ត្រូ​វបាន​ចាប់យក​ដោយ​ស្វ័យ​ប្រវត្តិ​រាល់ពេល​ដែល​បង្អួច VM ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម ។ នៅពេល​ក្ដារចុច​ត្រូវ​បាន​ចាប់យក  keystrokes (រួម​មាន​ប្រព័ន្ធ​​មួយ ដូចជា ជំនួស(Alt)-ថេប(Tab)) ត្រូវ​បាន​បញ្ជូន​ទៅ​កាន់ VM ។</translation>
+        <translation type="unfinished">នៅពេល​បានគូស​ធីក ក្ដារចុច​ត្រូ​វបាន​ចាប់យក​ដោយ​ស្វ័យ​ប្រវត្តិ​រាល់ពេល​ដែល​បង្អួច VM ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម ។ នៅពេល​ក្ដារចុច​ត្រូវ​បាន​ចាប់យក  keystrokes (រួម​មាន​ប្រព័ន្ធ​​មួយ ដូចជា ជំនួស(Alt)-ថេប(Tab)) ត្រូវ​បាន​បញ្ជូន​ទៅ​កាន់ VM ។</translation>
     </message>
     <message>
         <source>&Auto Capture Keyboard</source>
@@ -2949,15 +2947,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Language:</source>
-        <translation>ភាសា ៖</translation>
+        <translation>ភាសា ៖</translation>
     </message>
     <message>
         <source>&Interface Language:</source>
-        <translation type="obsolete">ភាសា​ចំណុច​ប្រទាក់ ៖</translation>
+        <translation type="obsolete">ភាសា​ចំណុច​ប្រទាក់ ៖</translation>
     </message>
     <message>
         <source>Lists all available user interface languages. The effective language is written in <b>bold</b>. Select <i>Default</i> to reset to the system default language.</source>
-        <translation>រាយ​ភាសា​ចំណុច​ប្រទាក់​អ្នក​ប្រើ​ដែល​អាច​ប្រើ​បាន ។ ភាសា​ដែល​មានប្រសិទ្ធភាព​ត្រូវ​បាន​សរសេរ​ <b>ដិត</b> ។ ជ្រើស <i>លំនាំដើម</i> ដើម្បី​កំណត់​ភាសា​លំនាំដើម​របស់​ប្រព័ន្ធ​ឡើង​វិញ ។</translation>
+        <translation>រាយ​ភាសា​ចំណុច​ប្រទាក់​អ្នក​ប្រើ​ដែល​អាច​ប្រើ​បាន ។ ភាសា​ដែល​មានប្រសិទ្ធភាព​ត្រូវ​បាន​សរសេរ​ <b>ដិត</b> ។ ជ្រើស <i>លំនាំដើម</i> ដើម្បី​កំណត់​ភាសា​លំនាំដើម​របស់​ប្រព័ន្ធ​ឡើង​វិញ ។</translation>
     </message>
     <message>
         <source>Name</source>
@@ -2977,7 +2975,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Author(s):</source>
-        <translation>អ្នកនិពន្ធ ៖</translation>
+        <translation>អ្នកនិពន្ធ ៖</translation>
     </message>
     <message>
         <source>&Interface Languages</source>
@@ -3157,11 +3155,11 @@ creating/removing host-only network</comment>
     </message>
     <message>
         <source>&Host-only Networks:</source>
-        <translation type="obsolete">បណ្ដាញ​ម៉ាស៊ីន​ប៉ុណ្ណោះ ៖</translation>
+        <translation type="obsolete">បណ្ដាញ​ម៉ាស៊ីន​ប៉ុណ្ណោះ ៖</translation>
     </message>
     <message>
         <source>Lists all available host-only networks.</source>
-        <translation>រាយ​បណ្ដាញ​ម៉ាស៊ីន​ដែលអាច​ប្រើបាន ។</translation>
+        <translation>រាយ​បណ្ដាញ​ម៉ាស៊ីន​ដែលអាច​ប្រើបាន ។</translation>
     </message>
     <message>
         <source>Name</source>
@@ -3411,27 +3409,27 @@ creating/removing host-only network</comment>
     </message>
     <message>
         <source>IPv4 Network &Mask:</source>
-        <translation type="obsolete">របាំង​បណ្តាញ​ IPv4 ៖</translation>
+        <translation type="obsolete">របាំង​បណ្តាញ​ IPv4 ៖</translation>
     </message>
     <message>
         <source>Holds the host IPv4 network mask for this adapter.</source>
-        <translation type="obsolete">បង្ហាញ​របាំង​បណ្តាញ​ម៉ាស៊ីន​ IPv4 សម្រាប់​អាដាប់​ទ័រ​នេះ​ ។</translation>
+        <translation type="obsolete">បង្ហាញ​របាំង​បណ្តាញ​ម៉ាស៊ីន​ IPv4 សម្រាប់​អាដាប់​ទ័រ​នេះ​ ។</translation>
     </message>
     <message>
         <source>I&Pv6 Address:</source>
-        <translation type="obsolete">អាសយដ្ឋាន​ IPv6 ៖</translation>
+        <translation type="obsolete">អាសយដ្ឋាន​ IPv6 ៖</translation>
     </message>
     <message>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation type="obsolete">បង្ហាញ​​អា​សយដ្ឋាន​ម៉ាស៊ីន​ IPv6 សម្រាប់​​អាដាប់​ទ័រ​​នេះ ​ប្រ​សិន​បើ​​ IPv6 ត្រូវ​បាន​គាំ​ទ្រ ។</translation>
+        <translation type="obsolete">បង្ហាញ​​អា​សយដ្ឋាន​ម៉ាស៊ីន​ IPv6 សម្រាប់​​អាដាប់​ទ័រ​​នេះ ​ប្រ​សិន​បើ​​ IPv6 ត្រូវ​បាន​គាំ​ទ្រ ។</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &Length:</source>
-        <translation type="obsolete">ប្រ​វែង​របាំង​បណ្តាញ​ IPv6 ៖</translation>
+        <translation type="obsolete">ប្រ​វែង​របាំង​បណ្តាញ​ IPv6 ៖</translation>
     </message>
     <message>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation type="obsolete">បង្ហាញ​ប្រ​វែង​​បុព្វបទ​របាំង​បណ្តាញ​ម៉ាស៊ីន​ IPv6​ សម្រាប់​​អាដាប់​ទ័រ​​នេះ ​ប្រ​សិន​បើ​ IPv6 ត្រូវ​បាន​គាំ​ទ្រ​ ។</translation>
+        <translation type="obsolete">បង្ហាញ​ប្រ​វែង​​បុព្វបទ​របាំង​បណ្តាញ​ម៉ាស៊ីន​ IPv6​ សម្រាប់​​អាដាប់​ទ័រ​​នេះ ​ប្រ​សិន​បើ​ IPv6 ត្រូវ​បាន​គាំ​ទ្រ​ ។</translation>
     </message>
     <message>
         <source>&DHCP Server</source>
@@ -3443,11 +3441,11 @@ creating/removing host-only network</comment>
     </message>
     <message>
         <source>Indicates whether the DHCP Server is enabled on machine startup or not.</source>
-        <translation type="obsolete">បង្ហាញ​​ថា​តើ​ម៉ា​ស៊ីន​បម្រើ​​ DHCP ត្រូវ​បាន​បើក​នៅពេល​ចាប់ផ្ដើម​ដែរ​ឬទេ ។</translation>
+        <translation type="obsolete">បង្ហាញ​​ថា​តើ​ម៉ា​ស៊ីន​បម្រើ​​ DHCP ត្រូវ​បាន​បើក​នៅពេល​ចាប់ផ្ដើម​ដែរ​ឬទេ ។</translation>
     </message>
     <message>
         <source>Server Add&ress:</source>
-        <translation type="obsolete">អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ​ ៖</translation>
+        <translation type="obsolete">អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ​ ៖</translation>
     </message>
     <message>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
@@ -3455,27 +3453,27 @@ creating/removing host-only network</comment>
     </message>
     <message>
         <source>Server &Mask:</source>
-        <translation type="obsolete">របាំង​ម៉ា​ស៊ីនបម្រើ​ ៖</translation>
+        <translation type="obsolete">របាំង​ម៉ា​ស៊ីនបម្រើ​ ៖</translation>
     </message>
     <message>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="obsolete">បង្ហាញ​របាំង​បណ្តាញ​​សេវា​​បម្រើ​ម៉ា​ស៊ីន​របស់​ DHCP ដែល​ភ្ជាប់​​​ជា​មួយ​កម្ម​វិធី​សម្រួល​ម៉ា​ស៊ីន​​-​តែ​មួយ​នេះ​ ។</translation>
+        <translation type="obsolete">បង្ហាញ​របាំង​បណ្តាញ​​សេវា​​បម្រើ​ម៉ា​ស៊ីន​របស់​ DHCP ដែល​ភ្ជាប់​​​ជា​មួយ​កម្ម​វិធី​សម្រួល​ម៉ា​ស៊ីន​​-​តែ​មួយ​នេះ​ ។</translation>
     </message>
     <message>
         <source>&Lower Address Bound:</source>
-        <translation type="obsolete">ព្រំ​ដែន​អា​សយ​ដ្ឋាន​ទាប​ ៖</translation>
+        <translation type="obsolete">ព្រំ​ដែន​អា​សយ​ដ្ឋាន​ទាប​ ៖</translation>
     </message>
     <message>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="obsolete">បង្ហាញ​ព្រំដែន​អាសយដ្ឋានទាប​ដែល​បានផ្ដល់ដោយ​សេវា​ម៉ាស៊ីន​បម្រើ DHCP ដែល​បានភ្ជាប់​ជា​មួយនឹងកម្មវិធី​សម្រួល​ម៉ាស៊ីន​ ។</translation>
+        <translation type="obsolete">បង្ហាញ​ព្រំដែន​អាសយដ្ឋានទាប​ដែល​បានផ្ដល់ដោយ​សេវា​ម៉ាស៊ីន​បម្រើ DHCP ដែល​បានភ្ជាប់​ជា​មួយនឹងកម្មវិធី​សម្រួល​ម៉ាស៊ីន​ ។</translation>
     </message>
     <message>
         <source>&Upper Address Bound:</source>
-        <translation type="obsolete">ព្រំដែន​អា​សយដ្ឋានខ្ពស់​ ៖</translation>
+        <translation type="obsolete">ព្រំដែន​អា​សយដ្ឋានខ្ពស់​ ៖</translation>
     </message>
     <message>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="obsolete">បង្ហាញ​ព្រំដែន​អាសយដ្ឋាន​ខ្ពស់​ដែលបានផ្ដល់​ដោយ​ម៉ាស៊ីន​បម្រើ DHCP ដោយ​ផ្ដល់​សេវា​បណ្ដាញ​ភ្ជាប់​ជា​មួយ​នឹង​អាដាប់ទ័រ​ម៉ាស៊ីន​ ។</translation>
+        <translation type="obsolete">បង្ហាញ​ព្រំដែន​អាសយដ្ឋាន​ខ្ពស់​ដែលបានផ្ដល់​ដោយ​ម៉ាស៊ីន​បម្រើ DHCP ដោយ​ផ្ដល់​សេវា​បណ្ដាញ​ភ្ជាប់​ជា​មួយ​នឹង​អាដាប់ទ័រ​ម៉ាស៊ីន​ ។</translation>
     </message>
 </context>
 <context>
@@ -3506,27 +3504,27 @@ creating/removing host-only network</comment>
     </message>
     <message>
         <source>IPv4 Network &Mask:</source>
-        <translation type="unfinished">របាំង​បណ្តាញ​ IPv4 ៖</translation>
+        <translation type="unfinished">របាំង​បណ្តាញ​ IPv4 ៖</translation>
     </message>
     <message>
         <source>Holds the host IPv4 network mask for this adapter.</source>
-        <translation type="unfinished">បង្ហាញ​របាំង​បណ្តាញ​ម៉ាស៊ីន​ IPv4 សម្រាប់​អាដាប់​ទ័រ​នេះ​ ។</translation>
+        <translation type="unfinished">បង្ហាញ​របាំង​បណ្តាញ​ម៉ាស៊ីន​ IPv4 សម្រាប់​អាដាប់​ទ័រ​នេះ​ ។</translation>
     </message>
     <message>
         <source>I&Pv6 Address:</source>
-        <translation type="unfinished">អាសយដ្ឋាន​ IPv6 ៖</translation>
+        <translation type="unfinished">អាសយដ្ឋាន​ IPv6 ៖</translation>
     </message>
     <message>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">បង្ហាញ​​អា​សយដ្ឋាន​ម៉ាស៊ីន​ IPv6 សម្រាប់​​អាដាប់​ទ័រ​​នេះ ​ប្រ​សិន​បើ​​ IPv6 ត្រូវ​បាន​គាំ​ទ្រ ។</translation>
+        <translation type="unfinished">បង្ហាញ​​អា​សយដ្ឋាន​ម៉ាស៊ីន​ IPv6 សម្រាប់​​អាដាប់​ទ័រ​​នេះ ​ប្រ​សិន​បើ​​ IPv6 ត្រូវ​បាន​គាំ​ទ្រ ។</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &Length:</source>
-        <translation type="unfinished">ប្រ​វែង​របាំង​បណ្តាញ​ IPv6 ៖</translation>
+        <translation type="unfinished">ប្រ​វែង​របាំង​បណ្តាញ​ IPv6 ៖</translation>
     </message>
     <message>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">បង្ហាញ​ប្រ​វែង​​បុព្វបទ​របាំង​បណ្តាញ​ម៉ាស៊ីន​ IPv6​ សម្រាប់​​អាដាប់​ទ័រ​​នេះ ​ប្រ​សិន​បើ​ IPv6 ត្រូវ​បាន​គាំ​ទ្រ​ ។</translation>
+        <translation type="unfinished">បង្ហាញ​ប្រ​វែង​​បុព្វបទ​របាំង​បណ្តាញ​ម៉ាស៊ីន​ IPv6​ សម្រាប់​​អាដាប់​ទ័រ​​នេះ ​ប្រ​សិន​បើ​ IPv6 ត្រូវ​បាន​គាំ​ទ្រ​ ។</translation>
     </message>
     <message>
         <source>&DHCP Server</source>
@@ -3538,11 +3536,11 @@ creating/removing host-only network</comment>
     </message>
     <message>
         <source>Indicates whether the DHCP Server is enabled on machine startup or not.</source>
-        <translation type="obsolete">បង្ហាញ​​ថា​តើ​ម៉ា​ស៊ីន​បម្រើ​​ DHCP ត្រូវ​បាន​បើក​នៅពេល​ចាប់ផ្ដើម​ដែរ​ឬទេ ។</translation>
+        <translation type="obsolete">បង្ហាញ​​ថា​តើ​ម៉ា​ស៊ីន​បម្រើ​​ DHCP ត្រូវ​បាន​បើក​នៅពេល​ចាប់ផ្ដើម​ដែរ​ឬទេ ។</translation>
     </message>
     <message>
         <source>Server Add&ress:</source>
-        <translation type="unfinished">អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ​ ៖</translation>
+        <translation type="unfinished">អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ​ ៖</translation>
     </message>
     <message>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
@@ -3550,34 +3548,34 @@ creating/removing host-only network</comment>
     </message>
     <message>
         <source>Server &Mask:</source>
-        <translation type="unfinished">របាំង​ម៉ា​ស៊ីនបម្រើ​ ៖</translation>
+        <translation type="unfinished">របាំង​ម៉ា​ស៊ីនបម្រើ​ ៖</translation>
     </message>
     <message>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">បង្ហាញ​របាំង​បណ្តាញ​​សេវា​​បម្រើ​ម៉ា​ស៊ីន​របស់​ DHCP ដែល​ភ្ជាប់​​​ជា​មួយ​កម្ម​វិធី​សម្រួល​ម៉ា​ស៊ីន​​-​តែ​មួយ​នេះ​ ។</translation>
+        <translation type="unfinished">បង្ហាញ​របាំង​បណ្តាញ​​សេវា​​បម្រើ​ម៉ា​ស៊ីន​របស់​ DHCP ដែល​ភ្ជាប់​​​ជា​មួយ​កម្ម​វិធី​សម្រួល​ម៉ា​ស៊ីន​​-​តែ​មួយ​នេះ​ ។</translation>
     </message>
     <message>
         <source>&Lower Address Bound:</source>
-        <translation type="unfinished">ព្រំ​ដែន​អា​សយ​ដ្ឋាន​ទាប​ ៖</translation>
+        <translation type="unfinished">ព្រំ​ដែន​អា​សយ​ដ្ឋាន​ទាប​ ៖</translation>
     </message>
     <message>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">បង្ហាញ​ព្រំដែន​អាសយដ្ឋានទាប​ដែល​បានផ្ដល់ដោយ​សេវា​ម៉ាស៊ីន​បម្រើ DHCP ដែល​បានភ្ជាប់​ជា​មួយនឹងកម្មវិធី​សម្រួល​ម៉ាស៊ីន​ ។</translation>
+        <translation type="unfinished">បង្ហាញ​ព្រំដែន​អាសយដ្ឋានទាប​ដែល​បានផ្ដល់ដោយ​សេវា​ម៉ាស៊ីន​បម្រើ DHCP ដែល​បានភ្ជាប់​ជា​មួយនឹងកម្មវិធី​សម្រួល​ម៉ាស៊ីន​ ។</translation>
     </message>
     <message>
         <source>&Upper Address Bound:</source>
-        <translation type="unfinished">ព្រំដែន​អា​សយដ្ឋានខ្ពស់​ ៖</translation>
+        <translation type="unfinished">ព្រំដែន​អា​សយដ្ឋានខ្ពស់​ ៖</translation>
     </message>
     <message>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">បង្ហាញ​ព្រំដែន​អាសយដ្ឋាន​ខ្ពស់​ដែលបានផ្ដល់​ដោយ​ម៉ាស៊ីន​បម្រើ DHCP ដោយ​ផ្ដល់​សេវា​បណ្ដាញ​ភ្ជាប់​ជា​មួយ​នឹង​អាដាប់ទ័រ​ម៉ាស៊ីន​ ។</translation>
+        <translation type="unfinished">បង្ហាញ​ព្រំដែន​អាសយដ្ឋាន​ខ្ពស់​ដែលបានផ្ដល់​ដោយ​ម៉ាស៊ីន​បម្រើ DHCP ដោយ​ផ្ដល់​សេវា​បណ្ដាញ​ភ្ជាប់​ជា​មួយ​នឹង​អាដាប់ទ័រ​ម៉ាស៊ីន​ ។</translation>
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3702,7 +3700,7 @@ creating/removing host-only network</comment>
     <name>UIGlobalSettingsUpdate</name>
     <message>
         <source>When checked, the application will periodically connect to the VirtualBox website and check whether a new VirtualBox version is available.</source>
-        <translation>នៅពេល​បាន​គូសធីក កម្មវិធី​នឹង​តភ្ជាប់​ទៅ​កាន់តំបន់បណ្ដាញ VirtualBox តាម​កាល​កំណត់ ហើយ​ពិនិត្យ​មើល​ថាតើ​មានកំណែ VirtualBox ដែរឬទេ ។</translation>
+        <translation>នៅពេល​បាន​គូសធីក កម្មវិធី​នឹង​តភ្ជាប់​ទៅ​កាន់តំបន់បណ្ដាញ VirtualBox តាម​កាល​កំណត់ ហើយ​ពិនិត្យ​មើល​ថាតើ​មានកំណែ VirtualBox ដែរឬទេ ។</translation>
     </message>
     <message>
         <source>&Check for Updates</source>
@@ -3710,23 +3708,23 @@ creating/removing host-only network</comment>
     </message>
     <message>
         <source>&Once per:</source>
-        <translation>ម្ដង​ក្នុង ៖</translation>
+        <translation>ម្ដង​ក្នុង ៖</translation>
     </message>
     <message>
         <source>Specifies how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="obsolete">បញ្ជាក់​វិធី​ដែល​កំណែ​ថ្មី​ពិនិត្យ​មើល​គួរ​ត្រូវ​បាន​អនុវត្ត​ ។ ចំណាំថា ប្រសិនបើ​ង្នក​ចង់​បញ្ចប់ បិទ​ការ​ពិនិត្យនេះ គ្រាន់តែ​ជម្រះ​ប្រអប់​គូស​ធីក​ខាង​លើ ។</translation>
+        <translation type="obsolete">បញ្ជាក់​វិធី​ដែល​កំណែ​ថ្មី​ពិនិត្យ​មើល​គួរ​ត្រូវ​បាន​អនុវត្ត​ ។ ចំណាំថា ប្រសិនបើ​ង្នក​ចង់​បញ្ចប់ បិទ​ការ​ពិនិត្យនេះ គ្រាន់តែ​ជម្រះ​ប្រអប់​គូស​ធីក​ខាង​លើ ។</translation>
     </message>
     <message>
         <source>Next Check:</source>
-        <translation>ការ​ពិនិត្យ​មើល​បន្ទាប់ ៖</translation>
+        <translation>ការ​ពិនិត្យ​មើល​បន្ទាប់ ៖</translation>
     </message>
     <message>
         <source>Check for:</source>
-        <translation>ពិនិត្យ​មើល ៖</translation>
+        <translation>ពិនិត្យ​មើល ៖</translation>
     </message>
     <message>
         <source><p>Choose this if you only wish to be notified about stable updates to VirtualBox.</p></source>
-        <translation><p>ជ្រើសវា​ ប្រសិនបើ​អ្នក​ចង់​ឲ្យ​ជូន​ដំណឹង​អំពី​ភាព​ទាន់សម័យ​ស្ថិតស្ថេរ​ដល់ VirtualBox ។</p></translation>
+        <translation><p>ជ្រើសវា​ ប្រសិនបើ​អ្នក​ចង់​ឲ្យ​ជូន​ដំណឹង​អំពី​ភាព​ទាន់សម័យ​ស្ថិតស្ថេរ​ដល់ VirtualBox ។</p></translation>
     </message>
     <message>
         <source>&Stable Release Versions</source>
@@ -3734,7 +3732,7 @@ creating/removing host-only network</comment>
     </message>
     <message>
         <source><p>Choose this if you wish to be notified about all new VirtualBox releases.</p></source>
-        <translation><p>ជ្រើសវា​ ប្រសិន​បើ​អ្នក​ចង់​ឲ្យ​ជូន​ដំណឹង​អំពី​ការ​ចេញផ្សាយ​ VirtualBox ថ្មី ។</p></translation>
+        <translation><p>ជ្រើសវា​ ប្រសិន​បើ​អ្នក​ចង់​ឲ្យ​ជូន​ដំណឹង​អំពី​ការ​ចេញផ្សាយ​ VirtualBox ថ្មី ។</p></translation>
     </message>
     <message>
         <source>&All New Releases</source>
@@ -3742,7 +3740,7 @@ creating/removing host-only network</comment>
     </message>
     <message>
         <source><p>Choose this to be notified about all new VirtualBox releases and pre-release versions of VirtualBox.</p></source>
-        <translation><p>ជ្រើស​វាដើម្បី​ឲ្យ​ជូន​ដំណឹង​អំពី​​កំណែ​​ចេញផ្សាយ​​​របស់ VirtualBox និង​និងចេញ​ផ្សាយ​មុន​របស់ VirtualBox ។</p></translation>
+        <translation><p>ជ្រើស​វាដើម្បី​ឲ្យ​ជូន​ដំណឹង​អំពី​​កំណែ​​ចេញផ្សាយ​​​របស់ VirtualBox និង​និងចេញ​ផ្សាយ​មុន​របស់ VirtualBox ។</p></translation>
     </message>
     <message>
         <source>All New Releases and &Pre-Releases</source>
@@ -4049,7 +4047,7 @@ creating/removing host-only network</comment>
     </message>
     <message>
         <source>Welcome to the Appliance Import Wizard!</source>
-        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​អ្នក​ជំនួយកា​រនាំចូល​ឧបករណ៍ !</translation>
+        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​អ្នក​ជំនួយកា​រនាំចូល​ឧបករណ៍ !</translation>
     </message>
     <message>
         <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
@@ -4063,9 +4061,9 @@ p, li { white-space: pre-wrap; }
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body>
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">អ្នក​ជំនួយ​ការ​នេះ​នឹង​នាំយក​​តាម​រយៈ​ការ​នាំចូល​ឧបករណ៍ ។</p>
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ប្រើ​ប៊ូតុង <span style=" font-weight:600;">បន្ទាប់</span> ទៅ​ទំព័រ​បន្ទាប់​របស់​អ្នក​ជំនួយ​ការ និងប៊ូតុង​ <span style=" font-weight:600;">ថយក្រោយ</span> ដើម្បី​ត្រឡប់​ទៅ​ទំព័រ​មុន ។</p>
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">បច្ចុប្បន្ន VirtualBox គាំទ្រ​ការ​នាំចូល​ឧបករណ៍ ដែលបាន​រក្សាទុក​នៅ​ក្នុង​ទ្រង់ទ្រាយ Open Virtualization Format (OVF) ។ ដើម្បី​បន្ត ជ្រើស​ឯកសារ​​ត្រូវ​នាំ​ចូល​ខាង​ក្រោម ៖</p></body></html></translation>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">អ្នក​ជំនួយ​ការ​នេះ​នឹង​នាំយក​​តាម​រយៈ​ការ​នាំចូល​ឧបករណ៍ ។</p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ប្រើ​ប៊ូតុង <span style=" font-weight:600;">បន្ទាប់</span> ទៅ​ទំព័រ​បន្ទាប់​របស់​អ្នក​ជំនួយ​ការ និងប៊ូតុង​ <span style=" font-weight:600;">ថយក្រោយ</span> ដើម្បី​ត្រឡប់​ទៅ​ទំព័រ​មុន ។</p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">បច្ចុប្បន្ន VirtualBox គាំទ្រ​ការ​នាំចូល​ឧបករណ៍ ដែលបាន​រក្សាទុក​នៅ​ក្នុង​ទ្រង់ទ្រាយ Open Virtualization Format (OVF) ។ ដើម្បី​បន្ត ជ្រើស​ឯកសារ​​ត្រូវ​នាំ​ចូល​ខាង​ក្រោម ៖</p></body></html></translation>
     </message>
     <message>
         <source>< &Back</source>
@@ -4085,7 +4083,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>These are the virtual machines contained in the appliance and the suggested settings of the imported VirtualBox machines. You can change many of the properties shown by double-clicking on the items and disable others using the check boxes below.</source>
-        <translation type="obsolete">មាន​ម៉ាស៊ីន​និម្មិត​ដែល​មាន​នៅ​ក្នុង​ឧបករណ៍​ និង​ការ​កំណត់​ដែលបាន​ស្នើ​របស់ម៉ាស៊ីន VirtualBox ដែល​បាននាំចូល ។ អ្នក​អាច​ផ្លាស់ប្ដូរ​លក្ខណសម្បត្តិ​ដែលបានបង្ហាញ​ដោយ​ចុច​ទ្វេដង​លើ​ធាតុ និងបិទ​​លក្ខណសម្បត្តិ​ផ្សេងៗ​ទៀត ដោយ​ប្រើ​ប្រ​អប់ធីក​ខាង​ក្រោម ។</translation>
+        <translation type="obsolete">មាន​ម៉ាស៊ីន​និម្មិត​ដែល​មាន​នៅ​ក្នុង​ឧបករណ៍​ និង​ការ​កំណត់​ដែលបាន​ស្នើ​របស់ម៉ាស៊ីន VirtualBox ដែល​បាននាំចូល ។ អ្នក​អាច​ផ្លាស់ប្ដូរ​លក្ខណសម្បត្តិ​ដែលបានបង្ហាញ​ដោយ​ចុច​ទ្វេដង​លើ​ធាតុ និងបិទ​​លក្ខណសម្បត្តិ​ផ្សេងៗ​ទៀត ដោយ​ប្រើ​ប្រ​អប់ធីក​ខាង​ក្រោម ។</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
@@ -4108,14 +4106,14 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Welcome to the Appliance Import Wizard!</source>
-        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​អ្នក​ជំនួយកា​រនាំចូល​ឧបករណ៍ !</translation>
+        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​អ្នក​ជំនួយកា​រនាំចូល​ឧបករណ៍ !</translation>
     </message>
 </context>
 <context>
     <name>UIImportApplianceWzdPage2</name>
     <message>
         <source>These are the virtual machines contained in the appliance and the suggested settings of the imported VirtualBox machines. You can change many of the properties shown by double-clicking on the items and disable others using the check boxes below.</source>
-        <translation type="obsolete">មាន​ម៉ាស៊ីន​និម្មិត​ដែល​មាន​នៅ​ក្នុង​ឧបករណ៍​ និង​ការ​កំណត់​ដែលបាន​ស្នើ​របស់ម៉ាស៊ីន VirtualBox ដែល​បាននាំចូល ។ អ្នក​អាច​ផ្លាស់ប្ដូរ​លក្ខណសម្បត្តិ​ដែលបានបង្ហាញ​ដោយ​ចុច​ទ្វេដង​លើ​ធាតុ និងបិទ​​លក្ខណសម្បត្តិ​ផ្សេងៗ​ទៀត ដោយ​ប្រើ​ប្រ​អប់ធីក​ខាង​ក្រោម ។</translation>
+        <translation type="obsolete">មាន​ម៉ាស៊ីន​និម្មិត​ដែល​មាន​នៅ​ក្នុង​ឧបករណ៍​ និង​ការ​កំណត់​ដែលបាន​ស្នើ​របស់ម៉ាស៊ីន VirtualBox ដែល​បាននាំចូល ។ អ្នក​អាច​ផ្លាស់ប្ដូរ​លក្ខណសម្បត្តិ​ដែលបានបង្ហាញ​ដោយ​ចុច​ទ្វេដង​លើ​ធាតុ និងបិទ​​លក្ខណសម្បត្តិ​ផ្សេងៗ​ទៀត ដោយ​ប្រើ​ប្រ​អប់ធីក​ខាង​ក្រោម ។</translation>
     </message>
     <message>
         <source>Appliance Import Settings</source>
@@ -4162,7 +4160,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the virtual hard disks:</nobr>%1</p></source>
         <comment>HDD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថាសរឹង​និម្មិត ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថាសរឹង​និម្មិត ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the CD/DVD devices:</nobr>%1</p></source>
@@ -4172,12 +4170,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy devices:</nobr>%1</p></source>
         <comment>FD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍​ថាស​ទន់ ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍​ថាស​ទន់ ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the network interfaces:</nobr>%1</p></source>
         <comment>Network adapters tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ចំណុច​ប្រទាក់​បណ្ដាញ ៖</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ចំណុច​ប្រទាក់​បណ្ដាញ ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr></source>
@@ -4202,7 +4200,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the attached USB devices:</nobr>%1</p></source>
         <comment>USB device tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍ USB ដែល​បាន​ភ្ជាប់ ៖</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍ USB ដែល​បាន​ភ្ជាប់ ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>No USB devices attached</b></nobr></source>
@@ -4217,7 +4215,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the machine's shared folders:</nobr>%1</p></source>
         <comment>Shared folders tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថត​ដែល​បានចែករំលែក​របស់​ម៉ាស៊ីន ៖</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថត​ដែល​បានចែករំលែក​របស់​ម៉ាស៊ីន ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>No shared folders</b></nobr></source>
@@ -4226,7 +4224,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source>
-        <translation type="obsolete">បង្ហាញ​ថាតើ​ការ​បង្ហាញ​ពី​ចម្ងាយ (ម៉ាស៊ីន​បម្រើ VRDP) ត្រូវ​បានបើក (<img src=:/vrdp_16px.png/>) ឬ​អត់ (<img src=:/vrdp_disabled_16px.png/>) ។</translation>
+        <translation type="obsolete">បង្ហាញ​ថាតើ​ការ​បង្ហាញ​ពី​ចម្ងាយ (ម៉ាស៊ីន​បម្រើ VRDP) ត្រូវ​បានបើក (<img src=:/vrdp_16px.png/>) ឬ​អត់ (<img src=:/vrdp_disabled_16px.png/>) ។</translation>
     </message>
     <message>
         <source><hr>The VRDP Server is listening on port %1</source>
@@ -4235,7 +4233,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Indicates the status of the hardware virtualization features used by this virtual machine:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr></source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="obsolete">បង្ហាញថា ​ស្ថាន​ភាព​របស់​លក្ខណៈពិសេស​និម្មិត​ផ្នែក​រឹង​ត្រូ​វបាន​ប្រើ​ដោយ​ម៉ាស៊ីន​និម្មិត​នេះ ៖​<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr></translation>
+        <translation type="obsolete">បង្ហាញថា ​ស្ថាន​ភាព​របស់​លក្ខណៈពិសេស​និម្មិត​ផ្នែក​រឹង​ត្រូ​វបាន​ប្រើ​ដោយ​ម៉ាស៊ីន​និម្មិត​នេះ ៖​<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr></translation>
     </message>
     <message>
         <source><br><nobr><b>%1:</b>&nbsp;%2</nobr></source>
@@ -4244,11 +4242,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_ [...]
-        <translation>បង្ហាញថា​តើ​ទស្សន៍​ទ្រនិច​កណ្ដុរ​របស់​ម៉ាស៊ីន​ត្រូ​វបាន​ចាប់យក​ដោយ​ប្រព័ន្ធ​ប្រតបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ដែរឬទេ ៖<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;ទស្សន៍​ទ្រនិច​មិន​ត្រូ​វបាន​ចាប់យក​ទេ</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;ទស្សន៍​ទ្រនិច​ត្រូវ​បាន​ចាប់យក</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;ការ​រួម​បញ្ចូល​កណ្ដ [...]
+        <translation>បង្ហាញថា​តើ​ទស្សន៍​ទ្រនិច​កណ្ដុរ​របស់​ម៉ាស៊ីន​ត្រូ​វបាន​ចាប់យក​ដោយ​ប្រព័ន្ធ​ប្រតបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ដែរឬទេ ៖<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;ទស្សន៍​ទ្រនិច​មិន​ត្រូ​វបាន​ចាប់យក​ទេ</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;ទស្សន៍​ទ្រនិច​ត្រូវ​បាន​ចាប់យក</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;ការ​រួម​បញ្ចូល​កណ្ដ [...]
     </message>
     <message>
         <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source>
-        <translation type="obsolete">បង្ហាញ​ថាតើ​ក្ដារចុច​ត្រូវ​បានចាប់យក​ដោយ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ (<img src=:/hostkey_captured_16px.png/>) ឬ​មិនមែន (<img src=:/hostkey_16px.png/>) ។</translation>
+        <translation type="obsolete">បង្ហាញ​ថាតើ​ក្ដារចុច​ត្រូវ​បានចាប់យក​ដោយ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ (<img src=:/hostkey_captured_16px.png/>) ឬ​មិនមែន (<img src=:/hostkey_16px.png/>) ។</translation>
     </message>
     <message>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
@@ -4268,7 +4266,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4282,8 +4281,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4349,7 +4347,7 @@ p, li { white-space: pre-wrap; }
     <name>UIMachineSettingsAudio</name>
     <message>
         <source>When checked, a virtual PCI audio card will be plugged into the virtual machine and will communicate with the host audio system using the specified driver.</source>
-        <translation>នៅពេល​បាន​គូស​ធីក កាត​អូឌីយ៉ូ PCI និម្មិត​នៅ​ក្នុង​ម៉ាស៊ីន​និម្មិត ​ដែល​ប្រើ​កម្មវិធី​បញ្ជា​ដែល​បានបញ្ជាក់​ទាក់ទង​ទៅ​កាត​អូឌីយ៉ូ​របស់​ម៉ាស៊ីន ។</translation>
+        <translation>នៅពេល​បាន​គូស​ធីក កាត​អូឌីយ៉ូ PCI និម្មិត​នៅ​ក្នុង​ម៉ាស៊ីន​និម្មិត ​ដែល​ប្រើ​កម្មវិធី​បញ្ជា​ដែល​បានបញ្ជាក់​ទាក់ទង​ទៅ​កាត​អូឌីយ៉ូ​របស់​ម៉ាស៊ីន ។</translation>
     </message>
     <message>
         <source>Enable &Audio</source>
@@ -4357,19 +4355,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Host Audio &Driver:</source>
-        <translation>កម្មវិធី​បញ្ជា​អូឌីយ៉ូ​របស់​ម៉ាស៊ីន ៖</translation>
+        <translation>កម្មវិធី​បញ្ជា​អូឌីយ៉ូ​របស់​ម៉ាស៊ីន ៖</translation>
     </message>
     <message>
         <source>Controls the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation type="obsolete">ត្រួតពិនិត្យ​កម្មវិធី​បញ្ជា​លទ្ធផល​អូឌីយ៉ូ ។ <b>គ្មាន​កម្មវិធី​បញ្ជា​អូឌីយ៉ូ</b> ធ្វើ​ឲ្យ​ម៉ាស៊ីន​ភ្ញៀវ​ឃើញ​កាត​អូឌីយ៉ូ ទោះ​ជា​យ៉ាង​ណា​រាល់​ពេល​ចូលដំណើរការ​វា​នឹង​ត្រូ​វបាន​មិនអើពើ ។</translation>
+        <translation type="obsolete">ត្រួតពិនិត្យ​កម្មវិធី​បញ្ជា​លទ្ធផល​អូឌីយ៉ូ ។ <b>គ្មាន​កម្មវិធី​បញ្ជា​អូឌីយ៉ូ</b> ធ្វើ​ឲ្យ​ម៉ាស៊ីន​ភ្ញៀវ​ឃើញ​កាត​អូឌីយ៉ូ ទោះ​ជា​យ៉ាង​ណា​រាល់​ពេល​ចូលដំណើរការ​វា​នឹង​ត្រូ​វបាន​មិនអើពើ ។</translation>
     </message>
     <message>
         <source>Audio &Controller:</source>
-        <translation>វត្ថុ​បញ្ជា​អូឌីយ៉ូ ៖</translation>
+        <translation>វត្ថុ​បញ្ជា​អូឌីយ៉ូ ៖</translation>
     </message>
     <message>
         <source>Selects the type of the virtual sound card. Depending on this value, VirtualBox will provide different audio hardware to the virtual machine.</source>
-        <translation>ជ្រើស​ប្រភេទ​កាត​សំឡេង​និម្មិត ។ ដោយ​អាស្រ័យ​លើ​តម្លៃនេះ VirtualBox នឹ​ងផ្ដល់​នូវ​ផ្នែក​រឹង​អូឌីយ៉ូ​ផ្សេងៗ​គ្នា​ដល់​ម៉ាស៊ីន​និម្មិត ។</translation>
+        <translation>ជ្រើស​ប្រភេទ​កាត​សំឡេង​និម្មិត ។ ដោយ​អាស្រ័យ​លើ​តម្លៃនេះ VirtualBox នឹ​ងផ្ដល់​នូវ​ផ្នែក​រឹង​អូឌីយ៉ូ​ផ្សេងៗ​គ្នា​ដល់​ម៉ាស៊ីន​និម្មិត ។</translation>
     </message>
     <message>
         <source>Selects the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
@@ -4380,11 +4378,11 @@ p, li { white-space: pre-wrap; }
     <name>UIMachineSettingsDisplay</name>
     <message>
         <source>you have assigned less than <b>%1</b> of video memory which is the minimum amount required to switch the virtual machine to fullscreen or seamless mode.</source>
-        <translation type="obsolete">អ្នកបានផ្ដល់​សតិវីដេអូតិច​ជាង <b>%1</b> ដែល​ជា​ចំនួន​អប្បបរមាដែលបានទាមទារ​ដើម្បី​ប្ដូរ​ម៉ាស៊ីន​និម្មិត​ទៅរបៀប​​ពេញអេក្រង់ ឬ​ពង្រីក ។</translation>
+        <translation type="obsolete">អ្នកបានផ្ដល់​សតិវីដេអូតិច​ជាង <b>%1</b> ដែល​ជា​ចំនួន​អប្បបរមាដែលបានទាមទារ​ដើម្បី​ប្ដូរ​ម៉ាស៊ីន​និម្មិត​ទៅរបៀប​​ពេញអេក្រង់ ឬ​ពង្រីក ។</translation>
     </message>
     <message>
         <source>you have assigned less than <b>%1</b> of video memory which is the minimum amount required for HD Video to be played efficiently.</source>
-        <translation type="obsolete">អ្នក​បានផ្ដល់​សតិ​វីដេអូតិច​ជាង <b>%1</b> ដែលជា​ចំនួន​អប្បបរមា​សម្រាប់​វីដេអូ HD ដើម្បីចាក់​ឲ្យ​មាន​ប្រសិទ្ធភាព ។</translation>
+        <translation type="obsolete">អ្នក​បានផ្ដល់​សតិ​វីដេអូតិច​ជាង <b>%1</b> ដែលជា​ចំនួន​អប្បបរមា​សម្រាប់​វីដេអូ HD ដើម្បីចាក់​ឲ្យ​មាន​ប្រសិទ្ធភាព ។</translation>
     </message>
     <message>
         <source><qt>%1&nbsp;MB</qt></source>
@@ -4396,11 +4394,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Video &Memory:</source>
-        <translation>សតិ​វីដេអូ​ ៖</translation>
+        <translation>សតិ​វីដេអូ​ ៖</translation>
     </message>
     <message>
         <source>Controls the amount of video memory provided to the virtual machine.</source>
-        <translation>ត្រួតពិនិត្យ​ចំនួន​សតិ​វីដេ​អូ​​ដែល​បានផ្ដល់​ឲ្យ​​ម៉ាស៊ីន​និម្មិត ។</translation>
+        <translation>ត្រួតពិនិត្យ​ចំនួន​សតិ​វីដេ​អូ​​ដែល​បានផ្ដល់​ឲ្យ​​ម៉ាស៊ីន​និម្មិត ។</translation>
     </message>
     <message>
         <source>MB</source>
@@ -4408,11 +4406,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Extended Features:</source>
-        <translation>លក្ខណសម្បត្តិ​ដែល​បានពង្រីក ៖</translation>
+        <translation>លក្ខណសម្បត្តិ​ដែល​បានពង្រីក ៖</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will be given access to the 3D graphics capabilities available on the host.</source>
-        <translation>នៅពេល​បាន​គូស​ធីក ម៉ាស៊ីន​និម្មិត​នឹង​ចូលដំណើរការ​សមត្ថភាព​ក្រាហ្វិក​ត្រីមាត្រ​ដែល​​អាច​រក​បាន​​នៅ​លើ​ម៉ាស៊ីន ។</translation>
+        <translation>នៅពេល​បាន​គូស​ធីក ម៉ាស៊ីន​និម្មិត​នឹង​ចូលដំណើរការ​សមត្ថភាព​ក្រាហ្វិក​ត្រីមាត្រ​ដែល​​អាច​រក​បាន​​នៅ​លើ​ម៉ាស៊ីន ។</translation>
     </message>
     <message>
         <source>Enable &3D Acceleration</source>
@@ -4432,7 +4430,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the VM will act as a Remote Desktop Protocol (RDP) server, allowing remote clients to connect and operate the VM (when it is running) using a standard RDP client.</source>
-        <translation>នៅពេល​បាន​គូស​ធីក VM នឹង​ដើរតួ​ជា​ម៉ាស៊ីន​បម្រើ​ពិធីការ​ផ្ទៃតុ​ពី​ចម្ងាយ (RDP) ដោយ​អនុញ្ញាត​ឲ្យ​ម៉ាស៊ីនភ្ញៀវ​ពី​ចម្ងាយ​តភ្ជាប់​ និង​ប្រតិបត្តិ​ VM (នៅ​ពេល​កំពុង​រត់) ដោយ​ប្រើ​ម៉ាស៊ីន​ភ្ញៀវ RDP ស្តង់ដារ ។</translation>
+        <translation>នៅពេល​បាន​គូស​ធីក VM នឹង​ដើរតួ​ជា​ម៉ាស៊ីន​បម្រើ​ពិធីការ​ផ្ទៃតុ​ពី​ចម្ងាយ (RDP) ដោយ​អនុញ្ញាត​ឲ្យ​ម៉ាស៊ីនភ្ញៀវ​ពី​ចម្ងាយ​តភ្ជាប់​ និង​ប្រតិបត្តិ​ VM (នៅ​ពេល​កំពុង​រត់) ដោយ​ប្រើ​ម៉ាស៊ីន​ភ្ញៀវ RDP ស្តង់ដារ ។</translation>
     </message>
     <message>
         <source>&Enable Server</source>
@@ -4440,7 +4438,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Server &Port:</source>
-        <translation>ច្រក​ម៉ាស៊ីនបម្រើ ៖</translation>
+        <translation>ច្រក​ម៉ាស៊ីនបម្រើ ៖</translation>
     </message>
     <message>
         <source>The VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
@@ -4448,19 +4446,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Authentication &Method:</source>
-        <translation>វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ៖</translation>
+        <translation>វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ៖</translation>
     </message>
     <message>
         <source>Defines the VRDP authentication method.</source>
-        <translation type="obsolete">កំណត់​វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​របស់ VRDP ។</translation>
+        <translation type="obsolete">កំណត់​វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​របស់ VRDP ។</translation>
     </message>
     <message>
         <source>Authentication &Timeout:</source>
-        <translation>អស់ពេល​ក្នុងការ​​​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ៖</translation>
+        <translation>អស់ពេល​ក្នុងការ​​​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ៖</translation>
     </message>
     <message>
         <source>Specifies the timeout for guest authentication, in milliseconds.</source>
-        <translation type="obsolete">បញ្ជាក់​ការ​អស់ពេល ​សម្រាប់​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ គិត​​ជា​មិល្លី​វិនាទី ។</translation>
+        <translation type="obsolete">បញ្ជាក់​ការ​អស់ពេល ​សម្រាប់​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ គិត​​ជា​មិល្លី​វិនាទី ។</translation>
     </message>
     <message>
         <source>Mo&nitor Count:</source>
@@ -4566,38 +4564,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">របារ​ឧបករណ៍​តូច​ ៖</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">ប្រ​សិន​បើ​ធីក​ បង្ហាញ​របារ​ឧបករណ៍​តូច​ក្នុងរបៀប​​អេ​​ក្រង់​ពេញ​ និង​​​ព​ង្រីក​ ។</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">​បង្ហាញ​អេ​ក្រង់​ពេញ​​/​ពង្រីក​</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">ប្រ​សិន​បើ​ធីក​ បង្ហាញ​របារឧបករណ៍​តូច​​នៅ​ផ្នែកខាង​លើ​​អេក្រង់​ ជា​ជាង​ក្នុង​ទី​តាំង​លំនាំ​ដើម​នៃ​ប៊ូតុង​របស់​អេក្រង់​ ។</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">បង្ហាញ​កំពូល​​អេក្រង់​</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4614,19 +4580,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, guest screen contents will not be scaled up to compensate for high host screen resolutions.</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use &Unscaled HiDPI Output</source>
+        <source>When checked, guest screen contents will not be scaled up to compensate for high host screen resolutions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Acceleration:</source>
+        <source>Use &Unscaled HiDPI Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
+        <source>Acceleration:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4678,6 +4644,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4686,6 +4660,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4694,47 +4672,47 @@ p, li { white-space: pre-wrap; }
     <name>UIMachineSettingsGeneral</name>
     <message>
         <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of disk space.</source>
-        <translation type="obsolete">បង្ហាញ​ផ្លូវ​ដែល​រូបថត​របស់ម៉ាស៊ីន​និម្មិត​នេះ​នឹង​ត្រូ​វបានផ្ទុក ។ ចំណាំ​ថា រូបថត​អាចចាប់យក​​ទំហំ​ថាស​ជា​ច្រើន​​យ៉ាង​ស្ងៀវស្ងាត់​ ។</translation>
+        <translation type="obsolete">បង្ហាញ​ផ្លូវ​ដែល​រូបថត​របស់ម៉ាស៊ីន​និម្មិត​នេះ​នឹង​ត្រូ​វបានផ្ទុក ។ ចំណាំ​ថា រូបថត​អាចចាប់យក​​ទំហំ​ថាស​ជា​ច្រើន​​យ៉ាង​ស្ងៀវស្ងាត់​ ។</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>មូលដ្ឋាន</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">មូលដ្ឋាន</translation>
     </message>
     <message>
         <source>&Name:</source>
-        <translation type="obsolete">ឈ្មោះ ៖</translation>
+        <translation type="obsolete">ឈ្មោះ ៖</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
-        <translation type="obsolete">បង្ហាញ​ឈ្មោះ​របស់​ម៉ាស៊ីន​និម្មិត ។</translation>
+        <translation type="obsolete">បង្ហាញ​ឈ្មោះ​របស់​ម៉ាស៊ីន​និម្មិត ។</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>កម្រិតខ្ពស់</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">កម្រិតខ្ពស់</translation>
     </message>
     <message>
         <source>&Shared Clipboard:</source>
-        <translation>ក្ដារតម្បៀតខ្ទាស់​ដែល​បាន​ចែករំលែក ៖</translation>
+        <translation>ក្ដារតម្បៀតខ្ទាស់​ដែល​បាន​ចែករំលែក ៖</translation>
     </message>
     <message>
         <source>Selects which clipboard data will be copied between the guest and the host OS. This feature requires Guest Additions to be installed in the guest OS.</source>
-        <translation>កំណត់​របៀប​ចែករំលែក​ក្ដារតម្បៀតខ្ទាស់​រវាង​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ និង​របស់ម៉ាស៊ីន ។ ចំណាំ​ថា លក្ខណៈពិសេស​នេះ​តម្រូវ​ឲ្យ​ដំឡើង​ផ្នែក​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ​ក្នុង​ប្រព័ន្ធប្រតិបត្តិការ​របស់​ម៉ាស៊ីន ។</translation>
+        <translation>កំណត់​របៀប​ចែករំលែក​ក្ដារតម្បៀតខ្ទាស់​រវាង​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ និង​របស់ម៉ាស៊ីន ។ ចំណាំ​ថា លក្ខណៈពិសេស​នេះ​តម្រូវ​ឲ្យ​ដំឡើង​ផ្នែក​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ​ក្នុង​ប្រព័ន្ធប្រតិបត្តិការ​របស់​ម៉ាស៊ីន ។</translation>
     </message>
     <message>
         <source>S&napshot Folder:</source>
-        <translation>ថត​រូបថត ៖</translation>
+        <translation>ថត​រូបថត ៖</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>សេចក្ដី​ពិពណ៌នា</translation>
+        <source>&Description</source>
+        <translation type="obsolete">សេចក្ដី​ពិពណ៌នា</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
-        <translation>បង្ហាញ​សេចក្ដីពិពណ៌នា​របស់ម៉ាស៊ីន​និម្មិត ។ វាល​សេចក្ដី​ពិពន៌នា​មានប្រយោជន៍​សម្រាប់​ផ្ដល់​យោបល់​អំពី​សេចក្ដី​លម្អិត​កំណត់​រចនាសម្ព័ន្ធ​របស់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​ដែល​បាន​ដំឡើង ។</translation>
+        <translation>បង្ហាញ​សេចក្ដីពិពណ៌នា​របស់ម៉ាស៊ីន​និម្មិត ។ វាល​សេចក្ដី​ពិពន៌នា​មានប្រយោជន៍​សម្រាប់​ផ្ដល់​យោបល់​អំពី​សេចក្ដី​លម្អិត​កំណត់​រចនាសម្ព័ន្ធ​របស់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​ដែល​បាន​ដំឡើង ។</translation>
     </message>
     <message>
         <source>If checked, any CD/DVD or floppy disks inserted into or removed from the virtual drives while the machine is running will be remembered.</source>
-        <translation type="obsolete">ប្រសិនបើបាន​គូស​ធីក ការ​ផ្លាស់ប្ដូរ​ទៅ​មេឌៀ​ថាសទន់ ឬ​ស៊ីឌី/ឌីវីឌី​ដែល​បានម៉ោន​ បាន អនុវត្ត​កំឡុង​ពេល​​ប្រតិបត្តិការ​ម៉ាស៊ីន នឹង​ត្រូវ​បាន​រក្សាទុក​ក្នុង​ឯកសារ​កំណត់​ ដើម្បី​បម្រុង​ទុក​នូវ​ការ​កំណត់​រចនាសម្ព័ន្ធ​របស់​មេឌៀ​ដែល​បានម៉ោន​​ចន្លោះ​ពេល​រត់ ។</translation>
+        <translation type="obsolete">ប្រសិនបើបាន​គូស​ធីក ការ​ផ្លាស់ប្ដូរ​ទៅ​មេឌៀ​ថាសទន់ ឬ​ស៊ីឌី/ឌីវីឌី​ដែល​បានម៉ោន​ បាន អនុវត្ត​កំឡុង​ពេល​​ប្រតិបត្តិការ​ម៉ាស៊ីន នឹង​ត្រូវ​បាន​រក្សាទុក​ក្នុង​ឯកសារ​កំណត់​ ដើម្បី​បម្រុង​ទុក​នូវ​ការ​កំណត់​រចនាសម្ព័ន្ធ​របស់​មេឌៀ​ដែល​បានម៉ោន​​ចន្លោះ​ពេល​រត់ ។</translation>
     </message>
     <message>
         <source>Removable Media:</source>
@@ -4746,11 +4724,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Mini ToolBar:</source>
-        <translation type="obsolete">របារ​ឧបករណ៍​តូច​ ៖</translation>
+        <translation type="obsolete">របារ​ឧបករណ៍​តូច​ ៖</translation>
     </message>
     <message>
         <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">ប្រ​សិន​បើ​ធីក​ បង្ហាញ​របារ​ឧបករណ៍​តូច​ក្នុងរបៀប​​អេ​​ក្រង់​ពេញ​ និង​​​ព​ង្រីក​ ។</translation>
+        <translation type="obsolete">ប្រ​សិន​បើ​ធីក​ បង្ហាញ​របារ​ឧបករណ៍​តូច​ក្នុងរបៀប​​អេ​​ក្រង់​ពេញ​ និង​​​ព​ង្រីក​ ។</translation>
     </message>
     <message>
         <source>Show in &Fullscreen/Seamless</source>
@@ -4758,7 +4736,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">ប្រ​សិន​បើ​ធីក​ បង្ហាញ​របារឧបករណ៍​តូច​​នៅ​ផ្នែកខាង​លើ​​អេក្រង់​ ជា​ជាង​ក្នុង​ទី​តាំង​លំនាំ​ដើម​នៃ​ប៊ូតុង​របស់​អេក្រង់​ ។</translation>
+        <translation type="obsolete">ប្រ​សិន​បើ​ធីក​ បង្ហាញ​របារឧបករណ៍​តូច​​នៅ​ផ្នែកខាង​លើ​​អេក្រង់​ ជា​ជាង​ក្នុង​ទី​តាំង​លំនាំ​ដើម​នៃ​ប៊ូតុង​របស់​អេក្រង់​ ។</translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -4769,10 +4747,6 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">អ្នក​បាន​​ជ្រើស​ប្រ​ភេទ​ប្រ​ព័ន្ធ​ប្រ​តិបត្តិ​​ការ​ម៉ាស៊ីន​ភ្ញៀវ​ ៦៤​-​ប៊ីត​ សម្រាប់​​ VM នេះ​ ។ ជាក់​ស្តែង​ ដូច​ម៉ាស៊ីន​ភ្ញៀវ​ទាមទារ​ថាសរឹង​ (VT-x/AMD-V) លក្ខណៈ​ពិសេស​នេះ​នឹង​ត្រូវ​បាន​បើក​ដោយ​ស្វ័យ​ប្រ​វត្តិ​ ។</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4785,6 +4759,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">កម្រិត​ខ្ពស់​</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
+        <translation type="unfinished">សេចក្ដី​ពិពណ៌នា</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4801,6 +4791,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4833,16 +4827,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4854,19 +4844,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Mini ToolBar:</source>
-        <translation type="unfinished">របារ​ឧបករណ៍​តូច​ ៖</translation>
+        <translation type="unfinished">របារ​ឧបករណ៍​តូច​ ៖</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">ប្រ​សិន​បើ​ធីក​ បង្ហាញ​របារ​ឧបករណ៍​តូច​ក្នុងរបៀប​​អេ​​ក្រង់​ពេញ​ និង​​​ព​ង្រីក​ ។</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">​បង្ហាញ​អេ​ក្រង់​ពេញ​​/​ពង្រីក​</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">ប្រ​សិន​បើ​ធីក​ បង្ហាញ​របារឧបករណ៍​តូច​​នៅ​ផ្នែកខាង​លើ​​អេក្រង់​ ជា​ជាង​ក្នុង​ទី​តាំង​លំនាំ​ដើម​នៃ​ប៊ូតុង​របស់​អេក្រង់​ ។</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -4876,24 +4866,12 @@ p, li { white-space: pre-wrap; }
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
     <message>
         <source>When checked, plugs this virtual network adapter into the virtual machine.</source>
-        <translation>នៅពេល​គូស​ធីក ដោត​អាដាប់ទ័រ​បណ្ដាញ​និម្មិត​ទៅ​ក្នុងម៉ាស៊ីន​នកម្មិត ។</translation>
+        <translation>នៅពេល​គូស​ធីក ដោត​អាដាប់ទ័រ​បណ្ដាញ​និម្មិត​ទៅ​ក្នុងម៉ាស៊ីន​នកម្មិត ។</translation>
     </message>
     <message>
         <source>&Enable Network Adapter</source>
@@ -4901,23 +4879,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the type of the virtual network adapter. Depending on this value, VirtualBox will provide different network hardware to the virtual machine.</source>
-        <translation>ជ្រើស​ប្រភេទ​អាដាប់ទ័រ​បណ្ដាញ​និម្មិត ។ អាស្រ័យ​លើ​តម្លៃ​នេះ VirtualBox នឹង​ផ្ដល់​នូវ​ផ្នែករឹង​​បណ្ដាញ​ផ្សេង​ទៅ​ឲ្យ​ម៉ាស៊ីន​និម្មិត ។</translation>
+        <translation>ជ្រើស​ប្រភេទ​អាដាប់ទ័រ​បណ្ដាញ​និម្មិត ។ អាស្រ័យ​លើ​តម្លៃ​នេះ VirtualBox នឹង​ផ្ដល់​នូវ​ផ្នែករឹង​​បណ្ដាញ​ផ្សេង​ទៅ​ឲ្យ​ម៉ាស៊ីន​និម្មិត ។</translation>
     </message>
     <message>
         <source>&Attached to:</source>
-        <translation>បាន​ភ្ជាប់​ទៅ ៖</translation>
+        <translation>បាន​ភ្ជាប់​ទៅ ៖</translation>
     </message>
     <message>
         <source>Holds the MAC address of this adapter. It contains exactly 12 characters chosen from {0-9,A-F}. Note that the second character must be an even digit.</source>
-        <translation>បង្ហាញ​អាសយដ្ឋាន MAC របស់​អាដាប់ទ័រ​នេះ ។ វា​មាន​តួអក្សរ​យ៉ាង​ជាក់លាក់​ចំនួន​ ១២ ដែល​បាន​ជ្រើស​ពី {0-9,A-F} ។ ចំណាំ​ថា​តួអក្សរ​ទីពីរ​ត្រូវ​តែ​ជា​​តួលេខ​គូ ។</translation>
+        <translation>បង្ហាញ​អាសយដ្ឋាន MAC របស់​អាដាប់ទ័រ​នេះ ។ វា​មាន​តួអក្សរ​យ៉ាង​ជាក់លាក់​ចំនួន​ ១២ ដែល​បាន​ជ្រើស​ពី {0-9,A-F} ។ ចំណាំ​ថា​តួអក្សរ​ទីពីរ​ត្រូវ​តែ​ជា​​តួលេខ​គូ ។</translation>
     </message>
     <message>
         <source>Generates a new random MAC address.</source>
-        <translation>បង្កើត​អាសយដ្ឋាន MAC ចៃដន្យ​ថ្មី ។</translation>
+        <translation>បង្កើត​អាសយដ្ឋាន MAC ចៃដន្យ​ថ្មី ។</translation>
     </message>
     <message>
         <source>Indicates whether the virtual network cable is plugged in on machine startup or not.</source>
-        <translation type="obsolete">បង្ហាញ​ថាតើ​ខ្សែ​បណ្ដាញ​និម្មិត​ត្រូ​វបានដោត​​នៅពេល​ម៉ាស៊ីន​ចាប់ផ្ដើម​ ឬ​ក៏អត់ ។</translation>
+        <translation type="obsolete">បង្ហាញ​ថាតើ​ខ្សែ​បណ្ដាញ​និម្មិត​ត្រូ​វបានដោត​​នៅពេល​ម៉ាស៊ីន​ចាប់ផ្ដើម​ ឬ​ក៏អត់ ។</translation>
     </message>
     <message>
         <source>no bridged network adapter is selected</source>
@@ -4940,15 +4918,15 @@ network adapter name</comment>
     </message>
     <message>
         <source>Controls how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="obsolete">ត្រួតពិនិត្យ​វិធី​ដែល​អាដាប់ទ័រ​និម្មិត​នេះ​ត្រូវ​បាន​ភ្ជាប់​ទៅ​បណ្ដាញ​ពិតប្រាកដ​​របស់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន ។</translation>
+        <translation type="obsolete">ត្រួតពិនិត្យ​វិធី​ដែល​អាដាប់ទ័រ​និម្មិត​នេះ​ត្រូវ​បាន​ភ្ជាប់​ទៅ​បណ្ដាញ​ពិតប្រាកដ​​របស់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន ។</translation>
     </message>
     <message>
         <source>&Name:</source>
-        <translation>ឈ្មោះ ៖</translation>
+        <translation>ឈ្មោះ ៖</translation>
     </message>
     <message>
         <source>Selects the name of the network adapter for <b>Bridged Adapter</b> or <b>Host-only Adapter</b> attachments and the name of the network <b>Internal Network</b> attachments.</source>
-        <translation type="obsolete">ជ្រើស​ឈ្មោះ​អាដាប់ទ័រ​បណ្ដាញ​សម្រាប់ <b>អាដាប់ទ័រ​ប្រ៊ីដ្យ</b> ឬ <b>អាដាប់ទ័រម៉ាស៊ីន</b> ការ​ភ្ជាប់ និង​ឈ្មោះ​​របស់​បណ្ដាញ ការ​ភ្ជាប់<b>បណ្ដាញ​ខាង​ក្នុង</b> ។</translation>
+        <translation type="obsolete">ជ្រើស​ឈ្មោះ​អាដាប់ទ័រ​បណ្ដាញ​សម្រាប់ <b>អាដាប់ទ័រ​ប្រ៊ីដ្យ</b> ឬ <b>អាដាប់ទ័រម៉ាស៊ីន</b> ការ​ភ្ជាប់ និង​ឈ្មោះ​​របស់​បណ្ដាញ ការ​ភ្ជាប់<b>បណ្ដាញ​ខាង​ក្នុង</b> ។</translation>
     </message>
     <message>
         <source>A&dvanced</source>
@@ -4956,15 +4934,15 @@ network adapter name</comment>
     </message>
     <message>
         <source>Shows or hides additional network adapter options.</source>
-        <translation type="obsolete">បង្ហាញ​ ឬ​លាក់​ជម្រើស​អាដាប់ទ័រ​បណ្ដាញ​បន្ថែម ។</translation>
+        <translation type="obsolete">បង្ហាញ​ ឬ​លាក់​ជម្រើស​អាដាប់ទ័រ​បណ្ដាញ​បន្ថែម ។</translation>
     </message>
     <message>
         <source>Adapter &Type:</source>
-        <translation>ប្រភេទ​អាដាប់​ទ័រ​ ៖</translation>
+        <translation>ប្រភេទ​អាដាប់​ទ័រ​ ៖</translation>
     </message>
     <message>
         <source>&Mac Address:</source>
-        <translation type="obsolete">អាសយដ្ឋាន Mac ៖</translation>
+        <translation type="obsolete">អាសយដ្ឋាន Mac ៖</translation>
     </message>
     <message>
         <source>&Cable Connected</source>
@@ -5073,7 +5051,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>When checked, enables the given parallel port of the virtual machine.</source>
-        <translation>នៅពេល​បាន​គូស​ធីក បើក​ច្រក​ប៉ារ៉ាឡែល​របស់​ម៉ាស៊ីន​និម្មិត ។</translation>
+        <translation>នៅពេល​បាន​គូស​ធីក បើក​ច្រក​ប៉ារ៉ាឡែល​របស់​ម៉ាស៊ីន​និម្មិត ។</translation>
     </message>
     <message>
         <source>&Enable Parallel Port</source>
@@ -5081,35 +5059,35 @@ network adapter name</comment>
     </message>
     <message>
         <source>Port &Number:</source>
-        <translation>លេខ​ច្រក ៖</translation>
+        <translation>លេខ​ច្រក ៖</translation>
     </message>
     <message>
         <source>Holds the parallel port number. You can choose one of the standard parallel ports or select <b>User-defined</b> and specify port parameters manually.</source>
-        <translation>បង្ហាញលេចច្រក​ប៉ារ៉ាឡែល ។ អ្នកអាចជ្រើស​ច្រក​មួយ​ក្នុងចំណោម​ច្រក​ប៉ារ៉ាឡែល​ជា​ច្រើន ឬ​ជ្រើស <b>កំណត់​ដោយ​អ្នក​ប្រើ</b> ហើយ​បញ្ញាក់​ប៉ារ៉ាម៉ែត្រ​ច្រក​ដោយ​ដៃ ។</translation>
+        <translation>បង្ហាញលេចច្រក​ប៉ារ៉ាឡែល ។ អ្នកអាចជ្រើស​ច្រក​មួយ​ក្នុងចំណោម​ច្រក​ប៉ារ៉ាឡែល​ជា​ច្រើន ឬ​ជ្រើស <b>កំណត់​ដោយ​អ្នក​ប្រើ</b> ហើយ​បញ្ញាក់​ប៉ារ៉ាម៉ែត្រ​ច្រក​ដោយ​ដៃ ។</translation>
     </message>
     <message>
         <source>&IRQ:</source>
-        <translation>IRQ ៖</translation>
+        <translation>IRQ ៖</translation>
     </message>
     <message>
         <source>Holds the IRQ number of this parallel port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> setting is enabled for this virtual machine.</source>
-        <translation>បង្ហាញលេខ IRQ របស​ច្រក​ប៉ារ៉ាឡែល​នេះ ។ តម្លៃ​ត្រឹមត្រូវ​ជា​ចំនួន​គត់​ដែល​ស្ថិត​ក្នុងជួរពី <tt>0</tt> ដល់ <tt>២៥៥</tt> ។ តម្លៃ​ធំជាង <tt>១៥</tt> អាច​ត្រូវ​បានប្រើ​តែ​ក្នុងករណី​ដែល <b>I/O APIC</b> ត្រូ​វបានបើក​សម្រាប់​ម៉ាស៊ីន​និម្មិត​នេះ​ប៉ុណ្ណោះ ។</translation>
+        <translation>បង្ហាញលេខ IRQ របស​ច្រក​ប៉ារ៉ាឡែល​នេះ ។ តម្លៃ​ត្រឹមត្រូវ​ជា​ចំនួន​គត់​ដែល​ស្ថិត​ក្នុងជួរពី <tt>0</tt> ដល់ <tt>២៥៥</tt> ។ តម្លៃ​ធំជាង <tt>១៥</tt> អាច​ត្រូវ​បានប្រើ​តែ​ក្នុងករណី​ដែល <b>I/O APIC</b> ត្រូ​វបានបើក​សម្រាប់​ម៉ាស៊ីន​និម្មិត​នេះ​ប៉ុណ្ណោះ ។</translation>
     </message>
     <message>
         <source>I/O Po&rt:</source>
-        <translation>ច្រក I/O ៖</translation>
+        <translation>ច្រក I/O ៖</translation>
     </message>
     <message>
         <source>Holds the base I/O port address of this parallel port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source>
-        <translation>បង្ហាញអាសយដ្ឋាន​ច្រក​ I/O មូលដ្ឋាន ។ តម្លៃដែល​ត្រឹមត្រូវ​គឺ​ធំជាង​ចំនួន​ដែល​ស្ថិត​ក្នុងជួរ​ពី <tt>0</tt>ដល់<tt>0xFFFF</tt> ។</translation>
+        <translation>បង្ហាញអាសយដ្ឋាន​ច្រក​ I/O មូលដ្ឋាន ។ តម្លៃដែល​ត្រឹមត្រូវ​គឺ​ធំជាង​ចំនួន​ដែល​ស្ថិត​ក្នុងជួរ​ពី <tt>0</tt>ដល់<tt>0xFFFF</tt> ។</translation>
     </message>
     <message>
         <source>Port &Path:</source>
-        <translation>ផ្លូវ​ច្រក ៖</translation>
+        <translation>ផ្លូវ​ច្រក ៖</translation>
     </message>
     <message>
         <source>Holds the host parallel device name.</source>
-        <translation>បង្ហាញ​ឈ្មោះ​ឧបករណ៍​ស្រប​គ្នា​​របស់​ម៉ាស៊ីន ។</translation>
+        <translation>បង្ហាញ​ឈ្មោះ​ឧបករណ៍​ស្រប​គ្នា​​របស់​ម៉ាស៊ីន ។</translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
@@ -5158,11 +5136,11 @@ network adapter name</comment>
     <name>UIMachineSettingsSF</name>
     <message>
         <source>Adds a new shared folder definition.</source>
-        <translation type="obsolete">បន្ថែម​កា​រកំណត់​ថត​ដែលបានចែករំលែកថ្មី ។</translation>
+        <translation type="obsolete">បន្ថែម​កា​រកំណត់​ថត​ដែលបានចែករំលែកថ្មី ។</translation>
     </message>
     <message>
         <source>Edits the selected shared folder definition.</source>
-        <translation type="obsolete">កែសម្រួល​កា​រកំណត់​ថត​ដែល​បានចែករំលែក​ដែល​បានជ្រើស ។</translation>
+        <translation type="obsolete">កែសម្រួល​កា​រកំណត់​ថត​ដែល​បានចែករំលែក​ដែល​បានជ្រើស ។</translation>
     </message>
     <message>
         <source>Removes the selected shared folder definition.</source>
@@ -5186,7 +5164,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>Lists all shared folders accessible to this machine. Use 'net use x: \\vboxsvr\share' to access a shared folder named <i>share</i> from a DOS-like OS, or 'mount -t vboxsf share mount_point' to access it from a Linux OS. This feature requires Guest Additions.</source>
-        <translation>រាយ​ថត​ដែល​បានចែករំលែក​ទាំង​អស់​ដែល​អាច​ចូលដំណើរការ​បានទៅ​ម៉ាស៊ីន​នេះ ។ ប្រើ​ 'net ប្រើ x: \\vboxsvr\share' ដើម្បី​ចូលដំណើរការ​ថត​ដែល​បានចែករំលែក​ដែលមាន​ឈ្មោះ <i>ចែករំលែក</i> ពីប្រព័ន្ធ​ប្រតិបត្តិការ​ដូចនឹង DOS ដែរ ឬ​ 'mount -t vboxsf share mount_point' ដើម្បីចូលដំណើរការ​វា​ពី​ប្រព័ន្ធ​ប្រតិបត្តិការ​លីនុច ។ លក្ខណៈពិសេស​នេះ​ត្រូវការ​ផ្នែក​បន្ថែម​របស់ម៉ាស៊ីន​ភ្ញៀវ ។</translation>
+        <translation>រាយ​ថត​ដែល​បានចែករំលែក​ទាំង​អស់​ដែល​អាច​ចូលដំណើរការ​បានទៅ​ម៉ាស៊ីន​នេះ ។ ប្រើ​ 'net ប្រើ x: \\vboxsvr\share' ដើម្បី​ចូលដំណើរការ​ថត​ដែល​បានចែករំលែក​ដែលមាន​ឈ្មោះ <i>ចែករំលែក</i> ពីប្រព័ន្ធ​ប្រតិបត្តិការ​ដូចនឹង DOS ដែរ ឬ​ 'mount -t vboxsf share mount_point' ដើម្បីចូលដំណើរការ​វា​ពី​ប្រព័ន្ធ​ប្រតិបត្តិការ​លីនុច ។ លក្ខណៈពិសេស​នេះ​ត្រូវការ​ផ្នែក​បន្ថែម​របស់ម៉ាស៊ីន​ភ្ញៀវ ។</translation>
     </message>
     <message>
         <source>Name</source>
@@ -5269,19 +5247,19 @@ network adapter name</comment>
     </message>
     <message>
         <source>Folder Path:</source>
-        <translation>ផ្លូវ​ថត ៖</translation>
+        <translation>ផ្លូវ​ថត ៖</translation>
     </message>
     <message>
         <source>Folder Name:</source>
-        <translation>ឈ្មោះ​ថត ៖</translation>
+        <translation>ឈ្មោះ​ថត ៖</translation>
     </message>
     <message>
         <source>Holds the name of the shared folder (as it will be seen by the guest OS).</source>
-        <translation>បង្ហាញ​ឈ្មោះ​របស់​ថត​ដែលបានចែករំលែក (ព្រោះថា​វា​នឹង​ត្រូវ​បានឃើញ​ដោយ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) ។</translation>
+        <translation>បង្ហាញ​ឈ្មោះ​របស់​ថត​ដែលបានចែករំលែក (ព្រោះថា​វា​នឹង​ត្រូវ​បានឃើញ​ដោយ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) ។</translation>
     </message>
     <message>
         <source>When checked, the guest OS will not be able to write to the specified shared folder.</source>
-        <translation>នៅពេល​បានគូសធីក ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​មិនអាច​សរសេរ​ទៅកាន​ថត​ដែល​បានចែករំលែក​​ដែល​បាន​បញ្ជាក់​ទេ ។</translation>
+        <translation>នៅពេល​បានគូសធីក ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​មិនអាច​សរសេរ​ទៅកាន​ថត​ដែល​បានចែករំលែក​​ដែល​បាន​បញ្ជាក់​ទេ ។</translation>
     </message>
     <message>
         <source>&Read-only</source>
@@ -5313,7 +5291,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>When checked, enables the given serial port of the virtual machine.</source>
-        <translation>នៅពេល​គូសធីក បើក​ច្រក​ស៊េរី​ដែល​បានផ្ដល់​របស់ម៉ាស៊ីននិម្មិត ។</translation>
+        <translation>នៅពេល​គូសធីក បើក​ច្រក​ស៊េរី​ដែល​បានផ្ដល់​របស់ម៉ាស៊ីននិម្មិត ។</translation>
     </message>
     <message>
         <source>&Enable Serial Port</source>
@@ -5321,39 +5299,39 @@ network adapter name</comment>
     </message>
     <message>
         <source>Port &Number:</source>
-        <translation>លេខ​ច្រក ៖</translation>
+        <translation>លេខ​ច្រក ៖</translation>
     </message>
     <message>
         <source>Selects the serial port number. You can choose one of the standard serial ports or select <b>User-defined</b> and specify port parameters manually.</source>
-        <translation>បង្ហាញលេខ​ច្រក​ស៊េរៀល ។ អ្នកអាច​ជ្រើ​ស​ច្រក​ស៊េរៀល​ស្តង់ដារ​មួយ​ក្នុងចំណោម​ច្រកជា​ច្រើន ឬ​ជ្រើស <b>កំណត់​ដោយ​អ្នក​ប្រើ</b> ហើយ​បញ្ជាក់​ប៉ារ៉ាម៉ែត្រ​ច្រក​ដោយដៃ ។</translation>
+        <translation>បង្ហាញលេខ​ច្រក​ស៊េរៀល ។ អ្នកអាច​ជ្រើ​ស​ច្រក​ស៊េរៀល​ស្តង់ដារ​មួយ​ក្នុងចំណោម​ច្រកជា​ច្រើន ឬ​ជ្រើស <b>កំណត់​ដោយ​អ្នក​ប្រើ</b> ហើយ​បញ្ជាក់​ប៉ារ៉ាម៉ែត្រ​ច្រក​ដោយដៃ ។</translation>
     </message>
     <message>
         <source>&IRQ:</source>
-        <translation>IRQ ៖</translation>
+        <translation>IRQ ៖</translation>
     </message>
     <message>
         <source>Holds the IRQ number of this serial port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> setting is enabled for this virtual machine.</source>
-        <translation>បង្ហាញ​លេខ IRQ របស់​ច្រក​ស៊េរៀល​នេះ ។ តម្លៃ​ដែល​ត្រឹមត្រូវ​គឺ​ជា​ចំនួន​គត់​ដែល​ស្ថិត​នៅ​ក្នុង​ចន្លោះ​ពី <tt>0</tt> ដល់ <tt>២៥៥</tt> ។ តម្លៃ​ធំជាង​ <tt>១៥</tt> អាច​ត្រូ​វបានប្រើ​តែ​ក្នុងករណី​ដែល <b>I/O APIC</b> ត្រូវ​បានបើក​សម្រាប់​ម៉ាស៊ីន​និម្មិត ។</translation>
+        <translation>បង្ហាញ​លេខ IRQ របស់​ច្រក​ស៊េរៀល​នេះ ។ តម្លៃ​ដែល​ត្រឹមត្រូវ​គឺ​ជា​ចំនួន​គត់​ដែល​ស្ថិត​នៅ​ក្នុង​ចន្លោះ​ពី <tt>0</tt> ដល់ <tt>២៥៥</tt> ។ តម្លៃ​ធំជាង​ <tt>១៥</tt> អាច​ត្រូ​វបានប្រើ​តែ​ក្នុងករណី​ដែល <b>I/O APIC</b> ត្រូវ​បានបើក​សម្រាប់​ម៉ាស៊ីន​និម្មិត ។</translation>
     </message>
     <message>
         <source>I/O Po&rt:</source>
-        <translation>ច្រក​ I/O ៖</translation>
+        <translation>ច្រក​ I/O ៖</translation>
     </message>
     <message>
         <source>Holds the base I/O port address of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source>
-        <translation>បង្ហាញ​អាសយដ្ឋាន​ច្រក I/O មូលដ្ឋាន​របស់​ច្រក​ស៊េរៀលនេះ ។ តម្លៃ​ដែល​ត្រឹមត្រូវ​គឺ​ជា​ចំនួន​ដែល​ស្ថិត​ក្នុង​ចន្លោះពី <tt>0</tt> ដល់<tt>0xFFFF</tt> ។</translation>
+        <translation>បង្ហាញ​អាសយដ្ឋាន​ច្រក I/O មូលដ្ឋាន​របស់​ច្រក​ស៊េរៀលនេះ ។ តម្លៃ​ដែល​ត្រឹមត្រូវ​គឺ​ជា​ចំនួន​ដែល​ស្ថិត​ក្នុង​ចន្លោះពី <tt>0</tt> ដល់<tt>0xFFFF</tt> ។</translation>
     </message>
     <message>
         <source>Port &Mode:</source>
-        <translation>របៀប​ច្រក ៖</translation>
+        <translation>របៀប​ច្រក ៖</translation>
     </message>
     <message>
         <source>Controls the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="obsolete">ពិនិត្យ​មើល​របៀប​ដំណើរការ​របស់​ច្រក​ស៊េរៀល ។ ប្រសិនបើ​អ្នក​ជ្រើស​ <b>បានផ្ដាច់</b> ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​រកឃើញ​ច្រក​ស៊េរៀល​ ប៉ុន្តែ​នឹង​មិន​អាច​ប្រតិបត្តិ​វា​បានទេ ។</translation>
+        <translation type="obsolete">ពិនិត្យ​មើល​របៀប​ដំណើរការ​របស់​ច្រក​ស៊េរៀល ។ ប្រសិនបើ​អ្នក​ជ្រើស​ <b>បានផ្ដាច់</b> ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​រកឃើញ​ច្រក​ស៊េរៀល​ ប៉ុន្តែ​នឹង​មិន​អាច​ប្រតិបត្តិ​វា​បានទេ ។</translation>
     </message>
     <message>
         <source>If checked, the pipe specified in the <b>Port Path</b> field will be created by the virtual machine when it starts. Otherwise, the virtual machine will assume that the pipe exists and try to use it.</source>
-        <translation type="obsolete">ប្រសិន​បើ​បានគូស​ធីក បំពង់​បាន​បញ្ជាក់​នៅ​ក្នុងវាល <b>ផ្លូវ​ច្រក</b> នឹង​ត្រូវ​បាន​បង្កើត​ដោយ​​ម៉ាស៊ីន​និម្មិត នៅពេល​វា​ចាប់ផ្ដើម ។ បើ​មិន​ដូច្នេះ​ទេ ម៉ាស៊ីន​និម្មិត​នឹង​ព្យាយាម​ប្រើ​បំពង់​ដែល​បានស្រាប់ ។</translation>
+        <translation type="obsolete">ប្រសិន​បើ​បានគូស​ធីក បំពង់​បាន​បញ្ជាក់​នៅ​ក្នុងវាល <b>ផ្លូវ​ច្រក</b> នឹង​ត្រូវ​បាន​បង្កើត​ដោយ​​ម៉ាស៊ីន​និម្មិត នៅពេល​វា​ចាប់ផ្ដើម ។ បើ​មិន​ដូច្នេះ​ទេ ម៉ាស៊ីន​និម្មិត​នឹង​ព្យាយាម​ប្រើ​បំពង់​ដែល​បានស្រាប់ ។</translation>
     </message>
     <message>
         <source>&Create Pipe</source>
@@ -5361,30 +5339,30 @@ network adapter name</comment>
     </message>
     <message>
         <source>Holds the path to the serial port's pipe on the host when the port is working in <b>Host Pipe</b> mode, or the host serial device name when the port is working in <b>Host Device</b> mode.</source>
-        <translation type="obsolete">បង្ហាញ​ផ្លូវ​ទៅកាន់​ច្រក​ស៊េរៀល​នៅ​លើ​ម៉ាស៊ីន នៅពេល​ច្រក​ដំណើការ​ក្នុង​របៀប <b>បំពង់​ម៉ាស៊ីន</b> ឬ​ឈ្មោះ​ឧបករណ៍​ស៊េរៀល​នៅពេល​ច្រក​ដំណើរការ​ក្នុង​របៀប <b>ឧបករណ៍​ម៉ាស៊ីន</b> ។</translation>
+        <translation type="obsolete">បង្ហាញ​ផ្លូវ​ទៅកាន់​ច្រក​ស៊េរៀល​នៅ​លើ​ម៉ាស៊ីន នៅពេល​ច្រក​ដំណើការ​ក្នុង​របៀប <b>បំពង់​ម៉ាស៊ីន</b> ឬ​ឈ្មោះ​ឧបករណ៍​ស៊េរៀល​នៅពេល​ច្រក​ដំណើរការ​ក្នុង​របៀប <b>ឧបករណ៍​ម៉ាស៊ីន</b> ។</translation>
     </message>
     <message>
         <source>Port/File &Path:</source>
-        <translation type="obsolete">ផ្លូវ​ ច្រក​​/ឯកសារ​ ៖</translation>
+        <translation type="obsolete">ផ្លូវ​ ច្រក​​/ឯកសារ​ ៖</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5427,7 +5405,7 @@ network adapter name</comment>
     <name>UIMachineSettingsStorage</name>
     <message>
         <source>If checked, shows the differencing hard disks that are attached to slots rather than their base hard disks (shown for indirect attachments) and allows explicit attaching of differencing hard disks. Check this only if you need a complex hard disk setup.</source>
-        <translation type="obsolete">ប្រសិនបើ​បានគូសធីគ វា​នឹង​បង្ហាញ​ថាសរឹង​ផ្សេងៗ​ដែល​បានភ្ជាប់​ទៅ​រន្ធ​ជំនួស​ឲ្យ​ថាសរឹង​មូលដ្ឋាន​​របស់​ពួកវា (បង្ហាញតែ​ក្នុងករណី​ដែល​មានការ​ភ្ជាប់​ដោយ​ប្រយោល​ប៉ុណ្ណោះ) ហើយ​នឹង​អនុញ្ញាត​ឲ្យ​ភ្ជាប់​ថាសរឹង​ផ្សេងៗ​ផងដែរ ។ គូស​ធីក​តែ​ក្នុងករណី​ដែល​អ្នក​ត្រូវការ​ការ​រៀបចំ​ថាសរឹង​ស្មុគស្មាញ​ប៉ុណ្ណោះ ។</translation>
+        <translation type="obsolete">ប្រសិនបើ​បានគូសធីគ វា​នឹង​បង្ហាញ​ថាសរឹង​ផ្សេងៗ​ដែល​បានភ្ជាប់​ទៅ​រន្ធ​ជំនួស​ឲ្យ​ថាសរឹង​មូលដ្ឋាន​​របស់​ពួកវា (បង្ហាញតែ​ក្នុងករណី​ដែល​មានការ​ភ្ជាប់​ដោយ​ប្រយោល​ប៉ុណ្ណោះ) ហើយ​នឹង​អនុញ្ញាត​ឲ្យ​ភ្ជាប់​ថាសរឹង​ផ្សេងៗ​ផងដែរ ។ គូស​ធីក​តែ​ក្នុងករណី​ដែល​អ្នក​ត្រូវការ​ការ​រៀបចំ​ថាសរឹង​ស្មុគស្មាញ​ប៉ុណ្ណោះ ។</translation>
     </message>
     <message>
         <source><nobr><b>%1</b></nobr><br><nobr>Bus:&nbsp;&nbsp;%2</nobr><br><nobr>Type:&nbsp;&nbsp;%3</nobr></source>
@@ -5451,11 +5429,11 @@ network adapter name</comment>
     </message>
     <message>
         <source>No hard disk is selected for <i>%1</i>.</source>
-        <translation type="unfinished">មិន​មាន​ថាស​រឹង​​ត្រូវ​បាន​ជ្រើស​​សម្រាប់<i>%1</i> នោះ​ទេ ។</translation>
+        <translation type="unfinished">មិន​មាន​ថាស​រឹង​​ត្រូវ​បាន​ជ្រើស​​សម្រាប់<i>%1</i> នោះ​ទេ ។</translation>
     </message>
     <message>
         <source><i>%1</i> uses a medium that is already attached to <i>%2</i>.</source>
-        <translation type="obsolete"><i>%1</i>ប្រើខ្នាត​​មធ្យម​ដែល​ភ្ជាប់​ទៅ​កាន់<i>%2</i>រួច​ហើយ​​​ ។</translation>
+        <translation type="obsolete"><i>%1</i>ប្រើខ្នាត​​មធ្យម​ដែល​ភ្ជាប់​ទៅ​កាន់<i>%2</i>រួច​ហើយ​​​ ។</translation>
     </message>
     <message>
         <source>Add Controller</source>
@@ -5503,19 +5481,19 @@ network adapter name</comment>
     </message>
     <message>
         <source>Adds a new controller to the end of the Storage Tree.</source>
-        <translation type="obsolete">បន្ថែម​វត្ថុ​បញ្ជា​ថ្មី​ទៅ​ចុង​មែកធាង​ផ្ទុក ។</translation>
+        <translation type="obsolete">បន្ថែម​វត្ថុ​បញ្ជា​ថ្មី​ទៅ​ចុង​មែកធាង​ផ្ទុក ។</translation>
     </message>
     <message>
         <source>Removes the controller highlighted in the Storage Tree.</source>
-        <translation type="obsolete">យក​ឧបករណ៍​បញ្ជា​ដែលបានបន្លិច​ចេញ​នៅ​ក្នុង​មែកធាង​ផ្ទុក ។</translation>
+        <translation type="obsolete">យក​ឧបករណ៍​បញ្ជា​ដែលបានបន្លិច​ចេញ​នៅ​ក្នុង​មែកធាង​ផ្ទុក ។</translation>
     </message>
     <message>
         <source>Adds a new attachment to the Storage Tree using currently selected controller as parent.</source>
-        <translation type="obsolete">បន្ថែម​ឯកសារ​ភ្ជាប់ថ្មី​ទៅ​​មែក​ធាង​ផ្ទុក ដោយ​ប្រើ​​កម្មវិធីបញ្ជាដែលបានជ្រើស​ជា​មេ​ ។</translation>
+        <translation type="obsolete">បន្ថែម​ឯកសារ​ភ្ជាប់ថ្មី​ទៅ​​មែក​ធាង​ផ្ទុក ដោយ​ប្រើ​​កម្មវិធីបញ្ជាដែលបានជ្រើស​ជា​មេ​ ។</translation>
     </message>
     <message>
         <source>Removes the attachment highlighted in the Storage Tree.</source>
-        <translation type="obsolete">យក​ឯកសារ​ភ្ជាប់​ដែល​បាន​បន្លិច​ចេញ​នៅ​ក្នុង​មែកធាង​ផ្ទុក ។</translation>
+        <translation type="obsolete">យក​ឯកសារ​ភ្ជាប់​ដែល​បាន​បន្លិច​ចេញ​នៅ​ក្នុង​មែកធាង​ផ្ទុក ។</translation>
     </message>
     <message>
         <source>IDE Controller</source>
@@ -5535,15 +5513,15 @@ network adapter name</comment>
     </message>
     <message>
         <source>Hard &Disk:</source>
-        <translation>ថាស​រឹង​ ៖</translation>
+        <translation>ថាស​រឹង​ ៖</translation>
     </message>
     <message>
         <source>&CD/DVD Device:</source>
-        <translation type="obsolete">ឧបករណ៍​​ស៊ី​ឌី​​/ឌីវីឌី ៖</translation>
+        <translation type="obsolete">ឧបករណ៍​​ស៊ី​ឌី​​/ឌីវីឌី ៖</translation>
     </message>
     <message>
         <source>&Floppy Device:</source>
-        <translation type="obsolete">ឧបករណ៍ថាសទន់ ៖</translation>
+        <translation type="obsolete">ឧបករណ៍ថាសទន់ ៖</translation>
     </message>
     <message>
         <source>&Storage Tree</source>
@@ -5551,7 +5529,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>Contains all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="obsolete">មាន​ឧបករណ៍​បញ្ជា​ផ្ទុក​ទាំង​អស់​សម្រាប់​ម៉ាស៊ី​ននេះ​ និង​រូប​ភាព​និម្មិត​ និងដ្រាយ​​ម៉ាស៊ីន​ដែល​បាន​​ភ្ជាប់​​ទៅកាន់​ពួកវា ។</translation>
+        <translation type="obsolete">មាន​ឧបករណ៍​បញ្ជា​ផ្ទុក​ទាំង​អស់​សម្រាប់​ម៉ាស៊ី​ននេះ​ និង​រូប​ភាព​និម្មិត​ និងដ្រាយ​​ម៉ាស៊ីន​ដែល​បាន​​ភ្ជាប់​​ទៅកាន់​ពួកវា ។</translation>
     </message>
     <message>
         <source>Information</source>
@@ -5559,7 +5537,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>The Storage Tree can contain several controllers of different types. This machine currently has no controllers.</source>
-        <translation>មែក​ធាង​ផ្ទុក​អាច​មាន​ឧបករណ៍​បញ្ជា​​​បី​ បួន​​​​ប្រ​ភេទ​ខុសៗ​គ្នា​ ។ ម៉ាស៊ីន​បច្ចុប្បន្ន​នេះ មិន​មាន​ឧបករណ៍​បញ្ជា​ឡើយ​ ។</translation>
+        <translation>មែក​ធាង​ផ្ទុក​អាច​មាន​ឧបករណ៍​បញ្ជា​​​បី​ បួន​​​​ប្រ​ភេទ​ខុសៗ​គ្នា​ ។ ម៉ាស៊ីន​បច្ចុប្បន្ន​នេះ មិន​មាន​ឧបករណ៍​បញ្ជា​ឡើយ​ ។</translation>
     </message>
     <message>
         <source>Attributes</source>
@@ -5567,27 +5545,27 @@ network adapter name</comment>
     </message>
     <message>
         <source>&Name:</source>
-        <translation>ឈ្មោះ ៖</translation>
+        <translation>ឈ្មោះ ៖</translation>
     </message>
     <message>
         <source>Changes the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="obsolete">ប្តូរ​ឈ្មោះ​របស់​ឧបករណ៍​បញ្ជា​ផ្ទុក ​បច្ចុប្បន្ន​ដែល​បានជ្រើស​ក្នុ​ងមែក​ធាង​ផ្ទុក ។</translation>
+        <translation type="obsolete">ប្តូរ​ឈ្មោះ​របស់​ឧបករណ៍​បញ្ជា​ផ្ទុក ​បច្ចុប្បន្ន​ដែល​បានជ្រើស​ក្នុ​ងមែក​ធាង​ផ្ទុក ។</translation>
     </message>
     <message>
         <source>&Type:</source>
-        <translation>ប្រភេទ ៖</translation>
+        <translation>ប្រភេទ ៖</translation>
     </message>
     <message>
         <source>Selects the sub-type of the storage controller currently selected in the Storage Tree.</source>
-        <translation>​ជ្រើស​ប្រ​ភេទ​រង​​របស់​ឧបករណ៍​បញ្ជា​ផ្ទុក​បច្ចុប្បន្ន​ដែល​បាន​ជ្រើស​ក្នុ​ង​មែក​ធាង​ផ្ទុក ។</translation>
+        <translation>​ជ្រើស​ប្រ​ភេទ​រង​​របស់​ឧបករណ៍​បញ្ជា​ផ្ទុក​បច្ចុប្បន្ន​ដែល​បាន​ជ្រើស​ក្នុ​ង​មែក​ធាង​ផ្ទុក ។</translation>
     </message>
     <message>
         <source>S&lot:</source>
-        <translation type="obsolete">រន្ធ ៖</translation>
+        <translation type="obsolete">រន្ធ ៖</translation>
     </message>
     <message>
         <source>Selects the slot on the storage controller used by this attachment. The available slots depend on the type of the controller and other attachments on it.</source>
-        <translation>ជ្រើស​រន្ធ​លើ​ឧបករណ៍​បញ្ជា​ផ្ទុក ​ដែល​បាន​ប្រើ​ដោយ​ឯកសារ​ភ្ជាប់​នេះ​ ។​ ​រន្ធ​ដែលអាចរកបានអាស្រ័យ​​លើ​ប្រ​ភេទ​របស់​ឧបករណ៍បញ្ជា​ និង​ឯកសារ​ភ្ជាប់​​​​លើ​វាផ្សេង​ទៀត​​ ។</translation>
+        <translation>ជ្រើស​រន្ធ​លើ​ឧបករណ៍​បញ្ជា​ផ្ទុក ​ដែល​បាន​ប្រើ​ដោយ​ឯកសារ​ភ្ជាប់​នេះ​ ។​ ​រន្ធ​ដែលអាចរកបានអាស្រ័យ​​លើ​ប្រ​ភេទ​របស់​ឧបករណ៍បញ្ជា​ និង​ឯកសារ​ភ្ជាប់​​​​លើ​វាផ្សេង​ទៀត​​ ។</translation>
     </message>
     <message>
         <source>Selects the virtual disk image or the host drive used by this attachment.</source>
@@ -5595,7 +5573,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>Opens the Virtual Media Manager to select a virtual image for this attachment.</source>
-        <translation type="obsolete">បើក​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត ដើម្បី​ជ្រើស​រូបភាព​​និម្មិត​សម្រាប់​ឯកសារ​ភ្ជាប់​នេះ ។</translation>
+        <translation type="obsolete">បើក​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត ដើម្បី​ជ្រើស​រូបភាព​​និម្មិត​សម្រាប់​ឯកសារ​ភ្ជាប់​នេះ ។</translation>
     </message>
     <message>
         <source>Open Virtual Media Manager</source>
@@ -5607,7 +5585,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>When checked, allows the guest to send ATAPI commands directly to the host-drive which makes it possible to use CD/DVD writers connected to the host inside the VM. Note that writing audio CD inside the VM is not yet supported.</source>
-        <translation>នៅ​ពេល​ដែល​បាន​ធីក​ អនុញ្ញាត​ម៉ាស៊ីន​ភ្ញៀវ​ផ្ញើពាក្យ​បញ្ជា​​ ATAPI ដោយ​ផ្ទាល់​​ទៅ​ដ្រាយ​ម៉ាស៊ីន ដែល​​​ធ្វើ​ឲ្យ​វា​អាច​ប្រើ​​ឧបករណ៍​​​សរសេរ​ស៊ី​ឌី​​/​ឌី​វី​ឌី​ ​ដែល​បាន​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​នៅ​​ក្នុង​ VM ។ ចំណាំថា ​ការ​សរសេរស៊ីឌីអូឌីយ៉ូ​ខាង​ក្នុង​ VM មិន​ត្រូវ​បាន​គាំ​ទ្រ​នៅ​ឡើយ​ទេ​ ។</translation>
+        <translation>នៅ​ពេល​ដែល​បាន​ធីក​ អនុញ្ញាត​ម៉ាស៊ីន​ភ្ញៀវ​ផ្ញើពាក្យ​បញ្ជា​​ ATAPI ដោយ​ផ្ទាល់​​ទៅ​ដ្រាយ​ម៉ាស៊ីន ដែល​​​ធ្វើ​ឲ្យ​វា​អាច​ប្រើ​​ឧបករណ៍​​​សរសេរ​ស៊ី​ឌី​​/​ឌី​វី​ឌី​ ​ដែល​បាន​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​នៅ​​ក្នុង​ VM ។ ចំណាំថា ​ការ​សរសេរស៊ីឌីអូឌីយ៉ូ​ខាង​ក្នុង​ VM មិន​ត្រូវ​បាន​គាំ​ទ្រ​នៅ​ឡើយ​ទេ​ ។</translation>
     </message>
     <message>
         <source>&Passthrough</source>
@@ -5615,11 +5593,11 @@ network adapter name</comment>
     </message>
     <message>
         <source>Virtual Size:</source>
-        <translation>ទំហំនិម្មិត​ ៖</translation>
+        <translation>ទំហំនិម្មិត​ ៖</translation>
     </message>
     <message>
         <source>Actual Size:</source>
-        <translation>ទំហំ​ពិត​ ៖</translation>
+        <translation>ទំហំ​ពិត​ ៖</translation>
     </message>
     <message>
         <source>Size:</source>
@@ -5635,7 +5613,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>Attached to:</source>
-        <translation>បាន​​ភ្ជាប់ទៅកាន់ ៖</translation>
+        <translation>បាន​​ភ្ជាប់ទៅកាន់ ៖</translation>
     </message>
     <message>
         <source>Use Host I/O Cache</source>
@@ -5720,96 +5698,97 @@ network adapter name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <source>Image</source>
+        <comment>storage image</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
+        <source>Add USB Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5825,7 +5804,7 @@ network adapter name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5837,27 +5816,27 @@ network adapter name</comment>
     <name>UIMachineSettingsSystem</name>
     <message>
         <source>you have assigned more than <b>%1%</b> of your computer's memory (<b>%2</b>) to the virtual machine. Not enough memory is left for your host operating system. Please select a smaller amount.</source>
-        <translation type="obsolete">អ្នកបាន​ផ្ដល់សតិ​កុំព្យូទ័ររបស់​អ្នក​ច្រើនជាង <b>%1%</b> (<b>%2</b>) ដល់​ម៉ាស៊ីន​និម្មិត ។ មិនមាន​សតិ​គ្រប់គ្រាន់​នៅ​សល់​សម្រាប់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​របស់​អ្នក​ទេ ។ សូម​ជ្រើស​​ចំនួន​សតិ​តូច​ជាង​​នេះ ។</translation>
+        <translation type="obsolete">អ្នកបាន​ផ្ដល់សតិ​កុំព្យូទ័ររបស់​អ្នក​ច្រើនជាង <b>%1%</b> (<b>%2</b>) ដល់​ម៉ាស៊ីន​និម្មិត ។ មិនមាន​សតិ​គ្រប់គ្រាន់​នៅ​សល់​សម្រាប់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​របស់​អ្នក​ទេ ។ សូម​ជ្រើស​​ចំនួន​សតិ​តូច​ជាង​​នេះ ។</translation>
     </message>
     <message>
         <source>you have assigned more than <b>%1%</b> of your computer's memory (<b>%2</b>) to the virtual machine. There might not be enough memory left for your host operating system. Continue at your own risk.</source>
-        <translation type="obsolete">អ្នក​បាន​ផ្ដល់​សតិ​កុំព្យូទ័រ​ច្រើន <b>%1%</b> (<b>%2</b>) ដល់​ម៉ាស៊ីន​និម្មិត ។ វា​ប្រហែលជា​មិន​គ្រប់គ្រាន់​​សម្រាប់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​របស់​អ្នក​ទេ ។ បន្ត​ដោយ​មានគ្រោះថ្នាក់ ។</translation>
+        <translation type="obsolete">អ្នក​បាន​ផ្ដល់​សតិ​កុំព្យូទ័រ​ច្រើន <b>%1%</b> (<b>%2</b>) ដល់​ម៉ាស៊ីន​និម្មិត ។ វា​ប្រហែលជា​មិន​គ្រប់គ្រាន់​​សម្រាប់​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​របស់​អ្នក​ទេ ។ បន្ត​ដោយ​មានគ្រោះថ្នាក់ ។</translation>
     </message>
     <message>
         <source>for performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
-        <translation type="obsolete">សម្រាប់​អនុវត្ត ចំនួន​ស៊ីភីយូ​ដែល​បាន​ភ្ជាប់​ទៅ​ម៉ាស៊ីន​មិន​អាច​លើស​ពី​​ចំនួន​ពីរ​នៃ​ស៊ីភីយូ​ហ្វីស៊ីខល​នៅ​លើ​ម៉ាស៊ីន (<b>%1</b>) ។ សូម​កាត់​បន្ថយ​ចំនួន​ស៊ីភីយូ​និម្មិត ។</translation>
+        <translation type="obsolete">សម្រាប់​អនុវត្ត ចំនួន​ស៊ីភីយូ​ដែល​បាន​ភ្ជាប់​ទៅ​ម៉ាស៊ីន​មិន​អាច​លើស​ពី​​ចំនួន​ពីរ​នៃ​ស៊ីភីយូ​ហ្វីស៊ីខល​នៅ​លើ​ម៉ាស៊ីន (<b>%1</b>) ។ សូម​កាត់​បន្ថយ​ចំនួន​ស៊ីភីយូ​និម្មិត ។</translation>
     </message>
     <message>
         <source>you have assigned more virtual CPUs to the virtual machine than the number of physical CPUs on your host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
-        <translation type="obsolete">អ្នក​បានផ្ដល់​ស៊ីភីយូ​និម្មិត​ច្រើន​ដល់​ម៉ាស៊ីន​និម្មិត​ជាង​ចំនួន​ស៊ីភីយូ​ហ្វីស៊ីខល​នៅ​ក្នុង​ប្រព័ន្ធ​ម៉ាស៊ីន​របស់​អ្នក (<b>%1</b>) ។ វា​ទំនង​ជា​បន្ថយ​ការ​អនុវត្ត​ម៉ាស៊ីននិម្មិត​របស់​អ្នក ។ សូម​ពិចារណា​លើការ​កាត់បន្ថយ​ចំនួន​ស៊ីភីយូ​និម្មិត ។</translation>
+        <translation type="obsolete">អ្នក​បានផ្ដល់​ស៊ីភីយូ​និម្មិត​ច្រើន​ដល់​ម៉ាស៊ីន​និម្មិត​ជាង​ចំនួន​ស៊ីភីយូ​ហ្វីស៊ីខល​នៅ​ក្នុង​ប្រព័ន្ធ​ម៉ាស៊ីន​របស់​អ្នក (<b>%1</b>) ។ វា​ទំនង​ជា​បន្ថយ​ការ​អនុវត្ត​ម៉ាស៊ីននិម្មិត​របស់​អ្នក ។ សូម​ពិចារណា​លើការ​កាត់បន្ថយ​ចំនួន​ស៊ីភីយូ​និម្មិត ។</translation>
     </message>
     <message>
         <source>you have assigned more than one virtual CPU to this VM. This will not work unless the IO-APIC feature is also enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source>
-        <translation type="obsolete">អ្នកបានផ្ដល់​ស៊ីភីយូ​និម្មិត​ច្រើនជាង​ដល់ VM នេះ ។ វា​នឹង​មិន​ដំណើរការ​ទេ លុះត្រា​តែ​លក្ខណៈពិសេស​របស់ IO-APIC ត្រូវ​បានបើក ។ វា​នឹង​ត្រូវ​បាន​ធ្វើ​ដោយ​ស្វ័យ​ប្រវត្តិ នៅពេល​អ្នក​ទទួល​យក​ការ​កំណត់ VM ដោយ​ចុច​ប៊ូតុង​យល់ព្រម ។</translation>
+        <translation type="obsolete">អ្នកបានផ្ដល់​ស៊ីភីយូ​និម្មិត​ច្រើនជាង​ដល់ VM នេះ ។ វា​នឹង​មិន​ដំណើរការ​ទេ លុះត្រា​តែ​លក្ខណៈពិសេស​របស់ IO-APIC ត្រូវ​បានបើក ។ វា​នឹង​ត្រូវ​បាន​ធ្វើ​ដោយ​ស្វ័យ​ប្រវត្តិ នៅពេល​អ្នក​ទទួល​យក​ការ​កំណត់ VM ដោយ​ចុច​ប៊ូតុង​យល់ព្រម ។</translation>
     </message>
     <message>
         <source>you have assigned more than one virtual CPU to this VM. This will not work unless hardware virtualization (VT-x/AMD-V) is also enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source>
-        <translation type="obsolete">អ្នក​បានផ្ដល់​ស៊ីភីយូ​និម្មិត​ច្រើនជាង​មួយ​ដល់ VM ។ វា​នឹង​មិនដំណើរការ​ទេ លុះត្រា​តែ​ផ្នែក​រឹង​និម្មិត (VT-x/AMD-V) ត្រូវ​បានបើក​ដែរ ។ វា​នឹង​ត្រូវ​បានធ្វើ​ដោយ​ស្វ័យ​ប្រវត្តិ នៅពេល​អ្នក​ទទួល​យក​ការ​កំណត់ VM ដោយ​ចុច​ប៊ូតុងយល់ព្រម ។</translation>
+        <translation type="obsolete">អ្នក​បានផ្ដល់​ស៊ីភីយូ​និម្មិត​ច្រើនជាង​មួយ​ដល់ VM ។ វា​នឹង​មិនដំណើរការ​ទេ លុះត្រា​តែ​ផ្នែក​រឹង​និម្មិត (VT-x/AMD-V) ត្រូវ​បានបើក​ដែរ ។ វា​នឹង​ត្រូវ​បានធ្វើ​ដោយ​ស្វ័យ​ប្រវត្តិ នៅពេល​អ្នក​ទទួល​យក​ការ​កំណត់ VM ដោយ​ចុច​ប៊ូតុងយល់ព្រម ។</translation>
     </message>
     <message>
         <source><qt>%1&nbsp;MB</qt></source>
@@ -5883,11 +5862,11 @@ network adapter name</comment>
     </message>
     <message>
         <source>Base &Memory:</source>
-        <translation>សតិ​គោល​ ៖</translation>
+        <translation>សតិ​គោល​ ៖</translation>
     </message>
     <message>
         <source>Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start.</source>
-        <translation>ត្រួតពិនិត្យ​ចំនួន​សតិ​ដែលបានផ្ដល់​ទៅ​ម៉ាស៊ីន​និម្មិត ។ ប្រសិនបើ​អ្នក​ផ្ដល់​ច្រើនពេក ម៉ាស៊ីន​មិនអាច​ចាប់ផ្ដើម​បានទេ ។</translation>
+        <translation>ត្រួតពិនិត្យ​ចំនួន​សតិ​ដែលបានផ្ដល់​ទៅ​ម៉ាស៊ីន​និម្មិត ។ ប្រសិនបើ​អ្នក​ផ្ដល់​ច្រើនពេក ម៉ាស៊ីន​មិនអាច​ចាប់ផ្ដើម​បានទេ ។</translation>
     </message>
     <message>
         <source>MB</source>
@@ -5895,11 +5874,11 @@ network adapter name</comment>
     </message>
     <message>
         <source>&Boot Order:</source>
-        <translation>លំដាប់​ចាប់ផ្ដើម ៖</translation>
+        <translation>លំដាប់​ចាប់ផ្ដើម ៖</translation>
     </message>
     <message>
         <source>Defines the boot device order. Use the checkboxes on the left to enable or disable individual boot devices. Move items up and down to change the device order.</source>
-        <translation>កំណត់​លំដាប់​ឧបករណ៍​ចាប់ផ្ដើម​ឡើង ។ ប្រើ​ប្រអប់​ធីក​នៅ​ខាង​ឆ្វេង ដើម្បី​បើក ឬ​បិទ​ឧបករណ៍​ចាប់ផ្ដើមឡើង ។ ផ្លាស់ទី​វា​ឡើង​លើ និង​ចុះក្រោម​ ដើម្បី​ផ្លាស់ប្ដូរ​លំដាប់​ឧបករណ៍ ។</translation>
+        <translation>កំណត់​លំដាប់​ឧបករណ៍​ចាប់ផ្ដើម​ឡើង ។ ប្រើ​ប្រអប់​ធីក​នៅ​ខាង​ឆ្វេង ដើម្បី​បើក ឬ​បិទ​ឧបករណ៍​ចាប់ផ្ដើមឡើង ។ ផ្លាស់ទី​វា​ឡើង​លើ និង​ចុះក្រោម​ ដើម្បី​ផ្លាស់ប្ដូរ​លំដាប់​ឧបករណ៍ ។</translation>
     </message>
     <message>
         <source>Move Up (Ctrl-Up)</source>
@@ -5907,7 +5886,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>Moves the selected boot device up.</source>
-        <translation>ផ្លាស់ទី​ឧបករណ៍​ចាប់ផ្ដើម​ដែលបាន​ជ្រើស​ឡើង​លើ ។</translation>
+        <translation>ផ្លាស់ទី​ឧបករណ៍​ចាប់ផ្ដើម​ដែលបាន​ជ្រើស​ឡើង​លើ ។</translation>
     </message>
     <message>
         <source>Move Down (Ctrl-Down)</source>
@@ -5919,11 +5898,11 @@ network adapter name</comment>
     </message>
     <message>
         <source>Extended Features:</source>
-        <translation>លក្ខណៈ​ពិសេស​ដែល​បានពង្រីក ៖</translation>
+        <translation>លក្ខណៈ​ពិសេស​ដែល​បានពង្រីក ៖</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will support the Input Output APIC (I/O APIC), which may slightly decrease performance. <b>Note:</b> don't disable this feature after having installed a Windows guest operating system!</source>
-        <translation>នៅ​ពេល​បានគូស​ធីក ម៉ាស៊ីន​និម្មិត​នឹង​គាំទ្រ​ Input Output APIC (I/O APIC) ដែលអាច​បន្ថយ​ការ​អនុវត្ត​បន្តិចបន្តួច ។ <b>ចំណាំ ៖</b> កុំ​បិទ​លក្ខណៈពិសេស​នេះ បន្ទាប់​ពី​ដំឡើង​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​វីនដូ !</translation>
+        <translation>នៅ​ពេល​បានគូស​ធីក ម៉ាស៊ីន​និម្មិត​នឹង​គាំទ្រ​ Input Output APIC (I/O APIC) ដែលអាច​បន្ថយ​ការ​អនុវត្ត​បន្តិចបន្តួច ។ <b>ចំណាំ ៖</b> កុំ​បិទ​លក្ខណៈពិសេស​នេះ បន្ទាប់​ពី​ដំឡើង​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​វីនដូ !</translation>
     </message>
     <message>
         <source>Enable &I/O APIC</source>
@@ -5931,7 +5910,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>When checked, the guest will support the Extended Firmware Interface (EFI), which is required to boot certain guest OSes. Non-EFI aware OSes will not be able to boot if this option is activated.</source>
-        <translation>​នៅ​ពេល​​ដែលបាន​គូស​ធីក​ ម៉ាស៊ីន​ភ្ញៀវ​នឹង​គាំ​ទ្រ Extended Firmware Interface (EFI) ដែល​ត្រូវ​បាន​ទាម​ទារ​ដើម្បី​ចាប់ផ្ដើម​ប្រ​ព័ន្ធ​ប្រតិបត្តិ​​ការ​​ម៉ាស៊ីន​ភ្ញៀវពិត​ប្រាកដ ។​ ប្រ​ព័ន្ធ​ប្រតិបត្តិ​ការ​​ដែល​មិនមែន​ ​EFI ​​នឹង​មិនអាច​ទៅ​ចាប់ផ្តើម​​បាន​ទេ ​​ប្រ​សិន​បើ​ជម្រើស​ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម​ ។</translation>
+        <translation>​នៅ​ពេល​​ដែលបាន​គូស​ធីក​ ម៉ាស៊ីន​ភ្ញៀវ​នឹង​គាំ​ទ្រ Extended Firmware Interface (EFI) ដែល​ត្រូវ​បាន​ទាម​ទារ​ដើម្បី​ចាប់ផ្ដើម​ប្រ​ព័ន្ធ​ប្រតិបត្តិ​​ការ​​ម៉ាស៊ីន​ភ្ញៀវពិត​ប្រាកដ ។​ ប្រ​ព័ន្ធ​ប្រតិបត្តិ​ការ​​ដែល​មិនមែន​ ​EFI ​​នឹង​មិនអាច​ទៅ​ចាប់ផ្តើម​​បាន​ទេ ​​ប្រ​សិន​បើ​ជម្រើស​ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម​ ។</translation>
     </message>
     <message>
         <source>Enable &EFI (special OSes only)</source>
@@ -5947,11 +5926,11 @@ network adapter name</comment>
     </message>
     <message>
         <source>Controls the number of virtual CPUs in the virtual machine.</source>
-        <translation type="obsolete">ត្រួត​ពិនិត្យចំនួន​ស៊ីភីយូ​និម្មិត​នៅ​ក្នុង​ម៉ាស៊ីន​និម្មិត ។</translation>
+        <translation type="obsolete">ត្រួត​ពិនិត្យចំនួន​ស៊ីភីយូ​និម្មិត​នៅ​ក្នុង​ម៉ាស៊ីន​និម្មិត ។</translation>
     </message>
     <message>
         <source>When checked, the Physical Address Extension (PAE) feature of the host CPU will be exposed to the virtual machine.</source>
-        <translation>នៅពេល​បាន​គូស​ធីក លក្ខណៈពិសេស Physical Address Extension (PAE) របស់​ស៊ីភីយូ​​ម៉ាស៊ីន​នឹង​ត្រូវ​បានបង្ហាញ​​ម៉ាស៊ីន​និម្មិត ។</translation>
+        <translation>នៅពេល​បាន​គូស​ធីក លក្ខណៈពិសេស Physical Address Extension (PAE) របស់​ស៊ីភីយូ​​ម៉ាស៊ីន​នឹង​ត្រូវ​បានបង្ហាញ​​ម៉ាស៊ីន​និម្មិត ។</translation>
     </message>
     <message>
         <source>Enable PA&E/NX</source>
@@ -5963,11 +5942,11 @@ network adapter name</comment>
     </message>
     <message>
         <source>Hardware Virtualization:</source>
-        <translation>ការ​ធ្វើ​ផ្នែក​រឹង​និម្មិត ៖</translation>
+        <translation>ការ​ធ្វើ​ផ្នែក​រឹង​និម្មិត ៖</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will try to make use of the host CPU's hardware virtualization extensions such as Intel VT-x and AMD-V.</source>
-        <translation>នៅ​ពេលបាន​គូស​ធីក ម៉ាស៊ីននិម្មិត​នឹង​ព្យាយាម​ប្រាកដថា​ ការ​ប្រើ​ប្រាស់​ផ្នែកបន្ថែម​និម្មិត​ផ្នែក​រឹង​របស់​ស៊ីភីយូ ដូ​ចជា Intel VT-x និង AMD-V ។</translation>
+        <translation>នៅ​ពេលបាន​គូស​ធីក ម៉ាស៊ីននិម្មិត​នឹង​ព្យាយាម​ប្រាកដថា​ ការ​ប្រើ​ប្រាស់​ផ្នែកបន្ថែម​និម្មិត​ផ្នែក​រឹង​របស់​ស៊ីភីយូ ដូ​ចជា Intel VT-x និង AMD-V ។</translation>
     </message>
     <message>
         <source>Enable &VT-x/AMD-V</source>
@@ -5975,7 +5954,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>When checked, the virtual machine will try to make use of the nested paging extension of Intel VT-x and AMD-V.</source>
-        <translation>នៅពេល​ដែលបានគូស​ធីក ម៉ាស៊ីន​និម្មិត​នឹង​ព្យាយាម​ប្រាកដ​ថា​ផ្នែក​បន្ថែម paging ខាង​ក្នុង​របស់ Intel VT-x និង AMD-V ។</translation>
+        <translation>នៅពេល​ដែលបានគូស​ធីក ម៉ាស៊ីន​និម្មិត​នឹង​ព្យាយាម​ប្រាកដ​ថា​ផ្នែក​បន្ថែម paging ខាង​ក្នុង​របស់ Intel VT-x និង AMD-V ។</translation>
     </message>
     <message>
         <source>Enable Nested Pa&ging</source>
@@ -6044,35 +6023,35 @@ network adapter name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6122,27 +6101,27 @@ network adapter name</comment>
     </message>
     <message>
         <source>Adds a new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="obsolete">បន្ថែម​តម្រង USB ថ្មី​ដែលមាន​វាល​ទាំងអស់​ ដោយ​ដំបូង​កំណត់​ខ្សែអក្សរ​ទៅ​ទទេ ។ ចំណាំ​ថា តម្រង​បែប​នេះ​នឹង​ផ្គូផ្គង​ឧបករណ៍ USB ដែល​បាន​ភ្ជាប់ ។</translation>
+        <translation type="obsolete">បន្ថែម​តម្រង USB ថ្មី​ដែលមាន​វាល​ទាំងអស់​ ដោយ​ដំបូង​កំណត់​ខ្សែអក្សរ​ទៅ​ទទេ ។ ចំណាំ​ថា តម្រង​បែប​នេះ​នឹង​ផ្គូផ្គង​ឧបករណ៍ USB ដែល​បាន​ភ្ជាប់ ។</translation>
     </message>
     <message>
         <source>Adds a new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="obsolete">បន្ថែម​តម្រង USB ថ្មី​ដែល​មាន​វាល​ទាំងអស់​កំណត់​ទៅ​តម្លៃ​របស់​ឧបករណ៍​ USB ដែល​ជ្រើស​ដែលបានភ្ជាប់​ទៅ នឹង​ម៉ាស៊ីន ។</translation>
+        <translation type="obsolete">បន្ថែម​តម្រង USB ថ្មី​ដែល​មាន​វាល​ទាំងអស់​កំណត់​ទៅ​តម្លៃ​របស់​ឧបករណ៍​ USB ដែល​ជ្រើស​ដែលបានភ្ជាប់​ទៅ នឹង​ម៉ាស៊ីន ។</translation>
     </message>
     <message>
         <source>Edits the selected USB filter.</source>
-        <translation type="obsolete">កែសម្រួល​តម្រង USB ដែល​បាន​ជ្រើស ។</translation>
+        <translation type="obsolete">កែសម្រួល​តម្រង USB ដែល​បាន​ជ្រើស ។</translation>
     </message>
     <message>
         <source>Removes the selected USB filter.</source>
-        <translation type="obsolete">យក​តម្រង USB ដែលបាន​ជ្រើស​ចេញ ។</translation>
+        <translation type="obsolete">យក​តម្រង USB ដែលបាន​ជ្រើស​ចេញ ។</translation>
     </message>
     <message>
         <source>Moves the selected USB filter up.</source>
-        <translation type="obsolete">ផ្លាស់ទី​តម្រង​ USB ដែលបាន​ជ្រើស​ឡើង​វលើ ។</translation>
+        <translation type="obsolete">ផ្លាស់ទី​តម្រង​ USB ដែលបាន​ជ្រើស​ឡើង​វលើ ។</translation>
     </message>
     <message>
         <source>Moves the selected USB filter down.</source>
-        <translation type="obsolete">ផ្លាស់ទី​តម្រង​ USB ដែលបាន​ជ្រើស​ចុះក្រោម ។</translation>
+        <translation type="obsolete">ផ្លាស់ទី​តម្រង​ USB ដែលបាន​ជ្រើស​ចុះក្រោម ។</translation>
     </message>
     <message>
         <source>New Filter %1</source>
@@ -6151,7 +6130,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>When checked, enables the virtual USB controller of this machine.</source>
-        <translation>នៅពេល​បានគូសធីក បើក​ឧបករណ៍​ត្រួតពិនិត្យ​ USB និម្មិត​របស់ម៉ាស៊ីន​នេះ ។</translation>
+        <translation>នៅពេល​បានគូសធីក បើក​ឧបករណ៍​ត្រួតពិនិត្យ​ USB និម្មិត​របស់ម៉ាស៊ីន​នេះ ។</translation>
     </message>
     <message>
         <source>Enable &USB Controller</source>
@@ -6159,7 +6138,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>When checked, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
-        <translation type="obsolete">នៅពេល​បានគូស​ធីក បើក​ឧបករណ៍​ត្រួតពិនិត្យ​ USB EHCI និម្មិត​របស់​ម៉ាស៊ីន​នេះ ។ ឧបករណ៍​បញ្ជា USB EHCI ផ្ដល់​នូវ​ការ​គាំទ្រ USB 2.0 ។</translation>
+        <translation type="obsolete">នៅពេល​បានគូស​ធីក បើក​ឧបករណ៍​ត្រួតពិនិត្យ​ USB EHCI និម្មិត​របស់​ម៉ាស៊ីន​នេះ ។ ឧបករណ៍​បញ្ជា USB EHCI ផ្ដល់​នូវ​ការ​គាំទ្រ USB 2.0 ។</translation>
     </message>
     <message>
         <source>Enable USB 2.0 (E&HCI) Controller</source>
@@ -6171,7 +6150,7 @@ network adapter name</comment>
     </message>
     <message>
         <source>Lists all USB filters of this machine. The checkbox to the left defines whether the particular filter is enabled or not. Use the context menu or buttons to the right to add or remove USB filters.</source>
-        <translation>រាយ​តម្រង USB ទាំង​អស់​របស់ម៉ាស៊ីន​នេះ ។ ប្រអប់​ធីក​នៅ​ខាង​ឆ្វេ​ងកំណត់​ថាតើ​តម្រង​ជាក់លាក់​ត្រូ​វបើក​ ឬ​ក៏​អត់ ។ ប្រើម៉ឺនុយ​បរិបទ​ ឬ​ប៊ូតុង​នៅ​ខាង​ស្ដាំ​ដើម្បី​បន្ថែម ឬ​យក​តម្រង  USB ចេញ ។</translation>
+        <translation>រាយ​តម្រង USB ទាំង​អស់​របស់ម៉ាស៊ីន​នេះ ។ ប្រអប់​ធីក​នៅ​ខាង​ឆ្វេ​ងកំណត់​ថាតើ​តម្រង​ជាក់លាក់​ត្រូ​វបើក​ ឬ​ក៏​អត់ ។ ប្រើម៉ឺនុយ​បរិបទ​ ឬ​ប៊ូតុង​នៅ​ខាង​ស្ដាំ​ដើម្បី​បន្ថែម ឬ​យក​តម្រង  USB ចេញ ។</translation>
     </message>
     <message>
         <source>[filter]</source>
@@ -6180,69 +6159,69 @@ network adapter name</comment>
     <message>
         <source><nobr>Vendor ID: %1</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation type="unfinished"><nobr>លេខ​សម្គាល់​អ្នក​លក់ ៖ %1</nobr></translation>
+        <translation type="unfinished"><nobr>លេខ​សម្គាល់​អ្នក​លក់ ៖ %1</nobr></translation>
     </message>
     <message>
         <source><nobr>Product ID: %2</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation type="unfinished"><nobr>លេខសម្គាល់​ផលិតផល ៖ %2</nobr></translation>
+        <translation type="unfinished"><nobr>លេខសម្គាល់​ផលិតផល ៖ %2</nobr></translation>
     </message>
     <message>
         <source><nobr>Revision: %3</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation type="unfinished"><nobr>កា​រពិនិត្យ​ឡើង​វិញ ៖ %3</nobr></translation>
+        <translation type="unfinished"><nobr>កា​រពិនិត្យ​ឡើង​វិញ ៖ %3</nobr></translation>
     </message>
     <message>
         <source><nobr>Product: %4</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation type="unfinished"><nobr>ផលិតផល ៖ %4</nobr></translation>
+        <translation type="unfinished"><nobr>ផលិតផល ៖ %4</nobr></translation>
     </message>
     <message>
         <source><nobr>Manufacturer: %5</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation type="unfinished"><nobr>ក្រុមហ៊ុន​ផលិត ៖ %5</nobr></translation>
+        <translation type="unfinished"><nobr>ក្រុមហ៊ុន​ផលិត ៖ %5</nobr></translation>
     </message>
     <message>
         <source><nobr>Serial No.: %1</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation type="unfinished"><nobr>លេខ​ស៊េរី ៖ %1</nobr></translation>
+        <translation type="unfinished"><nobr>លេខ​ស៊េរី ៖ %1</nobr></translation>
     </message>
     <message>
         <source><nobr>Port: %1</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation type="unfinished"><nobr>ច្រក ៖ %1</nobr></translation>
+        <translation type="unfinished"><nobr>ច្រក ៖ %1</nobr></translation>
     </message>
     <message>
         <source><nobr>State: %1</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation type="unfinished"><nobr>ស្ថានភាព ៖ %1</nobr></translation>
+        <translation type="unfinished"><nobr>ស្ថានភាព ៖ %1</nobr></translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6313,83 +6292,83 @@ network adapter name</comment>
     </message>
     <message>
         <source>&Name:</source>
-        <translation>ឈ្មោះ ៖</translation>
+        <translation>ឈ្មោះ ៖</translation>
     </message>
     <message>
         <source>Holds the filter name.</source>
-        <translation>បង្ហាញឈ្មោះ​តម្រង ។</translation>
+        <translation>បង្ហាញឈ្មោះ​តម្រង ។</translation>
     </message>
     <message>
         <source>&Vendor ID:</source>
-        <translation>លេខ​សម្គាល់​អ្នក​លក់ ៖</translation>
+        <translation>លេខ​សម្គាល់​អ្នក​លក់ ៖</translation>
     </message>
     <message>
         <source>Defines the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="obsolete">កំណត់​តម្រង​លេខ​សម្គាល់​អ្នក​លក់ ។ ទ្រង់ទ្រាយ​ខ្សែអក្សរ <i>ផ្គូផ្គងជាក់លាក់</i> គឺ <tt>XXXX</tt> ដែល <tt>X</tt> ជា​គោល​ដប់ប្រាំមួយ ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
+        <translation type="obsolete">កំណត់​តម្រង​លេខ​សម្គាល់​អ្នក​លក់ ។ ទ្រង់ទ្រាយ​ខ្សែអក្សរ <i>ផ្គូផ្គងជាក់លាក់</i> គឺ <tt>XXXX</tt> ដែល <tt>X</tt> ជា​គោល​ដប់ប្រាំមួយ ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
     </message>
     <message>
         <source>&Product ID:</source>
-        <translation>លេខ​សម្គាល់​ផលិតផល ៖</translation>
+        <translation>លេខ​សម្គាល់​ផលិតផល ៖</translation>
     </message>
     <message>
         <source>Defines the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="obsolete">កំណត់​តម្រង​លេខ​សម្គាល់​ផលិតផល ។ ទ្រង់ទ្រាយ​ខ្សែអក្សរ<i>ផ្គូផ្គង​ជាក់លាក់</i> គឺ<tt>XXXX</tt> ដែល <tt>X</tt> គឺជា​គោល​ដប់​ប្រាំមួយ ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
+        <translation type="obsolete">កំណត់​តម្រង​លេខ​សម្គាល់​ផលិតផល ។ ទ្រង់ទ្រាយ​ខ្សែអក្សរ<i>ផ្គូផ្គង​ជាក់លាក់</i> គឺ<tt>XXXX</tt> ដែល <tt>X</tt> គឺជា​គោល​ដប់​ប្រាំមួយ ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
     </message>
     <message>
         <source>&Revision:</source>
-        <translation>ការ​ពិនិត្យ​ឡើង​វិញ ៖</translation>
+        <translation>ការ​ពិនិត្យ​ឡើង​វិញ ៖</translation>
     </message>
     <message>
         <source>Defines the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation type="obsolete">កំណត់​ការ​ពិនិត្យ​តម្រង​លេខ​ឡើង​វិញ ។ ទ្រង់ទ្រាយ​ខ្សែអក្សរ <i>ផ្គូផ្គង​ជាក់លាក់</i> គឺ​<tt>IIFF</tt> ដែល <tt>I</tt> ជា​ចំនួន​គោល​ដប់​របស់​ផ្នែក​ចំនួន​គត់​ ហើយ <tt>F</tt> គឺជា​ចំនួន​គោលដប់​របស់​ផ្នែក​ប្រភាគ ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
+        <translation type="obsolete">កំណត់​ការ​ពិនិត្យ​តម្រង​លេខ​ឡើង​វិញ ។ ទ្រង់ទ្រាយ​ខ្សែអក្សរ <i>ផ្គូផ្គង​ជាក់លាក់</i> គឺ​<tt>IIFF</tt> ដែល <tt>I</tt> ជា​ចំនួន​គោល​ដប់​របស់​ផ្នែក​ចំនួន​គត់​ ហើយ <tt>F</tt> គឺជា​ចំនួន​គោលដប់​របស់​ផ្នែក​ប្រភាគ ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
     </message>
     <message>
         <source>&Manufacturer:</source>
-        <translation>អ្នក​បង្កើត ៖</translation>
+        <translation>អ្នក​បង្កើត ៖</translation>
     </message>
     <message>
         <source>Defines the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">កំណត់​តម្រង​អ្នក​ផលិត​ជាខ្សែអក្សរ <i>ផ្គូផ្គង​ជាក់លាក់</i> ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
+        <translation type="obsolete">កំណត់​តម្រង​អ្នក​ផលិត​ជាខ្សែអក្សរ <i>ផ្គូផ្គង​ជាក់លាក់</i> ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
     </message>
     <message>
         <source>Pro&duct:</source>
-        <translation>ផលិតផល ៖</translation>
+        <translation>ផលិតផល ៖</translation>
     </message>
     <message>
         <source>Defines the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">កំណត់​តម្រង​ឈ្មោះផលិតផល​ជាខ្សែអក្សរ <i>ផ្គូផ្គងជាក់លាក់</i> ។ ខ្សែអក្សរទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
+        <translation type="obsolete">កំណត់​តម្រង​ឈ្មោះផលិតផល​ជាខ្សែអក្សរ <i>ផ្គូផ្គងជាក់លាក់</i> ។ ខ្សែអក្សរទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
     </message>
     <message>
         <source>&Serial No.:</source>
-        <translation>លេខ​ស៊េរី ៖</translation>
+        <translation>លេខ​ស៊េរី ៖</translation>
     </message>
     <message>
         <source>Defines the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">កំណត់​តម្រង​លេខ​ស៊េរី​ជា​ខ្សែអក្សរ <i>កា​រផ្គូផ្គង​ជាក់លាក់</i> ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
+        <translation type="obsolete">កំណត់​តម្រង​លេខ​ស៊េរី​ជា​ខ្សែអក្សរ <i>កា​រផ្គូផ្គង​ជាក់លាក់</i> ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
     </message>
     <message>
         <source>Por&t:</source>
-        <translation>ច្រក ៖</translation>
+        <translation>ច្រក ៖</translation>
     </message>
     <message>
         <source>Defines the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="obsolete">កំណត់​តម្រង​ច្រក USB ម៉ាស៊ីណ​ជា​ខ្សែអក្សរ <i>ផ្គូផ្គង​ពិតប្រាកដ</i> ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
+        <translation type="obsolete">កំណត់​តម្រង​ច្រក USB ម៉ាស៊ីណ​ជា​ខ្សែអក្សរ <i>ផ្គូផ្គង​ពិតប្រាកដ</i> ។ ខ្សែអក្សរ​ទទេ​នឹង​ផ្គូផ្គង​តម្លៃ​ណាមួយ ។</translation>
     </message>
     <message>
         <source>R&emote:</source>
-        <translation>ពីចម្ងាយ ៖</translation>
+        <translation>ពីចម្ងាយ ៖</translation>
     </message>
     <message>
         <source>Defines whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
-        <translation type="obsolete">កំណត់​ថាតើ​តម្រង​នេះ​អនុវត្ត​ទៅកាន់​ឧបករណ៍ USB ដែលបាន​ភ្ជាប់​ទៅ​​កុំព្យូទ័រ​ដែរឬទេ (<i>គ្មានទេ</i>) ទៅកាន់​កុំព្យូទ័រ​ភ្ញៀវ​របស់ VRDP (<i>បាទ/ចាស</i>) ឬ​ទាំង​ពីរ (<i>ណាមួយ</i>) ។</translation>
+        <translation type="obsolete">កំណត់​ថាតើ​តម្រង​នេះ​អនុវត្ត​ទៅកាន់​ឧបករណ៍ USB ដែលបាន​ភ្ជាប់​ទៅ​​កុំព្យូទ័រ​ដែរឬទេ (<i>គ្មានទេ</i>) ទៅកាន់​កុំព្យូទ័រ​ភ្ញៀវ​របស់ VRDP (<i>បាទ/ចាស</i>) ឬ​ទាំង​ពីរ (<i>ណាមួយ</i>) ។</translation>
     </message>
     <message>
         <source>&Action:</source>
-        <translation type="obsolete">សកម្មភាព ៖</translation>
+        <translation type="obsolete">សកម្មភាព ៖</translation>
     </message>
     <message>
         <source>Defines an action performed by the host computer when a matching device is attached: give it up to the host OS (<i>Ignore</i>) or grab it for later usage by virtual machines (<i>Hold</i>).</source>
-        <translation type="obsolete">កំណត់​សកម្មភាព​ដែល​បាន​អនុវត្ត​ដោយ​កុំព្យូទ័រ នៅពេល​ផ្គូផ្គង​ឧបករណ៍​ដែល​ត្រូវ​បាន​ភ្ជាប់ ៖ ផ្ដល់​វា​ទៅ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន (<i>មិនអើពើ</i>) ឬ​ចាប់យក​វា​សម្រាប់​ប្រើ​ពេលក្រោយ ដោយ​ម៉ាស៊ីន​និម្មិត <i>រង់ចាំ</i>) ។</translation>
+        <translation type="obsolete">កំណត់​សកម្មភាព​ដែល​បាន​អនុវត្ត​ដោយ​កុំព្យូទ័រ នៅពេល​ផ្គូផ្គង​ឧបករណ៍​ដែល​ត្រូវ​បាន​ភ្ជាប់ ៖ ផ្ដល់​វា​ទៅ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន (<i>មិនអើពើ</i>) ឬ​ចាប់យក​វា​សម្រាប់​ប្រើ​ពេលក្រោយ ដោយ​ម៉ាស៊ីន​និម្មិត <i>រង់ចាំ</i>) ។</translation>
     </message>
     <message>
         <source>USB Filter Details</source>
@@ -6439,7 +6418,7 @@ network adapter name</comment>
     <name>UIMachineWindowNormal</name>
     <message>
         <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source>
-        <translation>បង្ហាញ​គ្រាប់ចុច​ម៉ាស៊ីន​ដែលបានផ្ដល់​បច្ចុប្បន្ន ។<br>គ្រាប់ចុច​នេះ នៅពេល​ចុច​យូរ បិទ/បើក​ក្ដារចុច ហើយ​ស្ថានភាព​ចាប់យក​កណ្ដុរ ។ វា​អាច​ត្រូវ​បាន​ប្រើ​ក្នុង​បន្សំ​ជា​មួយ​គ្រាប់ចុច​ផ្សេង ដើម្បី​អនុវត្ត​សកម្មភាព​យ៉ាង​លឿន ពី​ម៉ឺនុយ​ចម្បង ។</translation>
+        <translation>បង្ហាញ​គ្រាប់ចុច​ម៉ាស៊ីន​ដែលបានផ្ដល់​បច្ចុប្បន្ន ។<br>គ្រាប់ចុច​នេះ នៅពេល​ចុច​យូរ បិទ/បើក​ក្ដារចុច ហើយ​ស្ថានភាព​ចាប់យក​កណ្ដុរ ។ វា​អាច​ត្រូវ​បាន​ប្រើ​ក្នុង​បន្សំ​ជា​មួយ​គ្រាប់ចុច​ផ្សេង ដើម្បី​អនុវត្ត​សកម្មភាព​យ៉ាង​លឿន ពី​ម៉ឺនុយ​ចម្បង ។</translation>
     </message>
 </context>
 <context>
@@ -6491,14 +6470,14 @@ network adapter name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">បិទ</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">ប្ដូរ</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">បិទ</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6537,123 +6516,123 @@ network adapter name</comment>
     </message>
     <message>
         <source>Failed to open <tt>%1</tt>. Make sure your desktop environment can properly handle URLs of this type.</source>
-        <translation>បានបរាជ័យ​ក្នុងការ​បើក <tt>%1</tt> ។ ប្រាកដ​ថា​បរិស្ថាន​ផ្ទៃតុ​របស់​អ្នក​អាច​គ្រប់គ្រង URLs នៃ​ប្រភេទ​នេះ​យ៉ាង​ត្រឹមត្រូវ ។</translation>
+        <translation>បានបរាជ័យ​ក្នុងការ​បើក <tt>%1</tt> ។ ប្រាកដ​ថា​បរិស្ថាន​ផ្ទៃតុ​របស់​អ្នក​អាច​គ្រប់គ្រង URLs នៃ​ប្រភេទ​នេះ​យ៉ាង​ត្រឹមត្រូវ ។</translation>
     </message>
     <message>
         <source><p>Failed to initialize COM or to find the VirtualBox COM server. Most likely, the VirtualBox server is not running or failed to start.</p><p>The application will now terminate.</p></source>
-        <translation><p>បានបរាជ័យ​ក្នុងកា​រចាប់ផ្ដើម COM ឬ​រកម៉ាស៊ីនបម្រើ VirtualBox COM ។ ភាគ​ច្រើន​ម៉ាស៊ីនបម្រើ VirtualBox មិន​រត់​ ឬ​បរាជ័យ​ក្នុងកា​រចាប់ផ្ដើម ។</p><p>កម្មវិធី​នឹង​បិទ​ឥឡូវ ។</p></translation>
+        <translation><p>បានបរាជ័យ​ក្នុងកា​រចាប់ផ្ដើម COM ឬ​រកម៉ាស៊ីនបម្រើ VirtualBox COM ។ ភាគ​ច្រើន​ម៉ាស៊ីនបម្រើ VirtualBox មិន​រត់​ ឬ​បរាជ័យ​ក្នុងកា​រចាប់ផ្ដើម ។</p><p>កម្មវិធី​នឹង​បិទ​ឥឡូវ ។</p></translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBox COM object.</p><p>The application will now terminate.</p></source>
-        <translation type="obsolete"><p>បានបរាជ័យ​ក្នុងកា​របង្កើត​វត្ថុ VirtualBox COM ។</p><p>កម្មវិធី​នឹង​បិទ​ឥឡូវ​នេះ ។</p></translation>
+        <translation type="obsolete"><p>បានបរាជ័យ​ក្នុងកា​របង្កើត​វត្ថុ VirtualBox COM ។</p><p>កម្មវិធី​នឹង​បិទ​ឥឡូវ​នេះ ។</p></translation>
     </message>
     <message>
         <source>Failed to set global VirtualBox properties.</source>
-        <translation>បាន​បរាជ័យ​ក្នុង​ការ​កំណត់លក្ខណៈសម្បត្តិរបស់ VirtualBox ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុង​ការ​កំណត់លក្ខណៈសម្បត្តិរបស់ VirtualBox ។</translation>
     </message>
     <message>
         <source>Failed to access the USB subsystem.</source>
-        <translation>បាន​បរាជ័យ​ក្នុង​ការ​​ចូលដំណើរការ​ប្រព័ន្ធ​រង​របស់ USB ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុង​ការ​​ចូលដំណើរការ​ប្រព័ន្ធ​រង​របស់ USB ។</translation>
     </message>
     <message>
         <source>Failed to create a new virtual machine.</source>
-        <translation>បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ម៉ាស៊ីន​និម្មិត​ថ្មី ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ម៉ាស៊ីន​និម្មិត​ថ្មី ។</translation>
     </message>
     <message>
         <source>Failed to create a new virtual machine <b>%1</b>.</source>
-        <translation type="obsolete">បានបរាជ័យ​ក្នុងការ​បង្កើត​ម៉ាស៊ីន​និម្មិត​ថ្មី <b>%1</b> ។</translation>
+        <translation type="obsolete">បានបរាជ័យ​ក្នុងការ​បង្កើត​ម៉ាស៊ីន​និម្មិត​ថ្មី <b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to apply the settings to the virtual machine <b>%1</b>.</source>
-        <translation type="obsolete">បានបរាជ័យ​ក្នុងការ​អនុវត្ត​ការ​កំណត់ទៅ​កាន់​ម៉ាស៊ីន​និម្មិត​ថ្មី <b>%1</b> ។</translation>
+        <translation type="obsolete">បានបរាជ័យ​ក្នុងការ​អនុវត្ត​ការ​កំណត់ទៅ​កាន់​ម៉ាស៊ីន​និម្មិត​ថ្មី <b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to start the virtual machine <b>%1</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងការ​ចាប់ផ្ដើម​ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងការ​ចាប់ផ្ដើម​ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to pause the execution of the virtual machine <b>%1</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុង​កា​រផ្អាក​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុង​កា​រផ្អាក​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to resume the execution of the virtual machine <b>%1</b>.</source>
-        <translation>បានបរាជ័យ​ក្នុងការ​បន្ត​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
+        <translation>បានបរាជ័យ​ក្នុងការ​បន្ត​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to save the state of the virtual machine <b>%1</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងកា​ររក្សាទុក​ស្ថានភាព​របស់​ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងកា​ររក្សាទុក​ស្ថានភាព​របស់​ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to create a snapshot of the virtual machine <b>%1</b>.</source>
-        <translation>បានបរាជ័យ​ក្នុងការ​បង្កើត​រូបថត​អេក្រង់​របស់ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
+        <translation>បានបរាជ័យ​ក្នុងការ​បង្កើត​រូបថត​អេក្រង់​របស់ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to stop the virtual machine <b>%1</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងការ​បញ្ឈប់​ម៉ាស៊ីននិម្មិត <b>%1</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងការ​បញ្ឈប់​ម៉ាស៊ីននិម្មិត <b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to remove the virtual machine <b>%1</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងកា​រយក​ម៉ាស៊ីន​និម្មិត​ចេញ <b>%1</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងកា​រយក​ម៉ាស៊ីន​និម្មិត​ចេញ <b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to discard the saved state of the virtual machine <b>%1</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងការ​បោះបង់​ស្ថានភាព​របស់​ម៉ាស៊ីន​និម្មិត​ដែលបាន​រក្សាទុក <b>%1</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងការ​បោះបង់​ស្ថានភាព​របស់​ម៉ាស៊ីន​និម្មិត​ដែលបាន​រក្សាទុក <b>%1</b> ។</translation>
     </message>
     <message>
         <source>There is no virtual machine named <b>%1</b>.</source>
-        <translation>គ្មាន​ម៉ាស៊ីន​និម្មិត​ដែល​មាន​ឈ្មោះ <b>%1</b> នោះ​ទេ ។</translation>
+        <translation>គ្មាន​ម៉ាស៊ីន​និម្មិត​ដែល​មាន​ឈ្មោះ <b>%1</b> នោះ​ទេ ។</translation>
     </message>
     <message>
         <source><p>Are you sure you want to permanently delete the virtual machine <b>%1</b>?</p><p>This operation cannot be undone.</p></source>
-        <translation type="obsolete"><p>តើអ្នក​ប្រាកដ​ជា​ចង់​លុប​ម៉ាស៊ីន​និម្មិត <b>%1</b> ជា​អចិន្ត្រៃយ៍​ឬ ?</p><p>ប្រតិបត្តិការ​នេះ​មិនអាច​ត្រូវ​បាន​ធ្វើ​វិញ​ទេ ។</p></translation>
+        <translation type="obsolete"><p>តើអ្នក​ប្រាកដ​ជា​ចង់​លុប​ម៉ាស៊ីន​និម្មិត <b>%1</b> ជា​អចិន្ត្រៃយ៍​ឬ ?</p><p>ប្រតិបត្តិការ​នេះ​មិនអាច​ត្រូវ​បាន​ធ្វើ​វិញ​ទេ ។</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to unregister the inaccessible virtual machine <b>%1</b>?</p><p>You will not be able to register it again from GUI.</p></source>
-        <translation type="obsolete"><p>តើ​អ្នក​ប្រាកដ​ជា​ចង់​លុប​ឈ្មោះ​ម៉ាស៊ីននិម្មិត <b>%1</b>​ដែល​មិនអាច​ចូលដំណើរការ​បាន​​ដែរឬទេ?</p><p>អ្នក​នឹង​មិនអាច​ចុះឈ្មោះ​វា​បានទៀតទេ​ពី GUI ។</p></translation>
+        <translation type="obsolete"><p>តើ​អ្នក​ប្រាកដ​ជា​ចង់​លុប​ឈ្មោះ​ម៉ាស៊ីននិម្មិត <b>%1</b>​ដែល​មិនអាច​ចូលដំណើរការ​បាន​​ដែរឬទេ?</p><p>អ្នក​នឹង​មិនអាច​ចុះឈ្មោះ​វា​បានទៀតទេ​ពី GUI ។</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to discard the saved state of the virtual machine <b>%1</b>?</p><p>This operation is equivalent to resetting or powering off the machine without doing a proper shutdown of the guest OS.</p></source>
-        <translation type="obsolete"><p>តើ​អ្នក​ប្រាកដ​ជា​ចង់​បោះបង់​ស្ថានភាព​ដែលបានរក្សាទុក​របស់ម៉ាស៊ីន​និម្មិត <b>%1</b>ដែរឬទេ ?</p><p>ប្រតិបត្តិការ​នេះ​មិន​ស្មើ​នឹង​កា​រកំណត់​ឡើង​វិញ ឬ​បិទ​ម៉ាស៊ីន​​ដោ​​យ​មិន​បានចុច​ប៊ូតុង​ដោយ​សមរម្យ​តាម​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ។</p></translation>
+        <translation type="obsolete"><p>តើ​អ្នក​ប្រាកដ​ជា​ចង់​បោះបង់​ស្ថានភាព​ដែលបានរក្សាទុក​របស់ម៉ាស៊ីន​និម្មិត <b>%1</b>ដែរឬទេ ?</p><p>ប្រតិបត្តិការ​នេះ​មិន​ស្មើ​នឹង​កា​រកំណត់​ឡើង​វិញ ឬ​បិទ​ម៉ាស៊ីន​​ដោ​​យ​មិន​បានចុច​ប៊ូតុង​ដោយ​សមរម្យ​តាម​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ។</p></translation>
     </message>
     <message>
         <source>Failed to create a new session.</source>
-        <translation>បានបរាជ័យ​ក្នុងការ​បង្កើត​សម័យ​ថ្មី ។</translation>
+        <translation>បានបរាជ័យ​ក្នុងការ​បង្កើត​សម័យ​ថ្មី ។</translation>
     </message>
     <message>
         <source>Failed to open a session for the virtual machine <b>%1</b>.</source>
-        <translation>បានបរាជ័យ​ក្នុងកា​របើក​សម័យ​សម្រាប់​ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
+        <translation>បានបរាជ័យ​ក្នុងកា​របើក​សម័យ​សម្រាប់​ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to remove the host network interface <b>%1</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងការ​យក​ចំណុច​ប្រទាក់​បណ្ដាញ​ម៉ាស៊ីន​ <b>%1</b> ចេញ ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងការ​យក​ចំណុច​ប្រទាក់​បណ្ដាញ​ម៉ាស៊ីន​ <b>%1</b> ចេញ ។</translation>
     </message>
     <message>
         <source>Failed to attach the USB device <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងកា​រភ្ជាប់​ឧបករណ៍ USB <b>%1</b> ទៅ​ម៉ាស៊ីន​និម្មិត <b>%2</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងកា​រភ្ជាប់​ឧបករណ៍ USB <b>%1</b> ទៅ​ម៉ាស៊ីន​និម្មិត <b>%2</b> ។</translation>
     </message>
     <message>
         <source>Failed to detach the USB device <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation>បាន​ប​រាជ័យ​ក្នុងការ​ផ្ដាច់​ឧបករណ៍ USB <b>%1</b> ពី​ម៉ាស៊ីន​និម្មិត <b>%2</b> ។</translation>
+        <translation>បាន​ប​រាជ័យ​ក្នុងការ​ផ្ដាច់​ឧបករណ៍ USB <b>%1</b> ពី​ម៉ាស៊ីន​និម្មិត <b>%2</b> ។</translation>
     </message>
     <message>
         <source>Failed to create the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) for the virtual machine <b>%3</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងកា​របង្កើត​ថត <b>%1</b> (ចង្អុល​ទៅ​ <nobr><b>%2</b></nobr>) សម្រាប់​ម៉ាស៊ីន​និម្មិត <b>%3</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងកា​របង្កើត​ថត <b>%1</b> (ចង្អុល​ទៅ​ <nobr><b>%2</b></nobr>) សម្រាប់​ម៉ាស៊ីន​និម្មិត <b>%3</b> ។</translation>
     </message>
     <message>
         <source>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</source>
-        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងកា​រយក​ថត​ដែល​បាន​ចែករំលែក​ចេញ <b>%1</b> (ចង្អុល​ទៅ <nobr><b>%2</b></nobr>) ពី​ម៉ាស៊ីន​និម្មិត <b>%3</b> ។</translation>
+        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងកា​រយក​ថត​ដែល​បាន​ចែករំលែក​ចេញ <b>%1</b> (ចង្អុល​ទៅ <nobr><b>%2</b></nobr>) ពី​ម៉ាស៊ីន​និម្មិត <b>%3</b> ។</translation>
     </message>
     <message>
         <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source>
-        <translation><p>ម៉ាស៊ីន​និម្មិត​រាយការណ៍​ថា​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​មិន​គាំទ្រទេ ។ <b>ការ​រួម​បញ្ចូល​ទ្រនិច​កណ្ដុរ</b> នៅ​ក្នុង​របៀប​វីដេអូ​បច្ចុប្បន្ន ។ អ្នក​ត្រូវតែ​ចាប់យក​កណ្ដុរ (ដោយ​ចុច​លើ​ការ​បង្ហាញ VM ឬ​ចុច​គ្រាប់ចុច​លើ​ម៉ាស៊ីន) ដើម្បី​ប្រើ​កណ្ដុរ​ខាង​ក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ។</p></translation>
+        <translation><p>ម៉ាស៊ីន​និម្មិត​រាយការណ៍​ថា​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​មិន​គាំទ្រទេ ។ <b>ការ​រួម​បញ្ចូល​ទ្រនិច​កណ្ដុរ</b> នៅ​ក្នុង​របៀប​វីដេអូ​បច្ចុប្បន្ន ។ អ្នក​ត្រូវតែ​ចាប់យក​កណ្ដុរ (ដោយ​ចុច​លើ​ការ​បង្ហាញ VM ឬ​ចុច​គ្រាប់ចុច​លើ​ម៉ាស៊ីន) ដើម្បី​ប្រើ​កណ្ដុរ​ខាង​ក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ។</p></translation>
     </message>
     <message>
         <source><p>The Virtual Machine is currently in the <b>Paused</b> state and not able to see any keyboard or mouse input. If you want to continue to work inside the VM, you need to resume it by selecting the corresponding action from the menu bar.</p></source>
-        <translation><p>ម៉ាស៊ីន​និម្មិត​បច្ចុប្បន្ន​ស្ថិត​ក្នុង​ស្ថានភាព <b>បាន​ផ្អាក</b> ហើយ​ដូច្នេះ​មិន​ទទួល​​ក្ដារចុច​ ឬ​កណ្ដុរ​ណា​មួយ ។ ប្រសិន​បើ​អ្នក​ចង់​បន្ត​ដំណើរការ​ខាង​ក្នុង VM អ្នក​ត្រូវ​តែ​បន្តវា ដោយ​ជ្រើស​សកម្មភាព​ដែល​ទាក់ទង​ពីរបារ​ម៉ឺនុយ ។</p></translation>
+        <translation><p>ម៉ាស៊ីន​និម្មិត​បច្ចុប្បន្ន​ស្ថិត​ក្នុង​ស្ថានភាព <b>បាន​ផ្អាក</b> ហើយ​ដូច្នេះ​មិន​ទទួល​​ក្ដារចុច​ ឬ​កណ្ដុរ​ណា​មួយ ។ ប្រសិន​បើ​អ្នក​ចង់​បន្ត​ដំណើរការ​ខាង​ក្នុង VM អ្នក​ត្រូវ​តែ​បន្តវា ដោយ​ជ្រើស​សកម្មភាព​ដែល​ទាក់ទង​ពីរបារ​ម៉ឺនុយ ។</p></translation>
     </message>
     <message>
         <source><p>Cannot run VirtualBox in <i>VM Selector</i> mode due to local restrictions.</p><p>The application will now terminate.</p></source>
-        <translation type="obsolete"><p>មិន​អាច​រត់ VirtualBox នៅ​ក្នុងរបៀប <i>កម្មវិធី​ជ្រើស VM​</i> ដោយសារ​តែ​ការ​ដាក់កម្រិត​មូលដ្ឋាន ។</p><p>កម្មវិធី​នឹង​បញ្ចប់​ឥឡូវ ។</p></translation>
+        <translation type="obsolete"><p>មិន​អាច​រត់ VirtualBox នៅ​ក្នុងរបៀប <i>កម្មវិធី​ជ្រើស VM​</i> ដោយសារ​តែ​ការ​ដាក់កម្រិត​មូលដ្ឋាន ។</p><p>កម្មវិធី​នឹង​បញ្ចប់​ឥឡូវ ។</p></translation>
     </message>
     <message>
         <source><nobr>Fatal Error</nobr></source>
@@ -6673,85 +6652,85 @@ network adapter name</comment>
     <message>
         <source><nobr>Error ID: </nobr></source>
         <comment>runtime error info</comment>
-        <translation><nobr>លេខសម្គាល់​កំហុស ៖</nobr></translation>
+        <translation><nobr>លេខសម្គាល់​កំហុស ៖</nobr></translation>
     </message>
     <message>
         <source>Severity: </source>
         <comment>runtime error info</comment>
-        <translation>ភាព​ម៉ឺងម៉ាត់ ៖</translation>
+        <translation>ភាព​ម៉ឺងម៉ាត់ ៖</translation>
     </message>
     <message>
         <source><p>A fatal error has occurred during virtual machine execution! The virtual machine will be powered off. Please copy the following error message using the clipboard to help diagnose the problem:</p></source>
-        <translation><p>កំហុស​ធ្ងន់ធ្ងរ​មានកើត​ឡើង​កំឡុង​ពេល​ប្រតិបត្តិ​ម៉ាស៊ីន​និម្មិត ! ម៉ាស៊ីន​និម្មិត​នឹង​ត្រូវ​បាន​បិទ ។ វា​ត្រូ​វបាន​ស្នើ​ឲ្យ​ប្រើ​ក្ដារតម្បៀតខ្ទាស់​ដើម្បី​ចម្លង​សារ​កំហុស​ដើម្បីពិនិត្យ​មើល​បន្ថែម​ទេ ៖</p></translation>
+        <translation><p>កំហុស​ធ្ងន់ធ្ងរ​មានកើត​ឡើង​កំឡុង​ពេល​ប្រតិបត្តិ​ម៉ាស៊ីន​និម្មិត ! ម៉ាស៊ីន​និម្មិត​នឹង​ត្រូវ​បាន​បិទ ។ វា​ត្រូ​វបាន​ស្នើ​ឲ្យ​ប្រើ​ក្ដារតម្បៀតខ្ទាស់​ដើម្បី​ចម្លង​សារ​កំហុស​ដើម្បីពិនិត្យ​មើល​បន្ថែម​ទេ ៖</p></translation>
     </message>
     <message>
         <source><p>An error has occurred during virtual machine execution! The error details are shown below. You may try to correct the error and resume the virtual machine execution.</p></source>
-        <translation><p>កំហុស​បានកើត​ឡើង​កំឡុង​ពេល​ប្រតិបត្តិ​ម៉ាស៊ីន​និម្មិត ! សេចក្ដី​លម្អិត​កំហុស​ត្រូវ​បានបង្ហាញ​ខាង​ក្រោម ។ អ្នកអាច​ព្យាយាម​កែ​កំហុស​ដែល​ពិពណ៌នា ហើយ​បន្ត​ប្រតិបត្តិ​ម៉ាស៊ីន​និម្មិត ។</p></translation>
+        <translation><p>កំហុស​បានកើត​ឡើង​កំឡុង​ពេល​ប្រតិបត្តិ​ម៉ាស៊ីន​និម្មិត ! សេចក្ដី​លម្អិត​កំហុស​ត្រូវ​បានបង្ហាញ​ខាង​ក្រោម ។ អ្នកអាច​ព្យាយាម​កែ​កំហុស​ដែល​ពិពណ៌នា ហើយ​បន្ត​ប្រតិបត្តិ​ម៉ាស៊ីន​និម្មិត ។</p></translation>
     </message>
     <message>
         <source><p>The virtual machine execution may run into an error condition as described below. We suggest that you take an appropriate action to avert the error.</p></source>
-        <translation><p>ការ​ប្រតិបត្តិ​ម៉ាស៊ីន​និម្មិត​អាច​រត់​ក្នុង​លក្ខខណ្ឌ​មាន​កំហុស​ដូច​បាន​ពិពណ៌នា​ខាង​ក្រោម ។ អ្នក​អាច​មិនអើពើ​សារ​នេះ​បាន ប៉ុន្តែ​វា​ត្រូវ​បាន​ស្នើ​ឲ្យ​អនុវត្ត​សកម្មភាព​ដែល​សមរម្យ ដើម្បីប្រាកដ​ថា​សារ​ដែលបានពិពណ៌នា​មិន​កើតឡើង​ទេ ។</p></translation>
+        <translation><p>ការ​ប្រតិបត្តិ​ម៉ាស៊ីន​និម្មិត​អាច​រត់​ក្នុង​លក្ខខណ្ឌ​មាន​កំហុស​ដូច​បាន​ពិពណ៌នា​ខាង​ក្រោម ។ អ្នក​អាច​មិនអើពើ​សារ​នេះ​បាន ប៉ុន្តែ​វា​ត្រូវ​បាន​ស្នើ​ឲ្យ​អនុវត្ត​សកម្មភាព​ដែល​សមរម្យ ដើម្បីប្រាកដ​ថា​សារ​ដែលបានពិពណ៌នា​មិន​កើតឡើង​ទេ ។</p></translation>
     </message>
     <message>
         <source>Result&nbsp;Code: </source>
         <comment>error info</comment>
-        <translation>កូដ​&nbsp;លទ្ធផល ៖</translation>
+        <translation>កូដ​&nbsp;លទ្ធផល ៖</translation>
     </message>
     <message>
         <source>Component: </source>
         <comment>error info</comment>
-        <translation>សមាសភាគ ៖</translation>
+        <translation>សមាសភាគ ៖</translation>
     </message>
     <message>
         <source>Interface: </source>
         <comment>error info</comment>
-        <translation>ចំណុច​ប្រទាក់ ៖</translation>
+        <translation>ចំណុច​ប្រទាក់ ៖</translation>
     </message>
     <message>
         <source>Callee: </source>
         <comment>error info</comment>
-        <translation>Callee ៖ </translation>
+        <translation>Callee ៖ </translation>
     </message>
     <message>
         <source>Callee&nbsp;RC: </source>
         <comment>error info</comment>
-        <translation>Callee&nbsp;RC ៖ </translation>
+        <translation>Callee&nbsp;RC ៖ </translation>
     </message>
     <message>
         <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="obsolete"><p>រក​មិន​ឃើញ​​ឯកសារ​ភាសា​សម្រាប់​ភាសា <b>%1</b> នៅ​ក្នុង <b><nobr>%2</nobr></b>ទេ ។</p><p>ភាសា​នឹង​ត្រូវ​បានកំណត់​ឡើង​វិញជា​បណ្ដោះអាសន្ន​ទៅ​ភាសា​លំនាំដើម​របស់​ប្រព័ន្ធ ។ សូម​ចូល​ទៅ​ប្រអប់ <b>ចំណូលចិត្ត</b> ដែល​អ្នក​អាច​បើក​ពី​ម៉ឺនុយ <b>ឯកសារ</b> នៃ​បង្អួច​ VirtualBox មេ ហើយ​ជ្រើស​ភាសា​មួយ​ក្នុង​ចំណោម​ភាសា​ដែល​មាន​នៅ​លើ​ទំព័រ <b>ភាសា</b> ។</p></translation>
+        <translation type="obsolete"><p>រក​មិន​ឃើញ​​ឯកសារ​ភាសា​សម្រាប់​ភាសា <b>%1</b> នៅ​ក្នុង <b><nobr>%2</nobr></b>ទេ ។</p><p>ភាសា​នឹង​ត្រូវ​បានកំណត់​ឡើង​វិញជា​បណ្ដោះអាសន្ន​ទៅ​ភាសា​លំនាំដើម​របស់​ប្រព័ន្ធ ។ សូម​ចូល​ទៅ​ប្រអប់ <b>ចំណូលចិត្ត</b> ដែល​អ្នក​អាច​បើក​ពី​ម៉ឺនុយ <b>ឯកសារ</b> នៃ​បង្អួច​ VirtualBox មេ ហើយ​ជ្រើស​ភាសា​មួយ​ក្នុង​ចំណោម​ភាសា​ដែល​មាន​នៅ​លើ​ទំព័រ <b>ភាសា</b> ។</p></translation>
     </message>
     <message>
         <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="obsolete"><p>មិនអាច​ផ្ទុក​ឯកសារ​ភាសា <b><nobr>%1</nobr></b> បានទេ ។ <p>ភាសា​នឹង​ត្រូវ​បានកំណត់​ទៅ​ជា​ភាសា​អង់គ្លេស​ជា​បណ្ដោះអាសន្ន ។ សូម​ចូល​ទៅ​ប្រអប់ <b>ចំណូល​ចិត្ត</b> ដែល​អ្នក​អាច​បើក​ពី​ម៉ឺនុយ​ <b>ឯកសារ</b> នៃ​បង្អួច VirtualBox មេ ហើយ​ជ្រើស​ភាសា​មួយ​ក្នុងចំណោម​ភាសា​ដែល​មាន​ស្រាប់​នៅ​លើ​ទំព័រ <b>ភាសា</b> ។</p></translation>
+        <translation type="obsolete"><p>មិនអាច​ផ្ទុក​ឯកសារ​ភាសា <b><nobr>%1</nobr></b> បានទេ ។ <p>ភាសា​នឹង​ត្រូវ​បានកំណត់​ទៅ​ជា​ភាសា​អង់គ្លេស​ជា​បណ្ដោះអាសន្ន ។ សូម​ចូល​ទៅ​ប្រអប់ <b>ចំណូល​ចិត្ត</b> ដែល​អ្នក​អាច​បើក​ពី​ម៉ឺនុយ​ <b>ឯកសារ</b> នៃ​បង្អួច VirtualBox មេ ហើយ​ជ្រើស​ភាសា​មួយ​ក្នុងចំណោម​ភាសា​ដែល​មាន​ស្រាប់​នៅ​លើ​ទំព័រ <b>ភាសា</b> ។</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
-        <translation type="obsolete"><p>ផ្នែក​បន្ថែម​ភាសា​ភ្ញៀវ​របស់ VirtualBox បាន​ដំឡើង​នៅ​ក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ចាស់​ពេក ៖ កំណែ​ដែល​បាន​ដំឡើង​គឺ %1 កំណែ​ដែល​រំពឹង​ទុកគឺ %2 ។ លក្ខណៈពិសេស​មួយ​ចំនួន​ត្រូវការ​ផ្នែកបន្ថែម​របស់​ម៉ាស៊ីន​ភ្ញៀវ (ការ​រួម​បញ្ចូល​កណ្ដុរ បង្ហាញ​ការ​ផ្លាស់ប្ដូរ​ទំហំ​ដោយ​ស្វ័យ​ប្រវត្តិ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) នឹង​បញ្ឈប់​ដំណើរការ​យ៉ាង​ត្រឹមត្រូវ ។</p><p>សូម​ធ្វើ​ឲ្យ​ផ្នែក​បន្ថែម​របស់ម៉ាស៊ីន​ភ្ញៀវ​ទាន់សម័យ​ទៅ​កំណែ​បច្ចុប្បន្ន​ ដ [...]
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
+        <translation type="obsolete"><p>ផ្នែក​បន្ថែម​ភាសា​ភ្ញៀវ​របស់ VirtualBox បាន​ដំឡើង​នៅ​ក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ចាស់​ពេក ៖ កំណែ​ដែល​បាន​ដំឡើង​គឺ %1 កំណែ​ដែល​រំពឹង​ទុកគឺ %2 ។ លក្ខណៈពិសេស​មួយ​ចំនួន​ត្រូវការ​ផ្នែកបន្ថែម​របស់​ម៉ាស៊ីន​ភ្ញៀវ (ការ​រួម​បញ្ចូល​កណ្ដុរ បង្ហាញ​ការ​ផ្លាស់ប្ដូរ​ទំហំ​ដោយ​ស្វ័យ​ប្រវត្តិ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) នឹង​បញ្ឈប់​ដំណើរការ​យ៉ាង​ត្រឹមត្រូវ ។</p><p>សូម​ធ្វើ​ឲ្យ​ផ្នែក​បន្ថែម​របស់ម៉ាស៊ីន​ភ្ញៀវ​ទាន់សម័យ​ទៅ​កំណែ​បច្ចុប្បន្ន​ ដ [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
-        <translation type="obsolete"><p>ផ្នែក​បន្ថែម​របស់ម៉ាស៊ីន​ភ្ញៀវ VirtualBox បានដំឡើង​នៅ​ក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​គឺ​ហួស​សម័យ​ហើយ ៖ កំណែ​ដែលបានដំឡើង​គឺ %1 កំណែ​ដែល​រំពឹង​ទុក​គឺ %2 ។ លក្ខណៈ​ពិសេស​មួយ​ចំនួន​ដែល​ត្រូវការ​ផ្នែក​បន្ថែម​របស់​ម៉ាស៊ីន​ភ្ញៀវ (ការ​រួម​បញ្ចូល​កណ្ដុរ បង្ហាញ​កា​រផ្លាស់ប្ដូរ​ទំហំ​ដោយ​ស្វ័យ​ប្រវត្តិ​របស់ម៉ាស៊ីន​ភ្ញៀវ) មិនអាច​ដំណើរការ​ដូច​ដែល​បាន​រំពឹង​ទុក​ទេ ។</p><p>វា​ត្រូ​វបានផ្ដល់​អនុសាសន៍​ឲ្យ​ធ្វើ​ឲ្យ​ផ្នែកបន្ថែម​របស់​ម៉ាស៊ី [...]
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
+        <translation type="obsolete"><p>ផ្នែក​បន្ថែម​របស់ម៉ាស៊ីន​ភ្ញៀវ VirtualBox បានដំឡើង​នៅ​ក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​គឺ​ហួស​សម័យ​ហើយ ៖ កំណែ​ដែលបានដំឡើង​គឺ %1 កំណែ​ដែល​រំពឹង​ទុក​គឺ %2 ។ លក្ខណៈ​ពិសេស​មួយ​ចំនួន​ដែល​ត្រូវការ​ផ្នែក​បន្ថែម​របស់​ម៉ាស៊ីន​ភ្ញៀវ (ការ​រួម​បញ្ចូល​កណ្ដុរ បង្ហាញ​កា​រផ្លាស់ប្ដូរ​ទំហំ​ដោយ​ស្វ័យ​ប្រវត្តិ​របស់ម៉ាស៊ីន​ភ្ញៀវ) មិនអាច​ដំណើរការ​ដូច​ដែល​បាន​រំពឹង​ទុក​ទេ ។</p><p>វា​ត្រូ​វបានផ្ដល់​អនុសាសន៍​ឲ្យ​ធ្វើ​ឲ្យ​ផ្នែកបន្ថែម​របស់​ម៉ាស៊ី [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
-        <translation type="obsolete"><p>ផ្នែក​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ​របស់ VirtualBox នៅ​ក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ថ្មីពេក​សម្រាប់​កំណែ​របស់ VirtualBox ៖ កំណែ​ដែល​បាន​ដំឡើង​គឺ %1 កំណែ​ដែល​រំពឹង​ទុក​គឺ %2 ។</p><p>កា​រប្រើកំណែ​ថ្មី​របស់​បន្ថែម​ផ្នែកបន្ថែម​ជាង​កំណែ​ចាស់​របស់ VirtualBox មិន​ត្រូវ​បានគាំទ្រទេ ។ សូម​ដំឡើង​កំណែ​បច្ចុប្បន្ន​របស់​ផ្នែកបន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ ដោយ​ជ្រើស​<b>ដំឡើង​ផ្នែក​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ</b> ពី​ម៉ឺនុយ <b>ឧបករណ៍&l [...]
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
+        <translation type="obsolete"><p>ផ្នែក​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ​របស់ VirtualBox នៅ​ក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ថ្មីពេក​សម្រាប់​កំណែ​របស់ VirtualBox ៖ កំណែ​ដែល​បាន​ដំឡើង​គឺ %1 កំណែ​ដែល​រំពឹង​ទុក​គឺ %2 ។</p><p>កា​រប្រើកំណែ​ថ្មី​របស់​បន្ថែម​ផ្នែកបន្ថែម​ជាង​កំណែ​ចាស់​របស់ VirtualBox មិន​ត្រូវ​បានគាំទ្រទេ ។ សូម​ដំឡើង​កំណែ​បច្ចុប្បន្ន​របស់​ផ្នែកបន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ ដោយ​ជ្រើស​<b>ដំឡើង​ផ្នែក​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ</b> ពី​ម៉ឺនុយ <b>ឧបករណ៍&l [...]
     </message>
     <message>
         <source>Failed to change the snapshot folder path of the virtual machine <b>%1<b> to <nobr><b>%2</b></nobr>.</source>
-        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងការ​ផ្លាស់ប្ដូរ​ផ្លូវ​ថត​រូបថត​របស់​ម៉ាស៊ីន​និម្មិត <b>%1<b> ទៅ <nobr><b>%2</b></nobr> ។</translation>
+        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងការ​ផ្លាស់ប្ដូរ​ផ្លូវ​ថត​រូបថត​របស់​ម៉ាស៊ីន​និម្មិត <b>%1<b> ទៅ <nobr><b>%2</b></nobr> ។</translation>
     </message>
     <message>
         <source><p>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</p><p>Please close all programs in the guest OS that may be using this shared folder and try again.</p></source>
-        <translation><p>បានបរាជ័យ​ក្នុងកា​រយក​ថត​ដែល​បានចែករំលែក <b>%1</b> ចេញ (ចង្អុល​ទៅ <nobr><b>%2</b></nobr>) ពី​ម៉ាស៊ីន​និម្មិត <b>%3</b> ។</p><p>សូម​បិទ​កម្មវិធី​ទាំង​អស់​នៅ​ក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន​ភ្ញៀវ​ដែល​អាច​កំពុង​ប្រើ​ថត​ដែលបានចែករំលែក​នេះ ហើយ​ព្យាយាម​ម្ដង​ទៀត ។</p></translation>
+        <translation><p>បានបរាជ័យ​ក្នុងកា​រយក​ថត​ដែល​បានចែករំលែក <b>%1</b> ចេញ (ចង្អុល​ទៅ <nobr><b>%2</b></nobr>) ពី​ម៉ាស៊ីន​និម្មិត <b>%3</b> ។</p><p>សូម​បិទ​កម្មវិធី​ទាំង​អស់​នៅ​ក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន​ភ្ញៀវ​ដែល​អាច​កំពុង​ប្រើ​ថត​ដែលបានចែករំលែក​នេះ ហើយ​ព្យាយាម​ម្ដង​ទៀត ។</p></translation>
     </message>
     <message>
         <source><p>Could not find the VirtualBox Guest Additions disk image file file <nobr><b>%1</b></nobr> or <nobr><b>%2</b>.</nobr></p><p>Do you wish to download this disk image file from the Internet?</p></source>
-        <translation type="obsolete"><p>មិនអាច​រក​​ឯកសារ​រូបភាព​ស៊ីឌី​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ​របស់ VirtualBox <nobr><b>%1</b></nobr> ឬ <nobr><b>%2</b> ។</nobr></p><p>តើអ្នក​ចង់​ទាញ​យក​រូបភាព​ស៊ីឌី​ពី​អ៊ីនធឺណិត​ដែរឬទេ ?</p></translation>
+        <translation type="obsolete"><p>មិនអាច​រក​​ឯកសារ​រូបភាព​ស៊ីឌី​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ​របស់ VirtualBox <nobr><b>%1</b></nobr> ឬ <nobr><b>%2</b> ។</nobr></p><p>តើអ្នក​ចង់​ទាញ​យក​រូបភាព​ស៊ីឌី​ពី​អ៊ីនធឺណិត​ដែរឬទេ ?</p></translation>
     </message>
     <message>
         <source><p>Failed to download the VirtualBox Guest Additions disk image file from <nobr><a href="%1">%2</a>.</nobr></p><p>%3</p></source>
-        <translation type="obsolete"><p>បាន​បរាជ័យ​ក្នុងកា​រទាញ​​​យក​រូបភាព​ស៊ីឌី​បន្ថែម​របស់ម៉ាស៊ីន​ភ្ញៀវ​របស់ VirtualBox ពី <nobr><a href="%1">%2</a> ។</nobr></p><p>%3</p></translation>
+        <translation type="obsolete"><p>បាន​បរាជ័យ​ក្នុងកា​រទាញ​​​យក​រូបភាព​ស៊ីឌី​បន្ថែម​របស់ម៉ាស៊ីន​ភ្ញៀវ​របស់ VirtualBox ពី <nobr><a href="%1">%2</a> ។</nobr></p><p>%3</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the VirtualBox Guest Additions disk image file from <nobr><a href="%1">%2</a></nobr> (size %3 bytes)?</p></source>
@@ -6759,51 +6738,51 @@ network adapter name</comment>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions disk image file has been successfully downloaded from <nobr><a href="%1">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual CD/DVD drive?</p></source>
-        <translation type="obsolete"><p>រូបភាពស៊ីឌីផ្នែក​នែក​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ VirtualBត្រូ​វបាន​ទាញយក​ដោយ​ជោគជ័យ​ពីr<nobr><a href="%1">​%2</a></nobr>bហើយ​បាន​រក្សាទុក​ក្នុង​មូលដ្ឋាន​ជា as <nobr><b>%3</b> ។</nobr></p><p>តើ​អ្នក​ចង់​ចុះឈ្មោះ​រូបភាព​ស៊ីឌី​នេះ ហើយ​ម៉ោន​វា​នៅ​លើ​ដ្រាយ​ស៊ីឌី/ឌីវីឌី​និម្មិតដែរឬទេ ?ve?</p></translation>
+        <translation type="obsolete"><p>រូបភាពស៊ីឌីផ្នែក​នែក​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ VirtualBត្រូ​វបាន​ទាញយក​ដោយ​ជោគជ័យ​ពីr<nobr><a href="%1">​%2</a></nobr>bហើយ​បាន​រក្សាទុក​ក្នុង​មូលដ្ឋាន​ជា as <nobr><b>%3</b> ។</nobr></p><p>តើ​អ្នក​ចង់​ចុះឈ្មោះ​រូបភាព​ស៊ីឌី​នេះ ហើយ​ម៉ោន​វា​នៅ​លើ​ដ្រាយ​ស៊ីឌី/ឌីវីឌី​និម្មិតដែរឬទេ ?ve?</p></translation>
     </message>
     <message>
         <source><p>The virtual machine window is optimized to work in <b>%1&nbsp;bit</b> color mode but the virtual display is currently set to <b>%2&nbsp;bit</b>.</p><p>Please open the display properties dialog of the guest OS and select a <b>%3&nbsp;bit</b> color mode, if it is available, for best possible performance of the virtual video subsystem.</p><p><b>Note</b>. Some operating systems, like  [...]
-        <translation type="obsolete"><p>បង្អួច​ម៉ាស៊ីន​និម្មិត​ត្រូវ​បានធ្វើ​ឲ្យ​ប្រសើរ​ដើម្បី​ធ្វើការ​ក្នុងរបៀប​ពណ៌ <b>%1&nbsp;ប៊ីត</b> ប៉ុន្តែ​គុណភាពពណ៌​​នៃ​ការ​បង្ហាញ​និម្មិត​បច្ចុប្បន្ន​ត្រូវ​បានកំណត់​ទៅ <b>%2&nbsp;ប៊ីត</b> ។</p><p>សូម​បើក​ប្រអប់លក្ខណៈសម្បត្តិ​បង្ហាញ​របស់​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ហើយ​ជ្រើសរបៀប​ពណ៌ <b>%3&nbsp;ប៊ីត</b> ប្រសិនបើ​មាន សម្រាប់​ការអនុវត្ត​ដ៏​ល្អ​បំផុត​របស់​ប្រព័ន្ធ​រង​វីដែអូ​ [...]
+        <translation type="obsolete"><p>បង្អួច​ម៉ាស៊ីន​និម្មិត​ត្រូវ​បានធ្វើ​ឲ្យ​ប្រសើរ​ដើម្បី​ធ្វើការ​ក្នុងរបៀប​ពណ៌ <b>%1&nbsp;ប៊ីត</b> ប៉ុន្តែ​គុណភាពពណ៌​​នៃ​ការ​បង្ហាញ​និម្មិត​បច្ចុប្បន្ន​ត្រូវ​បានកំណត់​ទៅ <b>%2&nbsp;ប៊ីត</b> ។</p><p>សូម​បើក​ប្រអប់លក្ខណៈសម្បត្តិ​បង្ហាញ​របស់​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ហើយ​ជ្រើសរបៀប​ពណ៌ <b>%3&nbsp;ប៊ីត</b> ប្រសិនបើ​មាន សម្រាប់​ការអនុវត្ត​ដ៏​ល្អ​បំផុត​របស់​ប្រព័ន្ធ​រង​វីដែអូ​ [...]
     </message>
     <message>
         <source><p>You didn't attach a hard disk to the new virtual machine. The machine will not be able to boot unless you attach a hard disk with a guest operating system or some other bootable media to it later using the machine settings window or the First Run Wizard.</p><p>Do you wish to continue?</p></source>
-        <translation type="obsolete"><p>អ្នកមិនបានភ្ជាប់​ថាសរឹង​ទៅកាន់​ម៉ាស៊ីន​និម្មិត​ថ្មីទេ ។ ម៉ាស៊ីន​នឹង​មិនអាច​ចាប់ផ្ដើម​បានទេ លុះត្រា​តែ​អ្នក​ភ្ជាប់​ថាសរឹង​ជា​មួយ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ ឬ​មេឌៀ​ចាប់ផ្ដើម​ផ្សេងៗ​មួយ​ចំនួន​ទៀត​ទៅវា​ ពេលក្រោយ​ប្រើ​ប្រអប់​កំណត់​ម៉ាស៊ីន​ ឬ​រត់​អ្នក​ជំនួយការ​សិន ។</p><p>តើអ្នក​ចង់​បន្ត​ដែរឬទេ ?</p></translation>
+        <translation type="obsolete"><p>អ្នកមិនបានភ្ជាប់​ថាសរឹង​ទៅកាន់​ម៉ាស៊ីន​និម្មិត​ថ្មីទេ ។ ម៉ាស៊ីន​នឹង​មិនអាច​ចាប់ផ្ដើម​បានទេ លុះត្រា​តែ​អ្នក​ភ្ជាប់​ថាសរឹង​ជា​មួយ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ ឬ​មេឌៀ​ចាប់ផ្ដើម​ផ្សេងៗ​មួយ​ចំនួន​ទៀត​ទៅវា​ ពេលក្រោយ​ប្រើ​ប្រអប់​កំណត់​ម៉ាស៊ីន​ ឬ​រត់​អ្នក​ជំនួយការ​សិន ។</p><p>តើអ្នក​ចង់​បន្ត​ដែរឬទេ ?</p></translation>
     </message>
     <message>
         <source>Failed to find license files in <nobr><b>%1</b></nobr>.</source>
-        <translation type="obsolete">បាន​បរាជ័យ​យក្នុងកា​ររក​ឯកសារ​អាជ្ញាបណ្ណ​នៅ​ក្នុង <nobr><b>%1</b></nobr> ។</translation>
+        <translation type="obsolete">បាន​បរាជ័យ​យក្នុងកា​ររក​ឯកសារ​អាជ្ញាបណ្ណ​នៅ​ក្នុង <nobr><b>%1</b></nobr> ។</translation>
     </message>
     <message>
         <source>Failed to open the license file <nobr><b>%1</b></nobr>. Check file permissions.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងកា​របើក​ឯកសារ​អាជ្ញាប័ណ្ណ <nobr><b>%1</b></nobr> ។ ពិនិត្យ​មើល​សិទ្ធិ​របស់​ឯកសារ ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងកា​របើក​ឯកសារ​អាជ្ញាប័ណ្ណ <nobr><b>%1</b></nobr> ។ ពិនិត្យ​មើល​សិទ្ធិ​របស់​ឯកសារ ។</translation>
     </message>
     <message>
         <source>Failed to send the ACPI Power Button press event to the virtual machine <b>%1</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងការ​ផ្ញើ​កា​រចុច​ប៊ូតុងថាមពល ACPI ទៅ​កាន់​ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងការ​ផ្ញើ​កា​រចុច​ប៊ូតុងថាមពល ACPI ទៅ​កាន់​ម៉ាស៊ីន​និម្មិត <b>%1</b> ។</translation>
     </message>
     <message>
         <source><p>Congratulations! You have been successfully registered as a user of VirtualBox.</p><p>Thank you for finding time to fill out the registration form!</p></source>
-        <translation type="obsolete"><p>សូមអបអរសាទរ ! អ្នក​បានចុះឈ្មោះ​ជា​អ្នក​ប្រើ VirtualBox ដោយ​ជោគជ័យ​ហើយ ។ </p><p>សូម​អរគុណ​ចំពោះ​ការ​ចំណាយ​ពេលវេលា​បំពេញ​សំណុំបែបបទ​ចុះឈ្មោះ !</p></translation>
+        <translation type="obsolete"><p>សូមអបអរសាទរ ! អ្នក​បានចុះឈ្មោះ​ជា​អ្នក​ប្រើ VirtualBox ដោយ​ជោគជ័យ​ហើយ ។ </p><p>សូម​អរគុណ​ចំពោះ​ការ​ចំណាយ​ពេលវេលា​បំពេញ​សំណុំបែបបទ​ចុះឈ្មោះ !</p></translation>
     </message>
     <message>
         <source><p>Failed to save the global VirtualBox settings to <b><nobr>%1</nobr></b>.</p></source>
-        <translation type="obsolete"><p>បានបរាជ័យ​ក្នុងកា​ររក្សាទុក​ការ​កំណត់ VirtualBox សកល​ទៅ​កាន់ <b><nobr>%1</nobr></b> ។</p></translation>
+        <translation type="obsolete"><p>បានបរាជ័យ​ក្នុងកា​ររក្សាទុក​ការ​កំណត់ VirtualBox សកល​ទៅ​កាន់ <b><nobr>%1</nobr></b> ។</p></translation>
     </message>
     <message>
         <source><p>Failed to load the global GUI configuration from <b><nobr>%1</nobr></b>.</p><p>The application will now terminate.</p></source>
-        <translation><p>បានបរាជ័យ​ក្នុងការ​ផ្ទុក​ការ​កំណត់​រចនាសម្ព័ន្ធ​ចំណុច​ប្រទាក់​អ្នក​ប្រើ​សកល​ពី <b><nobr>%1</nobr></b> ។</p><p>កម្មវិធី​នឹង​បិទ​ឥឡូវ ។</p></translation>
+        <translation><p>បានបរាជ័យ​ក្នុងការ​ផ្ទុក​ការ​កំណត់​រចនាសម្ព័ន្ធ​ចំណុច​ប្រទាក់​អ្នក​ប្រើ​សកល​ពី <b><nobr>%1</nobr></b> ។</p><p>កម្មវិធី​នឹង​បិទ​ឥឡូវ ។</p></translation>
     </message>
     <message>
         <source><p>Failed to save the global GUI configuration to <b><nobr>%1</nobr></b>.</p><p>The application will now terminate.</p></source>
-        <translation><p>បានបរាជ័យ​ក្នុងកា​ររក្សាទុក​ការកំណត់​រចនាសម្ព័ន្ធ​ចំណុច​ប្រទាក់​អ្នក​ប្រើសកល​ទៅ​<b><nobr>%1</nobr></b> ។</p><p>កម្មវិធី​នឹង​បិទ​ឥឡូវ ។</p></translation>
+        <translation><p>បានបរាជ័យ​ក្នុងកា​ររក្សាទុក​ការកំណត់​រចនាសម្ព័ន្ធ​ចំណុច​ប្រទាក់​អ្នក​ប្រើសកល​ទៅ​<b><nobr>%1</nobr></b> ។</p><p>កម្មវិធី​នឹង​បិទ​ឥឡូវ ។</p></translation>
     </message>
     <message>
         <source>Failed to save the settings of the virtual machine <b>%1</b> to <b><nobr>%2</nobr></b>.</source>
-        <translation>បានបរាជ័យ​ក្នុង​ការ​រក្សាទុក​ការ​កំណត់​​របស់​ម៉ាស៊ីន​និម្មិត <b>%1</b> ទៅ<b><nobr>%2</nobr></b> ។</translation>
+        <translation>បានបរាជ័យ​ក្នុង​ការ​រក្សាទុក​ការ​កំណត់​​របស់​ម៉ាស៊ីន​និម្មិត <b>%1</b> ទៅ<b><nobr>%2</nobr></b> ។</translation>
     </message>
     <message>
         <source>Failed to load the settings of the virtual machine <b>%1</b> from <b><nobr>%2</nobr></b>.</source>
-        <translation type="obsolete">បានបរាជ័យ​ក្នុងកា​រផ្ទុក​កា​រកំណត់​របស់ម៉ាស៊ីន​និម្មិត <b>%1</b> ពី <b><nobr>%2</nobr></b> ។</translation>
+        <translation type="obsolete">បានបរាជ័យ​ក្នុងកា​រផ្ទុក​កា​រកំណត់​របស់ម៉ាស៊ីន​និម្មិត <b>%1</b> ពី <b><nobr>%2</nobr></b> ។</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -6831,14 +6810,14 @@ network adapter name</comment>
         <translation type="obsolete">ទាញយក</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">ម៉ោន</translation>
+        <translation type="unfinished">ម៉ោន</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
         <comment>additional message box paragraph</comment>
-        <translation><p>គ្រាប់ចុច​ម៉ាស៊ីន​បច្ចុប្បន្ន​ត្រូវ​បាន​កំណត់​ជា <b>%1</b> ។</p></translation>
+        <translation><p>គ្រាប់ចុច​ម៉ាស៊ីន​បច្ចុប្បន្ន​ត្រូវ​បាន​កំណត់​ជា <b>%1</b> ។</p></translation>
     </message>
     <message>
         <source>Capture</source>
@@ -6862,7 +6841,7 @@ network adapter name</comment>
     </message>
     <message>
         <source><p>Do you really want to reset the virtual machine?</p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
-        <translation type="obsolete"><p>តើ​អ្នក​ពិត​ជា​ចង់​កំណត់​ម៉ាស៊ីននិម្មិត​ឡើង​វិញ​ដែរឬទេ ?</p><p>នៅ​ពេល​ម៉ាស៊ីន​ត្រូវ​បាន​កំណត់​ឡើង​វិញ ទិន្នន័យ​របស់​កម្មវិធី​ដែល​មិនបានរក្សាទុកទាំង​អស់​ដែល​កំពុង​រត់​វា​នឹង​ត្រូវ​បានបាត់បង់ ។</p></translation>
+        <translation type="obsolete"><p>តើ​អ្នក​ពិត​ជា​ចង់​កំណត់​ម៉ាស៊ីននិម្មិត​ឡើង​វិញ​ដែរឬទេ ?</p><p>នៅ​ពេល​ម៉ាស៊ីន​ត្រូវ​បាន​កំណត់​ឡើង​វិញ ទិន្នន័យ​របស់​កម្មវិធី​ដែល​មិនបានរក្សាទុកទាំង​អស់​ដែល​កំពុង​រត់​វា​នឹង​ត្រូវ​បានបាត់បង់ ។</p></translation>
     </message>
     <message>
         <source>Reset</source>
@@ -6881,39 +6860,39 @@ network adapter name</comment>
     </message>
     <message>
         <source>Failed to copy file <b><nobr>%1</nobr></b> to <b><nobr>%2</nobr></b> (%3).</source>
-        <translation type="obsolete">បានបរាជ័យ​ក្នុងកា​រចម្លង​ឯកសារ <b><nobr>%1</nobr></b> ទៅ <b><nobr>%2</nobr></b> (%3) ។</translation>
+        <translation type="obsolete">បានបរាជ័យ​ក្នុងកា​រចម្លង​ឯកសារ <b><nobr>%1</nobr></b> ទៅ <b><nobr>%2</nobr></b> (%3) ។</translation>
     </message>
     <message>
         <source><p>Could not enter seamless mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p></source>
-        <translation><p>មិនអាច​ចូល​របៀប​គ្មាន​ថេរ ដោយសារ​តែ​សតិ​វីដេអូ​ម៉ាស៊ីន​ភ្ញៀវ​មិន​គ្រប់គ្រាន់ ។</p><p>អ្នក​គួរ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​និម្មិត​យ៉ាង​ហោចណាស់​មានសតិ​វីដេអូ <b>%1</b> ។</p></translation>
+        <translation><p>មិនអាច​ចូល​របៀប​គ្មាន​ថេរ ដោយសារ​តែ​សតិ​វីដេអូ​ម៉ាស៊ីន​ភ្ញៀវ​មិន​គ្រប់គ្រាន់ ។</p><p>អ្នក​គួរ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​និម្មិត​យ៉ាង​ហោចណាស់​មានសតិ​វីដេអូ <b>%1</b> ។</p></translation>
     </message>
     <message>
         <source><p>Could not switch the guest display to fullscreen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to fullscreen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="obsolete"><p>មិនអាច​ប្ដូរ​ការ​បង្ហាញ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ទៅ​របៀប​ពេញ​អេក្រង់​បានទេ ដោយសារ​តែ​សតិ​វីដេអូ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​មិន​គ្រប់គ្រាន់ ។</p><p>អ្នក​គួរ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​និម្មិត​ឲ្យ​មានសតិ​​យ៉ាង​ហោចណាស់​ <b>%1</b> នៃ​សតិ​វីដេអូ ។</p><p>ចុច​ <b>មិនអើពើ</b> ដើម្បី​ប្ដូរ​ទៅ​របៀប​ពេញអេក្រង់ ឬ​បើ​មិន​ដូច្នេះ​ទេ​ចុច <b>បោះបង់</b> ដើម្បី​បោះបង់​ប្រតិបត្តិការ ។</p></translation>
+        <translation type="obsolete"><p>មិនអាច​ប្ដូរ​ការ​បង្ហាញ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ទៅ​របៀប​ពេញ​អេក្រង់​បានទេ ដោយសារ​តែ​សតិ​វីដេអូ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​មិន​គ្រប់គ្រាន់ ។</p><p>អ្នក​គួរ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​និម្មិត​ឲ្យ​មានសតិ​​យ៉ាង​ហោចណាស់​ <b>%1</b> នៃ​សតិ​វីដេអូ ។</p><p>ចុច​ <b>មិនអើពើ</b> ដើម្បី​ប្ដូរ​ទៅ​របៀប​ពេញអេក្រង់ ឬ​បើ​មិន​ដូច្នេះ​ទេ​ចុច <b>បោះបង់</b> ដើម្បី​បោះបង់​ប្រតិបត្តិការ ។</p></translation>
     </message>
     <message>
         <source>You are already running the most recent version of VirtualBox.</source>
-        <translation>អ្នក​បាន​ដំឡើង​កំណែ VirtualBox ចុងក្រោយ​បំផុត​រួ​ចហើយ ។ សូម​​ពិនិត្យ​មើល​កំណែ​ពេលក្រោយ ។</translation>
+        <translation>អ្នក​បាន​ដំឡើង​កំណែ VirtualBox ចុងក្រោយ​បំផុត​រួ​ចហើយ ។ សូម​​ពិនិត្យ​មើល​កំណែ​ពេលក្រោយ ។</translation>
     </message>
     <message>
         <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at  [...]
-        <translation><p>អ្នក​បាន <b>ចុចកណ្ដុរ</b> ខាង​ក្នុង​ការ​បង្ហាញ​របស់​ម៉ាស៊ីន​និម្មិត ឬ​បាន​ចុច​ <b>គ្រាប់ចុច host</b> ។ វា​នឹងធ្វើ​​ឲ្យ​ម៉ាស៊ីន​និម្មិត <b>ចាប់យក</b> ទស្សន៍ទ្រនិច​កណ្ដុរ​របស់​ម៉ាស៊ីន (តែ​ក្នុងករណី​ដែល​ការ​រួម​បញ្ចូល​ទស្សន៍ទ្រនិច​បច្ចុប្បន្ន​មិន​ត្រូ​វបានគាំទ្រ​ដោយ​ប្រព័ន្ធប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ទេ ។) ហើយ​នឹង​ក្ដារចុច ដែល​នឹង​ធ្វើ​ឲ្យ​កម្មវិធី​ផ្សេងៗ​ដែល​កំពុង​រត់​ក្នុង​ម៉ាស៊ីន​របស់​​​មិនអាច​ប្រើបាន​ទេ ។</p>& [...]
+        <translation><p>អ្នក​បាន <b>ចុចកណ្ដុរ</b> ខាង​ក្នុង​ការ​បង្ហាញ​របស់​ម៉ាស៊ីន​និម្មិត ឬ​បាន​ចុច​ <b>គ្រាប់ចុច host</b> ។ វា​នឹងធ្វើ​​ឲ្យ​ម៉ាស៊ីន​និម្មិត <b>ចាប់យក</b> ទស្សន៍ទ្រនិច​កណ្ដុរ​របស់​ម៉ាស៊ីន (តែ​ក្នុងករណី​ដែល​ការ​រួម​បញ្ចូល​ទស្សន៍ទ្រនិច​បច្ចុប្បន្ន​មិន​ត្រូ​វបានគាំទ្រ​ដោយ​ប្រព័ន្ធប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ទេ ។) ហើយ​នឹង​ក្ដារចុច ដែល​នឹង​ធ្វើ​ឲ្យ​កម្មវិធី​ផ្សេងៗ​ដែល​កំពុង​រត់​ក្នុង​ម៉ាស៊ីន​របស់​​​មិនអាច​ប្រើបាន​ទេ ។</p>& [...]
     </message>
     <message>
         <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time t [...]
-        <translation><p>អ្នក​បានបើក​ជម្រើស <b>ចាប់យក​ក្ដារចុច​ដោយ​ស្វ័យ​ប្រវត្តិ</b> ។ វា​នឹង​​ធ្វើ​ឲ្យ​ម៉ាស៊ីន​និម្មិត​ <b>ចាប់យក</b> ក្ដារចុច​ដោយ​ស្វ័យ​ប្រវត្តិ​រាល់ពេល​ដែល​បង្អួច VM ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម​ ហើយ​ធ្វើ​ឲ្យ​វា​មិនអាច​ប្រើបាន​ចំពោះ​កម្មវិធី​ផ្សេងៗ​ដែល​កំពុង​រត់​ក្នុង​ម៉ាស៊ីន​របស់​អ្នក ៖ នៅពេល​ក្ដារចុច​ត្រូវ​បាន​ចាប់យក  keystrokes ទាំង អស់ (រួម​មាន​ប្រព័ន្ធ​មួយ​ដូចជា ជំនួស(Alt)-ថេប(Tab)) នឹង​ត្រូវ​បញ្ជូន​បន្ត​ទៅ​ VM ។</p><p>អ្នក​អា [...]
+        <translation><p>អ្នក​បានបើក​ជម្រើស <b>ចាប់យក​ក្ដារចុច​ដោយ​ស្វ័យ​ប្រវត្តិ</b> ។ វា​នឹង​​ធ្វើ​ឲ្យ​ម៉ាស៊ីន​និម្មិត​ <b>ចាប់យក</b> ក្ដារចុច​ដោយ​ស្វ័យ​ប្រវត្តិ​រាល់ពេល​ដែល​បង្អួច VM ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម​ ហើយ​ធ្វើ​ឲ្យ​វា​មិនអាច​ប្រើបាន​ចំពោះ​កម្មវិធី​ផ្សេងៗ​ដែល​កំពុង​រត់​ក្នុង​ម៉ាស៊ីន​របស់​អ្នក ៖ នៅពេល​ក្ដារចុច​ត្រូវ​បាន​ចាប់យក  keystrokes ទាំង អស់ (រួម​មាន​ប្រព័ន្ធ​មួយ​ដូចជា ជំនួស(Alt)-ថេប(Tab)) នឹង​ត្រូវ​បញ្ជូន​បន្ត​ទៅ​ VM ។</p><p>អ្នក​អា [...]
     </message>
     <message>
         <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the s [...]
-        <translation><p>ម៉ាស៊ីន​និម្មិត​រាយការណ៍​ថា​ប្រព័ន្ធ​ប្រតិបត្តិការ​គាំទ្រ <b>ការ​រួម​បញ្ចូល​ទស្សន៍​ទ្រនិច​កណ្ដុរ</b> ។ នេះ​មានន័យ​ថា អ្នក​មិន​ចាំបាច់ <i>ចាប់យក</i> ទស្សន៍ទ្រនិ​ច​កណ្ដុរ ដើម្បី​អាច​ប្រើ​វា​នៅ​ក្នុង​ប្រព័ន្ធប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​បានទេ -- សកម្មភាព​កណ្ដុរ​ទាំង​អស់​ដែល​អ្នក​អនុវត្ត​នៅពេល​ទស្សន៍ទ្រនិចកណ្ដុរ​នៅ​លើ​កា​របង្ហាញ​របស់​ម៉ាស៊ីន​និម្មិត ត្រូវ​បានបញ្ជូន​ដោយ​ផ្ទាល់​ទៅ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ។ ប្រសិនបើកណ្ដុរបច្ [...]
+        <translation><p>ម៉ាស៊ីន​និម្មិត​រាយការណ៍​ថា​ប្រព័ន្ធ​ប្រតិបត្តិការ​គាំទ្រ <b>ការ​រួម​បញ្ចូល​ទស្សន៍​ទ្រនិច​កណ្ដុរ</b> ។ នេះ​មានន័យ​ថា អ្នក​មិន​ចាំបាច់ <i>ចាប់យក</i> ទស្សន៍ទ្រនិ​ច​កណ្ដុរ ដើម្បី​អាច​ប្រើ​វា​នៅ​ក្នុង​ប្រព័ន្ធប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​បានទេ -- សកម្មភាព​កណ្ដុរ​ទាំង​អស់​ដែល​អ្នក​អនុវត្ត​នៅពេល​ទស្សន៍ទ្រនិចកណ្ដុរ​នៅ​លើ​កា​របង្ហាញ​របស់​ម៉ាស៊ីន​និម្មិត ត្រូវ​បានបញ្ជូន​ដោយ​ផ្ទាល់​ទៅ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ។ ប្រសិនបើកណ្ដុរបច្ [...]
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="obsolete"><p>បង្អួច​ម៉ាស៊ីន​និម្មិត​នឹង​ត្រូ​វបានប្ដូរ​ទៅ​របៀប <b>ពេញអេក្រង់</b> ឥឡូវ ។ អ្នក​អាច​ត្រឡប់ក្រោយ​​ទៅ​របៀប​បង្អួច​ នៅពេល​ណាមួយ ដោយ​ចុច <b>%1</b> ។ ចំណាំ​ថា គ្រាប់ចុច <i>ម៉ាស៊ីន</i> បច្ចុប្បន្ន​ត្រូវ​បាន​កំណត់​ជា <b>%2</b> ។</p><p>ចំណាំ​ថា របារ​ម៉ឺនុយ​មេ​​ត្រូវ​បានលាក់​ក្នុង​របៀប​ពេញអេក្រង់ ។​ អ្នក​អាច​ចូលដំណើរការ​វា​ដោយ​ចុច <b>ម៉ាស៊ីន(Host)+ដើម(Home)</b>.</p></translation>
+        <translation type="obsolete"><p>បង្អួច​ម៉ាស៊ីន​និម្មិត​នឹង​ត្រូ​វបានប្ដូរ​ទៅ​របៀប <b>ពេញអេក្រង់</b> ឥឡូវ ។ អ្នក​អាច​ត្រឡប់ក្រោយ​​ទៅ​របៀប​បង្អួច​ នៅពេល​ណាមួយ ដោយ​ចុច <b>%1</b> ។ ចំណាំ​ថា គ្រាប់ចុច <i>ម៉ាស៊ីន</i> បច្ចុប្បន្ន​ត្រូវ​បាន​កំណត់​ជា <b>%2</b> ។</p><p>ចំណាំ​ថា របារ​ម៉ឺនុយ​មេ​​ត្រូវ​បានលាក់​ក្នុង​របៀប​ពេញអេក្រង់ ។​ អ្នក​អាច​ចូលដំណើរការ​វា​ដោយ​ចុច <b>ម៉ាស៊ីន(Host)+ដើម(Home)</b>.</p></translation>
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>Seamless</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in seamless mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="obsolete"><p>បង្អួច​ម៉ាស៊ីន​និម្មិត​​នឹង​ត្រូ​វបានប្ដូរ​ទៅ​របៀប <b>គ្មាន​ថ្នេរ</b> ឥឡូវ ។ អ្នកអាច​ត្រឡប់​ទៅ​​របៀប​បង្អួច​នៅ​ពេល​ណាមួយ​ដោយចុច <b>%1</b> ។ ចំណាំ​ថា គ្រាប់ចុច <i>Host</i> បច្ចុប្បន្ន​ត្រូវ​បានកំណត់​ជា <b>%2</b> ។</p><p>ចំណាំថា របារ​ម៉ឺនុយមេ​ត្រូវ​បានលាក់​នៅ​ក្នុង​របៀប​គ្មាន​ថ្នេរ ។ អ្នកអាច​ចូលដំណើរការ​វា ដោយ​ចុច​ <b>Host+ដើម(Home)</b> ។</p></translation>
+        <translation type="obsolete"><p>បង្អួច​ម៉ាស៊ីន​និម្មិត​​នឹង​ត្រូ​វបានប្ដូរ​ទៅ​របៀប <b>គ្មាន​ថ្នេរ</b> ឥឡូវ ។ អ្នកអាច​ត្រឡប់​ទៅ​​របៀប​បង្អួច​នៅ​ពេល​ណាមួយ​ដោយចុច <b>%1</b> ។ ចំណាំ​ថា គ្រាប់ចុច <i>Host</i> បច្ចុប្បន្ន​ត្រូវ​បានកំណត់​ជា <b>%2</b> ។</p><p>ចំណាំថា របារ​ម៉ឺនុយមេ​ត្រូវ​បានលាក់​នៅ​ក្នុង​របៀប​គ្មាន​ថ្នេរ ។ អ្នកអាច​ចូលដំណើរការ​វា ដោយ​ចុច​ <b>Host+ដើម(Home)</b> ។</p></translation>
     </message>
     <message>
         <source>&Contents...</source>
@@ -6964,12 +6943,12 @@ network adapter name</comment>
         <translation type="obsolete">បង្ហាញ​ប្រអប់​ដែល​មាន​ព័ត៌មាន​ផលិតផល</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>កំណែ​ថ្មី​របស់ VirtualBox ត្រូវ​បាន​ចេញ​ផ្សាយ ! គឺ​កំណែ <b>%1</b> ដែលអាច​រក​បាន​នៅ <a href="http://www.virtualbox.org/">virtualbox.org</a> ។</p><p>អ្នក​អាច​ទាញ​យក​កំណែ​នេះ​ពី​តំណ​នេះ​ដោយ​ផ្ទាល់ ៖</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>កំណែ​ថ្មី​របស់ VirtualBox ត្រូវ​បាន​ចេញ​ផ្សាយ ! គឺ​កំណែ <b>%1</b> ដែលអាច​រក​បាន​នៅ <a href="https://www.virtualbox.org/">virtualbox.org</a> ។</p><p>អ្នក​អាច​ទាញ​យក​កំណែ​នេះ​ពី​តំណ​នេះ​ដោយ​ផ្ទាល់ ៖</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
-        <translation type="obsolete"><p>តើ​អ្នក​ប្រាកដ​ជា​ចង់​ចេញផ្សាយ %1 <nobr><b>%2</b></nobr>?</p><p>វា​នឹង​ផ្ដាច់​វា​ពី​ម៉ាស៊ីន​និម្មិត​ដូច​ខាងក្រោម ៖ <b>%3</b> ។</p></translation>
+        <translation type="obsolete"><p>តើ​អ្នក​ប្រាកដ​ជា​ចង់​ចេញផ្សាយ %1 <nobr><b>%2</b></nobr>?</p><p>វា​នឹង​ផ្ដាច់​វា​ពី​ម៉ាស៊ីន​និម្មិត​ដូច​ខាងក្រោម ៖ <b>%3</b> ។</p></translation>
     </message>
     <message>
         <source>Release</source>
@@ -6978,19 +6957,19 @@ network adapter name</comment>
     </message>
     <message>
         <source><p>Are you sure you want to remove the %1 <nobr><b>%2</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="obsolete"><p>តើអ្នក​ប្រាកដ​ជា​ចង់​យក %1 <nobr><b>%2</b></nobr> ចេញ​ពី​មេឌៀ​ដែលបាន​ស្គាល់​ដែរឬទេ ?</p></translation>
+        <translation type="obsolete"><p>តើអ្នក​ប្រាកដ​ជា​ចង់​យក %1 <nobr><b>%2</b></nobr> ចេញ​ពី​មេឌៀ​ដែលបាន​ស្គាល់​ដែរឬទេ ?</p></translation>
     </message>
     <message>
         <source>As this hard disk is inaccessible its image file can not be deleted.</source>
-        <translation type="obsolete">ចំណាំថា ថាសរឹង​នេះ​មិនអាច​ចូលដំណើរការ​បានទេ ដូច្នេះ​ឯកតា​ផ្ទុក​របស់វា​មិនអាច​ត្រូវ​បានលុប​ឥឡូវ​ទេ ។</translation>
+        <translation type="obsolete">ចំណាំថា ថាសរឹង​នេះ​មិនអាច​ចូលដំណើរការ​បានទេ ដូច្នេះ​ឯកតា​ផ្ទុក​របស់វា​មិនអាច​ត្រូវ​បានលុប​ឥឡូវ​ទេ ។</translation>
     </message>
     <message>
         <source>The next dialog will let you choose whether you also want to delete the storage unit of this hard disk or keep it for later usage.</source>
-        <translation type="obsolete">ប្រអប់​បន្ទាប់​នឹង​អនុញ្ញាត​ឲ្យ​អ្នក​ជ្រើស​ថាតើ អ្នក​ចង់​លុប​ឯកតា​ផ្ទុក​របស់​ថាសរឹង​នេះ ឬ​ទុក​វា​សម្រាប់​ប្រើ​ពេលក្រោយ ។</translation>
+        <translation type="obsolete">ប្រអប់​បន្ទាប់​នឹង​អនុញ្ញាត​ឲ្យ​អ្នក​ជ្រើស​ថាតើ អ្នក​ចង់​លុប​ឯកតា​ផ្ទុក​របស់​ថាសរឹង​នេះ ឬ​ទុក​វា​សម្រាប់​ប្រើ​ពេលក្រោយ ។</translation>
     </message>
     <message>
         <source><p>Note that the storage unit of this medium will not be deleted and that it will be possible to add it to the list later again.</p></source>
-        <translation type="obsolete"><p>ចំណាំ​ថា ឯកតា​ផ្ទុក​របស់​ឧបករណ៍​ផ្ទុក​នេះ​នឹង​មិន​ត្រូវ​បានលុប​ទេ ហើយ​ដូច្នេះ​វា​នឹង​អាច​បន្ថែម​ទៅ​កាន់​បញ្ជី​ពេល​ក្រោយ​ម្ដង​ទៀត ។</p></translation>
+        <translation type="obsolete"><p>ចំណាំ​ថា ឯកតា​ផ្ទុក​របស់​ឧបករណ៍​ផ្ទុក​នេះ​នឹង​មិន​ត្រូវ​បានលុប​ទេ ហើយ​ដូច្នេះ​វា​នឹង​អាច​បន្ថែម​ទៅ​កាន់​បញ្ជី​ពេល​ក្រោយ​ម្ដង​ទៀត ។</p></translation>
     </message>
     <message>
         <source>Remove</source>
@@ -6999,11 +6978,11 @@ network adapter name</comment>
     </message>
     <message>
         <source><p>The hard disk storage unit at location <b>%1</b> already exists. You cannot create a new virtual hard disk that uses this location because it can be already used by another virtual hard disk.</p><p>Please specify a different location.</p></source>
-        <translation><p>មាន​ឯកតា​ផ្ទុក​​របស់​ថាសរឹង​នៅ​ទីតាំង <b>%1</b> រួច​ហើយ ។ អ្នក​មិនអាច​បង្កើត​ថាសរឹង​និម្មិត​ថ្មី​បាន​ទេ ដែល​ប្រើ​ទីតាំង​នេះ ពីព្រោះ​វា​អាច​ត្រូវ​បានប្រើ​ដោយ​ថាសរឹង​និម្មិត​ផ្សេង ។</p><p>សូម​បញ្ជាក់​ទីតាំង​ផ្សេង ​។</p></translation>
+        <translation><p>មាន​ឯកតា​ផ្ទុក​​របស់​ថាសរឹង​នៅ​ទីតាំង <b>%1</b> រួច​ហើយ ។ អ្នក​មិនអាច​បង្កើត​ថាសរឹង​និម្មិត​ថ្មី​បាន​ទេ ដែល​ប្រើ​ទីតាំង​នេះ ពីព្រោះ​វា​អាច​ត្រូវ​បានប្រើ​ដោយ​ថាសរឹង​និម្មិត​ផ្សេង ។</p><p>សូម​បញ្ជាក់​ទីតាំង​ផ្សេង ​។</p></translation>
     </message>
     <message>
         <source><p>Do you want to delete the storage unit of the hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which makes it po [...]
-        <translation type="obsolete"><p>តើ​អ្នក​ចង់​លុប​ឯកតា​ផ្ទុក​របស់​ថាសរឹង​ <nobr><b>%1</b></nobr>ដែរឬទេ?</p><p>ប្រសិនបើ​អ្នក​ជ្រើស <b>លុប</b> បន្ទាប់​មក​ឯកតា​ផ្ទុក​ដែល​បានបញ្ជាក់​នឹង​ត្រូ​វបាន​លុប​ជា​អចិន្ត្រៃយ៍ ។ ប្រតិបត្តិការ​នេះ <b>មិនអាច​ត្រូ​វបាន​ធ្វើ​វិញ​បានទេ</b> ។</p><p>ប្រសិនបើ​អ្នក​ជ្រើស <b>រក្សាទុក</b> បន្ទាប់​មក​ថាសរឹង​នឹង​ត្រូវ​បានយកចេញ​តែ​ពី​បញ្ជី​របស់​ថាសរឹង​ដែល​ស្គាល់​ប៉ុណ្ណោះ ប [...]
+        <translation type="obsolete"><p>តើ​អ្នក​ចង់​លុប​ឯកតា​ផ្ទុក​របស់​ថាសរឹង​ <nobr><b>%1</b></nobr>ដែរឬទេ?</p><p>ប្រសិនបើ​អ្នក​ជ្រើស <b>លុប</b> បន្ទាប់​មក​ឯកតា​ផ្ទុក​ដែល​បានបញ្ជាក់​នឹង​ត្រូ​វបាន​លុប​ជា​អចិន្ត្រៃយ៍ ។ ប្រតិបត្តិការ​នេះ <b>មិនអាច​ត្រូ​វបាន​ធ្វើ​វិញ​បានទេ</b> ។</p><p>ប្រសិនបើ​អ្នក​ជ្រើស <b>រក្សាទុក</b> បន្ទាប់​មក​ថាសរឹង​នឹង​ត្រូវ​បានយកចេញ​តែ​ពី​បញ្ជី​របស់​ថាសរឹង​ដែល​ស្គាល់​ប៉ុណ្ណោះ ប [...]
     </message>
     <message>
         <source>Delete</source>
@@ -7017,76 +6996,76 @@ network adapter name</comment>
     </message>
     <message>
         <source>Failed to delete the storage unit of the hard disk <b>%1</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងការ​លុប​ការ​ផ្ទុក​របស់​ថាសរឹង <b>%1</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងការ​លុប​ការ​ផ្ទុក​របស់​ថាសរឹង <b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to create the hard disk storage <nobr><b>%1</b>.</nobr></source>
-        <translation>បានបរាជ័យ​ក្នុង​​ការ​បង្កើត​ការ​ផ្ទុក​ថាសរឹង <nobr><b>%1</b> ។</nobr></translation>
+        <translation>បានបរាជ័យ​ក្នុង​​ការ​បង្កើត​ការ​ផ្ទុក​ថាសរឹង <nobr><b>%1</b> ។</nobr></translation>
     </message>
     <message>
         <source>Failed to open the %1 <nobr><b>%2</b></nobr>.</source>
-        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងការ​បើក %1 <nobr><b>%2</b></nobr> ។</translation>
+        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងការ​បើក %1 <nobr><b>%2</b></nobr> ។</translation>
     </message>
     <message>
         <source>Failed to close the %1 <nobr><b>%2</b></nobr>.</source>
-        <translation type="obsolete">បានបរាជ័យ​ក្នុងកា​របិទ %1 <nobr><b>%2</b></nobr> ។</translation>
+        <translation type="obsolete">បានបរាជ័យ​ក្នុងកា​របិទ %1 <nobr><b>%2</b></nobr> ។</translation>
     </message>
     <message>
         <source>Failed to access the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation>បានបរាជ័យ​ក្នុងកា​រ​ចូលដំណើរការ​ស្ថានភាព​របស់​ឧបករណ៍​ផ្ទុក <nobr><b>%1</b></nobr> ។</translation>
+        <translation>បានបរាជ័យ​ក្នុងកា​រ​ចូលដំណើរការ​ស្ថានភាព​របស់​ឧបករណ៍​ផ្ទុក <nobr><b>%1</b></nobr> ។</translation>
     </message>
     <message>
         <source><p>Failed to connect to the VirtualBox online registration service due to the following error:</p><p><b>%1</b></p></source>
-        <translation type="obsolete"><p>បានបរាជ័យ​ក្នុងកា​រតភ្ជាប់​ទៅ​កាន់​សេវា​ចុះឈ្មោះ​លើ​បណ្ដាញ​របស់ VirtualBox ដោយ​សារ​តែ​កំហុស​ដូច​ខាងក្រោម ៖</p><p><b>%1</b></p></translation>
+        <translation type="obsolete"><p>បានបរាជ័យ​ក្នុងកា​រតភ្ជាប់​ទៅ​កាន់​សេវា​ចុះឈ្មោះ​លើ​បណ្ដាញ​របស់ VirtualBox ដោយ​សារ​តែ​កំហុស​ដូច​ខាងក្រោម ៖</p><p><b>%1</b></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following error:</p><p><b>%1</b></p></source>
-        <translation type="obsolete"><p>មិនអាច​ទទួល​យក​ព័ត៌មានកំណែ​ថ្មី​បាន​ទេ ដោយ​សារ​តែ​កំហុស​ដូច​ខាងក្រោម ៖</p><p><b>%1</b></p></translation>
+        <translation type="obsolete"><p>មិនអាច​ទទួល​យក​ព័ត៌មានកំណែ​ថ្មី​បាន​ទេ ដោយ​សារ​តែ​កំហុស​ដូច​ខាងក្រោម ៖</p><p><b>%1</b></p></translation>
     </message>
     <message>
         <source><p>One or more virtual hard disks, CD/DVD or floppy disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="obsolete"><p>ថាសរឹង​និម្មិត​មួយ ឬ​ច្រើន ស៊ីឌី/ឌីវីឌី ឬ​មេឌៀ​ថាសទន់​បច្ចុប្បន្ន​មិនអាច​ចូលដំណើរការ​បានទេ ។ ជា​លទ្ធផល អ្នកនឹង​មិនអាច​ប្រតិបត្តិ​ម៉ាស៊ីន​និម្មិត​ ដែល​ប្រើ​មេឌៀ​នេះ​បាន​ទេ រហូត​ដល់​ពួកវា​អាច​ចូលដំណើរការ​បាននៅពេល​ក្រោយ ។</p><p>ចុច <b>ពិនិត្យ​មើល</b> ដើម្បី​ប្រើ​បង្អួច​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត ហើយ​មើល​អ្វី​ដែល​មេឌៀ​មិនអាច​ចូលដំណើរការ​បាន ឬ​ចុច <b>មិនអើពើ</b> ដើម្បី​មិនអើពើ​នឹង​សារ​នេះ ។</p></translation>
+        <translation type="obsolete"><p>ថាសរឹង​និម្មិត​មួយ ឬ​ច្រើន ស៊ីឌី/ឌីវីឌី ឬ​មេឌៀ​ថាសទន់​បច្ចុប្បន្ន​មិនអាច​ចូលដំណើរការ​បានទេ ។ ជា​លទ្ធផល អ្នកនឹង​មិនអាច​ប្រតិបត្តិ​ម៉ាស៊ីន​និម្មិត​ ដែល​ប្រើ​មេឌៀ​នេះ​បាន​ទេ រហូត​ដល់​ពួកវា​អាច​ចូលដំណើរការ​បាននៅពេល​ក្រោយ ។</p><p>ចុច <b>ពិនិត្យ​មើល</b> ដើម្បី​ប្រើ​បង្អួច​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត ហើយ​មើល​អ្វី​ដែល​មេឌៀ​មិនអាច​ចូលដំណើរការ​បាន ឬ​ចុច <b>មិនអើពើ</b> ដើម្បី​មិនអើពើ​នឹង​សារ​នេះ ។</p></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>កំហុស​ធ្ងន់ធ្ងរ​បាន​កើត​ឡើង​ខណៈពេល​កំពុង​រត់​ម៉ាស៊ីននិម្មិត ហើយ​ការ​ប្រតិបត្តិ​ម៉ាស៊ីន​ត្រូ​វបានបញ្ឈប់ ។</p><p>ចំពោះ​ជំនួយ សូមមើល​ផ្នែក​សហគមន៍​នៅ​លើ <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> ឬ​កិច្ចសន្យា​គាំទ្រ​របស់​អ្នក ។ សូម​ផ្ដល់​នូវ​ខ្លឹមសារ​របស់​ឯកសារ​កំណត់ហេតុ <tt>VBox.log</tt> ហើយ​នឹង​ឯកសារ​រូបភាព <tt>VBox.png</tt> ដែល​អ្នក​អាច​រក​បាន​នៅ​ក្នុង​ថត <nobr><b&gt [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>កំហុស​ធ្ងន់ធ្ងរ​បាន​កើត​ឡើង​ខណៈពេល​កំពុង​រត់​ម៉ាស៊ីននិម្មិត ហើយ​ការ​ប្រតិបត្តិ​ម៉ាស៊ីន​ត្រូ​វបានបញ្ឈប់ ។</p><p>ចំពោះ​ជំនួយ សូមមើល​ផ្នែក​សហគមន៍​នៅ​លើ <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> ឬ​កិច្ចសន្យា​គាំទ្រ​របស់​អ្នក ។ សូម​ផ្ដល់​នូវ​ខ្លឹមសារ​របស់​ឯកសារ​កំណត់ហេតុ <tt>VBox.log</tt> ហើយ​នឹង​ឯកសារ​រូបភាព <tt>VBox.png</tt> ដែល​អ្នក​អាច​រក​បាន​នៅ​ក្នុង​ថត <nobr><b>%1</b>& [...]
     </message>
     <message>
         <source>A file named <b>%1</b> already exists. Are you sure you want to replace it?<br /><br />Replacing it will overwrite its contents.</source>
-        <translation>​មាន​ឈ្មោះ​ឯកសាររបស់​<b>%1</b>រួច​ហើយ​ ។ តើ​អ្នក​ពិត​ជាចង់​ជំនួស​វា​​ឬ ?<br /><br />​ការ​ជំនួស​វា​នឹង​សរសេរ​ជាន់​លើ​
-មាតិកា​​របស់​វា​ ។</translation>
+        <translation>​មាន​ឈ្មោះ​ឯកសាររបស់​<b>%1</b>រួច​ហើយ​ ។ តើ​អ្នក​ពិត​ជាចង់​ជំនួស​វា​​ឬ ?<br /><br />​ការ​ជំនួស​វា​នឹង​សរសេរ​ជាន់​លើ​
+មាតិកា​​របស់​វា​ ។</translation>
     </message>
     <message>
         <source>The following files already exist:<br /><br />%1<br /><br />Are you sure you want to replace them? Replacing them will overwrite their contents.</source>
-        <translation>មាន​ឯកសារ​​ជាបន្ត​បន្ទាប់​រួច​ហើយ​ ៖<br /><br />%1<br /><br />តើ​​អ្នក​ពិត​ជាចង់​ជំនួស​​​ពួកវា​ឬ ? ការ​ជំនួស​វា​នឹង​សរសេរ​ជាប់​លើ​មាតិកា​របស់វា ។</translation>
+        <translation>មាន​ឯកសារ​​ជាបន្ត​បន្ទាប់​រួច​ហើយ​ ៖<br /><br />%1<br /><br />តើ​​អ្នក​ពិត​ជាចង់​ជំនួស​​​ពួកវា​ឬ ? ការ​ជំនួស​វា​នឹង​សរសេរ​ជាប់​លើ​មាតិកា​របស់វា ។</translation>
     </message>
     <message>
         <source>Failed to remove the file <b>%1</b>.<br /><br />Please try to remove the file yourself and try again.</source>
-        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងកា​រយក​ឯកសារ <b>%1</b>ចេញ ។<br /><br />សូម​ព្យាយាម​យក​ឯកសារ​ចេញ​ដោយ​ខ្លួន​ឯង ហើយ​ព្យាយាម​ម្ដង​ទៀត ។</translation>
+        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងកា​រយក​ឯកសារ <b>%1</b>ចេញ ។<br /><br />សូម​ព្យាយាម​យក​ឯកសារ​ចេញ​ដោយ​ខ្លួន​ឯង ហើយ​ព្យាយាម​ម្ដង​ទៀត ។</translation>
     </message>
     <message>
         <source>You seem to have the USBFS filesystem mounted at /sys/bus/usb/drivers. We strongly recommend that you change this, as it is a severe mis-configuration of your system which could cause USB devices to fail in unexpected ways.</source>
-        <translation>អ្នក​ហាក់​បី​ដូច​ជា​មាន​ប្រព័ន្ធ​ឯកសារ USBFS បាន​ម៉ោន​នៅ /sys/bus/usb/drivers ។ យើ​ង​ផ្ដល់​អនុសាសន៍​ឲ្យ​ផ្លាស់ប្ដូរ​វា ព្រោះ​ថា​វា​ជា​កា​រកំណត់​រចនាសម្ព័ន្ធ​មិន​ត្រឹមត្រូវ​នៃ​ប្រព័ន្ធ​របស់​អ្នក ដែល​អាច​ធ្វើ​ឲ្យ​ឧបករណ៍ USB បរាជ័យ​​តាម​វិធី​ដែល​មិនបាន​រំពឹង​ទុក ។</translation>
+        <translation>អ្នក​ហាក់​បី​ដូច​ជា​មាន​ប្រព័ន្ធ​ឯកសារ USBFS បាន​ម៉ោន​នៅ /sys/bus/usb/drivers ។ យើ​ង​ផ្ដល់​អនុសាសន៍​ឲ្យ​ផ្លាស់ប្ដូរ​វា ព្រោះ​ថា​វា​ជា​កា​រកំណត់​រចនាសម្ព័ន្ធ​មិន​ត្រឹមត្រូវ​នៃ​ប្រព័ន្ធ​របស់​អ្នក ដែល​អាច​ធ្វើ​ឲ្យ​ឧបករណ៍ USB បរាជ័យ​​តាម​វិធី​ដែល​មិនបាន​រំពឹង​ទុក ។</translation>
     </message>
     <message>
         <source>You are running a prerelease version of VirtualBox. This version is not suitable for production use.</source>
-        <translation>អ្នក​កំពុង​ដំណើរការ​កំណែ​ចេញ​ផ្សាយ​មុន​របស់ VirtualBox ។ កំណែ​នេះ​មិន​សម​សម្រាប់​ការ​ប្រើផលិតផល​នេះ​ទេ ។</translation>
+        <translation>អ្នក​កំពុង​ដំណើរការ​កំណែ​ចេញ​ផ្សាយ​មុន​របស់ VirtualBox ។ កំណែ​នេះ​មិន​សម​សម្រាប់​ការ​ប្រើផលិតផល​នេះ​ទេ ។</translation>
     </message>
     <message>
         <source>You are running an EXPERIMENTAL build of VirtualBox. This version is not suitable for production use.</source>
-        <translation>អ្នកកំពុង​ដំណើរការ​ការ​ស្ថាបនា​ពិសោធន៍របស់ VirtualBox ។ កំណែ​នេះ​មិន​សម​សម្រាប់ការ​ប្រើ​ផលិតផល​នេះ​ទេ ។</translation>
+        <translation>អ្នកកំពុង​ដំណើរការ​ការ​ស្ថាបនា​ពិសោធន៍របស់ VirtualBox ។ កំណែ​នេះ​មិន​សម​សម្រាប់ការ​ប្រើ​ផលិតផល​នេះ​ទេ ។</translation>
     </message>
     <message>
         <source>Could not access USB on the host system, because neither the USB file system (usbfs) nor the DBus and hal services are currently available. If you wish to use host USB devices inside guest systems, you must correct this and restart VirtualBox.</source>
-        <translation type="obsolete">មិនអាច​ដំណើរការ​ USB ក្នុង​ប្រព័ន្ធ​របស់​ម៉ាស៊ីនបាន​ទេ ពីព្រោះប្រព័ន្ធ​ឯកសារ USB (usbfs) ឬ DBus និង​សេវា hal បច្ចុប្បន្ននេះអាច​ប្រើ​បាន ។ ប្រសិនបើ​អ្នក​ចង់​ប្រើ​ឧបករណ៍​ USB របស់​ម៉ាស៊ីន អ្នក​ត្រូវ​តែ​កែវា ហើយ​ចាប់ផ្ដើម VirtualBox ឡើង​វិញ ។</translation>
+        <translation type="obsolete">មិនអាច​ដំណើរការ​ USB ក្នុង​ប្រព័ន្ធ​របស់​ម៉ាស៊ីនបាន​ទេ ពីព្រោះប្រព័ន្ធ​ឯកសារ USB (usbfs) ឬ DBus និង​សេវា hal បច្ចុប្បន្ននេះអាច​ប្រើ​បាន ។ ប្រសិនបើ​អ្នក​ចង់​ប្រើ​ឧបករណ៍​ USB របស់​ម៉ាស៊ីន អ្នក​ត្រូវ​តែ​កែវា ហើយ​ចាប់ផ្ដើម VirtualBox ឡើង​វិញ ។</translation>
     </message>
     <message>
         <source>You are trying to shut down the guest with the ACPI power button. This is currently not possible because the guest does not support software shutdown.</source>
-        <translation>អ្នក​កំពុង​ព្យាយាប​បិទ​ម៉ាស៊ីន​ដោយ​ប្រើប៊ូតុង​ថាមពល ACPI  ហើយ ។ បច្ចុប្បន្ន​នេះ​មិនអាច​ប្រើបាន​ទេ ពីព្រោះ​ម៉ាស៊ីន​​មិន​គាំទ្រ​​កម្មវិធី​បិទ​​ទេ ។</translation>
+        <translation>អ្នក​កំពុង​ព្យាយាប​បិទ​ម៉ាស៊ីន​ដោយ​ប្រើប៊ូតុង​ថាមពល ACPI  ហើយ ។ បច្ចុប្បន្ន​នេះ​មិនអាច​ប្រើបាន​ទេ ពីព្រោះ​ម៉ាស៊ីន​​មិន​គាំទ្រ​​កម្មវិធី​បិទ​​ទេ ។</translation>
     </message>
     <message>
         <source><p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Your 64-bit guest will fail to detect a 64-bit CPU and will not be able to boot.</p><p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p></source>
-        <translation><p>ការ​បង្កើន​ល្បឿន​ផ្នែក​រឹង VT-x/AMD-V ត្រូវ​បានបើក ប៉ុន្តែ​មិន​ដំណើរការ​ទេ ។ ម៉ាស៊ីន​ ៦៤ ប៊ីត​របស់​អ្នក​នឹង​បរាជ័យ​ក្នុង​រក​ស៊ីភីយូ ៦៤ ប៊ីត ហើយ​មិន​អាច​ចាប់ផ្ដើម​បាន​ទេ ។</p><p>សូម​ប្រាកដ​ថា អ្នក​បានបើក VT-x/AMD-V យ៉ាង​ត្រាមត្រូវ​នៅ​ក្នុង BIOS នៃ​កុំព្យូទ័រ​របស់​អ្នក ។</p></translation>
+        <translation><p>ការ​បង្កើន​ល្បឿន​ផ្នែក​រឹង VT-x/AMD-V ត្រូវ​បានបើក ប៉ុន្តែ​មិន​ដំណើរការ​ទេ ។ ម៉ាស៊ីន​ ៦៤ ប៊ីត​របស់​អ្នក​នឹង​បរាជ័យ​ក្នុង​រក​ស៊ីភីយូ ៦៤ ប៊ីត ហើយ​មិន​អាច​ចាប់ផ្ដើម​បាន​ទេ ។</p><p>សូម​ប្រាកដ​ថា អ្នក​បានបើក VT-x/AMD-V យ៉ាង​ត្រាមត្រូវ​នៅ​ក្នុង BIOS នៃ​កុំព្យូទ័រ​របស់​អ្នក ។</p></translation>
     </message>
     <message>
         <source>Close VM</source>
@@ -7098,11 +7077,11 @@ network adapter name</comment>
     </message>
     <message>
         <source><p>VT-x/AMD-V hardware acceleration has been enabled, but is not operational. Certain guests (e.g. OS/2 and QNX) require this feature.</p><p>Please ensure that you have enabled VT-x/AMD-V properly in the BIOS of your host computer.</p></source>
-        <translation><p>ការ​បង្កើន​ល្បឿន​ផ្នែក​រឹង VT-x/AMD-V ត្រូវ​បានបើក ប៉ុន្តែ​មិន​អាច​ដំណើរការ​បាន​ទេ ។ ម៉ាស៊ីន​ជាក់លាក់ (ឧ. OS/2 និង QNX) ទាមទារ​លក្ខណៈពិសេស​នេះ ។</p><p>សូម​ប្រាកដ​ថា អ្នក​បានបើក​ VT-x/AMD-V យ៉ាង​ត្រឹមត្រូវ​នៅ​ក្នុង BIOS នៃ​​កុំព្យូទ័រ​របស់​អ្នក ។</p></translation>
+        <translation><p>ការ​បង្កើន​ល្បឿន​ផ្នែក​រឹង VT-x/AMD-V ត្រូវ​បានបើក ប៉ុន្តែ​មិន​អាច​ដំណើរការ​បាន​ទេ ។ ម៉ាស៊ីន​ជាក់លាក់ (ឧ. OS/2 និង QNX) ទាមទារ​លក្ខណៈពិសេស​នេះ ។</p><p>សូម​ប្រាកដ​ថា អ្នក​បានបើក​ VT-x/AMD-V យ៉ាង​ត្រឹមត្រូវ​នៅ​ក្នុង BIOS នៃ​​កុំព្យូទ័រ​របស់​អ្នក ។</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to restore snapshot <b>%1</b>? This will cause you to lose your current machine state, which cannot be recovered.</p></source>
-        <translation type="obsolete"><p>តើ​អ្នក​ប្រាក​ដ​ជា​ចង់​ស្ដារ​រូបថត​ <b>%1</b>ឬ ? វា​នឹង​ធ្វើ​ឲ្យ​អ្នក​បាត់បង់​ស្ថានភាព​ម៉ាស៊ីន​បច្ចុប្បន្ន​របស់​អ្នក ដែល​មិនអាច​សង្គ្រោះ​បាន​ទេ ។</p></translation>
+        <translation type="obsolete"><p>តើ​អ្នក​ប្រាក​ដ​ជា​ចង់​ស្ដារ​រូបថត​ <b>%1</b>ឬ ? វា​នឹង​ធ្វើ​ឲ្យ​អ្នក​បាត់បង់​ស្ថានភាព​ម៉ាស៊ីន​បច្ចុប្បន្ន​របស់​អ្នក ដែល​មិនអាច​សង្គ្រោះ​បាន​ទេ ។</p></translation>
     </message>
     <message>
         <source>Restore</source>
@@ -7114,7 +7093,7 @@ network adapter name</comment>
     </message>
     <message>
         <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and disk data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
-        <translation type="obsolete"><p>ការ​លុប​រូប​ថត​នឹង​បណ្តាល​ឲ្យព័ត៌​មានចេញ​​ដែល​បាន​រ​ក្សា​ទុក​ត្រូវ​បាន​បាត់​បង់​ និងការ​ផ្សាយ​​ទិន្នន័យ​ថាស​​​លើ​ឯកសារ​រូប​ភាពបី​បួន​​ដែល​ VirtualBox ត្រូវ​បានបង្កើត​ជាមួយ​គ្នា ​រូប​ថត​នឹង​ត្រូវ​បានបញ្ចូល​ចូល​​គ្នា​​ទៅ​ក្នុង​ឯកសារ​តែ​មួយ​ ។​ វាអាច​ដំណើរ​ការ​យូរ​ និង​ព័ត៌​មាន​ក្នុង​រូប​ថត​មិន​អាច​ត្រូវ​បានយកបាន​​ឡើយ ។</p></p>តើ​អ្នក​ប្រាកដ​ជា​ចង់​លុប​រូប​ថត​ដែលបាន​​ជ្រើស​<b>%1</b> ឬ ?</p></translation>
+        <translation type="obsolete"><p>ការ​លុប​រូប​ថត​នឹង​បណ្តាល​ឲ្យព័ត៌​មានចេញ​​ដែល​បាន​រ​ក្សា​ទុក​ត្រូវ​បាន​បាត់​បង់​ និងការ​ផ្សាយ​​ទិន្នន័យ​ថាស​​​លើ​ឯកសារ​រូប​ភាពបី​បួន​​ដែល​ VirtualBox ត្រូវ​បានបង្កើត​ជាមួយ​គ្នា ​រូប​ថត​នឹង​ត្រូវ​បានបញ្ចូល​ចូល​​គ្នា​​ទៅ​ក្នុង​ឯកសារ​តែ​មួយ​ ។​ វាអាច​ដំណើរ​ការ​យូរ​ និង​ព័ត៌​មាន​ក្នុង​រូប​ថត​មិន​អាច​ត្រូវ​បានយកបាន​​ឡើយ ។</p></p>តើ​អ្នក​ប្រាកដ​ជា​ចង់​លុប​រូប​ថត​ដែលបាន​​ជ្រើស​<b>%1</b> ឬ ?</p></translation>
     </message>
     <message>
         <source>Delete</source>
@@ -7126,15 +7105,15 @@ network adapter name</comment>
     </message>
     <message>
         <source>Failed to delete the snapshot <b>%1</b> of the virtual machine <b>%2</b>.</source>
-        <translation>បានបរាជ័យក្នុងការ​​​លុប​រូបថត​​<b>%1</b> របស់​​ម៉ាស៊ីន​​និម្មិត​​<b>%2</b> ។</translation>
+        <translation>បានបរាជ័យក្នុងការ​​​លុប​រូបថត​​<b>%1</b> របស់​​ម៉ាស៊ីន​​និម្មិត​​<b>%2</b> ។</translation>
     </message>
     <message>
         <source><p>There are hard disks attached to ports of the additional controller. If you disable the additional controller, all these hard disks will be automatically detached.</p><p>Are you sure you want to disable the additional controller?</p></source>
-        <translation type="obsolete"><p>មានថាស​រឹង​​ដែ​ល​ភ្ជាប់​ជា​មួយច្រក​របស់​ឧបករណ៍​បញ្ជា​បន្ថែម​ ។ ប្រ​សិន​បើ​អ្នកបិទ​​ឧបករណ៍​បញ្ជា​បន្ថែម​ គ្រប់​ថាស​រឹង​ទាំង​នេះ​នឹង​ត្រូវ​បាន​ផ្តាច់​ដោយ​ស្វ័យ​ប្រ​វត្តិ​ ។</p><p>​តើ​​អ្នក​ប្រាកដ​​ជា​​ចង់បិទ​​ឧបករណ៍​បញ្ជា​បន្ថែម​ ឬ ?</p></translation>
+        <translation type="obsolete"><p>មានថាស​រឹង​​ដែ​ល​ភ្ជាប់​ជា​មួយច្រក​របស់​ឧបករណ៍​បញ្ជា​បន្ថែម​ ។ ប្រ​សិន​បើ​អ្នកបិទ​​ឧបករណ៍​បញ្ជា​បន្ថែម​ គ្រប់​ថាស​រឹង​ទាំង​នេះ​នឹង​ត្រូវ​បាន​ផ្តាច់​ដោយ​ស្វ័យ​ប្រ​វត្តិ​ ។</p><p>​តើ​​អ្នក​ប្រាកដ​​ជា​​ចង់បិទ​​ឧបករណ៍​បញ្ជា​បន្ថែម​ ឬ ?</p></translation>
     </message>
     <message>
         <source><p>There are hard disks attached to ports of the additional controller. If you change the additional controller, all these hard disks will be automatically detached.</p><p>Are you sure you want to change the additional controller?</p></source>
-        <translation type="obsolete"><p>មាន​ថាសរឹង​ដែល​ភ្ជាប់​ជាមួយ​ច្រក​របស់​ឧបករណ៍​បញ្ជា​បន្ថែម​ ។ ប្រ​សិន​បើ​អ្នក​​ផ្លាស់​ប្តូរ​ឧបរណ៍​បញ្ញា​បន្ថែម​​ គ្រប់​ថាស​រឹង​ទាំង​នេះ​នឹង​ត្រូវ​បាន​ផ្តាច់​ដោយ​ស្វ័យ​ប្រវត្តិ​ ។​</p><p>​តើ​អ្នក​ប្រាកដជា​​ចង់​ផ្លាស់​ប្តូរ​​ឧបករណ៍​បញ្ជា​បន្ថែម​ឬ ?</p></translation>
+        <translation type="obsolete"><p>មាន​ថាសរឹង​ដែល​ភ្ជាប់​ជាមួយ​ច្រក​របស់​ឧបករណ៍​បញ្ជា​បន្ថែម​ ។ ប្រ​សិន​បើ​អ្នក​​ផ្លាស់​ប្តូរ​ឧបរណ៍​បញ្ញា​បន្ថែម​​ គ្រប់​ថាស​រឹង​ទាំង​នេះ​នឹង​ត្រូវ​បាន​ផ្តាច់​ដោយ​ស្វ័យ​ប្រវត្តិ​ ។​</p><p>​តើ​អ្នក​ប្រាកដជា​​ចង់​ផ្លាស់​ប្តូរ​​ឧបករណ៍​បញ្ជា​បន្ថែម​ឬ ?</p></translation>
     </message>
     <message>
         <source>Change</source>
@@ -7169,31 +7148,31 @@ medium</comment>
     </message>
     <message>
         <source><p>There are no unused media available for the newly created attachment.</p><p>Press the <b>Select</b> if you wish to open the <i>Virtual Media Manager</i>.</p></source>
-        <translation type="obsolete"><p>មិនមាន​មេឌៀ​មិន​បាន​ប្រើទេ សម្រាប់​ឯកសារ​ភ្ជាប់​ដែលបានបង្កើត​ថ្មី ។</p><p>ចុច <b>ជ្រើស</b> ប្រសិន​បើ​អ្នក​ចង់​បើក <i>កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត</i> ។</p></translation>
+        <translation type="obsolete"><p>មិនមាន​មេឌៀ​មិន​បាន​ប្រើទេ សម្រាប់​ឯកសារ​ភ្ជាប់​ដែលបានបង្កើត​ថ្មី ។</p><p>ចុច <b>ជ្រើស</b> ប្រសិន​បើ​អ្នក​ចង់​បើក <i>កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត</i> ។</p></translation>
     </message>
     <message>
         <source>Failed to attach the %1 to slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងការ​ភ្ជាប់ %1 ទៅ​រន្ធ <i>%2</i> របស់​ម៉ាស៊ីន<b>%3</b> ។</translation>
+        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងការ​ភ្ជាប់ %1 ទៅ​រន្ធ <i>%2</i> របស់​ម៉ាស៊ីន<b>%3</b> ។</translation>
     </message>
     <message>
         <source>Failed to detach the %1 from slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="obsolete">បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់​ %1 ពី​រន្ធ <i>%2</i> របស់​ម៉ាស៊ីន<b>%3</b> ។</translation>
+        <translation type="obsolete">បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់​ %1 ពី​រន្ធ <i>%2</i> របស់​ម៉ាស៊ីន<b>%3</b> ។</translation>
     </message>
     <message>
         <source>Unable to insert the %1 <nobr><b>%2</b></nobr> into the machine <b>%3</b>.</source>
-        <translation type="obsolete">មិនអាច​ម៉ោន %1 <nobr><b>%2</b></nobr> នៅ​លើ​ម៉ាស៊ីន <b>%3</b>បាន​ទេ ។</translation>
+        <translation type="obsolete">មិនអាច​ម៉ោន %1 <nobr><b>%2</b></nobr> នៅ​លើ​ម៉ាស៊ីន <b>%3</b>បាន​ទេ ។</translation>
     </message>
     <message>
         <source> Would you like to force mounting of this medium?</source>
-        <translation type="obsolete"> តើ​អ្នក​ចង់​បង្ខំ​ម៉ោន​ឧបករណ៍​ផ្ទុក​នេះ​ដែរឬទេ ?</translation>
+        <translation type="obsolete"> តើ​អ្នក​ចង់​បង្ខំ​ម៉ោន​ឧបករណ៍​ផ្ទុក​នេះ​ដែរឬទេ ?</translation>
     </message>
     <message>
         <source>Unable to unmount the %1 <nobr><b>%2</b></nobr> from the machine <b>%3</b>.</source>
-        <translation type="obsolete">មិនអាច​អាន់ម៉ោន​ %1 <nobr><b>%2</b></nobr> ពី​ម៉ាស៊ីន <b>%3</b> ។</translation>
+        <translation type="obsolete">មិនអាច​អាន់ម៉ោន​ %1 <nobr><b>%2</b></nobr> ពី​ម៉ាស៊ីន <b>%3</b> ។</translation>
     </message>
     <message>
         <source> Would you like to force unmounting of this medium?</source>
-        <translation type="obsolete"> តើ​អ្នក​ចង់​បង្ខំ​អាន់ម៉ោន​ឧបករណ៍​ផ្ទុក​នេះ​ដែរឬទេ ?</translation>
+        <translation type="obsolete"> តើ​អ្នក​ចង់​បង្ខំ​អាន់ម៉ោន​ឧបករណ៍​ផ្ទុក​នេះ​ដែរឬទេ ?</translation>
     </message>
     <message>
         <source>Force Unmount</source>
@@ -7201,7 +7180,7 @@ medium</comment>
     </message>
     <message>
         <source>Failed to eject the disk from the virtual drive. The drive may be locked by the guest operating system. Please check this and try again.</source>
-        <translation type="obsolete">បានបរាជ័យ​​ក្នុង​កា​រច្រាន​ថាស​ចេញ​ពី​ដ្រាយ​និម្មិត ។ ដ្រាយ​អាច​ត្រូវ​បានចាក់​សោ​ដោយ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ ។ សូម​ពិនិត្យ​មើល​វា ហើយ​ព្យាយាម​ម្ដង​ទៀត ។</translation>
+        <translation type="obsolete">បានបរាជ័យ​​ក្នុង​កា​រច្រាន​ថាស​ចេញ​ពី​ដ្រាយ​និម្មិត ។ ដ្រាយ​អាច​ត្រូវ​បានចាក់​សោ​ដោយ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ ។ សូម​ពិនិត្យ​មើល​វា ហើយ​ព្យាយាម​ម្ដង​ទៀត ។</translation>
     </message>
     <message>
         <source><p>Deleting this host-only network will remove the host-only interface this network is based on. Do you want to remove the (host-only network) interface <nobr><b>%1</b>?</nobr></p><p><b>Note:</b> this interface may be in use by one or more virtual network adapters belonging to one of your VMs. After it is removed, these adapters will no longer be usable until you correct their settings by either choosing a different in [...]
@@ -7213,19 +7192,19 @@ medium</comment>
     </message>
     <message>
         <source><p>Could not insert the VirtualBox Guest Additions installer disk image file into the virtual machine <b>%1</b>, as the machine has no CD/DVD drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
-        <translation type="obsolete"><p>មិនអាច​បញ្ចូល​រូបភាព​ស៊ីឌី​កម្មវិធី​ដំឡើង​បន្ថែម​របស់​ម៉ាស៊ីន VirtualBox ​ទៅ​ក្នុង​ម៉ាស៊ីន​និម្មិត​<b>%1</b>បាន​ទេ ព្រោះ​ថា​ម៉ាស៊ីន​មាន​ដ្រាយ​ស៊ីឌី/ឌីវីឌី​រ៉ូម ។ សូម​បន្ថែម​ដ្រាយ ដោយ​ប្រើ​ទំព័រ​ផ្ទុក​នៃ​ប្រអប់​កំណត់​ម៉ាស៊ីន​និម្មិត ។</p></translation>
+        <translation type="obsolete"><p>មិនអាច​បញ្ចូល​រូបភាព​ស៊ីឌី​កម្មវិធី​ដំឡើង​បន្ថែម​របស់​ម៉ាស៊ីន VirtualBox ​ទៅ​ក្នុង​ម៉ាស៊ីន​និម្មិត​<b>%1</b>បាន​ទេ ព្រោះ​ថា​ម៉ាស៊ីន​មាន​ដ្រាយ​ស៊ីឌី/ឌីវីឌី​រ៉ូម ។ សូម​បន្ថែម​ដ្រាយ ដោយ​ប្រើ​ទំព័រ​ផ្ទុក​នៃ​ប្រអប់​កំណត់​ម៉ាស៊ីន​និម្មិត ។</p></translation>
     </message>
     <message>
         <source><p>Invalid e-mail address or password specified.</p></source>
-        <translation type="obsolete"><p>អាសយដ្ឋាន​អ៊ីមែល ឬ​ពាក្យ​សម្ងាត់​ដែលបាន​បញ្ជាក់មិន​ត្រឹមត្រូវ ។</p></translation>
+        <translation type="obsolete"><p>អាសយដ្ឋាន​អ៊ីមែល ឬ​ពាក្យ​សម្ងាត់​ដែលបាន​បញ្ជាក់មិន​ត្រឹមត្រូវ ។</p></translation>
     </message>
     <message>
         <source><p>Failed to register the VirtualBox product.</p><p>%1</p></source>
-        <translation type="obsolete"><p>បាន​បរាជ័យ​ក្នុងកា​រចុះឈ្មោះផលិតផល VirtualBox ។</p><p>%1</p></translation>
+        <translation type="obsolete"><p>បាន​បរាជ័យ​ក្នុងកា​រចុះឈ្មោះផលិតផល VirtualBox ។</p><p>%1</p></translation>
     </message>
     <message>
         <source><p>Your existing VirtualBox settings files will be automatically converted from the old format to a new format required by the new version of VirtualBox.</p><p>Press <b>OK</b> to start VirtualBox now or press <b>Exit</b> if you want to terminate the VirtualBox application without any further actions.</p></source>
-        <translation type="obsolete"><p>ឯកសារ​កំណត់​ VirtualBox មាន​ស្រាប់​​របស់​អ្នក នឹង​ត្រូវ​បានបម្លែង​ដោយ​ស្វ័យ​ប្រវត្តិ​ពី​ទ្រង់ទ្រាយ​ចាស់ ទៅ​ទ្រង់ទ្រាយ​ថ្មី​ដែលបានទាមទារ​ដោយ​កំណែ​ថ្មី​របស់ VirtualBox ​។</p><p>ចុច <b>យល់</b> ដើម្បី​ចាប់ផ្ដើម VirtualBox ឥឡូវ ឬ​ចុច <b>ចាកចេញ</b> ប្រសិនបើ​អ្នក​ចង់​បញ្ចប់​កម្មវិធី​របស់ VirtualBox ដោយ​គ្មាន​សកម្មភាព​បន្ថែម​ផ្សេង​ទៀត ។</p></translation>
+        <translation type="obsolete"><p>ឯកសារ​កំណត់​ VirtualBox មាន​ស្រាប់​​របស់​អ្នក នឹង​ត្រូវ​បានបម្លែង​ដោយ​ស្វ័យ​ប្រវត្តិ​ពី​ទ្រង់ទ្រាយ​ចាស់ ទៅ​ទ្រង់ទ្រាយ​ថ្មី​ដែលបានទាមទារ​ដោយ​កំណែ​ថ្មី​របស់ VirtualBox ​។</p><p>ចុច <b>យល់</b> ដើម្បី​ចាប់ផ្ដើម VirtualBox ឥឡូវ ឬ​ចុច <b>ចាកចេញ</b> ប្រសិនបើ​អ្នក​ចង់​បញ្ចប់​កម្មវិធី​របស់ VirtualBox ដោយ​គ្មាន​សកម្មភាព​បន្ថែម​ផ្សេង​ទៀត ។</p></translation>
     </message>
     <message>
         <source>E&xit</source>
@@ -7238,19 +7217,19 @@ warnAboutSettingsAutoConversion message box</comment>
     </message>
     <message>
         <source><p>The following VirtualBox settings files will be automatically converted from the old format to a new format required by the new version of VirtualBox.</p><p>Press <b>OK</b> to start VirtualBox now or press <b>Exit</b> if you want to terminate the VirtualBox application without any further actions.</p></source>
-        <translation type="obsolete"><p>ឯកសារ​កំណត់ VirtualBox ដូច​ខាងក្រោម​នឹង​ត្រូវ​បានបម្លែង​ដោយ​ស្វ័យ​ប្រវត្តិ​ពី​ទ្រង់ទ្រាយ​ចាស់​ទៅ​ទ្រង់ទ្រាយ​ថ្មី​របស់ VirtualBox ។</p><p>ចុច <b>យល់</b> ដើម្បី​ចាប់ផ្ដើម VirtualBox ឥឡូវ ឬ​ចុច <b>ចាកចេញ</b> ប្រសិនបើ​អ្នក​ចង់​បញ្ចប់​កម្មវិធី VirtualBox ដោយ​គ្មាន​សកម្មភាព​បន្ថែម​ទៀត ។</p></translation>
+        <translation type="obsolete"><p>ឯកសារ​កំណត់ VirtualBox ដូច​ខាងក្រោម​នឹង​ត្រូវ​បានបម្លែង​ដោយ​ស្វ័យ​ប្រវត្តិ​ពី​ទ្រង់ទ្រាយ​ចាស់​ទៅ​ទ្រង់ទ្រាយ​ថ្មី​របស់ VirtualBox ។</p><p>ចុច <b>យល់</b> ដើម្បី​ចាប់ផ្ដើម VirtualBox ឥឡូវ ឬ​ចុច <b>ចាកចេញ</b> ប្រសិនបើ​អ្នក​ចង់​បញ្ចប់​កម្មវិធី VirtualBox ដោយ​គ្មាន​សកម្មភាព​បន្ថែម​ទៀត ។</p></translation>
     </message>
     <message>
         <source>Failed to open appliance.</source>
-        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងកា​របើក​ឧបករណ៍ ។</translation>
+        <translation type="obsolete">បាន​បរាជ័យ​ក្នុងកា​របើក​ឧបករណ៍ ។</translation>
     </message>
     <message>
         <source>Failed to open/interpret appliance <b>%1</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងកា​របើក/បកប្រែ​ឧបករណ៍<b>%1</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងកា​របើក/បកប្រែ​ឧបករណ៍<b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to import appliance <b>%1</b>.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងកា​រនាំចូល​ឧបករណ៍<b>%1</b> ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងកា​រនាំចូល​ឧបករណ៍<b>%1</b> ។</translation>
     </message>
     <message>
         <source>Failed to check files.</source>
@@ -7258,11 +7237,11 @@ warnAboutSettingsAutoConversion message box</comment>
     </message>
     <message>
         <source>Failed to remove file.</source>
-        <translation>បាន​បរាជ័យ​ក្នុងកា​រយក​ឯកសារ​ចេញ ។</translation>
+        <translation>បាន​បរាជ័យ​ក្នុងកា​រយក​ឯកសារ​ចេញ ។</translation>
     </message>
     <message>
         <source>Failed to create appliance.</source>
-        <translation type="obsolete">បាន​បរាជ័យ​ទៅ​បង្កើតឧបករណ៍ ។</translation>
+        <translation type="obsolete">បាន​បរាជ័យ​ទៅ​បង្កើតឧបករណ៍ ។</translation>
     </message>
     <message>
         <source>Failed to prepare the export of the appliance <b>%1</b>.</source>
@@ -7358,7 +7337,7 @@ failed to close ...</comment>
     </message>
     <message>
         <source><p>Are you sure you want to delete the CD/DVD device?</p><p>You will not be able to insert any CDs or ISO images or install the Guest Additions without it!</p></source>
-        <translation type="obsolete"><p>តើ​​​អ្នក​ប្រាកដ​ជា​ចង់​លុប​ឧបករណ៍​​ស៊ី​ឌី​​/​ឌី​វីឌី​-រ៉ូម​ឬ​​?</p><p>អ្នក​នឹង​​មិន​អាច​ម៉ោន​ស៊ី​ឌី​ ឬ​រូប​ភាព ISO ឬ​ដំឡើង​​ការ​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ​​ដោយ​គ្មាន​វា​បាន​​ទេ ​​!</p></translation>
+        <translation type="obsolete"><p>តើ​​​អ្នក​ប្រាកដ​ជា​ចង់​លុប​ឧបករណ៍​​ស៊ី​ឌី​​/​ឌី​វីឌី​-រ៉ូម​ឬ​​?</p><p>អ្នក​នឹង​​មិន​អាច​ម៉ោន​ស៊ី​ឌី​ ឬ​រូប​ភាព ISO ឬ​ដំឡើង​​ការ​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ​​ដោយ​គ្មាន​វា​បាន​​ទេ ​​!</p></translation>
     </message>
     <message>
         <source>&Remove</source>
@@ -7634,7 +7613,7 @@ medium</comment>
     </message>
     <message>
         <source><p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p></source>
-        <translation type="obsolete"><p>បាន​បរាជ័យ​ក្នុងកា​ររក្សាទុក​ឯកសារ​ដែលបាន​ទាញ​យក​ជា <nobr><b>%1</b> ។</nobr></p></translation>
+        <translation type="obsolete"><p>បាន​បរាជ័យ​ក្នុងកា​ររក្សាទុក​ឯកសារ​ដែលបាន​ទាញ​យក​ជា <nobr><b>%1</b> ។</nobr></p></translation>
     </message>
     <message>
         <source><p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p><p>Do you wish to download latest one from the Internet?</p></source>
@@ -7932,32 +7911,24 @@ medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Insert</source>
+        <comment>additions-new</comment>
+        <translation type="obsolete">ម៉ោន</translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7973,115 +7944,115 @@ medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8140,28 +8111,32 @@ medium</comment>
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished">ឈ្មោះ ៖</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">ឈ្មោះ ៖</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
-        <translation type="unfinished">បង្ហាញ​ឈ្មោះ​របស់​ម៉ាស៊ីន​និម្មិត ។</translation>
+        <translation type="unfinished">បង្ហាញ​ឈ្មោះ​របស់​ម៉ាស៊ីន​និម្មិត ។</translation>
     </message>
     <message>
         <source>&Type:</source>
-        <translation type="unfinished">ប្រភេទ ៖</translation>
+        <translation type="unfinished">ប្រភេទ ៖</translation>
     </message>
     <message>
         <source>Selects the operating system family that you plan to install into this virtual machine.</source>
-        <translation type="unfinished">បង្ហាញ​ក្រុមគ្រួសារ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​មានគម្រោង​ដំឡើង​ក្នុង​ម៉ាស៊ីន​និម្មិត​នេះ ។</translation>
+        <translation type="unfinished">បង្ហាញ​ក្រុមគ្រួសារ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​មានគម្រោង​ដំឡើង​ក្នុង​ម៉ាស៊ីន​និម្មិត​នេះ ។</translation>
     </message>
     <message>
         <source>&Version:</source>
-        <translation type="unfinished">កំណែ ៖</translation>
+        <translation type="unfinished">កំណែ ៖</translation>
     </message>
     <message>
         <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-        <translation type="unfinished">បង្ហាញ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​​មាន​​គម្រោង​ដំឡើង​ម៉ាស៊ីន​និម្មិត​នេះ (បាន​ហៅ​ប្រព័ន្ធ​ប្រតិបត្តិ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) ។</translation>
+        <translation type="unfinished">បង្ហាញ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​​មាន​​គម្រោង​ដំឡើង​ម៉ាស៊ីន​និម្មិត​នេះ (បាន​ហៅ​ប្រព័ន្ធ​ប្រតិបត្តិ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) ។</translation>
+    </message>
+    <message>
+        <source>N&ame:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -8254,7 +8229,7 @@ medium</comment>
     </message>
     <message>
         <source>Welcome to the Create New Virtual Disk Wizard!</source>
-        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​​អ្នក​ជំនួយការ​បង្កើត​ថាស​និម្មិ​តថ្មី !</translation>
+        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​​អ្នក​ជំនួយការ​បង្កើត​ថាស​និម្មិ​តថ្មី !</translation>
     </message>
     <message>
         <source>Virtual Disk Location and Size</source>
@@ -8314,7 +8289,7 @@ medium</comment>
     </message>
     <message>
         <source><p>This wizard will help you to create a new virtual hard disk for your virtual machine.</p><p>Use the <b>Next</b> button to go to the next page of the wizard and the <b>Back</b> button to return to the previous page.</p></source>
-        <translation type="obsolete"><p>អ្នក​ជំនួយការ​នេះ​ជួយ​អ្នក​ក្នុងកា​របង្កើត​ថាសរឹង​និម្មិត​សម្រាប់​ម៉ាស៊ីន​និម្មិត​របស់​អ្នក ។</p><p>ប្រើប៊ូតុង <b>បន្ទាប់</b> ដើម្បី​ទៅកាន់​ទំព័រ​បន្ទាប់​របស់​អ្នក​ជំនួយការ ប៊ូតុង<b>ថយក្រោយ</b> ដើម្បី​ត្រឡប់​ទៅ​ទំព័រ​មុន ។</p></translation>
+        <translation type="obsolete"><p>អ្នក​ជំនួយការ​នេះ​ជួយ​អ្នក​ក្នុងកា​របង្កើត​ថាសរឹង​និម្មិត​សម្រាប់​ម៉ាស៊ីន​និម្មិត​របស់​អ្នក ។</p><p>ប្រើប៊ូតុង <b>បន្ទាប់</b> ដើម្បី​ទៅកាន់​ទំព័រ​បន្ទាប់​របស់​អ្នក​ជំនួយការ ប៊ូតុង<b>ថយក្រោយ</b> ដើម្បី​ត្រឡប់​ទៅ​ទំព័រ​មុន ។</p></translation>
     </message>
     <message>
         <source>Hard Disk Storage Type</source>
@@ -8322,7 +8297,7 @@ medium</comment>
     </message>
     <message>
         <source><p>Select the type of virtual hard disk you want to create.</p><p>A <b>dynamically expanding storage</b> initially occupies a very small amount of space on your physical hard disk. It will grow dynamically (up to the size specified) as the Guest OS claims disk space.</p><p>A <b>fixed-size storage</b> does not grow. It is stored in a file of approximately the same size as the size of the virtual hard disk. The creation  [...]
-        <translation type="obsolete"><p>ជ្រើស​ប្រភេទ​ថាសរឹង​និម្មិត​ដែល​អ្នក​ចង់​បង្កើត ។</p><p> <b>កា​រផ្ទុក​ពង្រីក​ជា​ថាមវន្ត</b> ដំបូង​គ្រប់គ្រង​រាល់​ទំហំ​តូចៗ​របស់ចន្លោះ​នៅ​ក្នុង​ថាសរឹង​ហ្វីស៊ីខល​របស់​អ្នក ។ វា​នឹង​ពង្រីក​ដោយ​ថាមវន្ត (ដល់​ទំហំ​ដែល​បាន​បញ្ជាក់) ជា​ការ​អះអាង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ។</p><p> <b>កា​រផ្ទុក​ទំហំថេរ</b> មិន​រីកចំរើន​ទេ ។ វា​ត្រូ​វបាន​ផ្ទុក​នៅ​ក្នុង​ឯកសារ​របស់​ទំហំ​​ប្រហែល​ ជា​ទំហំ​របស់​ [...]
+        <translation type="obsolete"><p>ជ្រើស​ប្រភេទ​ថាសរឹង​និម្មិត​ដែល​អ្នក​ចង់​បង្កើត ។</p><p> <b>កា​រផ្ទុក​ពង្រីក​ជា​ថាមវន្ត</b> ដំបូង​គ្រប់គ្រង​រាល់​ទំហំ​តូចៗ​របស់ចន្លោះ​នៅ​ក្នុង​ថាសរឹង​ហ្វីស៊ីខល​របស់​អ្នក ។ វា​នឹង​ពង្រីក​ដោយ​ថាមវន្ត (ដល់​ទំហំ​ដែល​បាន​បញ្ជាក់) ជា​ការ​អះអាង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ។</p><p> <b>កា​រផ្ទុក​ទំហំថេរ</b> មិន​រីកចំរើន​ទេ ។ វា​ត្រូ​វបាន​ផ្ទុក​នៅ​ក្នុង​ឯកសារ​របស់​ទំហំ​​ប្រហែល​ ជា​ទំហំ​របស់​ [...]
     </message>
     <message>
         <source>Storage Type</source>
@@ -8338,7 +8313,7 @@ medium</comment>
     </message>
     <message>
         <source><p>Press the <b>Select</b> button to select the location of a file to store the hard disk data or type a file name in the entry field.</p></source>
-        <translation type="obsolete"><p>ចុច​ប៊ូតុង <b>ជ្រើស</b> ដើម្បី​ជ្រើស​ទីតាំង​របស់​ឯកសារ​ដើម្បី​ផ្ទុក​ថាសរឹង ឬ​ប្រភេទ​ឈ្មោះ​ឯកសារ​នៅ​ក្នុង​វាល​ធាតុ ។</p></translation>
+        <translation type="obsolete"><p>ចុច​ប៊ូតុង <b>ជ្រើស</b> ដើម្បី​ជ្រើស​ទីតាំង​របស់​ឯកសារ​ដើម្បី​ផ្ទុក​ថាសរឹង ឬ​ប្រភេទ​ឈ្មោះ​ឯកសារ​នៅ​ក្នុង​វាល​ធាតុ ។</p></translation>
     </message>
     <message>
         <source>&Location</source>
@@ -8346,7 +8321,7 @@ medium</comment>
     </message>
     <message>
         <source><p>Select the size of the virtual hard disk in megabytes. This size will be reported to the Guest OS as the maximum size of this hard disk.</p></source>
-        <translation type="obsolete"><p>ជ្រើស​ទំហំ​ថាសរឹង​និម្មិត​គិត​ជាមេកាបៃ ។ ទំហំ​នេះ​នឹង​ត្រូវ​បាន​រាយការណ៍​ទៅ​កាន់​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​តាម​ទំហំ​អតិបរមា​របស់​ថាសរឹង​នេះ ។</p></translation>
+        <translation type="obsolete"><p>ជ្រើស​ទំហំ​ថាសរឹង​និម្មិត​គិត​ជាមេកាបៃ ។ ទំហំ​នេះ​នឹង​ត្រូវ​បាន​រាយការណ៍​ទៅ​កាន់​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​តាម​ទំហំ​អតិបរមា​របស់​ថាសរឹង​នេះ ។</p></translation>
     </message>
     <message>
         <source>&Size</source>
@@ -8354,11 +8329,11 @@ medium</comment>
     </message>
     <message>
         <source>You are going to create a new virtual hard disk with the following parameters:</source>
-        <translation type="obsolete">អ្នកនឹង​បង្កើត​ថាសរឹង​និម្មិត​ថ្មី​ដោយ​មាន​ប៉ារ៉ាម៉ែត្រ​ដូច​ខាងក្រោម ៖</translation>
+        <translation type="obsolete">អ្នកនឹង​បង្កើត​ថាសរឹង​និម្មិត​ថ្មី​ដោយ​មាន​ប៉ារ៉ាម៉ែត្រ​ដូច​ខាងក្រោម ៖</translation>
     </message>
     <message>
         <source>If the above settings are correct, press the <b>Finish</b> button. Once you press it, a new hard disk will be created.</source>
-        <translation type="obsolete">ប្រសិនបើ​កា​រកំណត់​ខាង​លើ​ត្រឹមត្រូវ ចុច​ប៊ូតុង <b>បញ្ចប់</b> ។ នៅពេល​អ្នក​ចុចវា ថាសរឹង​ថ្មី​នឹង​ត្រូវ​បានបង្កើត​ឡើង ។</translation>
+        <translation type="obsolete">ប្រសិនបើ​កា​រកំណត់​ខាង​លើ​ត្រឹមត្រូវ ចុច​ប៊ូតុង <b>បញ្ចប់</b> ។ នៅពេល​អ្នក​ចុចវា ថាសរឹង​ថ្មី​នឹង​ត្រូវ​បានបង្កើត​ឡើង ។</translation>
     </message>
 </context>
 <context>
@@ -8376,14 +8351,14 @@ medium</comment>
     <name>UINewHDWizardPageWelcome</name>
     <message>
         <source>Welcome to the Create New Virtual Disk Wizard!</source>
-        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​​អ្នក​ជំនួយការ​បង្កើត​ថាស​និម្មិ​តថ្មី !</translation>
+        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​​អ្នក​ជំនួយការ​បង្កើត​ថាស​និម្មិ​តថ្មី !</translation>
     </message>
 </context>
 <context>
     <name>UINewHDWzdPage2</name>
     <message>
         <source><p>Select the type of virtual hard disk you want to create.</p><p>A <b>dynamically expanding storage</b> initially occupies a very small amount of space on your physical hard disk. It will grow dynamically (up to the size specified) as the Guest OS claims disk space.</p><p>A <b>fixed-size storage</b> does not grow. It is stored in a file of approximately the same size as the size of the virtual hard disk. The creation  [...]
-        <translation type="obsolete"><p>ជ្រើស​ប្រភេទ​ថាសរឹង​និម្មិត​ដែល​អ្នក​ចង់​បង្កើត ។</p><p> <b>កា​រផ្ទុក​ពង្រីក​ជា​ថាមវន្ត</b> ដំបូង​គ្រប់គ្រង​រាល់​ទំហំ​តូចៗ​របស់ចន្លោះ​នៅ​ក្នុង​ថាសរឹង​ហ្វីស៊ីខល​របស់​អ្នក ។ វា​នឹង​ពង្រីក​ដោយ​ថាមវន្ត (ដល់​ទំហំ​ដែល​បាន​បញ្ជាក់) ជា​ការ​អះអាង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ។</p><p> <b>កា​រផ្ទុក​ទំហំថេរ</b> មិន​រីកចំរើន​ទេ ។ វា​ត្រូ​វបាន​ផ្ទុក​នៅ​ក្នុង​ឯកសារ​របស់​ទំហំ​​ប្រហែល​ ជា​ទំហំ​របស់​ [...]
+        <translation type="obsolete"><p>ជ្រើស​ប្រភេទ​ថាសរឹង​និម្មិត​ដែល​អ្នក​ចង់​បង្កើត ។</p><p> <b>កា​រផ្ទុក​ពង្រីក​ជា​ថាមវន្ត</b> ដំបូង​គ្រប់គ្រង​រាល់​ទំហំ​តូចៗ​របស់ចន្លោះ​នៅ​ក្នុង​ថាសរឹង​ហ្វីស៊ីខល​របស់​អ្នក ។ វា​នឹង​ពង្រីក​ដោយ​ថាមវន្ត (ដល់​ទំហំ​ដែល​បាន​បញ្ជាក់) ជា​ការ​អះអាង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ ។</p><p> <b>កា​រផ្ទុក​ទំហំថេរ</b> មិន​រីកចំរើន​ទេ ។ វា​ត្រូ​វបាន​ផ្ទុក​នៅ​ក្នុង​ឯកសារ​របស់​ទំហំ​​ប្រហែល​ ជា​ទំហំ​របស់​ [...]
     </message>
     <message>
         <source>Storage Type</source>
@@ -8406,7 +8381,7 @@ medium</comment>
     <name>UINewHDWzdPage3</name>
     <message>
         <source><p>Press the <b>Select</b> button to select the location of a file to store the hard disk data or type a file name in the entry field.</p></source>
-        <translation type="obsolete"><p>ចុច​ប៊ូតុង <b>ជ្រើស</b> ដើម្បី​ជ្រើស​ទីតាំង​របស់​ឯកសារ​ដើម្បី​ផ្ទុក​ថាសរឹង ឬ​ប្រភេទ​ឈ្មោះ​ឯកសារ​នៅ​ក្នុង​វាល​ធាតុ ។</p></translation>
+        <translation type="obsolete"><p>ចុច​ប៊ូតុង <b>ជ្រើស</b> ដើម្បី​ជ្រើស​ទីតាំង​របស់​ឯកសារ​ដើម្បី​ផ្ទុក​ថាសរឹង ឬ​ប្រភេទ​ឈ្មោះ​ឯកសារ​នៅ​ក្នុង​វាល​ធាតុ ។</p></translation>
     </message>
     <message>
         <source>&Location</source>
@@ -8414,7 +8389,7 @@ medium</comment>
     </message>
     <message>
         <source><p>Select the size of the virtual hard disk in megabytes. This size will be reported to the Guest OS as the maximum size of this hard disk.</p></source>
-        <translation type="obsolete"><p>ជ្រើស​ទំហំ​ថាសរឹង​និម្មិត​គិត​ជាមេកាបៃ ។ ទំហំ​នេះ​នឹង​ត្រូវ​បាន​រាយការណ៍​ទៅ​កាន់​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​តាម​ទំហំ​អតិបរមា​របស់​ថាសរឹង​នេះ ។</p></translation>
+        <translation type="obsolete"><p>ជ្រើស​ទំហំ​ថាសរឹង​និម្មិត​គិត​ជាមេកាបៃ ។ ទំហំ​នេះ​នឹង​ត្រូវ​បាន​រាយការណ៍​ទៅ​កាន់​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​តាម​ទំហំ​អតិបរមា​របស់​ថាសរឹង​នេះ ។</p></translation>
     </message>
     <message>
         <source>&Size</source>
@@ -8437,7 +8412,7 @@ medium</comment>
     <name>UINewHDWzdPage4</name>
     <message>
         <source>You are going to create a new virtual hard disk with the following parameters:</source>
-        <translation type="obsolete">អ្នកនឹង​បង្កើត​ថាសរឹង​និម្មិត​ថ្មី​ដោយ​មាន​ប៉ារ៉ាម៉ែត្រ​ដូច​ខាងក្រោម ៖</translation>
+        <translation type="obsolete">អ្នកនឹង​បង្កើត​ថាសរឹង​និម្មិត​ថ្មី​ដោយ​មាន​ប៉ារ៉ាម៉ែត្រ​ដូច​ខាងក្រោម ៖</translation>
     </message>
     <message>
         <source>Type</source>
@@ -8463,7 +8438,7 @@ medium</comment>
     </message>
     <message>
         <source>Welcome to the New Virtual Machine Wizard!</source>
-        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​អ្នក​ជំនួយការ​ម៉ាស៊ីន​និម្មិត​ថ្មី !</translation>
+        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​អ្នក​ជំនួយការ​ម៉ាស៊ីន​និម្មិត​ថ្មី !</translation>
     </message>
     <message>
         <source>N&ame</source>
@@ -8479,7 +8454,7 @@ medium</comment>
     </message>
     <message>
         <source><p>Select the amount of base memory (RAM) in megabytes to be allocated to the virtual machine.</p></source>
-        <translation type="obsolete"><p>ជ្រើស​ចំនួន​សតិ (RAM) ​មូលដ្ឋាន​គិត​ជាមេកាបៃ ដែល​​ត្រូវ​បម្រុង​ទុក​សម្រាប់​ម៉ាស៊ីន​និម្មិត ។</p></translation>
+        <translation type="obsolete"><p>ជ្រើស​ចំនួន​សតិ (RAM) ​មូលដ្ឋាន​គិត​ជាមេកាបៃ ដែល​​ត្រូវ​បម្រុង​ទុក​សម្រាប់​ម៉ាស៊ីន​និម្មិត ។</p></translation>
     </message>
     <message>
         <source>Base &Memory Size</source>
@@ -8503,15 +8478,15 @@ medium</comment>
     </message>
     <message>
         <source>The recommended base memory size is <b>%1</b> MB.</source>
-        <translation type="obsolete">ទំហំ​សតិ​មូលដ្ឋាន​ដែលបានផ្ដល់​អនុសាសន៍​គឺ <b>%1</b> មេកាបៃ ។</translation>
+        <translation type="obsolete">ទំហំ​សតិ​មូលដ្ឋាន​ដែលបានផ្ដល់​អនុសាសន៍​គឺ <b>%1</b> មេកាបៃ ។</translation>
     </message>
     <message>
         <source>The recommended size of the start-up disk is <b>%1</b> MB.</source>
-        <translation type="obsolete">ទំហំ​ដែល​បានផ្ដល់​អនុសាសន៍​របស់​ថាសរឹង​ចាប់ផ្ដើម​គឺ <b>%1</b> មេកាបៃ ។</translation>
+        <translation type="obsolete">ទំហំ​ដែល​បានផ្ដល់​អនុសាសន៍​របស់​ថាសរឹង​ចាប់ផ្ដើម​គឺ <b>%1</b> មេកាបៃ ។</translation>
     </message>
     <message>
         <source><p>This wizard will guide you through the steps that are necessary to create a new virtual machine for VirtualBox.</p><p>Use the <b>Next</b> button to go the next page of the wizard and the <b>Back</b> button to return to the previous page.</p></source>
-        <translation type="obsolete"><p>អ្នក​ជំនួយ​កា​រនេះ​នឹង​នាំអ្នក​តាម​ជំហាន​ដែល​ចាំបាច់​ដើម្បីបង្កើត​ម៉ាស៊ីន​និម្មិ​តថ្មី​សម្រាប់ VirtualBox ។</p><p>ប្រើ​ប៊ូតុង <b>បន្ទាប់</b> ដើម្បី​ទៅកាន់​ទំព័រ​បន្ទាប់​របស់​អ្នក​ជំនួយការ ហើយ​ប៊ូតុង <b>ថយក្រោយ</b> ដើម្បី​ត្រឡប់​ទៅ​ទំព័រ​មុន ។</p></translation>
+        <translation type="obsolete"><p>អ្នក​ជំនួយ​កា​រនេះ​នឹង​នាំអ្នក​តាម​ជំហាន​ដែល​ចាំបាច់​ដើម្បីបង្កើត​ម៉ាស៊ីន​និម្មិ​តថ្មី​សម្រាប់ VirtualBox ។</p><p>ប្រើ​ប៊ូតុង <b>បន្ទាប់</b> ដើម្បី​ទៅកាន់​ទំព័រ​បន្ទាប់​របស់​អ្នក​ជំនួយការ ហើយ​ប៊ូតុង <b>ថយក្រោយ</b> ដើម្បី​ត្រឡប់​ទៅ​ទំព័រ​មុន ។</p></translation>
     </message>
     <message>
         <source>< &Back</source>
@@ -8523,15 +8498,15 @@ medium</comment>
     </message>
     <message>
         <source><p>Enter a name for the new virtual machine and select the type of the guest operating system you plan to install onto the virtual machine.</p><p>The name of the virtual machine usually indicates its software and hardware configuration. It will be used by all VirtualBox components to identify your virtual machine.</p></source>
-        <translation type="obsolete"><p>បញ្ចូល​ឈ្មោះ​ឲ្យ​ម៉ាស៊ីន​និម្មតិ​ថ្មី ហើយ​ជ្រើស​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ ដែល​អ្នក​ចង់​ដំឡើង​ក្នុង​ម៉ាស៊ីន​និម្មិត ។ </p><p>ឈ្មោះ​របស់​ម៉ាស៊ីន​និម្មិត​តាមធម្មតា​បង្ហាញ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ផ្នែក​រឹង និង​ផ្នែក​ទន់​របស់​វា ។ វា​នឹង​ត្រូវ​បាន​ប្រើ​ដោយ​សមាសធាតុ​ VirtualBox ដើម្បី​បញ្ជាក់​អត្តសញ្ញាណ​ម៉ាស៊ីន​និម្មិត​របស់​អ្នក ។</p></translation>
+        <translation type="obsolete"><p>បញ្ចូល​ឈ្មោះ​ឲ្យ​ម៉ាស៊ីន​និម្មតិ​ថ្មី ហើយ​ជ្រើស​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ ដែល​អ្នក​ចង់​ដំឡើង​ក្នុង​ម៉ាស៊ីន​និម្មិត ។ </p><p>ឈ្មោះ​របស់​ម៉ាស៊ីន​និម្មិត​តាមធម្មតា​បង្ហាញ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ផ្នែក​រឹង និង​ផ្នែក​ទន់​របស់​វា ។ វា​នឹង​ត្រូវ​បាន​ប្រើ​ដោយ​សមាសធាតុ​ VirtualBox ដើម្បី​បញ្ជាក់​អត្តសញ្ញាណ​ម៉ាស៊ីន​និម្មិត​របស់​អ្នក ។</p></translation>
     </message>
     <message>
         <source><p>You are going to create a new virtual machine with the following parameters:</p></source>
-        <translation type="obsolete"><p>អ្នករៀបនឹង​បង្កើត​ម៉ាស៊ីន​និម្មិត​ថ្មី​ដែល​មាន​ប៉ារ៉ាម៉ែត្រ​ដូច​ខាងក្រោម ៖</p></translation>
+        <translation type="obsolete"><p>អ្នករៀបនឹង​បង្កើត​ម៉ាស៊ីន​និម្មិត​ថ្មី​ដែល​មាន​ប៉ារ៉ាម៉ែត្រ​ដូច​ខាងក្រោម ៖</p></translation>
     </message>
     <message>
         <source><p>If the above is correct press the <b>Finish</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source>
-        <translation type="obsolete"><p>ប្រសិនបើ​ខា​ងលើ​ត្រឹមត្រូវ​​ហើយ ចុច​ប៊ូតុង <b>បញ្ចប់</b> ។ នៅពេល​អ្នក​ចុច​វា ម៉ាស៊ីន​និម្មិត​ថ្មី​នឹង​ត្រូវ​បាន​បង្កើត​ឡើង ។ </p><p>ចំណាំ​ថា អ្នក​អាច​ត្រង​ការ​កំណត់​ទាំង​នេះ និង​ការ​កំណត់​ផ្សេងៗ​របស់​ម៉ាស៊ីន​និម្មិត​ដែល​បានបង្កើត​​នៅពេល​ដែល​ប្រើ​ប្រអប់ <b>ការ​កំណត់</b> ដែល​អាច​ចូល​ដំណើរ​ការ​បាន​តាមរយៈ​ម៉ឺនុយ​របស់​បង្អួច​មេ ។</p></translation>
+        <translation type="obsolete"><p>ប្រសិនបើ​ខា​ងលើ​ត្រឹមត្រូវ​​ហើយ ចុច​ប៊ូតុង <b>បញ្ចប់</b> ។ នៅពេល​អ្នក​ចុច​វា ម៉ាស៊ីន​និម្មិត​ថ្មី​នឹង​ត្រូវ​បាន​បង្កើត​ឡើង ។ </p><p>ចំណាំ​ថា អ្នក​អាច​ត្រង​ការ​កំណត់​ទាំង​នេះ និង​ការ​កំណត់​ផ្សេងៗ​របស់​ម៉ាស៊ីន​និម្មិត​ដែល​បានបង្កើត​​នៅពេល​ដែល​ប្រើ​ប្រអប់ <b>ការ​កំណត់</b> ដែល​អាច​ចូល​ដំណើរ​ការ​បាន​តាមរយៈ​ម៉ឺនុយ​របស់​បង្អួច​មេ ។</p></translation>
     </message>
     <message>
         <source>&Finish</source>
@@ -8568,7 +8543,7 @@ medium</comment>
     </message>
     <message>
         <source><p>Select a hard disk image to be used as the boot hard disk of the virtual machine. You can either create a new hard disk using the <b>New</b> button or select an existing hard disk image from the drop-down list or by pressing the <b>Existing</b> button (to invoke the Virtual Media Manager window).</p><p>If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the mach [...]
-        <translation type="obsolete"><p>ជ្រើស​រូបភាព​ថាសរឹង​ត្រូវ​ប្រើ​ជា​ថាស​រឹង​ចាប់ផ្ដើម​របស់ម៉ាស៊ីន​និម្មិត ។ អ្នកអាច​បង្កើត​ថាសរឹង​ថ្មី​ដោយ​ប្រើ​ប៊ូតុង <b>ថ្មី</b> ឬ​ជ្រើស​រូបភាព​ថាសរឹង​ដែលមាន​ស្រាប់​ពី​បញ្ជី​ទម្លាក់ចុះ ឬ​ដោយ​ចុច​ប៊ូតុង <b>មាន​ស្រាប់</b> (ដើម្បីដកហូត​ប្រអប់​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត) ។</p><p>ប្រសិនបើ​អ្នក​ត្រូវការ​រៀបចំ​ថាសរឹង​ដែល​ស្មុគស្មាញ អ្នក​ក៏​អាច​រំលង​ជំហាន​នេះ ហើយ​ភ្ជាប់​ថាសរឹង​ពេលក្រោយ​ដោយ​ប្រើ​ប្រអប់​កំណត់របស [...]
+        <translation type="obsolete"><p>ជ្រើស​រូបភាព​ថាសរឹង​ត្រូវ​ប្រើ​ជា​ថាស​រឹង​ចាប់ផ្ដើម​របស់ម៉ាស៊ីន​និម្មិត ។ អ្នកអាច​បង្កើត​ថាសរឹង​ថ្មី​ដោយ​ប្រើ​ប៊ូតុង <b>ថ្មី</b> ឬ​ជ្រើស​រូបភាព​ថាសរឹង​ដែលមាន​ស្រាប់​ពី​បញ្ជី​ទម្លាក់ចុះ ឬ​ដោយ​ចុច​ប៊ូតុង <b>មាន​ស្រាប់</b> (ដើម្បីដកហូត​ប្រអប់​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត) ។</p><p>ប្រសិនបើ​អ្នក​ត្រូវការ​រៀបចំ​ថាសរឹង​ដែល​ស្មុគស្មាញ អ្នក​ក៏​អាច​រំលង​ជំហាន​នេះ ហើយ​ភ្ជាប់​ថាសរឹង​ពេលក្រោយ​ដោយ​ប្រើ​ប្រអប់​កំណត់របស [...]
     </message>
     <message>
         <source>Start-up &Disk (Primary Master)</source>
@@ -8587,14 +8562,14 @@ medium</comment>
     <name>UINewVMWzdPage1</name>
     <message>
         <source>Welcome to the New Virtual Machine Wizard!</source>
-        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​អ្នក​ជំនួយការ​ម៉ាស៊ីន​និម្មិត​ថ្មី !</translation>
+        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​អ្នក​ជំនួយការ​ម៉ាស៊ីន​និម្មិត​ថ្មី !</translation>
     </message>
 </context>
 <context>
     <name>UINewVMWzdPage2</name>
     <message>
         <source><p>Enter a name for the new virtual machine and select the type of the guest operating system you plan to install onto the virtual machine.</p><p>The name of the virtual machine usually indicates its software and hardware configuration. It will be used by all VirtualBox components to identify your virtual machine.</p></source>
-        <translation type="obsolete"><p>បញ្ចូល​ឈ្មោះ​ឲ្យ​ម៉ាស៊ីន​និម្មតិ​ថ្មី ហើយ​ជ្រើស​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ ដែល​អ្នក​ចង់​ដំឡើង​ក្នុង​ម៉ាស៊ីន​និម្មិត ។ </p><p>ឈ្មោះ​របស់​ម៉ាស៊ីន​និម្មិត​តាមធម្មតា​បង្ហាញ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ផ្នែក​រឹង និង​ផ្នែក​ទន់​របស់​វា ។ វា​នឹង​ត្រូវ​បាន​ប្រើ​ដោយ​សមាសធាតុ​ VirtualBox ដើម្បី​បញ្ជាក់​អត្តសញ្ញាណ​ម៉ាស៊ីន​និម្មិត​របស់​អ្នក ។</p></translation>
+        <translation type="obsolete"><p>បញ្ចូល​ឈ្មោះ​ឲ្យ​ម៉ាស៊ីន​និម្មតិ​ថ្មី ហើយ​ជ្រើស​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ ដែល​អ្នក​ចង់​ដំឡើង​ក្នុង​ម៉ាស៊ីន​និម្មិត ។ </p><p>ឈ្មោះ​របស់​ម៉ាស៊ីន​និម្មិត​តាមធម្មតា​បង្ហាញ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ផ្នែក​រឹង និង​ផ្នែក​ទន់​របស់​វា ។ វា​នឹង​ត្រូវ​បាន​ប្រើ​ដោយ​សមាសធាតុ​ VirtualBox ដើម្បី​បញ្ជាក់​អត្តសញ្ញាណ​ម៉ាស៊ីន​និម្មិត​របស់​អ្នក ។</p></translation>
     </message>
     <message>
         <source>N&ame</source>
@@ -8613,7 +8588,7 @@ medium</comment>
     <name>UINewVMWzdPage3</name>
     <message>
         <source><p>Select the amount of base memory (RAM) in megabytes to be allocated to the virtual machine.</p></source>
-        <translation type="obsolete"><p>ជ្រើស​ចំនួន​សតិ (RAM) ​មូលដ្ឋាន​គិត​ជាមេកាបៃ ដែល​​ត្រូវ​បម្រុង​ទុក​សម្រាប់​ម៉ាស៊ីន​និម្មិត ។</p></translation>
+        <translation type="obsolete"><p>ជ្រើស​ចំនួន​សតិ (RAM) ​មូលដ្ឋាន​គិត​ជាមេកាបៃ ដែល​​ត្រូវ​បម្រុង​ទុក​សម្រាប់​ម៉ាស៊ីន​និម្មិត ។</p></translation>
     </message>
     <message>
         <source>Base &Memory Size</source>
@@ -8629,7 +8604,7 @@ medium</comment>
     </message>
     <message>
         <source>The recommended base memory size is <b>%1</b> MB.</source>
-        <translation type="obsolete">ទំហំ​សតិ​មូលដ្ឋាន​ដែលបានផ្ដល់​អនុសាសន៍​គឺ <b>%1</b> មេកាបៃ ។</translation>
+        <translation type="obsolete">ទំហំ​សតិ​មូលដ្ឋាន​ដែលបានផ្ដល់​អនុសាសន៍​គឺ <b>%1</b> មេកាបៃ ។</translation>
     </message>
     <message>
         <source>MB</source>
@@ -8641,7 +8616,7 @@ medium</comment>
     <name>UINewVMWzdPage4</name>
     <message>
         <source><p>Select a hard disk image to be used as the boot hard disk of the virtual machine. You can either create a new hard disk using the <b>New</b> button or select an existing hard disk image from the drop-down list or by pressing the <b>Existing</b> button (to invoke the Virtual Media Manager window).</p><p>If you need a more complex virtual disk setup you can skip this step and make the changes to the machine settings once the mach [...]
-        <translation type="obsolete"><p>ជ្រើស​រូបភាព​ថាសរឹង​ត្រូវ​ប្រើ​ជា​ថាស​រឹង​ចាប់ផ្ដើម​របស់ម៉ាស៊ីន​និម្មិត ។ អ្នកអាច​បង្កើត​ថាសរឹង​ថ្មី​ដោយ​ប្រើ​ប៊ូតុង <b>ថ្មី</b> ឬ​ជ្រើស​រូបភាព​ថាសរឹង​ដែលមាន​ស្រាប់​ពី​បញ្ជី​ទម្លាក់ចុះ ឬ​ដោយ​ចុច​ប៊ូតុង <b>មាន​ស្រាប់</b> (ដើម្បីដកហូត​ប្រអប់​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត) ។</p><p>ប្រសិនបើ​អ្នក​ត្រូវការ​រៀបចំ​ថាសរឹង​ដែល​ស្មុគស្មាញ អ្នក​ក៏​អាច​រំលង​ជំហាន​នេះ ហើយ​ភ្ជាប់​ថាសរឹង​ពេលក្រោយ​ដោយ​ប្រើ​ប្រអប់​កំណត់របស [...]
+        <translation type="obsolete"><p>ជ្រើស​រូបភាព​ថាសរឹង​ត្រូវ​ប្រើ​ជា​ថាស​រឹង​ចាប់ផ្ដើម​របស់ម៉ាស៊ីន​និម្មិត ។ អ្នកអាច​បង្កើត​ថាសរឹង​ថ្មី​ដោយ​ប្រើ​ប៊ូតុង <b>ថ្មី</b> ឬ​ជ្រើស​រូបភាព​ថាសរឹង​ដែលមាន​ស្រាប់​ពី​បញ្ជី​ទម្លាក់ចុះ ឬ​ដោយ​ចុច​ប៊ូតុង <b>មាន​ស្រាប់</b> (ដើម្បីដកហូត​ប្រអប់​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត) ។</p><p>ប្រសិនបើ​អ្នក​ត្រូវការ​រៀបចំ​ថាសរឹង​ដែល​ស្មុគស្មាញ អ្នក​ក៏​អាច​រំលង​ជំហាន​នេះ ហើយ​ភ្ជាប់​ថាសរឹង​ពេលក្រោយ​ដោយ​ប្រើ​ប្រអប់​កំណត់របស [...]
     </message>
     <message>
         <source>Start-up &Disk (Primary Master)</source>
@@ -8661,14 +8636,14 @@ medium</comment>
     </message>
     <message>
         <source>The recommended size of the start-up disk is <b>%1</b> MB.</source>
-        <translation type="obsolete">ទំហំ​ដែល​បានផ្ដល់​អនុសាសន៍​របស់​ថាសរឹង​ចាប់ផ្ដើម​គឺ <b>%1</b> មេកាបៃ ។</translation>
+        <translation type="obsolete">ទំហំ​ដែល​បានផ្ដល់​អនុសាសន៍​របស់​ថាសរឹង​ចាប់ផ្ដើម​គឺ <b>%1</b> មេកាបៃ ។</translation>
     </message>
 </context>
 <context>
     <name>UINewVMWzdPage5</name>
     <message>
         <source><p>You are going to create a new virtual machine with the following parameters:</p></source>
-        <translation type="obsolete"><p>អ្នករៀបនឹង​បង្កើត​ម៉ាស៊ីន​និម្មិត​ថ្មី​ដែល​មាន​ប៉ារ៉ាម៉ែត្រ​ដូច​ខាងក្រោម ៖</p></translation>
+        <translation type="obsolete"><p>អ្នករៀបនឹង​បង្កើត​ម៉ាស៊ីន​និម្មិត​ថ្មី​ដែល​មាន​ប៉ារ៉ាម៉ែត្រ​ដូច​ខាងក្រោម ៖</p></translation>
     </message>
     <message>
         <source>Name</source>
@@ -8828,18 +8803,14 @@ You may wish to translate this more like "Time remaining: %1"</comment
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>សូមស្វាគមន៍​​មក​កាន់ VirtualBox !</h3><p>ផ្នែកដែល​នៅ​សល់​របស់​បង្អួច​នេះ គឺជា​បញ្ជី​ម៉ាស៊ីន​និម្មិត​នៅ​ក្នុង​កុំព្យូទ័រ​របស់​អ្នក ។ បញ្ជី​ទទេ​ឥឡូវ​នេះ ពីព្រោះ​អ្នកមិនបានបង្កើត​ម៉ាស៊ីននិម្មិត​នៅ​ឡើយ​ទេ ។<img src=:/welcome.png align=right/></p><p>ដើម្បី​បង្កើត​ម៉ាស៊ីន​និម្មិត ចុច​ប៊ូតុង <b>ថ្មី</b> ក្នុង​របារ​ឧបករណ៍​ដែល​មាននៅ​​ផ្នែក​ខាង​លើ​នៃ​បង្អួច ។</p><p>អ្នក​អាច​ចុច​គ្រាប់ចុច <b>% [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="unfinished"><h3>សូមស្វាគមន៍​​មក​កាន់ VirtualBox !</h3><p>ផ្នែកដែល​នៅ​សល់​របស់​បង្អួច​នេះ គឺជា​បញ្ជី​ម៉ាស៊ីន​និម្មិត​នៅ​ក្នុង​កុំព្យូទ័រ​របស់​អ្នក ។ បញ្ជី​ទទេ​ឥឡូវ​នេះ ពីព្រោះ​អ្នកមិនបានបង្កើត​ម៉ាស៊ីននិម្មិត​នៅ​ឡើយ​ទេ ។<img src=:/welcome.png align=right/></p><p>ដើម្បី​បង្កើត​ម៉ាស៊ីន​និម្មិត ចុច​ប៊ូតុង <b>ថ្មី</b> ក្នុង​របារ​ឧបករណ៍​ដែល​មាននៅ​​ផ្នែក​ខាង​លើ​នៃ​បង្អួច ។</p><p>អ្នក​អាច​ចុច​គ្រាប់ចុច <b&gt [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -9007,6 +8978,10 @@ You may wish to translate this more like "Time remaining: %1"</comment
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">បិទ</translation>
     </message>
@@ -9014,10 +8989,6 @@ You may wish to translate this more like "Time remaining: %1"</comment
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -9031,7 +9002,7 @@ You may wish to translate this more like "Time remaining: %1"</comment
     </message>
     <message>
         <source>Replaces the current text with the content of a file.</source>
-        <translation>ជំនួស​អត្ថបទ​បច្ចុប្បន្ន​ដោយ​មាតិកា​របស់​ឯកសារ​មួយ ។</translation>
+        <translation>ជំនួស​អត្ថបទ​បច្ចុប្បន្ន​ដោយ​មាតិកា​របស់​ឯកសារ​មួយ ។</translation>
     </message>
     <message>
         <source>Text (*.txt);;All (*.*)</source>
@@ -9113,20 +9084,20 @@ You may wish to translate this more like "Time remaining: %1"</comment
         <translation type="obsolete">សេចក្ដី​សង្ខេប</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>កំណែ​ថ្មី​របស់ VirtualBox ត្រូ​វបាន​ចេញ​ផ្សាយ​ហើយ ! គឺ​កំណែ <b>%1</b> ដែល​អាច​រក​បាននៅ <a href="http://www.virtualbox.org/">virtualbox.org</a>។</p><p>អ្នកអាច​ទាញ​យក​កំណែ​នេះ​​ដោយ​ផ្ទាល់ពី​តំណ ៖</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>កំណែ​ថ្មី​របស់ VirtualBox ត្រូ​វបាន​ចេញ​ផ្សាយ​ហើយ ! គឺ​កំណែ <b>%1</b> ដែល​អាច​រក​បាននៅ <a href="https://www.virtualbox.org/">virtualbox.org</a>។</p><p>អ្នកអាច​ទាញ​យក​កំណែ​នេះ​​ដោយ​ផ្ទាល់ពី​តំណ ៖</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
-        <translation type="obsolete"><p>មិនអាច​យក​ព័ត៌មានកំណែ​ថ្មី​បានទេ ដោយសារ​តែ​កំហុស​បណ្ដាញ​ដូច​ខាងក្រោម ៖</p><p><b>%1</b></p></translation>
+        <translation type="obsolete"><p>មិនអាច​យក​ព័ត៌មានកំណែ​ថ្មី​បានទេ ដោយសារ​តែ​កំហុស​បណ្ដាញ​ដូច​ខាងក្រោម ៖</p><p><b>%1</b></p></translation>
     </message>
     <message>
         <source>You are already running the most recent version of VirtualBox.</source>
-        <translation type="obsolete">អ្នក​បាន​ដំឡើង​កំណែ​របស់ VirtualBox ចុងក្រោយ​រួច​ហើយ ។ សូម​ធ្វើ​ការ​ពិនិត្យ​ពេលក្រោយ​ម្ដង​ទៀត ។</translation>
+        <translation type="obsolete">អ្នក​បាន​ដំឡើង​កំណែ​របស់ VirtualBox ចុងក្រោយ​រួច​ហើយ ។ សូម​ធ្វើ​ការ​ពិនិត្យ​ពេលក្រោយ​ម្ដង​ទៀត ។</translation>
     </message>
     <message>
         <source><p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.</p><p>Use the <b>Check</b> button to check for a new version now or the <b>Cancel</b> button if you do not want to perform this check.</p><p>You can run this wizard at any time by choosing <b>Check for Updates...</b> from the <b>Help</b> menu.</p></source>
-        <translation type="obsolete"><p>អ្នក​ជំនួយ​ការ​នេះ​នឹង​តភ្ជាប់​ទៅ​កាន់​តំបន់​បណ្ដាញ​របស់ VirtualBox ហើយ​ពិនិត្យ​មើល​ប្រសិនបើ​មានកំណែ​ថ្មី​របស់​ VirtualBox ។</p><p>ប្រើ​ប៊ូតុង <b>ពិនិត្យ​មើល</b> ដើម្បី​ពិនិត្យ​មើល​កំណែ​ថ្មី​ឥឡូវ ឬ​ប៊ូតុង <b>បោះបង់</b> ប្រសិនបើ​អ្នក​មិន​ចង់​អនុវត្ត​ការ​ត្រួតពិនិត្យ​នេះ​ទេ ។</p><p>អ្នក​អាច​រត់​អ្នក​ជំនួយការ​នេះ​នៅពេល​ណាមួយ ដោយ​​ជ្រើស <b>ពិនិត្យ​រកមើល​ភាព​ទាន់សម័យ...</b> ពី​ម៉ឺនុយ < [...]
+        <translation type="obsolete"><p>អ្នក​ជំនួយ​ការ​នេះ​នឹង​តភ្ជាប់​ទៅ​កាន់​តំបន់​បណ្ដាញ​របស់ VirtualBox ហើយ​ពិនិត្យ​មើល​ប្រសិនបើ​មានកំណែ​ថ្មី​របស់​ VirtualBox ។</p><p>ប្រើ​ប៊ូតុង <b>ពិនិត្យ​មើល</b> ដើម្បី​ពិនិត្យ​មើល​កំណែ​ថ្មី​ឥឡូវ ឬ​ប៊ូតុង <b>បោះបង់</b> ប្រសិនបើ​អ្នក​មិន​ចង់​អនុវត្ត​ការ​ត្រួតពិនិត្យ​នេះ​ទេ ។</p><p>អ្នក​អាច​រត់​អ្នក​ជំនួយការ​នេះ​នៅពេល​ណាមួយ ដោយ​​ជ្រើស <b>ពិនិត្យ​រកមើល​ភាព​ទាន់សម័យ...</b> ពី​ម៉ឺនុយ < [...]
     </message>
 </context>
 <context>
@@ -9144,11 +9115,11 @@ You may wish to translate this more like "Time remaining: %1"</comment
     </message>
     <message>
         <source>You want to:</source>
-        <translation type="unfinished">អ្នក​ចង់ ៖</translation>
+        <translation type="unfinished">អ្នក​ចង់ ៖</translation>
     </message>
     <message>
         <source><p>Saves the current execution state of the virtual machine to the physical hard disk of the host PC.</p><p>Next time this machine is started, it will be restored from the saved state and continue execution from the same place you saved it at, which will let you continue your work immediately.</p><p>Note that saving the machine state may take a long time, depending on the guest operating system type and the amount of memory you assigned to th [...]
-        <translation type="unfinished"><p>រក្សាទុក​ស្ថានភាព​ប្រតិបត្តិ​បច្ចុប្បន្ន​របស់​ម៉ាស៊ីន​និម្មិត ទៅ​ថាសរឹង​ហ្វីស៊ីខល​របស់​ម៉ាស៊ីន ។</p><p>ពេល​​ចាប់ផ្ដើម​ម៉ាស៊ីន​នេះ​លើកក្រោយ វា​នឹង​ត្រូ​វបាន​ស្ដារ​ពី​ស្ថានភាព​ដែល​បាន​រក្សាទុក និង​បន្ត​ប្រតិបត្តិការ​ពី​កន្លែង​ដដែល​ដែល​អ្នក​បាន​រក្សាទុក​វា ដែល​នឹង​អនុញ្ញាត​ឲ្យ​អ្នក​បន្ត​ការងារ​របស់​អ្នក​បាន​ភ្លាមៗ ។</p><p>ចំណាំ​ថា ការ​រក្សាទុក​ស្ថានភាព​របស់​ម៉ាស៊ីន​អាច​ចំណាយ​ពេល​យូ ដោយអាស្រ័យ​លើ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្ [...]
+        <translation type="unfinished"><p>រក្សាទុក​ស្ថានភាព​ប្រតិបត្តិ​បច្ចុប្បន្ន​របស់​ម៉ាស៊ីន​និម្មិត ទៅ​ថាសរឹង​ហ្វីស៊ីខល​របស់​ម៉ាស៊ីន ។</p><p>ពេល​​ចាប់ផ្ដើម​ម៉ាស៊ីន​នេះ​លើកក្រោយ វា​នឹង​ត្រូ​វបាន​ស្ដារ​ពី​ស្ថានភាព​ដែល​បាន​រក្សាទុក និង​បន្ត​ប្រតិបត្តិការ​ពី​កន្លែង​ដដែល​ដែល​អ្នក​បាន​រក្សាទុក​វា ដែល​នឹង​អនុញ្ញាត​ឲ្យ​អ្នក​បន្ត​ការងារ​របស់​អ្នក​បាន​ភ្លាមៗ ។</p><p>ចំណាំ​ថា ការ​រក្សាទុក​ស្ថានភាព​របស់​ម៉ាស៊ីន​អាច​ចំណាយ​ពេល​យូ ដោយអាស្រ័យ​លើ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្ [...]
     </message>
     <message>
         <source>&Save the machine state</source>
@@ -9156,7 +9127,7 @@ You may wish to translate this more like "Time remaining: %1"</comment
     </message>
     <message>
         <source><p>Sends the ACPI Power Button press event to the virtual machine.</p><p>Normally, the guest operating system running inside the virtual machine will detect this event and perform a clean shutdown procedure. This is a recommended way to turn off the virtual machine because all applications running inside it will get a chance to save their data and state.</p><p>If the machine doesn't respond to this action then the guest operating system  [...]
-        <translation type="unfinished"><p>ផ្ញើ​ព្រឹត្តិការ​ចុច​ប៊ូតុង​ថាមពល ACPI ទៅកាន់​ម៉ាស៊ីន​និម្មិត ។</p><p>ជា​ធម្មតា ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​រត់​ខាង​ក្នុង​ម៉ាស៊ីន​និម្មិត នឹង​រកឃើញ​ព្រឹត្តិការ​នេះ ហើយ​អនុវត្ត​នីតិវិធី​បិទ​ការ​ជម្រះ ។ នេះ​ជា​មធ្យោបាយ​ដែល​បានផ្ដល់​អនុសាសន៍ ឲ្យ​បិទ​ម៉ាស៊ីន​និម្មិត ពីព្រោះ​កម្មវិធី​ទាំង​អស់​ដែល​កំពុង​រត់​ខាង​ក្នុង​នឹង​មាន​ឱកាស​រក្សាទុក​ស្ថានភាព និង​ទិន្នន័យ​របស់​វា ។</p><p>ប្រសិន​បើ​ម៉ាស៊ីន​មិន​ឆ្លើយតប​នឹង​សកម្ [...]
+        <translation type="unfinished"><p>ផ្ញើ​ព្រឹត្តិការ​ចុច​ប៊ូតុង​ថាមពល ACPI ទៅកាន់​ម៉ាស៊ីន​និម្មិត ។</p><p>ជា​ធម្មតា ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​រត់​ខាង​ក្នុង​ម៉ាស៊ីន​និម្មិត នឹង​រកឃើញ​ព្រឹត្តិការ​នេះ ហើយ​អនុវត្ត​នីតិវិធី​បិទ​ការ​ជម្រះ ។ នេះ​ជា​មធ្យោបាយ​ដែល​បានផ្ដល់​អនុសាសន៍ ឲ្យ​បិទ​ម៉ាស៊ីន​និម្មិត ពីព្រោះ​កម្មវិធី​ទាំង​អស់​ដែល​កំពុង​រត់​ខាង​ក្នុង​នឹង​មាន​ឱកាស​រក្សាទុក​ស្ថានភាព និង​ទិន្នន័យ​របស់​វា ។</p><p>ប្រសិន​បើ​ម៉ាស៊ីន​មិន​ឆ្លើយតប​នឹង​សកម្ [...]
     </message>
     <message>
         <source>S&end the shutdown signal</source>
@@ -9164,7 +9135,7 @@ You may wish to translate this more like "Time remaining: %1"</comment
     </message>
     <message>
         <source><p>Turns off the virtual machine.</p><p>Note that this action will stop machine execution immediately so that the guest operating system running inside it will not be able to perform a clean shutdown procedure which may result in <i>data loss</i> inside the virtual machine. Selecting this action is recommended only if the virtual machine does not respond to the <b>Send the shutdown signal</b> action.</p></source>
-        <translation type="unfinished"><p>បិទ​ម៉ាស៊ីន​និម្មិត ។</p><p>ចំណាំ​ថា សកម្មភាព​នេះ​នឹង​បញ្ឈប់​កា​រប្រតិបត្តិ​របស់ម៉ាស៊ីន​ភ្លាមៗ​តែ​ម្ដង ដូច្នេះ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន​ភ្ញៀវ​កំពុង​រត់​ខាង​​ក្នុង​វា​នឹង​មិនអាច​អនុវត្ត​នីតិវិធី​បិទ​ការ​ជម្រះ​ដែល​អាច​បណ្ដាល​ឲ្យ <i>បាត់បង់​ទិន្នន័យ</i> ខាង​ក្នុង​ម៉ាស៊ីន​និម្មិត​បានទេ ។ កា​រជ្រើស​សកម្ម​ភាព​នេះ​ត្រូវ​បានផ្ដល់​អនុសាសន៍​តែ​ក្នុងករណី​ដែល​ម៉ាស៊ីន​និមន្មិត​មិន​ឆ្លើយតប​នឹង​សកម្មភាព <b>ផ្ញើ​សញ្ញ [...]
+        <translation type="unfinished"><p>បិទ​ម៉ាស៊ីន​និម្មិត ។</p><p>ចំណាំ​ថា សកម្មភាព​នេះ​នឹង​បញ្ឈប់​កា​រប្រតិបត្តិ​របស់ម៉ាស៊ីន​ភ្លាមៗ​តែ​ម្ដង ដូច្នេះ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន​ភ្ញៀវ​កំពុង​រត់​ខាង​​ក្នុង​វា​នឹង​មិនអាច​អនុវត្ត​នីតិវិធី​បិទ​ការ​ជម្រះ​ដែល​អាច​បណ្ដាល​ឲ្យ <i>បាត់បង់​ទិន្នន័យ</i> ខាង​ក្នុង​ម៉ាស៊ីន​និម្មិត​បានទេ ។ កា​រជ្រើស​សកម្ម​ភាព​នេះ​ត្រូវ​បានផ្ដល់​អនុសាសន៍​តែ​ក្នុងករណី​ដែល​ម៉ាស៊ីន​និមន្មិត​មិន​ឆ្លើយតប​នឹង​សកម្មភាព <b>ផ្ញើ​សញ្ញ [...]
     </message>
     <message>
         <source>&Power off the machine</source>
@@ -9176,7 +9147,7 @@ You may wish to translate this more like "Time remaining: %1"</comment
     </message>
     <message>
         <source><p>When checked, the machine will be returned to the state stored in the current snapshot after it is turned off. This is useful if you are sure that you want to discard the results of your last sessions and start again at that snapshot.</p></source>
-        <translation type="unfinished"><p>នៅពេល​គូស​ធីក ស្ថានភាព​ម៉ាស៊ីន​នឹង​ត្រូវ​បាន​ស្ដារ​ពី​ស្ថានភាព​ដែល​បាន​ទុក​នៅ​ក្នុង​រូបថត​បច្ចុប្បន្ន​ខាង​ស្ដាំ​បន្ទាប់​ពី​​បិទ ។ វា​មាន​ប្រយោជន៍​ប្រសិន​បើ​​អ្នក​ប្រាកដ​ថា អ្នក​ចង់​បោះបង់​លទ្ធផល​នៃ​សម័យ​ចុងក្រោយ​របស់​អ្នក ហើយ​ត្រឡប់​ទៅ​រូបថត​បច្ចុប្បន្ន ។</p></translation>
+        <translation type="unfinished"><p>នៅពេល​គូស​ធីក ស្ថានភាព​ម៉ាស៊ីន​នឹង​ត្រូវ​បាន​ស្ដារ​ពី​ស្ថានភាព​ដែល​បាន​ទុក​នៅ​ក្នុង​រូបថត​បច្ចុប្បន្ន​ខាង​ស្ដាំ​បន្ទាប់​ពី​​បិទ ។ វា​មាន​ប្រយោជន៍​ប្រសិន​បើ​​អ្នក​ប្រាកដ​ថា អ្នក​ចង់​បោះបង់​លទ្ធផល​នៃ​សម័យ​ចុងក្រោយ​របស់​អ្នក ហើយ​ត្រឡប់​ទៅ​រូបថត​បច្ចុប្បន្ន ។</p></translation>
     </message>
     <message>
         <source>&Restore current snapshot '%1'</source>
@@ -9206,117 +9177,49 @@ You may wish to translate this more like "Time remaining: %1"</comment
     <name>UIVMInfoDialog</name>
     <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - ព័ត៌មាន​សម័យ</translation>
-    </message>
-    <message>
-        <source>&Details</source>
-        <translation type="obsolete">សេចក្ដី​លម្អិត</translation>
-    </message>
-    <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">ពេលវេលា​រត់</translation>
+        <translation type="unfinished">%1 - ព័ត៌មាន​សម័យ</translation>
     </message>
     <message>
-        <source>DMA Transfers</source>
-        <translation>ការ​ផ្ទេរ DMA</translation>
-    </message>
-    <message>
-        <source>PIO Transfers</source>
-        <translation>ការ​ផ្ទេរ PIO</translation>
-    </message>
-    <message>
-        <source>Data Read</source>
-        <translation>អាន​ទិន្នន័យ</translation>
-    </message>
-    <message>
-        <source>Data Written</source>
-        <translation>សរសេរ​ទិន្នន័យ</translation>
-    </message>
-    <message>
-        <source>Data Transmitted</source>
-        <translation>បានផ្ទេរ​ទិន្នន័យ</translation>
-    </message>
-    <message>
-        <source>Data Received</source>
-        <translation>បាន​ទទួល​ទិន្នន័យ</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>គុណលក្ខណៈ​ពេលវេលា​រត់</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>គុណភាព​បង្ហាញ​របស់​អេក្រង់</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">កំណែ %1.%2</translation>
-    </message>
-    <message>
-        <source>Not Detected</source>
-        <comment>guest additions</comment>
-        <translation>រក​មិនឃើញ</translation>
-    </message>
-    <message>
-        <source>Not Detected</source>
-        <comment>guest os type</comment>
-        <translation>រក​មិន​ឃើញ</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>ការ​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ</translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation>ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ</translation>
-    </message>
-    <message>
-        <source>No Network Adapters</source>
-        <translation>គ្មានអាដាប់ទ័រ​បណ្ដាញ​ទេ</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">បានបើក</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">បានបិទ</translation>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="unfinished">ការ​ផ្ទេរ DMA</translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <translation type="obsolete">ភេយីង​ខាង​ក្នុង</translation>
+        <source>PIO Transfers</source>
+        <translation type="unfinished">ការ​ផ្ទេរ PIO</translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>Data Read</source>
+        <translation type="unfinished">អាន​ទិន្នន័យ</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>
-
-
-details report (VRDP server port)</comment>
-        <translation type="obsolete">មិនអាច​ប្រើបាន​</translation>
+        <source>Data Written</source>
+        <translation type="unfinished">សរសេរ​ទិន្នន័យ</translation>
     </message>
     <message>
-        <source>Storage Statistics</source>
-        <translation>ស្ថិតិ​ផ្ទុក​</translation>
+        <source>Data Transmitted</source>
+        <translation type="unfinished">បានផ្ទេរ​ទិន្នន័យ</translation>
     </message>
     <message>
-        <source>No Storage Devices</source>
-        <translation>គ្មាន​ឧបករណ៍​ផ្ទុក​ទេ​</translation>
+        <source>Data Received</source>
+        <translation type="unfinished">បាន​ទទួល​ទិន្នន័យ</translation>
     </message>
     <message>
-        <source>Network Statistics</source>
-        <translation>ស្ថិតិ​បណ្ដាញ</translation>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">មិនអាច​ប្រើបាន​</translation>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Available</source>
@@ -9324,25 +9227,49 @@ details report (VRDP server port)</comment>
         <translation type="unfinished">មិនអាច​ប្រើបាន​</translation>
     </message>
     <message>
-        <source>Clipboard Mode</source>
-        <translation type="unfinished"></translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">គុណលក្ខណៈ​ពេលវេលា​រត់</translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">គុណភាព​បង្ហាញ​របស់​អេក្រង់</translation>
     </message>
     <message>
-        <source>&Runtime Information</source>
+        <source>VM Uptime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>VM Uptime</source>
+        <source>Clipboard Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drag and Drop Mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="unfinished">ការ​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="unfinished">ស្ថិតិ​ផ្ទុក​</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="unfinished">គ្មាន​ឧបករណ៍​ផ្ទុក​ទេ​</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="unfinished">ស្ថិតិ​បណ្ដាញ</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">គ្មានអាដាប់ទ័រ​បណ្ដាញ​ទេ</translation>
+    </message>
 </context>
 <context>
     <name>UIVMListView</name>
@@ -9437,7 +9364,7 @@ details report (VRDP server port)</comment>
     </message>
     <message>
         <source><p>No log files found. Press the <b>Refresh</b> button to rescan the log folder <nobr><b>%1</b></nobr>.</p></source>
-        <translation type="unfinished"><p>រក​មិនឃើញ​កំណត់ហេតុទេ ។ ចុច​ប៊ូតុង <b>ធ្វើ​ឲ្យ​ស្រស់</b> ដើម្បី​វិភាគ​ថត​កំណត់ហេតុ​ម្ដង​ទៀត <nobr><b>%1</b></nobr> ។</p></translation>
+        <translation type="unfinished"><p>រក​មិនឃើញ​កំណត់ហេតុទេ ។ ចុច​ប៊ូតុង <b>ធ្វើ​ឲ្យ​ស្រស់</b> ដើម្បី​វិភាគ​ថត​កំណត់ហេតុ​ម្ដង​ទៀត <nobr><b>%1</b></nobr> ។</p></translation>
     </message>
     <message>
         <source>Save VirtualBox Log As</source>
@@ -9746,7 +9673,7 @@ details report (VRDP server port)</comment>
     </message>
     <message>
         <source>&Hostname:</source>
-        <translation type="unfinished">ឈ្មោះ​ម៉ាស៊ីន​ ៖</translation>
+        <translation type="unfinished">ឈ្មោះ​ម៉ាស៊ីន​ ៖</translation>
     </message>
     <message>
         <source>&Bucket:</source>
@@ -9754,7 +9681,7 @@ details report (VRDP server port)</comment>
     </message>
     <message>
         <source>&File:</source>
-        <translation type="unfinished">ឯកសារ​ ៖</translation>
+        <translation type="unfinished">ឯកសារ​ ៖</translation>
     </message>
     <message>
         <source>Open Virtualization Format Archive (%1)</source>
@@ -9918,7 +9845,7 @@ details report (VRDP server port)</comment>
     </message>
     <message>
         <source>These are the virtual machines contained in the appliance and the suggested settings of the imported VirtualBox machines. You can change many of the properties shown by double-clicking on the items and disable others using the check boxes below.</source>
-        <translation type="unfinished">មាន​ម៉ាស៊ីន​និម្មិត​ដែល​មាន​នៅ​ក្នុង​ឧបករណ៍​ និង​ការ​កំណត់​ដែលបាន​ស្នើ​របស់ម៉ាស៊ីន VirtualBox ដែល​បាននាំចូល ។ អ្នក​អាច​ផ្លាស់ប្ដូរ​លក្ខណសម្បត្តិ​ដែលបានបង្ហាញ​ដោយ​ចុច​ទ្វេដង​លើ​ធាតុ និងបិទ​​លក្ខណសម្បត្តិ​ផ្សេងៗ​ទៀត ដោយ​ប្រើ​ប្រ​អប់ធីក​ខាង​ក្រោម ។</translation>
+        <translation type="unfinished">មាន​ម៉ាស៊ីន​និម្មិត​ដែល​មាន​នៅ​ក្នុង​ឧបករណ៍​ និង​ការ​កំណត់​ដែលបាន​ស្នើ​របស់ម៉ាស៊ីន VirtualBox ដែល​បាននាំចូល ។ អ្នក​អាច​ផ្លាស់ប្ដូរ​លក្ខណសម្បត្តិ​ដែលបានបង្ហាញ​ដោយ​ចុច​ទ្វេដង​លើ​ធាតុ និងបិទ​​លក្ខណសម្បត្តិ​ផ្សេងៗ​ទៀត ដោយ​ប្រើ​ប្រ​អប់ធីក​ខាង​ក្រោម ។</translation>
     </message>
     <message>
         <source>Import Virtual Appliance</source>
@@ -10110,7 +10037,7 @@ details report (VRDP server port)</comment>
     </message>
     <message>
         <source>You want to:</source>
-        <translation type="obsolete">អ្នក​ចង់ ៖</translation>
+        <translation type="obsolete">អ្នក​ចង់ ៖</translation>
     </message>
     <message>
         <source>&Save the machine state</source>
@@ -10126,19 +10053,19 @@ details report (VRDP server port)</comment>
     </message>
     <message>
         <source><p>When checked, the machine will be returned to the state stored in the current snapshot after it is turned off. This is useful if you are sure that you want to discard the results of your last sessions and start again at that snapshot.</p></source>
-        <translation type="obsolete"><p>នៅពេល​គូស​ធីក ស្ថានភាព​ម៉ាស៊ីន​នឹង​ត្រូវ​បាន​ស្ដារ​ពី​ស្ថានភាព​ដែល​បាន​ទុក​នៅ​ក្នុង​រូបថត​បច្ចុប្បន្ន​ខាង​ស្ដាំ​បន្ទាប់​ពី​​បិទ ។ វា​មាន​ប្រយោជន៍​ប្រសិន​បើ​​អ្នក​ប្រាកដ​ថា អ្នក​ចង់​បោះបង់​លទ្ធផល​នៃ​សម័យ​ចុងក្រោយ​របស់​អ្នក ហើយ​ត្រឡប់​ទៅ​រូបថត​បច្ចុប្បន្ន ។</p></translation>
+        <translation type="obsolete"><p>នៅពេល​គូស​ធីក ស្ថានភាព​ម៉ាស៊ីន​នឹង​ត្រូវ​បាន​ស្ដារ​ពី​ស្ថានភាព​ដែល​បាន​ទុក​នៅ​ក្នុង​រូបថត​បច្ចុប្បន្ន​ខាង​ស្ដាំ​បន្ទាប់​ពី​​បិទ ។ វា​មាន​ប្រយោជន៍​ប្រសិន​បើ​​អ្នក​ប្រាកដ​ថា អ្នក​ចង់​បោះបង់​លទ្ធផល​នៃ​សម័យ​ចុងក្រោយ​របស់​អ្នក ហើយ​ត្រឡប់​ទៅ​រូបថត​បច្ចុប្បន្ន ។</p></translation>
     </message>
     <message>
         <source><p>Saves the current execution state of the virtual machine to the physical hard disk of the host PC.</p><p>Next time this machine is started, it will be restored from the saved state and continue execution from the same place you saved it at, which will let you continue your work immediately.</p><p>Note that saving the machine state may take a long time, depending on the guest operating system type and the amount of memory you assigned to th [...]
-        <translation type="obsolete"><p>រក្សាទុក​ស្ថានភាព​ប្រតិបត្តិ​បច្ចុប្បន្ន​របស់​ម៉ាស៊ីន​និម្មិត ទៅ​ថាសរឹង​ហ្វីស៊ីខល​របស់​ម៉ាស៊ីន ។</p><p>ពេល​​ចាប់ផ្ដើម​ម៉ាស៊ីន​នេះ​លើកក្រោយ វា​នឹង​ត្រូ​វបាន​ស្ដារ​ពី​ស្ថានភាព​ដែល​បាន​រក្សាទុក និង​បន្ត​ប្រតិបត្តិការ​ពី​កន្លែង​ដដែល​ដែល​អ្នក​បាន​រក្សាទុក​វា ដែល​នឹង​អនុញ្ញាត​ឲ្យ​អ្នក​បន្ត​ការងារ​របស់​អ្នក​បាន​ភ្លាមៗ ។</p><p>ចំណាំ​ថា ការ​រក្សាទុក​ស្ថានភាព​របស់​ម៉ាស៊ីន​អាច​ចំណាយ​ពេល​យូ ដោយអាស្រ័យ​លើ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិ [...]
+        <translation type="obsolete"><p>រក្សាទុក​ស្ថានភាព​ប្រតិបត្តិ​បច្ចុប្បន្ន​របស់​ម៉ាស៊ីន​និម្មិត ទៅ​ថាសរឹង​ហ្វីស៊ីខល​របស់​ម៉ាស៊ីន ។</p><p>ពេល​​ចាប់ផ្ដើម​ម៉ាស៊ីន​នេះ​លើកក្រោយ វា​នឹង​ត្រូ​វបាន​ស្ដារ​ពី​ស្ថានភាព​ដែល​បាន​រក្សាទុក និង​បន្ត​ប្រតិបត្តិការ​ពី​កន្លែង​ដដែល​ដែល​អ្នក​បាន​រក្សាទុក​វា ដែល​នឹង​អនុញ្ញាត​ឲ្យ​អ្នក​បន្ត​ការងារ​របស់​អ្នក​បាន​ភ្លាមៗ ។</p><p>ចំណាំ​ថា ការ​រក្សាទុក​ស្ថានភាព​របស់​ម៉ាស៊ីន​អាច​ចំណាយ​ពេល​យូ ដោយអាស្រ័យ​លើ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិ [...]
     </message>
     <message>
         <source><p>Sends the ACPI Power Button press event to the virtual machine.</p><p>Normally, the guest operating system running inside the virtual machine will detect this event and perform a clean shutdown procedure. This is a recommended way to turn off the virtual machine because all applications running inside it will get a chance to save their data and state.</p><p>If the machine doesn't respond to this action then the guest operating system  [...]
-        <translation type="obsolete"><p>ផ្ញើ​ព្រឹត្តិការ​ចុច​ប៊ូតុង​ថាមពល ACPI ទៅកាន់​ម៉ាស៊ីន​និម្មិត ។</p><p>ជា​ធម្មតា ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​រត់​ខាង​ក្នុង​ម៉ាស៊ីន​និម្មិត នឹង​រកឃើញ​ព្រឹត្តិការ​នេះ ហើយ​អនុវត្ត​នីតិវិធី​បិទ​ការ​ជម្រះ ។ នេះ​ជា​មធ្យោបាយ​ដែល​បានផ្ដល់​អនុសាសន៍ ឲ្យ​បិទ​ម៉ាស៊ីន​និម្មិត ពីព្រោះ​កម្មវិធី​ទាំង​អស់​ដែល​កំពុង​រត់​ខាង​ក្នុង​នឹង​មាន​ឱកាស​រក្សាទុក​ស្ថានភាព និង​ទិន្នន័យ​របស់​វា ។</p><p>ប្រសិន​បើ​ម៉ាស៊ីន​មិន​ឆ្លើយតប​នឹង​សកម្មភ [...]
+        <translation type="obsolete"><p>ផ្ញើ​ព្រឹត្តិការ​ចុច​ប៊ូតុង​ថាមពល ACPI ទៅកាន់​ម៉ាស៊ីន​និម្មិត ។</p><p>ជា​ធម្មតា ប្រព័ន្ធ​ប្រតិបត្តិការ​ម៉ាស៊ីន​ភ្ញៀវ​រត់​ខាង​ក្នុង​ម៉ាស៊ីន​និម្មិត នឹង​រកឃើញ​ព្រឹត្តិការ​នេះ ហើយ​អនុវត្ត​នីតិវិធី​បិទ​ការ​ជម្រះ ។ នេះ​ជា​មធ្យោបាយ​ដែល​បានផ្ដល់​អនុសាសន៍ ឲ្យ​បិទ​ម៉ាស៊ីន​និម្មិត ពីព្រោះ​កម្មវិធី​ទាំង​អស់​ដែល​កំពុង​រត់​ខាង​ក្នុង​នឹង​មាន​ឱកាស​រក្សាទុក​ស្ថានភាព និង​ទិន្នន័យ​របស់​វា ។</p><p>ប្រសិន​បើ​ម៉ាស៊ីន​មិន​ឆ្លើយតប​នឹង​សកម្មភ [...]
     </message>
     <message>
         <source><p>Turns off the virtual machine.</p><p>Note that this action will stop machine execution immediately so that the guest operating system running inside it will not be able to perform a clean shutdown procedure which may result in <i>data loss</i> inside the virtual machine. Selecting this action is recommended only if the virtual machine does not respond to the <b>Send the shutdown signal</b> action.</p></source>
-        <translation type="obsolete"><p>បិទ​ម៉ាស៊ីន​និម្មិត ។</p><p>ចំណាំ​ថា សកម្មភាព​នេះ​នឹង​បញ្ឈប់​កា​រប្រតិបត្តិ​របស់ម៉ាស៊ីន​ភ្លាមៗ​តែ​ម្ដង ដូច្នេះ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន​ភ្ញៀវ​កំពុង​រត់​ខាង​​ក្នុង​វា​នឹង​មិនអាច​អនុវត្ត​នីតិវិធី​បិទ​ការ​ជម្រះ​ដែល​អាច​បណ្ដាល​ឲ្យ <i>បាត់បង់​ទិន្នន័យ</i> ខាង​ក្នុង​ម៉ាស៊ីន​និម្មិត​បានទេ ។ កា​រជ្រើស​សកម្ម​ភាព​នេះ​ត្រូវ​បានផ្ដល់​អនុសាសន៍​តែ​ក្នុងករណី​ដែល​ម៉ាស៊ីន​និមន្មិត​មិន​ឆ្លើយតប​នឹង​សកម្មភាព <b>ផ្ញើ​សញ្ញា​ [...]
+        <translation type="obsolete"><p>បិទ​ម៉ាស៊ីន​និម្មិត ។</p><p>ចំណាំ​ថា សកម្មភាព​នេះ​នឹង​បញ្ឈប់​កា​រប្រតិបត្តិ​របស់ម៉ាស៊ីន​ភ្លាមៗ​តែ​ម្ដង ដូច្នេះ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន​ភ្ញៀវ​កំពុង​រត់​ខាង​​ក្នុង​វា​នឹង​មិនអាច​អនុវត្ត​នីតិវិធី​បិទ​ការ​ជម្រះ​ដែល​អាច​បណ្ដាល​ឲ្យ <i>បាត់បង់​ទិន្នន័យ</i> ខាង​ក្នុង​ម៉ាស៊ីន​និម្មិត​បានទេ ។ កា​រជ្រើស​សកម្ម​ភាព​នេះ​ត្រូវ​បានផ្ដល់​អនុសាសន៍​តែ​ក្នុងករណី​ដែល​ម៉ាស៊ីន​និមន្មិត​មិន​ឆ្លើយតប​នឹង​សកម្មភាព <b>ផ្ញើ​សញ្ញា​ [...]
     </message>
     <message>
         <source>Restore the machine state stored in the current snapshot</source>
@@ -10250,11 +10177,11 @@ details report (VRDP server port)</comment>
         <translation type="obsolete">បើក​ប្រអប់​ដើម្បី​ប្រតិបត្តិ​លើ​ថត​ដែល​បានចែករំលែក</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">ដំឡើង​ការ​បន្ថែម​ភ្ញៀវ...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">ម៉ោន​រូបភាព​ដំឡើង​បន្ថែម​ភ្ញៀវ</translation>
     </message>
     <message>
@@ -10333,7 +10260,7 @@ details report (VRDP server port)</comment>
     <message>
         <source><br><nobr><b>Adapter %1 (%2)</b>: cable %3</nobr></source>
         <comment>Network adapters tooltip</comment>
-        <translation type="obsolete"><br><nobr><b>អាដាប់ទ័រ %1 (%2)</b> ៖ ខ្សែ %3</nobr></translation>
+        <translation type="obsolete"><br><nobr><b>អាដាប់ទ័រ %1 (%2)</b> ៖ ខ្សែ %3</nobr></translation>
     </message>
     <message>
         <source>connected</source>
@@ -10370,7 +10297,7 @@ details report (VRDP server port)</comment>
         <translation type="obsolete">ប្រអប់​ព័ត៌មាន​សម័យ</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">បង្ហាញ​ប្រអប់​ព័ត៌មាន​សម័យ</translation>
     </message>
     <message>
@@ -10385,19 +10312,19 @@ details report (VRDP server port)</comment>
     </message>
     <message>
         <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source>
-        <translation type="obsolete">បង្ហាញ​ថាតើ​ការបង្ហាញ​ម៉ាស៊ីន​​ភ្ញៀវ​មុខងារ​ផ្លាស់ប្ដូរ​ទំហំ​ដោយ​ស្វ័យ​ប្រវត្តិ​បើក (<img src=:/auto_resize_on_16px.png/>) ឬ​បិទ (<img src=:/auto_resize_off_16px.png/>) ។ ចំណាំ​ថា មុខងារ​នេះ​ត្រូវការ​ការ​បន្ថែម​ភ្ញៀវ​ដើម្បី​ដំឡើង​នៅក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន​ភ្ញៀវ ។</translation>
+        <translation type="obsolete">បង្ហាញ​ថាតើ​ការបង្ហាញ​ម៉ាស៊ីន​​ភ្ញៀវ​មុខងារ​ផ្លាស់ប្ដូរ​ទំហំ​ដោយ​ស្វ័យ​ប្រវត្តិ​បើក (<img src=:/auto_resize_on_16px.png/>) ឬ​បិទ (<img src=:/auto_resize_off_16px.png/>) ។ ចំណាំ​ថា មុខងារ​នេះ​ត្រូវការ​ការ​បន្ថែម​ភ្ញៀវ​ដើម្បី​ដំឡើង​នៅក្នុង​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់ម៉ាស៊ីន​ភ្ញៀវ ។</translation>
     </message>
     <message>
         <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_ [...]
-        <translation type="obsolete">បង្ហាញថា​តើ​ទស្សន៍​ទ្រនិច​កណ្ដុរ​របស់​ម៉ាស៊ីន​ត្រូ​វបាន​ចាប់យក​ដោយ​ប្រព័ន្ធ​ប្រតបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ដែរឬទេ ៖<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;ទស្សន៍​ទ្រនិច​មិន​ត្រូ​វបាន​ចាប់យក​ទេ</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;ទស្សន៍​ទ្រនិច​ត្រូវ​បាន​ចាប់យក</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;ការ [...]
+        <translation type="obsolete">បង្ហាញថា​តើ​ទស្សន៍​ទ្រនិច​កណ្ដុរ​របស់​ម៉ាស៊ីន​ត្រូ​វបាន​ចាប់យក​ដោយ​ប្រព័ន្ធ​ប្រតបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ​ដែរឬទេ ៖<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;ទស្សន៍​ទ្រនិច​មិន​ត្រូ​វបាន​ចាប់យក​ទេ</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;ទស្សន៍​ទ្រនិច​ត្រូវ​បាន​ចាប់យក</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;ការ [...]
     </message>
     <message>
         <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source>
-        <translation type="obsolete">បង្ហាញ​ថាតើ​ក្ដារចុច​ត្រូវ​បានចាប់យក​ដោយ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ (<img src=:/hostkey_captured_16px.png/>) ឬ​មិនមែន (<img src=:/hostkey_16px.png/>) ។</translation>
+        <translation type="obsolete">បង្ហាញ​ថាតើ​ក្ដារចុច​ត្រូវ​បានចាប់យក​ដោយ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ (<img src=:/hostkey_captured_16px.png/>) ឬ​មិនមែន (<img src=:/hostkey_16px.png/>) ។</translation>
     </message>
     <message>
         <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source>
-        <translation type="obsolete">បង្ហាញ​ថាតើ​ការ​បង្ហាញ​ពី​ចម្ងាយ (ម៉ាស៊ីន​បម្រើ VRDP) ត្រូវ​បានបើក (<img src=:/vrdp_16px.png/>) ឬ​អត់ (<img src=:/vrdp_disabled_16px.png/>) ។</translation>
+        <translation type="obsolete">បង្ហាញ​ថាតើ​ការ​បង្ហាញ​ពី​ចម្ងាយ (ម៉ាស៊ីន​បម្រើ VRDP) ត្រូវ​បានបើក (<img src=:/vrdp_16px.png/>) ឬ​អត់ (<img src=:/vrdp_disabled_16px.png/>) ។</translation>
     </message>
     <message>
         <source>&Logging...</source>
@@ -10406,7 +10333,7 @@ details report (VRDP server port)</comment>
     </message>
     <message>
         <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source>
-        <translation type="obsolete">បង្ហាញ​គ្រាប់ចុច​ម៉ាស៊ីន​ដែលបានផ្ដល់​បច្ចុប្បន្ន ។<br>គ្រាប់ចុច​នេះ នៅពេល​ចុច​យូរ បិទ/បើក​ក្ដារចុច ហើយ​ស្ថានភាព​ចាប់យក​កណ្ដុរ ។ វា​អាច​ត្រូវ​បាន​ប្រើ​ក្នុង​បន្សំ​ជា​មួយ​គ្រាប់ចុច​ផ្សេង ដើម្បី​អនុវត្ត​សកម្មភាព​យ៉ាង​លឿន ពី​ម៉ឺនុយ​ចម្បង ។</translation>
+        <translation type="obsolete">បង្ហាញ​គ្រាប់ចុច​ម៉ាស៊ីន​ដែលបានផ្ដល់​បច្ចុប្បន្ន ។<br>គ្រាប់ចុច​នេះ នៅពេល​ចុច​យូរ បិទ/បើក​ក្ដារចុច ហើយ​ស្ថានភាព​ចាប់យក​កណ្ដុរ ។ វា​អាច​ត្រូវ​បាន​ប្រើ​ក្នុង​បន្សំ​ជា​មួយ​គ្រាប់ចុច​ផ្សេង ដើម្បី​អនុវត្ត​សកម្មភាព​យ៉ាង​លឿន ពី​ម៉ឺនុយ​ចម្បង ។</translation>
     </message>
     <message>
         <source>Sun VirtualBox</source>
@@ -10470,7 +10397,7 @@ enable/disable...</comment>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the virtual hard disks:</nobr>%1</p></source>
         <comment>
 HDD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថាសរឹង​និម្មិត ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថាសរឹង​និម្មិត ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the CD/DVD devices:</nobr>%1</p></source>
@@ -10488,7 +10415,7 @@ CD/DVD tooltip</comment>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy devices:</nobr>%1</p></source>
         <comment>
 FD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍​ថាស​ទន់ ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍​ថាស​ទន់ ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>No floppy devices attached</b></nobr></source>
@@ -10500,19 +10427,19 @@ FD tooltip</comment>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the network interfaces:</nobr>%1</p></source>
         <comment>
 Network adapters tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ចំណុច​ប្រទាក់​បណ្ដាញ ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ចំណុច​ប្រទាក់​បណ្ដាញ ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the attached USB devices:</nobr>%1</p></source>
         <comment>
 USB device tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍ USB ដែល​បាន​ភ្ជាប់ ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍ USB ដែល​បាន​ភ្ជាប់ ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the machine's shared folders:</nobr>%1</p></source>
         <comment>
 Shared folders tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថត​ដែល​បានចែករំលែក​របស់​ម៉ាស៊ីន ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថត​ដែល​បានចែករំលែក​របស់​ម៉ាស៊ីន ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source>Indicates the status of the hardware virtualization features used by this virtual machine:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr></source>
@@ -10523,7 +10450,7 @@ Shared folders tooltip</comment>
 
 
 Virtualization Stuff LED</comment>
-        <translation type="obsolete">បង្ហាញថា ​ស្ថាន​ភាព​របស់​លក្ខណៈពិសេស​និម្មិត​ផ្នែក​រឹង​ត្រូ​វបាន​ប្រើ​ដោយ​ម៉ាស៊ីន​និម្មិត​នេះ ៖​<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr></translation>
+        <translation type="obsolete">បង្ហាញថា ​ស្ថាន​ភាព​របស់​លក្ខណៈពិសេស​និម្មិត​ផ្នែក​រឹង​ត្រូ​វបាន​ប្រើ​ដោយ​ម៉ាស៊ីន​និម្មិត​នេះ ៖​<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr></translation>
     </message>
     <message>
         <source><br><nobr><b>%1:</b>&nbsp;%2</nobr></source>
@@ -10539,7 +10466,7 @@ Virtualization Stuff LED</comment>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the virtual hard disks:</nobr>%1</p></source>
         <comment>HDD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថាសរឹង​និម្មិត ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថាសរឹង​និម្មិត ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the CD/DVD devices:</nobr>%1</p></source>
@@ -10554,7 +10481,7 @@ Virtualization Stuff LED</comment>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy devices:</nobr>%1</p></source>
         <comment>FD tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍​ថាស​ទន់ ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍​ថាស​ទន់ ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>No floppy devices attached</b></nobr></source>
@@ -10564,22 +10491,22 @@ Virtualization Stuff LED</comment>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the network interfaces:</nobr>%1</p></source>
         <comment>Network adapters tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ចំណុច​ប្រទាក់​បណ្ដាញ ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ចំណុច​ប្រទាក់​បណ្ដាញ ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the attached USB devices:</nobr>%1</p></source>
         <comment>USB device tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍ USB ដែល​បាន​ភ្ជាប់ ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ឧបករណ៍ USB ដែល​បាន​ភ្ជាប់ ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the machine's shared folders:</nobr>%1</p></source>
         <comment>Shared folders tooltip</comment>
-        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថត​ដែល​បានចែករំលែក​របស់​ម៉ាស៊ីន ៖</nobr>%1</p></translation>
+        <translation type="obsolete"><p style='white-space:pre'><nobr>បង្ហាញ​សកម្មភាព​របស់​ថត​ដែល​បានចែករំលែក​របស់​ម៉ាស៊ីន ៖</nobr>%1</p></translation>
     </message>
     <message>
         <source>Indicates the status of the hardware virtualization features used by this virtual machine:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr></source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="obsolete">បង្ហាញថា ​ស្ថាន​ភាព​របស់​លក្ខណៈពិសេស​និម្មិត​ផ្នែក​រឹង​ត្រូ​វបាន​ប្រើ​ដោយ​ម៉ាស៊ីន​និម្មិត​នេះ ៖​<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr></translation>
+        <translation type="obsolete">បង្ហាញថា ​ស្ថាន​ភាព​របស់​លក្ខណៈពិសេស​និម្មិត​ផ្នែក​រឹង​ត្រូ​វបាន​ប្រើ​ដោយ​ម៉ាស៊ីន​និម្មិត​នេះ ៖​<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr></translation>
     </message>
     <message>
         <source><br><nobr><b>%1:</b>&nbsp;%2</nobr></source>
@@ -10609,8 +10536,8 @@ Virtualization Stuff LED</comment>
         <translation><កំណត់​ទៅ​លំនាំដើម​ឡើងវិញ></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">តម្លៃ​ផ្លូវ​លំនាំដើម​ពិតប្រាកដ​នឹង​ត្រូវ​បានបង្ហាញ​បន្ទាប់ពី​ទទួល​ការ​ផ្លាស់ប្ដូរ និង​បើក​ប្រអប់នេះ​ម្ដង​ទៀត ។</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished">តម្លៃ​ផ្លូវ​លំនាំដើម​ពិតប្រាកដ​នឹង​ត្រូវ​បានបង្ហាញ​បន្ទាប់ពី​ទទួល​ការ​ផ្លាស់ប្ដូរ និង​បើក​ប្រអប់នេះ​ម្ដង​ទៀត ។</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -10618,7 +10545,7 @@ Virtualization Stuff LED</comment>
     </message>
     <message>
         <source>Please use the <b>Other...</b> item from the drop-down list to select a path.</source>
-        <translation>សូម​ប្រើធាតុ <b>ផ្សេងៗ...</b> ពី​បញ្ជី​ទម្លាក់ចុះ​ដើម្បី​ជ្រើស​ផ្លូវ​ដែល​ចង់​បាន ។</translation>
+        <translation>សូម​ប្រើធាតុ <b>ផ្សេងៗ...</b> ពី​បញ្ជី​ទម្លាក់ចុះ​ដើម្បី​ជ្រើស​ផ្លូវ​ដែល​ចង់​បាន ។</translation>
     </message>
     <message>
         <source>Other...</source>
@@ -10630,19 +10557,19 @@ Virtualization Stuff LED</comment>
     </message>
     <message>
         <source>Opens a window to select a different folder.</source>
-        <translation type="obsolete">បើក​ប្រអប់ ដើម្បី​ជ្រើស​ថត​ផ្សេង ។</translation>
+        <translation type="obsolete">បើក​ប្រអប់ ដើម្បី​ជ្រើស​ថត​ផ្សេង ។</translation>
     </message>
     <message>
         <source>Resets the folder path to the default value.</source>
-        <translation>កំណត់​ផ្លូវថត​ទៅ​តម្លៃ​លំនាំដើម​ឡើង​វិញ ។</translation>
+        <translation>កំណត់​ផ្លូវថត​ទៅ​តម្លៃ​លំនាំដើម​ឡើង​វិញ ។</translation>
     </message>
     <message>
         <source>Opens a window to select a different file.</source>
-        <translation type="obsolete">បើក​ប្រអប់​ដើម្បី​ជ្រើស​ឯកសារ​ផ្សេង ។</translation>
+        <translation type="obsolete">បើក​ប្រអប់​ដើម្បី​ជ្រើស​ឯកសារ​ផ្សេង ។</translation>
     </message>
     <message>
         <source>Resets the file path to the default value.</source>
-        <translation>កំណត់​ផ្លូវ​ឯកសារ​ទៅ​តម្លៃ​លំនាំដើម​ឡើង​វិញ ។</translation>
+        <translation>កំណត់​ផ្លូវ​ឯកសារ​ទៅ​តម្លៃ​លំនាំដើម​ឡើង​វិញ ។</translation>
     </message>
     <message>
         <source>&Copy</source>
@@ -10650,15 +10577,16 @@ Virtualization Stuff LED</comment>
     </message>
     <message>
         <source>Please type the folder path here.</source>
-        <translation type="obsolete">សូម​វាយ​ផ្លូវ​ថត​ដែល​ចង់​បាននៅ​ទីនេះ ។</translation>
+        <translation type="obsolete">សូម​វាយ​ផ្លូវ​ថត​ដែល​ចង់​បាននៅ​ទីនេះ ។</translation>
     </message>
     <message>
         <source>Please type the file path here.</source>
-        <translation type="obsolete">សូម​វាយ​ផ្លូវ​ឯកសារ​ដែល​ចង់​បាន​នៅ​ទីនេះ ។</translation>
+        <translation type="obsolete">សូម​វាយ​ផ្លូវ​ឯកសារ​ដែល​ចង់​បាន​នៅ​ទីនេះ ។</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">តម្លៃ​ផ្លូវ​លំនាំដើម​ពិតប្រាកដ​នឹង​ត្រូវ​បានបង្ហាញ​បន្ទាប់ពី​ទទួល​ការ​ផ្លាស់ប្ដូរ និង​បើក​ប្រអប់នេះ​ម្ដង​ទៀត ។</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -10712,15 +10640,15 @@ Virtualization Stuff LED</comment>
     <name>VBoxGLSettingsInput</name>
     <message>
         <source>Host &Key:</source>
-        <translation type="obsolete">គ្រាប់ចុច​ម៉ាស៊ីន ៖</translation>
+        <translation type="obsolete">គ្រាប់ចុច​ម៉ាស៊ីន ៖</translation>
     </message>
     <message>
         <source>Holds the key used as a Host Key in the VM window. Activate the entry field and press a new Host Key. Note that alphanumeric, cursor movement and editing keys cannot be used.</source>
-        <translation type="obsolete">បង្ហាញគ្រាប់ចុច​ដែល​បាន​ប្រើ​ជា​គ្រាប់​ចុច​ម៉ាស៊ីន​នៅ​ក្នុង​បង្អួច VM ។ ធ្វើ​ឲ្យ​វាល​ធាតុ​សកម្ម ហើយ​ចុច​គ្រាប់ចុច​ម៉ាស៊ីន​ថ្មី ។ ចំណាំថា​លេខ ចលនា​ទស្សន៍ទ្រនិច និង​គ្រាប់ចុចកែសម្រួល​មិនអាច​ត្រូវ​បាន​ប្រើ​ជា​គ្រាប់ចុច​ម៉ាស៊ីន​ទេ ។</translation>
+        <translation type="obsolete">បង្ហាញគ្រាប់ចុច​ដែល​បាន​ប្រើ​ជា​គ្រាប់​ចុច​ម៉ាស៊ីន​នៅ​ក្នុង​បង្អួច VM ។ ធ្វើ​ឲ្យ​វាល​ធាតុ​សកម្ម ហើយ​ចុច​គ្រាប់ចុច​ម៉ាស៊ីន​ថ្មី ។ ចំណាំថា​លេខ ចលនា​ទស្សន៍ទ្រនិច និង​គ្រាប់ចុចកែសម្រួល​មិនអាច​ត្រូវ​បាន​ប្រើ​ជា​គ្រាប់ចុច​ម៉ាស៊ីន​ទេ ។</translation>
     </message>
     <message>
         <source>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</source>
-        <translation type="obsolete">នៅពេល​បានគូស​ធីក ក្ដារចុច​ត្រូ​វបាន​ចាប់យក​ដោយ​ស្វ័យ​ប្រវត្តិ​រាល់ពេល​ដែល​បង្អួច VM ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម ។ នៅពេល​ក្ដារចុច​ត្រូវ​បាន​ចាប់យក  keystrokes (រួម​មាន​ប្រព័ន្ធ​​មួយ ដូចជា ជំនួស(Alt)-ថេប(Tab)) ត្រូវ​បាន​បញ្ជូន​ទៅ​កាន់ VM ។</translation>
+        <translation type="obsolete">នៅពេល​បានគូស​ធីក ក្ដារចុច​ត្រូ​វបាន​ចាប់យក​ដោយ​ស្វ័យ​ប្រវត្តិ​រាល់ពេល​ដែល​បង្អួច VM ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម ។ នៅពេល​ក្ដារចុច​ត្រូវ​បាន​ចាប់យក  keystrokes (រួម​មាន​ប្រព័ន្ធ​​មួយ ដូចជា ជំនួស(Alt)-ថេប(Tab)) ត្រូវ​បាន​បញ្ជូន​ទៅ​កាន់ VM ។</translation>
     </message>
     <message>
         <source>&Auto Capture Keyboard</source>
@@ -10732,12 +10660,12 @@ Virtualization Stuff LED</comment>
     <message>
         <source>Unknown device %1:%2</source>
         <comment>USB device details</comment>
-        <translation>មិនស្គាល់​ឧបករណ៍ %1 ៖ %2</translation>
+        <translation>មិនស្គាល់​ឧបករណ៍ %1 ៖ %2</translation>
     </message>
     <message>
         <source><nobr>Vendor ID: %1</nobr><br><nobr>Product ID: %2</nobr><br><nobr>Revision: %3</nobr></source>
         <comment>USB device tooltip</comment>
-        <translation><nobr>លេខសម្គាល់​អ្នកលក់ ៖ %1</nobr><br><nobr>លេខសម្គាល់​អ្នក​ផលិត ៖ %2</nobr><br><nobr>ការ​ពិនិត្យ​ឡើង​វិញ ៖ %3</nobr></translation>
+        <translation><nobr>លេខសម្គាល់​អ្នកលក់ ៖ %1</nobr><br><nobr>លេខសម្គាល់​អ្នក​ផលិត ៖ %2</nobr><br><nobr>ការ​ពិនិត្យ​ឡើង​វិញ ៖ %3</nobr></translation>
     </message>
     <message>
         <source><br><nobr>Serial No. %1</nobr></source>
@@ -10747,7 +10675,7 @@ Virtualization Stuff LED</comment>
     <message>
         <source><br><nobr>State: %1</nobr></source>
         <comment>USB device tooltip</comment>
-        <translation><br><nobr>ស្ថានភាព ៖ %1</nobr></translation>
+        <translation><br><nobr>ស្ថានភាព ៖ %1</nobr></translation>
     </message>
     <message>
         <source>Name</source>
@@ -11272,42 +11200,42 @@ Virtualization Stuff LED</comment>
     <message>
         <source><nobr>Vendor ID: %1</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation><nobr>លេខ​សម្គាល់​អ្នក​លក់ ៖ %1</nobr></translation>
+        <translation><nobr>លេខ​សម្គាល់​អ្នក​លក់ ៖ %1</nobr></translation>
     </message>
     <message>
         <source><nobr>Product ID: %2</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation><nobr>លេខសម្គាល់​ផលិតផល ៖ %2</nobr></translation>
+        <translation><nobr>លេខសម្គាល់​ផលិតផល ៖ %2</nobr></translation>
     </message>
     <message>
         <source><nobr>Revision: %3</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation><nobr>កា​រពិនិត្យ​ឡើង​វិញ ៖ %3</nobr></translation>
+        <translation><nobr>កា​រពិនិត្យ​ឡើង​វិញ ៖ %3</nobr></translation>
     </message>
     <message>
         <source><nobr>Product: %4</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation><nobr>ផលិតផល ៖ %4</nobr></translation>
+        <translation><nobr>ផលិតផល ៖ %4</nobr></translation>
     </message>
     <message>
         <source><nobr>Manufacturer: %5</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation><nobr>ក្រុមហ៊ុន​ផលិត ៖ %5</nobr></translation>
+        <translation><nobr>ក្រុមហ៊ុន​ផលិត ៖ %5</nobr></translation>
     </message>
     <message>
         <source><nobr>Serial No.: %1</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation><nobr>លេខ​ស៊េរី ៖ %1</nobr></translation>
+        <translation><nobr>លេខ​ស៊េរី ៖ %1</nobr></translation>
     </message>
     <message>
         <source><nobr>Port: %1</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation><nobr>ច្រក ៖ %1</nobr></translation>
+        <translation><nobr>ច្រក ៖ %1</nobr></translation>
     </message>
     <message>
         <source><nobr>State: %1</nobr></source>
         <comment>USB filter tooltip</comment>
-        <translation><nobr>ស្ថានភាព ៖ %1</nobr></translation>
+        <translation><nobr>ស្ថានភាព ៖ %1</nobr></translation>
     </message>
     <message>
         <source>Adapter %1</source>
@@ -11851,7 +11779,7 @@ medium</comment>
 
 
 medium</comment>
-        <translation type="obsolete">បានបរាជ័យ​ក្នុងកា​រ​ពិនិត្យ​មើល​មធ្យោ​បាយ​ងាយ​ស្រួល​​របស់​មេឌៀ ។​</translation>
+        <translation type="obsolete">បានបរាជ័យ​ក្នុងកា​រ​ពិនិត្យ​មើល​មធ្យោ​បាយ​ងាយ​ស្រួល​​របស់​មេឌៀ ។​</translation>
     </message>
     <message>
         <source><b>No disk image file selected</b></source>
@@ -11864,7 +11792,7 @@ medium</comment>
     </message>
     <message>
         <source>You can also change this while the machine is running.</source>
-        <translation>អ្នក​ក៏អាច​ផ្លាស់ប្ដូរ​វា ខណៈពេល​ដែល​ម៉ាស៊ីន​កំពុង​រត់ ។</translation>
+        <translation>អ្នក​ក៏អាច​ផ្លាស់ប្ដូរ​វា ខណៈពេល​ដែល​ម៉ាស៊ីន​កំពុង​រត់ ។</translation>
     </message>
     <message>
         <source><b>No disk image files available</b></source>
@@ -11877,7 +11805,7 @@ medium</comment>
     </message>
     <message>
         <source>You can create disk image files using the virtual media manager.</source>
-        <translation type="obsolete">អ្នក​អាច​បង្កើត​រូបភាព​មេឌៀ ដោយ​ប្រើ​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត ។</translation>
+        <translation type="obsolete">អ្នក​អាច​បង្កើត​រូបភាព​មេឌៀ ដោយ​ប្រើ​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត ។</translation>
     </message>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
@@ -11887,7 +11815,7 @@ medium</comment>
 
 
 medium</comment>
-        <translation type="obsolete">ការ​ភ្ជាប់​ជា​មួយ​នឹង​ថាស​រឹង​នេះ នឹង​ត្រូវ​បាន​អនុវត្ត​ដោយ​ប្រយោល​ ដោយ​ប្រើ​ថាសរឹង​ផ្សេង​ដែលបានបង្កើត​ថ្មីៗ ។</translation>
+        <translation type="obsolete">ការ​ភ្ជាប់​ជា​មួយ​នឹង​ថាស​រឹង​នេះ នឹង​ត្រូវ​បាន​អនុវត្ត​ដោយ​ប្រយោល​ ដោយ​ប្រើ​ថាសរឹង​ផ្សេង​ដែលបានបង្កើត​ថ្មីៗ ។</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -11898,7 +11826,7 @@ medium</comment>
 
 
 medium</comment>
-        <translation type="obsolete">មេឌៀ​មួយ​ចំនួន​នៅ​ក្នុង​ស្រឡាយ​ផ្នែក​រឹង​នេះ​មិនអាច​ចូល​ដំណើរការ​បាន​ទេ ។ សូម​ប្រើ​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត​នៅ​ក្នុង​របៀប <b>បង្ហាញ​ថាសរឹង​ផ្សេងៗ​គ្នា</b> ដើម្បី​ពិនិត្យមើល​មេឌៀ​ទាំង​នេះ ។</translation>
+        <translation type="obsolete">មេឌៀ​មួយ​ចំនួន​នៅ​ក្នុង​ស្រឡាយ​ផ្នែក​រឹង​នេះ​មិនអាច​ចូល​ដំណើរការ​បាន​ទេ ។ សូម​ប្រើ​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត​នៅ​ក្នុង​របៀប <b>បង្ហាញ​ថាសរឹង​ផ្សេងៗ​គ្នា</b> ដើម្បី​ពិនិត្យមើល​មេឌៀ​ទាំង​នេះ ។</translation>
     </message>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
@@ -11908,7 +11836,7 @@ medium</comment>
 
 
 medium</comment>
-        <translation type="obsolete">ថាសរឹង​មូលដ្ឋាន​នេះ​ត្រូវ​បាន​ភ្ជាប់​ដោយ​ប្រយោល​ ដោយ​ប្រើ​ថាសរឹង​ផ្សេង ៖</translation>
+        <translation type="obsolete">ថាសរឹង​មូលដ្ឋាន​នេះ​ត្រូវ​បាន​ភ្ជាប់​ដោយ​ប្រយោល​ ដោយ​ប្រើ​ថាសរឹង​ផ្សេង ៖</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -11993,7 +11921,7 @@ medium</comment>
     <message>
         <source>Failed to check accessibility of disk image files.</source>
         <comment>medium</comment>
-        <translation type="unfinished">បានបរាជ័យ​ក្នុងកា​រ​ពិនិត្យ​មើល​មធ្យោ​បាយ​ងាយ​ស្រួល​​របស់​មេឌៀ ។​</translation>
+        <translation type="unfinished">បានបរាជ័យ​ក្នុងកា​រ​ពិនិត្យ​មើល​មធ្យោ​បាយ​ងាយ​ស្រួល​​របស់​មេឌៀ ។​</translation>
     </message>
     <message>
         <source><b>No disk image file selected</b></source>
@@ -12008,17 +11936,17 @@ medium</comment>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">ការ​ភ្ជាប់​ជា​មួយ​នឹង​ថាស​រឹង​នេះ នឹង​ត្រូវ​បាន​អនុវត្ត​ដោយ​ប្រយោល​ ដោយ​ប្រើ​ថាសរឹង​ផ្សេង​ដែលបានបង្កើត​ថ្មីៗ ។</translation>
+        <translation type="unfinished">ការ​ភ្ជាប់​ជា​មួយ​នឹង​ថាស​រឹង​នេះ នឹង​ត្រូវ​បាន​អនុវត្ត​ដោយ​ប្រយោល​ ដោយ​ប្រើ​ថាសរឹង​ផ្សេង​ដែលបានបង្កើត​ថ្មីៗ ។</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
         <comment>medium</comment>
-        <translation type="obsolete">មេឌៀ​មួយ​ចំនួន​នៅ​ក្នុង​ស្រឡាយ​ផ្នែក​រឹង​នេះ​មិនអាច​ចូល​ដំណើរការ​បាន​ទេ ។ សូម​ប្រើ​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត​នៅ​ក្នុង​របៀប <b>បង្ហាញ​ថាសរឹង​ផ្សេងៗ​គ្នា</b> ដើម្បី​ពិនិត្យមើល​មេឌៀ​ទាំង​នេះ ។</translation>
+        <translation type="obsolete">មេឌៀ​មួយ​ចំនួន​នៅ​ក្នុង​ស្រឡាយ​ផ្នែក​រឹង​នេះ​មិនអាច​ចូល​ដំណើរការ​បាន​ទេ ។ សូម​ប្រើ​កម្មវិធី​គ្រប់គ្រង​មេឌៀ​និម្មិត​នៅ​ក្នុង​របៀប <b>បង្ហាញ​ថាសរឹង​ផ្សេងៗ​គ្នា</b> ដើម្បី​ពិនិត្យមើល​មេឌៀ​ទាំង​នេះ ។</translation>
     </message>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">ថាសរឹង​មូលដ្ឋាន​នេះ​ត្រូវ​បាន​ភ្ជាប់​ដោយ​ប្រយោល​ ដោយ​ប្រើ​ថាសរឹង​ផ្សេង ៖</translation>
+        <translation type="unfinished">ថាសរឹង​មូលដ្ឋាន​នេះ​ត្រូវ​បាន​ភ្ជាប់​ដោយ​ប្រយោល​ ដោយ​ប្រើ​ថាសរឹង​ផ្សេង ៖</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -12735,51 +12663,11 @@ medium</comment>
         <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">គ្មាន</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">លំនាំដើម</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished"></translation>
@@ -12810,6 +12698,11 @@ medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -12820,6 +12713,31 @@ medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">គ្មាន</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">លំនាំដើម</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -12830,6 +12748,11 @@ medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished"></translation>
@@ -12850,6 +12773,11 @@ medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -12859,16 +12787,16 @@ medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12885,15 +12813,15 @@ medium</comment>
     <name>VBoxGlobalSettings</name>
     <message>
         <source>'%1 (0x%2)' is an invalid host key code.</source>
-        <translation type="obsolete">'%1 (0x%2)' គឺជា​កូដ​គ្រាប់ចុច​ម៉ាស៊ីន​មិនត្រឹមត្រូវ ។</translation>
+        <translation type="obsolete">'%1 (0x%2)' គឺជា​កូដ​គ្រាប់ចុច​ម៉ាស៊ីន​មិនត្រឹមត្រូវ ។</translation>
     </message>
     <message>
         <source>The value '%1' of the key '%2' doesn't match the regexp constraint '%3'.</source>
-        <translation>តម្លៃ '%1' នៃ​សោ '%2' មិនផ្គូផ្គង​កម្រិត​ regexp '%3' ។</translation>
+        <translation>តម្លៃ '%1' នៃ​សោ '%2' មិនផ្គូផ្គង​កម្រិត​ regexp '%3' ។</translation>
     </message>
     <message>
         <source>Cannot delete the key '%1'.</source>
-        <translation>មិន​អាច​លុប​គ្រាប់ចុច '%1' បានទេ ។</translation>
+        <translation>មិន​អាច​លុប​គ្រាប់ចុច '%1' បានទេ ។</translation>
     </message>
     <message>
         <source>'%1' is an invalid host-combination code-sequence.</source>
@@ -13149,7 +13077,7 @@ VMM: Floppy Image</comment>
     </message>
     <message>
         <source>Attached to:</source>
-        <translation type="unfinished">បាន​​ភ្ជាប់ទៅកាន់ ៖</translation>
+        <translation type="unfinished">បាន​​ភ្ជាប់ទៅកាន់ ៖</translation>
     </message>
     <message>
         <source>&Copy...</source>
@@ -13168,15 +13096,15 @@ VMM: Floppy Image</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -13206,19 +13134,19 @@ VMM: Floppy Image</comment>
     <name>VBoxOSTypeSelectorWidget</name>
     <message>
         <source>Operating &System:</source>
-        <translation type="obsolete">ប្រព័ន្ធ​ប្រតិបត្តិការ ៖</translation>
+        <translation type="obsolete">ប្រព័ន្ធ​ប្រតិបត្តិការ ៖</translation>
     </message>
     <message>
         <source>Selects the operating system family that you plan to install into this virtual machine.</source>
-        <translation type="obsolete">បង្ហាញ​ក្រុមគ្រួសារ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​មានគម្រោង​ដំឡើង​ក្នុង​ម៉ាស៊ីន​និម្មិត​នេះ ។</translation>
+        <translation type="obsolete">បង្ហាញ​ក្រុមគ្រួសារ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​មានគម្រោង​ដំឡើង​ក្នុង​ម៉ាស៊ីន​និម្មិត​នេះ ។</translation>
     </message>
     <message>
         <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-        <translation type="obsolete">បង្ហាញ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​​មាន​​គម្រោង​ដំឡើង​ម៉ាស៊ីន​និម្មិត​នេះ (បាន​ហៅ​ប្រព័ន្ធ​ប្រតិបត្តិ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) ។</translation>
+        <translation type="obsolete">បង្ហាញ​ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​ដែល​អ្នក​​មាន​​គម្រោង​ដំឡើង​ម៉ាស៊ីន​និម្មិត​នេះ (បាន​ហៅ​ប្រព័ន្ធ​ប្រតិបត្តិ​របស់​ម៉ាស៊ីន​ភ្ញៀវ) ។</translation>
     </message>
     <message>
         <source>&Version:</source>
-        <translation type="obsolete">កំណែ ៖</translation>
+        <translation type="obsolete">កំណែ ៖</translation>
     </message>
 </context>
 <context>
@@ -13229,19 +13157,19 @@ VMM: Floppy Image</comment>
     </message>
     <message>
         <source>Enter your full name using Latin characters.</source>
-        <translation type="obsolete">បញ្ចូល​ឈ្មោះ​ពេញ​ ដោយ​ប្រើ​តួអក្សរ​ឡាតាំង ។</translation>
+        <translation type="obsolete">បញ្ចូល​ឈ្មោះ​ពេញ​ ដោយ​ប្រើ​តួអក្សរ​ឡាតាំង ។</translation>
     </message>
     <message>
         <source>Enter your e-mail address. Please use a valid address here.</source>
-        <translation type="obsolete">បញ្ចូល​អាសយដ្ឋាន​អ៊ីមែល​ដែល​ត្រឹមត្រូវ​របស់អ្នក ។</translation>
+        <translation type="obsolete">បញ្ចូល​អាសយដ្ឋាន​អ៊ីមែល​ដែល​ត្រឹមត្រូវ​របស់អ្នក ។</translation>
     </message>
     <message>
         <source>Welcome to the VirtualBox Registration Form!</source>
-        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​សំណុំ​បែបបទ​ចុះឈ្មោះ​របស់ VirtualBox !</translation>
+        <translation type="obsolete">សូម​ស្វាគមន៍​មក​កាន់​សំណុំ​បែបបទ​ចុះឈ្មោះ​របស់ VirtualBox !</translation>
     </message>
     <message>
         <source>Could not perform connection handshake.</source>
-        <translation type="obsolete">មិនអាច​អនុវត្ត​ការ​តភ្ជាប់​ចាប់ដៃ​បានទេ ។</translation>
+        <translation type="obsolete">មិនអាច​អនុវត្ត​ការ​តភ្ជាប់​ចាប់ដៃ​បានទេ ។</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -13252,12 +13180,12 @@ VMM: Floppy Image</comment>
         <translation type="obsolete">ជ្រើស​​​ដែន​ដី​​/​ប្រ​ទេស​</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
-        <translation type="obsolete"><p>សូម​បំ​ពេញ​សំណុំ​​បែប​បទ​ការ​ចុះ​ឈ្មោះ​នេះ​​ដើម្បី​អនុ​ញ្ញាត​ពួក​យើង​ដឹង​ថា​អ្នក​ប្រើ​ VirtualBox និង ដោយ​ជម្រើស​ ​ដើម្បី​រក្សា​ទុកដែល​អ្នក​បាន​អង្កេត​អំពី​​ព័ត៌​មាន និងភាព​ទាន់​សម័យ​របស់​​​ VirtualBox ។</p><p>សូម​ប្រើ​តូ​អក្សរ​ឡាតាំង​តែ​មួយ​​ដើម្បី​បំ​ពេញ​ក្នុង​វាល​ខាង​ក្រោម​ ។ ប្រ​ព័ន្ធ​ម៉ៃ​​​ក្រូ​ Sun នឹង​ប្រើ​ព័ត៌​មានស្ថិតិ​​ប្រើ​ផលិតផល​ជាមួយ​គ្នា​ និង​​​ផ្ញើ​​សំបុត្រ​ព័ត៌​មានឲ្យ​អ្នក​​របស់​​ VirtualBox ។ ពិសេស​​ ប្រព័ន្ធ​ម៉ៃ​ [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
+        <translation type="obsolete"><p>សូម​បំ​ពេញ​សំណុំ​​បែប​បទ​ការ​ចុះ​ឈ្មោះ​នេះ​​ដើម្បី​អនុ​ញ្ញាត​ពួក​យើង​ដឹង​ថា​អ្នក​ប្រើ​ VirtualBox និង ដោយ​ជម្រើស​ ​ដើម្បី​រក្សា​ទុកដែល​អ្នក​បាន​អង្កេត​អំពី​​ព័ត៌​មាន និងភាព​ទាន់​សម័យ​របស់​​​ VirtualBox ។</p><p>សូម​ប្រើ​តូ​អក្សរ​ឡាតាំង​តែ​មួយ​​ដើម្បី​បំ​ពេញ​ក្នុង​វាល​ខាង​ក្រោម​ ។ ប្រ​ព័ន្ធ​ម៉ៃ​​​ក្រូ​ Sun នឹង​ប្រើ​ព័ត៌​មានស្ថិតិ​​ប្រើ​ផលិតផល​ជាមួយ​គ្នា​ និង​​​ផ្ញើ​​សំបុត្រ​ព័ត៌​មានឲ្យ​អ្នក​​របស់​​ VirtualBox ។ ពិសេស​​ ប្រព័ន្ធ​ម៉ៃ​ [...]
     </message>
     <message>
         <source>I &already have a Sun Online account:</source>
-        <translation type="obsolete">ខ្ញុំ​មាន​គណនី​លើបណ្តាញ​របស់​​ Sun រួច​ហើយ ៖</translation>
+        <translation type="obsolete">ខ្ញុំ​មាន​គណនី​លើបណ្តាញ​របស់​​ Sun រួច​ហើយ ៖</translation>
     </message>
     <message>
         <source>&E-mail:</source>
@@ -13265,39 +13193,39 @@ VMM: Floppy Image</comment>
     </message>
     <message>
         <source>&Password:</source>
-        <translation type="obsolete">​ពាក្យ​សម្ងាត់​ ៖</translation>
+        <translation type="obsolete">​ពាក្យ​សម្ងាត់​ ៖</translation>
     </message>
     <message>
         <source>I &would like to create a new Sun Online account:</source>
-        <translation type="obsolete">ខ្ញុំ​ចង់​បង្កើត​​គណនី​លើ​បណ្តាញ​របស់​ Sun ថ្មី ៖</translation>
+        <translation type="obsolete">ខ្ញុំ​ចង់​បង្កើត​​គណនី​លើ​បណ្តាញ​របស់​ Sun ថ្មី ៖</translation>
     </message>
     <message>
         <source>&First Name:</source>
-        <translation type="obsolete">នាម​ខ្លួន​ ៖</translation>
+        <translation type="obsolete">នាម​ខ្លួន​ ៖</translation>
     </message>
     <message>
         <source>&Last Name:</source>
-        <translation type="obsolete">នាម​ត្រ​កូល​ ៖</translation>
+        <translation type="obsolete">នាម​ត្រ​កូល​ ៖</translation>
     </message>
     <message>
         <source>&Company:</source>
-        <translation type="obsolete">ក្រុម​ហ៊ុន​​ ៖</translation>
+        <translation type="obsolete">ក្រុម​ហ៊ុន​​ ៖</translation>
     </message>
     <message>
         <source>Co&untry:</source>
-        <translation type="obsolete">ប្រ​ទេស​ ៖</translation>
+        <translation type="obsolete">ប្រ​ទេស​ ៖</translation>
     </message>
     <message>
         <source>E-&mail:</source>
-        <translation type="obsolete">អ៊ី​មែល​ ៖</translation>
+        <translation type="obsolete">អ៊ី​មែល​ ៖</translation>
     </message>
     <message>
         <source>P&assword:</source>
-        <translation type="obsolete">ពាក្យសម្ងាត់​ ៖</translation>
+        <translation type="obsolete">ពាក្យសម្ងាត់​ ៖</translation>
     </message>
     <message>
         <source>Co&nfirm Password:</source>
-        <translation type="obsolete">បញ្ជាក់​ពាក្យ​សម្ងាត់ ៖</translation>
+        <translation type="obsolete">បញ្ជាក់​ពាក្យ​សម្ងាត់ ៖</translation>
     </message>
     <message>
         <source>&Register</source>
@@ -13319,7 +13247,7 @@ VMM: Floppy Image</comment>
     </message>
     <message>
         <source>Click to view non-scaled screenshot.</source>
-        <translation>ចុច​ ដើម្បី​មើល​រូបថត​អេក្រង់​គ្មានមាត្រដ្ឋាន ។</translation>
+        <translation>ចុច​ ដើម្បី​មើល​រូបថត​អេក្រង់​គ្មានមាត្រដ្ឋាន ។</translation>
     </message>
     <message>
         <source>Click to view scaled screenshot.</source>
@@ -13491,8 +13419,8 @@ VMM: Floppy Image</comment>
         <translation type="obsolete">ធ្វើ​ឲ្យ​ស្រស់</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>សូមស្វាគមន៍​​មក​កាន់ VirtualBox !</h3><p>ផ្នែកដែល​នៅ​សល់​របស់​បង្អួច​នេះ គឺជា​បញ្ជី​ម៉ាស៊ីន​និម្មិត​នៅ​ក្នុង​កុំព្យូទ័រ​របស់​អ្នក ។ បញ្ជី​ទទេ​ឥឡូវ​នេះ ពីព្រោះ​អ្នកមិនបានបង្កើត​ម៉ាស៊ីននិម្មិត​នៅ​ឡើយ​ទេ ។<img src=:/welcome.png align=right/></p><p>ដើម្បី​បង្កើត​ម៉ាស៊ីន​និម្មិត ចុច​ប៊ូតុង <b>ថ្មី</b> ក្នុង​របារ​ឧបករណ៍​ដែល​មាននៅ​​ផ្នែក​ខាង​លើ​នៃ​បង្អួច ។</p><p>អ្នក​អាច​ចុច​គ្រាប់ចុច <b>% [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>សូមស្វាគមន៍​​មក​កាន់ VirtualBox !</h3><p>ផ្នែកដែល​នៅ​សល់​របស់​បង្អួច​នេះ គឺជា​បញ្ជី​ម៉ាស៊ីន​និម្មិត​នៅ​ក្នុង​កុំព្យូទ័រ​របស់​អ្នក ។ បញ្ជី​ទទេ​ឥឡូវ​នេះ ពីព្រោះ​អ្នកមិនបានបង្កើត​ម៉ាស៊ីននិម្មិត​នៅ​ឡើយ​ទេ ។<img src=:/welcome.png align=right/></p><p>ដើម្បី​បង្កើត​ម៉ាស៊ីន​និម្មិត ចុច​ប៊ូតុង <b>ថ្មី</b> ក្នុង​របារ​ឧបករណ៍​ដែល​មាននៅ​​ផ្នែក​ខាង​លើ​នៃ​បង្អួច ។</p><p>អ្នក​អាច​ចុច​គ្រាប់ចុច <b>% [...]
     </message>
     <message>
         <source>&File</source>
@@ -13521,7 +13449,7 @@ VMM: Floppy Image</comment>
     <name>VBoxSettingsDialog</name>
     <message>
         <source><i>Select a settings category from the list on the left-hand side and move the mouse over a settings item to get more information</i>.</source>
-        <translation type="obsolete"><i>ជ្រើស​ប្រភេទ​ការ​កំណត់​ពី​បញ្ជីនៅ​ខាង​ផ្នែកខាង​ឆ្វេង​ ហើយ​ផ្លាស់ទី​កណ្ដុរ​លើ​ធាតុ​កំណត់​ដើម្បី​ទទួល​យក​ព័ត៌មានបន្ថែម</i> ។</translation>
+        <translation type="obsolete"><i>ជ្រើស​ប្រភេទ​ការ​កំណត់​ពី​បញ្ជីនៅ​ខាង​ផ្នែកខាង​ឆ្វេង​ ហើយ​ផ្លាស់ទី​កណ្ដុរ​លើ​ធាតុ​កំណត់​ដើម្បី​ទទួល​យក​ព័ត៌មានបន្ថែម</i> ។</translation>
     </message>
     <message>
         <source>Invalid settings detected</source>
@@ -13548,15 +13476,15 @@ VMM: Floppy Image</comment>
     </message>
     <message>
         <source>Click to enlarge the screenshot.</source>
-        <translation>ចុច ដើម្បី​ពង្រីក​រូប​ថត​អេ​ក្រង់​ ។</translation>
+        <translation>ចុច ដើម្បី​ពង្រីក​រូប​ថត​អេ​ក្រង់​ ។</translation>
     </message>
     <message>
         <source>&Name:</source>
-        <translation>ឈ្មោះ ៖</translation>
+        <translation>ឈ្មោះ ៖</translation>
     </message>
     <message>
         <source>Taken:</source>
-        <translation>បាន​ថត ៖</translation>
+        <translation>បាន​ថត ៖</translation>
     </message>
     <message>
         <source>&Description:</source>
@@ -13564,7 +13492,7 @@ VMM: Floppy Image</comment>
     </message>
     <message>
         <source>D&etails:</source>
-        <translation>សេច​ក្តី​លម្អិត​ ៖</translation>
+        <translation>សេច​ក្តី​លម្អិត​ ៖</translation>
     </message>
 </context>
 <context>
@@ -13714,7 +13642,7 @@ VMM: Floppy Image</comment>
     <message numerus="yes">
         <source>Warning: You are taking a snapshot of a running machine which has %n immutable image(s) attached to it. As long as you are working from this snapshot the immutable image(s) will not be reset to avoid loss of data.</source>
         <translation type="unfinished">
-            <numerusform>ការ​ព្រមាន ៖ អ្នកកំពុង​ថត​រូប​របស់​ម៉ាស៊ីន​ដែល​កំពុង​រត់ ដែលមាន​រូបភាព​មិនប្រែប្រួល %n បានភ្ជាប់​ទៅកាន់​វា ។ ដ៏រាប​ណា​អ្នកកំពុង​ធ្វើការ​​ពី​រូបភាព​ដែល​មិនប្រែប្រួល​នេះ នឹង​មិន​ត្រូ​វបានកំណត់​ឡើងវិញ​ ដើម្បី​ចៀសវាង​ពី​ការ​បាត់បង់​ទិន្នន័យ​ទេ ។</numerusform>
+            <numerusform>ការ​ព្រមាន ៖ អ្នកកំពុង​ថត​រូប​របស់​ម៉ាស៊ីន​ដែល​កំពុង​រត់ ដែលមាន​រូបភាព​មិនប្រែប្រួល %n បានភ្ជាប់​ទៅកាន់​វា ។ ដ៏រាប​ណា​អ្នកកំពុង​ធ្វើការ​​ពី​រូបភាព​ដែល​មិនប្រែប្រួល​នេះ នឹង​មិន​ត្រូ​វបានកំណត់​ឡើងវិញ​ ដើម្បី​ចៀសវាង​ពី​ការ​បាត់បង់​ទិន្នន័យ​ទេ ។</numerusform>
         </translation>
     </message>
     <message>
@@ -13763,7 +13691,7 @@ VMM: Floppy Image</comment>
     <name>VBoxVMDescriptionPage</name>
     <message>
         <source>No description. Press the Edit button below to add it.</source>
-        <translation type="obsolete">គ្មាន​សេចក្ដី​ពិពណ៌នា​ទេ ។ ចុច​ប៊ុតុង កែសម្រួល​ខា​ងក្រោម​ដើម្បី​បន្ថែម​វា ។</translation>
+        <translation type="obsolete">គ្មាន​សេចក្ដី​ពិពណ៌នា​ទេ ។ ចុច​ប៊ុតុង កែសម្រួល​ខា​ងក្រោម​ដើម្បី​បន្ថែម​វា ។</translation>
     </message>
     <message>
         <source>Edit</source>
@@ -13778,7 +13706,129 @@ VMM: Floppy Image</comment>
     <name>VBoxVMDetailsView</name>
     <message>
         <source>The selected virtual machine is <i>inaccessible</i>. Please inspect the error message shown below and press the <b>Refresh</b> button if you want to repeat the accessibility check:</source>
-        <translation type="obsolete">ម៉ាស៊ីន​និម្មិត​ដែល​បាន​ជ្រើស​ <i>មិន​អាច​ចូលដំណើរការ​បានទេ</i> ។ សូម​ពិនិត្យ​មើល​សារ​កំហុស​ដែល​បានបង្ហាញ​ខាង​ក្រោម ហើយ​ចុច​ប៊ូតុង <b>ធ្វើ​ឲ្យ​ស្រស់</b> ប្រសិន​បើ​អ្នក​ចង់​ធ្វើការ​ពិនិត្យ​ការ​ចូលដំណើរការ​​ឡើង​វិញ ៖</translation>
+        <translation type="obsolete">ម៉ាស៊ីន​និម្មិត​ដែល​បាន​ជ្រើស​ <i>មិន​អាច​ចូលដំណើរការ​បានទេ</i> ។ សូម​ពិនិត្យ​មើល​សារ​កំហុស​ដែល​បានបង្ហាញ​ខាង​ក្រោម ហើយ​ចុច​ប៊ូតុង <b>ធ្វើ​ឲ្យ​ស្រស់</b> ប្រសិន​បើ​អ្នក​ចង់​ធ្វើការ​ពិនិត្យ​ការ​ចូលដំណើរការ​​ឡើង​វិញ ៖</translation>
+    </message>
+</context>
+<context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - ព័ត៌មាន​សម័យ</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">សេចក្ដី​លម្អិត</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">ពេលវេលា​រត់</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">ការ​ផ្ទេរ DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">ការ​ផ្ទេរ PIO</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">អាន​ទិន្នន័យ</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">សរសេរ​ទិន្នន័យ</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">បានផ្ទេរ​ទិន្នន័យ</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">បាន​ទទួល​ទិន្នន័យ</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">គុណលក្ខណៈ​ពេលវេលា​រត់</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">គុណភាព​បង្ហាញ​របស់​អេក្រង់</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">កំណែ %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">រក​មិនឃើញ</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">រក​មិន​ឃើញ</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">ការ​បន្ថែម​ម៉ាស៊ីន​ភ្ញៀវ</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">ប្រភេទ​ប្រព័ន្ធ​ប្រតិបត្តិការ​របស់​ម៉ាស៊ីន​ភ្ញៀវ</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">គ្មានអាដាប់ទ័រ​បណ្ដាញ​ទេ</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">បានបើក</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">បានបិទ</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <translation type="obsolete">ភេយីង​ខាង​ក្នុង</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>
+
+
+details report (VRDP server port)</comment>
+        <translation type="obsolete">មិនអាច​ប្រើបាន​</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">ស្ថិតិ​ផ្ទុក​</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">គ្មាន​ឧបករណ៍​ផ្ទុក​ទេ​</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">ស្ថិតិ​បណ្ដាញ</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">មិនអាច​ប្រើបាន​</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">មិនអាច​ប្រើបាន​</translation>
     </message>
 </context>
 <context>
@@ -13801,7 +13851,7 @@ VMM: Floppy Image</comment>
     </message>
     <message>
         <source><p>No log files found. Press the <b>Refresh</b> button to rescan the log folder <nobr><b>%1</b></nobr>.</p></source>
-        <translation type="obsolete"><p>រក​មិនឃើញ​កំណត់ហេតុទេ ។ ចុច​ប៊ូតុង <b>ធ្វើ​ឲ្យ​ស្រស់</b> ដើម្បី​វិភាគ​ថត​កំណត់ហេតុ​ម្ដង​ទៀត <nobr><b>%1</b></nobr> ។</p></translation>
+        <translation type="obsolete"><p>រក​មិនឃើញ​កំណត់ហេតុទេ ។ ចុច​ប៊ូតុង <b>ធ្វើ​ឲ្យ​ស្រស់</b> ដើម្បី​វិភាគ​ថត​កំណត់ហេតុ​ម្ដង​ទៀត <nobr><b>%1</b></nobr> ។</p></translation>
     </message>
     <message>
         <source>Save VirtualBox Log As</source>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
index 933d152..21ca105 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
@@ -1189,11 +1189,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1205,23 +1205,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1238,7 +1238,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1246,11 +1246,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1258,7 +1258,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1325,7 +1325,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1333,7 +1333,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1361,11 +1361,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1377,11 +1377,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1389,7 +1389,7 @@
         <translation type="unfinished">새로 고침(&F)</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1433,15 +1433,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3284,9 +3284,9 @@ p, li { white-space: pre-wrap; }
         <translation>일반 드라이버, '%1'</translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>일반 드라이버, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation type="unfinished">일반 드라이버, '%1' { %2 }</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -4560,7 +4560,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7539,10 +7539,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Image</source>
         <comment>storage image</comment>
         <translation type="unfinished">이미지</translation>
@@ -7592,13 +7588,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsSystem</name>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
index 3394bc1..f208980 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
@@ -282,7 +282,7 @@
         <translation type="obsolete">Sesijos i&nformacija</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Rodyti informaciją apie šią sesiją</translation>
     </message>
     <message>
@@ -366,11 +366,11 @@
         <translation type="obsolete">Kurti arba keisti bendruosius aplankus</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">Į&diegti svečio papildinius...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="unfinished">Į&diegti svečio papildinius...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Prijungti svečio papildinių disko atvaizdį</translation>
     </message>
     <message>
@@ -821,92 +821,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Į&diegti svečio papildinius...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Prijungti svečio papildinių disko atvaizdį</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
+        <source>&Webcams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Tinklas</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Rinkmena</translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Tinklas</translation>
-    </message>
-    <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Peržiūrėti ž&urnalus...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Rinkmena</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -926,175 +912,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
+        <source>Show Status &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
+        <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
+        <source>&Hard Disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
+        <source>&USB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Peržiūrėti ž&urnalus...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1140,6 +1126,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create new virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1156,7 +1150,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1164,7 +1158,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1188,15 +1182,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1208,15 +1214,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1260,15 +1266,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1277,29 +1283,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Įgalinti</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1323,6 +1308,19 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -2806,11 +2804,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
-        <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
         <translation type="unfinished"></translation>
@@ -2870,88 +2863,88 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">USB valdiklis</translation>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (user interface/Unscaled HiDPI Video Output)</comment>
-        <translation type="obsolete">Įgalinta</translation>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <translation type="unfinished">Įgalinta</translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">USB valdiklis</translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
-        <translation type="unfinished"></translation>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">Įgalinta</translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished">Įgalinta</translation>
     </message>
     <message>
-        <source>Menu-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Įgalinta</translation>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished">Įgalinta</translation>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3990,7 +3983,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4770,7 +4763,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4784,8 +4778,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5104,38 +5097,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Maža įrankinė:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Jei pažymėta, viso ekrano ir integruoto darbo veiksenose bus rodoma maža įrankinė.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Rodyti viso &ekrano/integravimo veiksenoje</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Jei pažymėta, maža įrankinė bus rodoma ekrano viršuje, o ne apačioje.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Rodyti &virš kitų langų</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5148,15 +5109,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">3D {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D {200%?}</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5172,10 +5129,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5224,6 +5177,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5232,6 +5193,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5239,8 +5204,8 @@
 <context>
     <name>UIMachineSettingsGeneral</name>
     <message>
-        <source>Basi&c</source>
-        <translation>&Pagrindai</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Pagrindai</translation>
     </message>
     <message>
         <source>&Name:</source>
@@ -5251,8 +5216,8 @@
         <translation type="obsolete">Parodo virtualios mašinos pavadinimą.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Sudėtingiau</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Sudėtingiau</translation>
     </message>
     <message>
         <source>S&napshot Folder:</source>
@@ -5299,8 +5264,8 @@
         <translation type="obsolete">Rodyti &virš kitų langų</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Aprašas</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Aprašas</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5315,20 +5280,32 @@
         <translation type="obsolete">šiai mašinai pasirinkote 64 bitų svečio OS. Kadangi toks svečias reikalauja virtualizaciją palaikančio procesoriaus (VT-x/AMD-V), pastaroji parinktis bus įgalinta automatiškai.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
+        <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
+        <source>No name specified for the virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No name specified for the virtual machine.</source>
+        <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">&Sudėtingiau</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
-        <translation type="unfinished"></translation>
+        <source>D&escription</source>
+        <translation type="unfinished">&Aprašymas</translation>
     </message>
     <message>
         <source>Enc&ryption</source>
@@ -5347,6 +5324,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5379,16 +5360,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5399,28 +5376,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">3D {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D {200%?}</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Maža įrankinė:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Jei pažymėta, viso ekrano ir integruoto darbo veiksenose bus rodoma maža įrankinė.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Rodyti viso &ekrano/integravimo veiksenoje</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Jei pažymėta, maža įrankinė bus rodoma ekrano viršuje, o ne apačioje.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -5430,18 +5399,6 @@
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -5943,23 +5900,23 @@
         <translation>%1 prievadas</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6335,96 +6292,97 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Atvaizdis</translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Atvaizdis</translation>
+        <source>Add USB Controller</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6440,7 +6398,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6675,35 +6633,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6857,31 +6815,31 @@
         <translation type="obsolete">Šioje virtualioje mašinoje įgalintas USB 2.0. Tačiau tam turi įdiegtas <b>%1</b>. Įdiegike papildinių paketą, kurį rasite VirtualBox svetainėje. Tuomet vėl galėsite įgalite USB 2.0. Iki tol ši funkcija bus uždrausta, nebent atsisakysite dabartinių nuostatų pakeitimų.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7134,14 +7092,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Užverti</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Perjungti</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Užverti</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7383,15 +7341,15 @@
         <translation type="obsolete"><p>Nepavyksta įkelti kalbos rinkmenos <b><nobr>%1</nobr></b>. <p>Laikinai bus naudojama anglų kalba.Eikite į <b>nuostatas</b> per <b>rinkmenos</b> meniu, esantį pagrindiniame VirtualBox lange, ir pasirinkite egzistuojančią kalbą <b>kalbos</b> kortelėje.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Įdiegtieji VirtualBox svečio papildiniai yra per seni: yra įdiegta %1 versija, bet tikėtasi %2 versijos. Kai kurios funkcijos (pelės integravimas, svečio ekrano dydžio automatinis keitimas) gali neveikti tinkamai.</p><p>Atnaujinkite svečio papildinius iki tinkamos versijos nuspaudę <b>Įdiegti svečio papildinius</b> iš <b>įtaisų</b> meniu.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Įdiegtieji VirtualBox svečio papildiniai nėra patys naujausi: yra įdiegta %1 versija, bet tikėtasi %2 versijos. Kai kurios funkcijos (pelės integravimas, svečio ekrano dydžio automatinis keitimas) gali neveikti tinkamai.</p><p>Patariama atnaujinti svečio papildinius iki tinkamos versijos nuspaudus <b>Įdiegti svečio papildinius</b> iš <b>įtaisų</b> meniu.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Įdiegtieji VirtualBox svečio papildiniai yra per nauji: yra įdiegta %1 versija, bet tikėtasi %2 versijos. Negalima naudoti naujesnių svečio papildinių už versiją, kurią palaiko VirtualBox.</p><p>Atnaujinkite svečio papildinius iki tinkamos versijos nuspaudę <b>Įdiegti svečio papildinius</b> iš <b>įtaisų</b> meniu.</p></translation>
     </message>
     <message>
@@ -7492,7 +7450,7 @@
         <translation type="obsolete">Parsiųsti</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions
 </comment>
         <translation type="obsolete">Prijungti</translation>
@@ -7632,8 +7590,8 @@
         <translation type="obsolete">Rodyti langą su produkto informacija</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Pasirodė nauja VirtualBox versija! Versija <b>%1</b> pasiekiama <a href="http://www.virtualbox.org/">virtualbox.org</a> svetainėje.</p><p>Šią versiją galite atsisiųsti spustelėję šią nuorodą: </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>Pasirodė nauja VirtualBox versija! Versija <b>%1</b> pasiekiama <a href="https://www.virtualbox.org/">virtualbox.org</a> svetainėje.</p><p>Šią versiją galite atsisiųsti spustelėję šią nuorodą: </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -7720,8 +7678,8 @@
         <translation type="obsolete"><p>Vienas ar keli virtualūs standieji diskai, CD/DVD ar diskelių įtaisai nebepasiekiami. Todėl negalėsite naudotis tomis virtualiomis mašinomis, kurios naudoja tas laikmenas tol, kol jos nebus pasiekiamos.</p><p>Norėdami atverti virtualių laikmenų tvarkytuvę ir pamatyti tas laikmenas, spauskite <b>Tikrinti</b>, o norėdami nekreipti dėmesio į šį pranešimą, spauskite <b>Nepaisyti</b>.</p></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Virtualios mašinos veikimo metu įvyko kritinė klaida, tad mašina sustojo.</p><p>Norėdami gauti pagalbos, žiūrėkite „Bendruomenės“ (angl. „Community“) skyrių <a href=http://www.virtualbox.org>http://www.virtualbox.org</a>  svetainėje arba palaikymo kontrakte. Prašom pateikti <tt>VBox.log</tt> žurnalo rinkmenos turinį ir <tt>VBox.png</tt> paveiksliuką, kuriuos galite rasti <nobr><b>%1& [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Virtualios mašinos veikimo metu įvyko kritinė klaida, tad mašina sustojo.</p><p>Norėdami gauti pagalbos, žiūrėkite „Bendruomenės“ (angl. „Community“) skyrių <a href=https://www.virtualbox.org>https://www.virtualbox.org</a>  svetainėje arba palaikymo kontrakte. Prašom pateikti <tt>VBox.log</tt> žurnalo rinkmenos turinį ir <tt>VBox.png</tt> paveiksliuką, kuriuos galite rasti <nobr><b>%1</b></ [...]
     </message>
     <message>
         <source>The following files already exist:<br /><br />%1<br /><br />Are you sure you want to replace them? Replacing them will overwrite their contents.</source>
@@ -8170,7 +8128,7 @@
         <translation type="obsolete">Nepavyko atjungti diskelio įtaiso (<nobr><b>%1</b></nobr>) nuo <i>%2</i> lizdo mašinoje <b>%3</b>.</translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully started then s [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="obsolete"><p>Regis šioje virtualioje mašinoje neprieinami VirtualBox svečio papildiniai, tad negalite naudoti bendrųjų aplankų. Norėdami naudoti bendruosius aplankus virtualioje mašinoje, įdiekite svečio papildinius (jei jie neįdiegti) arba iš naujo įdiekite juos (jei jie veikia netinkamai) pasirinkdami <b>Įdiegti svečio papildinius</b> iš <b>Mašinos</b> meniu. Jei jie įdiegti, bet mašina dar pilnai nepasileido, tuomet luktelėkite. [...]
     </message>
     <message>
@@ -8179,9 +8137,9 @@
         <translation type="obsolete">Parsiųsti</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Prijungti</translation>
+        <translation type="unfinished">Prijungti</translation>
     </message>
     <message>
         <source>Check</source>
@@ -8332,8 +8290,8 @@
         <translation><p>Atminkite, kad ši laikmena nebus ištrinta, tad vėliau ją vėl galėsite naudoti.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
-        <translation type="obsolete"><p>Regis šioje virtualioje mašinoje neprieinami VirtualBox svečio papildiniai, tad negalite naudoti bendrųjų aplankų. Norėdami naudoti bendruosius aplankus virtualioje mašinoje, įdiekite svečio papildinius (jei jie neįdiegti) arba iš naujo įdiekite juos (jei jie veikia netinkamai) pasirinkdami <b>Įdiegti svečio papildinius</b> iš <b>Įtaisų</b> meniu. Jei jie įdiegti, bet mašina dar pilnai nepasileido, tuomet luktelėkite.& [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
+        <translation type="unfinished"><p>Regis šioje virtualioje mašinoje neprieinami VirtualBox svečio papildiniai, tad negalite naudoti bendrųjų aplankų. Norėdami naudoti bendruosius aplankus virtualioje mašinoje, įdiekite svečio papildinius (jei jie neįdiegti) arba iš naujo įdiekite juos (jei jie veikia netinkamai) pasirinkdami <b>Įdiegti svečio papildinius</b> iš <b>Įtaisų</b> meniu. Jei jie įdiegti, bet mašina dar pilnai nepasileido, tuomet luktelėkite [...]
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
@@ -8787,32 +8745,25 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete"><p>Regis šioje virtualioje mašinoje neprieinami VirtualBox svečio papildiniai, tad negalite naudoti bendrųjų aplankų. Norėdami naudoti bendruosius aplankus virtualioje mašinoje, įdiekite svečio papildinius (jei jie neįdiegti) arba iš naujo įdiekite juos (jei jie veikia netinkamai) pasirinkdami <b>Įdiegti svečio papildinius</b> iš <b>Įtaisų</b> meniu. Jei jie įdiegti, bet mašina dar pilnai nepasileido, tuomet luktelėkite.& [...]
     </message>
     <message>
         <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Prijungti</translation>
     </message>
     <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8828,115 +8779,115 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9029,8 +8980,8 @@
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished">&Pavadinimas:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Pavadinimas:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -9052,6 +9003,10 @@
         <source>Selects 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>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -9760,18 +9715,14 @@
         <translation type="unfinished">Virtualių mašinų rinkmenos (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Jus sveikina VirtualBox!</h3><p>Kairėje lango pusėje pateikiamas visų Jūsų virtualių mašinų sąrašas. Kol kas šis sąrašas tuščias, kadangi dar nesukūrėte nei vienos virtualios mašinos.<img src=:/welcome.png align=right/></p><p>Norėdami sukurti naują VM, spauskite mygtuką <b>Nauja</b>, kuris yra pagrindinėje įrankių juostoje lango viršuje.</p><p>Trumpą pagalbą gausite nuspaudę <b>%1&l [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="unfinished"><h3>Jus sveikina VirtualBox!</h3><p>Kairėje lango pusėje pateikiamas visų Jūsų virtualių mašinų sąrašas. Kol kas šis sąrašas tuščias, kadangi dar nesukūrėte nei vienos virtualios mašinos.<img src=:/welcome.png align=right/></p><p>Norėdami sukurti naują VM, spauskite mygtuką <b>Nauja</b>, kuris yra pagrindinėje įrankių juostoje lango viršuje.</p><p>Trumpą pagalbą gausite nuspaudę <b>%1 [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation type="unfinished">Tvarkyklė</translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -9959,6 +9910,10 @@
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Užverti</translation>
     </message>
@@ -9966,10 +9921,6 @@
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -10065,8 +10016,8 @@
         <translation type="obsolete">Santrauka</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Pasirodė nauja VirtualBox versija! Versija <b>%1</b> pasiekiama <a href="http://www.virtualbox.org/">virtualbox.org</a> svetainėje.</p><p>Šią versiją galite atsisiųsti spustelėję šią nuorodą: </p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>Pasirodė nauja VirtualBox versija! Versija <b>%1</b> pasiekiama <a href="https://www.virtualbox.org/">virtualbox.org</a> svetainėje.</p><p>Šią versiją galite atsisiųsti spustelėję šią nuorodą: </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -10158,128 +10109,98 @@
     <name>UIVMInfoDialog</name>
     <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - sesijos informacija</translation>
+        <translation type="unfinished">%1 - sesijos informacija</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Detalės</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">&Vykdymas</translation>
+    <message>
+        <source>&Runtime Information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>DMA perdavimai</translation>
+        <translation type="unfinished">DMA perdavimai</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>PIO perdavimai</translation>
+        <translation type="unfinished">PIO perdavimai</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Perskaityta duomenų</translation>
+        <translation type="unfinished">Perskaityta duomenų</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Įrašyta duomenų</translation>
+        <translation type="unfinished">Įrašyta duomenų</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Perduota duomenų</translation>
+        <translation type="unfinished">Perduota duomenų</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Gauta duomenų</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Vykdymo ypatybės</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Ekrano skiriamoji geba</translation>
+        <translation type="unfinished">Gauta duomenų</translation>
     </message>
     <message>
         <source>Not Detected</source>
-        <comment>guest additions
-</comment>
-        <translation type="obsolete">Neaptikta</translation>
+        <comment>guest additions</comment>
+        <translation type="unfinished">Neaptikta</translation>
     </message>
     <message>
         <source>Not Detected</source>
-        <comment>guest os type
-</comment>
-        <translation type="obsolete">Neaptikta</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>Svečio papildiniai</translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation>Svečio OS tipas</translation>
-    </message>
-    <message>
-        <source>No Network Adapters</source>
-        <translation>Tinklo plokščių nėra</translation>
-    </message>
-    <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <comment>guest os type</comment>
+        <translation type="unfinished">Neaptikta</translation>
     </message>
     <message>
         <source>Not Available</source>
-        <comment>details report (VRDP server port)
-</comment>
-        <translation type="obsolete">Neprieinama</translation>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Neprieinama</translation>
     </message>
     <message>
-        <source>Storage Statistics</source>
-        <translation>Atminties įtaisų statistika</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Vykdymo ypatybės</translation>
     </message>
     <message>
-        <source>No Storage Devices</source>
-        <translation>Atminties įtaisų nėra</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Ekrano skiriamoji geba</translation>
     </message>
     <message>
-        <source>Network Statistics</source>
-        <translation>Tinklo statistika</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Detected</source>
-        <comment>guest additions</comment>
-        <translation>Neaptikta</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Detected</source>
-        <comment>guest os type</comment>
-        <translation>Neaptikta</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>Neprieinama</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Svečio papildiniai</translation>
     </message>
     <message>
-        <source>Clipboard Mode</source>
-        <translation type="unfinished"></translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Svečio OS tipas</translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
+        <source>Storage Statistics</source>
+        <translation type="unfinished">Atminties įtaisų statistika</translation>
     </message>
     <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
+        <source>No Storage Devices</source>
+        <translation type="unfinished">Atminties įtaisų nėra</translation>
     </message>
     <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <source>Network Statistics</source>
+        <translation type="unfinished">Tinklo statistika</translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Tinklo plokščių nėra</translation>
     </message>
 </context>
 <context>
@@ -11156,8 +11077,8 @@
         <translation><numatyta></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Pasirinkus, patvirtinus pasirinkimą ir iš naujo atvėrus šį langą, matysite numatytąjį kelią.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished">Pasirinkus, patvirtinus pasirinkimą ir iš naujo atvėrus šį langą, matysite numatytąjį kelią.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -11205,7 +11126,8 @@
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Pasirinkus, patvirtinus pasirinkimą ir iš naujo atvėrus šį langą, matysite numatytąjį kelią.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -12773,7 +12695,7 @@ IPv6.</translation>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Su šiuo standžiuoju disku bus dirbama ne tiesiogiai, o naudojant naujai sukurtą standžiojo disko vedinį.</translation>
+        <translation>Su šiuo standžiuoju disku bus dirbama ne tiesiogiai, o naudojant naujai sukurtą standžiojo disko vedinį.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -12784,7 +12706,7 @@ IPv6.</translation>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Šis pagrindinis standusis diskas prijungtas ne tiesiogiai, o naudojant šį jo vedinį:</translation>
+        <translation>Šis pagrindinis standusis diskas prijungtas ne tiesiogiai, o naudojant šį jo vedinį:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -14255,51 +14177,11 @@ IPv6.</translation>
         <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Numatytoji</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished">Aktyvus</translation>
@@ -14330,6 +14212,11 @@ IPv6.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -14340,6 +14227,31 @@ IPv6.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Numatytoji</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -14350,6 +14262,11 @@ IPv6.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -14370,6 +14287,11 @@ IPv6.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -14379,16 +14301,16 @@ IPv6.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14716,15 +14638,15 @@ IPv6.</translation>
         <translation type="obsolete">&Užverti</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -14899,8 +14821,8 @@ IPv6.</translation>
         <translation type="obsolete">Sustabdyti virtualią mašiną jos būseną išsaugant diske</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Jus sveikina VirtualBox!</h3><p>Kairėje lango pusėje pateikiamas visų Jūsų virtualių mašinų sąrašas. Kol kas šis sąrašas tuščias, kadangi dar nesukūrėte nei vienos virtualios mašinos.<img src=:/welcome.png align=right/></p><p>Norėdami sukurti naują VM, spauskite mygtuką <b>Nauja</b>, kuris yra pagrindinėje įrankių juostoje lango viršuje.</p><p>Trumpą pagalbą gausite nuspaudę <b>%1&l [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Jus sveikina VirtualBox!</h3><p>Kairėje lango pusėje pateikiamas visų Jūsų virtualių mašinų sąrašas. Kol kas šis sąrašas tuščias, kadangi dar nesukūrėte nei vienos virtualios mašinos.<img src=:/welcome.png align=right/></p><p>Norėdami sukurti naują VM, spauskite mygtuką <b>Nauja</b>, kuris yra pagrindinėje įrankių juostoje lango viršuje.</p><p>Trumpą pagalbą gausite nuspaudę <b>%1&l [...]
     </message>
     <message>
         <source>Log</source>
@@ -15447,6 +15369,114 @@ konkrečių nuostatų, matysite paaiškinimus<i>.</translation>
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - sesijos informacija</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Detalės</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Vykdymas</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">DMA perdavimai</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">PIO perdavimai</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Perskaityta duomenų</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Įrašyta duomenų</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Perduota duomenų</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Gauta duomenų</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Vykdymo ypatybės</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Ekrano skiriamoji geba</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions
+</comment>
+        <translation type="obsolete">Neaptikta</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type
+</comment>
+        <translation type="obsolete">Neaptikta</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Svečio papildiniai</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Svečio OS tipas</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Tinklo plokščių nėra</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)
+</comment>
+        <translation type="obsolete">Neprieinama</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Atminties įtaisų statistika</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Atminties įtaisų nėra</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Tinklo statistika</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Neaptikta</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Neaptikta</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Neprieinama</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMLogViewer</name>
     <message>
         <source>Log Viewer</source>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
index 869de4b..ce0af08 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
@@ -1038,312 +1038,313 @@
     </message>
     <message>
         <source>Minimize active window</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimaliseren actief venster</translation>
     </message>
     <message>
         <source>Display the Network Operations Manager window</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon venster Manager Netwerkoperaties</translation>
     </message>
     <message>
         <source>Display a window with product information</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon venster produktinformatie</translation>
     </message>
     <message>
         <source>&Preferences...</source>
         <comment>global preferences window</comment>
-        <translation type="unfinished">&Voorkeuren...</translation>
+        <translation>&Voorkeuren...</translation>
     </message>
     <message>
         <source>Display the global preferences window</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon venster Algemene Voorkeuren</translation>
     </message>
     <message>
         <source>Display the virtual machine settings window</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon venster virtuele machine-instellingen</translation>
     </message>
     <message>
         <source>Display the virtual machine session information window</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon virtuele machine sessie-informatievenster</translation>
     </message>
     <message>
         <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <translation>&Staat opslaan</translation>
     </message>
     <message>
         <source>Save the state of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Opslaan staat virtuele machine</translation>
     </message>
     <message>
         <source>Send the ACPI Shutdown signal to the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Stuur ACPI-Shutdownsignaal naar virtuele machine</translation>
     </message>
     <message>
         <source>&Minimize Window</source>
-        <translation type="unfinished"></translation>
+        <translation>&Minimaliseren venster</translation>
     </message>
     <message>
         <source>Automatically resize the guest display when the window is resized</source>
-        <translation type="unfinished"></translation>
+        <translation>Pas de grootte van het gastscherm automatisch aan wanneer het venster van grootte veranderd</translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
-        <translation type="unfinished"></translation>
+        <source>Take guest display screenshot</source>
+        <translation>Maak gastschermafdruk</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure video capture</source>
+        <translation>Toon virtuele machine instellingenvenster om videocapture in te stellen</translation>
     </message>
     <message>
         <source>Enable guest display video capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Inschakelen videocapture gastscherm</translation>
     </message>
     <message>
         <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sta Beeldscherm-op-Afstand (remote desktop protocol, RDP) verbindingen naar deze machine toe</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure menu-bar</source>
+        <translation>Toon venster om menubalk in te stellen</translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable menu-bar</source>
+        <translation>Inschakelen menubalk</translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure status-bar</source>
+        <translation>Toon venster om statusbalk in te stellen</translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable status-bar</source>
+        <translation>Inschakelen statusbalk</translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
-        <translation type="unfinished"></translation>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
+        <translation>Toon venster algemene instellingen om sneltoetsen in te stellen</translation>
     </message>
     <message>
         <source>&Insert %1</source>
         <comment>that means send the %1 key sequence to the virtual machine</comment>
-        <translation type="unfinished">&Invoeren %1</translation>
+        <translation>&Invoeren %1</translation>
     </message>
     <message>
         <source>&Hard Disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Harde schijven</translation>
     </message>
     <message>
         <source>&Hard Disk Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Instellingen &harde schijven...</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure hard disks</source>
+        <translation>Toon virtuele machine instellingenvenster omharde schijven in te stellen</translation>
     </message>
     <message>
         <source>&Network</source>
-        <translation type="unfinished"></translation>
+        <translation>&Netwerk</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure network adapters</source>
+        <translation>Toon virtuele machine instellingenvenster om netwerkadapters in te stellen</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure USB devices</source>
+        <translation>Toon virtuele machine instellingenvenster om USB-apparaten in te stellen</translation>
     </message>
     <message>
         <source>&Drag and Drop</source>
-        <translation type="unfinished"></translation>
+        <translation>&Drag-and-drop</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure shared folders</source>
+        <translation>Toon virtuele machine instellingenvenster om gedeelde mappen in te stellen</translation>
     </message>
     <message>
         <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Doe het Guest Additions-schijfbestand in het virtuele optische station</translation>
     </message>
     <message>
         <source>%1%</source>
         <comment>scale-factor</comment>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>Enable</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ingeschakelen</translation>
     </message>
     <message>
         <source>Resize to %1x%2</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">Herschalen naar %1x%2</translation>
+        <translation>Herschalen naar %1x%2</translation>
     </message>
     <message>
         <source>Preview Monitor %1</source>
-        <translation type="unfinished">Preview Monitor %1</translation>
+        <translatorcomment>Preview monitor %1</translatorcomment>
+        <translation>Preview Monitor %1</translation>
     </message>
     <message>
         <source>&Connect Network Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver&binden netwerkadapter</translation>
     </message>
     <message>
         <source>Connect Network Adapter &%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinden netwerkadapter &%1</translation>
     </message>
     <message>
         <source>No USB Devices Connected</source>
-        <translation type="unfinished">Er zijn geen USB-apparaten gekoppeld</translation>
+        <translation>Er zijn geen USB-apparaten verbonden</translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
-        <translation type="unfinished">Er zijn geen ondersteunde apparaten aan de host-PC verbonden</translation>
+        <translation>Er zijn geen ondersteunde apparaten aan de host-PC verbonden</translation>
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished">Er zijn geen webcams gekoppeld</translation>
+        <translation>Er zijn geen webcams verbonden</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
-        <translation type="unfinished">Er zijn geen ondersteunde webcams aan de host-PC verbonden</translation>
+        <translation>Er zijn geen ondersteunde webcams aan de host-PC verbonden</translation>
     </message>
     <message>
         <source>Create new virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Aanmaken nieuwe virtuele machine</translation>
     </message>
     <message>
         <source>Add existing virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Toevoegen bestaande virtuele machine</translation>
     </message>
     <message>
         <source>Rename selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <translation>Hernoemen geselecteerde virtuele machine-groep</translation>
     </message>
     <message>
         <source>&Ungroup</source>
-        <translation type="unfinished"></translation>
+        <translation>&Opheffen groep</translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <source>Ungroup items of selected virtual machine group</source>
+        <translation>Haal items uit de geselecteerde virtuele machine-groep</translation>
     </message>
     <message>
         <source>&Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&Sorteren</translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort items of selected virtual machine group alphabetically</source>
+        <translation>Sorteer items van geselecteerde virtuele machine-groep alfabetisch</translation>
     </message>
     <message>
         <source>Add new group based on selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Toevoegen nieuwe groep op basis van de geselecteerde virtuele machines</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Kloon de geselecteerde virtuele machine</translation>
     </message>
     <message>
         <source>Remove selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder de geselecteerde virtuele machine</translation>
     </message>
     <message>
         <source>Start selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Start de geselecteerde virtuele machines</translation>
     </message>
     <message>
         <source>Switch to the windows of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Schakel over naar de vensters van de geselecteerde virtuele machines</translation>
     </message>
     <message>
         <source>Start selected virtual machines in the background</source>
-        <translation type="unfinished"></translation>
+        <translation>Start de geselecteerde virtuele machines op de achtergrond</translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
-        <translation type="unfinished"></translation>
+        <source>Start selected virtual machines with option of continuing in background</source>
+        <translation>Start de geselecteerde virtuele machines met de optie deze op de achtergrond te laten doorgaan</translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Suspend execution of selected virtual machines</source>
+        <translation>Onderbreek tijdelijk de uitvoering van de geselecteerde virtuele machines</translation>
     </message>
     <message>
         <source>Reset selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Reset de geselecteerde virtuele machines</translation>
     </message>
     <message>
         <source>D&iscard Saved State...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver&werp opgeslagen staat...</translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Discard saved state of selected virtual machines</source>
+        <translation>Verwerp de opgeslagen staat van de geselecteerde virtuele machines</translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Show log files of selected virtual machines</source>
+        <translation>Toon de logbestanden van de geselecteerde virtuele machines</translation>
     </message>
     <message>
         <source>Re&fresh</source>
-        <translation type="unfinished">&Verversen</translation>
+        <translation>&Verversen</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Refresh accessibility state of selected virtual machines</source>
+        <translation>Actualiseer de toegankelijkheidsstatus van de geselecteerde virtuele machines</translation>
     </message>
     <message>
         <source>S&how in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>To&on in Finder</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon de VirtualBox-machinedefinitiebestanden in Finder</translation>
     </message>
     <message>
         <source>S&how in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>To&on in Explorer</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon de VirtualBox-machinedefinitiebestanden in Explorer</translation>
     </message>
     <message>
         <source>S&how in File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>To&on in Bestandsmanager</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in the File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon de VirtualBox-machinedefinitiebestanden in Bestandsmanager</translation>
     </message>
     <message>
         <source>Cr&eate Alias on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Maak alias op bur&eaublad</translation>
     </message>
     <message>
         <source>Create alias files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Maken aliasbestanden naar de VirtualBox-machinedefinitiebestanden op uw bureaublad</translation>
     </message>
     <message>
         <source>Cr&eate Shortcut on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Maak een sn&elkoppeling op bureaublad</translation>
     </message>
     <message>
         <source>Create shortcut files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Snelkoppeling maken naar het VirtualBox-machinedefinitiebestand op het bureaublad</translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort group of first selected virtual machine alphabetically</source>
+        <translation>Sorteer de groep van de eerst geselecteerde machine alfabetisch</translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Save state of selected virtual machines</source>
+        <translation>Opslaan staat virtuele machines</translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
+        <translation>Stuur ACPI-Shutdownsignaal naar de geselecteerde virtuele machins</translation>
     </message>
     <message>
         <source>Power off selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Zet de geselecteerde virtuele machines uit</translation>
     </message>
 </context>
 <context>
@@ -1388,24 +1389,24 @@
     <message>
         <source>Status</source>
         <comment>password table field</comment>
-        <translation type="unfinished">Status</translation>
+        <translation>Status</translation>
     </message>
     <message>
         <source>ID</source>
         <comment>password table field</comment>
-        <translation type="unfinished">ID</translation>
+        <translation>ID</translation>
     </message>
     <message>
         <source>Password</source>
         <comment>password table field</comment>
-        <translation type="unfinished">Wachtwoord</translation>
+        <translation>Wachtwoord</translation>
     </message>
     <message numerus="yes">
         <source><nobr>Used by the following %n hard disk(s):</nobr><br>%1</source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many hard drives are in the tool-tip and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><nobr>Gebruikt door de volgende %n harde schijf:</nobr><br>%1</numerusform>
+            <numerusform><nobr>Gebruikt door de volgende %n harde schijven:</nobr><br>%1</numerusform>
         </translation>
     </message>
 </context>
@@ -1526,19 +1527,19 @@
     </message>
     <message>
         <source>Storage Controller (IDE)</source>
-        <translation type="unfinished"></translation>
+        <translation>Opslagcontroller (IDE)</translation>
     </message>
     <message>
         <source>Storage Controller (SATA)</source>
-        <translation type="unfinished"></translation>
+        <translation>Opslagcontroller (SATA)</translation>
     </message>
     <message>
         <source>Storage Controller (SCSI)</source>
-        <translation type="unfinished"></translation>
+        <translation>Opslagcontroller (SCSI)</translation>
     </message>
     <message>
         <source>Storage Controller (SAS)</source>
-        <translation type="unfinished"></translation>
+        <translation>Opslagcontroller (SAS)</translation>
     </message>
 </context>
 <context>
@@ -2208,7 +2209,7 @@
     </message>
     <message>
         <source>Retrieving data ...</source>
-        <translation type="unfinished">Data ophalen...</translation>
+        <translation>Data ophalen...</translation>
     </message>
 </context>
 <context>
@@ -2819,9 +2820,9 @@
         <translation>Generiek stuurprogramma, '%1'</translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>Generiek stuurprogramma, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation>Generiek stuurprogramma, '%1' { %2 }</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -3250,15 +3251,15 @@
     </message>
     <message>
         <source>Holds the maximum width which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geeft aan welke maximum breedte de gast mag gebruiken.</translation>
     </message>
     <message>
         <source>Holds the maximum height which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geeft aan welke maximum hoogte de gast mag gebruiken.</translation>
     </message>
     <message>
         <source>When checked, machine windows will be raised when the mouse pointer moves over them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld zullen machine-vensters omhoog komen wanneer de muis er overheen gaat.</translation>
     </message>
 </context>
 <context>
@@ -3309,19 +3310,19 @@
     </message>
     <message>
         <source>Add Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Toevoegen pakket</translation>
     </message>
     <message>
         <source>Remove Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijderen pakket</translation>
     </message>
     <message>
         <source>Adds new package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voegt nieuw pakket toe.</translation>
     </message>
     <message>
         <source>Removes selected package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijdert geselecteerd pakket.</translation>
     </message>
 </context>
 <context>
@@ -3388,11 +3389,11 @@
     </message>
     <message>
         <source>Host Screensaver:</source>
-        <translation type="unfinished"></translation>
+        <translation>Screensaver host:</translation>
     </message>
     <message>
         <source>&Disable When Running Virtual Machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Uitschakelen wanneer Virtuele Machines &draaien</translation>
     </message>
 </context>
 <context>
@@ -3447,11 +3448,11 @@
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toont alle beschikbare shortcuts die kunnen worden ingesteld.</translation>
     </message>
     <message>
         <source>Holds a sequence to filter the shortcut list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruimte voor een combinatie waarmee shortcutlijst zal worden gefilterd.</translation>
     </message>
 </context>
 <context>
@@ -3778,51 +3779,51 @@
     </message>
     <message>
         <source>Add NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NAT-netwerk toevoegen</translation>
     </message>
     <message>
         <source>Remove NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NAT-netwerk verwijderen</translation>
     </message>
     <message>
         <source>Edit NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NAT-netwerk bewerken</translation>
     </message>
     <message>
         <source>Adds new NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voegt NAT-netwerk toe.</translation>
     </message>
     <message>
         <source>Removes selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijdert geselecteerd NAT-netwerk.</translation>
     </message>
     <message>
         <source>Edits selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bewerkt geselecteerd NAT-netwerk.</translation>
     </message>
     <message>
         <source>Add Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Host-only netwerk toevoegen</translation>
     </message>
     <message>
         <source>Remove Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Host-only netwerk verwijderen</translation>
     </message>
     <message>
         <source>Edit Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Host-only netwerk bewerken</translation>
     </message>
     <message>
         <source>Adds new host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voegt host-only netwerk toe.</translation>
     </message>
     <message>
         <source>Removes selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijdert  geselecteerd host only netwerk.</translation>
     </message>
     <message>
         <source>Edits selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bewerkt geselecteerd host only netwerk.</translation>
     </message>
 </context>
 <context>
@@ -4016,11 +4017,11 @@
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld wordt deze netwerkadapter handmatig geconfigureerd.</translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
-        <translation type="unfinished"></translation>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
+        <translation>Als dit is ingesteld zal voor dit netwerk de DHCP-server tijdens de machinestart worden ingeschakeld.</translation>
     </message>
 </context>
 <context>
@@ -4091,23 +4092,23 @@
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wanneer ingesteld zal dit netwerk worden ingeschakeld.</translation>
     </message>
     <message>
         <source>When checked, this network will support DHCP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wanneer ingesteld zal dit netwerk DHCP ondersteunen.</translation>
     </message>
     <message>
         <source>When checked, this network will support IPv6.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wanneer ingesteld zal dit netwerk IPv6 ondersteunen.</translation>
     </message>
     <message>
         <source>When checked, this network will be advertised as the default IPv6 route.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wanneer ingesteld zal dit netwerk bekend worden als de default IPv6-route.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toont een venster waarin de port-forwardingregels geconfigureerd kunnen worden.</translation>
     </message>
 </context>
 <context>
@@ -4185,11 +4186,11 @@
     </message>
     <message>
         <source>Holds the proxy host.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bevat de proxyhost.</translation>
     </message>
     <message>
         <source>Holds the proxy port.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bevat de proxypoort.</translation>
     </message>
 </context>
 <context>
@@ -4245,7 +4246,7 @@
     </message>
     <message>
         <source>Selects how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geeft aan hoe vaak de controle op nieuwe versies moet plaatsvinden. Wilt u deze controle helemaal niet, verwijdert u eenvoudigweg het vinkje in het keuzevak.</translation>
     </message>
 </context>
 <context>
@@ -4620,11 +4621,11 @@
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
         <comment>HDD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Geeft activiteit van de harde schijf weer:</nobr>%1</p></translation>
     </message>
     <message>
         <source>Indicates whether the host keyboard is captured by the guest OS:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;keyboard is not captured</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;keyboard is captured</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation>Geeft aan of het toetsenbord van de host door het gastbesturingssysteem is afgevangen:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;keyboard is not captured</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;keyboard is captured</nobr></translation>
     </message>
 </context>
 <context>
@@ -4721,7 +4722,7 @@
     </message>
     <message>
         <source>Selects the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecteert het audiostuurprogramma voor uitvoer. Het <b>Null-audiostuurprogramma</b> zorgt dat de gast de audiokaart wel ziet, maar daar geen toegang tot zal hebben.</translation>
     </message>
 </context>
 <context>
@@ -5043,67 +5044,67 @@
     </message>
     <message>
         <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
+        <translation>HiDPI-ondersteuning:</translation>
     </message>
     <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bevat het VRDP-serverpoortnummer. U mag <tt>0</tt> (nul) opgeven om poort 3389 te selecteren, de standaardpoort voor RDP.</translation>
     </message>
     <message>
         <source>Selects the VRDP authentication method.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecteert de VRDP-authenticatiemethode.</translation>
     </message>
     <message>
         <source>Holds the timeout for guest authentication, in milliseconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bevat de tijdslimiet voor authenticatie van de gast, in milliseconden.</translation>
     </message>
     <message>
         <source>When checked, multiple simultaneous connections to the VM are permitted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wanneer ingesteld zullen meerdere gelijktijdige verbindingen met de VM worden toegestaan.</translation>
     </message>
     <message>
         <source>Holds the filename VirtualBox uses to save the recorded content.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geef hier de bestandsnaam op waaronder VirtalBox de opname moet opslaan.</translation>
     </message>
     <message>
         <source>Selects the resolution (frame size) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Deze instelling bepaalt de resolutie (beeldgrootte) van de opname.</translation>
     </message>
     <message>
         <source>Holds the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Deze instelling bepaalt de <b>horizontale</b> resolutie (beeldbreedte) van de opname.</translation>
     </message>
     <message>
         <source>Holds the <b>vertical</b> resolution (frame height) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Deze instelling bepaalt de <b>verticale</b> resolutie (beeldhoogte) van de opname.</translation>
     </message>
     <message>
         <source>Controls the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Deze instelling bepaalt het maximale aantal <b>beelden per seconde</b>. De rest wordt overgeslagen. Deze hoeveelheid verlagen zal het aantal overgeslagen beelden verhogen en daarmee de bestandsgrootte verkleinen.</translation>
     </message>
     <message>
         <source>Controls the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Deze instelling bepaalt de <b>kwaliteit</b>. Een hogere waarde geeft een betere videokwaliteit, maar ook een groter bestand.</translation>
     </message>
     <message>
         <source>Holds the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Deze instelling bepaalt de bitrate in <b>kilobits per seconde</b>. Een hogere waarde geeft een betere videokwaliteit, maar ook een groter bestand.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>U hebt minder dan <b>%1</b> aan videogeheugen toegewezen; genoemde hoeveelheid is het minimum dat nodig is om de virtuele machine over te kunnen laten schakelen op schermvullende of naadloze modus.</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>When checked, enables video recording for screen %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld wordt video-opnemen voor scherm %1 ingeschakeld.</translation>
     </message>
 </context>
 <context>
@@ -5259,11 +5260,11 @@
     </message>
     <message>
         <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bevat de codering -cipher- die bij de versleuteling van de virtuele machineschijven is gebruikt.</translation>
     </message>
     <message>
         <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bevat het pad waar snapshots van deze virtuele machine worden opgeslagen. Wees er wel van bewust dat snapshots erg veel ruimte op de harde schijf kunnen innemen.</translation>
     </message>
 </context>
 <context>
@@ -5306,15 +5307,15 @@
     </message>
     <message>
         <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wanneer ingesteld, wordt de miniwerkbalk getoont in schermvullende en naadloze modi.</translation>
     </message>
     <message>
         <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon in &Schermvullend/Naadloos</translation>
     </message>
     <message>
         <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld wordt de miniwerkbalk boven in het scherm weergegeven in plaats van de standaardpositie onder aan het scherm.</translation>
     </message>
 </context>
 <context>
@@ -5482,23 +5483,23 @@
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="unfinished"></translation>
+        <translation>Stelt in hoe deze virtuele adapter is gekoppeld aan het werkelijke netwerk van het host-OS.</translation>
     </message>
     <message>
         <source>Shows additional network adapter options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toont of verbergt extra opties voor de netwerkadapter.</translation>
     </message>
     <message>
         <source>Holds the configuration settings for the network attachment driver. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vul hier configuratie-instellingen in voor de netwerkkoppelingsdriver die u zal gebruiken. De instellingen moeten in de vorm zijn <b>naam=waarde</b> en zijn driver-afhankelijk. Gebruik <b>shift-enter</b> voor een nieuwe toevoeging.</translation>
     </message>
     <message>
         <source>When checked, the virtual network cable is plugged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wanneer ingesteld zal de virtuele netwerkkabel worden ingeplugd.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toont een venster waarin de port-forwardingregels geconfigureerd kunnen worden.</translation>
     </message>
 </context>
 <context>
@@ -5550,23 +5551,23 @@
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">Op dit moment is geen IRQ opgegeven.</translation>
+        <translation>Op dit moment is geen IRQ opgegeven.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">Op dit moment is geen I/O-poort opgegeven.</translation>
+        <translation>Op dit moment is geen I/O-poort opgegeven.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">Twee of meer pooren hebben dezelfde instellingen.</translation>
+        <translation>Twee of meer poorten hebben dezelfde instellingen.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">Op dit moment is geen poortpad opgegeven.</translation>
+        <translation>Op dit moment is geen poortpad opgegeven.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Op dit moment zijn gelijke poortpaden opgegeven.</translation>
+        <translation>Op dit moment zijn gelijke poortpaden opgegeven.</translation>
     </message>
 </context>
 <context>
@@ -5707,27 +5708,27 @@
     </message>
     <message>
         <source>Add Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Toevoegen gedeelde map</translation>
     </message>
     <message>
         <source>Edit Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Wijzigen gedeelde map</translation>
     </message>
     <message>
         <source>Remove Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijderen gedeelde map</translation>
     </message>
     <message>
         <source>Adds new shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voegt gedeelde map toe.</translation>
     </message>
     <message>
         <source>Edits selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wijzigt gedeelde map.</translation>
     </message>
     <message>
         <source>Removes selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijdert gedeelde map.</translation>
     </message>
 </context>
 <context>
@@ -5782,7 +5783,7 @@
     </message>
     <message>
         <source>When checked, this shared folder will be permanent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld zal deze gedeelde map permanent worden.</translation>
     </message>
 </context>
 <context>
@@ -5867,31 +5868,31 @@
     </message>
     <message>
         <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Stelt de status van deze seriële poort in. Selecteert u <b>Niet verbonden</b> dan zal het gastbesturingssysteem de seriële poort wel detecteren maar zal niet in staat zijn ermee te werken.</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld zal de virtuele machine aannemen dat de pipe of socket gespecificeerd in het <b>Pad/Adres</b>-veld bestaat en proberen het te gebruiken. Niet aangevinkt zal de pipe of socket door de virtuele machine tijdends het opstarten worden aangemaakt.</translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">Op dit moment is geen IRQ opgegeven.</translation>
+        <translation>Op dit moment is geen IRQ opgegeven.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">Op dit moment is geen I/O-poort opgegeven.</translation>
+        <translation>Op dit moment is geen I/O-poort opgegeven.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">Twee of meer pooren hebben dezelfde instellingen.</translation>
+        <translation>Twee of meer poorten hebben dezelfde instellingen.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">Op dit moment is geen poortpad opgegeven.</translation>
+        <translation>Op dit moment is geen poortpad opgegeven.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Op dit moment zijn gelijke poortpaden opgegeven.</translation>
+        <translation>Op dit moment zijn gelijke poortpaden opgegeven.</translation>
     </message>
 </context>
 <context>
@@ -6319,88 +6320,89 @@
     </message>
     <message>
         <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toont een lijst van alle opslagcontrollers voor deze machine, de virtuele images en de hoststations die aangesloten zijn.</translation>
     </message>
     <message>
         <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bevat de naam van de opslagcontroller die momenteel geselecteerd is in Opslagstructuur.</translation>
     </message>
     <message>
         <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <translation>Indien ingesteld wordt toegestaan host I/O-cachingsmogelijkheden te gebruiken.</translation>
     </message>
     <message>
         <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld zal de virtuele disk niet worden verwijderd wanneer het gastsysteem het uitwerpt.</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld zal het gastsysteem de virtuele disk beschouwen als een solid-stateapparaat.</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld zal het gastsysteem de virtuele disk beschouwen als een 'hot-pluggable'-apparaat.</translation>
     </message>
     <message>
         <source>Image</source>
         <comment>storage image</comment>
-        <translation type="unfinished">Image</translation>
+        <translation>Image</translation>
     </message>
     <message>
         <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Item&nbsp;Uitklappen/Inklappen</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Voegt&nbsp;harde&nbsp;schijf&nbsp;toe</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Voegt&nbsp;optisch&nbsp;station&nbsp;toe</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Voegt&nbsp;diskettestation&nbsp;toe</nobr></translation>
     </message>
     <message>
         <source>Adds new storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voegt nieuwe opslagcontroller toe.</translation>
     </message>
     <message>
         <source>Removes selected storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijdert  nieuwe opslagcontroller.</translation>
     </message>
     <message>
         <source>Adds new storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voegt nieuwe opslagaansluiting toe.</translation>
     </message>
     <message>
         <source>Removes selected storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijdert geselecteerde opslagaansluiting.</translation>
     </message>
     <message>
         <source>Create New Hard Disk...</source>
-        <translation type="unfinished"></translation>
+        <translation>Maak een nieuwe harde schijf aan...</translation>
     </message>
     <message>
         <source>Choose Virtual Hard Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies een virtuele harde schijf bestand...</translation>
     </message>
     <message>
         <source>Choose Virtual Optical Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies een virtuele optische schijfbestand...</translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
-        <translation type="unfinished"></translation>
+        <source>Remove Disk from Virtual Drive</source>
+        <translation>Verwijder schijf van virtuele station</translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies een virtuele diskette bestand...</translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation>Kies een schijf-image...</translation>
     </message>
 </context>
 <context>
@@ -6677,29 +6679,29 @@
     </message>
     <message>
         <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld zal het RTC-apparaat de tijd in UTC-formaat rapporteren; anders in locale (host)tijd. Unix verwacht normaal gesproken dat de klok op UTC staat.</translation>
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1 CPU</source>
         <comment>%1 is 1 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPU</translation>
     </message>
     <message>
         <source>%1 CPUs</source>
         <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPUs</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
 </context>
 <context>
@@ -6860,63 +6862,63 @@
     </message>
     <message>
         <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld zal de virtuele USB-OHCI-controller van deze machine worden ingeschakeld. De USB-OHCI-controller levert ondersteuning voor USB 1.0.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld zal de virtuele USB-EHCI-controller van deze machine worden ingeschakeld. De USB-EHCI-controller levert ondersteuning voor USB 2.0.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als dit is ingesteld zal de virtuele USB-xHCI-controller van deze machine worden ingeschakeld. De USB-xHCI-controller levert ondersteuning voor USB 3.0.</translation>
     </message>
     <message>
         <source>Add Empty Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Toevoegen leeg filter</translation>
     </message>
     <message>
         <source>Add Filter From Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Toevoegen filter vanuit een appartaat </translation>
     </message>
     <message>
         <source>Edit Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Wijzigen filter</translation>
     </message>
     <message>
         <source>Remove Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijderen filter</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Verplaats filter omhoog</translation>
     </message>
     <message>
         <source>Move Filter Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Verplaats filter naar beneden</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voegt een nieuw USB-filter toe waarbij alle velden in het begin leeg zijn. Let op: een dergelijke filter zal met elk aangesloten USB-apparaat overeenkomen.</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voegt een nieuw USB-filter toe waarbij de velden de waarden van het geselecteerde USB-apparaat aangesloten op de fysieke PC overnemen.</translation>
     </message>
     <message>
         <source>Edits selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wijzigt geselecteerd USB-filter.</translation>
     </message>
     <message>
         <source>Removes selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijdert geselecteerd USB filter.</translation>
     </message>
     <message>
         <source>Moves selected USB filter up.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verplaatst geselecteerd USB filter omhoog.</translation>
     </message>
     <message>
         <source>Moves selected USB filter down.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verplaatst geselecteerd USB filter naar beneden.</translation>
     </message>
 </context>
 <context>
@@ -7023,35 +7025,35 @@
     </message>
     <message>
         <source>Holds the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bepaalt het filter voor het ID van de leverancier. Het <i>precieze</i> formaat is<tt>XXXX</tt> waarbij <tt>X</tt> een hexadecimaal getal is. Een leeg veld zal met elke waarde overeenkomen.</translation>
     </message>
     <message>
         <source>Holds the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bepaalt het filter voor het ID van het product. Het <i>precieze</i> formaat is<tt>XXXX</tt> waarbij <tt>X</tt> een hexadecimaal getal is. Een leeg veld zal met elke waarde overeenkomen.</translation>
     </message>
     <message>
         <source>Holds the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bepaalt het filter voor het revisienummer. Het <i>precieze</i> formaat is<tt>IIFF</</tt> waarbij <tt>I</tt> een geheel getal is en <tt>F</tt> een getal achter de komma. Een leeg veld zal met elke waarde overeenkomen.</translation>
     </message>
     <message>
         <source>Holds the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bepaalt het filter voor de fabrikant als een <i>exacte overeenkomst</i>. Een leeg veld zal met elke waarde overeenkomen.</translation>
     </message>
     <message>
         <source>Holds the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bepaalt het filter voor de produktnaam als een <i>exacte overeenkomst</i>. Een leeg veld zal met elke waarde overeenkomen.</translation>
     </message>
     <message>
         <source>Holds the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bepaalt het filter voor het serienummer als een <i>exacte overeenkomst</i>. Een leeg veld zal met elke waarde overeenkomen.</translation>
     </message>
     <message>
         <source>Holds the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bepaalt het filter voor de fysieke host-USB-poort als een <i>exacte overeenkomst</i>. Een leeg veld zal met elke waarde overeenkomen.</translation>
     </message>
     <message>
         <source>Holds whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
-        <translation type="unfinished"></translation>
+        <translation>Bepaalt of dit filter werkt voor USB-apparaten die lokaal gekoppeld zijn aan: de fysieke computer. (<i>Nee</i>), een VRDP computer (<i>Ja</i>) of beide (<i>Beide</i>).</translation>
     </message>
 </context>
 <context>
@@ -7096,7 +7098,7 @@
     </message>
     <message>
         <source>&Hard disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Harde schijven</translation>
     </message>
 </context>
 <context>
@@ -8436,8 +8438,8 @@
         <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
         <translation>
-            <numerusform><p>De volgende virtuele machine bevindt zich momenteel in opgeslagen staat: <b>%1</b></p><p>Indien u doorgaat wordt de runtime-staat van de geëxporteerde machine weggegooid. De bestaande machine wordt niet veranderd.</p></numerusform>
-            <numerusform><p>De volgende virtuele machines bevinden zich momenteel in opgeslagen staat: <b>%1</b></p><p>Indien u doorgaat wordt de runtime-staat van de geëxporteerde machines weggegooid. De bestaande machines worden niet veranderd.</p></numerusform>
+            <numerusform><p>De volgende %n virtuele machine bevindt zich momenteel in opgeslagen staat: <b>%1</b></p><p>Indien u doorgaat wordt de runtime-staat van de geëxporteerde machine weggegooid. De bestaande machine wordt niet veranderd.</p></numerusform>
+            <numerusform><p>De volgende %n virtuele machines bevinden zich momenteel in opgeslagen staat: <b>%1</b></p><p>Indien u doorgaat wordt de runtime-staat van de geëxporteerde machines weggegooid. De bestaande machines worden niet veranderd.</p></numerusform>
         </translation>
     </message>
     <message>
@@ -8635,43 +8637,43 @@
     </message>
     <message>
         <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Eén of meer schijf-imagebestanden zijn nu niet te benaderen. U kunt niet met de virtuele machines die deze bestanden gebruiken werken, totdat zij weer benaderbaar zijn.</p><p>Druk op de knop <b>Controleren</b> om de Virtuele Media Manager te openen en te bekijken welk medium niet te benaderen is, of druk op de knop <b>Negeren</b> om dit bericht te negeren.</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Door het verwijderen van een snapshot wordt ook de informatie over de staat -opgeslagen in het snapshot- weggegooid. De schijfgegevens die VirtualBox heeft aangemaakt met het snapshot -en die verspreid zijn over verschillende bestanden- worden samengevoegd in één bestand. Dit kan een langdurig proces zijn. De informatie in het snapshot kan niet worden hersteld.</p></p>Bent u er zeker van dat u het geselecteerde snapshot <b>%1</b> wilt [...]
     </message>
     <message>
         <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Het verwijderen van snapshot %1 kost tijdelijk meer schijfruimte. In het ergste geval zal de omvang van image %2 groeien met %3, er is echter maar %4 vrij.</p><p>Geen schijfruimte meer hebben tijdens de samenvoegoperatie kan als gevolg hebben, dat de image en de VM-configuratie corrupt raken. Dit betekent onherstelbaar verlies van deze VM en haar gegevens.</p><p>U mag natuurlijk op eigen risico doorgaan met het verwijderen van het sna [...]
     </message>
     <message>
         <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Weet u zeker dat u de virtuele harde schijf <nobr><b>%1</b></nobr> wilt losmaken?</p><p>Hierdoor wordt deze ontkoppeld van de volgende virtuele machine(s): <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Wilt u de opslageenheid van harde schijf <nobr><b>%1</b></nobr> verwijderen?</p><p>Selecteert u <b>Verwijderen</b> dan wordt de opslageenheid permanent verwijderd. Deze actie <b>kan niet</b> teruggedraaid worden.<p><p>Selecteert u <b>Behouden</b> dan wordt de harde schijf alleen uit de lijst met bekende harde schijven gehaald maar de opslageendheid blijft onaangetast, waardoo [...]
     </message>
     <message>
         <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Het is niet gelukt harde schijf bestand <nobr><b>%1</b></nobr> te openen.</translation>
     </message>
     <message>
         <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Het is niet gelukt harde schijf bestand <nobr><b>%1</b></nobr> te sluiten.</translation>
     </message>
     <message>
         <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
-        <translation type="unfinished"></translation>
+        <translation>U staat op het punt een nieuwe virtuele machine zonder harde schijf aan te maken. U zult niet in staat zijn een besturingssysteem te installeren voordat u een schijf hebt toegevoegd. Tot die tijd kunt u alleen de machine starten met gebruikmaking van een virtuele optische schijf of vanaf het netwerk.</translation>
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>De virtuele machine schakelt nu over op de <b>schermvullende</b> modus. U kunt ieder moment terugkeren door op <b>%1</b> te drukken. Let op: de <i>Hosttoets</i> is op dit moment <b>%2</b>.</p><p>Besef dat het hoofdmenu verborgen is bij volledig scherm. U kunt dit menu benaderen door op de <b>Hosttoets+Home</b> te drukken.</p></translation>
     </message>
     <message>
         <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kan het gastscherm niet laten overschakelen op schermvullend omdat de gast te weinig videogeheugen heeft.</p><p>U moet bij de configuratie de virtuele machine minimaal <b>%1</b> videogeheugen meegeven.</p><p>Klik op <b>Negeren</b> om toch op volledig beeld over te schakelen of klik op<b>Annuleren</b> om niet over te schakelen.</p></translation>
     </message>
 </context>
 <context>
@@ -9234,55 +9236,55 @@
     <name>UIPortForwardingTable</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Naam</translation>
+        <translation>Naam</translation>
     </message>
     <message>
         <source>Protocol</source>
-        <translation type="unfinished">Protocol</translation>
+        <translation>Protocol</translation>
     </message>
     <message>
         <source>Host IP</source>
-        <translation type="unfinished">Host IP</translation>
+        <translation>Host IP</translation>
     </message>
     <message>
         <source>Host Port</source>
-        <translation type="unfinished">Host poort</translation>
+        <translation>Hostpoort</translation>
     </message>
     <message>
         <source>Guest IP</source>
-        <translation type="unfinished">Gast IP</translation>
+        <translation>Gast-IP</translation>
     </message>
     <message>
         <source>Guest Port</source>
-        <translation type="unfinished">Gast poort</translation>
+        <translation>Gastpoort</translation>
     </message>
     <message>
         <source>Contains a list of port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bevat een lijst met doorverwijsregels voor een poort.</translation>
     </message>
     <message>
         <source>Add New Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Toevoegen nieuwe regel</translation>
     </message>
     <message>
         <source>Copy Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopieer de geselecteerde regel</translation>
     </message>
     <message>
         <source>Remove Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder de geselecteerde regel</translation>
     </message>
     <message>
         <source>Adds new port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voegt een nieuwe doorverwijsregel toe.</translation>
     </message>
     <message>
         <source>Copies selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopieert de geselecteerde doorverwijsregel.</translation>
     </message>
     <message>
         <source>Removes selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijdert  geselecteerde doorverwijsregel.</translation>
     </message>
 </context>
 <context>
@@ -9524,7 +9526,7 @@
     </message>
     <message>
         <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"><nobr><b>Klik</b> om indicator te toggelen.</nobr><br><nobr><b>Drag&Drop</b> om positie van indicator te veranderen.</nobr></translation>
+        <translation><nobr><b>Klik</b> om indicator te toggelen.</nobr><br><nobr><b>Drag&Drop</b> om positie van indicator te veranderen.</nobr></translation>
     </message>
 </context>
 <context>
@@ -10028,75 +10030,75 @@
     </message>
     <message>
         <source>Copy Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopieer Virtuele Schijf</translation>
     </message>
     <message>
         <source>Hard disk to copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Te kopiëren harde schijf</translation>
     </message>
     <message>
         <source><p>Please select the virtual hard disk file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kies een virtuele schijf om te kopiëren als u deze nog niet geselecteerd hebt. U kunt een schijf kiezen uit de lijst of door op de mappenicoon naast de lijst te klikken en daar een schijfbestand te kiezen.<p></translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file to copy...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies een te kopiëren virtuele harde schijf bestand...</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestandstype harde schijf</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies het bestandstype dat u voor deze nieuwe virtuele schijf wilt gebruiken. Indien u niet van plan bent deze virtuele schijf met andersoortige virtualisatiesoftware te gebruiken kunt u deze instelling onveranderd laten.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Opslag op fysieke harde schijf</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies of het nieuwe virtuele schijf bestand naar de maximale grootte moet groeien door gebruik (dynamisch gealloceerd) of dat het op de maximale grootte moet worden aangemaakt (gefixeerde grootte).</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Een <b>dynamisch gealloceerd</b> virtuele schijf bestand zal tijdens gebruik tot de aangegeven maximale grootte groeien (tot een maximum <b>gefixeerde grootte</b>).Het schijfbestand zal echter niet automatisch krimpen wanneer ruimte wordt vrijgemaakt.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Aanmaken van een virtuele schijf bestand van <b>gefixeerde grootte</b> kan op sommige systemen langer duren, maar is vaak sneller in het gebruik.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>U kunt er ook voor kiezen het virtueel schijfbestand <b>te splitsen</b> in meerdere bestanden van maximaal twee gigabytes elk. Dit is hoofdzakelijk handig indien u de virtuele machine wilt opslaan op verwijderbare USB-apparaten of op oudere systemen, waarvan sommige niet kunnen omgaan met erg grote bestanden.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies een lokatie voor het nieuwe virtuele harde schijf bestand</translation>
     </message>
     <message>
         <source>New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieuw aan te maken harde schijf</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ de naam van de nieuwe virtuele schijf in de ruimte beneden of klik op het mapicoontje, kies een andere map en maak daar het bestand in aan.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies een lokatie voor het nieuwe virtuele harde schijf bestand...</translation>
     </message>
     <message>
         <source>Hard disk to &copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Te kopieren harde s&chijf</translation>
     </message>
     <message>
         <source>&New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>&Nieuw aan te maken harde schijf</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestands&type harde schijf</translation>
     </message>
 </context>
 <context>
@@ -10201,7 +10203,7 @@
     </message>
     <message>
         <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Kies het type kloon dat u wilt aanmaken.</p><p>Indien u kiest voor <b>Volle kloon</b>, wordt er een exacte kopie (inclusief alle virtuele harde schijf bestanden) van de originele virtuele machine aangemaakt.</p><p>Indien u kiest voor <b>Gekoppelde kloon</b>, wordt er een nieuwe machine aangemaakt, maar de virtuele harde schijf bestanden zullen gebonden zijn aan de virtuele harde schijf bestanden van de originel [...]
     </message>
 </context>
 <context>
@@ -10561,51 +10563,51 @@
     </message>
     <message>
         <source>Create Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Maak een nieuwe virtuele schijf</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestandstype harde schijf</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies het bestandstype dat u voor deze nieuwe virtuele schijf wilt gebruiken. Indien u niet van plan bent deze virtuele schijf met andersoortige virtualisatiesoftware te gebruiken kunt u deze instelling onveranderd laten.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Opslag op fysieke harde schijf</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies of het nieuwe virtuele schijf bestand naar de maximale grootte moet groeien door gebruik (dynamisch gealloceerd) of dat het op de maximale grootte moet worden aangemaakt (gefixeerde grootte).</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Een <b>dynamisch gealloceerd</b> virtuele schijf bestand zal tijdens gebruik tot de aangegeven maximale grootte groeien (tot een maximum <b>gefixeerde grootte</b>).Het schijfbestand zal echter niet automatisch krimpen wanneer ruimte wordt vrijgemaakt.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Aanmaken van een virtuele schijf bestand van <b>gefixeerde grootte</b> kan op sommige systemen langer duren, maar is vaak sneller in het gebruik.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>U kunt er ook voor kiezen het virtueel schijfbestand <b>te splitsen</b> in meerdere bestanden van maximaal twee gigabytes elk. Dit is hoofdzakelijk handig indien u de virtuele machine wilt opslaan op verwijderbare USB-apparaten of op oudere systemen, waarvan sommige niet kunnen omgaan met erg grote bestanden.</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ de naam van de nieuwe virtuele schijf in de ruimte beneden of klik op het mapicoontje, kies een andere map en maak daar het bestand in aan.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies een lokatie voor het nieuwe virtuele harde schijf bestand...</translation>
     </message>
     <message>
         <source>Select the size of the virtual hard disk in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies de grootte van de virtuele harde schijf in megabytes. Deze grootte bepaalt de hoeveelheid bestandsdata die een virtuele machine uiteindelijk op deze schijf kan opslaan.</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestands&type harde schijf</translation>
     </message>
 </context>
 <context>
@@ -10696,27 +10698,27 @@
     </message>
     <message>
         <source>Hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Harde schijf</translation>
     </message>
     <message>
         <source><p>If you wish you can add a virtual hard disk to the new machine. You can either create a new hard disk file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard disk is <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Indien u dat wilt, kunt u een virtuele harde schijf aan de nieuwe machine toevoegen. U kunt een geheel nieuw harde schijf bestand aanmaken, één uit de lijst selecteren of met behulp van de mapicoon een bestand op een andere lokatie selecteren.</p><p>Indien u een wat meer complexe opslaginstelling nodig hebt, kunt u deze stap ook overslaan en deze instellingen aanbrengen wanneer de machine  is aangemaakt.</p><p>De aanbevolen grootte va [...]
     </message>
     <message>
         <source>&Do not add a virtual hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Voeg virtuele har&de schijf niet toe</translation>
     </message>
     <message>
         <source>&Create a virtual hard disk now</source>
-        <translation type="unfinished"></translation>
+        <translation>Maak nieuwe &virtuele harde schijf nu aan</translation>
     </message>
     <message>
         <source>&Use an existing virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Gebr&uik een bestaand virtuele harde schijf bestand</translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies een virtuele harde schijf bestand...</translation>
     </message>
 </context>
 <context>
@@ -10805,19 +10807,19 @@
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toont een venster waarin een andere map kan worden gekozen.</translation>
     </message>
     <message>
         <source>Displays a window to select a different file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toont een venster waarin een ander bestand kan worden gekozen.</translation>
     </message>
     <message>
         <source>Holds the folder path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bevat het pad naar de map.</translation>
     </message>
     <message>
         <source>Holds the file path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bevat het bestandspad.</translation>
     </message>
 </context>
 <context>
@@ -11698,7 +11700,7 @@
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
         <translatorcomment>RL - Definitie: "A differencing disk is a virtual hard disk you use to isolate changes to a virtual hard disk or the guest operating system by storing them in a separate file." Een techterm dus. Niet vertalen.</translatorcomment>
-        <translation type="unfinished">Aankoppelen van deze harde schijf wordt indirect uitgevoerd met gebruik van een nieuw aangemaakte differencing harde schijf.</translation>
+        <translation>Aankoppelen van deze harde schijf wordt indirect uitgevoerd met gebruik van een nieuw aangemaakte differencing harde schijf.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -11708,7 +11710,7 @@
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Deze basis harde schijf wordt indirect gekoppeld met gebruik van de volgende differencing harde schijf:</translation>
+        <translation>Deze basis harde schijf is indirect gekoppeld met gebruik van de volgende differencing harde schijf:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -12521,20 +12523,20 @@
     </message>
     <message>
         <source>Please choose a virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies een virtuele harde schijf bestand</translation>
     </message>
     <message>
         <source>All virtual hard disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle virtuele harde schijf bestanden (%1)</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Medium Manager to inspect these files.</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Enkele bestanden in deze keten van harde schijven zijn niet te benaderen. Gebruik de Virtuele Media Manager om deze bestanden nader te bekijken.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies een lokatie voor het nieuwe virtuele harde schijf bestand</translation>
     </message>
 </context>
 <context>
@@ -13214,19 +13216,19 @@
     </message>
     <message>
         <source>Restore selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Zet het geselecteerde snapshot van de virtuele machine terug</translation>
     </message>
     <message>
         <source>Delete selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder het geselecteerde snapshot van de virtuele machine</translation>
     </message>
     <message>
         <source>Display a window with selected snapshot details</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon details van geselecteerde snapshot</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Kloon de geselecteerde virtuele machine</translation>
     </message>
 </context>
 <context>
@@ -13263,7 +13265,7 @@
     </message>
     <message>
         <source>Snapshot %1</source>
-        <translation type="unfinished">Snapshot %1</translation>
+        <translation>Snapshot %1</translation>
     </message>
 </context>
 <context>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
index 1105f02..09d0a38 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
@@ -363,7 +363,7 @@
         <translation type="obsolete">I&nformacje o sesji</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Wyświetla okno z informacjami o sesji</translation>
     </message>
     <message>
@@ -455,11 +455,11 @@
         <translation type="obsolete">Włącza lub wyłącza zdalne połączenia RDP do tej maszyny</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">Za&instaluj Dodatki (Guest Additions)...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="unfinished">Za&instaluj Dodatki (Guest Additions)...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Montuje obraz z instalatorem Dodatków dla goszczonych systemów (Guest Additions)</translation>
     </message>
     <message>
@@ -787,92 +787,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Za&instaluj Dodatki (Guest Additions)...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Montuje obraz z instalatorem Dodatków dla goszczonych systemów (Guest Additions)</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
+        <source>&Webcams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Sieć</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Plik</translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="unfinished">&Klawiatura</translation>
-    </message>
-    <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Sieć</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Globalne ustawienia...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Pokaż &log...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Plik</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -888,175 +874,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Globalne ustawienia...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <source>&Keyboard</source>
+        <translation type="unfinished">&Klawiatura</translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <source>&Hard Disks</source>
+        <translation type="unfinished">&Dyski twarde</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="unfinished">&Dyski twarde</translation>
+        <source>&USB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Pokaż &log...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1102,6 +1088,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create new virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1118,7 +1112,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1126,7 +1120,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1150,15 +1144,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1170,11 +1176,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1182,7 +1188,7 @@
         <translation type="unfinished">&Odśwież</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1226,15 +1232,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1243,34 +1249,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Włącz</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1294,6 +1274,19 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -2789,11 +2782,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
-        <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
         <translation type="unfinished">Filtry urządzeń</translation>
@@ -2853,54 +2841,34 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">Kontroler USB</translation>
-    </message>
-    <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
-        <comment>details (user interface)</comment>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
-        <translation type="unfinished"></translation>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">Kontroler USB</translation>
     </message>
     <message>
         <source>Menu-bar</source>
@@ -2932,15 +2900,40 @@ p, li { white-space: pre-wrap; }
         <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>UIGDetailsUpdateThreadAudio</name>
     <message>
-        <source>Controller</source>
-        <comment>details</comment>
-        <translation type="obsolete">Kontroler</translation>
-    </message>
-</context>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details (user interface/mini-toolbar)</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UIGDetailsUpdateThreadAudio</name>
+    <message>
+        <source>Controller</source>
+        <comment>details</comment>
+        <translation type="obsolete">Kontroler</translation>
+    </message>
+</context>
 <context>
     <name>UIGDetailsUpdateThreadDescription</name>
     <message>
@@ -3888,7 +3881,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4583,7 +4576,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4597,8 +4591,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4901,38 +4894,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Miniaturowy pasek narzędzi:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Pokazywanie miniaturowego paska narzędzi w trybach pełnoekranowym i zintegrowanym.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Pokaż w trybie p&ełnoekranowym/zintegrowanym</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Pokazywanie miniaturowego paska narzędzi u góry ekranu, zamiast domyślnej pozycji u dołu ekranu.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Pokaż u &góry ekranu</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4945,15 +4906,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4969,10 +4926,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5021,6 +4974,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5029,6 +4990,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5044,8 +5009,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Zawiera ścieżkę do katalogu, w którym będą zapisywane migawki maszyny wirtualnej. Uwaga: migawki mogą zająć sporo miejsca na dysku.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Podstawowe</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Podstawowe</translation>
     </message>
     <message>
         <source>Identification</source>
@@ -5092,8 +5057,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Kontroluje ilość pamięci wideo przydzielonej maszynie wirtualnej.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Zaawansowane</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Zaawansowane</translation>
     </message>
     <message>
         <source>Boo&t Order:</source>
@@ -5180,8 +5145,8 @@ p, li { white-space: pre-wrap; }
         <translation>&Katalog migawek:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>Opi&s</translation>
+        <source>&Description</source>
+        <translation type="obsolete">Opi&s</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5268,10 +5233,6 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">wybrano 64-bitowy system operacyjny dla tej maszyny wirtualnej. Ponieważ tego typu goszczone systemy wymagają wsparcia dla sprzętowej wirtualizacji (VT-x/AMD-V), funkcja ta zostanie włączona automatycznie.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5284,6 +5245,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">&Zaawansowane</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
+        <translation type="unfinished">O&pis</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5300,6 +5277,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5332,16 +5313,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5352,28 +5329,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Miniaturowy pasek narzędzi:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Pokazywanie miniaturowego paska narzędzi w trybach pełnoekranowym i zintegrowanym.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Pokaż w trybie p&ełnoekranowym/zintegrowanym</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Pokazywanie miniaturowego paska narzędzi u góry ekranu, zamiast domyślnej pozycji u dołu ekranu.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -5383,18 +5352,6 @@ p, li { white-space: pre-wrap; }
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -6085,23 +6042,23 @@ p, li { white-space: pre-wrap; }
         <translation>Zawiera bazowy adres I/O danego portu szeregowego. Poprawne wartości to liczby szesnastkowe od <tt>0</tt> do <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6513,96 +6470,97 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <source>Image</source>
+        <comment>storage image</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
+        <source>Add USB Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6618,7 +6576,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6843,35 +6801,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7017,31 +6975,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"><nobr>Stan: %1</nobr></translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7290,17 +7248,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Zamknij</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Przełącz</translation>
     </message>
     <message>
-        <source>Enable Menu Bar</source>
-        <translation type="unfinished"></translation>
-    </message>
+        <source>Close</source>
+        <translation type="unfinished">Zamknij</translation>
+    </message>
+    <message>
+        <source>Enable Menu Bar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UIMessageCenter</name>
@@ -7625,15 +7583,15 @@ p, li { white-space: pre-wrap; }
         <translation><p>Wystąpił błąd podczas pracy maszyny wirtualnej! Więcej informacji o błędzie znajduje się poniżej. Można spróbować usunąć przyczynę błędu i wznowić pracę maszyny wirtualnej.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Dodatki VirtualBox (Guest Additions) zainstalowane w goszczonym systemie operacyjnym są zbyt stare: zainstalowana wersja to %1, a wersja wymagana - %2. Niektóre z funkcji wymagające do pracy Dodatków (jak np. integracja myszy, automatyczne skalowanie ekranu gościa) najprawdopodobniej przestaną pracować poprawnie.</p><p>Proszę uaktualnić Dodatki do wymaganej wersji poprzez wybranie opcji <b>Zainstaluj Dodatki (Guest Additions [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Dodatki VirtualBox (Guest Additions) zainstalowane w goszczonym systemie operacyjnym są zbyt stare: zainstalowana wersja to %1, a wersja wymagana to %2. Niektóre z funkcji wymagające do pracy Dodatków (jak np. integracja myszy, automatyczne skalowanie ekranu gościa) mogą pracować niezgodnie z oczekiwaniami.</p><p>Zalecane jest uaktualnienie Dodatków do wymaganej wersji poprzez wybranie opcji <b>Zainstaluj Dodatki (Guest Addi [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Dodatki VirtualBox (Guest Additions) zainstalowane w goszczonym systemie operacyjnym są zbyt nowe dla tej wersji programu VirtualBox: zainstalowana wersja to %1, a wersja wymagana - %2. Używanie nowszej wersji Dodatków wraz ze starsza wersją programu VirtualBox nie jest wspierane. Proszę zainstalować wymaganą wersję Dodatków poprzez wybranie opcji <b>Zainstaluj Dodatki (Guest Additions)...</b> z menu <b>Urządzenia</b>. [...]
     </message>
     <message>
@@ -7677,8 +7635,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete"><p>Okno maszyny wirtualnej jest zoptymalizowane do pracy w <b>%1&nbsp;bitowym</b> trybie kolorów, natomiast w goszczonym systemie operacyjnym ustawiony jest aktualnie tryb <b>%2&nbsp;bitowy</b>.</p><p>Proszę otworzyć okno ustawień ekranu w goszczonym sytemie i jeśli to możliwe, wybrać tryb <b>%3&nbsp;bitowego</b> koloru, aby uzyskać najlepszą wydajność wirtualnego podsystemu wideo.</ [...]
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Wystąpił błąd krytyczny podczas pracy maszyny wirtualnej i została ona zatrzymana.</p><p>Pomoc można uzyskać korzystając z forum na stronie <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> (sekcja Community) lub kontaktując się bezpośrednio z nami. Proszę pamiętać, aby do opisu problemu dołączyć zawartość pliku z logiem <tt>VBox.log</tt> oraz plik obrazu <tt>VBox.png</tt>, które m [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation type="obsolete"><p>Wystąpił błąd krytyczny podczas pracy maszyny wirtualnej i została ona zatrzymana.</p><p>Pomoc można uzyskać korzystając z forum na stronie <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> (sekcja Community) lub kontaktując się bezpośrednio z nami. Proszę pamiętać, aby do opisu problemu dołączyć zawartość pliku z logiem <tt>VBox.log</tt> oraz plik obrazu <tt>VBox.png</tt>, które [...]
     </message>
     <message>
         <source><p>You didn't attach a hard disk to the new virtual machine. The machine will not be able to boot unless you attach a hard disk with a guest operating system or some other bootable media to it later using the machine settings window or the First Run Wizard.</p><p>Do you wish to continue?</p></source>
@@ -7785,9 +7743,9 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Pobierz</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Zamontuj</translation>
+        <translation type="unfinished">Zamontuj</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -7955,8 +7913,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Pokazuje okno z informacjami o produkcie</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Została wydana nowa wersja VirtualBox! Wersja <b>%1</b> jest dostępna na <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Można pobrać tę wersję bezpośrednio spod adresu:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>Została wydana nowa wersja VirtualBox! Wersja <b>%1</b> jest dostępna na <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Można pobrać tę wersję bezpośrednio spod adresu:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -8086,8 +8044,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&Nadpisz</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Wystąpił błąd krytyczny podczas pracy maszyny wirtualnej i została ona zatrzymana.</p><p>Pomoc można uzyskać korzystając z forum na stronie <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> (sekcja Community) lub kontaktując się bezpośrednio z nami. Proszę pamiętać, aby do opisu problemu dołączyć zawartość pliku z logiem <tt>VBox.log</tt> oraz plik obrazu <tt>VBox.png</tt>, które m [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Wystąpił błąd krytyczny podczas pracy maszyny wirtualnej i została ona zatrzymana.</p><p>Pomoc można uzyskać korzystając z forum na stronie <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> (sekcja Community) lub kontaktując się bezpośrednio z nami. Proszę pamiętać, aby do opisu problemu dołączyć zawartość pliku z logiem <tt>VBox.log</tt> oraz plik obrazu <tt>VBox.png</tt>, które można znaleźć w [...]
     </message>
     <message>
         <source>hard disk</source>
@@ -8908,32 +8866,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Insert</source>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Zamontuj</translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8949,115 +8899,115 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9139,8 +9089,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished">&Nazwa:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Nazwa:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -9162,6 +9112,10 @@ p, li { white-space: pre-wrap; }
         <source>Selects 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>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -10079,18 +10033,14 @@ Będzie ona używana przez wszystkie moduły VirtualBox, aby móc rozróżnić t
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Witamy w VirtualBox!</h3><p>Lewa część tego okna przeznaczona jest do wyświetlania listy maszyn wirtualnych dostępnych na tym komputerze. Lista jest teraz pusta, ponieważ nie utworzono jeszcze żadnej maszyny.<img src=:/welcome.png align=right/></p><p>Aby utworzyć nową wirtualną maszynę, proszę wcisnąć przycisk <b>Nowa</b> na głównym pasku narzędziowym, umieszczonym na górze okna.</p><p>Mo [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="unfinished"><h3>Witamy w VirtualBox!</h3><p>Lewa część tego okna przeznaczona jest do wyświetlania listy maszyn wirtualnych dostępnych na tym komputerze. Lista jest teraz pusta, ponieważ nie utworzono jeszcze żadnej maszyny.<img src=:/welcome.png align=right/></p><p>Aby utworzyć nową wirtualną maszynę, proszę wcisnąć przycisk <b>Nowa</b> na głównym pasku narzędziowym, umieszczonym na górze okna.</p><p> [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -10262,6 +10212,10 @@ Będzie ona używana przez wszystkie moduły VirtualBox, aby móc rozróżnić t
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Zamknij</translation>
     </message>
@@ -10269,10 +10223,6 @@ Będzie ona używana przez wszystkie moduły VirtualBox, aby móc rozróżnić t
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -10372,8 +10322,8 @@ Będzie ona używana przez wszystkie moduły VirtualBox, aby móc rozróżnić t
         <translation type="obsolete">Podsumowanie</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Została wydana nowa wersja VirtualBox! Wersja <b>%1</b> jest dostępna na <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Można pobrać tę wersję bezpośrednio spod adresu:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>Została wydana nowa wersja VirtualBox! Wersja <b>%1</b> jest dostępna na <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Można pobrać tę wersję bezpośrednio spod adresu:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -10464,312 +10414,191 @@ Będzie ona używana przez wszystkie moduły VirtualBox, aby móc rozróżnić t
 <context>
     <name>UIVMInfoDialog</name>
     <message>
-        <source>Session Information Dialog</source>
-        <translation type="obsolete">Informacje o sesji</translation>
-    </message>
-    <message>
-        <source>&Close</source>
-        <translation type="obsolete">Z&amknij</translation>
-    </message>
-    <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Informacje o sesji</translation>
+        <translation type="unfinished">%1 - Informacje o sesji</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Szczegóły</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">Łączny &czas używania</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>Transfer DMA</translation>
+        <translation type="unfinished">Transfer DMA</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>Transfer PIO</translation>
+        <translation type="unfinished">Transfer PIO</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Dane odczytane</translation>
+        <translation type="unfinished">Dane odczytane</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Dane zapisane</translation>
+        <translation type="unfinished">Dane zapisane</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Dane wysłane</translation>
+        <translation type="unfinished">Dane wysłane</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Dane odebrane</translation>
+        <translation type="unfinished">Dane odebrane</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Włączone</translation>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="unfinished">Nie wykryto</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Wyłączone</translation>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="unfinished">Nie wykryto</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Niedostępne</translation>
     </message>
     <message>
         <source>Runtime Attributes</source>
-        <translation>Parametry maszyny</translation>
+        <translation type="unfinished">Parametry maszyny</translation>
     </message>
     <message>
         <source>Screen Resolution</source>
-        <translation>Rozdzielczość ekranu</translation>
+        <translation type="unfinished">Rozdzielczość ekranu</translation>
     </message>
     <message>
-        <source>Hardware Virtualization</source>
-        <translation type="obsolete">Wirtualizacja sprzętu</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IDE Hard Disk Statistics</source>
-        <translation type="obsolete">Statystyki dysków twardych IDE</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">Statystyki CD/DVD</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Statystyki kart sieciowych</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Dodatki (Guest Additions)</translation>
     </message>
     <message>
-        <source>Adapter 1</source>
-        <translation type="obsolete">Karta 1</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Typ systemu operacyjnego gościa</translation>
     </message>
     <message>
-        <source>Adapter 2</source>
-        <translation type="obsolete">Karta 2</translation>
+        <source>Storage Statistics</source>
+        <translation type="unfinished">Statystyka nośników</translation>
     </message>
     <message>
-        <source>Adapter 3</source>
-        <translation type="obsolete">Karta 3</translation>
+        <source>No Storage Devices</source>
+        <translation type="unfinished">Brak urządzeń</translation>
     </message>
     <message>
-        <source>Adapter 4</source>
-        <translation type="obsolete">Karta 4</translation>
+        <source>Network Statistics</source>
+        <translation type="unfinished">Statystyka sieci</translation>
     </message>
     <message>
-        <source>Not attached</source>
-        <translation type="obsolete">Niepodłączona</translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Brak kart sieciowych</translation>
     </message>
+</context>
+<context>
+    <name>UIVMListView</name>
     <message>
-        <source>Hard Disks Statistics</source>
-        <translation type="obsolete">Statystyki dysków twardych</translation>
+        <source>Inaccessible</source>
+        <translation>Niedostępna</translation>
     </message>
     <message>
-        <source>Primary Master</source>
-        <translation type="obsolete">Pierwszy (Primary, IDE0) Nadrzędny (Master)</translation>
+        <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
+        <comment>VM tooltip (name, last state change, session state)</comment>
+        <translation><nobr>%1<br></nobr><nobr>%2 od %3</nobr><br><nobr>Sesja %4</nobr></translation>
     </message>
     <message>
-        <source>Primary Slave</source>
-        <translation type="obsolete">Pierwszy (Primary, IDE0) Podrzędny (Slave)</translation>
+        <source><nobr><b>%1</b><br></nobr><nobr>Inaccessible since %2</nobr></source>
+        <comment>Inaccessible VM tooltip (name, last state change)</comment>
+        <translation><nobr><b>%1</b><br></nobr><nobr>Niedostępna od %2</nobr></translation>
     </message>
     <message>
-        <source>Secondary Master</source>
-        <translation type="obsolete">Drugi (Secondary, IDE1) Nadrzędny (Master)</translation>
+        <source>S&how</source>
+        <translation type="obsolete">Po&każ</translation>
     </message>
     <message>
-        <source>Secondary Slave</source>
-        <translation type="obsolete">Drugi (Secondary, IDE1) Podrzędny (Slave)</translation>
+        <source>Switch to the window of the selected virtual machine</source>
+        <translation type="obsolete">Przełącza do okna wybranej maszyny wirtualnej</translation>
     </message>
     <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Wersja %1.%2</translation>
+        <source>S&tart</source>
+        <translation type="obsolete">Uru&chom</translation>
     </message>
     <message>
-        <source>Not Detected</source>
-        <comment>guest additions</comment>
-        <translation>Nie wykryto</translation>
+        <source>Start the selected virtual machine</source>
+        <translation type="obsolete">Uruchamia wybraną maszynę wirtualną</translation>
     </message>
     <message>
-        <source>Not Detected</source>
-        <comment>guest os type</comment>
-        <translation>Nie wykryto</translation>
+        <source>R&esume</source>
+        <translation type="obsolete">Wz&nów</translation>
     </message>
     <message>
-        <source>Guest Additions</source>
-        <translation>Dodatki (Guest Additions)</translation>
+        <source>Resume the execution of the virtual machine</source>
+        <translation type="obsolete">Wznawia pracę maszyny wirtualnej</translation>
     </message>
     <message>
-        <source>Guest OS Type</source>
-        <translation>Typ systemu operacyjnego gościa</translation>
+        <source>&Pause</source>
+        <translation type="obsolete">&Pauza</translation>
     </message>
     <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Statystyki dysków twardych</translation>
+        <source>Suspend the execution of the virtual machine</source>
+        <translation type="obsolete">Wstrzymuje pracę maszyny wirtualnej</translation>
     </message>
+</context>
+<context>
+    <name>UIVMLogViewer</name>
     <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Brak dysków twardych</translation>
+        <source>Close the search panel</source>
+        <translation type="unfinished">Zamyka panel wyszukiwania</translation>
     </message>
     <message>
-        <source>No Network Adapters</source>
-        <translation>Brak kart sieciowych</translation>
+        <source>&Find</source>
+        <translation type="unfinished">&Szukaj</translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Włączone</translation>
+        <source>Enter a search string here</source>
+        <translation type="unfinished">Tekst do znalezienia</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Wyłączone</translation>
+        <source>&Previous</source>
+        <translation type="unfinished">&Poprzednie</translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <translation type="obsolete">Zagnieżdżone stronicowanie</translation>
+        <source>Search for the previous occurrence of the string</source>
+        <translation type="unfinished">Szuka poprzedniego wystąpienia danego tekstu</translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>&Next</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">Niedostępne</translation>
+        <source>Search for the next occurrence of the string</source>
+        <translation type="unfinished">Szuka następnego wystąpienia danego tekstu</translation>
     </message>
     <message>
-        <source>Storage Statistics</source>
-        <translation>Statystyka nośników</translation>
+        <source>C&ase Sensitive</source>
+        <translation type="unfinished">&Rozróżniaj wielkość liter</translation>
     </message>
     <message>
-        <source>No Storage Devices</source>
-        <translation>Brak urządzeń</translation>
+        <source>Perform case sensitive search (when checked)</source>
+        <translation type="unfinished">Szuka z uwzględnieniem wielkości liter (jeśli zaznaczone)</translation>
     </message>
     <message>
-        <source>Network Statistics</source>
-        <translation>Statystyka sieci</translation>
-    </message>
-    <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Zagnieżdżone stronicowanie</translation>
-    </message>
-    <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation type="unfinished">Niedostępne</translation>
-    </message>
-    <message>
-        <source>Clipboard Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIVMListView</name>
-    <message>
-        <source>Inaccessible</source>
-        <translation>Niedostępna</translation>
-    </message>
-    <message>
-        <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
-        <comment>VM tooltip (name, last state change, session state)</comment>
-        <translation><nobr>%1<br></nobr><nobr>%2 od %3</nobr><br><nobr>Sesja %4</nobr></translation>
-    </message>
-    <message>
-        <source><nobr><b>%1</b><br></nobr><nobr>Inaccessible since %2</nobr></source>
-        <comment>Inaccessible VM tooltip (name, last state change)</comment>
-        <translation><nobr><b>%1</b><br></nobr><nobr>Niedostępna od %2</nobr></translation>
-    </message>
-    <message>
-        <source>S&how</source>
-        <translation type="obsolete">Po&każ</translation>
-    </message>
-    <message>
-        <source>Switch to the window of the selected virtual machine</source>
-        <translation type="obsolete">Przełącza do okna wybranej maszyny wirtualnej</translation>
-    </message>
-    <message>
-        <source>S&tart</source>
-        <translation type="obsolete">Uru&chom</translation>
-    </message>
-    <message>
-        <source>Start the selected virtual machine</source>
-        <translation type="obsolete">Uruchamia wybraną maszynę wirtualną</translation>
-    </message>
-    <message>
-        <source>R&esume</source>
-        <translation type="obsolete">Wz&nów</translation>
-    </message>
-    <message>
-        <source>Resume the execution of the virtual machine</source>
-        <translation type="obsolete">Wznawia pracę maszyny wirtualnej</translation>
-    </message>
-    <message>
-        <source>&Pause</source>
-        <translation type="obsolete">&Pauza</translation>
-    </message>
-    <message>
-        <source>Suspend the execution of the virtual machine</source>
-        <translation type="obsolete">Wstrzymuje pracę maszyny wirtualnej</translation>
-    </message>
-</context>
-<context>
-    <name>UIVMLogViewer</name>
-    <message>
-        <source>Close the search panel</source>
-        <translation type="unfinished">Zamyka panel wyszukiwania</translation>
-    </message>
-    <message>
-        <source>&Find</source>
-        <translation type="unfinished">&Szukaj</translation>
-    </message>
-    <message>
-        <source>Enter a search string here</source>
-        <translation type="unfinished">Tekst do znalezienia</translation>
-    </message>
-    <message>
-        <source>&Previous</source>
-        <translation type="unfinished">&Poprzednie</translation>
-    </message>
-    <message>
-        <source>Search for the previous occurrence of the string</source>
-        <translation type="unfinished">Szuka poprzedniego wystąpienia danego tekstu</translation>
-    </message>
-    <message>
-        <source>&Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search for the next occurrence of the string</source>
-        <translation type="unfinished">Szuka następnego wystąpienia danego tekstu</translation>
-    </message>
-    <message>
-        <source>C&ase Sensitive</source>
-        <translation type="unfinished">&Rozróżniaj wielkość liter</translation>
-    </message>
-    <message>
-        <source>Perform case sensitive search (when checked)</source>
-        <translation type="unfinished">Szuka z uwzględnieniem wielkości liter (jeśli zaznaczone)</translation>
-    </message>
-    <message>
-        <source>String not found</source>
-        <translation type="unfinished">Nie znaleziono</translation>
+        <source>String not found</source>
+        <translation type="unfinished">Nie znaleziono</translation>
     </message>
     <message>
         <source><p>No log files found. Press the <b>Refresh</b> button to rescan the log folder <nobr><b>%1</b></nobr>.</p></source>
@@ -11817,11 +11646,11 @@ Wersja %1</translation>
         <translation type="obsolete">Otwiera okno ustawień współdzielonych katalogów</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">Za&instaluj Dodatki (Guest Additions)...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Montuje obraz z instalatorem Dodatków dla goszczonych systemów (Guest Additions)</translation>
     </message>
     <message>
@@ -12166,7 +11995,7 @@ Wersja %1</translation>
         <translation type="obsolete">I&nformacje o sesji</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Wyświetla okno z informacjami o sesji</translation>
     </message>
     <message>
@@ -12616,8 +12445,8 @@ Wersja %1</translation>
         <translation><przywróć domyślny></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Aktualna domyślna ścieżka będzie widoczna po zatwierdzeniu zmian i ponownym otwarciu tego okna.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished">Aktualna domyślna ścieżka będzie widoczna po zatwierdzeniu zmian i ponownym otwarciu tego okna.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -12665,7 +12494,8 @@ Wersja %1</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Aktualna domyślna ścieżka będzie widoczna po zatwierdzeniu zmian i ponownym otwarciu tego okna.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -13920,7 +13750,7 @@ Wersja %1</translation>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Podłączenie tego dysku twardego zostanie wykonane pośrednio, z użyciem nowo utworzonego różnicowego dysku twardego.</translation>
+        <translation>Podłączenie tego dysku twardego zostanie wykonane pośrednio, z użyciem nowo utworzonego różnicowego dysku twardego.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -13930,7 +13760,7 @@ Wersja %1</translation>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Ten bazowy dysk twardy jest podłączony pośrednio, z użyciem następujących różnicowych dysków twardych:</translation>
+        <translation>Ten bazowy dysk twardy jest podłączony pośrednio, z użyciem następujących różnicowych dysków twardych:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -14500,51 +14330,11 @@ Wersja %1</translation>
         <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Brak</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Domyślny</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished"></translation>
@@ -14575,6 +14365,11 @@ Wersja %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -14585,6 +14380,31 @@ Wersja %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Brak</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Domyślny</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -14595,6 +14415,11 @@ Wersja %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished"></translation>
@@ -14615,6 +14440,11 @@ Wersja %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -14624,16 +14454,16 @@ Wersja %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14857,11 +14687,11 @@ języka ustawiony jako domyślny dla systemu.</qt>
         <translation type="obsolete">Zawiera ścieżkę do domyślnego katalogu z obrazami dysków VDI. Katalog ten będzie użyty w przypadku, gdy nie zostanie wybrany inny podczas dodawania istniejących bądź tworzenia nowych wirtualnych dysków twardych.</translation>
     </message>
     <message>
-        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Przywraca domyślną ścieżkę do katalogu maszyn wirtualnych. Nowa ścieżka będzie widoczna po zatwierdzeniu zmian i ponownym otwarciu tego okna.</translation>
     </message>
     <message>
-        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Przywraca domyślną ścieżkę do katalogu z obrazami dysków VDI. Nowa ścieżka będzie widoczna po zatwierdzeniu zmian i ponownym otwarciu tego okna.</translation>
     </message>
     <message>
@@ -14910,7 +14740,7 @@ języka ustawiony jako domyślny dla systemu.</qt>
         <translation type="obsolete">Otwiera okno umożliwiające wybór pliku biblioteki uwierzytelniania dla VRDP.</translation>
     </message>
     <message>
-        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Przywraca domyślną ścieżkę do pliku biblioteki uwierzytelniania. Nowa ścieżka będzie widoczna po zatwierdzeniu zmian i ponownym otwarciu tego okna.</translation>
     </message>
     <message>
@@ -15439,15 +15269,15 @@ języka ustawiony jako domyślny dla systemu.</qt>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -15526,8 +15356,8 @@ języka ustawiony jako domyślny dla systemu.</qt>
         <translation type="obsolete">Okno rejestracji programu VirtualBox</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
-        <translation type="obsolete"><p>Wypełnij ten formularz w celu poinformowania nas, że korzystasz z programu VirtualBox oraz, opcjonalnie, aby być informowanym o jego uaktualnieniach i nowościach.</p><p>Wprowadź poniżej swoje imię i nazwisko używając znaków alfabetu łacińskiego oraz swój adres e-mail. Uwaga: firma innotek będzie używała tych danych tylko w celu gromadzenia statystyk popularności programu i wysyłania biuletynów. W szczególności, innotek nigdy nie p [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
+        <translation type="obsolete"><p>Wypełnij ten formularz w celu poinformowania nas, że korzystasz z programu VirtualBox oraz, opcjonalnie, aby być informowanym o jego uaktualnieniach i nowościach.</p><p>Wprowadź poniżej swoje imię i nazwisko używając znaków alfabetu łacińskiego oraz swój adres e-mail. Uwaga: firma innotek będzie używała tych danych tylko w celu gromadzenia statystyk popularności programu i wysyłania biuletynów. W szczególności, innotek nigdy nie p [...]
     </message>
     <message>
         <source>&Name</source>
@@ -15574,8 +15404,8 @@ języka ustawiony jako domyślny dla systemu.</qt>
         <translation type="obsolete">Nie udało się ustanowić połączenia.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Wypełnij ten formularz w celu poinformowania nas, że korzystasz z programu VirtualBox oraz, opcjonalnie, aby być informowanym o jego uaktualnieniach i nowościach.</p><p>Wprowadź poniżej swoje imię i nazwisko używając znaków alfabetu łacińskiego oraz swój adres e-mail. Uwaga: firma Sun Microsystems będzie używała tych danych tylko w celu gromadzenia statystyk popularności programu i wysyłania biuletynów. W szczególności, Sun Micros [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Wypełnij ten formularz w celu poinformowania nas, że korzystasz z programu VirtualBox oraz, opcjonalnie, aby być informowanym o jego uaktualnieniach i nowościach.</p><p>Wprowadź poniżej swoje imię i nazwisko używając znaków alfabetu łacińskiego oraz swój adres e-mail. Uwaga: firma Sun Microsystems będzie używała tych danych tylko w celu gromadzenia statystyk popularności programu i wysyłania biuletynów. W szczególności, Sun Micros [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -15594,8 +15424,8 @@ języka ustawiony jako domyślny dla systemu.</qt>
         <translation type="obsolete">Wybierz kraj/region</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
-        <translation type="obsolete"><p>Wypełnij ten formularz w celu poinformowania nas, że korzystasz z programu VirtualBox oraz, opcjonalnie, aby być informowanym o jego uaktualnieniach i nowościach.</p><p>Prosimy o używanie wyłącznie znaków alfabetu łacińskiego podczas wypełniania poniższych pól. Firma Sun Microsystems będzie używać tych danych tylko w celu gromadzenia statystyk popularności programu i wysyłania biuletynów. W szczególności, Sun Microsystems nigdy ni [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
+        <translation type="obsolete"><p>Wypełnij ten formularz w celu poinformowania nas, że korzystasz z programu VirtualBox oraz, opcjonalnie, aby być informowanym o jego uaktualnieniach i nowościach.</p><p>Prosimy o używanie wyłącznie znaków alfabetu łacińskiego podczas wypełniania poniższych pól. Firma Sun Microsystems będzie używać tych danych tylko w celu gromadzenia statystyk popularności programu i wysyłania biuletynów. W szczególności, Sun Microsystems nigdy ni [...]
     </message>
     <message>
         <source>I &already have a Sun Online account:</source>
@@ -15904,8 +15734,8 @@ języka ustawiony jako domyślny dla systemu.</qt>
         <translation type="obsolete">Wstrzymuje pracę maszyny wirtualnej</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Witamy w VirtualBox!</h3><p>Lewa część tego okna przeznaczona jest do wyświetlania listy maszyn wirtualnych dostępnych na tym komputerze. Lista jest teraz pusta, ponieważ nie utworzono jeszcze żadnej maszyny.<img src=:/welcome.png align=right/></p><p>Aby utworzyć nową wirtualną maszynę, proszę wcisnąć przycisk <b>Nowa</b> na głównym pasku narzędziowym, umieszczonym na górze okna.</p><p>Mo [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Witamy w VirtualBox!</h3><p>Lewa część tego okna przeznaczona jest do wyświetlania listy maszyn wirtualnych dostępnych na tym komputerze. Lista jest teraz pusta, ponieważ nie utworzono jeszcze żadnej maszyny.<img src=:/welcome.png align=right/></p><p>Aby utworzyć nową wirtualną maszynę, proszę wcisnąć przycisk <b>Nowa</b> na głównym pasku narzędziowym, umieszczonym na górze okna.</p><p>Mo [...]
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
@@ -16603,6 +16433,205 @@ Puste pole sprawi, że filtr zadziała dla jakiejkolwiek wartości.</qt></
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>Session Information Dialog</source>
+        <translation type="obsolete">Informacje o sesji</translation>
+    </message>
+    <message>
+        <source>&Close</source>
+        <translation type="obsolete">Z&amknij</translation>
+    </message>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Informacje o sesji</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Szczegóły</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">Łączny &czas używania</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">Transfer DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">Transfer PIO</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Dane odczytane</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Dane zapisane</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Dane wysłane</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Dane odebrane</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Włączone</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="obsolete">Wyłączone</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Parametry maszyny</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Rozdzielczość ekranu</translation>
+    </message>
+    <message>
+        <source>Hardware Virtualization</source>
+        <translation type="obsolete">Wirtualizacja sprzętu</translation>
+    </message>
+    <message>
+        <source>IDE Hard Disk Statistics</source>
+        <translation type="obsolete">Statystyki dysków twardych IDE</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">Statystyki CD/DVD</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Statystyki kart sieciowych</translation>
+    </message>
+    <message>
+        <source>Adapter 1</source>
+        <translation type="obsolete">Karta 1</translation>
+    </message>
+    <message>
+        <source>Adapter 2</source>
+        <translation type="obsolete">Karta 2</translation>
+    </message>
+    <message>
+        <source>Adapter 3</source>
+        <translation type="obsolete">Karta 3</translation>
+    </message>
+    <message>
+        <source>Adapter 4</source>
+        <translation type="obsolete">Karta 4</translation>
+    </message>
+    <message>
+        <source>Not attached</source>
+        <translation type="obsolete">Niepodłączona</translation>
+    </message>
+    <message>
+        <source>Hard Disks Statistics</source>
+        <translation type="obsolete">Statystyki dysków twardych</translation>
+    </message>
+    <message>
+        <source>Primary Master</source>
+        <translation type="obsolete">Pierwszy (Primary, IDE0) Nadrzędny (Master)</translation>
+    </message>
+    <message>
+        <source>Primary Slave</source>
+        <translation type="obsolete">Pierwszy (Primary, IDE0) Podrzędny (Slave)</translation>
+    </message>
+    <message>
+        <source>Secondary Master</source>
+        <translation type="obsolete">Drugi (Secondary, IDE1) Nadrzędny (Master)</translation>
+    </message>
+    <message>
+        <source>Secondary Slave</source>
+        <translation type="obsolete">Drugi (Secondary, IDE1) Podrzędny (Slave)</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Wersja %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Nie wykryto</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Nie wykryto</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Dodatki (Guest Additions)</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Typ systemu operacyjnego gościa</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Statystyki dysków twardych</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Brak dysków twardych</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Brak kart sieciowych</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Włączone</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Wyłączone</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <translation type="obsolete">Zagnieżdżone stronicowanie</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">Niedostępne</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Statystyka nośników</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Brak urządzeń</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Statystyka sieci</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Zagnieżdżone stronicowanie</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Niedostępne</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMListBox</name>
     <message>
         <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
@@ -17431,7 +17460,7 @@ tej opcji po zainstalowaniu na tej maszynie systemu Windows!</qt></transla
         <translation type="obsolete">Zawiera ścieżkę, do której będą zapisywane migawki maszyny wirtualnej. Uwaga: migawki mogą zająć sporo miejsca na dysku.</translation>
     </message>
     <message>
-        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Przywraca domyślną ścieżkę do katalogu z migawkami. Nowa ścieżka będzie widoczna po zatwierdzeniu zmian i ponownym otwarciu tego okna.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
index 31b9c0e..f535cc7 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
@@ -359,7 +359,7 @@
         <translation type="obsolete">Diálogo de I&nformação da Sessão</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Mostra o Diálogo de Informação da Sessão</translation>
     </message>
     <message>
@@ -447,11 +447,11 @@
         <translation type="obsolete">Activa ou desactiva ligações de ecrã remoto (RDP) para esta máquina</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Instalar Adições de Convidado...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="unfinished">&Instalar Adições de Convidado...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Monta a imagem de instalação das Adições de Convidado</translation>
     </message>
     <message>
@@ -801,92 +801,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">&Instalar Adições de Convidado...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Monta a imagem de instalação das Adições de Convidado</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
+        <source>&Webcams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Rede</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Ficheiro</translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="unfinished">&Teclado</translation>
-    </message>
-    <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Rede</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Preferências...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Mostrar &Registo...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Ficheiro</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -902,175 +888,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Preferências...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <source>&Keyboard</source>
+        <translation type="unfinished">&Teclado</translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <source>&Hard Disks</source>
+        <translation type="unfinished">Discos &Rígidos</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="unfinished">Discos &Rígidos</translation>
+        <source>&USB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Mostrar &Registo...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1116,6 +1102,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create new virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1132,7 +1126,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1140,7 +1134,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1164,15 +1158,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Start selected virtual machines with option of continuing in background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1184,11 +1190,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1196,7 +1202,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1240,15 +1246,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1257,33 +1263,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Activar</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1306,6 +1287,18 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -2668,11 +2661,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
-        <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
         <translation type="unfinished"></translation>
@@ -2732,88 +2720,88 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">Controladora USB</translation>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (user interface/Unscaled HiDPI Video Output)</comment>
-        <translation type="obsolete">Activado</translation>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <translation type="unfinished">Activado</translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">Controladora USB</translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
-        <translation type="unfinished">Desactivado</translation>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">Activado</translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
+        <translation type="unfinished">Desactivado</translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished">Activado</translation>
     </message>
     <message>
-        <source>Menu-bar</source>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
+        <translation type="unfinished">Desactivado</translation>
+    </message>
+    <message>
+        <source>Mini-toolbar Position</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Activado</translation>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished">Desactivado</translation>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
+        <source>Mini-toolbar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished">Activado</translation>
-    </message>
-    <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished">Desactivado</translation>
     </message>
 </context>
@@ -3821,7 +3809,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4469,7 +4457,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4482,9 +4471,8 @@
         <comment>FD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+    <message>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4751,38 +4739,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Mini Barra de Ferramentas:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Se seleccionado, mostra a Mini Barra de Ferramentas em modo Ecrã Completo ou Integrado.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Mostrar em &Ecrã Completo/Integrado</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Se seleccionado, mostra a Mini Barra de Ferramentas no topo do ecrã, em vez da sua posição predefinida no fundo do ecrã.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Mostrar no &Topo do Ecrã</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4795,15 +4751,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4819,10 +4771,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4871,6 +4819,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4879,6 +4835,10 @@
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4894,8 +4854,8 @@
         <translation type="obsolete">Mostra a localização onde as capturas desta máquina virtual serão armazenadas. Note que estas capturas podem ocupar bastante espaço em disco.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Básico</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Básico</translation>
     </message>
     <message>
         <source>Identification</source>
@@ -4942,8 +4902,8 @@
         <translation type="obsolete">Controla a quantidade de memória gráfica alocada para a máquina virtual.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Avançado</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Avançado</translation>
     </message>
     <message>
         <source>Boo&t Order:</source>
@@ -5030,8 +4990,8 @@
         <translation>Pasta de &Capturas:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Descrição</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Descrição</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5102,10 +5062,6 @@
         <translation type="obsolete">seleccionou um SO convidado 64 bit para esta MV. Como tal os convidados requerem virtualização de material (VT-x/AMD-V), esta opção será activada automaticamente.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5118,6 +5074,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">Avança&do</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
+        <translation type="unfinished">D&escrição</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5134,6 +5106,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5166,16 +5142,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5186,28 +5158,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Mini Barra de Ferramentas:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Se seleccionado, mostra a Mini Barra de Ferramentas em modo Ecrã Completo ou Integrado.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Mostrar em &Ecrã Completo/Integrado</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Se seleccionado, mostra a Mini Barra de Ferramentas no topo do ecrã, em vez da sua posição predefinida no fundo do ecrã.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -5217,18 +5181,6 @@
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -5866,23 +5818,23 @@
         <translation>Mostra o endereço da porta de E/S base desta porta em série. Os valores válidos são n+umeros inteiros no intervalo de <tt>0</tt> até <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6278,96 +6230,97 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Imagem</translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Imagem</translation>
+        <source>Add USB Controller</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6383,7 +6336,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6563,35 +6516,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6741,31 +6694,31 @@
         <translation type="obsolete">O USB 2.0 está actualmente activado para esta máquina virtual. No entanto isto requer que o <b>%1</b> seja instalado. Por favor instale o Pacote de Extensão do sítio de transferências do VirtualBox. Depois poderá re-activar o USB 2.0. Será desactivado entretanto a não ser que cancele as alterações das definições actuais.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6978,14 +6931,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Fechar</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Mudar</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Fechar</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7313,15 +7266,15 @@
         <translation type="obsolete"><p>Não foi possível carregar o ficheiro de linguagem <b><nobr>%1</nobr></b>. <p>O idioma será temporariamente redefinido para Inglês (embutido). Por favor vá até o diálogo <b>Preferências</b> a partir do menu <b>Ficheiro</b> na janela principal do VirtualBox, e seleccione um dos idiomas existentes na página <b>Idiomas</b>.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>As Adições de Convidado VirtualBox instalados no SO Convidado são muito antigas: a versão instalada é %1, e a versão esperada é %2. Alguns recursos das Adições de Convidado (integração do rato, auto-redimensionamento da janela do convidado) provavelmente não irão funcionar correctamente.</p><p>Por favor actualize as Adições de Convidado para a versão actual escolhendo <b>Instalar Adições de Convidado</b> no menu <b& [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>As Adições de Convidado VirtualBox instalados no SO Convidado estão desactualizadas: a versão instalada é %1, e a versão esperada é %2. Alguns recursos das Adições de Convidado (integração do rato, auto-redimensionamento de janela do convidado) podem não funcionar correctamente.</p><p>É recomendado que actualize as Adições de Convidado para a versão actual usando a função <b>Instalar Adições de Convidado</b> no menu &l [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>As Adições de ConvidadoVirtualBox instalados no SO Convidado são demasiado recentes para esta versão VirtualBox: a versão instalada é %1, a versão esperada é %2.</p><p>O uso de uma versão mais nova das Adições com uma versão mais antiga do VirtualBox não é suportado. Por favor instale a versão actual das Adições de Convidado escolhendo <b>Instalar Adições de Convidado</b> do menu  <b>Dispositivos</b>.</p [...]
     </message>
     <message>
@@ -7365,8 +7318,8 @@
         <translation type="obsolete"><p>A janela da máquina virtual está optimizada para funcionar em modo de cores <b>%1&nbsp;bits</b>, mas o modo de cores do monitor virtual está definido como <b>%2&nbsp;bits</b>.</p><p>Abra o diálogo de propriedades do monitor no sistema operativo convidado e seleccione um modo de cores <b>%3&nbsp;bits</b> se estiver disponível, de forma a obter o melhor desempenho possível do sub-siste [...]
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Ocorreu um erro crítico enquanto a máquina virtual estava em execução e a execução foi interrompida.</p><p>Para ajuda, consulte a secção Comunidade no endereço <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> ou use os recursos disponibilizados pelo seu contrato de suporte. Por favor forneça o conteúdo do ficheiro <tt>VBox.log</tt> e o ficheiro de imagem <tt>VBox.png</tt>, que pod [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation type="obsolete"><p>Ocorreu um erro crítico enquanto a máquina virtual estava em execução e a execução foi interrompida.</p><p>Para ajuda, consulte a secção Comunidade no endereço <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> ou use os recursos disponibilizados pelo seu contrato de suporte. Por favor forneça o conteúdo do ficheiro <tt>VBox.log</tt> e o ficheiro de imagem <tt>VBox.png</tt>, que p [...]
     </message>
     <message>
         <source><p>You didn't attach a hard disk to the new virtual machine. The machine will not be able to boot unless you attach a hard disk with a guest operating system or some other bootable media to it later using the machine settings window or the First Run Wizard.</p><p>Do you wish to continue?</p></source>
@@ -7473,9 +7426,9 @@
         <translation type="obsolete">Transferir</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Montar</translation>
+        <translation type="unfinished">Montar</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -7639,8 +7592,8 @@
         <translation type="obsolete">Mostra um diálogo com informações do produto</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Uma nova versão do VirtualBox está disponível! A version <b>%1</b> está disponível em <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Poderá fazer a transferência desta versão utilizando este atalho directo:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>Uma nova versão do VirtualBox está disponível! A version <b>%1</b> está disponível em <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Poderá fazer a transferência desta versão utilizando este atalho directo:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -7730,6 +7683,10 @@
         <translation type="obsolete">Sobre-escre&ver</translation>
     </message>
     <message>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>hard disk</source>
         <comment>failed to close ...</comment>
         <translation type="obsolete">disco rígido</translation>
@@ -8416,32 +8373,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Insert</source>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Montar</translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8457,115 +8406,115 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8643,8 +8592,8 @@
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished">&Nome:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Nome:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -8666,6 +8615,10 @@
         <source>Selects 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>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -9523,18 +9476,14 @@ diálogo de Configurações da MV.</p></translation>
         <translation type="unfinished">Ficheiros de máquina virtual (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Bem-vindo ao VirtualBox!</h3><p>A parte esquerda desta janela é uma lista de todas as máquinas virtuais no seu computador. A lista está vazia agora porque ainda não criou qualquer máquina virtual.<img src=:/welcome.png align=right/></p><p>Para poder criar uma nova máquina virtual, prima o botão <b>Nova</b> na barra de ferramentas no topo da janela.</p><p>Pode premir a tecla <b>%1&lt [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="unfinished"><h3>Bem-vindo ao VirtualBox!</h3><p>A parte esquerda desta janela é uma lista de todas as máquinas virtuais no seu computador. A lista está vazia agora porque ainda não criou qualquer máquina virtual.<img src=:/welcome.png align=right/></p><p>Para poder criar uma nova máquina virtual, prima o botão <b>Nova</b> na barra de ferramentas no topo da janela.</p><p>Pode premir a tecla <b>%1& [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation type="unfinished">Gestor</translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -9722,6 +9671,10 @@ diálogo de Configurações da MV.</p></translation>
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Fechar</translation>
     </message>
@@ -9729,10 +9682,6 @@ diálogo de Configurações da MV.</p></translation>
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -9828,8 +9777,8 @@ diálogo de Configurações da MV.</p></translation>
         <translation type="obsolete">Resumo</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Uma nova versão do VirtualBox está disponível! A version <b>%1</b> está disponível em <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Poderá fazer a transferência desta versão utilizando este atalho directo:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>Uma nova versão do VirtualBox está disponível! A version <b>%1</b> está disponível em <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Poderá fazer a transferência desta versão utilizando este atalho directo:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -9920,206 +9869,99 @@ diálogo de Configurações da MV.</p></translation>
 <context>
     <name>UIVMInfoDialog</name>
     <message>
-        <source>Session Information Dialog</source>
-        <translation type="obsolete">Diálogo de Informação de Sessão</translation>
-    </message>
-    <message>
-        <source>&Close</source>
-        <translation type="obsolete">Fe&char</translation>
-    </message>
-    <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Informação de Sessão</translation>
+        <translation type="unfinished">%1 - Informação de Sessão</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Detalhes</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">&Execução</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>Transferências DMA</translation>
+        <translation type="unfinished">Transferências DMA</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>Transferências PIO</translation>
+        <translation type="unfinished">Transferências PIO</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Dados Lidos</translation>
+        <translation type="unfinished">Dados Lidos</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Dados Gravados</translation>
+        <translation type="unfinished">Dados Gravados</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Dados Transferidos</translation>
+        <translation type="unfinished">Dados Transferidos</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Dados Recebidos</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Activado</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Desactivado</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Atributos de Execução</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Resolução de Ecrã</translation>
-    </message>
-    <message>
-        <source>Hardware Virtualization</source>
-        <translation type="obsolete">Virtualização do Material</translation>
-    </message>
-    <message>
-        <source>IDE Hard Disk Statistics</source>
-        <translation type="obsolete">Estatisticas de Disco Rígido IDE</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">Estatisticas CD/DVD</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Estatisticas de Adaptador de Rede</translation>
-    </message>
-    <message>
-        <source>Adapter 1</source>
-        <translation type="obsolete">Adaptador 1</translation>
-    </message>
-    <message>
-        <source>Adapter 2</source>
-        <translation type="obsolete">Adaptador 2</translation>
-    </message>
-    <message>
-        <source>Adapter 3</source>
-        <translation type="obsolete">Adaptador 3</translation>
-    </message>
-    <message>
-        <source>Adapter 4</source>
-        <translation type="obsolete">Adaptador 4</translation>
-    </message>
-    <message>
-        <source>Not attached</source>
-        <translation type="obsolete">Não conectado</translation>
-    </message>
-    <message>
-        <source>Hard Disks Statistics</source>
-        <translation type="obsolete">Estatisticas do Disco Rígido</translation>
-    </message>
-    <message>
-        <source>Primary Master</source>
-        <translation type="obsolete">'Master' Primário</translation>
-    </message>
-    <message>
-        <source>Primary Slave</source>
-        <translation type="obsolete">'Slave' Primário</translation>
-    </message>
-    <message>
-        <source>Secondary Master</source>
-        <translation type="obsolete">'Master' Secundário</translation>
-    </message>
-    <message>
-        <source>Secondary Slave</source>
-        <translation type="obsolete">'Slave' Secundário</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Versão %1.%2</translation>
+        <translation type="unfinished">Dados Recebidos</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Não Detectadas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Não Detectado</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Guest Additions</source>
-        <translation>Adições de Convidado</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Não Disponível</translation>
     </message>
     <message>
-        <source>Guest OS Type</source>
-        <translation>Tipo de SO Convidado</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Atributos de Execução</translation>
     </message>
     <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Estatísticas do Disco Rígido</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Resolução de Ecrã</translation>
     </message>
     <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Sem Discos Rígidos</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No Network Adapters</source>
-        <translation>Sem Adaptadores de Rede</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Activado</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Desactivado</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Adições de Convidado</translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Tipo de SO Convidado</translation>
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation>Estatísticas de Armazenamento</translation>
+        <translation type="unfinished">Estatísticas de Armazenamento</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
-        <translation>Sem Dispositivos de Armazenamento</translation>
+        <translation type="unfinished">Sem Dispositivos de Armazenamento</translation>
     </message>
     <message>
         <source>Network Statistics</source>
-        <translation>Estatísticas da Rede</translation>
-    </message>
-    <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>Não Disponível</translation>
-    </message>
-    <message>
-        <source>Clipboard Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Estatísticas da Rede</translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Sem Adaptadores de Rede</translation>
     </message>
 </context>
 <context>
@@ -11267,11 +11109,11 @@ Versão %1</translation>
         <translation type="obsolete">Abre o diálogo de pastas partilhadas</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">&Instalar Adições de Convidado...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Monta a imagem de instalação das Adições de Convidado</translation>
     </message>
     <message>
@@ -11612,7 +11454,7 @@ Versão %1</translation>
         <translation type="obsolete">Diálogo de I&nformação da Sessão</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Mostra o Diálogo de Informação da Sessão</translation>
     </message>
     <message>
@@ -11934,8 +11776,8 @@ Versão %1</translation>
         <translation><restaurar para predefinido></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">O caminho predefinido actual será apresentado após aceitar as alterações e abrir este diálogo novamente.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished">O caminho predefinido actual será apresentado após aceitar as alterações e abrir este diálogo novamente.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -11983,7 +11825,8 @@ Versão %1</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">O caminho predefinido actual será apresentado após aceitar as alterações e abrir este diálogo novamente.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -13193,7 +13036,7 @@ Versão %1</translation>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">A ligação deste disco será executada indirectamente usando um disco rígido de diferenciação recém criado.</translation>
+        <translation>A ligação deste disco será executada indirectamente usando um disco rígido de diferenciação recém criado.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -13203,7 +13046,7 @@ Versão %1</translation>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Este disco rígido base está ligado indirectamente usando o seguinte disco rígido de diferenciação:</translation>
+        <translation>Este disco rígido base está ligado indirectamente usando o seguinte disco rígido de diferenciação:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -13798,84 +13641,44 @@ Versão %1</translation>
     <message>
         <source>Disabled</source>
         <comment>unrestricted execution</comment>
-        <translation type="obsolete">Desactivado</translation>
-    </message>
-    <message>
-        <source>Unrestricted Execution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB Tablet</source>
-        <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB Multi-Touch Tablet</source>
-        <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NAT Network</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NAT network, '%1'</source>
-        <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished">USB</translation>
-    </message>
-    <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Desactivado</translation>
     </message>
     <message>
-        <source>off</source>
-        <comment>guest monitor status</comment>
+        <source>Unrestricted Execution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
+        <source>USB Tablet</source>
+        <comment>PointingHIDType</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Nenhum</translation>
+        <source>USB Multi-Touch Tablet</source>
+        <comment>PointingHIDType</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Predefinido</translation>
+        <source>NAT Network</source>
+        <comment>NetworkAttachmentType</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
+        <source>NAT network, '%1'</source>
+        <comment>details report (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
+        <source>You can create or add disk image files in the virtual machine settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <source>USB</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
+        <source>off</source>
+        <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13909,6 +13712,11 @@ Versão %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -13919,6 +13727,31 @@ Versão %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Nenhum</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Predefinido</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -13929,6 +13762,11 @@ Versão %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -13949,6 +13787,11 @@ Versão %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -13958,16 +13801,16 @@ Versão %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14247,11 +14090,11 @@ usar o idioma predefinido do sistema.</qt>
         <translation type="obsolete">Mostra a localização para a pasta predefinida VDI. Esta pasta é sempre usada para adicionar discos rígidos virtuais novos ou existentes, a não ser que seja definida outra quando estes são criados.</translation>
     </message>
     <message>
-        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Restaura a localização da pasta de máquinas virtuais para o valor predefinido. A localização predefinida será mostrada após aceitar as mudanças e abrir este diálogo novamente.</translation>
     </message>
     <message>
-        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Restaura a localização da pasta VDI para o valor predefinido. A localização predefinida actual será mostrada após aceitar as mudanças e abrir este diálogo novamente.</translation>
     </message>
     <message>
@@ -14295,7 +14138,7 @@ usar o idioma predefinido do sistema.</qt>
         <translation type="obsolete">Abre um diálogo para seleccionar o ficheiro da biblioteca de autenticação VRDP.</translation>
     </message>
     <message>
-        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Restaura o nome do ficheiro da biblioteca de autenticação para o valor predefinido. O ficheiro de biblioteca predefinido actual será mostrado após aceitar as mudanças e abrir este diálogo novamente.</translation>
     </message>
     <message>
@@ -14824,15 +14667,15 @@ para ligar ao encaixe actualmente destacado.</qt>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -14923,8 +14766,8 @@ para ligar ao encaixe actualmente destacado.</qt>
         <translation type="obsolete">Diálogo de Registo Virtualbox</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
-        <translation type="obsolete"><p>Por favor preencha este formulário para que possamos saber que usa o VirtualBox e, opcionalmente, para o manter informado acerca de notícias e actualizações VirtualBox.</p><p>Indique o seu nome completo (usando caracteres latinos) e o seu endereço electrónico nos campos abaixo. Note que a innotek usará esta informação apenas para recolha de estatísticas acerca do uso do produto e para lhe enviar notícias do VirtualBox. Em particul [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
+        <translation type="obsolete"><p>Por favor preencha este formulário para que possamos saber que usa o VirtualBox e, opcionalmente, para o manter informado acerca de notícias e actualizações VirtualBox.</p><p>Indique o seu nome completo (usando caracteres latinos) e o seu endereço electrónico nos campos abaixo. Note que a innotek usará esta informação apenas para recolha de estatísticas acerca do uso do produto e para lhe enviar notícias do VirtualBox. Em particul [...]
     </message>
     <message>
         <source>&Name</source>
@@ -14971,8 +14814,8 @@ para ligar ao encaixe actualmente destacado.</qt>
         <translation type="obsolete">Não foi possível estabelecer uma ligação.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Por favor preencha este formulário de registo para sabermos que usa o VirtualBox e, opcionalmente, para o manter informado acerca de noticias e actualizações do VirtualBox.</p><p>Indique o seu nome completo usando caracteres em Latim e o seu endereço electrónico nos campos em baixo. Por favor note que a Sun Microsystems irá usar esta informação apenas para elaborar estatíticas do uso do produto e para lhe enviar noticias acerca do [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Por favor preencha este formulário de registo para sabermos que usa o VirtualBox e, opcionalmente, para o manter informado acerca de noticias e actualizações do VirtualBox.</p><p>Indique o seu nome completo usando caracteres em Latim e o seu endereço electrónico nos campos em baixo. Por favor note que a Sun Microsystems irá usar esta informação apenas para elaborar estatíticas do uso do produto e para lhe enviar noticias acerca do [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -15285,8 +15128,8 @@ para ligar ao encaixe actualmente destacado.</qt>
         <translation type="obsolete">Suspende a execução da máquina virtual</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Bem-vindo ao VirtualBox!</h3><p>A parte esquerda desta janela é uma lista de todas as máquinas virtuais no seu computador. A lista está vazia agora porque ainda não criou qualquer máquina virtual.<img src=:/welcome.png align=right/></p><p>Para poder criar uma nova máquina virtual, prima o botão <b>Nova</b> na barra de ferramentas no topo da janela.</p><p>Pode premir a tecla <b>%1&lt [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Bem-vindo ao VirtualBox!</h3><p>A parte esquerda desta janela é uma lista de todas as máquinas virtuais no seu computador. A lista está vazia agora porque ainda não criou qualquer máquina virtual.<img src=:/welcome.png align=right/></p><p>Para poder criar uma nova máquina virtual, prima o botão <b>Nova</b> na barra de ferramentas no topo da janela.</p><p>Pode premir a tecla <b>%1&lt [...]
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
@@ -16121,6 +15964,191 @@ corresponder a qualquer valor.</qt></translation>
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>Session Information Dialog</source>
+        <translation type="obsolete">Diálogo de Informação de Sessão</translation>
+    </message>
+    <message>
+        <source>&Close</source>
+        <translation type="obsolete">Fe&char</translation>
+    </message>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Informação de Sessão</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Detalhes</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Execução</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">Transferências DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">Transferências PIO</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Dados Lidos</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Dados Gravados</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Dados Transferidos</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Dados Recebidos</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Activado</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="obsolete">Desactivado</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Atributos de Execução</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Resolução de Ecrã</translation>
+    </message>
+    <message>
+        <source>Hardware Virtualization</source>
+        <translation type="obsolete">Virtualização do Material</translation>
+    </message>
+    <message>
+        <source>IDE Hard Disk Statistics</source>
+        <translation type="obsolete">Estatisticas de Disco Rígido IDE</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">Estatisticas CD/DVD</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Estatisticas de Adaptador de Rede</translation>
+    </message>
+    <message>
+        <source>Adapter 1</source>
+        <translation type="obsolete">Adaptador 1</translation>
+    </message>
+    <message>
+        <source>Adapter 2</source>
+        <translation type="obsolete">Adaptador 2</translation>
+    </message>
+    <message>
+        <source>Adapter 3</source>
+        <translation type="obsolete">Adaptador 3</translation>
+    </message>
+    <message>
+        <source>Adapter 4</source>
+        <translation type="obsolete">Adaptador 4</translation>
+    </message>
+    <message>
+        <source>Not attached</source>
+        <translation type="obsolete">Não conectado</translation>
+    </message>
+    <message>
+        <source>Hard Disks Statistics</source>
+        <translation type="obsolete">Estatisticas do Disco Rígido</translation>
+    </message>
+    <message>
+        <source>Primary Master</source>
+        <translation type="obsolete">'Master' Primário</translation>
+    </message>
+    <message>
+        <source>Primary Slave</source>
+        <translation type="obsolete">'Slave' Primário</translation>
+    </message>
+    <message>
+        <source>Secondary Master</source>
+        <translation type="obsolete">'Master' Secundário</translation>
+    </message>
+    <message>
+        <source>Secondary Slave</source>
+        <translation type="obsolete">'Slave' Secundário</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Versão %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Não Detectadas</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Não Detectado</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Adições de Convidado</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Tipo de SO Convidado</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Estatísticas do Disco Rígido</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Sem Discos Rígidos</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Sem Adaptadores de Rede</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Activado</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Desactivado</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Estatísticas de Armazenamento</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Sem Dispositivos de Armazenamento</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Estatísticas da Rede</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Não Disponível</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMListBox</name>
     <message>
         <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
@@ -17046,7 +17074,7 @@ e Saída APIC (I/O APIC), o que deve diminuir levemente o desempenho da MV.
         <translation type="obsolete">Mostra a localização onde as capturas desta máquina virtual serão armazenadas. Note que estas capturas podem ocupar bastante espaço em disco.</translation>
     </message>
     <message>
-        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Restaura a localização da pasta de capturaspara o valor predefinido. O valor predefinido actual será mostrado após aceitar as mudanças e abrir este diálogo novamente.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
index 52eb87f..accbe2f 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
@@ -1338,11 +1338,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1354,23 +1354,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1387,7 +1387,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1395,11 +1395,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1407,7 +1407,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1474,7 +1474,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1482,7 +1482,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1510,11 +1510,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1526,15 +1526,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1578,15 +1578,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -3599,9 +3599,9 @@ p, li { white-space: pre-wrap; }
         <translation>Driver genérico, '%1'</translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>Driver genérico, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation type="unfinished">Driver genérico, '%1' { %2 }</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -4878,7 +4878,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7961,10 +7961,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Image</source>
         <comment>storage image</comment>
         <translation type="unfinished">Imagem</translation>
@@ -8014,13 +8010,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsSystem</name>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
index 2eb0010..279aa90 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
@@ -374,7 +374,7 @@
         <translation type="obsolete">Dialog i&nformații despre sesiune</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Arată dialogul de informații despre sesiune</translation>
     </message>
     <message>
@@ -462,11 +462,11 @@
         <translation type="obsolete">Activează sau dezactivează conexiuni remote desktop (RDP) către această mașină</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Instalare Guest Additions...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="unfinished">&Instalare Guest Additions...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Montează imaginea de instalare Guest Additions</translation>
     </message>
     <message>
@@ -736,92 +736,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">&Instalare Guest Additions...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Montează imaginea de instalare Guest Additions</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
+        <source>&Webcams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Rețea</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Fișier</translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="unfinished">&Tastatură</translation>
-    </message>
-    <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Rețea</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Preferințe...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Afișează &log...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Fișier</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -837,175 +823,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Preferințe...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <source>&Keyboard</source>
+        <translation type="unfinished">&Tastatură</translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <source>&Hard Disks</source>
+        <translation type="unfinished">Discuri &hard</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="unfinished">Discuri &hard</translation>
+        <source>&USB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Afișează &log...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1051,6 +1037,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create new virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1067,7 +1061,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1075,7 +1069,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1099,15 +1093,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1119,11 +1125,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1131,7 +1137,7 @@
         <translation type="unfinished">Reî&mprospătează</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1175,15 +1181,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1192,34 +1198,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Activează</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1243,6 +1223,19 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -2611,11 +2604,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
-        <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
         <translation type="unfinished">Filtru dispozitive</translation>
@@ -2675,83 +2663,88 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">Controlor USB</translation>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">Controlor USB</translation>
+    </message>
+    <message>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Menu-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3671,7 +3664,7 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4299,7 +4292,8 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4313,8 +4307,7 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4549,63 +4542,31 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <source>%1 fps</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>fps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>low</source>
-        <comment>quality</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <comment>quality</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>high</source>
-        <comment>quality</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>kbps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Screen %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Minibară:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Dacă este bifat, afișează Minibara în modul pe tot ecranul și în cel transparent.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Arată în mod pe tot &ecranul/transparent</translation>
+    <message>
+        <source>fps</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Dacă este bifată, poziționează minibara în partea de sus a ecranului, deși poziția implicită este la baza ecranului.</translation>
+        <source>low</source>
+        <comment>quality</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Poziționează &sus</translation>
+        <source>medium</source>
+        <comment>quality</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>About %1MB per 5 minute video</i></source>
+        <source>high</source>
+        <comment>quality</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <source>kbps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <source>Screen %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4621,15 +4582,11 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4645,10 +4602,6 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4697,6 +4650,14 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4705,6 +4666,10 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4720,8 +4685,8 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="obsolete">Afișează calea unde vor fi stocate instantaneele acestei mașini virtuale. Notați faptul că instantaneele pot ocupa puțin mai mult spațiu pe disc.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Elementar</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Elementar</translation>
     </message>
     <message>
         <source>Identification</source>
@@ -4772,8 +4737,8 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="obsolete">Controlează cantitatea de memorie video oferită mașinii virtuale.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Avansat</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Avansat</translation>
     </message>
     <message>
         <source>Boo&t Order:</source>
@@ -4860,8 +4825,8 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation>Director i&nstantanee:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Descriere</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Descriere</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -4932,10 +4897,6 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="obsolete">Poziționează &sus</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4948,6 +4909,22 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">A&vansat</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
+        <translation type="unfinished">&Descriere</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4964,6 +4941,10 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4996,16 +4977,12 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5016,28 +4993,20 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Minibară:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Dacă este bifat, afișează Minibara în modul pe tot ecranul și în cel transparent.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Arată în mod pe tot &ecranul/transparent</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Dacă este bifată, poziționează minibara în partea de sus a ecranului, deși poziția implicită este la baza ecranului.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -5047,18 +5016,6 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -5668,23 +5625,23 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation>Afișează adresa portului I/O de bază pentru acest port paralel. Valori valide sunt întregi între <tt>0</tt> și <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6044,96 +6001,97 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Imagine</translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Imagine</translation>
+        <source>Add USB Controller</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6149,7 +6107,7 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6351,35 +6309,35 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6525,31 +6483,31 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"><nobr>Stare %1</nobr></translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6798,14 +6756,14 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Închide</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Schimbă</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Închide</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7142,15 +7100,15 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="obsolete"><p>Unul sau mai multe discuri virtuale sau medii CD/DVD sau dischetă înregistrate nu sunt accesibile. Prin urmare, nu veți putea opera mașinile virtuale care fac uz de aceste medii până când ele devin accesibile din nou.</p><p>Apăsați <b>OK</b> pentru a deschide fereastra Manager de discuri virtuale și a vedea care medii sunt inaccesibile, sau apăsați <b>Ignoră</b> pentru a ignora acest mesaj.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Pachetul VirtualBox Guest Additions instalat pe SO musafir este prea vechi: versiunea instalată este %1, versiunea așteptată fiind %2. Unele funcții care necesită Guest Additions (integrarea cursorului, auto redimensionarea ecranului musafir) s-ar putea să nu mai funcționeze corect.</p><p>Vă rugăm aduceți Guest Additions la versiunea curentă alegând <b>Instalare Guest Additions</b> din meniul <b>Dispozitive</b [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Pachetul VirtualBox Guest Additions instalat pe SO musafir este depășit: versiunea instalată este %1, versiunea așteptată fiind %2. Unele funcții care necesită Guest Additions (integrarea cursorului, auto redimensionarea ecranului musafir) s-ar putea să nu mai funcționeze corect.</p><p>Vă rugăm aduceți Guest Additions la versiunea curentă alegând <b>Instalare Guest Additions</b> din meniul <b>Dispozitive</b&gt [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Pachetul VirtualBox Guest Additions instalat pe SO musafir este prea nou pentru acestă versiune a VirtualBox: versiunea instalată este %1, versiunea așteptată fiind %2. Folosirea unei versiuni mai noi a Guest Additions într-o versiune mai veche a VirtualBox nu este suportată.</p><p>Vă rugăm instalați versiunea curentă a Guest Additions alegând <b>Instalare Guest Additions</b> din meniul <b>Dispozitive</b>.& [...]
     </message>
     <message>
@@ -7195,8 +7153,8 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="obsolete"><p>Fereastra mașinii virtuale este optimizată pentru lucrul în modul de culori <b>%1&nbsp;bit</b>, dar calitatea culorii al ecranului virtual este în prezent setată la <b>%2&nbsp;bit</b>.</p><p>Vă rugăm deschideți dialogul de proprietăți ecran ale SO musafir și selectați modul de culoare <b>%3&nbsp;bit</b>, dacă este disponibil, pentru cea mai bună performanță posibilă a subsistemului v [...]
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>O eroare critică s-a petrecut în timpul execuției mașinii virtuale și execuția a fost oprită.</p><p>Pentru ajutor, vă rugăm verificați secțiunea Community pe <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> sau contractul dvs de suport tehnic. Vă rugăm oferiți conținutul fișierului jurnal <tt>VBox.log</tt> și fișierul imagine <tt>VBox.png</tt>, pe care le puteți găsi în dosarul &l [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation type="obsolete"><p>O eroare critică s-a petrecut în timpul execuției mașinii virtuale și execuția a fost oprită.</p><p>Pentru ajutor, vă rugăm verificați secțiunea Community pe <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> sau contractul dvs de suport tehnic. Vă rugăm oferiți conținutul fișierului jurnal <tt>VBox.log</tt> și fișierul imagine <tt>VBox.png</tt>, pe care le puteți găsi în dosarul  [...]
     </message>
     <message>
         <source><p>You didn't attach a hard disk to the new virtual machine. The machine will not be able to boot unless you attach a hard disk with a guest operating system or some other bootable media to it later using the machine settings window or the First Run Wizard.</p><p>Do you wish to continue?</p></source>
@@ -7303,9 +7261,9 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="obsolete">Descarcă</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Montează</translation>
+        <translation type="unfinished">Montează</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -7481,8 +7439,8 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="obsolete">Arată dialogul cu informații despre produs</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>O versiune mai nouă a VirtualBox a fost lansată! Versiunea <b>%1</b> este disponibilă la <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Puteți descărca această versiune direct de la:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>O versiune mai nouă a VirtualBox a fost lansată! Versiunea <b>%1</b> este disponibilă la <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Puteți descărca această versiune direct de la:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -7544,8 +7502,8 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="obsolete">Su&prascrie</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>O eroare critică s-a petrecut în timpul execuției mașinii virtuale și execuția a fost oprită.</p><p>Pentru ajutor, vă rugăm verificați secțiunea Community pe <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> sau contractul dvs de suport tehnic. Vă rugăm oferiți conținutul fișierului jurnal <tt>VBox.log</tt> și fișierul imagine <tt>VBox.png</tt>, pe care le puteți găsi în dosarul &l [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>O eroare critică s-a petrecut în timpul execuției mașinii virtuale și execuția a fost oprită.</p><p>Pentru ajutor, vă rugăm verificați secțiunea Community pe <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> sau contractul dvs de suport tehnic. Vă rugăm oferiți conținutul fișierului jurnal <tt>VBox.log</tt> și fișierul imagine <tt>VBox.png</tt>, pe care le puteți găsi în dosarul <nobr>< [...]
     </message>
     <message>
         <source>hard disk</source>
@@ -8214,32 +8172,24 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Insert</source>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Montează</translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8255,115 +8205,115 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8434,8 +8384,8 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished">&Nume:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Nume:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -8457,6 +8407,10 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
         <source>Selects 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>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -9391,18 +9345,14 @@ din listă apăsând butonul <b>Existent</b> (pentru a invoca dialog
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Bun venit în VirtualBox!</h3><p>Partea din stânga a ferestrei arată lista tuturor mașinilor virtuale din computerul dvs. Lista este goală acum deoarece nu a fost creată nici o mașină virtuală până acum.<img src=:/welcome.png align=right/></p><p>Pentru a crea o mașină virtuală nouă apăsați butonul <b>Nouă</b> în bara de unelte principală localizată în partea de sus a ferestrei.</p><p>Puteț [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="unfinished"><h3>Bun venit în VirtualBox!</h3><p>Partea din stânga a ferestrei arată lista tuturor mașinilor virtuale din computerul dvs. Lista este goală acum deoarece nu a fost creată nici o mașină virtuală până acum.<img src=:/welcome.png align=right/></p><p>Pentru a crea o mașină virtuală nouă apăsați butonul <b>Nouă</b> în bara de unelte principală localizată în partea de sus a ferestrei.</p><p>Put [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -9562,6 +9512,10 @@ din listă apăsând butonul <b>Existent</b> (pentru a invoca dialog
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Închide</translation>
     </message>
@@ -9569,10 +9523,6 @@ din listă apăsând butonul <b>Existent</b> (pentru a invoca dialog
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -9716,8 +9666,8 @@ din listă apăsând butonul <b>Existent</b> (pentru a invoca dialog
         <translation type="obsolete">Rezumat</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>O versiune mai nouă a VirtualBox a fost lansată! Versiunea <b>%1</b> este disponibilă la <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Puteți descărca această versiune direct de la:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>O versiune mai nouă a VirtualBox a fost lansată! Versiunea <b>%1</b> este disponibilă la <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Puteți descărca această versiune direct de la:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -9809,211 +9759,99 @@ din listă apăsând butonul <b>Existent</b> (pentru a invoca dialog
 <context>
     <name>UIVMInfoDialog</name>
     <message>
-        <source>Session Information Dialog</source>
-        <translation type="obsolete">Dialog informații despre sesiune</translation>
-    </message>
-    <message>
-        <source>&Close</source>
-        <translation type="obsolete">În&chide</translation>
-    </message>
-    <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - informații despre sesiune</translation>
+        <translation type="unfinished">%1 - informații despre sesiune</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Detalii</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">Timp &rulare</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>Transferuri DMA</translation>
+        <translation type="unfinished">Transferuri DMA</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>Transferuri PIO</translation>
+        <translation type="unfinished">Transferuri PIO</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Citire date</translation>
+        <translation type="unfinished">Citire date</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Scriere date</translation>
+        <translation type="unfinished">Scriere date</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Date transmise</translation>
+        <translation type="unfinished">Date transmise</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Date primite</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Activat</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Dezactivat</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Atribute la rulare</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Rezoluție ecran</translation>
-    </message>
-    <message>
-        <source>Hardware Virtualization</source>
-        <translation type="obsolete">Virtualizare hardware</translation>
-    </message>
-    <message>
-        <source>IDE Hard Disk Statistics</source>
-        <translation type="obsolete">Statistici disc hard ID</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">Statistici CD/DVD</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Statistici placă de rețea</translation>
-    </message>
-    <message>
-        <source>Adapter 1</source>
-        <translation type="obsolete">Placă 1</translation>
-    </message>
-    <message>
-        <source>Adapter 2</source>
-        <translation type="obsolete">Placă 2</translation>
-    </message>
-    <message>
-        <source>Adapter 3</source>
-        <translation type="obsolete">Placă 3</translation>
-    </message>
-    <message>
-        <source>Adapter 4</source>
-        <translation type="obsolete">Placă 4</translation>
-    </message>
-    <message>
-        <source>Not attached</source>
-        <translation type="obsolete">Neconectat</translation>
-    </message>
-    <message>
-        <source>Hard Disks Statistics</source>
-        <translation type="obsolete">Statistici discuri hard</translation>
-    </message>
-    <message>
-        <source>Primary Master</source>
-        <translation type="obsolete">Primar master</translation>
-    </message>
-    <message>
-        <source>Primary Slave</source>
-        <translation type="obsolete">Primar slave</translation>
-    </message>
-    <message>
-        <source>Secondary Master</source>
-        <translation type="obsolete">Secundar master</translation>
-    </message>
-    <message>
-        <source>Secondary Slave</source>
-        <translation type="obsolete">Secundar slave</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Versiunea %1.%2</translation>
+        <translation type="unfinished">Date primite</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Nedetectat</translation>
+        <translation type="unfinished">Nedetectat</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Nedetectat</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation></translation>
+        <translation type="unfinished">Nedetectat</translation>
     </message>
     <message>
-        <source>Guest OS Type</source>
-        <translation>Tip SO musafir</translation>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Indisponibil</translation>
     </message>
     <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Statistici disc fix</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Atribute la rulare</translation>
     </message>
     <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Lipsă discuri fixe</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Rezoluție ecran</translation>
     </message>
     <message>
-        <source>No Network Adapters</source>
-        <translation>Lipsă plăci de rețea</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Activat</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Dezactivat</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">Indisponibil</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Tip SO musafir</translation>
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation>Statistici stocare</translation>
+        <translation type="unfinished">Statistici stocare</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
-        <translation>Lipsă dispozitive de stocare</translation>
+        <translation type="unfinished">Lipsă dispozitive de stocare</translation>
     </message>
     <message>
         <source>Network Statistics</source>
-        <translation>Statistici rețea</translation>
-    </message>
-    <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation type="unfinished">Indisponibil</translation>
-    </message>
-    <message>
-        <source>Clipboard Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Statistici rețea</translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Lipsă plăci de rețea</translation>
     </message>
 </context>
 <context>
@@ -11165,11 +11003,11 @@ Versiunea %1</translation>
         <translation type="obsolete">Deschide dialogul directoare partajate</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">&Instalare Guest Additions...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Montează imaginea de instalare Guest Additions</translation>
     </message>
     <message>
@@ -11542,7 +11380,7 @@ Versiunea %1</translation>
         <translation type="obsolete">Dialog i&nformații despre sesiune</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Arată dialogul de informații despre sesiune</translation>
     </message>
     <message>
@@ -12004,8 +11842,8 @@ Versiunea %1</translation>
         <translation><restabilește valoarea implicită></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Valoarea implicită actuală va fi afișată după acceptarea schimbărilor și redeschiderea acestei ferestre de dialog.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished">Valoarea implicită actuală va fi afișată după acceptarea schimbărilor și redeschiderea acestei ferestre de dialog.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -12053,7 +11891,8 @@ Versiunea %1</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Valoarea implicită actuală va fi afișată după acceptarea schimbărilor și redeschiderea acestei ferestre de dialog.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -13244,6 +13083,16 @@ Versiunea %1</translation>
         <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
         <source>%n year(s)</source>
         <translation>
@@ -13764,76 +13613,36 @@ Versiunea %1</translation>
     </message>
     <message>
         <source>USB Tablet</source>
-        <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB Multi-Touch Tablet</source>
-        <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NAT Network</source>
-        <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NAT network, '%1'</source>
-        <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished">USB</translation>
-    </message>
-    <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>off</source>
-        <comment>guest monitor status</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
+        <comment>PointingHIDType</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Nici unul</translation>
+        <source>USB Multi-Touch Tablet</source>
+        <comment>PointingHIDType</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Implicită</translation>
+        <source>NAT Network</source>
+        <comment>NetworkAttachmentType</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
+        <source>NAT network, '%1'</source>
+        <comment>details report (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
+        <source>You can create or add disk image files in the virtual machine settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <source>USB</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
+        <source>off</source>
+        <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13867,6 +13676,11 @@ Versiunea %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -13877,6 +13691,31 @@ Versiunea %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Nici unul</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Implicită</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -13887,6 +13726,11 @@ Versiunea %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished"></translation>
@@ -13907,17 +13751,17 @@ Versiunea %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>User interface</source>
-        <comment>DetailsElementType</comment>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Optical Drive)</source>
+        <source>User interface</source>
+        <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>(Optical Drive)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13929,7 +13773,7 @@ Versiunea %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
+        <source>Encrypted</source>
         <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -13939,11 +13783,6 @@ Versiunea %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Please choose a location for new virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14033,13 +13872,13 @@ folosit, daca nu este explicit specificat altfel, atunci când creați noi sau a
     </message>
     <message>
         <source>Resets the virtual machine folder path to the default value.
-The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Restează calea către directorul mașinii virtuale la valoarea implicită.
 Calea implicită actuală va fi afișată după ce acceptați schimbările și deschideți acet dialog din nou.</translation>
     </message>
     <message>
         <source>Resets the VDI folder path to the default value.
-The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Restează calea către directorul VDI la valoarea implicită.
 Calea implicită actuală va fi afișată după ce acceptați schimbările și deschideți acet dialog din nou.</translation>
     </message>
@@ -14277,11 +14116,11 @@ către cea a sistemului de operare.</qt>
         <translation type="obsolete">Afișează calea către directorul VDI implicit. Acest director este folosit, dacă nu este explicit specificat altfel, atunci când creați noi sau adăugați discuri hard virtuale existente.</translation>
     </message>
     <message>
-        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Restează calea către directorul mașinii virtuale la valoarea implicită. Calea implicită actuală va fi afișată după ce acceptați schimbările și deschideți acest dialog din nou.</translation>
     </message>
     <message>
-        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Restează calea către directorul VDI la valoarea implicită.
 Calea implicită actuală va fi afișată după ce acceptați schimbările și deschideți acest dialog din nou.</translation>
     </message>
@@ -14330,7 +14169,7 @@ toate apăsarile de taste (inclusiv cele specifice sistemului, gen Alt+Tab) sunt
         <translation type="obsolete">Deschide un dialog de selecție a fișierului bibliotecă de autentificare VRDP.</translation>
     </message>
     <message>
-        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Resetează fișierul bibliotecă autentificare la valoarea implicită. Valoarea actuală implicită va fi afișată după acceptarea schimbărilor și redeschiderea acestui dialog.</translation>
     </message>
     <message>
@@ -14827,15 +14666,15 @@ Folosiți meniul contextual sau butaonele din dreapta pentru a adâuga sau șter
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -14926,8 +14765,8 @@ Folosiți meniul contextual sau butaonele din dreapta pentru a adâuga sau șter
         <translation type="obsolete">Dialog înregistrare VirtualBox</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
-        <translation type="obsolete"><p>Vă rugăm completați formularul de înregistrare pentru ca noi să știm că folosiți VirtualBox și, opțional, să vă ținem la curent cu noutățile și actualizările VirtualBox. </p><p>Introduceți numele dvs complet folosind caractere Latine și adresa dvs de e-mail în câmpurile de mai jos. Notați faptul că innotek va folosi aceste informații numai pentru a obține statistici de utilizare a produsului și a vă trimite newsletter. În particul [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Please note that innotek will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, innotek will never pass your data to third parties. Detailed in [...]
+        <translation type="obsolete"><p>Vă rugăm completați formularul de înregistrare pentru ca noi să știm că folosiți VirtualBox și, opțional, să vă ținem la curent cu noutățile și actualizările VirtualBox. </p><p>Introduceți numele dvs complet folosind caractere Latine și adresa dvs de e-mail în câmpurile de mai jos. Notați faptul că innotek va folosi aceste informații numai pentru a obține statistici de utilizare a produsului și a vă trimite newsletter. În particul [...]
     </message>
     <message>
         <source>&Name</source>
@@ -14974,8 +14813,8 @@ Folosiți meniul contextual sau butaonele din dreapta pentru a adâuga sau șter
         <translation type="obsolete">Nu am putut efectua strângerea de mâini necesară conexiunii.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Vă rugăm completați formularul de înregistrare pentru ca noi să știm că folosiți VirtualBox și, opțional, să vă ținem la curent cu noutățile și actualizările VirtualBox. </p><p>Introduceți numele dvs complet folosind caractere latine și adresa dvs de e-mail în câmpurile de mai jos. Notați faptul că Sun Microsystems va folosi aceste informații numai pentru a obține statistici de utilizare a produsului și pentru a vă trimite newslet [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Vă rugăm completați formularul de înregistrare pentru ca noi să știm că folosiți VirtualBox și, opțional, să vă ținem la curent cu noutățile și actualizările VirtualBox. </p><p>Introduceți numele dvs complet folosind caractere latine și adresa dvs de e-mail în câmpurile de mai jos. Notați faptul că Sun Microsystems va folosi aceste informații numai pentru a obține statistici de utilizare a produsului și pentru a vă trimite newslet [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -15348,8 +15187,8 @@ Folosiți meniul contextual sau butaonele din dreapta pentru a adâuga sau șter
         <translation type="obsolete">Caută pe server actualizări VirtualBox</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Bun venit în VirtualBox!</h3><p>Partea din stânga a ferestrei arată lista tuturor mașinilor virtuale din computerul dvs. Lista este goală acum deoarece nu a fost creată nici o mașină virtuală până acum.<img src=:/welcome.png align=right/></p><p>Pentru a crea o mașină virtuală nouă apăsați butonul <b>Nouă</b> în bara de unelte principală localizată în partea de sus a ferestrei.</p><p>Puteț [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Bun venit în VirtualBox!</h3><p>Partea din stânga a ferestrei arată lista tuturor mașinilor virtuale din computerul dvs. Lista este goală acum deoarece nu a fost creată nici o mașină virtuală până acum.<img src=:/welcome.png align=right/></p><p>Pentru a crea o mașină virtuală nouă apăsați butonul <b>Nouă</b> în bara de unelte principală localizată în partea de sus a ferestrei.</p><p>Puteț [...]
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
@@ -16177,6 +16016,192 @@ value.</qt></source>
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>Session Information Dialog</source>
+        <translation type="obsolete">Dialog informații despre sesiune</translation>
+    </message>
+    <message>
+        <source>&Close</source>
+        <translation type="obsolete">În&chide</translation>
+    </message>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - informații despre sesiune</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Detalii</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">Timp &rulare</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">Transferuri DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">Transferuri PIO</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Citire date</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Scriere date</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Date transmise</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Date primite</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Activat</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="obsolete">Dezactivat</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Atribute la rulare</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Rezoluție ecran</translation>
+    </message>
+    <message>
+        <source>Hardware Virtualization</source>
+        <translation type="obsolete">Virtualizare hardware</translation>
+    </message>
+    <message>
+        <source>IDE Hard Disk Statistics</source>
+        <translation type="obsolete">Statistici disc hard ID</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">Statistici CD/DVD</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Statistici placă de rețea</translation>
+    </message>
+    <message>
+        <source>Adapter 1</source>
+        <translation type="obsolete">Placă 1</translation>
+    </message>
+    <message>
+        <source>Adapter 2</source>
+        <translation type="obsolete">Placă 2</translation>
+    </message>
+    <message>
+        <source>Adapter 3</source>
+        <translation type="obsolete">Placă 3</translation>
+    </message>
+    <message>
+        <source>Adapter 4</source>
+        <translation type="obsolete">Placă 4</translation>
+    </message>
+    <message>
+        <source>Not attached</source>
+        <translation type="obsolete">Neconectat</translation>
+    </message>
+    <message>
+        <source>Hard Disks Statistics</source>
+        <translation type="obsolete">Statistici discuri hard</translation>
+    </message>
+    <message>
+        <source>Primary Master</source>
+        <translation type="obsolete">Primar master</translation>
+    </message>
+    <message>
+        <source>Primary Slave</source>
+        <translation type="obsolete">Primar slave</translation>
+    </message>
+    <message>
+        <source>Secondary Master</source>
+        <translation type="obsolete">Secundar master</translation>
+    </message>
+    <message>
+        <source>Secondary Slave</source>
+        <translation type="obsolete">Secundar slave</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Versiunea %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Nedetectat</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Nedetectat</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Tip SO musafir</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Statistici disc fix</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Lipsă discuri fixe</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Lipsă plăci de rețea</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Activat</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Dezactivat</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">Indisponibil</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Statistici stocare</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Lipsă dispozitive de stocare</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Statistici rețea</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Indisponibil</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMListBox</name>
     <message>
         <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
@@ -16833,7 +16858,7 @@ virtuale. Notați faptul că instantaneele pot ocupa puțin mai mult spațiu pe
     </message>
     <message>
         <source>Resets the snapshot folder path to the default value.
-The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Restează calea către directorul de instantanee la valoarea implicită.
 Calea implicită actuală va fi afișată după ce acceptați schimbările și deschideți acet dialog din nou.</translation>
     </message>
@@ -17303,7 +17328,7 @@ această opțiune după ce ați instalat un sistem de operare musafir Microsoft!
         <translation type="obsolete">Afișează calea unde vor fi stocate instantaneele acestei mașini virtuale. Notați faptul că instantaneele pot ocupa puțin mai mult spațiu pe disc.</translation>
     </message>
     <message>
-        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Restează calea către directorul de instantanee la valoarea implicită. Calea implicită actuală va fi afișată după ce acceptați schimbările și deschideți acest dialog din nou.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
index ad2d440..34d3ec4 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
@@ -252,7 +252,7 @@
     </message>
     <message>
         <source>Seam&less Mode</source>
-        <translation type="unfinished">Режим интеграции &дисплея</translation>
+        <translation>Режим &интеграции экрана</translation>
     </message>
     <message>
         <source>Switch to seamless desktop integration mode</source>
@@ -312,7 +312,7 @@
     </message>
     <message>
         <source>Take a snapshot of the virtual machine</source>
-        <translation>Сделать снимок текущего состояния виртуальной машины</translation>
+        <translation>Сделать снимок состояния виртуальной машины</translation>
     </message>
     <message>
         <source>Session I&nformation Dialog</source>
@@ -328,7 +328,7 @@
     </message>
     <message>
         <source>Suspend the execution of the virtual machine</source>
-        <translation>Приостановить работу виртуальной машины</translation>
+        <translation>Приостановить виртуальную машину</translation>
     </message>
     <message>
         <source>R&esume</source>
@@ -521,7 +521,7 @@
     </message>
     <message>
         <source>Switch between normal and seamless desktop integration mode</source>
-        <translation>Переключиться в режим интеграции гостевого дисплея с рабочим столом</translation>
+        <translation>Переключиться в режим интеграции экрана гостевой ОС с рабочим столом</translation>
     </message>
     <message>
         <source>Switch to &Scaled Mode</source>
@@ -529,7 +529,7 @@
     </message>
     <message>
         <source>Switch between normal and scaled mode</source>
-        <translation>Переключиться в режим масштабирования дисплея гостевой ОС</translation>
+        <translation>Переключиться в режим масштабирования экрана гостевой ОС</translation>
     </message>
     <message>
         <source>Session I&nformation</source>
@@ -569,11 +569,11 @@
     </message>
     <message>
         <source>Go back to showing all suppressed warnings and messages</source>
-        <translation>Включить отображение всех отключенных ранее предупреждений и сообщений</translation>
+        <translation>Разрешить отображение всех отключенных ранее сообщений</translation>
     </message>
     <message>
         <source>&Network Operations Manager...</source>
-        <translation>&Менеджер сетевых операций...</translation>
+        <translation>Менеджер &сетевых операций...</translation>
     </message>
     <message>
         <source>Show Network Operations Manager</source>
@@ -593,7 +593,7 @@
     </message>
     <message>
         <source>Take Sn&apshot...</source>
-        <translation>Сделать с&нимок...</translation>
+        <translation>Сделать с&нимок состояния...</translation>
     </message>
     <message>
         <source>Take Screensh&ot...</source>
@@ -619,7 +619,7 @@
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
-        <translation>&Менеджер виртуальных носителей...</translation>
+        <translation>Менеджер виртуальных н&осителей...</translation>
     </message>
     <message>
         <source>Display the Virtual Media Manager window</source>
@@ -736,7 +736,7 @@
     </message>
     <message>
         <source>Cl&one...</source>
-        <translation>&Копировать...</translation>
+        <translation>&Клонировать...</translation>
     </message>
     <message>
         <source>Clone the selected virtual machine</source>
@@ -792,7 +792,7 @@
     </message>
     <message>
         <source>&Reset All Warnings</source>
-        <translation>&Разрешить все предупреждения</translation>
+        <translation>&Разрешить все сообщения</translation>
     </message>
     <message>
         <source>C&heck for Updates...</source>
@@ -800,7 +800,7 @@
     </message>
     <message>
         <source>Rena&me Group...</source>
-        <translation>&Переименовать...</translation>
+        <translation>П&ереименовать...</translation>
     </message>
     <message>
         <source>Sort the items of the selected virtual machine group alphabetically</source>
@@ -860,7 +860,7 @@
     </message>
     <message>
         <source>Po&wer Off</source>
-        <translation>Выключить</translation>
+        <translation>&Выключить</translation>
     </message>
     <message>
         <source>Power off the selected virtual machines</source>
@@ -888,7 +888,7 @@
     </message>
     <message>
         <source>Gro&up</source>
-        <translation>&Сгруппировать</translation>
+        <translation>С&группировать</translation>
     </message>
     <message>
         <source>Sort the group of the first selected machine alphabetically</source>
@@ -964,47 +964,47 @@
     </message>
     <message>
         <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <translation>&VirtualBox</translation>
     </message>
     <message>
         <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Строка &меню</translation>
     </message>
     <message>
         <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Настроить строку меню...</translation>
     </message>
     <message>
         <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>&Показывать строку меню</translation>
     </message>
     <message>
         <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Строка &состояния</translation>
     </message>
     <message>
         <source>&Status Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Настроить строку состояния...</translation>
     </message>
     <message>
         <source>Show Status &Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>&Показывать строку состояния</translation>
     </message>
     <message>
         <source>&Input</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ввод</translation>
     </message>
     <message>
         <source>&Keyboard</source>
-        <translation type="unfinished"></translation>
+        <translation>&Клавиатура</translation>
     </message>
     <message>
         <source>&Keyboard Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Настроить клавиатуру...</translation>
     </message>
     <message>
         <source>&Mouse</source>
-        <translation type="unfinished"></translation>
+        <translation>&Мышь</translation>
     </message>
     <message>
         <source>Network</source>
@@ -1012,402 +1012,402 @@
     </message>
     <message>
         <source>&USB Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Настроить USB...</translation>
     </message>
     <message>
         <source>&Shared Folders</source>
-        <translation type="unfinished"></translation>
+        <translation>&Общие папки</translation>
     </message>
     <message>
         <source>Show &Log...</source>
         <comment>debug action</comment>
-        <translation type="unfinished">Показать &журнал...</translation>
+        <translation>Показать &журнал...</translation>
     </message>
     <message>
         <source>E&xtra Data Manager...</source>
-        <translation type="unfinished"></translation>
+        <translation>Менеджер внутренних &данных...</translation>
     </message>
     <message>
         <source>Display the Extra Data Manager window</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть менеджер внутренних данных</translation>
     </message>
     <message>
         <source>&File</source>
-        <translation type="unfinished">&Файл</translation>
+        <translation>&Файл</translation>
     </message>
     <message>
         <source>&Window</source>
-        <translation type="unfinished"></translation>
+        <translation>&Окно</translation>
     </message>
     <message>
         <source>&Minimize</source>
-        <translation type="unfinished"></translation>
+        <translation>&Убрать в Dock</translation>
     </message>
     <message>
         <source>&Full-screen Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>&Режим полного экрана</translation>
     </message>
     <message>
         <source>Switch between normal and full-screen mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Переключиться в режим полного экрана</translation>
     </message>
     <message>
         <source>S&caled Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Р&ежим масштабирования экрана</translation>
     </message>
     <message>
         <source>S&cale Factor</source>
-        <translation type="unfinished"></translation>
+        <translation>&Коэффициент масштабирования</translation>
     </message>
     <message>
         <source>Send the %1 sequence to the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Послать последовательность клавиш %1 в виртуальную машину</translation>
     </message>
     <message>
         <source>&Mouse Integration</source>
-        <translation type="unfinished"></translation>
+        <translation>&Интеграция мыши</translation>
     </message>
     <message>
         <source>Enable host mouse pointer integration</source>
-        <translation type="unfinished"></translation>
+        <translation>Включить интеграцию указателя мыши</translation>
     </message>
     <message>
         <source>&Optical Drives</source>
-        <translation type="unfinished"></translation>
+        <translation>&Оптические диски</translation>
     </message>
     <message>
         <source>&Floppy Drives</source>
-        <translation type="unfinished"></translation>
+        <translation>&Гибкие диски</translation>
     </message>
     <message>
         <source>&USB</source>
-        <translation type="unfinished"></translation>
+        <translation>&USB</translation>
     </message>
     <message>
         <source>&Logging</source>
         <comment>debug action</comment>
-        <translation type="unfinished"></translation>
+        <translation>С&бор данных</translation>
     </message>
     <message>
         <source>&Normal Start</source>
-        <translation type="unfinished"></translation>
+        <translation>&Запустить</translation>
     </message>
     <message>
         <source>&Headless Start</source>
-        <translation type="unfinished"></translation>
+        <translation>З&апустить в фоновом режиме</translation>
     </message>
     <message>
         <source>&Detachable Start</source>
-        <translation type="unfinished"></translation>
+        <translation>За&пустить в фоновом режиме с интерфейсом</translation>
     </message>
     <message>
         <source>Minimize active window</source>
-        <translation type="unfinished"></translation>
+        <translation>Свернуть активное окно</translation>
     </message>
     <message>
         <source>Display the Network Operations Manager window</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть менеджер сетевых операций</translation>
     </message>
     <message>
         <source>Display a window with product information</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть диалоговое окно с информацией о программе</translation>
     </message>
     <message>
         <source>&Preferences...</source>
         <comment>global preferences window</comment>
-        <translation type="unfinished"></translation>
+        <translation>&Настройки...</translation>
     </message>
     <message>
         <source>Display the global preferences window</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть диалог глобальных настроек</translation>
     </message>
     <message>
         <source>Display the virtual machine settings window</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть диалог настроек виртуальной машины</translation>
     </message>
     <message>
         <source>Display the virtual machine session information window</source>
-        <translation type="unfinished"></translation>
+        <translation>Открыть диалоговое окно с информацией о сессии виртуальной машины</translation>
     </message>
     <message>
         <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <translation>&Сохранить состояние</translation>
     </message>
     <message>
         <source>Save the state of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить состояние виртуальной машины</translation>
     </message>
     <message>
         <source>Send the ACPI Shutdown signal to the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Послать виртуальной машине сигнал завершения работы</translation>
     </message>
     <message>
         <source>&Minimize Window</source>
-        <translation type="unfinished"></translation>
+        <translation>&Свернуть окно</translation>
     </message>
     <message>
         <source>Automatically resize the guest display when the window is resized</source>
-        <translation type="unfinished"></translation>
+        <translation>Автоматически подгонять размер экрана гостевой ОС при изменении размеров окна</translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
-        <translation type="unfinished"></translation>
+        <source>Take guest display screenshot</source>
+        <translation>Сделать снимок экрана гостевой ОС</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure video capture</source>
+        <translation>Открыть диалог настроек виртуальной машины на странице настроек захвата видео</translation>
     </message>
     <message>
         <source>Enable guest display video capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Включить захват видео экрана гостевой ОС</translation>
     </message>
     <message>
         <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Разрешить удалённый доступ (RDP) к этой машине</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure menu-bar</source>
+        <translation>Открыть окно настроек строки меню</translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable menu-bar</source>
+        <translation>Показывать строку меню</translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure status-bar</source>
+        <translation>Открыть окно настроек строки состояния</translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable status-bar</source>
+        <translation>Показывать строку состояния</translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
-        <translation type="unfinished"></translation>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
+        <translation>Открыть диалог глобальных настроек на странице настроек клавиатуры</translation>
     </message>
     <message>
         <source>&Insert %1</source>
         <comment>that means send the %1 key sequence to the virtual machine</comment>
-        <translation type="unfinished"></translation>
+        <translation>&Послать %1</translation>
     </message>
     <message>
         <source>&Hard Disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Жёсткие диски</translation>
     </message>
     <message>
         <source>&Hard Disk Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Настроить жёсткие диски...</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure hard disks</source>
+        <translation>Открыть диалог настроек виртуальной машины на странице настроек жёстких дисков</translation>
     </message>
     <message>
         <source>&Network</source>
-        <translation type="unfinished"></translation>
+        <translation>&Сеть</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure network adapters</source>
+        <translation>Открыть диалог настроек виртуальной машины на странице настроек сети</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure USB devices</source>
+        <translation>Открыть диалог настроек виртуальной машины на странице настроек USB</translation>
     </message>
     <message>
         <source>&Drag and Drop</source>
-        <translation type="unfinished"></translation>
+        <translation>&Функция Drag and Drop</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure shared folders</source>
+        <translation>Открыть диалог настроек виртуальной машины на странице настроек общих папок</translation>
     </message>
     <message>
         <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключить установочный образ диска c пакетом Дополнений гостевой ОС</translation>
     </message>
     <message>
         <source>%1%</source>
         <comment>scale-factor</comment>
-        <translation type="unfinished">%1%</translation>
+        <translation></translation>
     </message>
     <message>
         <source>Enable</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">Включить</translation>
+        <translation>Включить</translation>
     </message>
     <message>
         <source>Resize to %1x%2</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished"></translation>
+        <translation>Запросить разрешение в %1x%2</translation>
     </message>
     <message>
         <source>Preview Monitor %1</source>
-        <translation type="unfinished">Предпросмотр монитора %1</translation>
+        <translation>Предпросмотр монитора %1</translation>
     </message>
     <message>
         <source>&Connect Network Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>&Подключить сетевой кабель</translation>
     </message>
     <message>
         <source>Connect Network Adapter &%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Подключить сетевой адаптер &%1</translation>
     </message>
     <message>
         <source>No USB Devices Connected</source>
-        <translation type="unfinished">Нет подсоединенных USB устройств</translation>
+        <translation>Нет подсоединённых USB устройств</translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
-        <translation type="unfinished"></translation>
+        <translation>Нет поддерживаемых USB устройств, подсоединённых к хосту</translation>
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished">Нет подсоединённых веб-камер</translation>
+        <translation>Нет подсоединённых веб-камер</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
-        <translation type="unfinished">Нет поддерживаемых веб-камер, подсоединённых к хосту</translation>
+        <translation>Нет поддерживаемых веб-камер, подсоединённых к хосту</translation>
     </message>
     <message>
         <source>Create new virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Создать новую виртуальную машину</translation>
     </message>
     <message>
         <source>Add existing virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить существующую виртуальную машину</translation>
     </message>
     <message>
         <source>Rename selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <translation>Переименовать выбранную группу виртуальных машин</translation>
     </message>
     <message>
         <source>&Ungroup</source>
-        <translation type="unfinished"></translation>
+        <translation>Раз&группировать</translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <source>Ungroup items of selected virtual machine group</source>
+        <translation>Разгруппировать выбранную группу виртуальных машин</translation>
     </message>
     <message>
         <source>&Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>Сор&тировать</translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort items of selected virtual machine group alphabetically</source>
+        <translation>Сортировать элементы выбранной группы виртуальных машин по алфавиту</translation>
     </message>
     <message>
         <source>Add new group based on selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Сгруппировать выбранные виртуальные машины</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Клонировать выбранную виртуальную машину</translation>
     </message>
     <message>
         <source>Remove selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить выбранные виртуальные машины</translation>
     </message>
     <message>
         <source>Start selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Запустить выбранные виртуальные машины</translation>
     </message>
     <message>
         <source>Switch to the windows of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать окна выбранных виртуальных машин</translation>
     </message>
     <message>
         <source>Start selected virtual machines in the background</source>
-        <translation type="unfinished"></translation>
+        <translation>Запустить выбранные виртуальные машины в фоновом режиме</translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
-        <translation type="unfinished"></translation>
+        <source>Start selected virtual machines with option of continuing in background</source>
+        <translation>Запустить выбранные виртуальные машины в фоновом режиме с графическим интерфейсом</translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Suspend execution of selected virtual machines</source>
+        <translation>Приостановить выбранные виртуальные машины</translation>
     </message>
     <message>
         <source>Reset selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Перезапустить выбранные виртуальные машины</translation>
     </message>
     <message>
         <source>D&iscard Saved State...</source>
-        <translation type="unfinished"></translation>
+        <translation>С&бросить сохранённое состояние...</translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Discard saved state of selected virtual machines</source>
+        <translation>Сбросить сохранённые состояния выбранных виртуальных машин</translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Show log files of selected virtual machines</source>
+        <translation>Показать файлы журналов выбранных виртуальных машин</translation>
     </message>
     <message>
         <source>Re&fresh</source>
-        <translation type="unfinished">Об&новить</translation>
+        <translation>Обно&вить</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Refresh accessibility state of selected virtual machines</source>
+        <translation>Перепроверить доступность выбранных виртуальных машин</translation>
     </message>
     <message>
         <source>S&how in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>&Показать в Finder</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать файлы выбранных виртуальных машин в Finder</translation>
     </message>
     <message>
         <source>S&how in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>&Показать в проводнике</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать файлы выбранных виртуальных машин в проводнике</translation>
     </message>
     <message>
         <source>S&how in File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>&Показать в файловом менеджере</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in the File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать файлы выбранных виртуальных машин в файловом менеджере</translation>
     </message>
     <message>
         <source>Cr&eate Alias on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Созд&ать псевдоним на рабочем столе</translation>
     </message>
     <message>
         <source>Create alias files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Создать псевдонимы выбранных виртуальных машин на Вашем рабочем столе</translation>
     </message>
     <message>
         <source>Cr&eate Shortcut on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Созд&ать ярлык на рабочем столе</translation>
     </message>
     <message>
         <source>Create shortcut files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Создать ярлыки выбранных виртуальных машин на Вашем рабочем столе</translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort group of first selected virtual machine alphabetically</source>
+        <translation>Сортировать группу первой из выбранных виртуальных машин по алфавиту</translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Save state of selected virtual machines</source>
+        <translation>Сохранить состояния выбранных виртуальных машин</translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
+        <translation>Послать выбранным виртуальным машинам сигналы завершения работы</translation>
     </message>
     <message>
         <source>Power off selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Выключить выбранные виртуальные машины</translation>
     </message>
 </context>
 <context>
@@ -1434,39 +1434,39 @@
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
         <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - Шифрование дисков</translation>
     </message>
     <message numerus="yes">
         <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Данная виртуальная машина защищена паролем. Пожалуйста введите пароль в таблице ниже.</numerusform>
+            <numerusform>Данная виртуальная машина защищена паролями. Пожалуйста введите пароли в таблице ниже.</numerusform>
+            <numerusform>Данная виртуальная машина защищена паролями. Пожалуйста введите пароли в таблице ниже.</numerusform>
         </translation>
     </message>
     <message>
         <source>Status</source>
         <comment>password table field</comment>
-        <translation type="unfinished"></translation>
+        <translation>Статус</translation>
     </message>
     <message>
         <source>ID</source>
         <comment>password table field</comment>
-        <translation type="unfinished"></translation>
+        <translation>ИД</translation>
     </message>
     <message>
         <source>Password</source>
         <comment>password table field</comment>
-        <translation type="unfinished"></translation>
+        <translation>Пароль</translation>
     </message>
     <message numerus="yes">
         <source><nobr>Used by the following %n hard disk(s):</nobr><br>%1</source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many hard drives are in the tool-tip and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><nobr>Используется следующим жёстким диском:</nobr><br>%1</numerusform>
+            <numerusform><nobr>Используется следующими жёсткими дисками:</nobr><br>%1</numerusform>
+            <numerusform><nobr>Используется следующими жёсткими дисками:</nobr><br>%1</numerusform>
         </translation>
     </message>
 </context>
@@ -1600,19 +1600,19 @@
     </message>
     <message>
         <source>Storage Controller (IDE)</source>
-        <translation type="unfinished"></translation>
+        <translation>Контроллер (IDE)</translation>
     </message>
     <message>
         <source>Storage Controller (SATA)</source>
-        <translation type="unfinished"></translation>
+        <translation>Контроллер (SATA)</translation>
     </message>
     <message>
         <source>Storage Controller (SCSI)</source>
-        <translation type="unfinished"></translation>
+        <translation>Контроллер (SCSI)</translation>
     </message>
     <message>
         <source>Storage Controller (SAS)</source>
-        <translation type="unfinished"></translation>
+        <translation>Контроллер (SAS)</translation>
     </message>
 </context>
 <context>
@@ -2309,7 +2309,7 @@
     </message>
     <message>
         <source>Retrieving data ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Получение данных ...</translation>
     </message>
 </context>
 <context>
@@ -3018,7 +3018,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Groups</source>
         <comment>details (general)</comment>
-        <translation>Состоит в группах</translation>
+        <translation>Группы</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -3083,7 +3083,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Controller</source>
         <comment>details (audio)</comment>
-        <translation>Аудио-контроллер</translation>
+        <translation>Аудиоконтроллер</translation>
     </message>
     <message>
         <source>Disabled</source>
@@ -3168,7 +3168,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Operating System</source>
         <comment>details (general)</comment>
-        <translation>Операционная система</translation>
+        <translation>ОС</translation>
     </message>
     <message>
         <source>Information Inaccessible</source>
@@ -3208,12 +3208,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Remote Desktop Server Port</source>
         <comment>details (display/vrde)</comment>
-        <translation>Порт сервера удалённого дисплея</translation>
+        <translation>Порт сервера удалённого доступа</translation>
     </message>
     <message>
         <source>Remote Desktop Server</source>
         <comment>details (display/vrde)</comment>
-        <translation>Сервер удалённого дисплея</translation>
+        <translation>Сервер удалённого доступа</translation>
     </message>
     <message>
         <source>Not Attached</source>
@@ -3223,7 +3223,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Host Driver</source>
         <comment>details (audio)</comment>
-        <translation>Аудиодрайвер</translation>
+        <translation>Аудио драйвер</translation>
     </message>
     <message>
         <source>Bridged Adapter, %1</source>
@@ -3246,9 +3246,9 @@ p, li { white-space: pre-wrap; }
         <translation>Универсальный драйвер, '%1'</translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>Универсальный драйвер, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation>Универсальный драйвер, '%1' { %2 }</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -3297,97 +3297,97 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Minimal Paravirtualization</source>
         <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Минимальная паравиртуализация</translation>
     </message>
     <message>
         <source>Hyper-V Paravirtualization</source>
         <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Паравиртуализация Hyper-V</translation>
     </message>
     <message>
         <source>KVM Paravirtualization</source>
         <comment>details (system)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Паравиртуализация KVM</translation>
     </message>
     <message>
         <source>[Optical Drive]</source>
         <comment>details (storage)</comment>
-        <translation type="unfinished"></translation>
+        <translation>[Оптический привод]</translation>
     </message>
     <message>
         <source>USB Controller</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished">USB-контроллер</translation>
+        <translation>USB-контроллер</translation>
     </message>
     <message>
         <source>Mini-toolbar Position</source>
         <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Мини-тулбар</translation>
     </message>
     <message>
         <source>Top</source>
         <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
+        <translation>В верхней части экрана</translation>
     </message>
     <message>
         <source>Bottom</source>
         <comment>details (user interface/mini-toolbar position)</comment>
-        <translation type="unfinished"></translation>
+        <translation>В нижней части экрана</translation>
     </message>
     <message>
         <source>Mini-toolbar</source>
         <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Мини-тулбар</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (user interface/mini-toolbar)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Выключен</translation>
     </message>
     <message>
         <source>Scale-factor</source>
         <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Коэффициент масштабирования</translation>
     </message>
     <message>
         <source>Unscaled HiDPI Video Output</source>
         <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Прямой вывод HiDPI-контента</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details (display/Unscaled HiDPI Video Output)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Включен</translation>
     </message>
     <message>
         <source>Menu-bar</source>
         <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Строка меню</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Включена</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Выключена</translation>
     </message>
     <message>
         <source>Status-bar</source>
         <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Строка состояния</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Включена</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Выключена</translation>
     </message>
 </context>
 <context>
@@ -3621,23 +3621,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Machine Windows:</source>
-        <translation type="unfinished"></translation>
+        <translation>Окна машины:</translation>
     </message>
     <message>
         <source>&Raise Window Under Mouse</source>
-        <translation type="unfinished"></translation>
+        <translation>&Активировать при наведении мыши</translation>
     </message>
     <message>
         <source>Holds the maximum width which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет максимальный горизонтальный размер экрана гостевой операционной системы (в пикселях).</translation>
     </message>
     <message>
         <source>Holds the maximum height which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет максимальный вертикальный размер экрана гостевой операционной системы (в пикселях).</translation>
     </message>
     <message>
         <source>When checked, machine windows will be raised when the mouse pointer moves over them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, окно машины будет автоматически активироваться при наведении мыши.</translation>
     </message>
 </context>
 <context>
@@ -3648,7 +3648,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all installed packages.</source>
-        <translation>Список всех установленных плагинов.</translation>
+        <translation>Содержит список всех установленных плагинов.</translation>
     </message>
     <message>
         <source>Active</source>
@@ -3688,30 +3688,30 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить плагин</translation>
     </message>
     <message>
         <source>Remove Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить плагин</translation>
     </message>
     <message>
         <source>Adds new package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавляет новый плагин.</translation>
     </message>
     <message>
         <source>Removes selected package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удаляет выбранный плагин.</translation>
     </message>
 </context>
 <context>
     <name>UIGlobalSettingsGeneral</name>
     <message>
         <source>Holds the path to the default virtual machine folder. This folder is used, if not explicitly specified otherwise, when creating new virtual machines.</source>
-        <translation>Показывает путь к папке по умолчанию для виртуальных машин. Эта папка используется (если другая папка не указана явным образом) при создании новых виртуальных машин.</translation>
+        <translation>Определяет путь к папке по умолчанию для виртуальных машин. Эта папка используется (если другая папка не указана явным образом) при создании новых виртуальных машин.</translation>
     </message>
     <message>
         <source>Holds the path to the library that provides authentication for Remote Display (VRDP) clients.</source>
-        <translation>Показывает путь к библиотеке, обеспечивающей аутентификацию клиентов удаленного дисплея (VRDP).</translation>
+        <translation>Определяет путь к библиотеке, обеспечивающей аутентификацию клиентов удалённого дисплея (VRDP).</translation>
     </message>
     <message>
         <source>Default &Hard Disk Folder:</source>
@@ -3719,7 +3719,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Default &Machine Folder:</source>
-        <translation>Папка для &машин:</translation>
+        <translation>Папка для &машин по умолчанию:</translation>
     </message>
     <message>
         <source>V&RDP Authentication Library:</source>
@@ -3775,7 +3775,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
-        <translation>Когда стоит галочка, скринсейвер хоста будет отключен во время работы машины.</translation>
+        <translation>Если галочка стоит, скринсейвер хоста будет отключен во время работы машины.</translation>
     </message>
     <message>
         <source>Disable When Running Virtual Machines</source>
@@ -3783,11 +3783,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Host Screensaver:</source>
-        <translation type="unfinished"></translation>
+        <translation>Скринсейвер хоста:</translation>
     </message>
     <message>
         <source>&Disable When Running Virtual Machines</source>
-        <translation type="unfinished"></translation>
+        <translation>&Отключать во время работы машины</translation>
     </message>
 </context>
 <context>
@@ -3810,7 +3810,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the keyboard is automatically captured every time the VM window is activated. When the keyboard is captured, all keystrokes (including system ones like Alt-Tab) are directed to the VM.</source>
-        <translation>Когда стоит галочка, происходит автоматический захват клавиатуры при каждом переключении в окно ВМ. Когда клавиатура захвачена, все нажатия клавиш (включая системные, такие как Alt-Tab), направляются в ВМ.</translation>
+        <translation>Если галочка стоит, при каждой активации окна ВМ будет происходить автоматический захват клавиатуры. Когда клавиатура захвачена, все нажатия клавиш (включая системные, такие как Alt-Tab), направляются в ВМ.</translation>
     </message>
     <message>
         <source>&Auto Capture Keyboard</source>
@@ -3834,7 +3834,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&VirtualBox Manager</source>
-        <translation>VirtualBox &менеджер</translation>
+        <translation>VirtualBox &Менеджер</translation>
     </message>
     <message>
         <source>Virtual &Machine</source>
@@ -3850,11 +3850,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Содержит список всех настраиваемых сочетаний клавиш.</translation>
     </message>
     <message>
         <source>Holds a sequence to filter the shortcut list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет фильтровать список настраиваемых сочетаний клавиш.</translation>
     </message>
 </context>
 <context>
@@ -3889,7 +3889,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all available user interface languages. The effective language is written in <b>bold</b>. Select <i>Default</i> to reset to the system default language.</source>
-        <translation>Перечисляет все доступные языки интерфейса. Активный в настоящий момент язык выделен <b>жирным</b>. Выберите <i>По умолчанию</i> для активации языка, используемого в системе по умолчанию.</translation>
+        <translation>Содержит список всех доступных языков интерфейса. Активный в настоящий момент язык выделен <b>жирным</b>. Выберите <i>По умолчанию</i> для активации языка, используемого в системе по умолчанию.</translation>
     </message>
     <message>
         <source>Name</source>
@@ -4054,7 +4054,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all available host-only networks.</source>
-        <translation>Список всех доступных виртуальных сетей хоста.</translation>
+        <translation>Содержит список всех доступных виртуальных сетей хоста.</translation>
     </message>
     <message>
         <source>Name</source>
@@ -4074,7 +4074,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all available NAT networks.</source>
-        <translation>Показывает список всех доступных сетей NAT.</translation>
+        <translation>Содержит список всех доступных сетей NAT.</translation>
     </message>
     <message>
         <source>&Host-only Networks</source>
@@ -4142,7 +4142,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Default IPv6 route</source>
-        <translation>Роутинг IPv6 по-умолчанию</translation>
+        <translation>Роутинг IPv6 по умолчанию</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 address.</source>
@@ -4195,51 +4195,51 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить NAT сеть</translation>
     </message>
     <message>
         <source>Remove NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить NAT сеть</translation>
     </message>
     <message>
         <source>Edit NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Изменить NAT сеть</translation>
     </message>
     <message>
         <source>Adds new NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавляет новую NAT сеть.</translation>
     </message>
     <message>
         <source>Removes selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удаляет выбранную NAT сеть.</translation>
     </message>
     <message>
         <source>Edits selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Изменяет выбранную NAT сеть.</translation>
     </message>
     <message>
         <source>Add Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить виртуальную сеть хоста</translation>
     </message>
     <message>
         <source>Remove Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить виртуальную сеть хоста</translation>
     </message>
     <message>
         <source>Edit Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Изменить виртуальную сеть хоста</translation>
     </message>
     <message>
         <source>Adds new host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавляет новую виртуальную сеть хоста.</translation>
     </message>
     <message>
         <source>Removes selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удаляет выбранную виртуальную сеть хоста.</translation>
     </message>
     <message>
         <source>Edits selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Изменяет выбранную виртуальную сеть хоста.</translation>
     </message>
 </context>
 <context>
@@ -4361,7 +4361,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the host IPv4 address for this adapter.</source>
-        <translation>Отображает IPv4 адрес адаптера хоста данной виртуальной сети.</translation>
+        <translation>Определяет IPv4 адрес адаптера хоста данной виртуальной сети.</translation>
     </message>
     <message>
         <source>IPv4 Network &Mask:</source>
@@ -4369,7 +4369,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the host IPv4 network mask for this adapter.</source>
-        <translation>Отображает IPv4 маску адаптера хоста данной виртуальной сети.</translation>
+        <translation>Определяет IPv4 маску адаптера хоста данной виртуальной сети.</translation>
     </message>
     <message>
         <source>I&Pv6 Address:</source>
@@ -4377,7 +4377,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation>Отображает IPv6 адрес адаптера хоста данной виртуальной сети, если IPv6 поддерживается.</translation>
+        <translation>Определяет IPv6 адрес адаптера хоста данной виртуальной сети, если IPv6 поддерживается.</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &Length:</source>
@@ -4385,7 +4385,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation>Отображает длину IPv6 маски адаптера хоста данной виртуальной сети, если IPv6 поддерживается.</translation>
+        <translation>Определяет длину IPv6 маски адаптера хоста данной виртуальной сети, если IPv6 поддерживается.</translation>
     </message>
     <message>
         <source>&DHCP Server</source>
@@ -4405,7 +4405,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation>Отображает адрес DHCP сервера, обслуживающего виртуальную сеть хоста, связанную с данным сетевым адаптером.</translation>
+        <translation>Определяет адрес DHCP сервера, обслуживающего виртуальную сеть хоста, связанную с данным сетевым адаптером.</translation>
     </message>
     <message>
         <source>Server &Mask:</source>
@@ -4413,7 +4413,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation>Отображает маску сети DHCP сервера, обслуживающего виртуальную сеть хоста, связанную с данным сетевым адаптером.</translation>
+        <translation>Определяет маску сети DHCP сервера, обслуживающего виртуальную сеть хоста, связанную с данным сетевым адаптером.</translation>
     </message>
     <message>
         <source>&Lower Address Bound:</source>
@@ -4421,7 +4421,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation>Отображает нижнюю границу, предоставляемую DHCP сервером, обслуживающим виртуальную сеть хоста, связанную с данным сетевым адаптером.</translation>
+        <translation>Определяет нижнюю границу, предоставляемую DHCP сервером, обслуживающим виртуальную сеть хоста, связанную с данным сетевым адаптером.</translation>
     </message>
     <message>
         <source>&Upper Address Bound:</source>
@@ -4429,15 +4429,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation>Отображает верхнюю границу, предоставляемую DHCP сервером, обслуживающим виртуальную сеть хоста, связанную с данным сетевым адаптером.</translation>
+        <translation>Определяет верхнюю границу, предоставляемую DHCP сервером, обслуживающим виртуальную сеть хоста, связанную с данным сетевым адаптером.</translation>
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, виртуальный адаптер сети хоста можно будет настроить вручную.</translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
-        <translation type="unfinished"></translation>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
+        <translation>Если галочка стоит, для виртуальной сети хоста при старте машины запускается свой DHCP сервер.</translation>
     </message>
 </context>
 <context>
@@ -4492,7 +4492,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Advertise Default IPv6 &Route</source>
-        <translation>&Объявить маршрутом IPv6 по-умолчанию</translation>
+        <translation>&Объявить маршрутом IPv6 по умолчанию</translation>
     </message>
     <message>
         <source>Determines whether this network should be advertised as the default IPv6 route.</source>
@@ -4508,23 +4508,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, данная сеть будет доступна.</translation>
     </message>
     <message>
         <source>When checked, this network will support DHCP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, данная сеть будет поддерживать DHCP.</translation>
     </message>
     <message>
         <source>When checked, this network will support IPv6.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, данная сеть будет поддерживать IPv6.</translation>
     </message>
     <message>
         <source>When checked, this network will be advertised as the default IPv6 route.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, данная сеть будет являться маршрутом IPv6 по умолчанию.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Открывает диалог настройки правил проброса портов.</translation>
     </message>
 </context>
 <context>
@@ -4546,7 +4546,7 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsProxy</name>
     <message>
         <source>When checked, VirtualBox will use the proxy settings supplied for tasks like downloading Guest Additions from the network or checking for updates.</source>
-        <translation>Если стоит галочка, VirtualBox будет использовать данные настройки для работы с прокси-сервером в целях загрузки гостевых дополнений и проверки обновлений.</translation>
+        <translation>Если галочка стоит, VirtualBox будет использовать данные настройки для работы с прокси-сервером в целях загрузки гостевых дополнений и проверки обновлений.</translation>
     </message>
     <message>
         <source>&Enable Proxy</source>
@@ -4602,18 +4602,18 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the proxy host.</source>
-        <translation type="unfinished"></translation>
+        <translation>Опредеяет адрес прокси-сервера.</translation>
     </message>
     <message>
         <source>Holds the proxy port.</source>
-        <translation type="unfinished"></translation>
+        <translation>Опредеяет порт прокси-сервера.</translation>
     </message>
 </context>
 <context>
     <name>UIGlobalSettingsUpdate</name>
     <message>
         <source>When checked, the application will periodically connect to the VirtualBox website and check whether a new VirtualBox version is available.</source>
-        <translation>Если стоит галочка, программа будет периодически подключаться к веб-сайту VirtualBox и проверять наличие новой версии.</translation>
+        <translation>Если галочка стоит, программа будет периодически подключаться к веб-сайту VirtualBox и проверять наличие новой версии.</translation>
     </message>
     <message>
         <source>&Check for Updates</source>
@@ -4637,7 +4637,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Choose this if you only wish to be notified about stable updates to VirtualBox.</p></source>
-        <translation><p>Выберете этот пункт, если хотите быть информированы лишь о стабильных релизных версиях VirtualBox.</p></translation>
+        <translation><p>Если выбран данный пункт, Вы будете информированы лишь о стабильных релизных версиях VirtualBox.</p></translation>
     </message>
     <message>
         <source>&Stable Release Versions</source>
@@ -4645,7 +4645,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Choose this if you wish to be notified about all new VirtualBox releases.</p></source>
-        <translation><p>Выберете этот пункт, если хотите быть информированы о всех релизных версиях VirtualBox.</p></translation>
+        <translation><p>Если выбран данный пункт, Вы будете информированы о всех релизных версиях VirtualBox.</p></translation>
     </message>
     <message>
         <source>&All New Releases</source>
@@ -4653,7 +4653,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Choose this to be notified about all new VirtualBox releases and pre-release versions of VirtualBox.</p></source>
-        <translation><p>Выберете этот пункт, если хотите быть информированы о всех релизных и тестовых версиях VirtualBox.</p></translation>
+        <translation><p>Если выбран данный пункт, Вы будете информированы о всех релизных и тестовых версиях VirtualBox.</p></translation>
     </message>
     <message>
         <source>All New Releases and &Pre-Releases</source>
@@ -4661,7 +4661,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет выбрать, как часто нужно производить проверку наличия новой версии. Если Вы хотите полностью отключить такую проверку, просто уберите расположенную выше галочку.</translation>
     </message>
 </context>
 <context>
@@ -4906,7 +4906,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Reset shortcut to default</source>
-        <translation>Сбросить сочетание клавиш на значение по-умолчанию</translation>
+        <translation>Сбросить сочетание клавиш на значение по умолчанию</translation>
     </message>
     <message>
         <source>Unset shortcut</source>
@@ -5076,7 +5076,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the network interfaces:</nobr>%1</p></source>
         <comment>Network adapters tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>Отображает активность сетевых адаптеров:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Отражает активность сетевых адаптеров:</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr></source>
@@ -5101,7 +5101,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the attached USB devices:</nobr>%1</p></source>
         <comment>USB device tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>Отображает активность подсоединенных USB устройств:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Отражает активность подсоединенных USB устройств:</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>No USB devices attached</b></nobr></source>
@@ -5116,7 +5116,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the machine's shared folders:</nobr>%1</p></source>
         <comment>Shared folders tooltip</comment>
-        <translation><p style='white-space:pre'><nobr>Отображает активность общих папок машины:</nobr>%1</p></translation>
+        <translation><p style='white-space:pre'><nobr>Отражает активность общих папок машины:</nobr>%1</p></translation>
     </message>
     <message>
         <source><br><nobr><b>No shared folders</b></nobr></source>
@@ -5143,7 +5143,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_ [...]
-        <translation>Показывает, захвачен ли указатель мыши основного ПК в гостевой ОС:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;указатель не захвачен</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;указатель захвачен</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;интеграция мыши (ИМ) включена</nobr><br><nobr><img src=:/mouse_can_seamless_ [...]
+        <translation>Отражает, захвачен ли указатель мыши хоста в гостевой ОС:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;указатель не захвачен</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;указатель захвачен</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;интеграция мыши (ИМ) включена</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/ [...]
     </message>
     <message>
         <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source>
@@ -5164,7 +5164,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
-        <translation><nobr>Показывает активность захвата видео:</nobr><br>%1</translation>
+        <translation><nobr>Отражает активность функции захвата видео:</nobr><br>%1</translation>
     </message>
     <message>
         <source><nobr><b>Video capture disabled</b></nobr></source>
@@ -5181,26 +5181,26 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Отражает активность дисплея:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the optical drives:</nobr>%1</p></source>
         <comment>CD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Отражает активность приводов оптических дисков:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the floppy drives:</nobr>%1</p></source>
         <comment>FD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Отражает активность приводов гибких дисков:</nobr>%1</p></translation>
     </message>
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
         <comment>HDD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Отражает активность жёстких дисков:</nobr>%1</p></translation>
     </message>
     <message>
         <source>Indicates whether the host keyboard is captured by the guest OS:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;keyboard is not captured</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;keyboard is captured</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation>Отражает, захвачена ли клавиатура хоста в гостевой ОС:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;клавиатура не захвачена</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;клавиатура захвачена</nobr></translation>
     </message>
 </context>
 <context>
@@ -5285,7 +5285,7 @@ p, li { white-space: pre-wrap; }
     <name>UIMachineSettingsAudio</name>
     <message>
         <source>When checked, a virtual PCI audio card will be plugged into the virtual machine and will communicate with the host audio system using the specified driver.</source>
-        <translation>Когда стоит галочка, к виртуальной машине подключается виртуальная звуковая PCI-карта, которая использует указанный аудиодрайвер для связи со звуковой картой основного компьютера.</translation>
+        <translation>Если галочка стоит, к виртуальной машине будет подключена виртуальная звуковая PCI-карта, использующая указанный аудио драйвер для связи со звуковой картой хоста.</translation>
     </message>
     <message>
         <source>Enable &Audio</source>
@@ -5293,7 +5293,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Host Audio &Driver:</source>
-        <translation>А&удиодрайвер:</translation>
+        <translation>А&удио драйвер:</translation>
     </message>
     <message>
         <source>Controls the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
@@ -5301,15 +5301,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Audio &Controller:</source>
-        <translation>Ау&дио-контроллер:</translation>
+        <translation>Ау&диоконтроллер:</translation>
     </message>
     <message>
         <source>Selects the type of the virtual sound card. Depending on this value, VirtualBox will provide different audio hardware to the virtual machine.</source>
-        <translation>Задает тип виртуальной звуковой карты. В зависимости от выбранного значения, VirtualBox обеспечит виртуальную машину соответствующим звуковым устройством.</translation>
+        <translation>Позволяет выбрать тип виртуальной звуковой карты. В зависимости от выбранного значения, VirtualBox обеспечит виртуальную машину соответствующим звуковым устройством.</translation>
     </message>
     <message>
         <source>Selects the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет выбрать драйвер хоста, используемый для вывода звука. Пункт <b>Пустой аудио драйвер</b> позволяет гостевой ОС обнаружить звуковую карту, однако любой доступ к ней будет проигнорирован.</translation>
     </message>
 </context>
 <context>
@@ -5328,11 +5328,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Video &Memory:</source>
-        <translation>Видео &память:</translation>
+        <translation>&Видеопамять:</translation>
     </message>
     <message>
         <source>Controls the amount of video memory provided to the virtual machine.</source>
-        <translation>Регулирует количество видеопамяти, доступной для виртуальной машины.</translation>
+        <translation>Задаёт количество видеопамяти, доступной виртуальной машине.</translation>
     </message>
     <message>
         <source>MB</source>
@@ -5344,23 +5344,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the virtual machine will be given access to the 3D graphics capabilities available on the host.</source>
-        <translation>Если стоит галочка, виртуальная машина получит доступ к возможностям 3D-графики, имеющимся на основном ПК.</translation>
+        <translation>Если галочка стоит, виртуальная машина получит доступ к возможностям ускорения 3D-графики, имеющимся на хосте.</translation>
     </message>
     <message>
         <source>Enable &3D Acceleration</source>
-        <translation>В&ключить 3D-ускорение</translation>
+        <translation>Включить &3D-ускорение</translation>
     </message>
     <message>
         <source>&Remote Display</source>
-        <translation>&Удаленный дисплей</translation>
+        <translation>&Удаленный доступ</translation>
     </message>
     <message>
         <source>When checked, the VM will act as a Remote Desktop Protocol (RDP) server, allowing remote clients to connect and operate the VM (when it is running) using a standard RDP client.</source>
-        <translation>Если стоит галочка, то виртуальная машина будет работать как сервер удаленного рабочего стола (RDP), позволяя удаленным клиентам соединяться и использовать ВМ (когда она работает) с помощью стандартного RDP-клиента.</translation>
+        <translation>Если галочка стоит, виртуальная машина будет работать как сервер удалённого доступа (RDP), позволяя удаленным клиентам соединяться и использовать ВМ (когда она работает) с помощью стандартного RDP-клиента.</translation>
     </message>
     <message>
         <source>&Enable Server</source>
-        <translation>В&ключить сервер</translation>
+        <translation>&Включить сервер удалённого доступа</translation>
     </message>
     <message>
         <source>Server &Port:</source>
@@ -5392,7 +5392,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the virtual machine will be given access to the Video Acceleration capabilities available on the host.</source>
-        <translation>Если стоит галочка, виртуальной машине будет предоставлен доступ к средствам ускорения видео, имеющимся на основном ПК.</translation>
+        <translation>Если галочка стоит, виртуальная машина получит доступ к возможностям ускорения видео, имеющимся на хосте.</translation>
     </message>
     <message>
         <source>Enable &2D Video Acceleration</source>
@@ -5408,7 +5408,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Controls the amount of virtual monitors provided to the virtual machine.</source>
-        <translation>Задаёт количество виртуальных мониторов, подключенных к данной виртуальной машине.</translation>
+        <translation>Задаёт количество виртуальных мониторов, подключенных к виртуальной машине.</translation>
     </message>
     <message>
         <source><qt>%1</qt></source>
@@ -5420,7 +5420,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Allow Multiple Connections</source>
-        <translation>&Разрешать несколько подключений</translation>
+        <translation>М&ногопользовательский удалённый доступ</translation>
     </message>
     <message>
         <source>You have 3D Acceleration enabled for a operation system which uses the WDDM video driver. For maximal performance set the guest VRAM to at least <b>%1</b>.</source>
@@ -5444,7 +5444,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, VirtualBox will record the virtual machine session as a video file.</source>
-        <translation>Если стоит галочка, VirtualBox будет записывать сессию виртуальной машины в видео файл.</translation>
+        <translation>Если галочка стоит, VirtualBox будет записывать сессию виртуальной машины в видео файл.</translation>
     </message>
     <message>
         <source>&Enable Video Capture</source>
@@ -5500,7 +5500,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The virtual machine is set up to use hardware graphics acceleration. However the host system does not currently provide this, so you will not be able to start the machine.</source>
-        <translation>Виртуальная машина настроена на использование средств аппаратного ускорения. Однако эти средства в данный момент недоступны, поэтому машина не может быть запущена.</translation>
+        <translation>Виртуальная машина настроена на использование средств аппаратного ускорения, однако эти средства в данный момент недоступны, и машина не сможет быть запущена.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to fullscreen or seamless mode.</source>
@@ -5520,11 +5520,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The VRDE server port value is not currently specified.</source>
-        <translation>Не задан порт сервера удаленного рабочего стола.</translation>
+        <translation>Не задан порт сервера удалённого доступа.</translation>
     </message>
     <message>
         <source>The VRDE authentication timeout value is not currently specified.</source>
-        <translation>Не задано максимальное время ожидания авторизации подключения к серверу удаленного рабочего стола.</translation>
+        <translation>Не задано максимальное время ожидания авторизации подключения к серверу удалённого доступа.</translation>
     </message>
     <message>
         <source>User Defined</source>
@@ -5587,27 +5587,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
+        <translation><i>Около %1МБ за 5 минут видео</i></translation>
     </message>
     <message>
         <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Эта виртуальная машина настроена на работу в качестве сервера удалённого доступа, для чего требуется установить <b>%1</b>. Если необходимо, установите данный плагин, предварительно скачав его с сайта VirtualBox, в противном случае сервер удалённого доступа при запуске машины будет недоступен.</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Виртуальная машина настроена на использование аппаратного ускорения, а операционной системой является Windows Vista или более новая версия. Для достижения наилучшей производительности следует выделить под видеопамять машины как минимум <b>%1</b>.</translation>
     </message>
     <message>
         <source>&Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>&Экран</translation>
     </message>
     <message>
         <source>Scale Factor:</source>
-        <translation type="unfinished"></translation>
+        <translation>Коэффициент масштабирования:</translation>
     </message>
     <message>
         <source>Controls the guest screen scale factor.</source>
-        <translation type="unfinished"></translation>
+        <translation>Задаёт коэффициент масштабирования экрана гостевой ОС.</translation>
     </message>
     <message>
         <source>100%</source>
@@ -5619,83 +5619,83 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>When checked, guest screen contents will not be scaled up to compensate for high host screen resolutions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, содержимое экрана гостя быдет выводиться в неизменном виде без масштабирования под высокое разрешение экрана хоста.</translation>
     </message>
     <message>
         <source>Use &Unscaled HiDPI Output</source>
-        <translation type="unfinished"></translation>
+        <translation>&Прямой вывод HiDPI-контента</translation>
     </message>
     <message>
         <source>Acceleration:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ускорение:</translation>
     </message>
     <message>
         <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
+        <translation>Поддержка HiDPI:</translation>
     </message>
     <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет номер порта сервера удалённого доступа. Вы можете указать <tt>0</tt> (ноль) для сброса номера порта к значению по умолчанию.</translation>
     </message>
     <message>
         <source>Selects the VRDP authentication method.</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет выбрать способ авторизации сервера удалённого доступа.</translation>
     </message>
     <message>
         <source>Holds the timeout for guest authentication, in milliseconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет максимальное время ожидания авторизации сервера удалённого доступа в миллисекундах.</translation>
     </message>
     <message>
         <source>When checked, multiple simultaneous connections to the VM are permitted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, к серверу удалённого доступа будут разрешены несколько одновременных подключений.</translation>
     </message>
     <message>
         <source>Holds the filename VirtualBox uses to save the recorded content.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет имя файла хранения записанного видео контента.</translation>
     </message>
     <message>
         <source>Selects the resolution (frame size) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет выбрать размер кадра (разрешение) записанного видео контента.</translation>
     </message>
     <message>
         <source>Holds the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет <b>горизонтальное</b> разрешение (длину кадра) записанного видео контента.</translation>
     </message>
     <message>
         <source>Holds the <b>vertical</b> resolution (frame height) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет <b>вертикальное</b> разрешение (ширину кадра) записанного видео контента.</translation>
     </message>
     <message>
         <source>Controls the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Задаёт максимальное число <b>кадров в секунду</b>. Лишние кадры будут пропущены. Уменьшение значения данного параметра приведёт к увеличению числа пропущенных кадров и уменьшению размера видео файла.</translation>
     </message>
     <message>
         <source>Controls the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Задаёт <b>качество</b> видео. Увеличение данного параметра в общем случае приведёт к улучшению качества видео и увеличению размера видео файла.</translation>
     </message>
     <message>
         <source>Holds the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет битрейт видео в <b>килобитах в секунду</b>. Увеличение данного параметра в общем случае приведёт к улучшению качества видео и увеличению размера видео файла.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>Под видеопамять виртуальной машины выделено менее <b>%1</b>. Данное значение является минимальным количеством, необходимым для переключения машины в режим полного экрана или интеграции дисплея.</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 МБ</translation>
+        <translation>%1 МБ</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation></translation>
     </message>
     <message>
         <source>When checked, enables video recording for screen %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, будет производиться захват видео для экрана №%1.</translation>
     </message>
 </context>
 <context>
@@ -5822,7 +5822,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects which clipboard data will be copied between the guest and the host OS. This feature requires Guest Additions to be installed in the guest OS.</source>
-        <translation>Задает режим работы буфера обмена между гостевой и основной ОС. Заметьте, что использование этой функции требует установки пакета дополнений гостевой ОС.</translation>
+        <translation>Позволяет выбрать режим работы буфера обмена между гостевой и основной ОС. Использование этой функции требует установки пакета дополнений гостевой ОС.</translation>
     </message>
     <message>
         <source>Defines the type of the virtual IDE controller. Depending on this value, VirtualBox will provide different virtual IDE hardware devices to the guest OS.</source>
@@ -5842,7 +5842,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
-        <translation>Показывает описание виртуальной машины. Поле описания удобно использовать для занесения заметок о настройках установленной гостевой ОС.</translation>
+        <translation>Определяет описание виртуальной машины. Поле описания удобно использовать для занесения заметок о настройках установленной гостевой ОС.</translation>
     </message>
     <message>
         <source>&Other</source>
@@ -5934,11 +5934,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>D&rag'n'Drop:</source>
-        <translation>&Drag'n'Drop:</translation>
+        <translation>&Функция &Drag'n'Drop:</translation>
     </message>
     <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
-        <translation>Задает режим работы Drag'n'Drop-функции обмена между гостевой и основной ОС. Заметьте, что использование этой функции требует установки пакета дополнений гостевой ОС.</translation>
+        <translation>Позволяет выбрать режим работы функции Drag'n'Drop между гостевой и основной ОС. Использование этой функции требует установки пакета дополнений гостевой ОС.</translation>
     </message>
     <message>
         <source>No name specified for the virtual machine.</source>
@@ -5950,71 +5950,71 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Enc&ryption</source>
-        <translation type="unfinished"></translation>
+        <translation>&Шифрование</translation>
     </message>
     <message>
         <source>When checked, enables encryption for this virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, эта виртуальная машина будет зашифрована.</translation>
     </message>
     <message>
         <source>En&able Encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>&Включить шифрование</translation>
     </message>
     <message>
         <source>Encryption C&ipher:</source>
-        <translation type="unfinished"></translation>
+        <translation>А&лгоритм шифирования:</translation>
     </message>
     <message>
         <source>E&nter New Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Вв&едите новый пароль:</translation>
     </message>
     <message>
         <source>Holds the password to be assigned to the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет пароль, который будет назначен зашифрованным дискам виртуальной машины.</translation>
     </message>
     <message>
         <source>C&onfirm New Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>П&одтвердите новый пароль:</translation>
     </message>
     <message>
         <source>Confirms the password to be assigned to the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Подтверждает пароль, который будет назначен зашифрованным дискам виртуальной машины.</translation>
     </message>
     <message>
         <source>You are trying to encrypt this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site.</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы включили шифрование этой виртуальной машины, для чего требуется установить <b>%1</b>. Если необходимо, установите данный плагин, предварительно скачав его с сайта VirtualBox.</translation>
     </message>
     <message>
         <source>Encryption cipher type not specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Алгоритм шифрования не выбран.</translation>
     </message>
     <message>
         <source>Encryption password empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Пароль шифрования не задан.</translation>
     </message>
     <message>
         <source>Encryption passwords do not match.</source>
-        <translation type="unfinished"></translation>
+        <translation>Пароли шифрования не совпадают.</translation>
     </message>
     <message>
         <source>Leave Unchanged</source>
         <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
+        <translation>Не менять</translation>
     </message>
     <message>
         <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет выбрать алгоритм, который будет использоваться для шифрования дисков виртуальной машины.</translation>
     </message>
     <message>
         <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет путь к папке хранения снимков этой виртуальной машины. Имейте ввиду, что снимки могут занимать достаточно много места на жёстком диске.</translation>
     </message>
 </context>
 <context>
     <name>UIMachineSettingsInterface</name>
     <message>
         <source>Allows to modify VM menu-bar contents.</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет настроить содержимое строки меню.</translation>
     </message>
     <message>
         <source>100%</source>
@@ -6026,7 +6026,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Mini ToolBar:</source>
-        <translation type="unfinished">Мини тулбар:</translation>
+        <translation>Мини-тулбар:</translation>
     </message>
     <message>
         <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
@@ -6042,23 +6042,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Show at &Top of Screen</source>
-        <translation type="unfinished">&Расположить сверху экрана</translation>
+        <translation>&В верхней части экрана</translation>
     </message>
     <message>
         <source>Allows to modify VM status-bar contents.</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет настроить содержимое строки состояния.</translation>
     </message>
     <message>
         <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, в полноэкранных режимах машины будет использоваться мини-тулбар.</translation>
     </message>
     <message>
         <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
+        <translation>&Использовать в полноэкранных режимах</translation>
     </message>
     <message>
         <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, мини-тулбар будет расположен в верхней части экрана, в отличие от своей позиции по умолчанию - в нижней части экрана.</translation>
     </message>
 </context>
 <context>
@@ -6073,7 +6073,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, plugs this virtual network adapter into the virtual machine.</source>
-        <translation>Если стоит галочка, то этот виртуальный сетевой адаптер будет подключен к виртуальной машине.</translation>
+        <translation>Если галочка стоит, этот виртуальный сетевой адаптер будет подключен к виртуальной машине.</translation>
     </message>
     <message>
         <source>&Enable Network Adapter</source>
@@ -6085,7 +6085,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the type of the virtual network adapter. Depending on this value, VirtualBox will provide different network hardware to the virtual machine.</source>
-        <translation>Задает тип виртуального сетевого адаптера. В зависимости от выбранного значения, VirtualBox обеспечит виртуальную машину соответствующим сетевым устройством.</translation>
+        <translation>Позволяет выбрать тип виртуального сетевого адаптера. В зависимости от выбранного значения, VirtualBox обеспечит виртуальную машину соответствующим сетевым устройством.</translation>
     </message>
     <message>
         <source>&Attached to:</source>
@@ -6257,7 +6257,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Cable Connected</source>
-        <translation>&Кабель подключен</translation>
+        <translation>&Подключить кабель</translation>
     </message>
     <message>
         <source>Opens a window to manage port forwarding rules.</source>
@@ -6273,7 +6273,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the promiscuous mode policy of the network adapter when attached to an internal network, host only network or a bridge.</source>
-        <translation>Задаёт политику "неразборчивого" режима данного виртуального сетевого адаптера, если он подключен к внутренней сети, виртуальному сетевому адаптеру хоста или сетевому мосту.</translation>
+        <translation>Позволяет выбрать политику "неразборчивого" режима данного виртуального сетевого адаптера, если он подключен к внутренней сети, виртуальному сетевому адаптеру хоста или сетевому мосту.</translation>
     </message>
     <message>
         <source>Generic Properties:</source>
@@ -6289,19 +6289,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the network adapter on the host system that traffic to and from this network card will go through.</source>
-        <translation>Задаёт сетевой адаптер хоста, через который пойдёт трафик данного виртуального сетевого адаптера.</translation>
+        <translation>Позволяет выбрать сетевой адаптер хоста, через который пойдёт трафик данного виртуального сетевого адаптера.</translation>
     </message>
     <message>
         <source>Holds the name of the internal network that this network card will be connected to. You can create a new internal network by choosing a name which is not used by any other network cards in this virtual machine or others.</source>
-        <translation>Задаёт имя внутренней сети, к которой будет подключен данный виртуальный сетевой адаптер. Вы можете создать новую внутреннюю сеть, выбрав имя, которое не используется иными виртуальными сетевыми адаптерами данной и других машин.</translation>
+        <translation>Определяет имя внутренней сети, к которой будет подключен данный виртуальный сетевой адаптер. Вы можете создать новую внутреннюю сеть, выбрав имя, которое не используется иными виртуальными сетевыми адаптерами этой и других машин.</translation>
     </message>
     <message>
         <source>Selects the virtual network adapter on the host system that traffic to and from this network card will go through. You can create and remove adapters using the global network settings in the virtual machine manager window.</source>
-        <translation>Задаёт виртуальный сетевой адаптер хоста, через который пойдёт трафик данного виртуального сетевого адаптера. Вы можете добавлять и удалять виртуальные сетевые адаптеры хоста на странице глобальных сетевых настроек VirtualBox.</translation>
+        <translation>Позволяет выбрать виртуальный сетевой адаптер хоста, через который пойдёт трафик данного виртуального сетевого адаптера. Вы можете добавлять и удалять виртуальные сетевые адаптеры хоста на странице глобальных сетевых настроек VirtualBox.</translation>
     </message>
     <message>
         <source>Selects the driver to be used with this network card.</source>
-        <translation>Задаёт имя универсального сетевого драйвера, который будет использоваться для данного виртуального сетевого адаптера.</translation>
+        <translation>Позволяет выбрать имя универсального сетевого драйвера, который будет использоваться для данного виртуального сетевого адаптера.</translation>
     </message>
     <message>
         <source>the MAC address must be 12 hexadecimal digits long.</source>
@@ -6341,27 +6341,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the name of the NAT network that this network card will be connected to. You can create and remove networks using the global network settings in the virtual machine manager window.</source>
-        <translation>Задаёт имя NAT сети, к которой будет подключен данный виртуальный сетевой адаптер. Вы можете создавать и удалять такие сети на странице глобальных сетевых настроек VirtualBox.</translation>
+        <translation>Определяет имя NAT сети, к которой будет подключен данный виртуальный сетевой адаптер. Вы можете создавать и удалять такие сети на странице глобальных сетевых настроек VirtualBox.</translation>
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет выбрать способ, которым этот виртуальный сетевой адаптер подсоединяется к реальной сети хоста.</translation>
     </message>
     <message>
         <source>Shows additional network adapter options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Показывает дополнительные опции сетевого адаптера.</translation>
     </message>
     <message>
         <source>Holds the configuration settings for the network attachment driver. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет параметры драйвера сетевого подключения. Параметры должны быть заданы в форме <b>имя=значение</b> и зависят от самого драйвера. Используйте <b>shift-enter</b> для перехода на новую строку.</translation>
     </message>
     <message>
         <source>When checked, the virtual network cable is plugged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, к этому виртуальному сетевому адаптеру будет подключен кабель.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Открывает диалог настройки правил проброса портов.</translation>
     </message>
 </context>
 <context>
@@ -6475,7 +6475,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, enables the given parallel port of the virtual machine.</source>
-        <translation>Когда стоит галочка, активизируется указанный параллельный порт виртуальной машины.</translation>
+        <translation>Если галочка стоит, в виртуальной машине будет активирован  этот параллельный порт.</translation>
     </message>
     <message>
         <source>&Enable Parallel Port</source>
@@ -6487,7 +6487,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the parallel port number. You can choose one of the standard parallel ports or select <b>User-defined</b> and specify port parameters manually.</source>
-        <translation>Задает номер параллельного порта. Вы можете выбрать один из стандартных номеров портов или выбрать <b>Пользовательский</b> и указать параметры порта вручную.</translation>
+        <translation>Определяет номер параллельного порта. Вы можете выбрать один из стандартных номеров портов или выбрать <b>Пользовательский</b> и указать параметры порта вручную.</translation>
     </message>
     <message>
         <source>&IRQ:</source>
@@ -6511,35 +6511,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the host parallel device name.</source>
-        <translation>Показывает имя устройства параллельного порта основного ПК.</translation>
+        <translation>Определяет имя устройства параллельного порта хоста.</translation>
     </message>
     <message>
         <source>Holds the IRQ number of this parallel port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> setting is enabled for this virtual machine.</source>
-        <translation>Показывает номер прерывания (IRQ) для этого параллельного порта. Допустимые значения -- целые числа в диапазоне от <tt>0</tt> до <tt>255</tt>. Значения больше <tt>15</tt> могут использоваться только в том случае, если для этой машины включен <b>I/O APIC</b>.</translation>
+        <translation>Определяет номер прерывания (IRQ) для этого параллельного порта. Допустимые значения -- целые числа в диапазоне от <tt>0</tt> до <tt>255</tt>. Значения больше <tt>15</tt> могут использоваться только в том случае, если для этой машины включен <b>I/O APIC</b>.</translation>
     </message>
     <message>
         <source>Holds the base I/O port address of this parallel port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source>
-        <translation>Показывает базовый адрес ввода-вывода для этого параллельного порта. Допустимые значения -- целые числа в диапазоне от <tt>0</tt> до <tt>0xFFFF</tt>.</translation>
+        <translation>Определяет адрес порта ввода/вывода для этого параллельного порта. Допустимые значения -- целые числа в диапазоне от <tt>0</tt> до <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">Не задано IRQ.</translation>
+        <translation>Не задано прерывание.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">Не задан I/O порт.</translation>
+        <translation>Не задан порт ввода/вывода.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">Как минимум два порта имеют идентичные настройки.</translation>
+        <translation>Как минимум два порта имеют идентичные настройки.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">Не задан путь к порту.</translation>
+        <translation>Не задан путь к порту.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Как минимум два порта имеют идентичные пути.</translation>
+        <translation>Как минимум два порта имеют идентичные пути.</translation>
     </message>
 </context>
 <context>
@@ -6652,7 +6652,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all shared folders accessible to this machine. Use 'net use x: \\vboxsvr\share' to access a shared folder named <i>share</i> from a DOS-like OS, or 'mount -t vboxsf share mount_point' to access it from a Linux OS. This feature requires Guest Additions.</source>
-        <translation>Перечисляет все общие папки, доступные этой машине. Используйте команду <tt>net use x: \\vboxsvr\share</tt> для доступа к общей папке с именем <i>share</i> в DOS-подобной ОС или <tt>mount -t vboxsf share mount_point</tt> для доступа из Линукс-подобной ОС. Требует установки Дополнений гостевой ОС.</translation>
+        <translation>Содержит список всех общих папок, доступных этой машине. Используйте команду <tt>net use x: \\vboxsvr\share</tt> для доступа к общей папке с именем <i>share</i> в DOS-подобной ОС или <tt>mount -t vboxsf share mount_point</tt> для доступа из Линукс-подобной ОС. Требует установки Дополнений гостевой ОС.</translation>
     </message>
     <message>
         <source>Name</source>
@@ -6684,7 +6684,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Folders List</source>
-        <translation>&Список общих папок</translation>
+        <translation>&Общие папки</translation>
     </message>
     <message>
         <source>Auto-mount</source>
@@ -6696,27 +6696,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить общую папку</translation>
     </message>
     <message>
         <source>Edit Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Изменить общую папку</translation>
     </message>
     <message>
         <source>Remove Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить общую папку</translation>
     </message>
     <message>
         <source>Adds new shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавляет новую общую папку.</translation>
     </message>
     <message>
         <source>Edits selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Изменяет выбранную общую папку.</translation>
     </message>
     <message>
         <source>Removes selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удаляет выбранную общую папку.</translation>
     </message>
 </context>
 <context>
@@ -6739,11 +6739,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the name of the shared folder (as it will be seen by the guest OS).</source>
-        <translation>Показывает имя общей папки (под этим именем папка будет видна в гостевой ОС).</translation>
+        <translation>Определяет имя общей папки (под этим именем папка будет видна в гостевой ОС).</translation>
     </message>
     <message>
         <source>When checked, the guest OS will not be able to write to the specified shared folder.</source>
-        <translation>Когда стоит галочка, гостевая ОС будет лишена права записи в указанную общую папку.</translation>
+        <translation>Если галочка стоит, гостевая ОС будет лишена права записи в эту общую папку.</translation>
     </message>
     <message>
         <source>&Read-only</source>
@@ -6755,7 +6755,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the guest OS will try to automatically mount the shared folder on startup.</source>
-        <translation>Если стоит галочка, гостевая ОС будет пытаться автоматически подключать указанную общую папку в процессе загрузки.</translation>
+        <translation>Если галочка стоит, гостевая ОС будет пытаться автоматически подключать эту общую папку в процессе загрузки.</translation>
     </message>
     <message>
         <source>&Auto-mount</source>
@@ -6767,7 +6767,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, this shared folder will be permanent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, эта общая папка будет постоянной для данной машины.</translation>
     </message>
 </context>
 <context>
@@ -6779,7 +6779,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, enables the given serial port of the virtual machine.</source>
-        <translation>Когда стоит галочка, активизируется указанный последовательный порт виртуальной машины.</translation>
+        <translation>Если галочка стоит, в виртуальной машине будет активирован  этот последовательный порт.</translation>
     </message>
     <message>
         <source>&Enable Serial Port</source>
@@ -6791,7 +6791,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the serial port number. You can choose one of the standard serial ports or select <b>User-defined</b> and specify port parameters manually.</source>
-        <translation>Задает номер последовательного порта. Вы можете выбрать один из стандартных номеров портов или выбрать <b>Пользовательский</b> и указать параметры порта вручную.</translation>
+        <translation>Позволяет выбрать номер последовательного порта. Вы можете выбрать один из стандартных номеров портов или выбрать <b>Пользовательский</b> и указать параметры порта вручную.</translation>
     </message>
     <message>
         <source>&IRQ:</source>
@@ -6839,51 +6839,51 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the IRQ number of this serial port. This should be a whole number between <tt>0</tt> and <tt>255</tt>. Values greater than <tt>15</tt> may only be used if the <b>I/O APIC</b> setting is enabled for this virtual machine.</source>
-        <translation>Показывает номер прерывания (IRQ) для этого последовательного порта. Допустимые значения -- целые числа в диапазоне от <tt>0</tt> до <tt>255</tt>. Значения больше <tt>15</tt> могут использоваться только в том случае, если для этой машины включен <b>I/O APIC</b>.</translation>
+        <translation>Определяет номер прерывания (IRQ) для этого последовательного порта. Допустимые значения -- целые числа в диапазоне от <tt>0</tt> до <tt>255</tt>. Значения больше <tt>15</tt> могут использоваться только в том случае, если для этой машины включен <b>I/O APIC</b>.</translation>
     </message>
     <message>
         <source>Holds the base I/O port address of this serial port. Valid values are integer numbers in range from <tt>0</tt> to <tt>0xFFFF</tt>.</source>
-        <translation>Показывает базовый адрес ввода-вывода для этого последовательного порта. Допустимые значения -- целые числа в диапазоне от <tt>0</tt> до <tt>0xFFFF</tt>.</translation>
+        <translation>Определяет адрес порта ввода/вывода для этого последовательного порта. Допустимые значения -- целые числа в диапазоне от <tt>0</tt> до <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
         <source>&Connect to existing pipe/socket</source>
-        <translation type="unfinished"></translation>
+        <translation>&Подключиться к существующему каналу/сокету</translation>
     </message>
     <message>
         <source>&Path/Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Путь/адрес:</translation>
     </message>
     <message>
         <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
-        <translation type="unfinished"></translation>
+        <translation><p>В режиме <b>Хост-канал</b>: Определяет путь к каналу последовательного порта на хосте. Пример: "\\.\pipe\myvbox" или "/tmp/myvbox", для Windows и UNIX-подобных систем соответственно.</p><p>В режиме <b>Хост-устройство</b>: Определяет имя последовательного устройства. Пример: "COM1" or "/dev/ttyS0".</p><p>В режиме <b>Перенаправлен в файл</b>: Определяет путь к ф [...]
     </message>
     <message>
         <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет выбрать режим работы последовательного порта. Если выбрать <b>Отключен</b>, то гостевая ОС обнаружит последовательный порт, но не сможет с ним работать.</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, виртуальная машина предположит наличие канала или сокета, указанного в поле <b>Путь/адрес</b>, и попытается его использовать. В противном случае, канал или сокет будет создан машиной в момент старта.</translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">Не задано IRQ.</translation>
+        <translation>Не задано прерывание.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">Не задан I/O порт.</translation>
+        <translation>Не задан порт ввода/вывода.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">Как минимум два порта имеют идентичные настройки.</translation>
+        <translation>Как минимум два порта имеют идентичные настройки.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">Не задан путь к порту.</translation>
+        <translation>Не задан путь к порту.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Как минимум два порта имеют идентичные пути.</translation>
+        <translation>Как минимум два порта имеют идентичные пути.</translation>
     </message>
 </context>
 <context>
@@ -7125,7 +7125,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The Storage Tree can contain several controllers of different types. This machine currently has no controllers.</source>
-        <translation>Дерево носителей информации может содержать несколько контроллеров различных типов. Данная машина не имеет подключенных контроллеров.</translation>
+        <translation>Дерево носителей информации может содержать несколько контроллеров различных типов. Эта машина не имеет подключенных контроллеров.</translation>
     </message>
     <message>
         <source>Attributes</source>
@@ -7145,7 +7145,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the sub-type of the storage controller currently selected in the Storage Tree.</source>
-        <translation>Задаёт тип контроллера носителей информации, выбранного в данный момент.</translation>
+        <translation>Позволяет выбрать тип контроллера носителей информации, выбранного в данный момент.</translation>
     </message>
     <message>
         <source>S&lot:</source>
@@ -7153,7 +7153,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the slot on the storage controller used by this attachment. The available slots depend on the type of the controller and other attachments on it.</source>
-        <translation>Задаёт слот контроллера носителей информации, используемый данным виртуальным устройством.</translation>
+        <translation>Позволяет выбрать слот контроллера носителей информации, используемый данным виртуальным устройством.</translation>
     </message>
     <message>
         <source>Selects the virtual disk image or the host drive used by this attachment.</source>
@@ -7173,7 +7173,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, allows the guest to send ATAPI commands directly to the host-drive which makes it possible to use CD/DVD writers connected to the host inside the VM. Note that writing audio CD inside the VM is not yet supported.</source>
-        <translation>Когда стоит галочка, гостевой ОС разрешается посылать ATAPI-команды напрямую в физический привод, что делает возможным использовать подключенные к основному ПК устройства для записи CD/DVD внутри ВМ. Имейте в виду, что запись аудио-CD внутри ВМ пока еще не поддерживается.</translation>
+        <translation>Если галочка стоит, гостевой ОС разрешается посылать ATAPI-команды напрямую в физический привод, что делает возможным использовать подключенные к хосту устройства для записи CD/DVD внутри ВМ. Имейте в виду, что запись аудио-CD внутри ВМ пока еще не поддерживается.</translation>
     </message>
     <message>
         <source>&Passthrough</source>
@@ -7209,7 +7209,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Use Host I/O Cache</source>
-        <translation>Кеширование операций ввода/вывода</translation>
+        <translation>Кеширование ввода/вывода</translation>
     </message>
     <message>
         <source>Add SAS Controller</source>
@@ -7265,7 +7265,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Choose a virtual floppy disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation>Выбрать файл образа гибкого диска или привод хоста для использования в виртуальном приводе гостевой ВМ. Виртуальная машина получит доступ к информации, содержащейся в образе или на носителе привода хоста, как если бы эта информация находилась на гибком диске внутри виртуальной машины.</translation>
+        <translation>Выбрать файл образа гибкого диска или привод хоста для использования в виртуальном приводе гостевой ВМ. Виртуальная машина получит доступ к информации, содержащейся в образе или на диске привода хоста, как если бы эта информация находилась на гибком диске внутри виртуальной машины.</translation>
     </message>
     <message>
         <source>Set up the virtual floppy drive</source>
@@ -7343,7 +7343,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source>
-        <translation>Задаёт количество портов контроллера носителей информации типа SATA, выбранного в данный момент в дереве носителей информации. Это значение не может быть меньше, чем максимальный номер использованного порта + 1.</translation>
+        <translation>Позволяет выбрать количество портов контроллера носителей информации типа SATA, выбранного в данный момент в дереве носителей информации. Это значение не может быть меньше, чем максимальный номер использованного порта + 1.</translation>
     </message>
     <message>
         <source>Controller: %1</source>
@@ -7359,11 +7359,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
-        <translation><i>%1</i> использует жесткий диск, который уже подключен к <i>%2</i>.</translation>
+        <translation><i>%1</i> использует жёсткий диск, который уже подключен к <i>%2</i>.</translation>
     </message>
     <message>
         <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
-        <translation>В данный момент больше контроллеров носителей информации, чем поддерживается чипсетом %1. Пожалуйста, измените тип чипсета на странице 'Система' или уменьшите количество следующих контроллеров на странице 'Носители': %2.</translation>
+        <translation>В данный момент больше контроллеров носителей информации, чем поддерживается чипсетом %1. Пожалуйста, измените тип чипсета на странице 'Система' или уменьшите количество следующих контроллеров на странице 'Носители': %2</translation>
     </message>
     <message>
         <source>Add USB Controller</source>
@@ -7371,7 +7371,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Hot-pluggable</source>
-        <translation type="unfinished"></translation>
+        <translation>&С горячей заменой</translation>
     </message>
     <message>
         <source>Choose a virtual optical disk file...</source>
@@ -7379,108 +7379,113 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Add Optical Drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить привод оптических дисков</translation>
     </message>
     <message>
         <source>Add Floppy Drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить привод гибких дисков</translation>
     </message>
     <message>
         <source>Optical &Drive:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Оптический привод:</translation>
     </message>
     <message>
         <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать файл образа оптического диска или привод хоста для использования в виртуальном приводе гостевой ВМ. Виртуальная машина получит доступ к информации, содержащейся в образе или на диске привода хоста, как если бы эта информация находилась на оптическом диске внутри виртуальной машины.</translation>
     </message>
     <message>
         <source>Encrypted with key:</source>
-        <translation type="unfinished"></translation>
+        <translation>Шифрован ключём с ИД:</translation>
     </message>
     <message>
         <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Содержит список всех контроллеров носителей информации, подключенных к этой виртуальной машине, а так же образы виртуальных дисков и приводы хоста, подключенные к этим контроллерам.</translation>
     </message>
     <message>
         <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет имя контроллера носителей информации, выбранного в данный момент.</translation>
     </message>
     <message>
         <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, будут использованы функции кеширования операций ввода/вывода данного хоста.</translation>
     </message>
     <message>
         <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, VirtualBox будет подавлять демонтирование образа в случаях извлечения его со стороны гостевой ОС.</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, гостевая ОС будет считать данное устройство твердотельным накопителем (SSD).</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, гостевая ОС будет считать, что данное устройство поддерживает горячую замену (hot-plug).</translation>
     </message>
     <message>
         <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Выбрать образ диска...</translation>
     </message>
     <message>
         <source>Image</source>
         <comment>storage image</comment>
-        <translation type="unfinished">Образ</translation>
+        <translation>Образ</translation>
     </message>
     <message>
         <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Раскрывает/Скрывает&nbsp;элемент.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Добавляет&nbsp;жёсткий&nbsp;диск.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Добавляет&nbsp;привод&nbsp;оптических&nbsp;дисков.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Добавляет&nbsp;привод&nbsp;гибких&nbsp;дисков.</nobr></translation>
     </message>
     <message>
         <source>Adds new storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавляет новый контроллер.</translation>
     </message>
     <message>
         <source>Removes selected storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удаляет выбранный контроллер.</translation>
     </message>
     <message>
         <source>Adds new storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавляет новое устройство.</translation>
     </message>
     <message>
         <source>Removes selected storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удаляет выбранное устройство.</translation>
     </message>
     <message>
         <source>Create New Hard Disk...</source>
-        <translation type="unfinished"></translation>
+        <translation>Создать новый жёсткий диск...</translation>
     </message>
     <message>
         <source>Choose Virtual Hard Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать образ жёсткого диска...</translation>
     </message>
     <message>
         <source>Choose Virtual Optical Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать образ оптического диска...</translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
-        <translation type="unfinished"></translation>
+        <source>Remove Disk from Virtual Drive</source>
+        <translation>Изъять диск из привода</translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать образ гибкого диска...</translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation>Выбрать образ диска...</translation>
     </message>
 </context>
 <context>
@@ -7533,7 +7538,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start.</source>
-        <translation>Регулирует количество памяти, доступной для виртуальной машины. Если установить слишком большое значение, то машина может не запуститься.</translation>
+        <translation>Задаёт количество памяти, доступной виртуальной машине. Если установить слишком большое значение, машина может не запуститься.</translation>
     </message>
     <message>
         <source>MB</source>
@@ -7577,7 +7582,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the virtual machine will support the Input Output APIC (I/O APIC), which may slightly decrease performance. <b>Note:</b> don't disable this feature after having installed a Windows guest operating system!</source>
-        <translation>Если стоит галочка, то виртуальная машина будет поддерживать операции ввода/вывода контроллера прерываний (I/O APIC), что может слегка снизить производительность ВМ. <b>Примечание:</b> не выключайте это свойство после установки Windows в качестве гостевой ОС!</translation>
+        <translation>Если галочка стоит, виртуальная машина будет поддерживать операции ввода/вывода контроллера прерываний (I/O APIC), что может слегка снизить производительность ВМ. <b>Примечание:</b> не выключайте эту функцию после установки Windows в качестве гостевой ОС!</translation>
     </message>
     <message>
         <source>Enable &I/O APIC</source>
@@ -7597,7 +7602,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the Physical Address Extension (PAE) feature of the host CPU will be exposed to the virtual machine.</source>
-        <translation>Если стоит галочка, виртуальной машине будет предоставлен доступ к функции Physical Address Extension (PAE, расширение физического адреса) центрального процессора основного ПК.</translation>
+        <translation>Если галочка стоит, виртуальной машине будет предоставлен доступ к функции Physical Address Extension (PAE, расширение физического адреса) центрального процессора хоста.</translation>
     </message>
     <message>
         <source>Enable PA&E/NX</source>
@@ -7613,7 +7618,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the virtual machine will try to make use of the host CPU's hardware virtualization extensions such as Intel VT-x and AMD-V.</source>
-        <translation>Если стоит галочка, виртуальная машина будет пытаться задействовать расширенные функции аппаратной виртуализации процессора основного ПК, такие как Intel VT-x или AMD-V.</translation>
+        <translation>Если галочка стоит, виртуальная машина будет пытаться задействовать расширенные функции аппаратной виртуализации процессора хоста, такие как Intel VT-x или AMD-V.</translation>
     </message>
     <message>
         <source>Enable &VT-x/AMD-V</source>
@@ -7621,7 +7626,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the virtual machine will try to make use of the nested paging extension of Intel VT-x and AMD-V.</source>
-        <translation>Если стоит галочка, виртуальная машина будет пытаться использовать расширение Nested Paging для функций аппаратной виртуализации Intel VT-x and AMD-V.</translation>
+        <translation>Если галочка стоит, виртуальная машина будет пытаться использовать расширение Nested Paging для функций аппаратной виртуализации Intel VT-x and AMD-V.</translation>
     </message>
     <message>
         <source>Enable Nested Pa&ging</source>
@@ -7634,7 +7639,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, the guest will support the Extended Firmware Interface (EFI), which is required to boot certain guest OSes. Non-EFI aware OSes will not be able to boot if this option is activated.</source>
-        <translation>Если стоит галочка, гостевая ОС будет поддерживать Extended Firmware Interface (EFI), что необходимо для загрузки некоторых гостевых ОС. Гостевые системы, которые не поддерживают EFI, не будут иметь возможности загрузиться в случае выбора данной опции.</translation>
+        <translation>Если галочка стоит, гостевая ОС будет поддерживать Extended Firmware Interface (EFI), что необходимо для загрузки некоторых гостевых ОС. Гостевые системы, которые не поддерживают EFI, не будут иметь возможности загрузиться в случае выбора данной опции.</translation>
     </message>
     <message>
         <source>Enable &EFI (special OSes only)</source>
@@ -7650,7 +7655,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Controls the number of virtual CPUs in the virtual machine. You need hardware virtualization support on your host system to use more than one virtual CPU.</source>
-        <translation>Контролирует количество процессоров виртуальной машины. Вам необходима поддержка аппаратной виртуализации для задействования более одного процессора в виртуальной машине.</translation>
+        <translation>Задаёт количество процессоров виртуальной машины. Вам необходима поддержка аппаратной виртуализации для задействования более одного процессора в виртуальной машине.</translation>
     </message>
     <message>
         <source>If checked, an absolute pointing device (a USB tablet) will be supported. Otherwise, only a standard PS/2 mouse will be emulated.</source>
@@ -7666,7 +7671,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the chipset to be emulated in this virtual machine. Note that the ICH9 chipset emulation is experimental and not recommended except for guest systems (such as Mac OS X) which require it.</source>
-        <translation>Определяет набор микросхем (чипсет), используемый материнской платой данной виртуальной машины. Учтите, что чипсет ICH9 считается экспериментальным и не рекомендуется для использования за исключением тех гостевых систем, которые в нём непосредственно нуждаются (например Mac OS X).</translation>
+        <translation>Позволяет выбрать набор микросхем (чипсет), используемый материнской платой этой виртуальной машины. Учтите, что чипсет ICH9 считается экспериментальным и не рекомендуется для использования за исключением тех гостевых систем, которые в нём непосредственно нуждаются (например Mac OS X).</translation>
     </message>
     <message>
         <source>you have selected emulation of an ICH9 chipset in this machine. This requires the IO-APIC feature to be enabled. This will be done automatically when you accept the VM Settings by pressing the OK button.</source>
@@ -7752,53 +7757,53 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Paravirtualization Interface:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Интерфейс паравиртуализации:</translation>
     </message>
     <message>
         <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Позволяет выбрать провайдера интерфейса паравиртуализации, используемого этой виртуальной машиной.</translation>
     </message>
     <message>
         <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Данная машина настроена на использование чипсета ICH9, для работы которого требуется функция IO-APIC, которая будет включена автоматически при сохранении настроек.</translation>
     </message>
     <message>
         <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Данная машина настроена на использование одного из USB устройств в качетве манипулятора курсора. Данная опция не сможет функционировать без эмуляции USB, которая будет включена автоматически при сохранении настроек.</translation>
     </message>
     <message>
         <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Данная машина настроена на использование более одного виртуального процессора, что в свою очередь требует активации функции IO-APIC, которая будет включена автоматически при сохранении настроек.</translation>
     </message>
     <message>
         <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Данная машина настроена на использование более одного виртуального процессора, что в свою очередь требует средств аппаратной виртуализации, которые будет включены автоматически при сохранении настроек.</translation>
     </message>
     <message>
         <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если галочка стоит, часы Вашего хоста отобразят время по шкале всемирного координированного времени (UTC), иначе будет отображено локальное время хоста. Unix-подобные системы обычно придерживаются системы UTC.</translation>
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 МБ</translation>
+        <translation>%1 МБ</translation>
     </message>
     <message>
         <source>%1 CPU</source>
         <comment>%1 is 1 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 ЦП</translation>
     </message>
     <message>
         <source>%1 CPUs</source>
         <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 ЦП</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -7858,7 +7863,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>When checked, enables the virtual USB controller of this machine.</source>
-        <translation>Когда стоит галочка, активизируется виртуальный USB-контроллер этой машины.</translation>
+        <translation>Если галочка стоит, виртуальный USB-контроллер этой машины будет активирован.</translation>
     </message>
     <message>
         <source>Enable &USB Controller</source>
@@ -7878,7 +7883,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Lists all USB filters of this machine. The checkbox to the left defines whether the particular filter is enabled or not. Use the context menu or buttons to the right to add or remove USB filters.</source>
-        <translation>Показывает список всех USB-фильтров этой машины. Галочка слева указывает, включен данный фильтр или нет. Используйте контекстное меню или кнопки справа для добавления или удаления фильтров.</translation>
+        <translation>Содержит список всех USB-фильтров этой машины. Галочка слева указывает, включен данный фильтр или нет. Используйте контекстное меню или кнопки справа для добавления или удаления фильтров.</translation>
     </message>
     <message>
         <source>[filter]</source>
@@ -7938,79 +7943,79 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>USB &1.1 (OHCI) Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Контроллер USB &1.1 (OHCI)</translation>
     </message>
     <message>
         <source>USB &2.0 (EHCI) Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Контроллер USB &2.0 (EHCI)</translation>
     </message>
     <message>
         <source>USB &3.0 (xHCI) Controller</source>
-        <translation type="unfinished"></translation>
+        <translation>Контроллер USB &3.0 (xHCI)</translation>
     </message>
     <message>
         <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Эта машина настроена на эмуляцию USB 2.0/3.0, для чего требуюется установить <b>%1</b>. Если необходимо, установите данный плагин, предварительно скачав его с сайта VirtualBox или отключите USB 2.0/3.0 для возможности запуска машины.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если выбран данный пункт, виртуальный USB OHCI контроллер этой машины будет активирован. Контроллер USB OHCI предоставляет поддержку USB 1.0.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если выбран данный пункт, виртуальный USB EHCI контроллер этой машины будет активирован. Контроллер USB EHCI предоставляет поддержку USB 2.0.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Если выбран данный пункт, виртуальный USB xHCI контроллер этой машины будет активирован. Контроллер USB xHCI предоставляет поддержку USB 3.0.</translation>
     </message>
     <message>
         <source>Add Empty Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить пустой фильтр</translation>
     </message>
     <message>
         <source>Add Filter From Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить фильтр из устройства</translation>
     </message>
     <message>
         <source>Edit Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Изменить фильтр</translation>
     </message>
     <message>
         <source>Remove Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить фильтр</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Переместить вверх</translation>
     </message>
     <message>
         <source>Move Filter Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Переместить вниз</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавляет новый USB-фильтр, в котором все поля первоначально пустые. Имейте ввиду, что пустой фильтр будет соответствовать любому подсоединенному USB-устройству.</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавляет новый USB-фильтр, в котором все поля заполнены значениями одного из USB-устройств, подключенных к основному ПК.</translation>
     </message>
     <message>
         <source>Edits selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Изменяет выбранный USB-фильтр.</translation>
     </message>
     <message>
         <source>Removes selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удаляет выбранный USB-фильтр.</translation>
     </message>
     <message>
         <source>Moves selected USB filter up.</source>
-        <translation type="unfinished"></translation>
+        <translation>Перемещает выбранный USB-фильтр вверх.</translation>
     </message>
     <message>
         <source>Moves selected USB filter down.</source>
-        <translation type="unfinished"></translation>
+        <translation>Перемещает выбранный USB-фильтр вниз.</translation>
     </message>
 </context>
 <context>
@@ -8018,7 +8023,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Any</source>
         <comment>remote</comment>
-        <translation>Оба</translation>
+        <translation>Любой</translation>
     </message>
     <message>
         <source>Yes</source>
@@ -8036,7 +8041,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the filter name.</source>
-        <translation>Показывает название фильтра.</translation>
+        <translation>Определяет название фильтра.</translation>
     </message>
     <message>
         <source>&Vendor ID:</source>
@@ -8096,7 +8101,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>R&emote:</source>
-        <translation>Уд&аленное:</translation>
+        <translation>Уд&аленный:</translation>
     </message>
     <message>
         <source>Defines whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
@@ -8116,35 +8121,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Holds the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет фильтр по ID поставщика. Формат строки <i>точного соответствия</i> - <tt>XXXX</tt>, где <tt>X</tt> - шестнадцатеричная цифра. Пустая строка соответствует любому значению.</translation>
     </message>
     <message>
         <source>Holds the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет фильтр по ID продукта. Формат строки <i>точного соответствия</i> - <tt>XXXX</tt>, где <tt>X</tt> - шестнадцатеричная цифра. Пустая строка соответствует любому значению.</translation>
     </message>
     <message>
         <source>Holds the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет фильтр по номеру ревизии. Формат строки <i>точного соответствия</i> - <tt>IIFF</tt>, где <tt>I</tt> - десятичная цифра целой части, а <tt>F</tt> - десятичная цифра дробной части. Пустая строка соответствует любому значению.</translation>
     </message>
     <message>
         <source>Holds the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет фильтр по производителю в виде строки с <i>точным соответствием</i>. Пустая строка соответствует любому значению.</translation>
     </message>
     <message>
         <source>Holds the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет фильтр по названию продукта в виде строки с <i>точным соответствием</i>. Пустая строка соответствует любому значению.</translation>
     </message>
     <message>
         <source>Holds the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет фильтр по серийному номеру в виде строки с <i>точным соответствием</i>. Пустая строка соответствует любому значению.</translation>
     </message>
     <message>
         <source>Holds the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет фильтр по физическому порту USB в виде строки <i>точного соответствия</i>. Пустая строка соответствует любому значению.</translation>
     </message>
     <message>
         <source>Holds whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет, применяется ли этот фильтр к USB-устройствам, подсоединенным локально к основному ПК (<i>Нет</i>), к компьютеру VRDP-клиента (<i>Да</i>), или к обоим (<i>Оба</i>).</translation>
     </message>
 </context>
 <context>
@@ -8158,7 +8163,7 @@ p, li { white-space: pre-wrap; }
     <name>UIMachineWindowNormal</name>
     <message>
         <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source>
-        <translation>Показывает назначенную хост-клавишу.<br>Эта клавиша, если ее нажимать отдельно, переключает состояние захвата клавиатуры и мыши. Ее можно также использовать в сочетании с другими клавишами для быстрого выполнения действий из главного меню.</translation>
+        <translation>Показывает назначенную хост-клавишу.<br>Эта клавиша, если её нажимать отдельно, переключает состояние захвата клавиатуры и мыши. Её можно также использовать в сочетании с другими клавишами для быстрого выполнения действий из главного меню.</translation>
     </message>
 </context>
 <context>
@@ -8185,49 +8190,49 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Removing medium...</source>
-        <translation type="unfinished"></translation>
+        <translation>Удаление образа...</translation>
     </message>
     <message>
         <source>&Hard disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Жёсткие диски</translation>
     </message>
 </context>
 <context>
     <name>UIMediumTypeChangeDialog</name>
     <message>
         <source>Modify medium attributes</source>
-        <translation>Изменить атрибуты носителя</translation>
+        <translation>Изменить атрибуты носителя информации</translation>
     </message>
     <message>
         <source><p>You are about to change the settings of the disk image file <b>%1</b>.</p><p>Please choose one of the following modes and press <b>%2</b> to proceed or <b>%3</b> otherwise.</p></source>
-        <translation><p>Вы собираетесь изменить атрибуты виртуального носителя, расположенного по адресу <b>%1</b>.</p><p>Пожалуйста, выберите один из следующих типов носителя и нажмите <b>%2</b> чтобы продолжить или <b>%3</b> в противном случае.</p></translation>
+        <translation><p>Вы собираетесь изменить атрибуты носителя информации, расположенного по адресу <b>%1</b>.</p><p>Пожалуйста, выберите один из следующих типов носителя информации и нажмите <b>%2</b> чтобы продолжить или <b>%3</b> в противном случае.</p></translation>
     </message>
     <message>
         <source>Choose mode:</source>
-        <translation>Выберите тип носителя:</translation>
+        <translation>Выберите тип носителя информации:</translation>
     </message>
 </context>
 <context>
     <name>UIMenuBarEditorWidget</name>
     <message>
         <source>Virtual Screen Resize</source>
-        <translation type="unfinished"></translation>
+        <translation>Разрешение виртуального экрана</translation>
     </message>
     <message>
         <source>Virtual Screen Mapping</source>
-        <translation type="unfinished"></translation>
+        <translation>Расположение виртуального экрана</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Закрыть</translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
         <source>Switch</source>
-        <translation type="unfinished">Переключить</translation>
+        <translation>Активировать</translation>
     </message>
     <message>
         <source>Enable Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Показывать строку меню</translation>
     </message>
 </context>
 <context>
@@ -8324,7 +8329,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Failed to discard the saved state of the virtual machine <b>%1</b>.</source>
-        <translation>Не удалось сбросить сохраненное состояние виртуальной машины <b>%1</b>.</translation>
+        <translation>Не удалось сбросить сохранённое состояние виртуальной машины <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to discard the snapshot <b>%1</b> of the virtual machine <b>%2</b>.</source>
@@ -8392,7 +8397,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>The Virtual Machine is currently in the <b>Paused</b> state and not able to see any keyboard or mouse input. If you want to continue to work inside the VM, you need to resume it by selecting the corresponding action from the menu bar.</p></source>
-        <translation><p>Виртуальная машина находится в состоянии <b>Приостановлена</b> и поэтому не принимает события от клавиатуры или мыши. Если Вы хотите продолжить работу в ВМ, Вам необходимо возобновить ее выполнение, выбрав соответствующее действие из меню.</p></translation>
+        <translation><p>Виртуальная машина находится в состоянии <b>Приостановлена</b> и потому не принимает события от клавиатуры или мыши. Если Вы хотите продолжить работу в ВМ, Вам необходимо возобновить её выполнение, выбрав соответствующее действие из меню.</p></translation>
     </message>
     <message>
         <source><p>Cannot run VirtualBox in <i>VM Selector</i> mode due to local restrictions.</p><p>The application will now terminate.</p></source>
@@ -8663,15 +8668,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at  [...]
-        <translation><p>Вы <b>щелкнули кнопкой мыши</b> внутри экрана виртуальной машины или нажали <b>хост-клавишу</b>. Это приведет к тому, что виртуальная машина <b>захватит</b> указатель мыши (только в случае, если интеграция указателя мыши не поддерживается гостевой ОС) и клавиатуру основного ПК, что сделает их недоступными для других приложений, работающих на компьютере.</p><p>Вы можете нажать <b>хост-клавишу</b> в л [...]
+        <translation><p>Вы <b>щелкнули кнопкой мыши</b> внутри экрана виртуальной машины или нажали <b>хост-клавишу</b>. Это приведет к тому, что виртуальная машина <b>захватит</b> указатель мыши (только в случае, если интеграция указателя мыши не поддерживается гостевой ОС) и клавиатуру хоста, что сделает их недоступными для других приложений, работающих на компьютере.</p><p>Вы можете нажать <b>хост-клавишу</b> в любое вр [...]
     </message>
     <message>
         <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time t [...]
-        <translation><p>У Вас включена настройка <b>Автозахват клавиатуры</b>. Это приведет к тому, что виртуальная машина будет автоматически <b>захватывать</b> клавиатуру каждый раз при переключении в окно ВМ, что сделает ее недоступной для других приложений, работающих на компьютере: когда клавиатура захвачена, все нажатия клавиш (включая системные, такие как Alt-Tab) будут направлены в виртуальную машину.</p><p>Вы можете нажать <b>хост- [...]
+        <translation><p>У Вас включена настройка <b>Автозахват клавиатуры</b>. Это приведет к тому, что виртуальная машина будет автоматически <b>захватывать</b> клавиатуру каждый раз при переключении в окно ВМ, что сделает её недоступной для других приложений, работающих на компьютере: когда клавиатура захвачена, все нажатия клавиш (включая системные, такие как Alt-Tab) будут направлены в виртуальную машину.</p><p>Вы можете нажать <b>хост- [...]
     </message>
     <message>
         <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the s [...]
-        <translation><p>Виртуальная машина сообщает, что гостевая ОС поддерживает <b>интеграцию указателя мыши</b>. Это означает, что не требуется <i>захватывать</i> указатель мыши для того, чтобы использовать ее в гостевой ОС -- все действия с мышью, когда ее указатель находится в пределах экрана виртуальной машины, напрямую передаются в гостевую ОС. Если мышь в настоящий момент захвачена, она будет автоматически освобождена.</p><p>Значок мыши в [...]
+        <translation><p>Виртуальная машина сообщает, что гостевая ОС поддерживает <b>интеграцию указателя мыши</b>. Это означает, что не требуется <i>захватывать</i> указатель мыши для того, чтобы использовать её в гостевой ОС -- все действия с мышью, когда её указатель находится в пределах экрана виртуальной машины, напрямую передаются в гостевую ОС. Если мышь в настоящий момент захвачена, она будет автоматически освобождена.</p><p>Значок мыши в [...]
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
@@ -8765,7 +8770,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>The hard disk storage unit at location <b>%1</b> already exists. You cannot create a new virtual hard disk that uses this location because it can be already used by another virtual hard disk.</p><p>Please specify a different location.</p></source>
-        <translation><p>Файл жесткого диска <b>%1</b>, уже существует. Вы не можете создать новый виртуальный жесткий диск, который использует этот файл, потому что он, возможно, уже используется другим жестким диском.</p><p>Пожалуйста, укажите другое расположение файла.</p></translation>
+        <translation><p>Файл жёсткого диска <b>%1</b>, уже существует. Вы не можете создать новый виртуальный жёсткий диск, который использует этот файл, потому что он, возможно, уже используется другим жёстким диском.</p><p>Пожалуйста, укажите другое расположение файла.</p></translation>
     </message>
     <message>
         <source><p>Do you want to delete the storage unit of the hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which makes it po [...]
@@ -8783,7 +8788,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Failed to delete the storage unit of the hard disk <b>%1</b>.</source>
-        <translation>Не удалось удалить файл жесткого диска <b>%1</b>.</translation>
+        <translation>Не удалось удалить файл жёсткого диска <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>There are no unused hard disks available for the newly created attachment.</p><p>Press the <b>Create</b> button to start the <i>New Virtual Disk</i> wizard and create a new hard disk, or press the <b>Select</b> if you wish to open the <i>Virtual Media Manager</i>.</p></source>
@@ -8791,7 +8796,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Failed to create the hard disk storage <nobr><b>%1</b>.</nobr></source>
-        <translation>Не удалось создать файл жесткого диска <nobr><b>%1</b>.</nobr></translation>
+        <translation>Не удалось создать файл жёсткого диска <nobr><b>%1</b>.</nobr></translation>
     </message>
     <message>
         <source>Failed to attach the hard disk <nobr><b>%1</b></nobr> to slot <i>%2</i> of the machine <b>%3</b>.</source>
@@ -8819,7 +8824,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Failed to access the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation>Не удалось проверить доступность носителя <nobr><b>%1</b></nobr>.</translation>
+        <translation>Не удалось проверить доступность образа виртуального диска <nobr><b>%1</b></nobr>.</translation>
     </message>
     <message>
         <source><p>Failed to connect to the VirtualBox online registration service due to the following error:</p><p><b>%1</b></p></source>
@@ -9326,7 +9331,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Note that the storage unit of this medium will not be deleted and that it will be possible to use it later again.</p></source>
-        <translation><p>Имейте в виду, что файл с данными этого носителя не будет удален и в дальнейшем может быть снова использован.</p></translation>
+        <translation><p>Имейте в виду, что файл с данными этого носителя информации не будет удален и в дальнейшем может быть снова использован.</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
@@ -9338,11 +9343,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>Seamless</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in seamless mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation><p>Сейчас окно виртуальной машины будет переключено в режим <b>интеграции дисплея</b>. Вы можете вернуться в оконный режим в любое время, нажав <b>%1</b>.</p><p>Обратите внимание, что в данный момент в качестве <i>хост-клавиши</i> используется <b>%2</b>.</p><p>Имейте в виду, что в режиме интеграции дисплея основное меню окна скрыто. Вы можете получить к нему доступ, нажав <b>Host+Home [...]
+        <translation><p>Сейчас окно виртуальной машины будет переключено в режим <b>интеграции дисплея</b>. Вы можете вернуться в оконный режим в любое время, нажав <b>%1</b>.</p><p>Обратите внимание, что в данный момент в качестве <i>хост-клавиши</i> используется <b>%2</b>.</p><p>Имейте в виду, что в этом режиме основное меню окна скрыто. Вы можете получить к нему доступ, нажав <b>Host+Home</b>.&lt [...]
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>Scale</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in scaled mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation><p>Сейчас окно виртуальной машины будет переключено в режим <b>масштабирования</b>. Вы можете вернуться в оконный режим в любое время, нажав <b>%1</b>.</p><p>Обратите внимание, что в данный момент в качестве <i>хост-клавиши</i> используется <b>%2</b>.</p><p>Имейте в виду, что в режиме масштабирования основное меню окна скрыто. Вы можете получить к нему доступ, нажав <b>Host+Home</b [...]
+        <translation><p>Сейчас окно виртуальной машины будет переключено в режим <b>масштабирования</b>. Вы можете вернуться в оконный режим в любое время, нажав <b>%1</b>.</p><p>Обратите внимание, что в данный момент в качестве <i>хост-клавиши</i> используется <b>%2</b>.</p><p>Имейте в виду, что в этом режиме основное меню окна скрыто. Вы можете получить к нему доступ, нажав <b>Host+Home</b>.</p [...]
     </message>
     <message>
         <source>Switch</source>
@@ -9451,7 +9456,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Failed to clone the virtual machine <b>%1</b>.</source>
-        <translation>Не удалось скопировать виртуальную машину <b>%1</b>.</translation>
+        <translation>Не удалось клонировать виртуальную машину <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>You are about to restore snapshot <b>%1</b>.</p><p>You can create a snapshot of the current state of the virtual machine first by checking the box below; if you do not do this the current state will be permanently lost. Do you wish to proceed?</p></source>
@@ -9467,7 +9472,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Error changing disk image mode from <b>%1</b> to <b>%2</b>.</p></source>
-        <translation><p>Не удалось сменить тип носителя с <b>'%1'</b> на <b>'%2'</b>.</p></translation>
+        <translation><p>Не удалось сменить тип носителя информации с <b>'%1'</b> на <b>'%2'</b>.</p></translation>
     </message>
     <message>
         <source><p>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b><nobr>%1</nobr></b> to be installed.</p><p>Please install the Extension Pack from the VirtualBox download site. After this you will be able to re-enable USB 2.0. It will be disabled in the meantime unless you cancel the current settings changes.</p></source>
@@ -9581,11 +9586,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Are you sure you want to discard the saved state of the following virtual machines?</p><p><b>%1</b></p><p>This operation is equivalent to resetting or powering off the machine without doing a proper shutdown of the guest OS.</p></source>
-        <translation><p>Вы уверены, что хотите сбросить (удалить) сохраненное состояние следующих виртуальных машин?</p><p><b>%1</b></p><p>Эта операция равносильна перезапуску или выключению питания машины без надлежащей остановки средствами гостевой ОС.</p></translation>
+        <translation><p>Вы уверены, что хотите сбросить сохранённое состояние следующих виртуальных машин?</p><p><b>%1</b></p><p>Эта операция равносильна перезапуску или выключению питания машины без надлежащей остановки средствами гостевой ОС.</p></translation>
     </message>
     <message>
         <source><p>Do you really want to reset the following virtual machines?</p><p><b>%1</b></p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
-        <translation><p>Вы действительно хотите выполнить перезапуск следующих виртуальных машин?</p><p><b>%1</b></p><p>Во время перезапуска произойдет утеря несохраненных данных всех приложений, работающих внутри виртуальной машины.</p></translation>
+        <translation><p>Вы действительно хотите выполнить перезапуск следующих виртуальных машин?</p><p><b>%1</b></p><p>Во время перезапуска произойдет утеря несохранённых данных всех приложений, работающих внутри виртуальной машины.</p></translation>
     </message>
     <message>
         <source><p>Do you really want to send an ACPI shutdown signal to the following virtual machines?</p><p><b>%1</b></p></source>
@@ -9593,7 +9598,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Do you really want to power off the following virtual machines?</p><p><b>%1</b></p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
-        <translation><p>Вы действительно хотите выключить следующие виртуальные машины?</p><p><b>%1</b></p><p>При выключении произойдет утеря несохраненных данных всех приложений, работающих внутри виртуальной машины.</p></translation>
+        <translation><p>Вы действительно хотите выключить следующие виртуальные машины?</p><p><b>%1</b></p><p>При выключении произойдет утеря несохранённых данных всех приложений, работающих внутри виртуальной машины.</p></translation>
     </message>
     <message>
         <source><p>You are trying to move machine <nobr><b>%1</b></nobr> to group <nobr><b>%2</b></nobr> which already have sub-group <nobr><b>%1</b></nobr>.</p><p>Please resolve this name-conflict and try again.</p></source>
@@ -9701,7 +9706,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation><p>Вы уверены, что хотите убрать образ виртуального жёсткого диска <nobr><b>%1</b></nobr> из списка используемых носителей?</p></translation>
+        <translation><p>Вы уверены, что хотите убрать образ виртуального жёсткого диска <nobr><b>%1</b></nobr> из списка известных носителей?</p></translation>
     </message>
     <message>
         <source><p>As this hard disk is inaccessible its image file can not be deleted.</p></source>
@@ -9709,11 +9714,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual optical disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation><p>Вы уверены, что хотите убрать образ виртуального оптического диска <nobr><b>%1</b></nobr> из списка используемых носителей?</p></translation>
+        <translation><p>Вы уверены, что хотите убрать образ виртуального оптического диска <nobr><b>%1</b></nobr> из списка известных носителей?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual floppy disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation><p>Вы уверены, что хотите убрать образ виртуального гибкого диска <nobr><b>%1</b></nobr> из списка используемых носителей?</p></translation>
+        <translation><p>Вы уверены, что хотите убрать образ виртуального гибкого диска <nobr><b>%1</b></nobr> из списка известных носителей?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual optical disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
@@ -9871,135 +9876,135 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
+        <translation>Текущие правила проброса портов неверны. Значения хостовых и гостевых портов не могут совпадать.</translation>
     </message>
     <message>
         <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
-        <translation type="unfinished"></translation>
+        <translation>Текущие правила проброса портов неверны. Некоторые из правил относятся к одним и тем же портам хоста, имея конфликтные IP адреса.</translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Не удалось создать COM-объект VirtualBoxClient.</p><p>Работа приложения будет завершена.</p></translation>
     </message>
     <message>
         <source>Failed to set the global VirtualBox extra data for key <i>%1</i> to value <i>{%2}</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось задать глобальной внутренней переменной VirtualBox с ключём <i>%1</i> значение <i>{%2}</i>.</translation>
     </message>
     <message>
         <source>Failed to set the extra data for key <i>%1</i> of machine <i>%2</i> to value <i>{%3}</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось задать внутренней переменной машины <i>%2</i> с ключём <i>%1</i> значение <i>{%3}</i>.</translation>
     </message>
     <message>
         <source>Failed to save the settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось сохранить настройки.</translation>
     </message>
     <message>
         <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Вы собираетесь добавить новый привод оптических дисков к контроллеру <b>%1</b>.</p><p>Желаете выбрать образ оптического диска и поместить его в данный привод или оставить привод пустым?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Вы уверены, что хотите удалить виртуальный привод оптических дисков?</p><p>Без такого устройства у Вас не будет возможности подключать оптические диски хоста или их образы к виртуальной машине. Кроме того, Вы не сможете установить дополнения гостевой операционной системы!</p></translation>
     </message>
     <message>
         <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось подсоединить привод оптических дисков <nobr><b>%1</b></nobr> к слоту  <i>%2</i> машины <b>%3</b>.</translation>
     </message>
     <message>
         <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось подсоединить привод гибких дисков <nobr><b>%1</b></nobr> к слоту  <i>%2</i> машины <b>%3</b>.</translation>
     </message>
     <message>
         <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось отсоединить привод оптических дисков <nobr><b>%1</b></nobr> от слота <i>%2</i> машины <b>%3</b>.</translation>
     </message>
     <message>
         <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось отсоединить привод гибких дисков <nobr><b>%1</b></nobr> от слота <i>%2</i> машины <b>%3</b>.</translation>
     </message>
     <message>
         <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Не удалось подключить установочный пакет <b>Образа дополнений гостевой ОС</b> к виртуальной машине <b>%1</b>, поскольку данная машина не имеет привода оптических дисков. Пожалуйста добавьте привод, используя настройки носителей информации виртуальной машины.</p></translation>
     </message>
     <message>
         <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>Образ дополнений гостевой ОС</b> был успешно загружен с сетевого адреса <nobr><a href="%1">%1</a></nobr> и сохранён локально по адресу <nobr><b>%2</b>.</nobr></p><p>Хотите ли подключить его к виртуальному приводу оптических дисков?</p></translation>
     </message>
     <message>
         <source>Bad password or authentication failure.</source>
-        <translation type="unfinished"></translation>
+        <translation>Неверный пароль или ошибка аутентификации.</translation>
     </message>
     <message>
         <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Во время работы виртуальной машины произошла критическая ошибка. Выполнение виртуальной машины остановлено.</p><p>Вы можете обратиться за помощью к разделу Community на веб-сайте <a href=https://www.virtualbox.org>https://www.virtualbox.org</a>, либо к Вашему контракту на поддержку и сопровождение продукта. Пожалуйста, предоставьте содержимое журнала <tt>VBox.log</tt> и изображение <tt>VBox.png</tt>, которые на [...]
     </message>
     <message>
         <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Во время работы виртуальной машины произошла критическая ошибка. Выполнение виртуальной машины должно быть остановлено.</p><p>Вы можете обратиться за помощью к разделу Community на веб-сайте <a href=https://www.virtualbox.org>https://www.virtualbox.org</a>, либо к Вашему контракту на поддержку и сопровождение продукта. Пожалуйста, предоставьте содержимое журнала <tt>VBox.log</tt> , который находятся в папке журналов виртуа [...]
     </message>
     <message>
         <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Выпущена новая версия программы VirtualBox! Версия <b>%1</b> доступна на сайте <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Вы можете скачать эту версию, используя следующую прямую ссылку: </p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source>Drag and drop operation from host to guest failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Операция drag and drop с хостовой в гостевую ОС завершилась неудачей.</translation>
     </message>
     <message>
         <source>Unable to cancel host to guest drag and drop operation.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удаётся отменить операцию drag and drop с хостовой в гостевую ОС.</translation>
     </message>
     <message>
         <source>Drag and drop operation from guest to host failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Операция drag and drop с гостевой в хостовую ОС завершилась неудачей.</translation>
     </message>
     <message>
         <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось поключить сетевой кабель к адаптеру виртуальной машины <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось отключить сетевой кабель от адаптера виртуальной машины <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Один или несколько носителей информации сейчас недоступны. В результате, Вы не сможете запускать виртуальные машины, использующие эти носители, до тех пор, пока к ним не появится доступ.</p><p>Нажмите <b>Проверить</b>, чтобы открыть окно Менеджера виртуальных носителей и увидеть, какие именно носители недоступны, или нажмите <b>Игнорировать</b>, чтобы пропустить это сообщение.</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>При удалении снимка информация о состоянии машины, хранящаяся в данном снимке, будет уничтожена, а данные, хранящиеся в файлах, созданных VirtualBox при создании снимка, будут объединены в один файл. Данный процесс может занять некоторое время, а информация хранящаяся в снимке не может быть в последствии восстановлена.</p></p>Вы уверены, что хотите удалить выбранный снимок <b>%1</b>?</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Для удаление снимка %1 временно понадобится некоторое количество свободного дискового пространства. В худшем случае размер образа %2 увеличится на %3, однако в данной системе доступно лишь %4.</p><p>В случае нехватки свободного места в процессе операции объединения образов, может произойти критическая ошибка, что приведёт к повреждению образа и конфигурации виртуальной машины, иными словами - к потере данной машины и её данных.</p><p> [...]
     </message>
     <message>
         <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Вы уверены, что хотите освободить носитель информации <nobr><b>%1</b></nobr>?</p><p>Это приведет к его отсоединению от следующих виртуальных машин: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Хотите ли Вы удалить файл виртуального жёсткого диска <nobr><b>%1</b></nobr>?</p><p>Если Вы выберете <b>Удалить</b>, то указанный файл будет физически удален. Эту операцию <b>отменить нельзя</b>.</p><p>Если Вы выберете <b>Сохранить</b>, то жёсткий диск будет убран из списка используемых жёстких дисков, но указанный файл удален не будет, что дает возможность вновь добавить это [...]
     </message>
     <message>
         <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось открыть образ виртуального диска <nobr><b>%1</b></nobr>.</translation>
     </message>
     <message>
         <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не удалось закрыть образ виртуального диска <nobr><b>%1</b></nobr>.</translation>
     </message>
     <message>
         <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы собираетесь создать новую виртуальную машину без жёсткого диска. У Вас не будет возможности установить операционную систему до тех пор, пока Вы не добавите как минимум один жёсткий диск. Однако, Вы сможете запустить машину и загрузить операционную систему с оптического диска.</translation>
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Сейчас окно виртуальной машины будет переключено в режим <b>полного экрана</b>. Вы можете вернуться в оконный режим в любое время, нажав <b>%1</b>.</p><p>Обратите внимание, что в данный момент в качестве <i>хост-клавиши</i> используется <b>%2</b>.</p><p>Имейте в виду, что в этом режиме основное меню окна скрыто. Вы можете получить к нему доступ, нажав <b>Host+Home</b>.</p& [...]
     </message>
     <message>
         <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Не удалось переключить дисплей гостевой ОС в режим полного экрана из-за недостаточного количества виртуальной видеопамяти.</p><p>Необходимо задать как минимум <b>%1</b> видеопамяти в диалоге свойств виртуальной машины.</p><p>Нажмите <b>Игнорировать</b>, чтобы переключиться в режим полного экрана в любом случае, или нажмите <b>Отмена</b> для отмены операции.</p></translation>
     </message>
 </context>
 <context>
@@ -10093,7 +10098,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the operating system family that you plan to install into this virtual machine.</source>
-        <translation>Определяет тип операционной системы, который вы желаете установить на виртуальную машину.</translation>
+        <translation>Позволяет выбрать класс операционных систем, одну из которых вы желаете установить на эту виртуальную машину.</translation>
     </message>
     <message>
         <source>&Version:</source>
@@ -10101,7 +10106,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-        <translation>Определяет версию операционной системы, которую вы хотите установить на эту виртуальную машину (эта операционная система называется "гостевая ОС").</translation>
+        <translation>Позволяет выбрать версию операционной системы, которую вы желаете установить на эту виртуальную машину (эта операционная система называется "гостевая ОС").</translation>
     </message>
 </context>
 <context>
@@ -10891,55 +10896,55 @@ p, li { white-space: pre-wrap; }
     <name>UIPortForwardingTable</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Имя</translation>
     </message>
     <message>
         <source>Protocol</source>
-        <translation type="unfinished">Протокол</translation>
+        <translation>Протокол</translation>
     </message>
     <message>
         <source>Host IP</source>
-        <translation type="unfinished">IP хоста</translation>
+        <translation>Адрес хоста</translation>
     </message>
     <message>
         <source>Host Port</source>
-        <translation type="unfinished">Порт хоста</translation>
+        <translation>Порт хоста</translation>
     </message>
     <message>
         <source>Guest IP</source>
-        <translation type="unfinished">IP гостя</translation>
+        <translation>Адрес гостя</translation>
     </message>
     <message>
         <source>Guest Port</source>
-        <translation type="unfinished">Порт гостя</translation>
+        <translation>Порт гостя</translation>
     </message>
     <message>
         <source>Contains a list of port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Содержит список правил проброса портов.</translation>
     </message>
     <message>
         <source>Add New Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить новое правило</translation>
     </message>
     <message>
         <source>Copy Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать выбранное правило</translation>
     </message>
     <message>
         <source>Remove Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить выбранное правило</translation>
     </message>
     <message>
         <source>Adds new port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавляет новое правило проброса портов.</translation>
     </message>
     <message>
         <source>Copies selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Копирует выбранное правило проброса портов.</translation>
     </message>
     <message>
         <source>Removes selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Удаляет выбранное правило проброса портов.</translation>
     </message>
 </context>
 <context>
@@ -11056,7 +11061,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
+        <translation><h3>Добро пожаловать в мир VirtualBox!</h3><p>Левая часть этого окна предназначена для отображения списка Ваших  виртуальных машин. Этот список сейчас пуст, потому что Вы не создали ни одной виртуальной машины.<img src=:/welcome.png align=right/></p><p>Чтобы создать новую машину, нажмите кнопку <b>Создать</b> на основной панели инструментов, расположенной вверху окна.</p><p>Hажмите клавишу <b>%1</b& [...]
     </message>
 </context>
 <context>
@@ -11145,7 +11150,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки</translation>
     </message>
 </context>
 <context>
@@ -11224,37 +11229,37 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>User Interface</source>
-        <translation type="unfinished"></translation>
+        <translation>Интерфейс пользователя</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Настройки</translation>
     </message>
 </context>
 <context>
     <name>UISettingsSerializerProgress</name>
     <message>
         <source>Loading Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузка настроек...</translation>
     </message>
     <message>
         <source>Saving Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранение настроек...</translation>
     </message>
 </context>
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Закрыть</translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
         <source>Enable Status Bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Показывать строку состояния</translation>
     </message>
     <message>
         <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Щёлкните мышкой</b>, чтобы показать/скрыть индикатор.</nobr><br><nobr><b>Перетащите мышкой</b>, чтобы изменить его позицию.</nobr></translation>
     </message>
 </context>
 <context>
@@ -11386,7 +11391,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Saves the current execution state of the virtual machine to the physical hard disk of the host PC.</p><p>Next time this machine is started, it will be restored from the saved state and continue execution from the same place you saved it at, which will let you continue your work immediately.</p><p>Note that saving the machine state may take a long time, depending on the guest operating system type and the amount of memory you assigned to th [...]
-        <translation><p>Сохраняет текущее состояние виртуальной машины на жестком диске основного ПК.</p><p>При следующем запуске машина будет восстановлена из этого сохраненного состояния и продолжит выполнение с того места, на котором она была сохранена, позволяя быстро продолжить прерванную работу.</p><p>Имейте ввиду, что операция сохранения состояния машины может занять продолжительное время, в зависимости от типа гостевой ОС и размера оперативной памяти [...]
+        <translation><p>Сохраняет текущее состояние виртуальной машины на жёстком диске хоста.</p><p>При следующем запуске машина будет восстановлена из этого сохранённого состояния и продолжит выполнение с того места, на котором она была сохранена, позволяя быстро продолжить прерванную работу.</p><p>Имейте ввиду, что операция сохранения состояния машины может занять продолжительное время, в зависимости от типа гостевой ОС и размера оперативной памяти, задан [...]
     </message>
     <message>
         <source>&Save the machine state</source>
@@ -11414,7 +11419,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>When checked, the machine will be returned to the state stored in the current snapshot after it is turned off. This is useful if you are sure that you want to discard the results of your last sessions and start again at that snapshot.</p></source>
-        <translation><p>Если стоит галочка, то состояние машины будет восстановлено из состояния, сохраненного в текущем снимке, сразу после ее выключения. Это может быть полезным, если Вы уверены, что хотите удалить результаты последнего сеанса работы с виртуальной машиной и вернуться к текущему снимку.</p></translation>
+        <translation><p>Если галочка стоит, сразу после выключения машины будет восстановлено её состояние, сохранённое в текущем снимке. Это может быть полезным, если Вы уверены, что хотите удалить результаты последнего сеанса работы с виртуальной машиной и вернуться к текущему снимку.</p></translation>
     </message>
     <message>
         <source>&Restore current snapshot '%1'</source>
@@ -11422,11 +11427,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Continue running in the background</source>
-        <translation type="unfinished"></translation>
+        <translation>&Продолжить работу в фоновом режиме</translation>
     </message>
     <message>
         <source><p>Close the virtual machine windows but keep the virtual machine running.</p><p>You can use the VirtualBox Manager to return to running the virtual machine in a window.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Закрыть графический интерфейс виртуальной машины, но продолжать её работу в фоновом режиме.</p><p>Для возврата к графическому интерфейсу этой машины Вы можете использовать VirtualBox Менеджер.</p></translation>
     </message>
 </context>
 <context>
@@ -11550,7 +11555,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation>Статистика носителей</translation>
+        <translation>Статистика носителей информации</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
@@ -11558,7 +11563,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Network Statistics</source>
-        <translation>Сетевая статистика</translation>
+        <translation>Статистика сетевых адаптеров</translation>
     </message>
     <message>
         <source>Not Available</source>
@@ -11583,11 +11588,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <translation>Время работы</translation>
     </message>
     <message>
         <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Функция Drag and Drop</translation>
     </message>
 </context>
 <context>
@@ -11749,19 +11754,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Expert Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>&Экспертный режим</translation>
     </message>
     <message>
         <source>Switch to <nobr><b>Expert Mode</b></nobr>, a one-page dialog for experienced users.</source>
-        <translation type="unfinished"></translation>
+        <translation>Переключиться в <nobr><b>Экспертный режим</b></nobr>, одностраничный диалог для опытных пользователей.</translation>
     </message>
     <message>
         <source>&Guided Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>&Подробный режим</translation>
     </message>
     <message>
         <source>Switch to <nobr><b>Guided Mode</b></nobr>, a step-by-step dialog with detailed explanations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Переключиться в <nobr><b>Подробный режим</b></nobr>, пошаговый диалог с детальными пояснениями.</translation>
     </message>
 </context>
 <context>
@@ -11861,75 +11866,75 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Copy Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Копировать виртуальный жёсткий диск</translation>
     </message>
     <message>
         <source>Hard disk to copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберите диск</translation>
     </message>
     <message>
         <source><p>Please select the virtual hard disk file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Пожалуйста, выберите виртуальный жёсткий диск, который Вы желаете скопировать, если он ещё не выбран. Вы можете выбрать один из выпадающего списка или использовать кнопку с иконкой папки справа от него.</p></translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file to copy...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать файл виртуального жёсткого диска...</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите тип</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Пожалуйста, укажите тип файла, определяющий формат, который Вы хотите использовать при создании нового жёсткого диска. Если у Вас нет необходимости использовать диск с другими продуктами программной виртуализации, Вы можете оставить данный параметр без изменений.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите формат хранения</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>Пожалуйста уточните, должен ли новый виртуальный жёсткий диск подстраивать свой размер под размер своего содержимого или быть точно заданного размера.</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Файл <b>динамического</b> жёсткого диска будет занимать необходимое место на Вашем физическом носителе информации лишь по мере заполнения, однако не сможет уменьшиться в размере если место, занятое его содержимым, освободится.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Файл <b>фиксированного</b> жёсткого диска может потребовать больше времени при создании на некоторых файловых системах, однако, обычно, быстрее в использовании.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Вы можете также <b>разделить</b> жёсткий диск на несколько файлов размером до 2х ГБ. Это может пригодиться если Вы планируете хранить виртуальную машину на съёмных USB носителях или старых файловых системах, некоторые из которых не поддерживают файлы больших размеров.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите местоположение нового виртуального жёсткого диска</translation>
     </message>
     <message>
         <source>New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите имя нового диска</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Пожалуйста укажите имя нового виртуального жёсткого диска в поле снизу или используйте кнопку с иконкой папки справа от него.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать местоположение нового виртуального жёсткого диска...</translation>
     </message>
     <message>
         <source>Hard disk to &copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберите &диск</translation>
     </message>
     <message>
         <source>&New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите имя &нового диска</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите &тип</translation>
     </message>
 </context>
 <context>
@@ -11940,15 +11945,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Clone Virtual Machine</source>
-        <translation>Копировать виртуальную машину</translation>
+        <translation>Клонировать виртуальную машину</translation>
     </message>
     <message>
         <source>Clone</source>
-        <translation>Копировать</translation>
+        <translation>Клонировать</translation>
     </message>
     <message>
         <source>%1 Clone</source>
-        <translation>Копия %1</translation>
+        <translation>Клон %1</translation>
     </message>
     <message>
         <source>New machine name</source>
@@ -11956,7 +11961,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>Please choose a name for the new virtual machine. The new machine will be a clone of the machine <b>%1</b>.</p></source>
-        <translation><p>Пожалуйста укажите имя новой виртуально машины. Эта машина будет копией машины <b>%1</b>.</p></translation>
+        <translation><p>Пожалуйста укажите имя новой виртуальной машины. Эта машина будет клоном машины <b>%1</b>.</p></translation>
     </message>
     <message>
         <source>When checked a new unique MAC address will be assigned to all configured network cards.</source>
@@ -11968,7 +11973,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Clone type</source>
-        <translation>Укажите тип копии</translation>
+        <translation>Укажите тип клонирования</translation>
     </message>
     <message>
         <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard drive files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard drive files will be tied to the virtual hard drive files of original machine and you will not be able to move the new virtual machi [...]
@@ -11976,35 +11981,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><p>If you create a <b>Linked clone</b> then a new snapshot will be created in the original virtual machine as part of the cloning process.</p></source>
-        <translation><p>Если Вы выберите <b>Связная копия</b>, в копируемой машине будет создан новый снимок, являющийся частью процедуры копирования.</p></translation>
+        <translation><p>Если Вы выберите <b>Связное клонирование</b>, в клонируемой машине также будет создан новый снимок, являющийся частью процедуры клонирования.</p></translation>
     </message>
     <message>
         <source>&Full clone</source>
-        <translation>&Полная копия</translation>
+        <translation>&Полное клонирование</translation>
     </message>
     <message>
         <source>&Linked clone</source>
-        <translation>&Связная копия</translation>
+        <translation>&Связное клонирование</translation>
     </message>
     <message>
         <source>Snapshots</source>
-        <translation>Укажите, что копировать</translation>
+        <translation>Укажите цель клонирования</translation>
     </message>
     <message>
         <source><p>Please choose which parts of the snapshot tree should be cloned with the machine.</p></source>
-        <translation><p>Пожалуйста укажите, какие части виртуальной машины должны быть скопированы.</p></translation>
+        <translation><p>Пожалуйста укажите, какие части виртуальной машины должны быть клонированы.</p></translation>
     </message>
     <message>
         <source><p>If you choose <b>Current machine state</b>, the new machine will reflect the current state of the original machine and will have no snapshots.</p></source>
-        <translation><p>Если Вы выберите <b>Состояние машины</b>, новая машина будет отражать текущее состояние копируемой машины, без снимков.</p></translation>
+        <translation><p>Если Вы выберите <b>Состояние машины</b>, новая машина будет отражать текущее состояние клонируемой машины, без снимков.</p></translation>
     </message>
     <message>
         <source><p>If you choose <b>Current snapshot tree branch</b>, the new machine will reflect the current state of the original machine and will have matching snapshots for all snapshots in the tree branch starting at the current state in the original machine.</p></source>
-        <translation><p>Если Вы выберите <b>Текущая ветка древа снимков</b>, новая машина будет отражать текущее состояние копируемой машины, и будет иметь копии всех снимков ветки древа снимков копируемой машины вплоть до текущего состояния.</p></translation>
+        <translation><p>Если Вы выберите <b>Текущая ветка древа снимков</b>, новая машина будет отражать текущее состояние клонируемой машины, и будет иметь копии всех снимков ветки древа снимков клонируемой машины вплоть до текущего состояния.</p></translation>
     </message>
     <message>
         <source><p>If you choose <b>Everything</b>, the new machine will reflect the current state of the original machine and will have matching snapshots for all snapshots in the original machine.</p></source>
-        <translation><p>Если Вы выберите <b>Всё</b>, новая машина будет отражать текущее состояние копируемой машины, и будет иметь копии всех снимков древа снимков копируемой машины.</p></translation>
+        <translation><p>Если Вы выберите <b>Всё</b>, новая машина будет отражать текущее состояние клонируемой машины, и будет иметь копии всех снимков древа снимков клонируемой машины.</p></translation>
     </message>
     <message>
         <source>Current &machine state</source>
@@ -12024,15 +12029,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Full Clone</source>
-        <translation>&Полная копия</translation>
+        <translation>&Полное клонирование</translation>
     </message>
     <message>
         <source>&Linked Clone</source>
-        <translation>&Связная копия</translation>
+        <translation>&Связное клонирование</translation>
     </message>
     <message>
         <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Пожалуйста укажите какое клонирование Вы желаете выполнить.</p><p>Если Вы выберите <b>Полное клонирование</b>, будет создана полная копия клонируемой виртуальной машины (включая все файлы виртуальных жёстких дисков).</p><p>Если Вы выберите <b>Связное клонирование</b>, будет создана новая машина, использующая файлы виртуальных жёстких дисков клонируемой машины и Вы не сможете перенести новую машину на другой ком [...]
     </message>
 </context>
 <context>
@@ -12390,51 +12395,51 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Create Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Создать виртуальный жёсткий диск</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите тип</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Пожалуйста, укажите тип файла, определяющий формат, который Вы хотите использовать при создании нового жёсткого диска. Если у Вас нет необходимости использовать диск с другими продуктами программной виртуализации, Вы можете оставить данный параметр без изменений.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите формат хранения</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>Пожалуйста уточните, должен ли новый виртуальный жёсткий диск подстраивать свой размер под размер своего содержимого или быть точно заданного размера.</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Файл <b>динамического</b> жёсткого диска будет занимать необходимое место на Вашем физическом носителе информации лишь по мере заполнения, однако не сможет уменьшиться в размере если место, занятое его содержимым, освободится.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Файл <b>фиксированного</b> жёсткого диска может потребовать больше времени при создании на некоторых файловых системах, однако, обычно, быстрее в использовании.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Вы можете также <b>разделить</b> жёсткий диск на несколько файлов размером до 2х ГБ. Это может пригодиться если Вы планируете хранить виртуальную машину на съёмных USB носителях или старых файловых системах, некоторые из которых не поддерживают файлы больших размеров.</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Пожалуйста укажите имя нового виртуального жёсткого диска в поле снизу или используйте кнопку с иконкой папки справа от него.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать местоположение нового виртуального жёсткого диска...</translation>
     </message>
     <message>
         <source>Select the size of the virtual hard disk in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите размер виртуального жёсткого диска в мегабайтах. Эта величина ограничивает размер файловых данных, которые виртуальная машина сможет хранить на этом диске.</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите &тип</translation>
     </message>
 </context>
 <context>
@@ -12513,27 +12518,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Жесткий диск</translation>
     </message>
     <message>
         <source><p>If you wish you can add a virtual hard disk to the new machine. You can either create a new hard disk file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard disk is <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>При желании к новой виртуальной машине можно подключить виртуальный жёсткий диск. Вы можете создать новый или выбрать из уже имеющихся.</p><p>Если Вам необходима более сложная конфигурация Вы можете пропустить этот шаг и внести изменения в настройки машины после её создания.</p><p>Рекомендуемый объём нового виртуального жёсткого диска равен <b>%1</b>.</p></translation>
     </message>
     <message>
         <source>&Do not add a virtual hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>&Не подключать виртуальный жёсткий диск</translation>
     </message>
     <message>
         <source>&Create a virtual hard disk now</source>
-        <translation type="unfinished"></translation>
+        <translation>&Создать новый виртуальный жёсткий диск</translation>
     </message>
     <message>
         <source>&Use an existing virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>&Использовать существующий виртуальный жёсткий диск</translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Выбрать образ виртуального жёсткого диска...</translation>
     </message>
 </context>
 <context>
@@ -13251,19 +13256,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Открывает диалог выбора папки.</translation>
     </message>
     <message>
         <source>Displays a window to select a different file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Открывает диалог выбора файла.</translation>
     </message>
     <message>
         <source>Holds the folder path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет название папки.</translation>
     </message>
     <message>
         <source>Holds the file path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Определяет название файла.</translation>
     </message>
 </context>
 <context>
@@ -13608,7 +13613,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Floppy</source>
         <comment>DeviceType</comment>
-        <translation>Дискета</translation>
+        <translation>Гибкий диск</translation>
     </message>
     <message>
         <source>CD/DVD</source>
@@ -13618,7 +13623,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Hard Disk</source>
         <comment>DeviceType</comment>
-        <translation>Жесткий диск</translation>
+        <translation>Жёсткий диск</translation>
     </message>
     <message>
         <source>Network</source>
@@ -13668,7 +13673,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Null Audio Driver</source>
         <comment>AudioDriverType</comment>
-        <translation>Пустой аудиодрайвер</translation>
+        <translation>Пустой аудио драйвер</translation>
     </message>
     <message>
         <source>Windows Multimedia</source>
@@ -13678,12 +13683,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>OSS Audio Driver</source>
         <comment>AudioDriverType</comment>
-        <translation>Аудиодрайвер OSS</translation>
+        <translation>Аудио драйвер OSS</translation>
     </message>
     <message>
         <source>ALSA Audio Driver</source>
         <comment>AudioDriverType</comment>
-        <translation>Аудиодрайвер ALSA</translation>
+        <translation>Аудио драйвер ALSA</translation>
     </message>
     <message>
         <source>Windows DirectSound</source>
@@ -13871,7 +13876,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Host Driver</source>
         <comment>details report (audio)</comment>
-        <translation>Аудиодрайвер</translation>
+        <translation>Аудио драйвер</translation>
     </message>
     <message>
         <source>Controller</source>
@@ -14404,21 +14409,21 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Failed to check accessibility of disk image files.</source>
         <comment>medium</comment>
-        <translation>Не удалось проверить доступность устройства.</translation>
+        <translation>Не удалось проверить доступность носителей информации.</translation>
     </message>
     <message>
         <source><b>No disk image file selected</b></source>
         <comment>medium</comment>
-        <translation><b>Устройство не выбрано</b></translation>
+        <translation><b>Носитель информации не выбран</b></translation>
     </message>
     <message>
         <source>You can also change this while the machine is running.</source>
-        <translation>Вы можете выбрать это устройство позже или во время работы машины.</translation>
+        <translation>Вы можете изменить содержимое этого устройства позже или во время работы машины.</translation>
     </message>
     <message>
         <source><b>No disk image files available</b></source>
         <comment>medium</comment>
-        <translation><b>Нет доступных устройств</b></translation>
+        <translation><b>Нет доступных носителей информации</b></translation>
     </message>
     <message>
         <source>You can create disk image files using the virtual media manager.</source>
@@ -14427,7 +14432,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Подключение данного жёсткого диска будет осуществлено косвенно, используя новый разностный диск.</translation>
+        <translation>Подключение данного жёсткого диска будет осуществлено косвенно, используя новый разностный жёсткий диск.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -14437,7 +14442,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Этот базовый жёсткий диск косвенно подсоединен с помощью следующего разностного диска:</translation>
+        <translation>Этот базовый жёсткий диск косвенно подсоединен с помощью следующего разностного жёсткого диска:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -14764,7 +14769,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Disabled</source>
         <comment>DragAndDropType</comment>
-        <translation>Выключен</translation>
+        <translation>Выключена</translation>
     </message>
     <message>
         <source>Host To Guest</source>
@@ -15114,7 +15119,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation>Вы можете добавлять и удалять устройства, используя настройки машин.</translation>
+        <translation>Вы можете добавлять и удалять доступные носители информации, используя настройки машины.</translation>
     </message>
     <message>
         <source>USB</source>
@@ -15129,143 +15134,143 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>off</source>
         <comment>guest monitor status</comment>
-        <translation type="unfinished"></translation>
+        <translation>(выключен)</translation>
     </message>
     <message>
         <source>Paravirtualization Interface</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>Интерфейс паравиртуализации</translation>
     </message>
     <message>
         <source>None</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation>Отсутствует</translation>
     </message>
     <message>
         <source>Default</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished">По умолчанию</translation>
+        <translation>По умолчанию</translation>
     </message>
     <message>
         <source>Legacy</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation>Совместимый</translation>
     </message>
     <message>
         <source>Minimal</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation>Минимальный</translation>
     </message>
     <message>
         <source>Hyper-V</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>New dynamically allocated storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Новый динамически расширяющийся образ</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Активно</translation>
     </message>
     <message>
         <source>Inactive</source>
         <comment>details report (VT-x/AMD-V)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Неактивно</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Активно</translation>
     </message>
     <message>
         <source>Inactive</source>
         <comment>details report (Nested Paging)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Неактивно</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>details report (Unrestricted Execution)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Активно</translation>
     </message>
     <message>
         <source>Inactive</source>
         <comment>details report (Unrestricted Execution)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Неактивно</translation>
     </message>
     <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translation>Создание снимка</translation>
     </message>
     <message>
         <source>Taking Online Snapshot</source>
         <comment>MachineState</comment>
-        <translation type="unfinished"></translation>
+        <translation>Создание рабочего снимка</translation>
     </message>
     <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Optical</source>
         <comment>DeviceType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Оптический диск</translation>
     </message>
     <message>
         <source>TCP</source>
         <comment>PortMode</comment>
-        <translation type="unfinished">TCP</translation>
+        <translation></translation>
     </message>
     <message>
         <source>OHCI</source>
         <comment>USBControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>EHCI</source>
         <comment>USBControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>xHCI</source>
         <comment>USBControllerType</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Интерфейс пользователя</translation>
     </message>
     <message>
         <source>(Optical Drive)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Оптический привод)</translation>
     </message>
     <message>
         <source>Encrypted</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Шифрован</translation>
     </message>
     <message>
         <source>Please choose a virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберите файл виртуального жёсткого диска</translation>
     </message>
     <message>
         <source>All virtual hard disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Все файлы виртуальных жёстких дисков (%1)</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Medium Manager to inspect these files.</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Некоторые устройства данной цепочки жёстких дисков недоступны. Используйте менеджер виртуальных носителей для проверки.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Укажите местоположение нового виртуального жёсткого диска</translation>
     </message>
 </context>
 <context>
@@ -15399,15 +15404,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Remove the selected disk image file</source>
-        <translation>Удалить выбранный носитель</translation>
+        <translation>Удалить выбранный носитель информации</translation>
     </message>
     <message>
         <source>Release the selected disk image file by detaching it from the machines</source>
-        <translation>Освободить выбранный носитель, отсоединив его от машин</translation>
+        <translation>Освободить выбранный носитель информации, отсоединив его от машин</translation>
     </message>
     <message>
         <source>Refresh the list of disk image files</source>
-        <translation>Обновить список носителей</translation>
+        <translation>Обновить список носителей информации</translation>
     </message>
     <message>
         <source>Location</source>
@@ -15559,11 +15564,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Copy an existing disk image file</source>
-        <translation>Копировать существующий виртуальный носитель</translation>
+        <translation>Копировать существующий носитель информации</translation>
     </message>
     <message>
         <source>Modify the attributes of the selected disk image file</source>
-        <translation>Изменить атрибуты выбранного виртуального носителя</translation>
+        <translation>Изменить атрибуты выбранного носителя информации</translation>
     </message>
     <message>
         <source>C&lose</source>
@@ -15575,15 +15580,15 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>UUID:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source><i>Not&nbsp;Encrypted</i></source>
-        <translation type="unfinished"></translation>
+        <translation><i>Не&nbsp;шифрован</i></translation>
     </message>
     <message>
         <source>Encrypted with key:</source>
-        <translation type="unfinished"></translation>
+        <translation>Шифрован ключём с ИД:</translation>
     </message>
 </context>
 <context>
@@ -16175,11 +16180,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The current state differs from the state stored in the current snapshot</source>
-        <translation>Текущее состояние отличается от состояния, сохраненного в текущем снимке</translation>
+        <translation>Текущее состояние отличается от состояния, сохранённого в текущем снимке</translation>
     </message>
     <message>
         <source>The current state is identical to the state stored in the current snapshot</source>
-        <translation>Текущее состояние идентично состоянию, сохраненному в текущем снимке</translation>
+        <translation>Текущее состояние идентично состоянию, сохранённому в текущем снимке</translation>
     </message>
     <message>
         <source> (current, </source>
@@ -16297,7 +16302,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Clone...</source>
-        <translation>&Копировать...</translation>
+        <translation>&Клонировать...</translation>
     </message>
     <message>
         <source>Clone the selected virtual machine</source>
@@ -16305,19 +16310,19 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Restore selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Восстановить выбранный снимок виртуальной машины</translation>
     </message>
     <message>
         <source>Delete selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить выбранный снимок виртуальной машины</translation>
     </message>
     <message>
         <source>Display a window with selected snapshot details</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать подробности о выбранном снимке</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Клонировать выбранную виртуальную машину</translation>
     </message>
 </context>
 <context>
@@ -16355,7 +16360,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Snapshot %1</source>
-        <translation type="unfinished">Снимок %1</translation>
+        <translation>Снимок %1</translation>
     </message>
 </context>
 <context>
@@ -16392,7 +16397,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>No supported devices connected to the host PC</source>
         <comment>USB device tooltip</comment>
-        <translation>Нет поддерживаемых устройств, подключенных к основному ПК</translation>
+        <translation>Нет поддерживаемых устройств, подключенных к хосту</translation>
     </message>
 </context>
 <context>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
index 9c7a83c..900fd10 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
@@ -359,7 +359,7 @@
         <translation type="obsolete">I&nformačné okno o relácii</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Zobrazí informačné okno o relácii</translation>
     </message>
     <message>
@@ -447,11 +447,11 @@
         <translation type="obsolete">Zapne alebo vypne spojenia Vzdialenej plochy (RDP) k tomuto stroju</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">&Nainštalovať Hosťovské doplnky...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="unfinished">&Nainštalovať Hosťovské doplnky...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Pripojí inštalačný obraz Hosťovských doplnkov</translation>
     </message>
     <message>
@@ -754,92 +754,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">&Nainštalovať Hosťovské doplnky...</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Pripojí inštalačný obraz Hosťovských doplnkov</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
+        <source>&Webcams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Sieť</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Súbor</translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
-        <translation type="unfinished">&Klávesnica</translation>
-    </message>
-    <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Sieť</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Nastavenia...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Zobraziť &záznam...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Súbor</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -855,175 +841,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Nastavenia...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <source>&Keyboard</source>
+        <translation type="unfinished">&Klávesnica</translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <source>&Hard Disks</source>
+        <translation type="unfinished">&Pevné disky</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
-        <translation type="unfinished">&Pevné disky</translation>
+        <source>&USB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Zobraziť &záznam...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1069,6 +1055,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create new virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1085,7 +1079,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1093,7 +1087,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1117,15 +1111,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Start selected virtual machines with option of continuing in background</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1137,11 +1143,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1149,7 +1155,7 @@
         <translation type="unfinished">O&bnoviť</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1193,15 +1199,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1210,34 +1216,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Zapnúť</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1261,6 +1241,19 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -2844,11 +2837,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
-        <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
         <translation type="unfinished">Filtre zariadení</translation>
@@ -2908,83 +2896,88 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">USB radič</translation>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">USB radič</translation>
+    </message>
+    <message>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Menu-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4000,7 +3993,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4670,7 +4663,7 @@
     </message>
     <message>
         <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source>
-        <translation type="obsolete">Indikuje, či je klávesnica odchytávaná hosťovaným OS (<img src=:/hostkey_captured_16px.png/>) alebo nie (<img src=:/hostkey_16px.png/>).</translation>
+        <translation type="obsolete">Indikuje, či je klávesnica odchytávaná hosťovaným OS (<img src=:/hostkey_captured_16px.png/>) alebo nie (<img src=:/hostkey_16px.png/>).</translation>
     </message>
     <message>
         <source><hr>The Remote Desktop Server is listening on port %1</source>
@@ -4694,7 +4687,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4708,8 +4702,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4996,34 +4989,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Mini nástrojová lišta:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Ak je zaškrtnuté, zobrazí v režime na celú obrazovku a v režime plynulého prechodu malú lištu nástrojov.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Zobraziť v rež&ime celej obrazovky/plynulého prechodu</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Z&obraziť na vrchu obrazovky</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5036,15 +5001,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5060,10 +5021,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5112,6 +5069,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5120,6 +5085,10 @@
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5135,8 +5104,8 @@
         <translation type="obsolete">Určuje cestu, kam budú ukladané snímky tohto virtuálneho stroja. Uvedomte si, že snímky môžu zaberať veľkú časť miesta na disku.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Základné</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Základné</translation>
     </message>
     <message>
         <source>&Name:</source>
@@ -5179,8 +5148,8 @@
         <translation type="obsolete">Ovláda množstvo videopamäte poskytnutej virtuálnemu stroju.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Rozšírené</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Rozšírené</translation>
     </message>
     <message>
         <source>Defines the boot device order. Use the checkboxes on the left to enable or disable individual boot devices. Move items up and down to change the device order.</source>
@@ -5231,8 +5200,8 @@
         <translation>Priečinok pre s&nímky:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Popis</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Popis</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5263,10 +5232,6 @@
         <translation type="obsolete">Z&obraziť na vrchu obrazovky</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5279,6 +5244,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">&Pokročilé</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
+        <translation type="unfinished">&Popis</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5295,6 +5276,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5327,16 +5312,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5347,43 +5328,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">100%</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">200%</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Mini nástrojová lišta:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Ak je zaškrtnuté, zobrazí v režime na celú obrazovku a v režime plynulého prechodu malú lištu nástrojov.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Zobraziť v rež&ime celej obrazovky/plynulého prechodu</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="unfinished">Z&obraziť na vrchu obrazovky</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allows to modify VM status-bar contents.</source>
+        <source>Show in &Full-screen/Seamless</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
+        <source>Show at &Top of Screen</source>
+        <translation type="unfinished">Z&obraziť na vrchu obrazovky</translation>
     </message>
     <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5911,23 +5876,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6239,80 +6204,73 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Hot-pluggable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Optical Drive</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Obraz</translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Obraz</translation>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add USB Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6332,6 +6290,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Optical &Drive:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create New Hard Disk...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6344,7 +6310,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6524,35 +6490,35 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6682,31 +6648,31 @@
         <translation type="unfinished"><nobr>Stav: %1</nobr></translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6919,14 +6885,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Zatvoriť</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Prepnúť</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Zatvoriť</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7296,9 +7262,9 @@
         <translation type="obsolete">Stiahnuť</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Pripojiť</translation>
+        <translation type="unfinished">Pripojiť</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -7438,6 +7404,10 @@
         <translation type="obsolete">Zobrazí dialógové okno s informáciami o produkte</translation>
     </message>
     <message>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Release</source>
         <comment>detach medium</comment>
         <translation>Uvoľniť</translation>
@@ -7479,6 +7449,10 @@
         <translation type="obsolete">&Ukončiť</translation>
     </message>
     <message>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>hard disk</source>
         <comment>failed to close ...</comment>
         <translation type="obsolete">pevný disk</translation>
@@ -8152,32 +8126,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Insert</source>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Pripojiť</translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8193,115 +8159,115 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -8372,8 +8338,8 @@
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished">&Názov:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Názov:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -8395,6 +8361,10 @@
         <source>Selects 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>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -8990,7 +8960,7 @@ preskočiť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
     </message>
     <message>
         <source><p>If the above is correct press the <b>Finish</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source>
-        <translation type="obsolete"><p>Ak je vyššie uvedené v poriadku, stlačte tlačidlo <b>Dokončiť</b>. Potom sa začne vytvárať virtuálny stroj.</p><p>Poznámka: Všetky tieto i ďalšie nastavenia pre virtuálny stroj môžete kedykoľvek zmeniť v dialógovom okne <b>Nastavenia</b>, ktoré vyvoláte z ponuky v hlavnom menu.</p></translation>
+        <translation type="obsolete"><p>Ak je vyššie uvedené v poriadku, stlačte tlačidlo <b>Dokončiť</b>. Potom sa začne vytvárať virtuálny stroj.</p><p>Poznámka: Všetky tieto i ďalšie nastavenia pre virtuálny stroj môžete kedykoľvek zmeniť v dialógovom okne <b>Nastavenia</b>, ktoré vyvoláte z ponuky v hlavnom menu.</p></translation>
     </message>
     <message>
         <source>&Finish</source>
@@ -9164,7 +9134,7 @@ preskočiť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
     </message>
     <message>
         <source><p>If the above is correct press the <b>%1</b> button. Once you press it, a new virtual machine will be created. </p><p>Note that you can alter these and all other setting of the created virtual machine at any time using the <b>Settings</b> dialog accessible through the menu of the main window.</p></source>
-        <translation type="obsolete"><p>Ak sú vyššie uvedené údaje v poriadku, stlačte tlačidlo <b>%1</b> Potom sa začne vytvárať virtuálny stroj.</p><p>Poznámka: Všetky tieto i dodatočené nastavenia pre virtuálny stroj môžete kedykoľvek zmeniť v dialógovom okne <b>Nastavenia</b>, ktoré vyvoláte z ponuky v hlavnom menu.</p></translation>
+        <translation type="obsolete"><p>Ak sú vyššie uvedené údaje v poriadku, stlačte tlačidlo <b>%1</b> Potom sa začne vytvárať virtuálny stroj.</p><p>Poznámka: Všetky tieto i dodatočené nastavenia pre virtuálny stroj môžete kedykoľvek zmeniť v dialógovom okne <b>Nastavenia</b>, ktoré vyvoláte z ponuky v hlavnom menu.</p></translation>
     </message>
 </context>
 <context>
@@ -9284,12 +9254,12 @@ preskočiť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manager</source>
-        <comment>Note: main window title which is pretended by the product name.</comment>
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <source>Manager</source>
+        <comment>Note: main window title which is pretended by the product name.</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9459,6 +9429,10 @@ preskočiť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Zatvoriť</translation>
     </message>
@@ -9466,10 +9440,6 @@ preskočiť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -9649,164 +9619,99 @@ preskočiť a pripojiť pevné disky neskôr pomocou dialógu Nastavenia virtuá
 <context>
     <name>UIVMInfoDialog</name>
     <message>
-        <source>Session Information Dialog</source>
-        <translation type="obsolete">Informačné okno o relácii</translation>
-    </message>
-    <message>
-        <source>&Close</source>
-        <translation type="obsolete">&Zatvoriť</translation>
+        <source>%1 - Session Information</source>
+        <translation type="unfinished">%1 - Informácie o relácii</translation>
     </message>
     <message>
-        <source>%1 - Session Information</source>
-        <translation>%1 - Informácie o relácii</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Podrobnosti</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>Prenosy DMA</translation>
+        <translation type="unfinished">Prenosy DMA</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>Prenosy PIO</translation>
+        <translation type="unfinished">Prenosy PIO</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Prečítané dáta</translation>
+        <translation type="unfinished">Prečítané dáta</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Zapísané dáta</translation>
+        <translation type="unfinished">Zapísané dáta</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Prenesené dáta</translation>
+        <translation type="unfinished">Prenesené dáta</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Prijaté dáta</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Zapnutá</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Rozlíšenie obrazovky</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">Štatistika CD/DVD</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Štatistika sieťových adaptérov</translation>
-    </message>
-    <message>
-        <source>Not attached</source>
-        <translation type="obsolete">Nepripojená</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Verzia %1.%2</translation>
+        <translation type="unfinished">Prijaté dáta</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Nedetegované</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Nedetegovaný</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>Hosťovské doplnky</translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation>Typ hostiteľského OS</translation>
-    </message>
-    <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Štatistika pevných diskov</translation>
-    </message>
-    <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Žiadne pevné disky</translation>
-    </message>
-    <message>
-        <source>No Network Adapters</source>
-        <translation>Žiadne sieťové adaptéry</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Zapnuté</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Vypnuté</translation>
-    </message>
-    <message>
-        <source>Nested Paging</source>
-        <translation type="obsolete">Priamy prístup k hardware</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">Nedostupný</translation>
-    </message>
-    <message>
-        <source>Storage Statistics</source>
-        <translation>Štatistiky o úložiskách</translation>
-    </message>
-    <message>
-        <source>No Storage Devices</source>
-        <translation>Bez zariadení pre úložiská</translation>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Nedostupný</translation>
     </message>
     <message>
-        <source>Network Statistics</source>
-        <translation>Sieťové štatistiky</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Priamy prístup k hardware</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Rozlíšenie obrazovky</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation type="unfinished">Nedostupný</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clipboard Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
+        <source>Drag and Drop Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Hosťovské doplnky</translation>
     </message>
     <message>
-        <source>VM Uptime</source>
+        <source>Guest OS Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>Storage Statistics</source>
+        <translation type="unfinished">Štatistiky o úložiskách</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="unfinished">Bez zariadení pre úložiská</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="unfinished">Sieťové štatistiky</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Žiadne sieťové adaptéry</translation>
     </message>
 </context>
 <context>
@@ -10928,11 +10833,11 @@ verzia %1</translation>
         <translation type="obsolete">Otvorí dialóg operácií so zdieľanými priečinkami</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">&Nainštalovať Hosťovské doplnky...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Pripojí inštalačný obraz Hosťovských doplnkov</translation>
     </message>
     <message>
@@ -11211,7 +11116,7 @@ verzia %1</translation>
         <translation type="obsolete">I&nformačné okno o relácii</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Zobrazí informačné okno o relácii</translation>
     </message>
     <message>
@@ -11231,7 +11136,7 @@ verzia %1</translation>
     </message>
     <message>
         <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source>
-        <translation type="obsolete">Indikuje, či je klávesnica odchytávaná hosťovaným OS (<img src=:/hostkey_captured_16px.png/>) alebo nie (<img src=:/hostkey_16px.png/>).</translation>
+        <translation type="obsolete">Indikuje, či je klávesnica odchytávaná hosťovaným OS (<img src=:/hostkey_captured_16px.png/>) alebo nie (<img src=:/hostkey_16px.png/>).</translation>
     </message>
     <message>
         <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source>
@@ -11626,8 +11531,8 @@ verzia %1</translation>
         <translation><nastaviť na východzie></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Aktuálna východzia cesta bude zobrazená po akceptovaní zmien a novom otvorení tohto dialógového okna.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished">Aktuálna východzia cesta bude zobrazená po akceptovaní zmien a novom otvorení tohto dialógového okna.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -11675,7 +11580,8 @@ verzia %1</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Aktuálna východzia cesta bude zobrazená po akceptovaní zmien a novom otvorení tohto dialógového okna.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -12904,6 +12810,16 @@ verzia %1</translation>
         <source>You can create disk image files using the virtual media manager.</source>
         <translation type="obsolete">Obrazy médií môžete vytvoriť pomocou Správcu virtuálnych médií.</translation>
     </message>
+    <message>
+        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
+        <comment>medium</comment>
+        <translation type="unfinished"></translation>
+    </message>
     <message numerus="yes">
         <source>%n year(s)</source>
         <translation>
@@ -13517,51 +13433,11 @@ verzia %1</translation>
         <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Žiadne</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished">Aktívne</translation>
@@ -13592,6 +13468,11 @@ verzia %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -13602,6 +13483,31 @@ verzia %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Žiadne</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -13612,6 +13518,11 @@ verzia %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -13632,17 +13543,17 @@ verzia %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>User interface</source>
-        <comment>DetailsElementType</comment>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Optical Drive)</source>
+        <source>User interface</source>
+        <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>(Optical Drive)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13654,7 +13565,7 @@ verzia %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
+        <source>Encrypted</source>
         <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -13664,11 +13575,6 @@ verzia %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
-        <comment>medium</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Please choose a location for new virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13948,11 +13854,11 @@ je zobrazený <b>tučným</b> písmom. Voľbou <i>Štandardný
         <translation type="obsolete">Zobrazí cestu k štandardnému priečinku VDI. Priečinok sa použije, ak nie je výslovne uvedené inak, pri pridávaní existujúcich a tvorbe nových virtuálnych pevných diskov.</translation>
     </message>
     <message>
-        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the virtual machine folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Obnoví štandardnú cestu k virtuálnym strojom na štandardnú hodnotu. Skutočná štandardná cesta sa zobrazí po prijatí zmien a opätovnom otvorení tohto dialógu.</translation>
     </message>
     <message>
-        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the VDI folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Obnoví štandardnú cestu k VDI na štandardnú hodnotu. Skutočná štandardná cesta sa zobrazí po prijatí zmien a opätovnom otvorení tohto dialógu.</translation>
     </message>
     <message>
@@ -13996,7 +13902,7 @@ je zobrazený <b>tučným</b> písmom. Voľbou <i>Štandardný
         <translation type="obsolete">Otvorí dialóg pre výber autentifikačnej knižnice VRDP.</translation>
     </message>
     <message>
-        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the authentication library file to the default value. The actual default library file will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Obnoví súbor autentifikačnej knižnice na štandardnú hodnotu. Skutočná štandardný súbor autentifikačnej knižnice sa zobrazí po prijatí zmien a opätovnom otvorení tohto dialógu.</translation>
     </message>
     <message>
@@ -14398,15 +14304,15 @@ je zobrazený <b>tučným</b> písmom. Voľbou <i>Štandardný
         <translation type="obsolete">&Zavrieť</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -14998,7 +14904,7 @@ je zobrazený <b>tučným</b> písmom. Voľbou <i>Štandardný
     </message>
     <message>
         <source>Edit the selected shared folder (Ctrl+Space)</source>
-        <translation type="obsolete">Upraví vybraný zdieľaný priečinok (Ctrl + Medzera)</translation>
+        <translation type="obsolete">Upraví vybraný zdieľaný priečinok (Ctrl + Medzera)</translation>
     </message>
     <message>
         <source>Full</source>
@@ -15418,7 +15324,7 @@ je zobrazený <b>tučným</b> písmom. Voľbou <i>Štandardný
     </message>
     <message>
         <source>&Product ID</source>
-        <translation type="obsolete">&ID produktu</translation>
+        <translation type="obsolete">&ID produktu</translation>
     </message>
     <message>
         <source>&Revision</source>
@@ -15484,6 +15390,145 @@ je zobrazený <b>tučným</b> písmom. Voľbou <i>Štandardný
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>Session Information Dialog</source>
+        <translation type="obsolete">Informačné okno o relácii</translation>
+    </message>
+    <message>
+        <source>&Close</source>
+        <translation type="obsolete">&Zatvoriť</translation>
+    </message>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Informácie o relácii</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Podrobnosti</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">Prenosy DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">Prenosy PIO</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Prečítané dáta</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Zapísané dáta</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Prenesené dáta</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Prijaté dáta</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="obsolete">Zapnutá</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Rozlíšenie obrazovky</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">Štatistika CD/DVD</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Štatistika sieťových adaptérov</translation>
+    </message>
+    <message>
+        <source>Not attached</source>
+        <translation type="obsolete">Nepripojená</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Verzia %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Nedetegované</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Nedetegovaný</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Hosťovské doplnky</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Typ hostiteľského OS</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Štatistika pevných diskov</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Žiadne pevné disky</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Žiadne sieťové adaptéry</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Zapnuté</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Vypnuté</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <translation type="obsolete">Priamy prístup k hardware</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">Nedostupný</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Štatistiky o úložiskách</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Bez zariadení pre úložiská</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Sieťové štatistiky</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Priamy prístup k hardware</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Nedostupný</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMListBox</name>
     <message>
         <source><nobr>%1<br></nobr><nobr>%2 since %3</nobr><br><nobr>Session %4</nobr></source>
@@ -16200,7 +16245,7 @@ je zobrazený <b>tučným</b> písmom. Voľbou <i>Štandardný
         <translation type="obsolete">Určuje cestu, kam budú ukladané snímky virtuálneho stroja. Všimnite si, že snímky môžu zaberať veľkú časť diskového priestoru.</translation>
     </message>
     <message>
-        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this dialog again.</source>
+        <source>Resets the snapshot folder path to the default value. The actual default path will be displayed after accepting the changes and opening this window again.</source>
         <translation type="obsolete">Obnoví štandardnú cestu pre snímky. Vlastná štandardná cesta bude zobrazená po prijatí zmien a opätovnom otvorení tohto dialógového okna.</translation>
     </message>
     <message>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
index 5d7efba..ed36de8 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
@@ -315,7 +315,7 @@
         <translation type="obsolete">Информација сесије</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Покажи информације сесије</translation>
     </message>
     <message>
@@ -399,11 +399,11 @@
         <translation type="obsolete">Омогучи или не привезивање удаљене површине (RDP) на ову машину</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">Инсталирај 'додатци госта'...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="unfinished">Инсталирај 'додатци госта'...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Монтирај слику 'додатака госта'</translation>
     </message>
     <message>
@@ -762,92 +762,73 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Монтирај слику 'додатака госта'</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
+        <source>&Webcams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Мрежа</translation>
     </message>
     <message>
-        <source>&Status Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
+        <source>&File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Мрежа</translation>
-    </message>
-    <message>
-        <source>&USB Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Параметри...</translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">По&кажи журнал...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -863,175 +844,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Параметри...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
+        <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
+        <source>&Hard Disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
+        <source>&USB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">По&кажи журнал...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1077,6 +1058,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create new virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1093,7 +1082,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1101,7 +1090,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1125,15 +1114,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1145,11 +1146,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1157,7 +1158,7 @@
         <translation type="unfinished">Ос&вежи</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1201,15 +1202,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1218,34 +1219,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Омогући</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1269,6 +1244,19 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -2984,11 +2972,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
-        <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
         <translation type="unfinished">Филтери уређаја</translation>
@@ -3048,83 +3031,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">USB контролер</translation>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">USB контролер</translation>
+    </message>
+    <message>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Menu-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4151,7 +4139,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4800,7 +4788,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4814,8 +4803,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5114,38 +5102,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Мини алатна-трака:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Ако унето, показати алатну траку у пуном екрану или интегрисаном моду.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Покажи у пуном екрану/интегрисано</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Ако унето, покажи малу алатну траку на врх екрана, уместо на дну.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Покажи на врх екрана</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5158,15 +5114,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">3D {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D {200%?}</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5182,10 +5134,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5234,6 +5182,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5242,6 +5198,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5257,8 +5217,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Показује путању где се налазе снимци машине. Снимци могу користити доста простора.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Класично</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Класично</translation>
     </message>
     <message>
         <source>Identification</source>
@@ -5301,8 +5261,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Контолише дату видео меморију машини.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Напредно</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Напредно</translation>
     </message>
     <message>
         <source>Boo&t Order:</source>
@@ -5389,8 +5349,8 @@ p, li { white-space: pre-wrap; }
         <translation>Фасцикла снимка:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Опис</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Опис</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5481,10 +5441,6 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">одабрали сте 64-битни ОС. Пошто је госту потребно хардверска виртуализација (VT-x/AMD-V), ова способност ће бити омоигучена.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5497,6 +5453,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">Напредно</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
+        <translation type="unfinished">&Опис</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5513,6 +5485,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5545,16 +5521,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5565,28 +5537,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">3D {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D {200%?}</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Мини алатна-трака:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Ако унето, показати алатну траку у пуном екрану или интегрисаном моду.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Покажи у пуном екрану/интегрисано</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Ако унето, покажи малу алатну траку на врх екрана, уместо на дну.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -5596,18 +5560,6 @@ p, li { white-space: pre-wrap; }
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -6268,23 +6220,23 @@ p, li { white-space: pre-wrap; }
         <translation>Показује базну I/O адресу серијалног порта. Вредности су бројеви између <tt>0</tt> и <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6731,60 +6683,32 @@ p, li { white-space: pre-wrap; }
         <source>you are currently using more storage controllers than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2.</source>
         <translation type="obsolete">употребљавате више контролера него што чипсет %1 подржава. Промените тип чипсета у поставке система или умањите број чипсета преко поставке стоваришта: %2.</translation>
     </message>
-    <message>
-        <source>&Port Count:</source>
-        <translation>Број порта:</translation>
-    </message>
-    <message>
-        <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source>
-        <translation>Одабере број порта од SATA контролера који је одабран у дрво стоваришта. Вредност мора да буде макар један више него број порта који Вам треба.</translation>
-    </message>
-    <message>
-        <source>Controller: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No name is currently specified for the controller at position <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add USB Controller</source>
-        <translation type="unfinished"></translation>
+    <message>
+        <source>&Port Count:</source>
+        <translation>Број порта:</translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
-        <translation type="unfinished"></translation>
+        <source>Selects the port count of the SATA storage controller currently selected in the Storage Tree. This must be at least one more than the highest port number you need to use.</source>
+        <translation>Одабере број порта од SATA контролера који је одабран у дрво стоваришта. Вредност мора да буде макар један више него број порта који Вам треба.</translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>Controller: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>No name is currently specified for the controller at position <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6812,7 +6736,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source>&Hot-pluggable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encrypted with key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6837,6 +6770,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Add USB Controller</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Optical Drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Floppy Drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6853,6 +6798,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Optical &Drive:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create New Hard Disk...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6865,7 +6818,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7121,35 +7074,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7299,31 +7252,31 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">USB 2.0 је активно за ову машину. Али, потребно је да <b>%1</b> буде инсталиран. Инсталирајте пакет са VirtualBox сајта. После тога, мочићете да поново упали USB 2.0. Дотле, биће онемогућен осим ако поништите актуелне промене поставке.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7576,14 +7529,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Затвори</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Пребаци</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Затвори</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7828,15 +7781,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete"><p>Не може да се нађе датотека за језик <b>%1</b> у фасцикли <b><nobr>%2</nobr></b>.</p><p>Језик ће бити врачен на Енгленски. Ићи на дијалог <b>Параметри</b> који се отвара са менија <b>Датотека</b> са главног прозора VirtualBox-а, и одабрати постојећи језик са језичка <b>Језик</b>.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>'Гост додатци' је престаро: инсталирана верзија је %1, а очекује се %2. Неке способности (интеграција миша, ауто6величина дисплеја госта) ће највероватније престати да раде.</p><p>Ажурирати 'гост додатци' преко <b>Инсталирај 'гост додатци'</b> са менија <b>Уређаји</b>.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>'Гост додатци' је престаро: инсталирана верзија је %1, а очекује се %2. Неке способности (интеграција миша, ауто6величина дисплеја госта) могу да не раде.</p><p>Препоручено је да се ажурира 'гост додатци' преко <b>Инсталирај 'гост додатци'</b> са менија <b>Уређаји</b>.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>'Гост додатци' је новији за ову верзију: инсталирана верзија је %1, а очекује се %2.</p><p>Употреба новије верзије додатка са старијом веруијом Virtualbox-а није дозвоњено. Инсталирати актуелну верзију 'гост додатци' преко <b>Инсталирај 'гост додатци'</b> са менија <b>Уређаји</b>.</p></translation>
     </message>
     <message>
@@ -7941,9 +7894,9 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Преузми</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Монтирај</translation>
+        <translation type="unfinished">Монтирај</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -8089,8 +8042,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Покажи дијалог са информација производа</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Нађена новија верзија VirtualBox-а! Верзија <b>%1</b> је доступна на <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Можете преузети ову верзију са овим линком:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>Нађена новија верзија VirtualBox-а! Верзија <b>%1</b> је доступна на <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Можете преузети ову верзију са овим линком:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -8220,8 +8173,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Препиши</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Критична грешка се појавила при раду машине, тако да је рад заустављен.</p><p>За помоћ, видети <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> или вашу подршку. Послати садржај журнала <tt>VBox.log</tt> и слику <tt>VBox.png</tt>, које су у фасцикли <nobr><b>%1</b></nobr>, као и опис шта сте радили пре појављивање грешке. Можете исто приступити овим датотек [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Критична грешка се појавила при раду машине, тако да је рад заустављен.</p><p>За помоћ, видети <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> или вашу подршку. Послати садржај журнала <tt>VBox.log</tt> и слику <tt>VBox.png</tt>, које су у фасцикли <nobr><b>%1</b></nobr>, као и опис шта сте радили пре појављивање грешке. Можете исто приступити овим датотекама преко < [...]
     </message>
     <message>
         <source>hard disk</source>
@@ -8684,8 +8637,8 @@ p, li { white-space: pre-wrap; }
         <translation><p>Стовариште овог медијума неће бити избрисан и мочиће да се опет искористи.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
-        <translation type="obsolete"><p>'Додатци госта' делује да није доступан на овој машини, тако да дељене фасцикле не могу да се користе. Да би користили дељене фасцикле, , инсталирајте 'додатци госта' ако није инсталиран, или га поново инсталирајте ако не ради како треба, преко <b>Инсталирај додатци госта</b> из менија <b>Уређаји</b>. Ако је инсталирано а машина није потпуно покренута, онда ће дељење бити доспупно после покретања.&l [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
+        <translation type="unfinished"><p>'Додатци госта' делује да није доступан на овој машини, тако да дељене фасцикле не могу да се користе. Да би користили дељене фасцикле, , инсталирајте 'додатци госта' ако није инсталиран, или га поново инсталирајте ако не ради како треба, преко <b>Инсталирај додатци госта</b> из менија <b>Уређаји</b>. Ако је инсталирано а машина није потпуно покренута, онда ће дељење бити доспупно после покретања. [...]
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
@@ -9143,32 +9096,25 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete"><p>'Додатци госта' делује да није доступан на овој машини, тако да дељене фасцикле не могу да се користе. Да би користили дељене фасцикле, , инсталирајте 'додатци госта' ако није инсталиран, или га поново инсталирајте ако не ради како треба, преко <b>Инсталирај додатци госта</b> из менија <b>Уређаји</b>. Ако је инсталирано а машина није потпуно покренута, онда ће дељење бити доспупно после покретања.&l [...]
     </message>
     <message>
         <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Монтирај</translation>
     </message>
     <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9184,115 +9130,115 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9385,8 +9331,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished">Име:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">Име:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -9408,6 +9354,10 @@ p, li { white-space: pre-wrap; }
         <source>Selects 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>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManagerDialog</name>
@@ -10351,18 +10301,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Машина (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Добродошли у VirtualBox!</h3><p>Леви део прозор показује списак виртуелне машине са рачунара. Списак је празан пошто нисте још креирали виртуелну машину.<img src=:/welcome.png align=right/></p><p>За креацију нове виртуелне машине, стиснути <b>Ново</b> са главне траке која је на горњи део прозора.</p><p>Можете да стиснете <b>F1</b> за инстантни помоћ, или ићи на <a href=http [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="unfinished"><h3>Добродошли у VirtualBox!</h3><p>Леви део прозор показује списак виртуелне машине са рачунара. Списак је празан пошто нисте још креирали виртуелну машину.<img src=:/welcome.png align=right/></p><p>За креацију нове виртуелне машине, стиснути <b>Ново</b> са главне траке која је на горњи део прозора.</p><p>Можете да стиснете <b>F1</b> за инстантни помоћ, или ићи на <a href=ht [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation type="unfinished">Уреди</translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -10534,6 +10480,10 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Затвори</translation>
     </message>
@@ -10541,10 +10491,6 @@ p, li { white-space: pre-wrap; }
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -10640,8 +10586,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Резиме</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Нађена новија верзија VirtualBox-а! Верзија <b>%1</b> је доступна на <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Можете преузети ову верзију са овим линком:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>Нађена новија верзија VirtualBox-а! Верзија <b>%1</b> је доступна на <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Можете преузети ову верзију са овим линком:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -10733,155 +10679,98 @@ p, li { white-space: pre-wrap; }
     <name>UIVMInfoDialog</name>
     <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Информација сесије</translation>
+        <translation type="unfinished">%1 - Информација сесије</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">Детаљи</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">Ради</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>DMA трансфери</translation>
+        <translation type="unfinished">DMA трансфери</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>PIO трансфери</translation>
+        <translation type="unfinished">PIO трансфери</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Читано</translation>
+        <translation type="unfinished">Читано</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Писано</translation>
+        <translation type="unfinished">Писано</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Пренешено</translation>
+        <translation type="unfinished">Пренешено</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Примљено</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Атрибути рада</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Резолуција екрана</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">Статистике CD/DVD</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Статистике мрежног адаптера</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Верзија %1.%2</translation>
+        <translation type="unfinished">Примљено</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Ненађено</translation>
+        <translation type="unfinished">Ненађено</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Ненађено</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>Додатци госта</translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation>Тип ОС госта</translation>
-    </message>
-    <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Статистике хард диска</translation>
-    </message>
-    <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Без хард диска</translation>
-    </message>
-    <message>
-        <source>No Network Adapters</source>
-        <translation>Без мрежних адаптера</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Упаљено</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Угашено</translation>
-    </message>
-    <message>
-        <source>Nested Paging</source>
-        <translation type="obsolete">Подметнуто записивање</translation>
-    </message>
-    <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <translation type="unfinished">Ненађено</translation>
     </message>
     <message>
         <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">Недоступно</translation>
-    </message>
-    <message>
-        <source>Storage Statistics</source>
-        <translation>Статистике стоваришта</translation>
-    </message>
-    <message>
-        <source>No Storage Devices</source>
-        <translation>Нема стоваришна уређаја</translation>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Недоступно</translation>
     </message>
     <message>
-        <source>Network Statistics</source>
-        <translation>Мрежне статистике</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Атрибути рада</translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Подметнуто записивање</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Резолуција екрана</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>Недоступно</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clipboard Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
+        <source>Drag and Drop Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Додатци госта</translation>
     </message>
     <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Тип ОС госта</translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>Storage Statistics</source>
+        <translation type="unfinished">Статистике стоваришта</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="unfinished">Нема стоваришна уређаја</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="unfinished">Мрежне статистике</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Без мрежних адаптера</translation>
     </message>
 </context>
 <context>
@@ -11892,11 +11781,11 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">креирај или промени дељене фасцикле</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">&Инсталирај 'додатци госта'...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Монтирај слику 'додатака госта'</translation>
     </message>
     <message>
@@ -12111,7 +12000,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Информација сесије</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Покажи информације сесије</translation>
     </message>
     <message>
@@ -12283,8 +12172,8 @@ p, li { white-space: pre-wrap; }
         <translation><Рисетуј на иницијално></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Актуелна путања ће бити показана после прихватања промене и поновног отварање овог дијалога.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished">Актуелна путања ће бити показана после прихватања промене и поновног отварање овог дијалога.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -12332,7 +12221,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Актуелна путања ће бити показана после прихватања промене и поновног отварање овог дијалога.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -13494,7 +13384,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Привезивање овог хард диска ће бити индиректан користечи новог креираног различитог хард диска.</translation>
+        <translation>Привезивање овог хард диска ће бити индиректан користечи новог креираног различитог хард диска.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -13504,7 +13394,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Овај базни хард диск је индиректно прикачен са овим различитим диском:</translation>
+        <translation>Овај базни хард диск је индиректно прикачен са овим различитим диском:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -14137,56 +14027,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB</source>
-        <comment>StorageControllerType</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Ништа</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Иницијално</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished">Активно</translation>
@@ -14217,6 +14062,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -14227,6 +14077,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Ништа</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Иницијално</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -14237,6 +14112,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -14257,6 +14137,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB</source>
+        <comment>StorageControllerType</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -14266,16 +14156,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14590,15 +14480,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Затвори</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -14721,8 +14611,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Неуспешно пријављивање везе.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to thir [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to thir [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -14741,8 +14631,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Одабрати земљу/територију</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
-        <translation type="obsolete"><p>Молимо вас да попунити овај формулар да би знали да користите VirtualBox и, необавезно, да будете информисани о ажурирања VirtualBox-а.</p><p>Унети само латинске карактере. Sun Microsystems користи ове информације само за статистике и да вам пошаље VirtualBox новости. Sun Microsystems неће никада попустити Ваше податке другима. Детаљи о употреби личних информацијама може се наћи у <b>Политика приватности</b> руковника  [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
+        <translation type="obsolete"><p>Молимо вас да попунити овај формулар да би знали да користите VirtualBox и, необавезно, да будете информисани о ажурирања VirtualBox-а.</p><p>Унети само латинске карактере. Sun Microsystems користи ове информације само за статистике и да вам пошаље VirtualBox новости. Sun Microsystems неће никада попустити Ваше податке другима. Детаљи о употреби личних информацијама може се наћи у <b>Политика приватности</b> руковника  [...]
     </message>
     <message>
         <source>I &already have a Sun Online account:</source>
@@ -14947,8 +14837,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Паузирај рад машине</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Добродошли у VirtualBox!</h3><p>Леви део прозор показује списак виртуелне машине са рачунара. Списак је празан пошто нисте још креирали виртуелну машину.<img src=:/welcome.png align=right/></p><p>За креацију нове виртуелне машине, стиснути <b>Ново</b> са главне траке која је на горњи део прозора.</p><p>Можете да стиснете <b>F1</b> за инстантни помоћ, или ићи на <a href=http [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Добродошли у VirtualBox!</h3><p>Леви део прозор показује списак виртуелне машине са рачунара. Списак је празан пошто нисте још креирали виртуелну машину.<img src=:/welcome.png align=right/></p><p>За креацију нове виртуелне машине, стиснути <b>Ново</b> са главне траке која је на горњи део прозора.</p><p>Можете да стиснете <b>F1</b> за инстантни помоћ, или ићи на <a href=http [...]
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
@@ -15410,6 +15300,141 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Информација сесије</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">Детаљи</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">Ради</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">DMA трансфери</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">PIO трансфери</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Читано</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Писано</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Пренешено</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Примљено</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Атрибути рада</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Резолуција екрана</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">Статистике CD/DVD</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Статистике мрежног адаптера</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Верзија %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Ненађено</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Ненађено</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Додатци госта</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Тип ОС госта</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Статистике хард диска</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Без хард диска</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Без мрежних адаптера</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Упаљено</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Угашено</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <translation type="obsolete">Подметнуто записивање</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">Недоступно</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Статистике стоваришта</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Нема стоваришна уређаја</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Мрежне статистике</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Подметнуто записивање</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Недоступно</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMLogViewer</name>
     <message>
         <source>Log Viewer</source>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
index 0e8d2a6..2684236 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
@@ -339,7 +339,7 @@
     </message>
     <message>
         <source>Suspend the execution of the virtual machine</source>
-        <translation></translation>
+        <translation>Pausa körningen av den virtuella maskinen</translation>
     </message>
     <message>
         <source>R&esume</source>
@@ -569,36 +569,36 @@
     <message>
         <source>&File</source>
         <comment>Mac OS X version</comment>
-        <translation type="unfinished">&Arkiv</translation>
+        <translation>&Arkiv</translation>
     </message>
     <message>
         <source>&File</source>
         <comment>Non Mac OS X version</comment>
-        <translation type="unfinished">&Arkiv</translation>
+        <translation>&Arkiv</translation>
     </message>
     <message>
         <source>&Virtual Media Manager...</source>
-        <translation type="unfinished">Hanterare för virtuella &media...</translation>
+        <translation>Hanterare för virtuella &media...</translation>
     </message>
     <message>
         <source>Display the Virtual Media Manager window</source>
-        <translation type="unfinished">Visa Hanterare för virtuella media</translation>
+        <translation>Visa Hanterare för virtuella media</translation>
     </message>
     <message>
         <source>&Import Appliance...</source>
-        <translation type="unfinished">&Importera appliance...</translation>
+        <translation>&Importera appliance...</translation>
     </message>
     <message>
         <source>Import an appliance into VirtualBox</source>
-        <translation type="unfinished">Importera en appliance till VirtualBox</translation>
+        <translation>Importera en appliance till VirtualBox</translation>
     </message>
     <message>
         <source>&Export Appliance...</source>
-        <translation type="unfinished">&Exportera appliance...</translation>
+        <translation>&Exportera appliance...</translation>
     </message>
     <message>
         <source>Export one or more VirtualBox virtual machines as an appliance</source>
-        <translation type="unfinished">Exportera en appliance från virtuella maskiner från VirtualBox</translation>
+        <translation>Exportera en eller flera virtuella VirtualBox-maskiner som en appliance</translation>
     </message>
     <message>
         <source>&Preferences...</source>
@@ -607,19 +607,19 @@
     </message>
     <message>
         <source>Display the global settings window</source>
-        <translation type="obsolete">Visa allmänna inställningar</translation>
+        <translation type="obsolete">Visa fönster för allmänna inställningar</translation>
     </message>
     <message>
         <source>E&xit</source>
-        <translation type="unfinished">A&vsluta</translation>
+        <translation>A&vsluta</translation>
     </message>
     <message>
         <source>Close application</source>
-        <translation type="unfinished">Stäng programmet</translation>
+        <translation>Stäng programmet</translation>
     </message>
     <message>
         <source>&New...</source>
-        <translation type="unfinished">&Ny...</translation>
+        <translation>&Ny...</translation>
     </message>
     <message>
         <source>Create a new virtual machine</source>
@@ -627,7 +627,7 @@
     </message>
     <message>
         <source>&Add...</source>
-        <translation type="unfinished">&Lägg till...</translation>
+        <translation>&Lägg till...</translation>
     </message>
     <message>
         <source>Add an existing virtual machine</source>
@@ -635,7 +635,7 @@
     </message>
     <message>
         <source>Cl&one...</source>
-        <translation type="unfinished">Kl&ona...</translation>
+        <translation>Kl&ona...</translation>
     </message>
     <message>
         <source>Clone the selected virtual machine</source>
@@ -651,7 +651,7 @@
     </message>
     <message>
         <source>S&tart</source>
-        <translation type="unfinished">St&arta</translation>
+        <translation>St&arta</translation>
     </message>
     <message>
         <source>Start the selected virtual machine</source>
@@ -659,7 +659,7 @@
     </message>
     <message>
         <source>S&how</source>
-        <translation type="unfinished">V&isa</translation>
+        <translation>V&isa</translation>
     </message>
     <message>
         <source>Switch to the window of the selected virtual machine</source>
@@ -667,7 +667,7 @@
     </message>
     <message>
         <source>Discard</source>
-        <translation type="unfinished">Förkasta</translation>
+        <translation>Förkasta</translation>
     </message>
     <message>
         <source>D&iscard Saved State</source>
@@ -687,7 +687,7 @@
     </message>
     <message>
         <source>Show &Log...</source>
-        <translation type="unfinished">Visa lo&gg...</translation>
+        <translation>Visa lo&gg...</translation>
     </message>
     <message>
         <source>Show the log files of the selected virtual machine</source>
@@ -735,11 +735,11 @@
     </message>
     <message>
         <source>Take Sn&apshot...</source>
-        <translation type="unfinished">Ta ö&gonblicksbild...</translation>
+        <translation>Ta ö&gonblicksbild...</translation>
     </message>
     <message>
         <source>Take Screensh&ot...</source>
-        <translation type="unfinished">Ta skärmbil&d...</translation>
+        <translation>Ta skärmbil&d...</translation>
     </message>
     <message>
         <source>Take a screenshot of the virtual machine</source>
@@ -759,35 +759,35 @@
     </message>
     <message>
         <source>&Close</source>
-        <translation type="unfinished">S&täng</translation>
+        <translation>S&täng</translation>
     </message>
     <message>
         <source>Po&wer Off</source>
-        <translation type="unfinished">Stäng a&v</translation>
+        <translation>Stäng a&v</translation>
     </message>
     <message>
         <source>Power off the virtual machine</source>
-        <translation type="unfinished">Stäng av den virtuella maskinen</translation>
+        <translation>Stäng av den virtuella maskinen</translation>
     </message>
     <message>
         <source>&Contents...</source>
-        <translation type="unfinished">&Innehåll...</translation>
+        <translation>&Innehåll...</translation>
     </message>
     <message>
         <source>Show help contents</source>
-        <translation type="unfinished"></translation>
+        <translation>Visa hjälpinnehållet</translation>
     </message>
     <message>
         <source>Open the browser and go to the VirtualBox product web site</source>
-        <translation type="unfinished">Öppna webbläsaren och gå till VirtualBox produktwebbplats</translation>
+        <translation>Öppna webbläsaren och gå till VirtualBox produktwebbplats</translation>
     </message>
     <message>
         <source>Go back to showing all suppressed warnings and messages</source>
-        <translation type="unfinished">Gör att alla tysta varningar och meddelanden visas igen</translation>
+        <translation>Gör att alla tysta varningar och meddelanden visas igen</translation>
     </message>
     <message>
         <source>&Network Operations Manager...</source>
-        <translation type="unfinished"></translation>
+        <translation>Hanterare för &nätverksåtgärder...</translation>
     </message>
     <message>
         <source>Show Network Operations Manager</source>
@@ -795,11 +795,11 @@
     </message>
     <message>
         <source>Check for a new VirtualBox version</source>
-        <translation type="unfinished">Leta efter en ny version av VirtualBox</translation>
+        <translation>Leta efter en ny version av VirtualBox</translation>
     </message>
     <message>
         <source>&About VirtualBox...</source>
-        <translation type="unfinished">&Om VirtualBox...</translation>
+        <translation>&Om VirtualBox...</translation>
     </message>
     <message>
         <source>Show a window with product information</source>
@@ -807,155 +807,255 @@
     </message>
     <message>
         <source>&Group</source>
-        <translation type="unfinished"></translation>
+        <translation>&Grupp</translation>
+    </message>
+    <message>
+        <source>Rename the selected virtual machine group</source>
+        <translation type="obsolete">Byt namn på markerad virtuell maskingrupp</translation>
+    </message>
+    <message>
+        <source>Re&fresh...</source>
+        <translation type="obsolete">Up&pdatera...</translation>
+    </message>
+    <message>
+        <source>Add a new group based on the items selected</source>
+        <translation type="obsolete">Lägg till en ny grupp baserad på markerade objekt</translation>
     </message>
     <message>
         <source>&Remove...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ta bort...</translation>
+    </message>
+    <message>
+        <source>D&iscard saved state...</source>
+        <translation type="obsolete">För&kasta sparat tillstånd...</translation>
     </message>
     <message>
         <source>&VirtualBox Web Site...</source>
-        <translation type="unfinished">&VirtualBox webbplats...</translation>
+        <translation>&VirtualBox webbplats...</translation>
     </message>
     <message>
         <source>&Reset All Warnings</source>
-        <translation type="unfinished">&Nollställ alla varningar</translation>
+        <translation>&Nollställ alla varningar</translation>
     </message>
     <message>
         <source>C&heck for Updates...</source>
-        <translation type="unfinished">Leta e&fter uppdateringar...</translation>
+        <translation>Leta e&fter uppdateringar...</translation>
     </message>
     <message>
         <source>Rena&me Group...</source>
-        <translation type="unfinished"></translation>
+        <translation>Byt na&mn på grupp...</translation>
+    </message>
+    <message>
+        <source>Sort the items of the selected virtual machine group alphabetically</source>
+        <translation type="obsolete">Sortera objekten alfabetiskt i den markerade virtuella maskingruppen</translation>
+    </message>
+    <message>
+        <source>Remove the selected virtual machines</source>
+        <translation type="obsolete">Ta bort markerade virtuella maskiner</translation>
+    </message>
+    <message>
+        <source>Start the selected virtual machines</source>
+        <translation type="obsolete">Starta markerade virtuella maskiner</translation>
+    </message>
+    <message>
+        <source>Switch to the windows of the selected virtual machines</source>
+        <translation type="obsolete">Växla till fönstren för de markerade virtuella maskinerna</translation>
+    </message>
+    <message>
+        <source>Suspend the execution of the selected virtual machines</source>
+        <translation type="obsolete">Pausa körningen av markerade virtuella maskiner</translation>
+    </message>
+    <message>
+        <source>Reset the selected virtual machines</source>
+        <translation type="obsolete">Starta om markerade virtuella maskiner</translation>
+    </message>
+    <message>
+        <source>Discard the saved state of the selected virtual machines</source>
+        <translation type="obsolete">Förkasta sparat tillstånd för markerade virtuella maskiner</translation>
+    </message>
+    <message>
+        <source>Show the VirtualBox Machine Definition file in Finder</source>
+        <translation type="obsolete">Visa VirtualBox Machine Definition-filen i Finder</translation>
+    </message>
+    <message>
+        <source>Show the VirtualBox Machine Definition file in Explorer</source>
+        <translation type="obsolete">Visa VirtualBox Machine Definition-filen i Utforskaren</translation>
+    </message>
+    <message>
+        <source>Creates an alias file to the VirtualBox Machine Definition file on your desktop</source>
+        <translation type="obsolete">Skapar en aliasfil till VirtualBox Machine Definition-filen på ditt skrivbord</translation>
+    </message>
+    <message>
+        <source>Creates an shortcut file to the VirtualBox Machine Definition file on your desktop</source>
+        <translation type="obsolete">Skapar en genvägsfil till VirtualBox Machine Definition-filen på ditt skrivbord</translation>
+    </message>
+    <message>
+        <source>Save State</source>
+        <translation type="obsolete">Spara tillstånd</translation>
+    </message>
+    <message>
+        <source>Save the machine state of the selected virtual machines</source>
+        <translation type="obsolete">Spara maskintillståndet för de markerade virtuella maskinerna</translation>
+    </message>
+    <message>
+        <source>Send the ACPI Power Button press event to the selected virtual machines</source>
+        <translation type="obsolete">Skicka ACPI Power Button-händelse till de markerade virtuella maskinerna</translation>
+    </message>
+    <message>
+        <source>Power off the selected virtual machines</source>
+        <translation type="obsolete">Stäng av de markerade virtuella maskinerna</translation>
     </message>
     <message>
         <source>&New Machine...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ny maskin...</translation>
     </message>
     <message>
         <source>&Add Machine...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Lägg till maskin...</translation>
+    </message>
+    <message>
+        <source>&Ungroup...</source>
+        <translation type="obsolete">Ta &bort ur grupp...</translation>
+    </message>
+    <message>
+        <source>Ungroup items of the selected virtual machine group</source>
+        <translation type="obsolete">Ta bort objekt ur den markerade virtuella maskingruppen</translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="obsolete">Sortera</translation>
     </message>
     <message>
         <source>Gro&up</source>
-        <translation type="unfinished"></translation>
+        <translation>Gr&upp</translation>
+    </message>
+    <message>
+        <source>Sort the group of the first selected machine alphabetically</source>
+        <translation type="obsolete">Sortera gruppen efter första markerade maskinen i alfabetsordning</translation>
     </message>
     <message>
         <source>Shared &Clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Delade &urklipp</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop</source>
+        <translation type="obsolete">Dra och släpp</translation>
+    </message>
+    <message>
+        <source>Save the machine state of the virtual machine</source>
+        <translation type="obsolete">Spara maskintillståndet för den virtuella maskinen</translation>
     </message>
     <message>
         <source>&Network Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Nätverksinställningar...</translation>
     </message>
     <message>
         <source>&Shared Folders Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Inställningar för &delade mappar...</translation>
     </message>
     <message>
         <source>R&emote Display</source>
-        <translation type="unfinished"></translation>
+        <translation>F&järrskrivbord</translation>
+    </message>
+    <message>
+        <source>Toggle remote desktop (RDP) connections to this machine</source>
+        <translation type="obsolete">Växla fjärrskrivbordsanslutningar (RDP) till denna maskin</translation>
     </message>
     <message>
         <source>&Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>&Videofångst</translation>
+    </message>
+    <message>
+        <source>Toggle video capture</source>
+        <translation type="obsolete">Växla videofångst</translation>
     </message>
     <message>
         <source>&Video Capture Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Inställningar för vide&ofångst...</translation>
     </message>
     <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
+        <source>Configure video capture settings</source>
+        <translation type="obsolete">Konfigurera inställningar för videofångst</translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
+        <source>Popup Menu</source>
+        <translation>Popup-meny</translation>
     </message>
     <message>
-        <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
+        <source>Show Session Information Window</source>
+        <translation type="obsolete">Visa fönstret för sessionsinformation</translation>
     </message>
     <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <source>&Webcams</source>
+        <translation>&Webbkameror</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation>Mata &in cd-avbild för gästtillägg...</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <translation type="obsolete">Mata in diskfilen för gästtillägg i den virtuella enheten</translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Nätverk</translation>
     </message>
     <message>
-        <source>&Status Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Arkiv</translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Nätverk</translation>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
+        <translation type="unfinished">&Inställningar...</translation>
     </message>
     <message>
-        <source>&USB Settings...</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
-        <translation type="unfinished">Visa lo&gg...</translation>
-    </message>
-    <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Arkiv</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -971,175 +1071,175 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
-        <translation type="unfinished">&Inställningar...</translation>
+        <source>Show Status &Bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
+        <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
+        <source>&Hard Disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
+        <source>&USB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
+        <translation type="unfinished">Visa lo&gg...</translation>
     </message>
     <message>
         <source>%1%</source>
@@ -1178,10 +1278,18 @@
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Inga anslutna webbkameror</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
+        <translation type="unfinished">Inga webbkameror som stöds är anslutna till värddatorn</translation>
+    </message>
+    <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1201,7 +1309,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1209,7 +1317,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1233,15 +1341,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1253,15 +1373,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1305,15 +1425,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1322,33 +1442,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Aktivera</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1371,6 +1466,18 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -1498,7 +1605,7 @@
     </message>
     <message>
         <source>&Reinitialize the MAC address of all network cards</source>
-        <translation>Ominiti&era MAC-adressen för alla nätverkskort</translation>
+        <translation>Initi&era om MAC-adressen för alla nätverkskort</translation>
     </message>
     <message>
         <source>Storage Controller (IDE)</source>
@@ -2207,7 +2314,7 @@
     <name>UIDnDHandler</name>
     <message>
         <source>Dropping data ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Släpper data ...</translation>
     </message>
     <message>
         <source>Retrieving data ...</source>
@@ -2215,6 +2322,13 @@
     </message>
 </context>
 <context>
+    <name>UIDnDMimeData</name>
+    <message>
+        <source>Dropping data ...</source>
+        <translation type="obsolete">Släpper data ...</translation>
+    </message>
+</context>
+<context>
     <name>UIDownloader</name>
     <message>
         <source>Cancel</source>
@@ -2254,11 +2368,11 @@
     </message>
     <message>
         <source>Looking for %1...</source>
-        <translation type="unfinished">Letar efter %1...</translation>
+        <translation>Letar efter %1...</translation>
     </message>
     <message>
         <source>Downloading %1...</source>
-        <translation type="unfinished">Hämtar %1...</translation>
+        <translation>Hämtar %1...</translation>
     </message>
 </context>
 <context>
@@ -2285,7 +2399,7 @@
     </message>
     <message>
         <source>VirtualBox Guest Additions</source>
-        <translation type="unfinished">VirtualBox Gästtillägg</translation>
+        <translation>VirtualBox Gästtillägg</translation>
     </message>
 </context>
 <context>
@@ -2296,7 +2410,7 @@
     </message>
     <message>
         <source>VirtualBox Extension Pack</source>
-        <translation type="unfinished">VirtualBox tilläggspaket</translation>
+        <translation>VirtualBox tilläggspaket</translation>
     </message>
 </context>
 <context>
@@ -2307,7 +2421,7 @@
     </message>
     <message>
         <source>VirtualBox User Manual</source>
-        <translation type="unfinished">Handbok för VirtualBox</translation>
+        <translation>Handbok för VirtualBox</translation>
     </message>
 </context>
 <context>
@@ -2868,69 +2982,69 @@ p, li { white-space: pre-wrap; }
     <message>
         <source><b>%1</b></source>
         <comment>Group item tool-tip / Group name</comment>
-        <translation type="unfinished"></translation>
+        <translation><b>%1</b></translation>
     </message>
     <message numerus="yes">
         <source>%n group(s)</source>
         <comment>Group item tool-tip / Group info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n grupp</numerusform>
+            <numerusform>%n grupper</numerusform>
         </translation>
     </message>
     <message>
         <source><nobr>%1</nobr></source>
         <comment>Group item tool-tip / Group info wrapper</comment>
-        <translation type="unfinished"><nobr>%1</nobr></translation>
+        <translation><nobr>%1</nobr></translation>
     </message>
     <message numerus="yes">
         <source>%n machine(s)</source>
         <comment>Group item tool-tip / Machine info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%n maskin</numerusform>
+            <numerusform>%n maskiner</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>(%n running)</source>
         <comment>Group item tool-tip / Running machine info</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>(%n kör)</numerusform>
+            <numerusform>(%n kör)</numerusform>
         </translation>
     </message>
     <message>
         <source><nobr>%1</nobr></source>
         <comment>Group item tool-tip / Machine info wrapper</comment>
-        <translation type="unfinished"><nobr>%1</nobr></translation>
+        <translation><nobr>%1</nobr></translation>
     </message>
     <message>
         <source><nobr>%1 %2</nobr></source>
         <comment>Group item tool-tip / Machine info wrapper, including running</comment>
-        <translation type="unfinished"><nobr>%1</nobr> {1 %2<?}</translation>
+        <translation><nobr>%1 %2</nobr></translation>
     </message>
     <message>
         <source>Collapse group</source>
-        <translation type="unfinished"></translation>
+        <translation>Fäll ut grupp</translation>
     </message>
     <message>
         <source>Expand group</source>
-        <translation type="unfinished"></translation>
+        <translation>Fäll in grupp</translation>
     </message>
     <message>
         <source>Enter group</source>
-        <translation type="unfinished"></translation>
+        <translation>Gå in i grupp</translation>
     </message>
     <message>
         <source>Exit group</source>
-        <translation type="unfinished"></translation>
+        <translation>Gå ur grupp</translation>
     </message>
 </context>
 <context>
     <name>UIGChooserModel</name>
     <message>
         <source>New group</source>
-        <translation type="unfinished"></translation>
+        <translation>Ny grupp</translation>
     </message>
 </context>
 <context>
@@ -2938,12 +3052,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Name</source>
         <comment>details (general)</comment>
-        <translation type="unfinished">Namn</translation>
+        <translation>Namn</translation>
     </message>
     <message>
         <source>Groups</source>
         <comment>details (general)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Grupper</translation>
     </message>
     <message>
         <source>Information inaccessible</source>
@@ -2953,52 +3067,57 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>%1 MB</source>
         <comment>details</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>Processors</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Processorer</translation>
+        <translation>Processorer</translation>
     </message>
     <message>
         <source>%1%</source>
         <comment>details</comment>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>VT-x/AMD-V</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">VT-x/AMD-V</translation>
+        <translation>VT-x/AMD-V</translation>
     </message>
     <message>
         <source>PAE/NX</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">PAE/NX</translation>
+        <translation>PAE/NX</translation>
     </message>
     <message>
         <source>Acceleration</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Acceleration</translation>
+        <translation>Acceleration</translation>
     </message>
     <message>
         <source>Screens</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">Skärmar</translation>
+        <translation>Skärmar</translation>
     </message>
     <message>
         <source>3D</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">3D</translation>
+        <translation>3D</translation>
     </message>
     <message>
         <source>Acceleration</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">Acceleration</translation>
+        <translation>Acceleration</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (display/vrde/VRDE server)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inaktiverad</translation>
+    </message>
+    <message>
+        <source>[CD/DVD]</source>
+        <comment>details (storage)</comment>
+        <translation type="obsolete">[CD/DVD]</translation>
     </message>
     <message>
         <source>Not attached</source>
@@ -3008,12 +3127,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Controller</source>
         <comment>details (audio)</comment>
-        <translation type="unfinished">Styrkort</translation>
+        <translation>Styrkort</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (audio)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inaktiverad</translation>
     </message>
     <message>
         <source>Bridged adapter, %1</source>
@@ -3043,181 +3162,181 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Adapter %1</source>
         <comment>details (network)</comment>
-        <translation type="unfinished">Adapter %1</translation>
+        <translation>Adapter %1</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (network/adapter)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inaktiverad</translation>
     </message>
     <message>
         <source>Port %1</source>
         <comment>details (serial)</comment>
-        <translation type="unfinished">Port %1</translation>
+        <translation>Port %1</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (serial)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inaktiverad</translation>
     </message>
     <message>
         <source>Port %1</source>
         <comment>details (parallel)</comment>
-        <translation type="unfinished">Port %1</translation>
+        <translation>Port %1</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (parallel)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inaktiverad</translation>
     </message>
     <message>
         <source>%1 (%2 active)</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished">%1 (%2 aktiv)</translation>
+        <translation>%1 (%2 aktiv)</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inaktiverad</translation>
     </message>
     <message>
         <source>None</source>
         <comment>details (shared folders)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ingen</translation>
     </message>
     <message>
         <source>None</source>
         <comment>details (description)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ingen</translation>
     </message>
     <message>
         <source>Operating System</source>
         <comment>details (general)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Operativsystem</translation>
     </message>
     <message>
         <source>Information Inaccessible</source>
         <comment>details</comment>
-        <translation type="unfinished"></translation>
+        <translation>Information inte tillgänglig</translation>
     </message>
     <message>
         <source>Base Memory</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Basminne</translation>
+        <translation>Basminne</translation>
     </message>
     <message>
         <source>Execution Cap</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Exekveringsgräns</translation>
+        <translation>Exekveringsgräns</translation>
     </message>
     <message>
         <source>Boot Order</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Uppstartsordning</translation>
+        <translation>Uppstartsordning</translation>
     </message>
     <message>
         <source>Nested Paging</source>
         <comment>details (system)</comment>
-        <translation type="unfinished">Nested Paging</translation>
+        <translation>Nested Paging</translation>
     </message>
     <message>
         <source>Video Memory</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">Grafikminne</translation>
+        <translation>Grafikminne</translation>
     </message>
     <message>
         <source>2D Video</source>
         <comment>details (display)</comment>
-        <translation type="unfinished"></translation>
+        <translation>2D-grafik</translation>
     </message>
     <message>
         <source>Remote Desktop Server Port</source>
         <comment>details (display/vrde)</comment>
-        <translation type="unfinished">Port för fjärrskrivbordsserver</translation>
+        <translation>Port för fjärrskrivbordsserver</translation>
     </message>
     <message>
         <source>Remote Desktop Server</source>
         <comment>details (display/vrde)</comment>
-        <translation type="unfinished">Fjärrskrivbordsserver</translation>
+        <translation>Fjärrskrivbordsserver</translation>
     </message>
     <message>
         <source>Not Attached</source>
         <comment>details (storage)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inte ansluten</translation>
     </message>
     <message>
         <source>Host Driver</source>
         <comment>details (audio)</comment>
-        <translation type="unfinished">Värddrivrutin</translation>
+        <translation>Värddrivrutin</translation>
     </message>
     <message>
         <source>Bridged Adapter, %1</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Bryggad adapter, %1</translation>
     </message>
     <message>
         <source>Internal Network, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Internt nätverk, '%1'</translation>
     </message>
     <message>
         <source>Host-only Adapter, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Endast-värd-adapter, '%1'</translation>
     </message>
     <message>
         <source>Generic Driver, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Allmän drivrutin, '%1'</translation>
     </message>
     <message>
         <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Allmän drivrutin, '%1' {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished">Enhetsfilter</translation>
+        <translation>Enhetsfilter</translation>
     </message>
     <message>
         <source>USB Controller Inaccessible</source>
         <comment>details (usb)</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB-styrkort inte tillgängligt</translation>
     </message>
     <message>
         <source>Shared Folders</source>
         <comment>details (shared folders)</comment>
-        <translation type="unfinished">Delade mappar</translation>
+        <translation>Delade mappar</translation>
     </message>
     <message>
         <source>Video Capture File</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Fil för videofångst</translation>
     </message>
     <message>
         <source>Video Capture Attributes</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Attribut för videofångst</translation>
     </message>
     <message>
         <source>Video Capture</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Videofångst</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (display/video capture)</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inaktiverad</translation>
     </message>
     <message>
         <source>NAT Network, '%1'</source>
         <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>NAT-nätverk, '%1'</translation>
     </message>
     <message>
         <source>Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>Bildstorlek: %1x%2, Bildfrekvens: %3 bilder/s, Bitfrekvens: %4 kbps</translation>
     </message>
     <message>
         <source>Minimal Paravirtualization</source>
@@ -3235,83 +3354,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">USB-styrkort</translation>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">USB-styrkort</translation>
+    </message>
+    <message>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Menu-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3546,23 +3670,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Every 0.5 s</source>
-        <translation type="unfinished">Var 0,5 s</translation>
+        <translation>Var 0,5 s</translation>
     </message>
     <message>
         <source>Every 1 s</source>
-        <translation type="unfinished">Var 1 s</translation>
+        <translation>Var 1 s</translation>
     </message>
     <message>
         <source>Every 2 s</source>
-        <translation type="unfinished">Var 2 s</translation>
+        <translation>Var 2 s</translation>
     </message>
     <message>
         <source>Every 5 s</source>
-        <translation type="unfinished">Var 5 s</translation>
+        <translation>Var 5 s</translation>
     </message>
     <message>
         <source>Every 10 s</source>
-        <translation type="unfinished">Var 10 s</translation>
+        <translation>Var 10 s</translation>
     </message>
     <message>
         <source>No Preview</source>
@@ -3570,22 +3694,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Update disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Uppdatering inaktiverad</translation>
     </message>
     <message>
         <source>No preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen förhandsvisning</translation>
     </message>
 </context>
 <context>
     <name>UIGlobalSettingsDisplay</name>
     <message>
         <source>Maximum Guest Screen &Size:</source>
-        <translation type="unfinished">Maximal storlek för gästs&kärm:</translation>
+        <translation>Maximal storlek för gästs&kärm:</translation>
     </message>
     <message>
         <source>&Width:</source>
-        <translation type="unfinished">&Bredd:</translation>
+        <translation>&Bredd:</translation>
     </message>
     <message>
         <source>Specifies the maximum width which we would like the guest to use.</source>
@@ -3593,7 +3717,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Height:</source>
-        <translation type="unfinished">&Höjd:</translation>
+        <translation>&Höjd:</translation>
     </message>
     <message>
         <source>Specifies the maximum height which we would like the guest to use.</source>
@@ -3602,29 +3726,29 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Automatic</source>
         <comment>Maximum Guest Screen Size</comment>
-        <translation type="unfinished">Automatiskt</translation>
+        <translation>Automatiskt</translation>
     </message>
     <message>
         <source>Suggest a reasonable maximum screen size to the guest. The guest will only see this suggestion when guest additions are installed.</source>
-        <translation type="unfinished">Föreslå en rimlig maximal skärmstorlek för gästen. Gästen kommer endast att se detta förslag när gästtillägg har installerats.</translation>
+        <translation>Föreslå en rimlig maximal skärmstorlek för gästen. Gästen kommer endast att se detta förslag när gästtillägg har installerats.</translation>
     </message>
     <message>
         <source>None</source>
         <comment>Maximum Guest Screen Size</comment>
-        <translation type="unfinished">Ingen</translation>
+        <translation>Ingen</translation>
     </message>
     <message>
         <source>Do not attempt to limit the size of the guest screen.</source>
-        <translation type="unfinished">Försök inte att begränsa storleken för gästskärmen.</translation>
+        <translation>Försök inte att begränsa storleken för gästskärmen.</translation>
     </message>
     <message>
         <source>Hint</source>
         <comment>Maximum Guest Screen Size</comment>
-        <translation type="unfinished">Tips</translation>
+        <translation>Tips</translation>
     </message>
     <message>
         <source>Suggest a maximum screen size to the guest. The guest will only see this suggestion when guest additions are installed.</source>
-        <translation type="unfinished">Föreslå en maximal skärmstorlek för gästen. Gästen kommer endast att se detta förslag när gästtillägg har installerats.</translation>
+        <translation>Föreslå en maximal skärmstorlek för gästen. Gästen kommer endast att se detta förslag när gästtillägg har installerats.</translation>
     </message>
     <message>
         <source>Machine Windows:</source>
@@ -3691,7 +3815,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Extension Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>&Tilläggspaket</translation>
     </message>
     <message>
         <source>Add Package</source>
@@ -3769,8 +3893,28 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Inaktivera &skärmsläckare på värddatorn</translation>
     </message>
     <message>
+        <source>&Dock and Menubar:</source>
+        <translation type="obsolete">&Docka och menyrad:</translation>
+    </message>
+    <message>
+        <source>Auto-Show in Fullscreen</source>
+        <translation type="obsolete">Visa automatiskt i helskärm</translation>
+    </message>
+    <message>
+        <source>When checked, the host dock and menu bar will be shown when the virtual machine is in fullscreen mode.</source>
+        <translation type="obsolete">När kryssad kommer värddatorns docka och menyrad att visas när en virtuell maskin körs i helskärmsläge.</translation>
+    </message>
+    <message>
+        <source>&Host Screensaver:</source>
+        <translation type="obsolete">Skärmsläckare för gäs&t:</translation>
+    </message>
+    <message>
         <source>When checked, the host screensaver will be disabled whenever a virtual machine is running.</source>
-        <translation type="unfinished"></translation>
+        <translation>När kryssad kommer värddatorns skärmsläckare att vara inaktiverad när en virtuell maskin körs.</translation>
+    </message>
+    <message>
+        <source>Disable When Running Virtual Machines</source>
+        <translation type="obsolete">Inaktivera när virtuella maskiner körs</translation>
     </message>
     <message>
         <source>Host Screensaver:</source>
@@ -3817,19 +3961,27 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Host Key Combination</source>
-        <translation type="unfinished"></translation>
+        <translation>Värdtangentskombination</translation>
     </message>
     <message>
         <source>Some items have the same shortcuts assigned.</source>
-        <translation type="unfinished"></translation>
+        <translation>Några objekt har samma tilldelade genvägar.</translation>
     </message>
     <message>
         <source>&VirtualBox Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Hanterare för &VirtualBox</translation>
     </message>
     <message>
         <source>Virtual &Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtuell &maskin</translation>
+    </message>
+    <message>
+        <source>Lists all the available shortcuts which can be configured.</source>
+        <translation type="obsolete">Listar alla tillgängliga genvägar som kan konfigueras.</translation>
+    </message>
+    <message>
+        <source>Enter a sequence to filter the shortcut list.</source>
+        <translation type="obsolete">Ange en sekvens för att filtrera genvägslistan.</translation>
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
@@ -3896,7 +4048,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&Interface Languages</source>
-        <translation type="unfinished"></translation>
+        <translation>&Gränssnittsspråk</translation>
     </message>
 </context>
 <context>
@@ -4053,116 +4205,128 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&NAT Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>&NAT-nätverk</translation>
     </message>
     <message>
         <source>Lists all available NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Listar alla tillgängliga NAT-nätverk.</translation>
     </message>
     <message>
         <source>&Host-only Networks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Endast-värd-nätverk</translation>
     </message>
     <message>
         <source>No new name specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Inget nytt namn angivet för NAT-nätverket som tidigare kallades för <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen CIDR angiven för NAT-nätverket <b>%1</b>.</translation>
     </message>
     <message>
         <source>No CIDR specified for the NAT network previously called <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen CIDR angiven för NAT-nätverket som tidigare kallades för <b>%1</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ogiltig CIDR angiven (<i>%1</i>) för NAT-nätverket <b>%2</b>.</translation>
     </message>
     <message>
         <source>Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ogiltig CIDR angiven (<i>%1</i>) för NAT-nätverket som tidigare kallades för <b>%2</b>.</translation>
     </message>
     <message>
         <source>Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nätverksnamn</translation>
     </message>
     <message>
         <source>[empty]</source>
-        <translation type="unfinished"></translation>
+        <translation>[tom]</translation>
     </message>
     <message>
         <source>%1 (renamed from %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (döptes om från %2)</translation>
     </message>
     <message>
         <source>Old Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Gammalt nätverksnamn</translation>
     </message>
     <message>
         <source>New Network Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nytt nätverksnamn</translation>
     </message>
     <message>
         <source>Network CIDR</source>
-        <translation type="unfinished"></translation>
+        <translation>Nätverkets CIDR</translation>
     </message>
     <message>
         <source>Supports DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Stöd för DHCP</translation>
     </message>
     <message>
         <source>yes</source>
-        <translation type="unfinished"></translation>
+        <translation>ja</translation>
     </message>
     <message>
         <source>no</source>
-        <translation type="unfinished"></translation>
+        <translation>nej</translation>
     </message>
     <message>
         <source>Supports IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Stöd för IPv6</translation>
     </message>
     <message>
         <source>Default IPv6 route</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardrutt för IPv6</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Värdgränssnittet <b>%1</b> har inte en giltig IPv4-adress.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv4 network mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>Värdgränssnittet <b>%1</b> har inte en giltig IPv4-nätverksmask.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid IPv6 address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Värdgränssnittet <b>%1</b> har inte en giltig IPv6-adress.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Värdgränssnittet <b>%1</b> har inte en giltig DHCP-serveradress.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server mask.</source>
-        <translation type="unfinished"></translation>
+        <translation>Värdgränssnittet <b>%1</b> har inte en giltig DHCP-servermask.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server lower address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>Värdgränssnittet <b>%1</b> har inte en giltig nedre adressgräns för DHCP-servern.</translation>
     </message>
     <message>
         <source>Host interface <b>%1</b> does not currently have a valid DHCP server upper address bound.</source>
-        <translation type="unfinished"></translation>
+        <translation>Värdgränssnittet <b>%1</b> har inte en giltig övre adressgräns för DHCP-servern.</translation>
     </message>
     <message>
         <source>The name <b>%1</b> is being used for several NAT networks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Namnet <b>%1</b> används för flera NAT-nätverk.</translation>
     </message>
     <message>
         <source>Active</source>
         <comment>NAT network</comment>
-        <translation type="unfinished">Aktiv</translation>
+        <translation>Aktiv</translation>
+    </message>
+    <message>
+        <source>&Add NAT network</source>
+        <translation type="obsolete">&Lägg till NAT-nätverk</translation>
+    </message>
+    <message>
+        <source>&Remove NAT network</source>
+        <translation type="obsolete">&Ta bort NAT-nätverk</translation>
+    </message>
+    <message>
+        <source>&Edit NAT network</source>
+        <translation type="obsolete">R&edigera NAT-nätverk</translation>
     </message>
     <message>
         <source>Add NAT Network</source>
@@ -4312,59 +4476,59 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsNetworkDetailsHost</name>
     <message>
         <source>Host-only Network Details</source>
-        <translation type="unfinished">Detaljer för endast-värd-nätverk</translation>
+        <translation>Detaljer för endast-värd-nätverk</translation>
     </message>
     <message>
         <source>&Adapter</source>
-        <translation type="unfinished">&Adapter</translation>
+        <translation>&Adapter</translation>
     </message>
     <message>
         <source>Manual &Configuration</source>
-        <translation type="unfinished">Manuell &konfiguration</translation>
+        <translation>Manuell &konfiguration</translation>
     </message>
     <message>
         <source>Use manual configuration for this host-only network adapter.</source>
-        <translation type="obsolete">Använd manuell konfiguration för detta endast-värd-nätverkskort.</translation>
+        <translation type="obsolete">Använd manuell konfiguration för detta endast-värd-nätverksadapter.</translation>
     </message>
     <message>
         <source>&IPv4 Address:</source>
-        <translation type="unfinished">&IPv4-adress:</translation>
+        <translation>&IPv4-adress:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 address for this adapter.</source>
-        <translation type="unfinished">Visar värdens IPv4-adress för detta kort.</translation>
+        <translation>Innehåller värdens IPv4-adress för denna adapter.</translation>
     </message>
     <message>
         <source>IPv4 Network &Mask:</source>
-        <translation type="unfinished">&Mask för IPv4-nätverk:</translation>
+        <translation>&Mask för IPv4-nätverk:</translation>
     </message>
     <message>
         <source>Holds the host IPv4 network mask for this adapter.</source>
-        <translation type="unfinished">Visar värdens IPv4-nätverksmask för detta kort.</translation>
+        <translation>Innehåller värdens IPv4-nätverksmask för denna adapter.</translation>
     </message>
     <message>
         <source>I&Pv6 Address:</source>
-        <translation type="unfinished">I&Pv6-adress:</translation>
+        <translation>I&Pv6-adress:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 address for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Visar värdens IPv6-adress för detta kort om IPv6 stöds.</translation>
+        <translation>Innehåller värdens IPv6-adress för denna adapter om IPv6 stöds.</translation>
     </message>
     <message>
         <source>IPv6 Network Mask &Length:</source>
-        <translation type="unfinished">Mask&längd för IPv6-nätverk:</translation>
+        <translation>Mask&längd för IPv6-nätverk:</translation>
     </message>
     <message>
         <source>Holds the host IPv6 network mask prefix length for this adapter if IPv6 is supported.</source>
-        <translation type="unfinished">Visar prefixlängd för värdens IPv6-nätverksmask för detta kort om IPv6 stöds.</translation>
+        <translation>Innehåller prefixlängd för värdens IPv6-nätverksmask för denna adapter om IPv6 stöds.</translation>
     </message>
     <message>
         <source>&DHCP Server</source>
-        <translation type="unfinished">&DHCP-server</translation>
+        <translation>&DHCP-server</translation>
     </message>
     <message>
         <source>&Enable Server</source>
-        <translation type="unfinished">&Aktivera server</translation>
+        <translation>&Aktivera server</translation>
     </message>
     <message>
         <source>Indicates whether the DHCP Server is enabled on machine startup or not.</source>
@@ -4372,42 +4536,42 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Server Add&ress:</source>
-        <translation type="unfinished">Serverad&ress:</translation>
+        <translation>Serverad&ress:</translation>
     </message>
     <message>
         <source>Holds the address of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Visar adressen för DHCP-servern som är verksam på nätverket som är associerat med detta endast-värd-kort.</translation>
+        <translation>Innehåller adressen för DHCP-servern som är verksam på nätverket som är associerat med detta endast-värd-kort.</translation>
     </message>
     <message>
         <source>Server &Mask:</source>
-        <translation type="unfinished">Server&mask:</translation>
+        <translation>Server&mask:</translation>
     </message>
     <message>
         <source>Holds the network mask of the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Visar nätverksmasken för DHCP-servern som är verksam på nätverket som är associerat med detta endast-värd-kort.</translation>
+        <translation>Innehåller nätverksmasken för DHCP-servern som är verksam på nätverket som är associerat med detta endast-värd-kort.</translation>
     </message>
     <message>
         <source>&Lower Address Bound:</source>
-        <translation type="unfinished">&Nedre adressgräns:</translation>
+        <translation>&Nedre adressgräns:</translation>
     </message>
     <message>
         <source>Holds the lower address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Visar den nedre adressgränsen som erbjuds av DHCP-servern som är verksam på nätverket som är associerat med detta endast-värd-kort.</translation>
+        <translation>Innehåller den nedre adressgränsen som erbjuds av DHCP-servern som är verksam på nätverket som är associerat med detta endast-värd-kort.</translation>
     </message>
     <message>
         <source>&Upper Address Bound:</source>
-        <translation type="unfinished">&Övre adressgräns:</translation>
+        <translation>&Övre adressgräns:</translation>
     </message>
     <message>
         <source>Holds the upper address bound offered by the DHCP server servicing the network associated with this host-only adapter.</source>
-        <translation type="unfinished">Visar den övre adressgränsen som erbjuds av DHCP-servern som är verksam på nätverket som är associerat med detta endast-värd-kort.</translation>
+        <translation>Innehåller den övre adressgränsen som erbjuds av DHCP-servern som är verksam på nätverket som är associerat med detta endast-värd-kort.</translation>
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4415,51 +4579,67 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsNetworkDetailsNAT</name>
     <message>
         <source>NAT Network Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detaljer om NAT-nätverk</translation>
     </message>
     <message>
         <source>&Enable Network</source>
-        <translation type="unfinished"></translation>
+        <translation>A&ktivera nätverk</translation>
+    </message>
+    <message>
+        <source>Enable this NAT network.</source>
+        <translation type="obsolete">Aktivera detta NAT-nätverk.</translation>
     </message>
     <message>
         <source>Network &Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nätverks&namn:</translation>
     </message>
     <message>
         <source>Holds the name for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Innehåller namnet för detta nätverk.</translation>
     </message>
     <message>
         <source>Network &CIDR:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nätverkets &CIDR:</translation>
     </message>
     <message>
         <source>Holds the CIDR for this network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Innehåller CIDR för detta nätverk.</translation>
     </message>
     <message>
         <source>Network Options:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nätverksalternativ:</translation>
     </message>
     <message>
         <source>Supports &DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>Stöd för &DHCP</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports DHCP.</source>
+        <translation type="obsolete">Bestämmer huruvida detta nätverk har stöd för DHCP.</translation>
     </message>
     <message>
         <source>Supports &IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Stöd för &IPv6</translation>
+    </message>
+    <message>
+        <source>Determines whether this network supports IPv6.</source>
+        <translation type="obsolete">Bestämmer huruvida detta nätverk har stöd för IPv6.</translation>
     </message>
     <message>
         <source>Advertise Default IPv6 &Route</source>
-        <translation type="unfinished"></translation>
+        <translation>Annonsera standardrutt för I&Pv6</translation>
+    </message>
+    <message>
+        <source>Determines whether this network should be advertised as the default IPv6 route.</source>
+        <translation type="obsolete">Bestämmer huruvida detta nätverk ska annonseras som standardrutt för IPv6.</translation>
     </message>
     <message>
         <source>Opens a window to manage port forwarding rules.</source>
-        <translation type="obsolete">Öppnar dialogrutan för att hantera regler för omdirigering av portar.</translation>
+        <translation type="obsolete">Öppnar ett fönster för att hantera regler för omdirigering av portar.</translation>
     </message>
     <message>
         <source>&Port Forwarding</source>
-        <translation type="unfinished">Omdirigering av &portar</translation>
+        <translation>Omdirigering av &portar</translation>
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
@@ -4486,15 +4666,15 @@ p, li { white-space: pre-wrap; }
     <name>UIGlobalSettingsPortForwardingDlg</name>
     <message>
         <source>Port Forwarding Rules</source>
-        <translation type="unfinished">Regler för omdirigering av portar</translation>
+        <translation>Regler för omdirigering av portar</translation>
     </message>
     <message>
         <source>IPv4</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv4</translation>
     </message>
     <message>
         <source>IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6</translation>
     </message>
 </context>
 <context>
@@ -4549,11 +4729,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No proxy host is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen proxyvärd har angivits.</translation>
     </message>
     <message>
         <source>No proxy port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen proxyport har angivits.</translation>
     </message>
     <message>
         <source>Holds the proxy host.</source>
@@ -4630,71 +4810,71 @@ p, li { white-space: pre-wrap; }
     <name>UIHostComboEditor</name>
     <message>
         <source><key_%1></source>
-        <translation type="unfinished"><tangent_%1></translation>
+        <translation><tangent_%1></translation>
     </message>
     <message>
         <source>Left </source>
-        <translation type="unfinished">Vänster</translation>
+        <translation>Vänster </translation>
     </message>
     <message>
         <source>Right </source>
-        <translation type="unfinished">Höger</translation>
+        <translation>Höger </translation>
     </message>
     <message>
         <source>Left Shift</source>
-        <translation type="unfinished">Vänster Skift</translation>
+        <translation>Vänster Skift</translation>
     </message>
     <message>
         <source>Right Shift</source>
-        <translation type="unfinished">Höger Skift</translation>
+        <translation>Höger Skift</translation>
     </message>
     <message>
         <source>Left Ctrl</source>
-        <translation type="unfinished">Vänster Ctrl</translation>
+        <translation>Vänster Ctrl</translation>
     </message>
     <message>
         <source>Right Ctrl</source>
-        <translation type="unfinished">Höger Ctrl</translation>
+        <translation>Höger Ctrl</translation>
     </message>
     <message>
         <source>Left Alt</source>
-        <translation type="unfinished">Vänster Alt</translation>
+        <translation>Vänster Alt</translation>
     </message>
     <message>
         <source>Right Alt</source>
-        <translation type="unfinished">Höger Alt</translation>
+        <translation>Höger Alt</translation>
     </message>
     <message>
         <source>Left WinKey</source>
-        <translation type="unfinished">Vänster Win-tangent</translation>
+        <translation>Vänster Win-tangent</translation>
     </message>
     <message>
         <source>Right WinKey</source>
-        <translation type="unfinished">Höger Win-tangent</translation>
+        <translation>Höger Win-tangent</translation>
     </message>
     <message>
         <source>Menu key</source>
-        <translation type="unfinished">Menytangent</translation>
+        <translation>Menytangent</translation>
     </message>
     <message>
         <source>Alt Gr</source>
-        <translation type="unfinished">AltGr</translation>
+        <translation>AltGr</translation>
     </message>
     <message>
         <source>Caps Lock</source>
-        <translation type="unfinished">CapsLock</translation>
+        <translation>CapsLock</translation>
     </message>
     <message>
         <source>Scroll Lock</source>
-        <translation type="unfinished">ScrollLock</translation>
+        <translation>ScrollLock</translation>
     </message>
     <message>
         <source>Host+</source>
-        <translation type="unfinished"></translation>
+        <translation>Värd+</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen</translation>
     </message>
 </context>
 <context>
@@ -4881,22 +5061,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Reset shortcut to default</source>
-        <translation type="unfinished"></translation>
+        <translation>Återställ genväg till standard</translation>
     </message>
     <message>
         <source>Unset shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Nollställ genväg</translation>
     </message>
 </context>
 <context>
     <name>UIHotKeyTableModel</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Namn</translation>
+        <translation>Namn</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Genväg</translation>
     </message>
 </context>
 <context>
@@ -5139,23 +5319,24 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source><nobr>Indicates video capturing activity:</nobr><br>%1</source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Indikerar aktivitet för videofångst:</nobr><br>%1</translation>
     </message>
     <message>
         <source><nobr><b>Video capture disabled</b></nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Videofångst inaktiverad</b></nobr></translation>
     </message>
     <message>
         <source><nobr><b>Video capture file:</b> %1</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>Fil för videofångst:</b> %1</nobr></translation>
     </message>
     <message>
         <source>Additional feature status:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></source>
         <comment>Virtualization Stuff LED</comment>
-        <translation type="unfinished"></translation>
+        <translation>Status för ytterligare funktioner:<br><nobr><b>%1:</b>&nbsp;%2</nobr><br><nobr><b>%3:</b>&nbsp;%4</nobr><br><nobr><b>%5:</b>&nbsp;%6</nobr><br><nobr><b>%7:</b>&nbsp;%8%</nobr></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5169,8 +5350,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5229,7 +5409,23 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Select a filename for the screenshot ...</source>
-        <translation type="unfinished">Välj ett filnamn för skärmbilden ...</translation>
+        <translation>Välj ett filnamn för skärmbilden ...</translation>
+    </message>
+    <message>
+        <source>No Webcams Connected</source>
+        <translation type="obsolete">Inga anslutna webbkameror</translation>
+    </message>
+    <message>
+        <source>No supported webcams connected to the host PC</source>
+        <translation type="obsolete">Inga webbkameror som stöds är anslutna till värddatorn</translation>
+    </message>
+    <message>
+        <source>Connect Network Adapter</source>
+        <translation type="obsolete">Anslut nätverksadapter</translation>
+    </message>
+    <message>
+        <source>Connect Network Adapter %1</source>
+        <translation type="obsolete">Anslut nätverksadapter %1</translation>
     </message>
 </context>
 <context>
@@ -5391,122 +5587,134 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Video &Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Video&fångst</translation>
     </message>
     <message>
         <source>When checked, VirtualBox will record the virtual machine session as a video file.</source>
-        <translation type="unfinished"></translation>
+        <translation>När kryssad kommer VirtualBox att spela in den virtuella maskinens session som en videofil.</translation>
     </message>
     <message>
         <source>&Enable Video Capture</source>
-        <translation type="unfinished"></translation>
+        <translation>A&ktivera videofångst</translation>
     </message>
     <message>
         <source>File &Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>Filsök&väg:</translation>
+    </message>
+    <message>
+        <source>This setting determines the filename VirtualBox uses to save the recorded content.</source>
+        <translation type="obsolete">Denna inställning bestämmer filnamnet som VirtualBox använder för att spara det inspelade materialet.</translation>
     </message>
     <message>
         <source>Frame &Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bildst&orlek:</translation>
+    </message>
+    <message>
+        <source>This setting determines the resolution (frame size) of the recorded video.</source>
+        <translation type="obsolete">Denna inställning bestämmer upplösningen (bildstorlek) för inspelad video.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
+        <translation type="obsolete">Denna inställning bestämmer <b>horisontell</b> upplösning (bildbredd) för inspelad video.</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>vertical</b> resolution (frame height) of the recorded video.</source>
+        <translation type="obsolete">Denna inställning bestämmer <b>vertikal</b> upplösning (bildhöjd) för inspelad video.</translation>
     </message>
     <message>
         <source>&Frame Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Bildfrekvens:</translation>
+    </message>
+    <message>
+        <source>This setting determines the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
+        <translation type="obsolete">Denna inställning bestämmer maximalt antal <b>bilder per sekund</b>. Bilder som överstiger värdet kommer att förkastas. Minskning av detta värde kommer att öka antalet förkastade bilder och minska filstorleken.</translation>
     </message>
     <message>
         <source>&Quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kva&litet:</translation>
+    </message>
+    <message>
+        <source>This setting determines the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Denna inställning bestämmer <b>kvaliteten</b>. Ökning av detta värde kommer att göra att videon ser bättre ut men filstorleken kan öka kraftigt.</translation>
+    </message>
+    <message>
+        <source>This setting determines the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
+        <translation type="obsolete">Denna inställning bestämmer bitfrekvensen i <b>kilobit per sekund</b>. Ökning av detta värde kommer att göra att videon ser bättre ut men filstorleken kan öka kraftigt.</translation>
     </message>
     <message>
         <source>&Screens:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Skärmar:</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use hardware graphics acceleration. However the host system does not currently provide this, so you will not be able to start the machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Den virtuella maskinen är konfigurerad att använda grafikacceleration i hårdvaran. Dock tillhandahåller inte värdsystemet detta så du kommer inte kunna att starta maskinen.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to fullscreen or seamless mode.</source>
+        <translation type="obsolete">Den virtuella maskinen har tilldelats mindre än <b>%1</b> för grafikminne. Detta är det minsta värdet som krävs för att växla till helskärm eller sömlöst läge.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required for High Definition Video to be played efficiently.</source>
-        <translation type="unfinished"></translation>
+        <translation>Den virtuella maskinen har tilldelats mindre än <b>%1</b> för grafikminne. Detta är det minsta värdet som krävs för att High Definition Video ska fungera effektivt.</translation>
+    </message>
+    <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least b>%1</b>.</source>
+        <translation type="obsolete">Den virtuella maskinen är konfigurerad att använda grafikacceleration i hårdvaran och operativsystemet är inställt till Windows Vista eller senare. För bästa prestanda så bör du ställa in maskinens grafikminne till minst <b>%1</b>.</translation>
     </message>
     <message>
         <source>The virtual machine is set up to use Video Stream Acceleration. As this feature only works with Windows guest systems it will be disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Den virtuella maskinen är konfigurerad att använda Video Stream Acceleration. Denna funktion kommer att inaktiveras eftersom den endast fungerar för Windows-gästsystem.</translation>
     </message>
     <message>
         <source>The VRDE server port value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Värdet för VRDE-serverport har inte angivits.</translation>
     </message>
     <message>
         <source>The VRDE authentication timeout value is not currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidsgränsvärdet för VRDE-autentisering har inte angivits.</translation>
     </message>
     <message>
         <source>User Defined</source>
-        <translation type="unfinished"></translation>
+        <translation>Användardefinierad</translation>
     </message>
     <message>
         <source>%1 fps</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 bilder/s</translation>
     </message>
     <message>
         <source>fps</source>
-        <translation type="unfinished"></translation>
+        <translation>bilder/s</translation>
     </message>
     <message>
         <source>low</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>låg</translation>
     </message>
     <message>
         <source>medium</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>medel</translation>
     </message>
     <message>
         <source>high</source>
         <comment>quality</comment>
-        <translation type="unfinished"></translation>
+        <translation>hög</translation>
     </message>
     <message>
         <source>kbps</source>
-        <translation type="unfinished"></translation>
+        <translation>kbps</translation>
     </message>
     <message>
         <source>Screen %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Minimal verktygsrad:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Om kryssad, visa minimal verktygsrad i helskärmsläge och sömlöst läge.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Visa i &helskärm/sömlöst läge</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Om kryssad kommer minimala verktygsraden att visas överst på skärmen istället för på dess standardposition längst ner på skärmen.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Visa övers&t på skärmen</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
+        <translation>Skärm %1</translation>
     </message>
     <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
+        <source>Enable video recording for screen %1.</source>
+        <translation type="obsolete">Aktivera videoinspelning för skärm %1.</translation>
     </message>
     <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="obsolete">Fjärrskrivbord är för närvarande aktiverad för denna virtuella maskin. Dock kräver detta att <b>%1</b> installeras. Installera tilläggspaketet från VirtualBox webbplats, om inte så kommer din virtuella maskin att startas med fjärrskrivbord inaktiverat.</translation>
     </message>
     <message>
         <source>&Screen</source>
@@ -5521,15 +5729,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">3D {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D {200%?}</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5545,10 +5749,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5597,14 +5797,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 MB</source>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>%1 MB</source>
+        <translation type="unfinished">%1 MB</translation>
+    </message>
+    <message>
         <source>%1%</source>
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5620,8 +5832,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Visar sökvägen där ögonblicksbilder av den virtuella maskinen lagras. Observera att ögonblicksbilder kan ta upp en hel del diskutrymme.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Grundläggande</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">A&llmänt</translation>
     </message>
     <message>
         <source>Identification</source>
@@ -5672,8 +5884,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Kontrollerar den mängd grafikminne som tilldelas den virtuella maskinen.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Avancerat</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Avancerat</translation>
     </message>
     <message>
         <source>Boo&t Order:</source>
@@ -5760,8 +5972,8 @@ p, li { white-space: pre-wrap; }
         <translation>Mapp för ö&gonblicksbilder:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Beskrivning</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Beskrivning</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5856,22 +6068,38 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">du har valt en 64-bitars operativsystemstyp för denna virtuella maskin. Eftersom sådana gästoperativsystem kräver maskinvirtualisering (VT-x/AMD-V) så kommer denna funktion att vara automatiskt aktiverad.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation type="unfinished"></translation>
+        <source>&Drag'n'Drop:</source>
+        <translation type="obsolete">&Dra och släpp:</translation>
     </message>
     <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
-        <translation type="unfinished"></translation>
+        <translation>Väljer vilket data som ska kopieras mellan gästen och värddatorn genom att dra och släppa. Denna funktion kräver att gästtillägg installeras i gästens operativsystem.</translation>
     </message>
     <message>
         <source>No name specified for the virtual machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Inget namn har angivits för den virtuella maskinen.</translation>
     </message>
     <message>
         <source>The virtual machine operating system hint is set to a 64-bit type. 64-bit guest systems require hardware virtualization, so this will be enabled automatically if you confirm the changes.</source>
+        <translation>Den virtuella maskinen är inställd till ett operativsystem med 64 bitar. Gästsystem med 64 bitar kräver hårdvaruvirtualisering. Detta kommer att aktiveras automatiskt om du bekräftar ändringen.</translation>
+    </message>
+    <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">A&vancerat</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>D&escription</source>
+        <translation type="unfinished">B&eskrivning</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5888,6 +6116,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5920,58 +6152,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UIMachineSettingsInterface</name>
-    <message>
-        <source>Allows to modify VM menu-bar contents.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>100%</source>
-        <translation type="obsolete">3D {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">3D {200%?}</translation>
-    </message>
-    <message>
-        <source>Mini ToolBar:</source>
-        <translation type="unfinished">Minimal verktygsrad:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Om kryssad, visa minimal verktygsrad i helskärmsläge och sömlöst läge.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">Visa i &helskärm/sömlöst läge</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Om kryssad kommer minimala verktygsraden att visas överst på skärmen istället för på dess standardposition längst ner på skärmen.</translation>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="unfinished">Visa övers&t på skärmen</translation>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>UIMachineSettingsInterface</name>
     <message>
-        <source>Allows to modify VM status-bar contents.</source>
+        <source>Allows to modify VM menu-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Mini ToolBar:</source>
+        <translation type="unfinished">Minimal verktygsrad:</translation>
+    </message>
+    <message>
         <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5983,6 +6183,14 @@ p, li { white-space: pre-wrap; }
         <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show at &Top of Screen</source>
+        <translation type="unfinished">Visa övers&t på skärmen</translation>
+    </message>
+    <message>
+        <source>Allows to modify VM status-bar contents.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -6028,7 +6236,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>&MAC Address:</source>
-        <translation type="unfinished">Maski&nvaruadress:</translation>
+        <translation>Maski&nvaruadress:</translation>
     </message>
     <message>
         <source>Holds the MAC address of this adapter. It contains exactly 12 characters chosen from {0-9,A-F}. Note that the second character must be an even digit.</source>
@@ -6228,35 +6436,35 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>No bridged network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen adapter för bryggat nätverk har angivits.</translation>
     </message>
     <message>
         <source>No internal network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Inget namn för internt nätverk har angivits.</translation>
     </message>
     <message>
         <source>No host-only network adapter is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen adapter för endast-värd-nätverk har angivits.</translation>
     </message>
     <message>
         <source>No generic driver is currently selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen allmän drivrutin har angivits.</translation>
     </message>
     <message>
         <source>The MAC address must be 12 hexadecimal digits long.</source>
-        <translation type="unfinished"></translation>
+        <translation>MAC-adressen måste vara hexadecimal och 12 siffror lång.</translation>
     </message>
     <message>
         <source>The second digit in the MAC address may not be odd as only unicast addresses are allowed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Den andra siffran i MAC-adressen får inte vara udda eftersom endast unicast-adresser tillåts.</translation>
     </message>
     <message>
         <source>No NAT network name is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Inget namn för NAT-nätverket har angivits.</translation>
     </message>
     <message>
         <source>Holds the name of the NAT network that this network card will be connected to. You can create and remove networks using the global network settings in the virtual machine manager window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Innehåller namnet på det NAT-nätverk som detta nätverkskort kommer anslutas till. Du kan skapa och ta bort nätverk via de allmänna nätverksinställningarna i den virtuella maskinens inställningar.</translation>
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
@@ -6444,23 +6652,23 @@ parallel ports</comment>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ingen IRQ har angivits.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ingen I/O-port har angivits.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Två eller flera portar har samma inställningar.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ingen portsökväg har angivits.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Den finns dubletter angivna i portsökvägarna.</translation>
     </message>
 </context>
 <context>
@@ -6477,6 +6685,26 @@ parallel ports</comment>
         <source>Duplicate port path entered </source>
         <translation type="obsolete">Dublett av portsökväg har angivits </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">Ingen IRQ har angivits.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">Ingen I/O-port har angivits.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Två eller flera portar har samma inställningar.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">Ingen portsökväg har angivits.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">Den finns dubletter angivna i portsökvägarna.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsPortForwardingDlg</name>
@@ -6671,6 +6899,10 @@ parallel ports</comment>
         <translation type="obsolete">Om kryssad kommer denna delade mapp att vara permanent.</translation>
     </message>
     <message>
+        <source>Window</source>
+        <translation type="obsolete">Fönster</translation>
+    </message>
+    <message>
         <source>When checked, this shared folder will be permanent.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6757,44 +6989,44 @@ serial ports</comment>
         <translation>Visar I/O-basportadressen för denna serieport. Giltiga värden är heltal inom intervallet <tt>0</tt> till <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ingen IRQ har angivits.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ingen I/O-port har angivits.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Två eller flera portar har samma inställningar.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ingen portsökväg har angivits.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Den finns dubletter angivna i portsökvägarna.</translation>
     </message>
 </context>
 <context>
@@ -6811,6 +7043,26 @@ serial ports</comment>
         <source>Duplicate port path entered </source>
         <translation type="obsolete">Dublett av portsökväg har angivits </translation>
     </message>
+    <message>
+        <source>No IRQ is currently specified.</source>
+        <translation type="obsolete">Ingen IRQ har angivits.</translation>
+    </message>
+    <message>
+        <source>No I/O port is currently specified.</source>
+        <translation type="obsolete">Ingen I/O-port har angivits.</translation>
+    </message>
+    <message>
+        <source>Two or more ports have the same settings.</source>
+        <translation type="obsolete">Två eller flera portar har samma inställningar.</translation>
+    </message>
+    <message>
+        <source>No port path is currently specified.</source>
+        <translation type="obsolete">Ingen portsökväg har angivits.</translation>
+    </message>
+    <message>
+        <source>There are currently duplicate port paths specified.</source>
+        <translation type="obsolete">Den finns dubletter angivna i portsökvägarna.</translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsStorage</name>
@@ -6912,7 +7164,7 @@ serial ports</comment>
     </message>
     <message>
         <source>No hard disk is selected for <i>%1</i>.</source>
-        <translation type="unfinished">Ingen hårddisk har valts för <i>%1</i>.</translation>
+        <translation>Ingen hårddisk har valts för <i>%1</i>.</translation>
     </message>
     <message>
         <source><i>%1</i> uses a medium that is already attached to <i>%2</i>.</source>
@@ -7250,51 +7502,27 @@ serial ports</comment>
     </message>
     <message>
         <source>Controller: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Styrkort: %1</translation>
     </message>
     <message>
         <source>No name is currently specified for the controller at position <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Inget namn har angivits för styrkortet på plats <b>%1</b>.</translation>
     </message>
     <message>
         <source>The controller at position <b>%1</b> has the same name as the controller at position <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Styrkortet på plats <b>%1</b> har samma namn som styrkortet på plats <b>%2</b>.</translation>
     </message>
     <message>
         <source><i>%1</i> is using a disk that is already attached to <i>%2</i>.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>%1</i> använder en disk som redan anslutits till <i>%2</i>.</translation>
     </message>
     <message>
         <source>The machine currently has more storage controllers assigned than a %1 chipset supports. Please change the chipset type on the System settings page or reduce the number of the following storage controllers on the Storage settings page: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Maskinen har fler lagringsstyrkort tilldelade än vad ett %1-chipset har stöd för. Ändra typ av chipset i systeminställningarna eller minska antalet av följande lagringsstyrkort i lagringsinställningarna: %2</translation>
     </message>
     <message>
         <source>Add USB Controller</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&Hot-pluggable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Optical Drive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Floppy Drive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Optical &Drive:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Encrypted with key:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lägg till USB-styrkort</translation>
     </message>
     <message>
         <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
@@ -7321,7 +7549,16 @@ serial ports</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source>&Hot-pluggable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encrypted with key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7346,6 +7583,14 @@ serial ports</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Add Optical Drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Floppy Drive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7362,6 +7607,14 @@ serial ports</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Optical &Drive:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create New Hard Disk...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7374,7 +7627,7 @@ serial ports</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7537,7 +7790,7 @@ serial ports</comment>
     </message>
     <message>
         <source>Enable &EFI (special OSes only)</source>
-        <translation>Aktivera &EFI (endast speciella OS)</translation>
+        <translation>Aktivera &EFI (endast specifika operativsystem)</translation>
     </message>
     <message>
         <source>If checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
@@ -7603,30 +7856,54 @@ serial ports</comment>
     </message>
     <message>
         <source>&Pointing Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Pekdon:</translation>
     </message>
     <message>
         <source>Determines whether the emulated pointing device is a standard PS/2 mouse, a USB tablet or a USB multi-touch tablet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestämmer huruvida det emulerade pekdonet är en PS/2-standardmus, en USB-musplatta eller en USB-musplatta med multi-touch.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. Not enough memory is left for the host operating system. Please select a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mer än <b>%1%</b> av värddatorns minne (<b>%2</b>) har tilldelats den virtuella maskinen. Det inte finns tillräckligt mycket minne kvar för värdens operativsystem. Välj ett mindre värde.</translation>
     </message>
     <message>
         <source>More than <b>%1%</b> of the host computer's memory (<b>%2</b>) is assigned to the virtual machine. There might not be enough memory left for the host operating system. Please consider selecting a smaller amount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mer än <b>%1%</b> av värddatorns minne (<b>%2</b>) har tilldelats den virtuella maskinen. Det kan innebära att det inte finns tillräckligt mycket minne kvar för värdens operativsystem. Överväg att minska detta värde.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">I/O APIC-funktionen är för närvarande inte aktiverad i Moderkort-delen på sidan System. Detta krävs för att ge stöd för chipset av typen ICH9. Detta kan göras automatiskt om du bekräftar dina ändringar.</translation>
+    </message>
+    <message>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">Emulering av USB-styrkort är för närvarande inte aktiverat på USB-sidan. Detta krävs för att ge stöd för en emulerad USB-inmatningsenhet. Det kan göras automatiskt om du bekräftar dina ändringar.</translation>
     </message>
     <message>
         <source>For performance reasons, the number of virtual CPUs attached to the virtual machine may not be more than twice the number of physical CPUs on the host (<b>%1</b>). Please reduce the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Av prestandaskäl så får inte antalet virtuella processorer anslutna till den virtuella maskinen vara mer än dubbelt det antal fysiska processorer som värden (<b>%1</b>) har. Minska därför antalet virtuella processorer.</translation>
     </message>
     <message>
         <source>More virtual CPUs are assigned to the virtual machine than the number of physical CPUs on the host system (<b>%1</b>). This is likely to degrade the performance of your virtual machine. Please consider reducing the number of virtual CPUs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fler virtuella processorer har tilldelats den virtuella maskinen än antalet fysiska processorer på värdsystemet (<b>%1</b>). Detta kan ge degraderad prestanda för din virtuella maskin. Överväg att minska antalet virtuella processorer.</translation>
+    </message>
+    <message>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">I/O APIC-funktionen är för närvarande inte aktiverad i Moderkort-delen på sidan System. Detta krävs för att ge stöd för fler än en virtuell processor. Detta kan göras automatiskt om du bekräftar dina ändringar.</translation>
+    </message>
+    <message>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor. It will be done automatically if you confirm your changes.</source>
+        <translation type="obsolete">Hårdvaruvirtualisering är för närvarande inte aktiverat i Acceleration-delen på sidan System. Detta krävs för att ge stöd för fler än en virtuell processor. Det kan göras automatiskt om du bekräftar dina ändringar.</translation>
     </message>
     <message>
         <source>The processor execution cap is set to a low value. This may make the machine feel slow to respond.</source>
+        <translation>Processorns exekveringsgräns är inställd till ett lågt värde. Detta kan göras att maskinen känns långsam att svara.</translation>
+    </message>
+    <message>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7654,16 +7931,8 @@ serial ports</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>%1 MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 MB</translation>
     </message>
     <message>
         <source>%1 CPU</source>
@@ -7812,31 +8081,35 @@ serial ports</comment>
         <translation type="obsolete">USB 2.0 är för närvarande aktiverat för denna virtuella maskin. Dock kräver detta att <b>%1</b> installeras. Installera Extension Pack (tilläggspaket) från VirtualBox webbplats. Efter det kommer du att kunna återaktivera USB 2.0. Det kommer att vara inaktiverat under tiden såvida inte du avbryter de aktuella inställningsändringarna.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>USB 2.0 is currently enabled for this virtual machine. However, this requires the <b>%1</b> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0 to be able to start the machine.</source>
+        <translation type="obsolete">USB 2.0 är för närvarande aktiverat för denna virtuella maskin. Dock kräver detta att <b>%1</b> installeras. Installera Extension Pack (tilläggspaket) från VirtualBox webbplats eller inaktivera USB 2.0 för att kunna starta maskinen.</translation>
+    </message>
+    <message>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8026,7 +8299,7 @@ serial ports</comment>
     <name>UIMachineWindow</name>
     <message>
         <source> EXPERIMENTAL build %1r%2 - %3</source>
-        <translation type="unfinished"> EXPERIMENTELL byggnation %1r%2 - %3</translation>
+        <translation> EXPERIMENTELL byggnation %1r%2 - %3</translation>
     </message>
 </context>
 <context>
@@ -8039,12 +8312,16 @@ serial ports</comment>
 <context>
     <name>UIMediumManager</name>
     <message>
+        <source>&Hard drives</source>
+        <translation type="obsolete">&Hårddiskar</translation>
+    </message>
+    <message>
         <source>&Optical disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Optiska diskar</translation>
     </message>
     <message>
         <source>&Floppy disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Disketter</translation>
     </message>
     <message>
         <source>&Select</source>
@@ -8089,14 +8366,14 @@ serial ports</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Stäng</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Växla</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Stäng</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8424,8 +8701,8 @@ serial ports</comment>
         <translation type="obsolete"><p>Det virtuella maskinfönstret är optimerat till att arbeta i <b>%1-bitars</b> färgläge men färgkvaliteten för den virtuella displayen är för närvarande inställd till <b>%2&nbsp;bitar</b>.</p><p>Öppna dialogrutan för displayegenskaper i gästoperativsystemet och välj ett <b>%3-bitars</b> färgläge, om det finns tillgängligt, för bästa tänkbara prestanda för det virtuella grafiksystemet.</p&gt [...]
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Ett kritiskt fel har inträffat vid körning av den virtuella maskinen och maskinkörningen har stoppats.</p><p>Se Community-sektionen på <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> för mer hjälp eller ditt supportkontrakt. Tillhandahåll innehållet i loggfilen <tt>VBox.log</tt> och bildfilen <tt>VBox.png</tt>, vilka du kan hitta i katalogen <nobr><b>%1</b></ [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation type="obsolete"><p>Ett kritiskt fel har inträffat vid körning av den virtuella maskinen och maskinkörningen har stoppats.</p><p>Se Community-sektionen på <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> för mer hjälp eller ditt supportkontrakt. Tillhandahåll innehållet i loggfilen <tt>VBox.log</tt> och bildfilen <tt>VBox.png</tt>, vilka du kan hitta i katalogen <nobr><b>%1</b>&lt [...]
     </message>
     <message>
         <source><p>You didn't attach a hard disk to the new virtual machine. The machine will not be able to boot unless you attach a hard disk with a guest operating system or some other bootable media to it later using the machine settings window or the First Run Wizard.</p><p>Do you wish to continue?</p></source>
@@ -8706,8 +8983,8 @@ serial ports</comment>
         <translation type="obsolete">Visa en dialogruta med produktinformation</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>En ny version av VirtualBox har släppts! Version <b>%1</b> finns tillgänglig på <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hämta ner denna version från denna direktlänk:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>En ny version av VirtualBox har släppts! Version <b>%1</b> finns tillgänglig på <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hämta ner denna version från denna direktlänk:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -8837,8 +9114,8 @@ serial ports</comment>
         <translation type="obsolete">Skriv &över</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Ett kritiskt fel har inträffat vid körning av den virtuella maskinen och därför har maskinkörningen stoppats.</p><p>För hjälp kan du se avsnittet Community på <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> eller ditt supportkontrakt. Tillhandahåll innehållet i loggfilen <tt>VBox.log</tt> och bildfilen <tt>VBox.png</tt> som du kan hitta i katalogen <nobr><b>%1</b&g [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Ett kritiskt fel har inträffat vid körning av den virtuella maskinen och därför har maskinkörningen stoppats.</p><p>För hjälp kan du se avsnittet Community på <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> eller ditt supportkontrakt. Tillhandahåll innehållet i loggfilen <tt>VBox.log</tt> och bildfilen <tt>VBox.png</tt> som du kan hitta i katalogen <nobr><b>%1</b></nobr&gt [...]
     </message>
     <message>
         <source>hard disk</source>
@@ -9496,15 +9773,15 @@ serial ports</comment>
     </message>
     <message>
         <source><p>You are about to remove following inaccessible virtual machines from the machine list:</p><p>%1</p><p>Do you wish to proceed?</p></source>
-        <translation type="unfinished"><p>Du är på väg att ta bort följande oåtkomliga virtuella maskiner från maskinlistan:</p><p>%1</p><p>Vill du fortsätta?</p></translation>
+        <translation><p>Du är på väg att ta bort följande oåtkomliga virtuella maskiner från maskinlistan:</p><p>%1</p><p>Vill du fortsätta?</p></translation>
     </message>
     <message>
         <source><p>You are about to remove following virtual machines from the machine list:</p><p>%1</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well? Doing this will also remove the files containing the machine's virtual hard disks if they are not in use by another machine.</p></source>
-        <translation type="unfinished"><p>Du är på väg att ta bort följande virtuella maskiner från maskinlistan:</p><p>%1</p><p>Vill du även ta bort filerna som innehåller den virtuella maskinen från din hårddisk? Genom att göra det så tas även filerna bort som innehåller maskinens virtuella hårddiskar, om de inte används av en annan maskin.</p></translation>
+        <translation><p>Du är på väg att ta bort följande virtuella maskiner från maskinlistan:</p><p>%1</p><p>Vill du även ta bort filerna som innehåller den virtuella maskinen från din hårddisk? Genom att göra det så tas även filerna bort som innehåller maskinens virtuella hårddiskar, om de inte används av en annan maskin.</p></translation>
     </message>
     <message>
         <source><p>You are about to remove following virtual machines from the machine list:</p><p>%1</p><p>Would you like to delete the files containing the virtual machine from your hard disk as well?</p></source>
-        <translation type="unfinished"><p>Du är på väg att ta bort följande virtuella maskiner från maskinlistan:</p><p>%1</p><p>Vill du även ta bort filerna som innehåller den virtuella maskinen från din hårddisk?</p></translation>
+        <translation><p>Du är på väg att ta bort följande virtuella maskiner från maskinlistan:</p><p>%1</p><p>Vill du även ta bort filerna som innehåller den virtuella maskinen från din hårddisk?</p></translation>
     </message>
     <message>
         <source><p>You have version %1 of the <b><nobr>%2</nobr></b> installed.</p><p>You should download and install version %3 of this extension pack from Oracle!</p></source>
@@ -9517,7 +9794,7 @@ serial ports</comment>
     </message>
     <message>
         <source>Do you wish to cancel all current network operations?</source>
-        <translation type="unfinished">Vill du avbryta alla aktuella nätverksåtgärder?</translation>
+        <translation>Vill du avbryta alla aktuella nätverksåtgärder?</translation>
     </message>
     <message>
         <source>Do you wish to cancel all current network operations or leave them running in the background?</source>
@@ -9538,7 +9815,7 @@ serial ports</comment>
     <message>
         <source>ACPI Shutdown</source>
         <comment>machine</comment>
-        <translation type="unfinished">ACPI Stäng av</translation>
+        <translation>ACPI Stäng av</translation>
     </message>
     <message>
         <source><p>Do you really want to power off the virtual machine?</p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
@@ -9547,7 +9824,7 @@ serial ports</comment>
     <message>
         <source>Power Off</source>
         <comment>machine</comment>
-        <translation type="unfinished">Stäng av</translation>
+        <translation>Stäng av</translation>
     </message>
     <message>
         <source>Failed to drop data.</source>
@@ -9555,7 +9832,7 @@ serial ports</comment>
     </message>
     <message>
         <source><p>Failed to initialize COM because the VirtualBox global configuration directory <b><nobr>%1</nobr></b> is not accessible. Please check the permissions of this directory and of its parent directory.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Misslyckades med att initiera COM därför att den allmänna konfigurationskatalogen <b><nobr>%1</nobr></b> för VirtualBox inte är tillgänglig. Kontrollera behörigheten för denna katalog och dess föräldrakatalog.</p><p>Programmet kommer nu att avslutas.</p></translation>
     </message>
     <message numerus="yes">
         <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
@@ -9567,63 +9844,67 @@ serial ports</comment>
     </message>
     <message>
         <source><p>You are about to remove following virtual machine items from the machine list:</p><p><b>%1</b></p><p>Do you wish to proceed?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Du är på väg att ta bort följande virtuella maskinobjekt från maskinlistan:</p><p>%1</p><p>Vill du fortsätta?</p></translation>
     </message>
     <message>
         <source><p>Cannot remove the machine folder <nobr><b>%1</b>.</nobr></p><p>Please check that this folder really exists and that you have permissions to remove it.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kan inte ta bort maskinmappen <nobr><b>%1</b>.</nobr></p><p>Kontrollera att denna mapp finns och att du har behörighet att ta bort den.</p></translation>
     </message>
     <message>
         <source><p>Cannot create the machine folder <b>%1</b> in the parent folder <nobr><b>%2</b>.</nobr></p><p>This folder already exists and possibly belongs to another machine.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kan inte skapa maskinmappen <b>%1</b> i föräldramappen <nobr><b>%2</b>.</nobr></p><p>Denna mapp finns redan och kan möjligtvis användas av en annan maskin.</p></translation>
+    </message>
+    <message>
+        <source>You are about to create a new virtual machine without a hard drive. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <translation type="obsolete">Du är på väg att skapa en ny virtuell maskin utan en hårddisk. Du kommer inte att kunna installera ett operativsystem på maskinen tills du lägger till en hårddisk. Du kommer för tillfället endast att kunna starta maskinen med en virtuell optisk disk eller från nätverket.</translation>
     </message>
     <message>
         <source><p>Are you sure you want to discard the saved state of the following virtual machines?</p><p><b>%1</b></p><p>This operation is equivalent to resetting or powering off the machine without doing a proper shutdown of the guest OS.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Är du säker på att du vill förkasta det sparade tillståndet för följande virtuella maskiner?</p><p><b>%1</b></p><p>Den här åtgärden är samma som att starta om eller stänga av maskinen utan att göra en korrekt avstängning i gästoperativsystemet.</p></translation>
     </message>
     <message>
         <source><p>Do you really want to reset the following virtual machines?</p><p><b>%1</b></p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Vill du verkligen starta om följande virtuella maskiner?</p><p><b>%1</b></p><p>Detta gör att allt osparat data i program som körs inuti den kommer att gå förlorat.</p></translation>
     </message>
     <message>
         <source><p>Do you really want to send an ACPI shutdown signal to the following virtual machines?</p><p><b>%1</b></p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Vill du verkligen skicka en ACPI Stäng av-signal till följande virtuella maskiner?</p><p><b>%1</b></p></translation>
     </message>
     <message>
         <source><p>Do you really want to power off the following virtual machines?</p><p><b>%1</b></p><p>This will cause any unsaved data in applications running inside it to be lost.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Vill du verkligen stänga av följande virtuella maskiner?</p><p><b>%1</b></p><p>Detta gör att allt osparat data i program som körs inuti den kommer att gå förlorat.</p></translation>
     </message>
     <message>
         <source><p>You are trying to move machine <nobr><b>%1</b></nobr> to group <nobr><b>%2</b></nobr> which already have sub-group <nobr><b>%1</b></nobr>.</p><p>Please resolve this name-conflict and try again.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Du försöker att flytta maskinen <nobr><b>%1</b></nobr> till gruppen <nobr><b>%2</b></nobr> som redan innehåller undergruppen <nobr><b>%1</b></nobr>.</p><p>Korrigera denna namnkonflikt och försök igen.</p></translation>
     </message>
     <message>
         <source><p>You are trying to move group <nobr><b>%1</b></nobr> to group <nobr><b>%2</b></nobr> which already have another item with the same name.</p><p>Would you like to automatically rename it?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Du försöker att flytta gruppen <nobr><b>%1</b></nobr> till gruppen <nobr><b>%2</b></nobr> som redan innehåller ett objekt med samma namn.</p><p>Vill du automatiskt byta namn på den?</p></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Byt namn</translation>
     </message>
     <message>
         <source><p>You are about to restore snapshot <nobr><b>%1</b></nobr>.</p><p>You can create a snapshot of the current state of the virtual machine first by checking the box below; if you do not do this the current state will be permanently lost. Do you wish to proceed?</p></source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source><p>Are you sure you want to restore snapshot <nobr><b>%1</b></nobr>?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Är du säker på att du vill återskapa ögonblicksbilden <nobr><b>%1</b></nobr>?</p></translation>
     </message>
     <message>
         <source>Failed to set groups of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att ställa in grupper för den virtuella maskinen <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>Could not start the machine <b>%1</b> because the following physical network interfaces were not found:</p><p><b>%2</b></p><p>You can either change the machine's network settings or stop the machine.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunde inte starta maskinen <b>%1</b> därför att följande fysiska nätverkskort inte hittades:</p><p><b>%2</b></p><p>Du kan antingen ändra maskinens nätverksinställningar eller stoppa maskinen.</p></translation>
     </message>
     <message>
         <source>Change Network Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ändra nätverksinställningar</translation>
     </message>
     <message>
         <source>Close Virtual Machine</source>
@@ -9631,204 +9912,240 @@ serial ports</comment>
     </message>
     <message>
         <source><p>Cannot start the VirtualBox Manager due to local restrictions.</p><p>The application will now terminate.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kan inte starta VirtualBox Manager på grund av lokala begränsningar.</p><p>Programmet kommer nu att avslutas.</p></translation>
     </message>
     <message>
         <source><p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p><p>The language will be temporarily reset to the system default language. Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunde inte hitta en språkfil för språket <b>%1</b> i katalogen <b><nobr>%2</nobr></b>.</p><p>Språket kommer att temporärt återställas till systemets standardspråk. Gå till dialogrutan <b>Inställningar</b> som du kan öppna från menyn <b>Arkiv</b> i VirtualBox huvudfönster, och välj ett av de befintliga språken på sidan <b>Språk</b>.</p></translation>
     </message>
     <message>
         <source><p>Could not load the language file <b><nobr>%1</nobr></b>. <p>The language will be temporarily reset to English (built-in). Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunde inte läsa in språkfilen <b><nobr>%1</nobr></b>. <p>Språket kommer att temporärt återställas till engelska (inbyggt). Gå till dialogrutan <b>Inställningar</b> som du kan öppna från menyn <b>Arkiv</b> i VirtualBox huvudfönster, välj sedan ett av de befintliga språken på sidan <b>Språk</b>.</p></translation>
     </message>
     <message>
         <source>There is no virtual machine with the identifier <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Det finns ingen virtuell maskin med namnet <b>%1</b>.</translation>
     </message>
     <message>
         <source>Ignore</source>
-        <translation type="unfinished">Ignorera</translation>
+        <translation>Ignorera</translation>
     </message>
     <message>
         <source>Failed to create NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att skapa NAT-nätverk.</translation>
     </message>
     <message>
         <source>Failed to remove NAT network <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att ta bort NAT-nätverket <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create DHCP server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att skapa DHCP-server.</translation>
     </message>
     <message>
         <source>Failed to remove DHCP server for network interface <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att ta bort DHCP-servern för nätverketskortet <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to create the host network interface.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att skapa värdnätverksgränssnittet.</translation>
     </message>
     <message>
         <source>Create &new disk</source>
-        <translation type="unfinished">Skapa &ny disk</translation>
+        <translation>Skapa &ny disk</translation>
     </message>
     <message>
         <source>&Choose existing disk</source>
-        <translation type="unfinished">&Välj befintlig disk</translation>
+        <translation>&Välj befintlig disk</translation>
     </message>
     <message>
         <source>Leave &empty</source>
-        <translation type="unfinished">Lämna &tom</translation>
+        <translation>Lämna &tom</translation>
     </message>
     <message>
         <source>&Choose disk</source>
-        <translation type="unfinished">&Välj disk</translation>
+        <translation>&Välj disk</translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Är du säker på att du vill frigöra den virtuella hårddisken <nobr><b>%1</b></nobr>?</p><p>Detta kommer att koppla loss den från följande virtuella maskin(er): <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual optical disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Är du säker på att du vill frigöra den virtuella optiska disken <nobr><b>%1</b></nobr>?</p><p>Detta kommer att koppla loss den från följande virtuella maskin(er): <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source><p>Are you sure you want to release the virtual floppy disk <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <translation type="obsolete"><p>Är du säker på att du vill frigöra den virtuella disketten <nobr><b>%1</b></nobr>?</p><p>Detta kommer att koppla loss den från följande virtuella maskin(er): <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual hard disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Är du säker på att du vill ta bort den virtuella hårddisken <nobr><b>%1</b></nobr> från listan över kända diskavbildsfiler?</p></translation>
     </message>
     <message>
         <source><p>As this hard disk is inaccessible its image file can not be deleted.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Eftersom denna hårddisk inte är tillgänglig så kan inte dess avbildsfil tas bort.</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual optical disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Är du säker på att du vill ta bort den virtuella optiska disken <nobr><b>%1</b></nobr> från listan över kända diskavbildsfiler?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to remove the virtual floppy disk <nobr><b>%1</b></nobr> from the list of known disk image files?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Är du säker på att du vill ta bort den virtuella disketten <nobr><b>%1</b></nobr> från listan över kända diskavbildsfiler?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual optical disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunde inte mata in den virtuella optiska disken <nobr><b>%1</b></nobr> i maskinen <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force insertion of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Vill du försöka att tvinga inmatning av denna disk?</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual optical disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunde inte mata ut den virtuella optiska disken <nobr><b>%1</b></nobr> från maskinen <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Would you like to try to force ejection of this disk?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Vill du försöka att tvinga utmatning av denna disk?</p></translation>
     </message>
     <message>
         <source><p>Unable to insert the virtual floppy disk <nobr><b>%1</b></nobr> into the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunde inte mata in den virtuella disketten <nobr><b>%1</b></nobr> i maskinen <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Unable to eject the virtual floppy disk <nobr><b>%1</b></nobr> from the machine <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunde inte mata ut den virtuella disketten <nobr><b>%1</b></nobr> från maskinen <b>%2</b>.</p></translation>
+    </message>
+    <message>
+        <source>Failed to open the hard disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Misslyckades med att öppna hårddiskfilen <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the optical disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Misslyckades med att öppna den optiska diskfilen <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to open the floppy disk file <nobr><b>%1</b></nobr>.</source>
+        <translation type="obsolete">Misslyckades med att öppna diskettfilen <nobr><b>%1</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the hard disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Misslyckades med att stänga hårddiskfilen <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the optical disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Misslyckades med att stänga den optiska diskfilen <nobr><b>%2</b></nobr>.</translation>
+    </message>
+    <message>
+        <source>Failed to close the floppy disk file <nobr><b>%2</b></nobr>.</source>
+        <translation type="obsolete">Misslyckades med att stänga diskettfilen <nobr><b>%2</b></nobr>.</translation>
     </message>
     <message numerus="yes">
         <source><p>The %n following virtual machine(s) are currently in a saved state: <b>%1</b></p><p>If you continue the runtime state of the exported machine(s) will be discarded. The other machine(s) will not be changed.</p></source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many machines are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform><p>Virtuella maskinen <b>%1</b> befinner sig i ett sparat tillstånd.</p><p>Om du fortsätter så kommer körtidstillståndet för de exporterade maskinerna att förkastas. Observera att de befintliga maskinerna inte kommer att ändras.</p></numerusform>
-            <numerusform><p>Virtuella maskinerna <b>%1</b> befinner sig i ett sparat tillstånd.</p><p>Om du fortsätter så kommer körtidstillståndet för de exporterade maskinerna att förkastas. Observera att de befintliga maskinerna inte kommer att ändras.</p></numerusform>
+        <translation>
+            <numerusform><p>Följande %n virtuella maskiner befinner sig i ett sparat tillstånd: <b>%1</b></p><p>Om du fortsätter så kommer körtidstillståndet för de exporterade maskinerna att förkastas. Observera att de andra maskinerna inte kommer att ändras.</p></numerusform>
+            <numerusform><p>Följande %n virtuella maskiner befinner sig i ett sparat tillstånd: <b>%1</b></p><p>Om du fortsätter så kommer körtidstillståndet för de exporterade maskinerna att förkastas. Observera att de andra maskinerna inte kommer att ändras.</p></numerusform>
         </translation>
     </message>
     <message>
         <source>Switch</source>
-        <translation type="unfinished">Växla</translation>
+        <translation>Växla</translation>
     </message>
     <message>
         <source>Failed to enable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att aktivera fjärrskrivbordsservern för den virtuella maskinen <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable the remote desktop server for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att inaktivera fjärrskrivbordsservern för den virtuella maskinen <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to enable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att aktivera videofångst för den virtuella maskinen <b>%1</b>.</translation>
     </message>
     <message>
         <source>Failed to disable video capturing for the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att inaktivera videofångst för den virtuella maskinen <b>%1</b>.</translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox Guest Additions</b> disk image file.</p><p>Do you wish to download this disk image file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunde inte hitta diskavbildsfilen för <b>VirtualBox gästtillägg</b>.</p><p>Vill du hämta denna diskavbildsfil från Internet?</p></translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished">Hämta</translation>
+        <translation>Hämta</translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox Guest Additions</b> disk image file from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Är du säker på att du vill hämta diskavbildsfilen för <b>VirtualBox gästtillägg</b> från <nobr><a href="%1">%1</a></nobr> (storlek %2 byte)?</p></translation>
     </message>
     <message>
         <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Diskavbildsfilen för <b>VirtualBox gästtillägg</b> har hämtats från <nobr><a href="%1">%1</a></nobr> men kan inte sparas lokalt som <nobr><b>%2</b>.</nobr></p><p>Välj en annan plats att spara filen på.</p></translation>
+    </message>
+    <message>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual CD/DVD drive?</p></source>
+        <translation type="obsolete"><p>Diskavbildsfilen för <b>VirtualBox gästtillägg</b> har hämtats ner från <nobr><a href="%1">%1</a></nobr> och sparats lokalt som <nobr><b>%2</b>.</nobr></p><p>Vill du registrera den här diskavbildsfilen och mata in den i den virtuella CD/DVD-enheten?</p></translation>
+    </message>
+    <message>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no CD/DVD drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <translation type="obsolete"><p>Kunde inte mata in diskavbildsfilen för <b>VirtualBox gästtillägg</b> i den virtuella maskinen <b>%1</b>, eftersom maskinen inte har någon cd/dvd-enhet. Lägg till en enhet under Lagring i inställningarna för den virtuella maskinen.</p></translation>
     </message>
     <message>
         <source><p>Could not find the <b>VirtualBox User Manual</b> <nobr><b>%1</b>.</nobr></p><p>Do you wish to download this file from the Internet?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Kunde inte hitta <b>Handboken för VirtualBox</b> <nobr><b>%1</b>.</nobr></p><p>Vill du hämta denna fil från Internet?</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to download the <b>VirtualBox User Manual</b> from <nobr><a href="%1">%1</a></nobr> (size %2 bytes)?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Är du säker på att du vill hämta <b>Handboken för VirtualBox</b> från <nobr><a href="%1">%1</a></nobr> (storlek %2 byte)?</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> but can't be saved locally as <nobr><b>%2</b>.</nobr></p><p>Please choose another location for that file.</p></source>
-        <translation type="unfinished"><p>Användarhandboken för VirtualBox har hämtats från <nobr><a href="%1">%2</a></nobr> men kan inte sparas lokalt som <nobr><b>%3</b>.</nobr></p><p>Välj en annan plats för denna fil.</p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>Användarhandboken för VirtualBox har hämtats från <nobr><a href="%1">%1</a></nobr> men kan inte sparas lokalt som <nobr><b>%2</b>.</nobr></p><p>Välj en annan plats för denna fil.</p></translation>
     </message>
     <message>
         <source><p>The VirtualBox User Manual has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p></source>
-        <translation type="unfinished"><p>Användarhandboken för VirtualBox har hämtats från <nobr><a href="%1">%2</a></nobr> och sparats lokalt som <nobr><b>%3</b>.</nobr></p> {1"?} {1<?} {2<?}</translation>
+        <translation><p>Användarhandboken för VirtualBox har hämtats från <nobr><a href="%1">%1</a></nobr> och sparats lokalt som <nobr><b>%2</b>.</nobr></p></translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Stäng</translation>
+        <translation>Stäng</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished">Ok</translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Do not show this message again</source>
-        <translation type="unfinished">Visa inte det här meddelandet igen</translation>
+        <translation>Visa inte det här meddelandet igen</translation>
     </message>
     <message>
         <source><p>Do you want to remove the NAT network <nobr><b>%1</b>?</nobr></p><p>If this network is in use by one or more virtual machine network adapters these adapters will no longer be usable until you correct their settings by either choosing a different network name or a different adapter attachment type.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Vill du ta bort NAT-nätverket <nobr><b>%1</b>?</nobr></p><p>Om detta nätverk används av en eller flera nätverksadaptrar så kommer dessa inte längre att vara användbara tills du har korrigerat inställningarna, antingen genom att välja ett annan nätverksnamn eller en annan adaptertyp.</p></translation>
     </message>
     <message>
         <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att ansluta webbkameran <b>%1</b> till den virtuella maskinen <b>%2</b>.</translation>
     </message>
     <message>
         <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misslyckades med att koppla från webbkameran <b>%1</b> från den virtuella maskinen <b>%2</b>.</translation>
     </message>
     <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <translation><p>VirtualBox gästtillägg verkar inte finnas tillgänglig på denna virtuella maskin och delade mappar kan inte användas utan dem. För att använda delade mappar inne i den virtuella maskinen så måste gästtillägg installeras. Installera om dem om de inte fungerar korrekt genom att välja <b>Mata in cd-avbild för gästtillägg</b> från menyn <b>Enheter</b>. Om de är installerade men maskinen inte är helt uppstartad så kan delade mappar bli till [...]
     </message>
     <message>
         <source>Insert</source>
         <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <translation>Mata in</translation>
     </message>
     <message>
         <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Den virtuella skärmen är för närvarande inställd till <b>%1-bitars</b> färgläge. Ändra detta till <b>%2&nbsp;bitar</b> för bättre prestanda. Detta kan oftast göras från avsnittet <b>Skärm</b> i gästoperativsystemets kontrollpanel eller systeminställningar.</p></translation>
     </message>
     <message>
         <source><p>Failed to create the VirtualBoxClient COM object.</p><p>The application will now terminate.</p></source>
@@ -9843,115 +10160,115 @@ serial ports</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10015,19 +10332,19 @@ serial ports</comment>
     <name>UIMiniToolBar</name>
     <message>
         <source>Always show the toolbar</source>
-        <translation type="unfinished">Visa alltid verktygsraden</translation>
+        <translation>Visa alltid verktygsraden</translation>
     </message>
     <message>
         <source>Minimize Window</source>
-        <translation type="unfinished">Minimera fönstret</translation>
+        <translation>Minimera fönstret</translation>
     </message>
     <message>
         <source>Exit Full Screen or Seamless Mode</source>
-        <translation type="unfinished">Avsluta helskämsläge eller sömlöst läge</translation>
+        <translation>Avsluta helskämsläge eller sömlöst läge</translation>
     </message>
     <message>
         <source>Close VM</source>
-        <translation type="unfinished">Stäng virtuell maskin</translation>
+        <translation>Stäng virtuell maskin</translation>
     </message>
 </context>
 <context>
@@ -10044,27 +10361,31 @@ serial ports</comment>
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation type="unfinished">&Namn:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Namn:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
-        <translation type="unfinished">Visar namnet på den virtuella maskinen.</translation>
+        <translation>Innehåller namnet på den virtuella maskinen.</translation>
     </message>
     <message>
         <source>&Type:</source>
-        <translation type="unfinished">&Typ:</translation>
+        <translation>&Typ:</translation>
     </message>
     <message>
         <source>Selects the operating system family that you plan to install into this virtual machine.</source>
-        <translation type="unfinished">Visar operativsystemsfamiljen som du planerar att installera på denna virtuella maskin.</translation>
+        <translation>Väljer familj av operativsystem som du planerar att installera på denna virtuella maskin.</translation>
     </message>
     <message>
         <source>&Version:</source>
-        <translation type="unfinished">&Version:</translation>
+        <translation>&Version:</translation>
     </message>
     <message>
         <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
+        <translation>Väljer typ av operativsystem som du planerar att installera på denna virtuella maskin (så kallat gästoperativsystem).</translation>
+    </message>
+    <message>
+        <source>N&ame:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -10107,19 +10428,19 @@ serial ports</comment>
     <name>UINetworkManagerDialog</name>
     <message>
         <source>Network Operations Manager</source>
-        <translation type="unfinished">Hanterare för nätverksåtgärder</translation>
+        <translation>Hanterare för nätverksåtgärder</translation>
     </message>
     <message>
         <source>There are no active network operations.</source>
-        <translation type="unfinished">Det finns inga aktiva nätverksåtgärder.</translation>
+        <translation>Det finns inga aktiva nätverksåtgärder.</translation>
     </message>
     <message>
         <source>&Cancel All</source>
-        <translation type="unfinished">A&vbryt alla</translation>
+        <translation>A&vbryt alla</translation>
     </message>
     <message>
         <source>Cancel all active network operations</source>
-        <translation type="unfinished">Avbryt alla aktiva nätverksåtgärder</translation>
+        <translation>Avbryt alla aktiva nätverksåtgärder</translation>
     </message>
     <message>
         <source>Error: %1.</source>
@@ -10127,66 +10448,66 @@ serial ports</comment>
     </message>
     <message>
         <source>Network Operation</source>
-        <translation type="unfinished">Nätverksåtgärd</translation>
+        <translation>Nätverksåtgärd</translation>
     </message>
     <message>
         <source>Restart network operation</source>
-        <translation type="unfinished">Starta om nätverksåtgärd</translation>
+        <translation>Starta om nätverksåtgärd</translation>
     </message>
     <message>
         <source>Cancel network operation</source>
-        <translation type="unfinished">Avbryt nätverksåtgärd</translation>
+        <translation>Avbryt nätverksåtgärd</translation>
     </message>
     <message>
         <source>The network operation failed with the following error: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nätverksåtgärden misslyckades med följande fel: %1.</translation>
     </message>
 </context>
 <context>
     <name>UINetworkManagerIndicator</name>
     <message>
         <source>Current network operations:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktuella nätverksåtgärder:</translation>
     </message>
     <message>
         <source>failed</source>
         <comment>network operation</comment>
-        <translation type="unfinished"></translation>
+        <translation>misslyckades</translation>
     </message>
     <message>
         <source>(%1 of %2)</source>
-        <translation type="unfinished"></translation>
+        <translation>(%1 av %2)</translation>
     </message>
     <message>
         <source>Double-click for more information.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dubbelklicka för mer information.</translation>
     </message>
 </context>
 <context>
     <name>UINetworkReplyPrivate</name>
     <message>
         <source>Host not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Värden hittades inte</translation>
     </message>
     <message>
         <source>Content access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Innehållsåtkomst nekades</translation>
     </message>
     <message>
         <source>Protocol failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Protokollfel</translation>
     </message>
     <message>
         <source>Wrong SSL certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>Felaktigt SSL-certifikatformat</translation>
     </message>
     <message>
         <source>SSL authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>SSL-autentisering misslyckades</translation>
     </message>
     <message>
         <source>Unknown reason</source>
-        <translation type="unfinished"></translation>
+        <translation>Okänd anledning</translation>
     </message>
 </context>
 <context>
@@ -10953,7 +11274,7 @@ serial ports</comment>
     <name>UIPopupCenter</name>
     <message>
         <source>Click for full details</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicka för fullständiga detaljer</translation>
     </message>
 </context>
 <context>
@@ -11127,32 +11448,28 @@ serial ports</comment>
     <name>UISelectorWindow</name>
     <message>
         <source>Show Toolbar</source>
-        <translation type="unfinished">Visa verktygsrad</translation>
+        <translation>Visa verktygsrad</translation>
     </message>
     <message>
         <source>Show Statusbar</source>
-        <translation type="unfinished">Visa statusrad</translation>
+        <translation>Visa statusrad</translation>
     </message>
     <message>
         <source>Select a virtual machine file</source>
-        <translation type="unfinished">Välj en virtuell maskin-fil</translation>
+        <translation>Välj en virtuell maskin-fil</translation>
     </message>
     <message>
         <source>Virtual machine files (%1)</source>
-        <translation type="unfinished">Virtuella maskin-filer (%1)</translation>
+        <translation>Virtuella maskin-filer (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Välkommen till VirtualBox!</h3><p>På den vänstra sidan av detta fönster finns en lista över alla virtuella maskiner på din dator. Listan är tom just nu därför att du inte har skapat några virtuella maskiner än.<img src=:/welcome.png align=right/></p><p>Tryck på knappen <b>Ny</b> i huvudverktygsraden i överkanten av fönstret för att skapa en ny virtuell maskin.</p><p>Du kan trycka på tange [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation><h3>Välkommen till VirtualBox!</h3><p>På den vänstra sidan av detta fönster finns en lista över alla virtuella maskiner på din dator. Listan är tom just nu därför att du inte har skapat några virtuella maskiner än.<img src=:/welcome.png align=right/></p><p>Tryck på knappen <b>Ny</b> i huvudverktygsraden i överkanten av fönstret för att skapa en ny virtuell maskin.</p><p>Du kan trycka på tangenten <b>%1 [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
-        <translation type="unfinished">Hanterare</translation>
-    </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
+        <translation>Manager</translation>
     </message>
 </context>
 <context>
@@ -11163,7 +11480,7 @@ serial ports</comment>
     </message>
     <message>
         <source>Updating Guest Additions</source>
-        <translation type="unfinished"></translation>
+        <translation>Uppdaterar gästtillägg</translation>
     </message>
 </context>
 <context>
@@ -11190,11 +11507,11 @@ serial ports</comment>
     </message>
     <message>
         <source><b>%1</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1</b> sida:</translation>
     </message>
     <message>
         <source><b>%1: %2</b> page:</source>
-        <translation type="unfinished"></translation>
+        <translation><b>%1: %2</b> sida:</translation>
     </message>
 </context>
 <context>
@@ -11237,7 +11554,7 @@ serial ports</comment>
     </message>
     <message>
         <source>Display</source>
-        <translation type="unfinished">Skärm</translation>
+        <translation>Skärm</translation>
     </message>
     <message>
         <source>Preferences</source>
@@ -11341,6 +11658,10 @@ serial ports</comment>
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Stäng</translation>
     </message>
@@ -11348,10 +11669,6 @@ serial ports</comment>
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -11463,8 +11780,8 @@ serial ports</comment>
         <translation type="obsolete">Sammandrag</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>En ny version av VirtualBox har släppts! Version <b>%1</b> finns tillgänglig på <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hämta ner denna version från denna direktlänk:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>En ny version av VirtualBox har släppts! Version <b>%1</b> finns tillgänglig på <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Du kan hämta ner denna version från denna direktlänk:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -11483,7 +11800,7 @@ serial ports</comment>
     <name>UIUpdateStepVirtualBox</name>
     <message>
         <source>Checking for a new VirtualBox version...</source>
-        <translation type="unfinished">Letar efter en ny version av VirtualBox...</translation>
+        <translation>Letar efter en ny version av VirtualBox...</translation>
     </message>
 </context>
 <context>
@@ -11556,7 +11873,7 @@ serial ports</comment>
     <name>UIVMInfoDialog</name>
     <message>
         <source>%1 - Session Information</source>
-        <translation>%1 - Sessionsinformation</translation>
+        <translation type="unfinished">%1 - Sessionsinformation</translation>
     </message>
     <message>
         <source>&Details</source>
@@ -11568,35 +11885,35 @@ serial ports</comment>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>DMA-överföringar</translation>
+        <translation type="unfinished">DMA-överföringar</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>PIO-överföringar</translation>
+        <translation type="unfinished">PIO-överföringar</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Data läst</translation>
+        <translation type="unfinished">Data läst</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Data skriven</translation>
+        <translation type="unfinished">Data skriven</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Data överförd</translation>
+        <translation type="unfinished">Data överförd</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Data mottagen</translation>
+        <translation type="unfinished">Data mottagen</translation>
     </message>
     <message>
         <source>Runtime Attributes</source>
-        <translation>Körtidsattribut</translation>
+        <translation type="unfinished">Körtidsattribut</translation>
     </message>
     <message>
         <source>Screen Resolution</source>
-        <translation>Skärmupplösning</translation>
+        <translation type="unfinished">Skärmupplösning</translation>
     </message>
     <message>
         <source>CD/DVD Statistics</source>
@@ -11614,20 +11931,20 @@ serial ports</comment>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Inte identifierad</translation>
+        <translation type="unfinished">Inte identifierad</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Inte identifierad</translation>
+        <translation type="unfinished">Inte identifierad</translation>
     </message>
     <message>
         <source>Guest Additions</source>
-        <translation>Gästtillägg</translation>
+        <translation type="unfinished">Gästtillägg</translation>
     </message>
     <message>
         <source>Guest OS Type</source>
-        <translation>Typ av gästoperativsystem</translation>
+        <translation type="unfinished">Typ av gästoperativsystem</translation>
     </message>
     <message>
         <source>Hard Disk Statistics</source>
@@ -11639,7 +11956,7 @@ serial ports</comment>
     </message>
     <message>
         <source>No Network Adapters</source>
-        <translation>Inga nätverksadaptrar</translation>
+        <translation type="unfinished">Inga nätverksadaptrar</translation>
     </message>
     <message>
         <source>Enabled</source>
@@ -11666,15 +11983,15 @@ serial ports</comment>
     </message>
     <message>
         <source>Storage Statistics</source>
-        <translation>Lagringsstatistik</translation>
+        <translation type="unfinished">Lagringsstatistik</translation>
     </message>
     <message>
         <source>No Storage Devices</source>
-        <translation>Inga lagringsenheter</translation>
+        <translation type="unfinished">Inga lagringsenheter</translation>
     </message>
     <message>
         <source>Network Statistics</source>
-        <translation>Nätverksstatistik</translation>
+        <translation type="unfinished">Nätverksstatistik</translation>
     </message>
     <message>
         <source>Nested Paging</source>
@@ -11684,19 +12001,23 @@ serial ports</comment>
     <message>
         <source>Not Available</source>
         <comment>details report (VRDE server port)</comment>
-        <translation>Inte tillgänglig</translation>
+        <translation type="unfinished">Inte tillgänglig</translation>
     </message>
     <message>
         <source>Clipboard Mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Urklippsläge</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">Dra och släpp-läge</translation>
     </message>
     <message>
         <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Konfigurations&detaljer</translation>
     </message>
     <message>
         <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&Körtidsinformation</translation>
     </message>
     <message>
         <source>VM Uptime</source>
@@ -11764,67 +12085,67 @@ serial ports</comment>
     </message>
     <message>
         <source>&Save</source>
-        <translation type="unfinished">S&para</translation>
+        <translation>S&para</translation>
     </message>
     <message>
         <source>&Refresh</source>
-        <translation type="unfinished">&Uppdatera</translation>
+        <translation>&Uppdatera</translation>
     </message>
     <message>
         <source>%1 - VirtualBox Log Viewer</source>
-        <translation type="unfinished">%1 - VirtualBox loggvisare</translation>
+        <translation>%1 - VirtualBox loggvisare</translation>
     </message>
     <message>
         <source><p>No log files found. Press the <b>Refresh</b> button to rescan the log folder <nobr><b>%1</b></nobr>.</p></source>
-        <translation type="unfinished"><p>Inga loggfiler hittades. Tryck på knappen <b>Uppdatera</b> för att söka igenom loggmappen <nobr><b>%1</b></nobr> igen.</p></translation>
+        <translation><p>Inga loggfiler hittades. Tryck på knappen <b>Uppdatera</b> för att söka igenom loggmappen <nobr><b>%1</b></nobr> igen.</p></translation>
     </message>
     <message>
         <source>Save VirtualBox Log As</source>
-        <translation type="unfinished">Spara VirtualBox-logg som</translation>
+        <translation>Spara VirtualBox-logg som</translation>
     </message>
     <message>
         <source>&Find</source>
-        <translation type="unfinished">&Sök</translation>
+        <translation>&Sök</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Stäng</translation>
+        <translation>Stäng</translation>
     </message>
     <message>
         <source>Close the search panel</source>
-        <translation type="unfinished">Stäng sökpanelen</translation>
+        <translation>Stäng sökpanelen</translation>
     </message>
     <message>
         <source>Enter a search string here</source>
-        <translation type="unfinished">Ange en söksträng här</translation>
+        <translation>Ange en söksträng här</translation>
     </message>
     <message>
         <source>&Previous</source>
-        <translation type="unfinished">&Föregående</translation>
+        <translation>&Föregående</translation>
     </message>
     <message>
         <source>Search for the previous occurrence of the string</source>
-        <translation type="unfinished">Sök efter föregående förekomst av strängen</translation>
+        <translation>Sök efter tidigare förekomst av strängen</translation>
     </message>
     <message>
         <source>&Next</source>
-        <translation type="unfinished">&Nästa</translation>
+        <translation>&Nästa</translation>
     </message>
     <message>
         <source>Search for the next occurrence of the string</source>
-        <translation type="unfinished">Sök efter nästa förekomst av strängen</translation>
+        <translation>Sök efter nästa förekomst av strängen</translation>
     </message>
     <message>
         <source>C&ase Sensitive</source>
-        <translation type="unfinished">Skiftläges&känslig</translation>
+        <translation>Skiftläges&känslig</translation>
     </message>
     <message>
         <source>Perform case sensitive search (when checked)</source>
-        <translation type="unfinished">Genomför skiftlägeskänslig sökning (om kryssad)</translation>
+        <translation>Genomför skiftlägeskänslig sökning (om kryssad)</translation>
     </message>
     <message>
         <source>String not found</source>
-        <translation type="unfinished">Strängen hittades inte</translation>
+        <translation>Strängen hittades inte</translation>
     </message>
 </context>
 <context>
@@ -11861,6 +12182,14 @@ serial ports</comment>
 <context>
     <name>UIWizard</name>
     <message>
+        <source>Hide Description</source>
+        <translation type="obsolete">Dölj beskrivning</translation>
+    </message>
+    <message>
+        <source>Show Description</source>
+        <translation type="obsolete">Visa beskrivning</translation>
+    </message>
+    <message>
         <source>&Expert Mode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11880,25 +12209,97 @@ serial ports</comment>
 <context>
     <name>UIWizardCloneVD</name>
     <message>
+        <source>Copy Virtual Hard Drive</source>
+        <translation type="obsolete">Kopiera virtuell hårddisk</translation>
+    </message>
+    <message>
         <source>Copy</source>
-        <translation type="unfinished">Kopiera</translation>
+        <translation>Kopiera</translation>
+    </message>
+    <message>
+        <source>Hard drive to copy</source>
+        <translation type="obsolete">Hårddisk att kopiera</translation>
+    </message>
+    <message>
+        <source><p>Please select the virtual hard drive file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
+        <translation type="obsolete"><p>Välj den virtuella hårddiskfilen som du vill kopiera om den inte redan har valts. Du kan antingen välja från listan eller använda mappikonen bredvid listan för att välja en.</p></translation>
+    </message>
+    <message>
+        <source>Choose a virtual hard drive file to copy...</source>
+        <translation type="obsolete">Välj en virtuell hårddiskfil att kopiera...</translation>
+    </message>
+    <message>
+        <source>Hard drive file type</source>
+        <translation type="obsolete">Typ av hårddiskfil</translation>
+    </message>
+    <message>
+        <source>Please choose the type of file that you would like to use for the new virtual hard drive. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
+        <translation type="obsolete">Välj den typ av fil som du vill använda för den nya virtuella hårddisken. Om du inte behöver att använda den med andra virtualiseringsprogram så kan du lämna denna inställning oförändrad.</translation>
+    </message>
+    <message>
+        <source>Storage on physical hard drive</source>
+        <translation type="obsolete">Lagring på fysisk hårddisk</translation>
+    </message>
+    <message>
+        <source>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
+        <translation type="obsolete">Välj huruvida den nya virtuella hårddiskfilen ska växa när den används (dynamiskt allokerad) eller om den ska skapas med dess maximala storlek (fast storlek).</translation>
+    </message>
+    <message>
+        <source><p>A <b>dynamically allocated</b> hard drive file will only use space on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
+        <translation type="obsolete"><p>En hårddiskfil som är <b>dynamiskt allokerad</b> kommer endast att använda utrymme på din fysiska hårddisk när den fylls upp (upp till maximal <b>fast storlek</b>), dock kommer den inte att minska igen när utrymme frigörs på den.</p></translation>
+    </message>
+    <message>
+        <source><p>A <b>fixed size</b> hard drive file may take longer to create on some systems but is often faster to use.</p></source>
+        <translation type="obsolete"><p>En hårddiskfil med <b>fast storlek</b> kan ta längre tid att skapa på vissa system men är oftast snabbare att använda.</p></translation>
+    </message>
+    <message>
+        <source><p>You can also choose to <b>split</b> the hard drive file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
+        <translation type="obsolete"><p>Du kan även välja att <b>dela upp</b> hårddiskfilen i flera filer på upp till två gigabyte vardera. Detta är oftast användbart om du önskar att lagra den virtuella maskinen på flyttbara USB-enheter eller äldre system, vilka kan ha problem att hantera mycket stora filer.</translation>
     </message>
     <message>
         <source>&Dynamically allocated</source>
-        <translation type="unfinished">&Dynamiskt allokerad</translation>
+        <translation>&Dynamiskt allokerad</translation>
     </message>
     <message>
         <source>&Fixed size</source>
-        <translation type="unfinished">&Fast storlek</translation>
+        <translation>&Fast storlek</translation>
     </message>
     <message>
         <source>&Split into files of less than 2GB</source>
-        <translation type="unfinished">&Dela upp i filer mindre än 2 GB</translation>
+        <translation>&Dela upp i filer mindre än 2 GB</translation>
+    </message>
+    <message>
+        <source>Please choose a location for new virtual hard drive file</source>
+        <translation type="obsolete">Välj en plats för den nya virtuella hårddiskfilen</translation>
+    </message>
+    <message>
+        <source>New hard drive to create</source>
+        <translation type="obsolete">Ny hårddisk att skapa</translation>
+    </message>
+    <message>
+        <source>Please type the name of the new virtual hard drive file into the box below or click on the folder icon to select a different folder to create the file in.</source>
+        <translation type="obsolete">Ange namnet på den nya virtuella hårddiskfilen i rutan nedan eller klicka på mappikonen för att välja en annan mapp att skapa filen i.</translation>
+    </message>
+    <message>
+        <source>Choose a location for new virtual hard drive file...</source>
+        <translation type="obsolete">Välj en plats för den nya virtuella hårddiskfilen...</translation>
     </message>
     <message>
         <source>%1_copy</source>
         <comment>copied virtual hard drive name</comment>
-        <translation type="unfinished">%1_kopia</translation>
+        <translation>%1_kopia</translation>
+    </message>
+    <message>
+        <source>Hard drive to &copy</source>
+        <translation type="obsolete">Hårddisk att &kopiera</translation>
+    </message>
+    <message>
+        <source>&New hard drive to create</source>
+        <translation type="obsolete">&Ny hårddisk att skapa</translation>
+    </message>
+    <message>
+        <source>Hard drive file &type</source>
+        <translation type="obsolete">&Typ av hårddiskfil</translation>
     </message>
     <message>
         <source>Copy Virtual Hard Disk</source>
@@ -11977,95 +12378,99 @@ serial ports</comment>
     <name>UIWizardCloneVM</name>
     <message>
         <source>Linked Base for %1 and %2</source>
-        <translation type="unfinished">Länkad bas för %1 och %2</translation>
+        <translation>Länkad bas för %1 och %2</translation>
     </message>
     <message>
         <source>Clone Virtual Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Klona virtuell maskin</translation>
     </message>
     <message>
         <source>Clone</source>
-        <translation type="unfinished">Klona</translation>
+        <translation>Klona</translation>
     </message>
     <message>
         <source>%1 Clone</source>
-        <translation type="unfinished">%1-klon</translation>
+        <translation>%1-klon</translation>
     </message>
     <message>
         <source>New machine name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nytt maskinnamn</translation>
     </message>
     <message>
         <source><p>Please choose a name for the new virtual machine. The new machine will be a clone of the machine <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Välj ett namn för den nya virtuella maskinen. Den nya maskinen kommer att bli en klon av maskinen <b>%1</b>.</p></translation>
     </message>
     <message>
         <source>When checked a new unique MAC address will be assigned to all configured network cards.</source>
-        <translation type="unfinished">När kryssad kommer en ny unik MAC-adress att tilldelas till alla konfigurerade nätverkskort.</translation>
+        <translation>När kryssad kommer en ny unik MAC-adress att tilldelas till alla konfigurerade nätverkskort.</translation>
     </message>
     <message>
         <source>&Reinitialize the MAC address of all network cards</source>
-        <translation type="unfinished"></translation>
+        <translation>Åt&erinitiera MAC-adressen på alla nätverkskort</translation>
     </message>
     <message>
         <source>Clone type</source>
-        <translation type="unfinished"></translation>
+        <translation>Klontyp</translation>
+    </message>
+    <message>
+        <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard drive files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard drive files will be tied to the virtual hard drive files of original machine and you will not be able to move the new virtual machi [...]
+        <translation type="obsolete"><p>Välj den typ av klon som du vill skapa.</p><p>Om du väljer <b>Fullständig klon</b> så kommer en exakt kopia (inklusive alla virtuella hårddiskfiler) av den ursprungliga virtuella maskinen att skapas.</p><p>Om du väljer <b>Länkad klon</b> så kommer en ny maskin att skapas, men de virtuella hårddiskfiler kommer att knytas till de virtuella hårddiskfilerna för ursprungsmaskinen och du kommer inte k [...]
     </message>
     <message>
         <source><p>If you create a <b>Linked clone</b> then a new snapshot will be created in the original virtual machine as part of the cloning process.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Om du skapar en <b>Länkad klon</b> så kommer en ny ögonblicksbild att skapas i den ursprungliga virtuella maskinen som en del av kloningsprocessen.</p></translation>
     </message>
     <message>
         <source>&Full clone</source>
-        <translation type="unfinished"></translation>
+        <translation>&Fullständig klon</translation>
     </message>
     <message>
         <source>&Linked clone</source>
-        <translation type="unfinished"></translation>
+        <translation>&Länkad klon</translation>
     </message>
     <message>
         <source>Snapshots</source>
-        <translation type="unfinished"></translation>
+        <translation>Ögonblicksbilder</translation>
     </message>
     <message>
         <source><p>Please choose which parts of the snapshot tree should be cloned with the machine.</p></source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source><p>If you choose <b>Current machine state</b>, the new machine will reflect the current state of the original machine and will have no snapshots.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Om du väljer <b>Aktuellt maskintillstånd</b> så kommer den nya maskinen att likna det aktuella tillståndet för originalmaskinen men inte ha några ögonblicksbilder.</p></translation>
     </message>
     <message>
         <source><p>If you choose <b>Current snapshot tree branch</b>, the new machine will reflect the current state of the original machine and will have matching snapshots for all snapshots in the tree branch starting at the current state in the original machine.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Om du väljer <b>Aktuell trädgrupp för ögonblicksbilder</b> så kommer den nya maskinen att likna det aktuella tillståndet för originalmaskinen och ha matchande ögonblicksbilder i trädgruppen, och börja med aktuellt tillstånd för originalmaskinen.</p></translation>
     </message>
     <message>
         <source><p>If you choose <b>Everything</b>, the new machine will reflect the current state of the original machine and will have matching snapshots for all snapshots in the original machine.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Om du väljer <b>Allting</b> så kommer den nya maskinen att likna det aktuella tillståndet för originalmaskinen och ha matchande ögonblicksbilder för alla ögonblicksbilder i originalmaskinen.</p></translation>
     </message>
     <message>
         <source>Current &machine state</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktuellt &maskintillstånd</translation>
     </message>
     <message>
         <source>Current &snapshot tree branch</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktuell träd&grupp för ögonblicksbilder</translation>
     </message>
     <message>
         <source>&Everything</source>
-        <translation type="unfinished"></translation>
+        <translation>A&llting</translation>
     </message>
     <message>
         <source>New machine &name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nytt maskin&namn</translation>
     </message>
     <message>
         <source>&Full Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>&Fullständig klon</translation>
     </message>
     <message>
         <source>&Linked Clone</source>
-        <translation type="unfinished"></translation>
+        <translation>&Länkad klon</translation>
     </message>
     <message>
         <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
@@ -12076,227 +12481,227 @@ serial ports</comment>
     <name>UIWizardExportApp</name>
     <message>
         <source>Checking files ...</source>
-        <translation type="unfinished">Kontrollerar filer ...</translation>
+        <translation>Kontrollerar filer ...</translation>
     </message>
     <message>
         <source>Removing files ...</source>
-        <translation type="unfinished">Tar bort filer ...</translation>
+        <translation>Tar bort filer ...</translation>
     </message>
     <message>
         <source>Exporting Appliance ...</source>
-        <translation type="unfinished">Exporterar appliance ...</translation>
+        <translation>Exporterar appliance ...</translation>
     </message>
     <message>
         <source>Export Virtual Appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportera virtuell appliance</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
-        <translation type="unfinished">Återställ till standardvärden</translation>
+        <translation>Återställ till standardvärden</translation>
     </message>
     <message>
         <source>Export</source>
-        <translation type="unfinished">Exportera</translation>
+        <translation>Exportera</translation>
     </message>
     <message>
         <source>Virtual machines to export</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtuella maskiner att exportera</translation>
     </message>
     <message>
         <source><p>Please select the virtual machines that should be added to the appliance. You can select more than one. Please note that these machines have to be turned off before they can be exported.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Välj de virtuella maskiner som ska läggas till i denna appliance. Du kan välja fler än en. Observera att dessa maskiner måste stängas av innan de kan exporteras.</p></translation>
     </message>
     <message>
         <source>Appliance settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Inställningar för appliance</translation>
     </message>
     <message>
         <source>Please choose where to create the virtual appliance. You can create it on your own computer, on the Sun Cloud service or on an S3 storage server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj var virtuell appliance ska skapas. Du kan skapa den på din egna dator, via tjänsten Sun Cloud eller på en S3-lagringsserver.</translation>
     </message>
     <message>
         <source>Create on</source>
-        <translation type="unfinished"></translation>
+        <translation>Skapa på</translation>
     </message>
     <message>
         <source>&This computer</source>
-        <translation type="unfinished"></translation>
+        <translation>&Denna dator</translation>
     </message>
     <message>
         <source>Sun &Cloud</source>
-        <translation type="unfinished">Sun &Cloud</translation>
+        <translation>Sun &Cloud</translation>
     </message>
     <message>
         <source>&Simple Storage System (S3)</source>
-        <translation type="unfinished">&Simple Storage System (S3)</translation>
+        <translation>&Simple Storage System (S3)</translation>
     </message>
     <message>
         <source>Appliance</source>
-        <translation type="unfinished">Appliance</translation>
+        <translation>Appliance</translation>
     </message>
     <message>
         <source>&Username:</source>
-        <translation type="unfinished">&Användarnamn:</translation>
+        <translation>&Användarnamn:</translation>
     </message>
     <message>
         <source>&Password:</source>
-        <translation type="unfinished">&Lösenord:</translation>
+        <translation>&Lösenord:</translation>
     </message>
     <message>
         <source>&Hostname:</source>
-        <translation type="unfinished">&Värdnamn:</translation>
+        <translation>&Värdnamn:</translation>
     </message>
     <message>
         <source>&Bucket:</source>
-        <translation type="unfinished">&Bucket:</translation>
+        <translation>&Bucket:</translation>
     </message>
     <message>
         <source>&File:</source>
-        <translation type="unfinished">&Fil:</translation>
+        <translation>&Fil:</translation>
     </message>
     <message>
         <source>Open Virtualization Format Archive (%1)</source>
-        <translation type="unfinished">Open Virtualization Format-arkiv (%1)</translation>
+        <translation>Open Virtualization Format Archive (%1)</translation>
     </message>
     <message>
         <source>Open Virtualization Format (%1)</source>
-        <translation type="unfinished">Open Virtualization Format (%1)</translation>
+        <translation>Open Virtualization Format (%1)</translation>
     </message>
     <message>
         <source>Write in legacy OVF 0.9 format for compatibility with other virtualization products.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv i det äldre formatet OVF 0.9 för kompatibilitet med andra virtualiseringsprodukter.</translation>
     </message>
     <message>
         <source>Create a Manifest file for automatic data integrity checks on import.</source>
-        <translation type="unfinished">Skapa en Manifest-fil för automatiska dataintegritetskontroller vid import.</translation>
+        <translation>Skapa en Manifest-fil för automatiska dataintegritetskontroller vid import.</translation>
     </message>
     <message>
         <source>Write &Manifest file</source>
-        <translation type="unfinished">Skriv &Manifest-fil</translation>
+        <translation>Skriv &Manifest-fil</translation>
     </message>
     <message>
         <source>This is the descriptive information which will be added to the virtual appliance.  You can change it by double clicking on individual lines.</source>
-        <translation type="unfinished"></translation>
+        <translation>Detta är en beskrivande information som kommer att läggas till i virtuell appliance.  Du kan ändra den genom att dubbelklicka på individuella rader.</translation>
     </message>
     <message>
         <source>Virtual &machines to export</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtuella &maskiner att exportera</translation>
     </message>
     <message>
         <source>Appliance &settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Inställninga&r för appliance</translation>
     </message>
     <message>
         <source>&Destination</source>
-        <translation type="unfinished"></translation>
+        <translation>&Mål</translation>
     </message>
     <message>
         <source>&Local Filesystem </source>
-        <translation type="unfinished">&Lokalt filsystem </translation>
+        <translation>&Lokalt filsystem </translation>
     </message>
     <message>
         <source>Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagringsinställningar</translation>
     </message>
     <message>
         <source>Please choose a file to export the virtual appliance to</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj en fil att exportera virtuell appliance till</translation>
     </message>
     <message>
         <source>F&ormat:</source>
-        <translation type="unfinished"></translation>
+        <translation>F&ormat:</translation>
     </message>
     <message>
         <source>OVF 0.9</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 0.9</translation>
     </message>
     <message>
         <source>OVF 1.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 1.0</translation>
     </message>
     <message>
         <source>OVF 2.0</source>
-        <translation type="unfinished"></translation>
+        <translation>OVF 2.0</translation>
     </message>
     <message>
         <source>Write in standard OVF 1.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv i standardformatet OVF 1.0.</translation>
     </message>
     <message>
         <source>Write in new experimental OVF 2.0 format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv i nya experimentformatet OVF 2.0.</translation>
     </message>
     <message>
         <source>&Storage settings</source>
-        <translation type="unfinished"></translation>
+        <translation>La&gringsinställningar</translation>
     </message>
 </context>
 <context>
     <name>UIWizardExportAppPageBasic3</name>
     <message>
         <source><p>Please choose a filename to export the OVF/OVA to.</p><p>If you use an <i>ova</i> extension, then all the files will be combined into one Open Virtualization Format Archive.</p><p>If you use an <i>ovf</i> extension, several files will be written separately.</p><p>Other extensions are not allowed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Välj ett filnamn att exportera OVF/OVA-filen till.</p><p>Om du använder filändelsen <i>ova</i> så kommer alla filer att kombineras i ett Open Virtualization Format Archive.</p><p>Om du använder filändelsen <i>ovf</i> så kommer flera filer att skrivas separat.</p><p>Andra filändelser tillåts inte.</p></translation>
     </message>
     <message>
         <source>Please complete the additional fields like the username, password and the bucket, and provide a filename for the OVF target.</source>
-        <translation type="unfinished"></translation>
+        <translation>Färdigställ ytterligare fält såsom användarnamn, lösenord och bucket, samt ett filnamn för OVF-filen.</translation>
     </message>
     <message>
         <source>Please complete the additional fields like the username, password, hostname and the bucket, and provide a filename for the OVF target.</source>
-        <translation type="unfinished"></translation>
+        <translation>Färdigställ ytterligare fält såsom användarnamn, lösenord, värdnamn och bucket, samt ett filnamn för OVF-filen.</translation>
     </message>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj en fil att exportera virtuell appliance till...</translation>
     </message>
 </context>
 <context>
     <name>UIWizardExportAppPageExpert</name>
     <message>
         <source>Choose a file to export the virtual appliance to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj en fil att exportera virtuell appliance till...</translation>
     </message>
 </context>
 <context>
     <name>UIWizardFirstRun</name>
     <message>
         <source>Select start-up disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj uppstartsdisk</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished">Starta</translation>
+        <translation>Starta</translation>
     </message>
     <message>
         <source><p>Please select a virtual optical disk file or a physical optical drive containing a disk to start your new virtual machine from.</p><p>The disk should be suitable for starting a computer from and should contain the operating system you wish to install on the virtual machine if you want to do that now. The disk will be ejected from the virtual drive automatically next time you switch the virtual machine off, but you can also do this yourself if needed u [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Välj en virtuell optisk diskfil eller en fysisk optisk enhet som innehåller en disk för att starta upp din nya virtuella maskin från.</p><p>Disken bör vara lämplig för att starta upp en dator från och bör innehålla operativsystemet som du vill installera på den virtuella maskinen om du vill göra det nu. Disken kommer automatiskt att matas ut från den virtuella enheten nästa gång som du stänger av den virtuella maskinen, men du kan även göra detta [...]
     </message>
     <message>
         <source><p>Please select a virtual optical disk file or a physical optical drive containing a disk to start your new virtual machine from.</p><p>The disk should be suitable for starting a computer from. As this virtual machine has no hard drive you will not be able to install an operating system on it at the moment.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Välj en virtuell optisk diskfil eller en fysisk optisk enhet som innehåller en disk för att starta upp din nya virtuella maskin från.</p><p>Disken bör vara lämplig för att starta upp en dator från. Eftersom denna virtuella maskin inte har någon hårddisk så kommer du inte kunna att installera ett operativsystem på den för tillfället.</p></translation>
     </message>
     <message>
         <source>Choose a virtual optical disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj en virtuell optisk diskfil...</translation>
     </message>
 </context>
 <context>
     <name>UIWizardImportApp</name>
     <message>
         <source>Restore Defaults</source>
-        <translation type="unfinished">Återställ till standardvärden</translation>
+        <translation>Återställ till standardvärden</translation>
     </message>
     <message>
         <source>Import</source>
-        <translation type="unfinished">Importera</translation>
+        <translation>Importera</translation>
     </message>
     <message>
         <source>Appliance to import</source>
-        <translation type="unfinished"></translation>
+        <translation>Appliance att importera</translation>
     </message>
     <message>
         <source><p>VirtualBox currently supports importing appliances saved in the Open Virtualization Format (OVF). To continue, select the file to import below.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>VirtualBox har stöd för att importera appliance som sparats i Open Virtualization Format (OVF). Välj en fil att importera för att fortsätta.</p></translation>
     </message>
     <message>
         <source>Select an appliance to import</source>
@@ -12304,62 +12709,110 @@ serial ports</comment>
     </message>
     <message>
         <source>Open Virtualization Format (%1)</source>
-        <translation type="unfinished">Open Virtualization Format (%1)</translation>
+        <translation>Open Virtualization Format (%1)</translation>
     </message>
     <message>
         <source>Appliance settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Inställningar för appliance</translation>
     </message>
     <message>
         <source>These are the virtual machines contained in the appliance and the suggested settings of the imported VirtualBox machines. You can change many of the properties shown by double-clicking on the items and disable others using the check boxes below.</source>
-        <translation type="unfinished"></translation>
+        <translation>Detta är de virtuella maskiner som finns i denna appliance och de föredragna inställningarna för de importerade VirtualBox-maskinerna. Du kan ändra flera av egenskaperna som visas genom att dubbelklicka på objekten och inaktivera andra via kryssrutorna nedan.</translation>
     </message>
     <message>
         <source>Import Virtual Appliance</source>
-        <translation type="unfinished"></translation>
+        <translation>Importera virtuell appliance</translation>
     </message>
     <message>
         <source>Choose a virtual appliance file to import...</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj en virtuell appliance-fil att importera...</translation>
     </message>
     <message>
         <source>Please choose a virtual appliance file to import</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj en virtuell appliance-fil att importera</translation>
     </message>
 </context>
 <context>
     <name>UIWizardNewVD</name>
     <message>
+        <source>Create Virtual Hard Drive</source>
+        <translation type="obsolete">Skapa virtuell hårddisk</translation>
+    </message>
+    <message>
         <source>Create</source>
-        <translation type="unfinished">Skapa</translation>
+        <translation>Skapa</translation>
+    </message>
+    <message>
+        <source>Hard drive file type</source>
+        <translation type="obsolete">Typ av hårddiskfil</translation>
+    </message>
+    <message>
+        <source>Please choose the type of file that you would like to use for the new virtual hard drive. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
+        <translation type="obsolete">Välj den typ av fil som du vill använda för den nya virtuella hårddisken. Om du inte behöver använda den med andra virtualiseringsprogram så kan du lämna denna inställning oförändrad.</translation>
+    </message>
+    <message>
+        <source>Storage on physical hard drive</source>
+        <translation type="obsolete">Lagring på fysisk hårddisk</translation>
+    </message>
+    <message>
+        <source>Please choose whether the new virtual hard drive file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
+        <translation type="obsolete">Välj huruvida den nya virtuella hårddiskfilen ska växa när den används (dynamiskt allokerad) eller om den ska skapas med dess maximala storlek (fast storlek).</translation>
+    </message>
+    <message>
+        <source><p>A <b>dynamically allocated</b> hard drive file will only use space on your physical hard drive as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
+        <translation type="obsolete"><p>En hårddiskfil som är <b>dynamiskt allokerad</b> kommer endast att använda utrymme på din fysiska hårddisk när den fylls upp (upp till maximal <b>fast storlek</b>), dock kommer den inte att minska igen när utrymme frigörs på den.</p></translation>
+    </message>
+    <message>
+        <source><p>A <b>fixed size</b> hard drive file may take longer to create on some systems but is often faster to use.</p></source>
+        <translation type="obsolete"><p>En hårddiskfil med <b>fast storlek</b> kan ta längre tid att skapa på vissa system men är oftast snabbare att använda.</p></translation>
+    </message>
+    <message>
+        <source><p>You can also choose to <b>split</b> the hard drive file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
+        <translation type="obsolete"><p>Du kan även välja att <b>dela upp</b> hårddiskfilen i flera filer på upp till två gigabyte vardera. Detta är oftast användbart om du önskar att lagra den virtuella maskinen på flyttbara USB-enheter eller äldre system, vilka kan ha problem att hantera mycket stora filer.</translation>
     </message>
     <message>
         <source>&Dynamically allocated</source>
-        <translation type="unfinished">&Dynamiskt allokerad</translation>
+        <translation>&Dynamiskt allokerad</translation>
     </message>
     <message>
         <source>&Fixed size</source>
-        <translation type="unfinished">&Fast storlek</translation>
+        <translation>&Fast storlek</translation>
     </message>
     <message>
         <source>&Split into files of less than 2GB</source>
-        <translation type="unfinished">&Dela upp i filer mindre än 2 GB</translation>
+        <translation>&Dela upp i filer mindre än 2 GB</translation>
     </message>
     <message>
         <source><nobr>%1 (%2 B)</nobr></source>
-        <translation type="unfinished"><nobr>%1 (%2 B)</nobr></translation>
+        <translation><nobr>%1 (%2 B)</nobr></translation>
     </message>
     <message>
         <source>File location and size</source>
-        <translation type="unfinished"></translation>
+        <translation>Plats och storlek för fil</translation>
+    </message>
+    <message>
+        <source>Please type the name of the new virtual hard drive file into the box below or click on the folder icon to select a different folder to create the file in.</source>
+        <translation type="obsolete">Välj ett namn för den nya virtuella hårddiskfilen i rutan nedan eller klicka på mappikonen för att välja en annan mapp att skapa filen i.</translation>
+    </message>
+    <message>
+        <source>Choose a location for new virtual hard drive file...</source>
+        <translation type="obsolete">Välj en plats för nya virtuella hårddiskfilen...</translation>
+    </message>
+    <message>
+        <source>Select the size of the virtual hard drive in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard drive.</source>
+        <translation type="obsolete">Välj storlek för den virtuella hårddisk i megabyte. Denna storlek är den övre gränsen för det fildata som en virtuell maskin kommer att kunna lagra på hårddisken.</translation>
     </message>
     <message>
         <source>File &location</source>
-        <translation type="unfinished"></translation>
+        <translation>Pla&ts för fil</translation>
     </message>
     <message>
         <source>File &size</source>
-        <translation type="unfinished"></translation>
+        <translation>Fil&storlek</translation>
+    </message>
+    <message>
+        <source>Hard drive file &type</source>
+        <translation type="obsolete">&Typ av hårddiskfil</translation>
     </message>
     <message>
         <source>Create Virtual Hard Disk</source>
@@ -12414,11 +12867,11 @@ serial ports</comment>
     <name>UIWizardNewVM</name>
     <message>
         <source>Create Virtual Machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Skapa virtuell maskin</translation>
     </message>
     <message>
         <source>Create</source>
-        <translation type="unfinished">Skapa</translation>
+        <translation>Skapa</translation>
     </message>
     <message>
         <source>IDE Controller</source>
@@ -12442,23 +12895,47 @@ serial ports</comment>
     </message>
     <message>
         <source>Name and operating system</source>
-        <translation type="unfinished"></translation>
+        <translation>Namn och operativsystem</translation>
     </message>
     <message>
         <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj ett beskrivande namn för den nya virtuella maskinen och välj den typ av operativsystem som du planerar att installera på den. Namnet som du väljer kommer att användas i VirtualBox för att identifiera denna maskin.</translation>
     </message>
     <message>
         <source>Memory size</source>
-        <translation type="unfinished"></translation>
+        <translation>Minnesstorlek</translation>
     </message>
     <message>
         <source><p>Select the amount of memory (RAM) in megabytes to be allocated to the virtual machine.</p><p>The recommended memory size is <b>%1</b> MB.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Välj storlek på minnet (RAM) i megabyte som ska allokeras till den virtuella maskinen.</p><p>Rekommenderad minnesstorlek är <b>%1</b> MB.</p></translation>
+    </message>
+    <message>
+        <source>Hard drive</source>
+        <translation type="obsolete">Hårddisk</translation>
+    </message>
+    <message>
+        <source><p>If you wish you can add a virtual hard drive to the new machine. You can either create a new hard drive file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard drive is <b>%1</b>.</p></source>
+        <translation type="obsolete"><p>Om du så önskar så kan du lägga till en virtuell hårddisk till den nya maskinen. Du kan antingen skapa en ny hårddiskfil eller välja en från listan från andra platser med hjälp av mappikonen.</p><p>Om du behöver mer komplexa lagringskonfigurationer så kan du hoppa över detta steg och göra ändringarna i maskininställningarna när maskinen har skapats.</p><p>Rekommenderad storlek för hårddisken är <b>%1</b>.&l [...]
+    </message>
+    <message>
+        <source>Choose a virtual hard drive file...</source>
+        <translation type="obsolete">Välj en virtuell hårddiskfil...</translation>
     </message>
     <message>
         <source>&Memory size</source>
-        <translation type="unfinished"></translation>
+        <translation>&Minnesstorlek</translation>
+    </message>
+    <message>
+        <source>&Do not add a virtual hard drive</source>
+        <translation type="obsolete">Lägg &inte till en virtuell hårddisk</translation>
+    </message>
+    <message>
+        <source>&Create a virtual hard drive now</source>
+        <translation type="obsolete">S&kapa en virtuell hårddisk nu</translation>
+    </message>
+    <message>
+        <source>&Use an existing virtual hard drive file</source>
+        <translation type="obsolete">A&nvänd en befintlig virtuell hårddiskfil</translation>
     </message>
     <message>
         <source>Hard disk</source>
@@ -13311,7 +13788,7 @@ Version %1</translation>
     </message>
     <message>
         <source>Choose...</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj...</translation>
     </message>
 </context>
 <context>
@@ -13370,7 +13847,7 @@ Version %1</translation>
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Värdet för standardsökväg kommer att visas efter att ändringarna har godkänts och detta fönster öppnats igen.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -14600,7 +15077,7 @@ Version %1</translation>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Anslutning av denna hårddisk kommer att genomföras indirekt med en nyligen skapad skiljande hårddisk.</translation>
+        <translation>Anslutning av denna hårddisk kommer att genomföras indirekt med en nyligen skapad skiljande hårddisk.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -14610,7 +15087,7 @@ Version %1</translation>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Denna bashårddisk är indirekt ansluten med följande skiljande hårddisk:</translation>
+        <translation>Denna bashårddisk är indirekt ansluten med följande skiljande hårddisk:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -14931,325 +15408,347 @@ Version %1</translation>
     <message>
         <source>Disabled</source>
         <comment>DragAndDropType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Inaktiverad</translation>
     </message>
     <message>
         <source>Host To Guest</source>
         <comment>DragAndDropType</comment>
-        <translation type="unfinished">Värd till gäst</translation>
+        <translation>Värd till gäst</translation>
     </message>
     <message>
         <source>Guest To Host</source>
         <comment>DragAndDropType</comment>
-        <translation type="unfinished">Gäst till värd</translation>
+        <translation>Gäst till värd</translation>
     </message>
     <message>
         <source>Bidirectional</source>
         <comment>DragAndDropType</comment>
-        <translation type="unfinished">Dubbelriktad</translation>
+        <translation>Dubbelriktad</translation>
     </message>
     <message>
         <source>Normal</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Normal</translation>
+        <translation>Normal</translation>
     </message>
     <message>
         <source>Immutable</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Oföränderlig</translation>
+        <translation>Oföränderlig</translation>
     </message>
     <message>
         <source>Writethrough</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Writethrough</translation>
+        <translation>Writethrough</translation>
     </message>
     <message>
         <source>Shareable</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Delningsbar</translation>
+        <translation>Delningsbar</translation>
     </message>
     <message>
         <source>Readonly</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Skrivskyddad</translation>
+        <translation>Skrivskyddad</translation>
     </message>
     <message>
         <source>Multi-attach</source>
         <comment>MediumType</comment>
-        <translation type="unfinished">Multi-attach</translation>
+        <translation>Multi-attach</translation>
     </message>
     <message>
         <source>Dynamically allocated storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished">Dynamiskt allokerad lagring</translation>
+        <translation>Dynamiskt allokerad lagring</translation>
     </message>
     <message>
         <source>Dynamically allocated differencing storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dynamiskt allokerad lagring (endast förändringar)</translation>
     </message>
     <message>
         <source>Fixed size storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished">Lagring med fast storlek</translation>
+        <translation>Lagring med fast storlek</translation>
     </message>
     <message>
         <source>Dynamically allocated storage split into files of less than 2GB</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished">Dynamiskt allokerad lagring delad i filer mindre än 2 GB</translation>
+        <translation>Dynamiskt allokerad lagring delad i filer mindre än 2 GB</translation>
     </message>
     <message>
         <source>Dynamically allocated differencing storage split into files of less than 2GB</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dynamiskt allokerad lagring (endast förändringar) delad i filer mindre än 2 GB</translation>
     </message>
     <message>
         <source>Fixed size storage split into files of less than 2GB</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished">Lagring med fast storlek delad i filer mindre än 2 GB</translation>
+        <translation>Lagring med fast storlek delad i filer mindre än 2 GB</translation>
     </message>
     <message>
         <source>Dynamically allocated compressed storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dynamiskt allokerad komprimerad lagring</translation>
     </message>
     <message>
         <source>Dynamically allocated differencing compressed storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dynamiskt allokerad och komprimerad lagring (endast förändringar)</translation>
     </message>
     <message>
         <source>Fixed size ESX storage</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>ESX-lagring med fast storlek</translation>
     </message>
     <message>
         <source>Fixed size storage on raw disk</source>
         <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
+        <translation>Lagring med fast storlek på rå disk</translation>
     </message>
     <message>
         <source>Deny</source>
         <comment>NetworkAdapterPromiscModePolicy</comment>
-        <translation type="unfinished">Neka</translation>
+        <translation>Neka</translation>
     </message>
     <message>
         <source>Allow VMs</source>
         <comment>NetworkAdapterPromiscModePolicy</comment>
-        <translation type="unfinished">Tillåt virtuella maskiner</translation>
+        <translation>Tillåt virtuella maskiner</translation>
     </message>
     <message>
         <source>Allow All</source>
         <comment>NetworkAdapterPromiscModePolicy</comment>
-        <translation type="unfinished">Tillåt alla</translation>
+        <translation>Tillåt alla</translation>
     </message>
     <message>
         <source>Ignore</source>
         <comment>USBDeviceFilterAction</comment>
-        <translation type="unfinished">Ignorera</translation>
+        <translation>Ignorera</translation>
     </message>
     <message>
         <source>Hold</source>
         <comment>USBDeviceFilterAction</comment>
-        <translation type="unfinished">Håll kvar</translation>
+        <translation>Håll kvar</translation>
     </message>
     <message>
         <source>UDP</source>
         <comment>NATProtocol</comment>
-        <translation type="unfinished">UDP</translation>
+        <translation>UDP</translation>
     </message>
     <message>
         <source>TCP</source>
         <comment>NATProtocol</comment>
-        <translation type="unfinished">TCP</translation>
+        <translation>TCP</translation>
     </message>
     <message>
         <source>IDE Primary Master</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">IDE Primär master</translation>
+        <translation>IDE Primär master</translation>
     </message>
     <message>
         <source>IDE Primary Slave</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">IDE Primär slav</translation>
+        <translation>IDE Primär slav</translation>
     </message>
     <message>
         <source>IDE Secondary Master</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">IDE Sekundär master</translation>
+        <translation>IDE Sekundär master</translation>
     </message>
     <message>
         <source>IDE Secondary Slave</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">IDE Sekundär slav</translation>
+        <translation>IDE Sekundär slav</translation>
     </message>
     <message>
         <source>SATA Port %1</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">SATA-port %1</translation>
+        <translation>SATA-port %1</translation>
     </message>
     <message>
         <source>SCSI Port %1</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">SCSI-port %1</translation>
+        <translation>SCSI-port %1</translation>
     </message>
     <message>
         <source>SAS Port %1</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">SAS-port %1</translation>
+        <translation>SAS-port %1</translation>
     </message>
     <message>
         <source>Floppy Device %1</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished">Diskettenhet %1</translation>
+        <translation>Diskettenhet %1</translation>
     </message>
     <message>
         <source>General</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Allmänt</translation>
+        <translation>Allmänt</translation>
     </message>
     <message>
         <source>Preview</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Förhandsvisning</translation>
+        <translation>Förhandsvisning</translation>
     </message>
     <message>
         <source>System</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">System</translation>
+        <translation>System</translation>
     </message>
     <message>
         <source>Display</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Skärm</translation>
+        <translation>Skärm</translation>
     </message>
     <message>
         <source>Storage</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Lagring</translation>
+        <translation>Lagring</translation>
     </message>
     <message>
         <source>Audio</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Ljud</translation>
+        <translation>Ljud</translation>
     </message>
     <message>
         <source>Network</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Nätverk</translation>
+        <translation>Nätverk</translation>
     </message>
     <message>
         <source>Serial ports</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Serieportar</translation>
     </message>
     <message>
         <source>Parallel ports</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Parallelportar</translation>
     </message>
     <message>
         <source>USB</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">USB</translation>
+        <translation>USB</translation>
     </message>
     <message>
         <source>Shared folders</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished"></translation>
+        <translation>Delade mappar</translation>
     </message>
     <message>
         <source>Description</source>
         <comment>DetailsElementType</comment>
-        <translation type="unfinished">Beskrivning</translation>
+        <translation>Beskrivning</translation>
+    </message>
+    <message>
+        <source>Please choose a virtual hard drive file</source>
+        <translation type="obsolete">Välj en virtuell hårddiskfil</translation>
+    </message>
+    <message>
+        <source>All virtual hard drive files (%1)</source>
+        <translation type="obsolete">Alla virtuella hårddiskfiler (%1)</translation>
     </message>
     <message>
         <source>Please choose a virtual optical disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj en virtuell optisk diskfil</translation>
     </message>
     <message>
         <source>All virtual optical disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Alla virtuella optiska diskfiler (%1)</translation>
     </message>
     <message>
         <source>Please choose a virtual floppy disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Välj en virtuell diskettavbildsfil</translation>
     </message>
     <message>
         <source>All virtual floppy disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Alla virtuella diskettavbildsfiler (%1)</translation>
     </message>
     <message>
         <source>VDI (VirtualBox Disk Image)</source>
-        <translation type="unfinished"></translation>
+        <translation>VDI (VirtualBox diskavbild)</translation>
     </message>
     <message>
         <source>VMDK (Virtual Machine Disk)</source>
-        <translation type="unfinished"></translation>
+        <translation>VMDK (Virtuell maskin-disk)</translation>
     </message>
     <message>
         <source>VHD (Virtual Hard Disk)</source>
-        <translation type="unfinished"></translation>
+        <translation>VHD (Virtuell hårddisk)</translation>
     </message>
     <message>
         <source>HDD (Parallels Hard Disk)</source>
-        <translation type="unfinished"></translation>
+        <translation>HDD (Parallels-hårddisk)</translation>
     </message>
     <message>
         <source>QED (QEMU enhanced disk)</source>
-        <translation type="unfinished"></translation>
+        <translation>QED (QEMU utökad disk)</translation>
     </message>
     <message>
         <source>QCOW (QEMU Copy-On-Write)</source>
-        <translation type="unfinished"></translation>
+        <translation>QCOW (QEMU Copy-On-Write)</translation>
+    </message>
+    <message>
+        <source>Please choose a location for new virtual hard drive file</source>
+        <translation type="obsolete">Välj en plats för den nya virtuella hårddiskfilen</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Aktiverad</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>details report (Unrestricted Execution)</comment>
+        <translation type="obsolete">Inaktiverad</translation>
     </message>
     <message>
         <source>Unrestricted Execution</source>
         <comment>details report</comment>
-        <translation type="unfinished"></translation>
+        <translation>Obegränsad körning</translation>
     </message>
     <message>
         <source>PS/2 Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PS/2-mus</translation>
     </message>
     <message>
         <source>USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB-mus</translation>
     </message>
     <message>
         <source>PS/2 and USB Mouse</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>PS/2 och USB-mus</translation>
     </message>
     <message>
         <source>Unrestricted Execution</source>
-        <translation type="unfinished"></translation>
+        <translation>Obegränsad körning</translation>
     </message>
     <message>
         <source>USB Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB-musplatta</translation>
     </message>
     <message>
         <source>USB Multi-Touch Tablet</source>
         <comment>PointingHIDType</comment>
-        <translation type="unfinished"></translation>
+        <translation>USB-musplatta (Multi Touch)</translation>
     </message>
     <message>
         <source>NAT Network</source>
         <comment>NetworkAttachmentType</comment>
-        <translation type="unfinished"></translation>
+        <translation>NAT-nätverk</translation>
     </message>
     <message>
         <source>NAT network, '%1'</source>
         <comment>details report (network)</comment>
-        <translation type="unfinished"></translation>
+        <translation>NAT-nätverk, '%1'</translation>
     </message>
     <message>
         <source>You can create or add disk image files in the virtual machine settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du kan skapa eller lägga till diskavbildsfiler i inställningarna för virtuella maskinen.</translation>
     </message>
     <message>
         <source>USB</source>
@@ -15259,7 +15758,7 @@ Version %1</translation>
     <message>
         <source>USB Port %1</source>
         <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">USB-port %1</translation>
     </message>
     <message>
         <source>off</source>
@@ -15267,41 +15766,6 @@ Version %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Standard</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished">Aktiv</translation>
@@ -15332,6 +15796,11 @@ Version %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -15342,6 +15811,31 @@ Version %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -15352,6 +15846,11 @@ Version %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -15381,16 +15880,16 @@ Version %1</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15709,15 +16208,15 @@ Version %1</translation>
         <translation type="obsolete">S&täng</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -15848,8 +16347,8 @@ Version %1</translation>
         <translation type="obsolete">Kunde inte genomföra anslutningshandskakning.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Fyll i det här registreringsformuläret för att informera oss om att du använder VirtualBox och, valfritt, för att hålla dig informerad om nyheter och uppdateringar för VirtualBox.</p><p>Ange ditt fullständiga namn med latinska bokstäver och din e-postadress i nedanstående fält. Observera att Sun Microsystems endast kommer att använda den här informationen för att samla in statistik om produktanvändning och för att skicka ut nyhets [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Fyll i det här registreringsformuläret för att informera oss om att du använder VirtualBox och, valfritt, för att hålla dig informerad om nyheter och uppdateringar för VirtualBox.</p><p>Ange ditt fullständiga namn med latinska bokstäver och din e-postadress i nedanstående fält. Observera att Sun Microsystems endast kommer att använda den här informationen för att samla in statistik om produktanvändning och för att skicka ut nyhets [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -15868,8 +16367,8 @@ Version %1</translation>
         <translation type="obsolete">Välj land/region</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
-        <translation type="obsolete"><p>Fyll i detta registreringsformulär för att informera oss om att du använder VirtualBox och, upp till dig själv, för att hålla dig informerad om nyheter och uppdateringar för VirtualBox.</p><p>Observera att Sun Microsystems endast kommer att använda denna information för att samla in statistik om användningen av produkten och för att skicka ut nyhetsbrev om VirtualBox. Sun Microsystems kommer aldrig att skicka vidare din informatio [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
+        <translation type="obsolete"><p>Fyll i detta registreringsformulär för att informera oss om att du använder VirtualBox och, upp till dig själv, för att hålla dig informerad om nyheter och uppdateringar för VirtualBox.</p><p>Observera att Sun Microsystems endast kommer att använda denna information för att samla in statistik om användningen av produkten och för att skicka ut nyhetsbrev om VirtualBox. Sun Microsystems kommer aldrig att skicka vidare din informatio [...]
     </message>
     <message>
         <source>I &already have a Sun Online account:</source>
@@ -16025,8 +16524,8 @@ Version %1</translation>
         <translation type="obsolete">Pausa körningen av den virtuella maskinen</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Välkommen till VirtualBox!</h3><p>Den vänstra sidan av detta fönster är tänkt att visa en lista över alla virtuella maskiner på din dator. Listan är tom just nu därför att du inte har skapat några virtuella maskiner än.<img src=:/welcome.png align=right/></p><p>Tryck på knappen <b>Ny</b> i huvudverktygsraden i överkanten av fönstret för att skapa en ny virtuell maskin.</p><p>Du kan trycka [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Välkommen till VirtualBox!</h3><p>Den vänstra sidan av detta fönster är tänkt att visa en lista över alla virtuella maskiner på din dator. Listan är tom just nu därför att du inte har skapat några virtuella maskiner än.<img src=:/welcome.png align=right/></p><p>Tryck på knappen <b>Ny</b> i huvudverktygsraden i överkanten av fönstret för att skapa en ny virtuell maskin.</p><p>Du kan trycka [...]
     </message>
     <message>
         <source>Log</source>
@@ -16576,6 +17075,104 @@ Version %1</translation>
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Configuration &Details</source>
+        <translation type="obsolete">Konfigurations&detaljer</translation>
+    </message>
+    <message>
+        <source>&Runtime Information</source>
+        <translation type="obsolete">&Körtidsinformation</translation>
+    </message>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 - Sessionsinformation</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">DMA-överföringar</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">PIO-överföringar</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Data läst</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Data skriven</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Data överförd</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Data mottagen</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Inte upptäckt</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Inte upptäckt</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Inte tillgänglig</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Körtidsattribut</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Skärmupplösning</translation>
+    </message>
+    <message>
+        <source>Clipboard Mode</source>
+        <translation type="obsolete">Urklippsläge</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">Dra och släpp-läge</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Gästtillägg</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Typ av gästoperativsystem</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Lagringsstatistik</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Inga lagringsenheter</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Nätverksstatistik</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Inga nätverksadaptrar</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMLogViewer</name>
     <message>
         <source>Log Viewer</source>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
index c8186a5..ad5a7c9 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
@@ -607,7 +607,7 @@
     </message>
     <message>
         <source>&Import Appliance...</source>
-        <translation>Cihazı iç&e aktar...</translation>
+        <translation>Cihazı İç&e Aktar...</translation>
     </message>
     <message>
         <source>Import an appliance into VirtualBox</source>
@@ -615,7 +615,7 @@
     </message>
     <message>
         <source>&Export Appliance...</source>
-        <translation>Cihazı &dışa aktar...</translation>
+        <translation>Cihazı &Dışa Aktar...</translation>
     </message>
     <message>
         <source>Export one or more VirtualBox virtual machines as an appliance</source>
@@ -736,7 +736,7 @@
     </message>
     <message>
         <source>Show &Log...</source>
-        <translation>Gün&lüğü göster...</translation>
+        <translation>Gün&lüğü Göster...</translation>
     </message>
     <message>
         <source>&VirtualBox Web Site...</source>
@@ -752,7 +752,7 @@
     </message>
     <message>
         <source>Rena&me Group...</source>
-        <translation>Grubu yeniden &adlandır...</translation>
+        <translation>Grubu Yeniden &Adlandır...</translation>
     </message>
     <message>
         <source>Sort the items of the selected virtual machine group alphabetically</source>
@@ -832,7 +832,7 @@
     </message>
     <message>
         <source>&Add Machine...</source>
-        <translation>Makine &ekle...</translation>
+        <translation>Makine &Ekle...</translation>
     </message>
     <message>
         <source>&Ungroup...</source>
@@ -1118,312 +1118,312 @@
     </message>
     <message>
         <source>Minimize active window</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktif pencereyi simge durumuna küçült</translation>
     </message>
     <message>
         <source>Display the Network Operations Manager window</source>
-        <translation type="unfinished"></translation>
+        <translation>Ağ İşlemleri Yöneticisi penceresini görünütüle</translation>
     </message>
     <message>
         <source>Display a window with product information</source>
-        <translation type="unfinished"></translation>
+        <translation>Ürün bilgisi olan bir pencere görüntüle</translation>
     </message>
     <message>
         <source>&Preferences...</source>
         <comment>global preferences window</comment>
-        <translation type="unfinished">&Tercihler...</translation>
+        <translation>&Tercihler...</translation>
     </message>
     <message>
         <source>Display the global preferences window</source>
-        <translation type="unfinished"></translation>
+        <translation>Genel tercihler penceresini görüntüle</translation>
     </message>
     <message>
         <source>Display the virtual machine settings window</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal makine ayarları penceresini görüntüle</translation>
     </message>
     <message>
         <source>Display the virtual machine session information window</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal makine oturum bilgisi penceresini görüntüle</translation>
     </message>
     <message>
         <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <translation>Durumu &Kaydet</translation>
     </message>
     <message>
         <source>Save the state of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal makinenin durumunu kaydet</translation>
     </message>
     <message>
         <source>Send the ACPI Shutdown signal to the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal makineye ACPI Kapatma sinyali gönder</translation>
     </message>
     <message>
         <source>&Minimize Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Pencere &Simge Durumuna</translation>
     </message>
     <message>
         <source>Automatically resize the guest display when the window is resized</source>
-        <translation type="unfinished"></translation>
+        <translation>Pencere yeniden boyutlandırıldığında misafir ekranını otomatik olarak yeniden boyutlandır</translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
-        <translation type="unfinished"></translation>
+        <source>Take guest display screenshot</source>
+        <translation>Misafir ekranı görüntüsünü al</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure video capture</source>
+        <translation>Görüntü yakalamayı yapılandırmak için sanal makine ayarları penceresini görüntüle</translation>
     </message>
     <message>
         <source>Enable guest display video capture</source>
-        <translation type="unfinished"></translation>
+        <translation>Misafir ekranı görüntünü yakalamayı etkinleştir</translation>
     </message>
     <message>
         <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Bu makineye uzak masaüstü (RDP) bağlantılarına izin ver</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure menu-bar</source>
+        <translation>Menü çubuğunu yapılandırmak için pencereyi görüntüle</translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable menu-bar</source>
+        <translation>Menü çubuğunu etkinleştir</translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure status-bar</source>
+        <translation>Durum çubuğunu yapılandırmak için pencereyi görüntüle</translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable status-bar</source>
+        <translation>Durum çubuğunu etkinleştir</translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
-        <translation type="unfinished"></translation>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
+        <translation>Klavye kısayollarını yapılandırmak için genel tercihler penceresini görüntüle</translation>
     </message>
     <message>
         <source>&Insert %1</source>
         <comment>that means send the %1 key sequence to the virtual machine</comment>
-        <translation type="unfinished">%1 &Ekle</translation>
+        <translation>%1 &Ekle</translation>
     </message>
     <message>
         <source>&Hard Disks</source>
-        <translation type="unfinished">&Sabit Diskler</translation>
+        <translation>&Sabit Diskler</translation>
     </message>
     <message>
         <source>&Hard Disk Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Sabit Disk Ayarları...</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure hard disks</source>
+        <translation>Sabit diskleri yapılandırmak için sanal makine ayarları penceresini görüntüle</translation>
     </message>
     <message>
         <source>&Network</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ağ</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure network adapters</source>
+        <translation>Ağ bağdaştırıcılarını yapılandırmak için sanal makine ayarları penceresini görüntüle</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure USB devices</source>
+        <translation>USB aygıtları yapılandırmak için sanal makine ayarları penceresini görüntüle</translation>
     </message>
     <message>
         <source>&Drag and Drop</source>
-        <translation type="unfinished"></translation>
+        <translation>&Sürükle ve Bırak</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure shared folders</source>
+        <translation>Paylaşılan klasörleri yapılandırmak için sanal makine ayarları penceresini görüntüle</translation>
     </message>
     <message>
         <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal optik sürücü içine Misafir Eklentileri disk dosyasını yerleştir</translation>
     </message>
     <message>
         <source>%1%</source>
         <comment>scale-factor</comment>
-        <translation type="unfinished">%1%</translation>
+        <translation>% %1</translation>
     </message>
     <message>
         <source>Enable</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">Etkinleştir</translation>
+        <translation>Etkinleştir</translation>
     </message>
     <message>
         <source>Resize to %1x%2</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">%1x%2 olarak yeniden boyutlandır</translation>
+        <translation>%1x%2 olarak yeniden boyutlandır</translation>
     </message>
     <message>
         <source>Preview Monitor %1</source>
-        <translation type="unfinished">Önizleme Monitörü %1</translation>
+        <translation>Önizleme Monitörü %1</translation>
     </message>
     <message>
         <source>&Connect Network Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>Ağ Bağdaştırıcısını &Bağla</translation>
     </message>
     <message>
         <source>Connect Network Adapter &%1</source>
-        <translation type="unfinished"></translation>
+        <translation>&%1 Ağ Bağdaştırıcısını Bağla</translation>
     </message>
     <message>
         <source>No USB Devices Connected</source>
-        <translation type="unfinished">Bağlı USB Aygıtlar Yok</translation>
+        <translation>Bağlı USB Aygıtlar Yok</translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
-        <translation type="unfinished"></translation>
+        <translation>Anamakine PC'ye bağlı desteklenen aygıtlar yok</translation>
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished">Bağlı Web Kameraları Yok</translation>
+        <translation>Bağlı Web Kameraları Yok</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
-        <translation type="unfinished">Anamakine PC'ye bağlı desteklenen web kameraları yok</translation>
+        <translation>Anamakine PC'ye bağlı desteklenen web kameraları yok</translation>
     </message>
     <message>
         <source>Create new virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni sanal makine oluştur</translation>
     </message>
     <message>
         <source>Add existing virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Varolan sanal makine ekle</translation>
     </message>
     <message>
         <source>Rename selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sanal makine grubunu yeniden adlandır</translation>
     </message>
     <message>
         <source>&Ungroup</source>
-        <translation type="unfinished"></translation>
+        <translation>Gru&plamayı Kaldır</translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <source>Ungroup items of selected virtual machine group</source>
+        <translation>Seçilen sanal makine grubunun öğelerinin grublamasını kaldır</translation>
     </message>
     <message>
         <source>&Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&Sırala</translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort items of selected virtual machine group alphabetically</source>
+        <translation>Seçilen sanal makine grubunun öğelerini alfabetik olarak sırala</translation>
     </message>
     <message>
         <source>Add new group based on selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sanal makinelere bağlı yeni grup ekle</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sanal makineyi çoğalt</translation>
     </message>
     <message>
         <source>Remove selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sanal makineleri kaldır</translation>
     </message>
     <message>
         <source>Start selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sanal makineleri başlat</translation>
     </message>
     <message>
         <source>Switch to the windows of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sanal makinelerin pencerelerine geç</translation>
     </message>
     <message>
         <source>Start selected virtual machines in the background</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sanal makineleri arka planda başlat</translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
-        <translation type="unfinished"></translation>
+        <source>Start selected virtual machines with option of continuing in background</source>
+        <translation>Seçilen sanal makineleri arka planda devam ettiren seçenek ile başlat</translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Suspend execution of selected virtual machines</source>
+        <translation>Seçilen sanal makinelerin çalıştırılmasını askıya al</translation>
     </message>
     <message>
         <source>Reset selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sanal makineleri sıfırla</translation>
     </message>
     <message>
         <source>D&iscard Saved State...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kaydedilmiş Durumdan V&azgeç...</translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Discard saved state of selected virtual machines</source>
+        <translation>Seçilen sanal makinelerin kaydedilmiş durumundan vazgeç</translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Show log files of selected virtual machines</source>
+        <translation>Seçilen sanal makinelerin günlük dosyalarını göster</translation>
     </message>
     <message>
         <source>Re&fresh</source>
-        <translation type="unfinished">&Yenile</translation>
+        <translation>&Yenile</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Refresh accessibility state of selected virtual machines</source>
+        <translation>Seçilen sanal makinelerin erişilebilirlik durumunu yenile</translation>
     </message>
     <message>
         <source>S&how in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>Bulucuda &Göster</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>Bulucuda VirtualBox Makinesi Açıklama dosyalerını göster</translation>
     </message>
     <message>
         <source>S&how in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>Gezginde &Göster</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>Gezginde VirtualBox Makinesi Açıklama dosyalarını göster</translation>
     </message>
     <message>
         <source>S&how in File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Dosya Yöneticisinde &Göster</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in the File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Dosya Yöneticisinde VirtualBox Makinesi Açıklama dosyalerını göster</translation>
     </message>
     <message>
         <source>Cr&eate Alias on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Masaüstüne Kodadı &Oluştur</translation>
     </message>
     <message>
         <source>Create alias files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Masaüstünüzde VirtualBox Makinesi Açıklama dosyalarına kodadı dosyaları oluştur</translation>
     </message>
     <message>
         <source>Cr&eate Shortcut on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Masaüstünde Kısayol &Oluştur</translation>
     </message>
     <message>
         <source>Create shortcut files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Masaüstünüzde VirtualBox Makinesi Açıklama dosyalarına kısayol dosyaları oluştur</translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort group of first selected virtual machine alphabetically</source>
+        <translation>İlk seçilen sanal makinenin grubunu alfabetik olarak sırala</translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Save state of selected virtual machines</source>
+        <translation>Seçilen sanal makinelerin durumunu kaydet</translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
+        <translation>Seçilen sanal makinelere ACPI Kapatma sinyali gönder</translation>
     </message>
     <message>
         <source>Power off selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sanal makinelerin gücünü kapat</translation>
     </message>
 </context>
 <context>
@@ -1467,23 +1467,23 @@
     <message>
         <source>Status</source>
         <comment>password table field</comment>
-        <translation type="unfinished">Durum</translation>
+        <translation>Durum</translation>
     </message>
     <message>
         <source>ID</source>
         <comment>password table field</comment>
-        <translation type="unfinished">KİMLİK</translation>
+        <translation>KİMLİK</translation>
     </message>
     <message>
         <source>Password</source>
         <comment>password table field</comment>
-        <translation type="unfinished">Parola</translation>
+        <translation>Parola</translation>
     </message>
     <message numerus="yes">
         <source><nobr>Used by the following %n hard disk(s):</nobr><br>%1</source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many hard drives are in the tool-tip and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><nobr>Aşağıdaki %n sabit disk(ler) tarafından kullanılır:</nobr><br>%1</numerusform>
         </translation>
     </message>
 </context>
@@ -1617,19 +1617,19 @@
     </message>
     <message>
         <source>Storage Controller (IDE)</source>
-        <translation type="unfinished"></translation>
+        <translation>Depolama Denetleyicisi (IDE)</translation>
     </message>
     <message>
         <source>Storage Controller (SATA)</source>
-        <translation type="unfinished"></translation>
+        <translation>Depolama Denetleyicisi (SATA)</translation>
     </message>
     <message>
         <source>Storage Controller (SCSI)</source>
-        <translation type="unfinished"></translation>
+        <translation>Depolama Denetleyicisi (SCSI)</translation>
     </message>
     <message>
         <source>Storage Controller (SAS)</source>
-        <translation type="unfinished"></translation>
+        <translation>Depolama Denetleyicisi (SAS)</translation>
     </message>
 </context>
 <context>
@@ -2117,7 +2117,7 @@
     </message>
     <message>
         <source>Retrieving data ...</source>
-        <translation type="unfinished">Veri alınıyor...</translation>
+        <translation>Veri alınıyor...</translation>
     </message>
 </context>
 <context>
@@ -2731,9 +2731,9 @@
         <translation>Kapsamlı Sürücü, '%1'</translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>Kapsamlı Sürücü, '%1' {&nbsp;%2&nbsp;}</translation>
+        <translation>Kapsamlı Sürücü, '%1' { %2 }</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -3128,19 +3128,19 @@
     </message>
     <message>
         <source>&Raise Window Under Mouse</source>
-        <translation>Fare Altındaki Pencereyi Öne &Getir</translation>
+        <translation>Fare Altındaki Pencereyi öne &getir</translation>
     </message>
     <message>
         <source>Holds the maximum width which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misafirin kullanmasını isteyeceğimiz en fazla genişliği tutar.</translation>
     </message>
     <message>
         <source>Holds the maximum height which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misafirin kullanmasını isteyeceğimiz en fazla yüksekliği tutar.</translation>
     </message>
     <message>
         <source>When checked, machine windows will be raised when the mouse pointer moves over them.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, fare işaretçisi üzerlerine hareket ettiğinde makine pencereleri öne gelecektir.</translation>
     </message>
 </context>
 <context>
@@ -3191,19 +3191,19 @@
     </message>
     <message>
         <source>Add Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Paket Ekle</translation>
     </message>
     <message>
         <source>Remove Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Paketi Kaldır</translation>
     </message>
     <message>
         <source>Adds new package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni paket ekler.</translation>
     </message>
     <message>
         <source>Removes selected package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen paketi kaldırır.</translation>
     </message>
 </context>
 <context>
@@ -3282,11 +3282,11 @@
     </message>
     <message>
         <source>Host Screensaver:</source>
-        <translation type="unfinished"></translation>
+        <translation>Anamakine Ekran Koruyucusu:</translation>
     </message>
     <message>
         <source>&Disable When Running Virtual Machines</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal Makineler Çalışırken &Etkisizleştir</translation>
     </message>
 </context>
 <context>
@@ -3341,11 +3341,11 @@
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Yapılandırılabilir tüm mevcut kısayolları listeler.</translation>
     </message>
     <message>
         <source>Holds a sequence to filter the shortcut list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kısayol listesini süzmek için bir sıralama tutar.</translation>
     </message>
 </context>
 <context>
@@ -3672,51 +3672,51 @@
     </message>
     <message>
         <source>Add NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NAT Ağı Ekle</translation>
     </message>
     <message>
         <source>Remove NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NAT Ağını Kaldır</translation>
     </message>
     <message>
         <source>Edit NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>NAT Ağını Düzenle</translation>
     </message>
     <message>
         <source>Adds new NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni NAT ağı ekler.</translation>
     </message>
     <message>
         <source>Removes selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen NAT ağını kaldırır.</translation>
     </message>
     <message>
         <source>Edits selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen NAT ağını düzenler.</translation>
     </message>
     <message>
         <source>Add Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Sadece-anamakine Ağı Ekle</translation>
     </message>
     <message>
         <source>Remove Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Sadece-anamakine Ağını Kaldır</translation>
     </message>
     <message>
         <source>Edit Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Sadece-anamakine Ağını Düzenle</translation>
     </message>
     <message>
         <source>Adds new host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni sadece-anamakine ağı ekler.</translation>
     </message>
     <message>
         <source>Removes selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sadece-anamakine ağını kaldırır.</translation>
     </message>
     <message>
         <source>Edits selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sadece-anamakine ağını düzenler.</translation>
     </message>
 </context>
 <context>
@@ -3910,11 +3910,11 @@
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, bu ağ bağdaştırıcısı için elle yapılandırma kullanılacaktır.</translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
-        <translation type="unfinished"></translation>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
+        <translation>İşaretlendiğinde, makine başlatılmasında bu ağ için DHCP Sunucusu etkinleştirilecektir.</translation>
     </message>
 </context>
 <context>
@@ -3985,23 +3985,23 @@
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, bu ağ etkinleştirilecektir.</translation>
     </message>
     <message>
         <source>When checked, this network will support DHCP.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, bu ağ DHCP destekleyecek.</translation>
     </message>
     <message>
         <source>When checked, this network will support IPv6.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, bu ağ IPv6 destekleyecek.</translation>
     </message>
     <message>
         <source>When checked, this network will be advertised as the default IPv6 route.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, bu ağ varsayılan IPv6 yönlendirmesi olarak tanıtılacaktır.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bağlantı noktası yönlendirme kurallarını yapılandırmak için bir pencere görüntüler.</translation>
     </message>
 </context>
 <context>
@@ -4079,11 +4079,11 @@
     </message>
     <message>
         <source>Holds the proxy host.</source>
-        <translation type="unfinished"></translation>
+        <translation>Proksi anamakinesini tutar.</translation>
     </message>
     <message>
         <source>Holds the proxy port.</source>
-        <translation type="unfinished"></translation>
+        <translation>Proksi bağlantı noktasını tutar.</translation>
     </message>
 </context>
 <context>
@@ -4138,7 +4138,7 @@
     </message>
     <message>
         <source>Selects how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni sürüm kontrolünün ne sıklıkla yapılması gerektiğini seçer. Eğer bu kontrolü tamamen etkisizleştirmek istiyorsanız, sadece yukarıdaki işaretleme kutusunun işaretini kaldırmayı unutmayın.</translation>
     </message>
 </context>
 <context>
@@ -4602,11 +4602,11 @@
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
         <comment>HDD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>Sabit disklerin etkinliğini gösterir:</nobr>%1</p></translation>
     </message>
     <message>
         <source>Indicates whether the host keyboard is captured by the guest OS:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;keyboard is not captured</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;keyboard is captured</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation>Misafir İS tarafından anamakine klavyesinin yakalanıp yakalanmadığını gösterir:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;klavye yakalanmadı</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;klavye yakalandı</nobr></translation>
     </message>
 </context>
 <context>
@@ -4679,7 +4679,7 @@
     <name>UIMachineSettingsAudio</name>
     <message>
         <source>When checked, a virtual PCI audio card will be plugged into the virtual machine and will communicate with the host audio system using the specified driver.</source>
-        <translation>İşaretlendiğinde, sanal PCI ses kartı sanal makineye takılacaktır ve belirlenmiş sürücüyü kullanan anamakine ses sistemiyle iletişim kuracaktır.</translation>
+        <translation>İşaretlendiğinde, sanal PCI ses kartı sanal makineye takılacaktır ve belirlenmiş sürücüyü kullanarak anamakine ses sistemiyle iletişim kuracaktır.</translation>
     </message>
     <message>
         <source>Enable &Audio</source>
@@ -4703,7 +4703,7 @@
     </message>
     <message>
         <source>Selects the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ses çıktı sürücüsünü seçer. <b>Belirsiz Ses Sürücüsü</b> misafirin bir ses kartı görmesini sağlar ancak bu karta yapılan her erişim yoksayılacaktır.</translation>
     </message>
 </context>
 <context>
@@ -5029,67 +5029,67 @@
     </message>
     <message>
         <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
+        <translation>HiDPI Desteği:</translation>
     </message>
     <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="unfinished"></translation>
+        <translation>VRDP Sunucusu bağlantı noktası numarasını tutar. 3389 nolu bağlantı noktasını seçmek için <tt>0</tt> (sıfır) belirtebilirsiniz, RDP için standart bağlantı noktasıdır.</translation>
     </message>
     <message>
         <source>Selects the VRDP authentication method.</source>
-        <translation type="unfinished"></translation>
+        <translation>VRDP kimlik doğrulaması yöntemini seçer.</translation>
     </message>
     <message>
         <source>Holds the timeout for guest authentication, in milliseconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>Misafir kimlik doğrulaması için zaman aşımı süresini milisaniye olarak tutar.</translation>
     </message>
     <message>
         <source>When checked, multiple simultaneous connections to the VM are permitted.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, VM'e çoklu eşzamanlı bağlantılar yapmaya izin verilir.</translation>
     </message>
     <message>
         <source>Holds the filename VirtualBox uses to save the recorded content.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kaydedilen içeriği saklamak için VirtualBox'ın kullandığı dosya adını tutar.</translation>
     </message>
     <message>
         <source>Selects the resolution (frame size) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kaydedilen görüntünün çözünürlüğünü (kare boyutu) seçer.</translation>
     </message>
     <message>
         <source>Holds the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kaydedilen görüntünün <b>yatay</b> çözünürlüğünü (kare genişliği) tutar.</translation>
     </message>
     <message>
         <source>Holds the <b>vertical</b> resolution (frame height) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kaydedilen görüntünün <b>dikey</b> çözünürlüğünü (kare yüksekliği) tutar.</translation>
     </message>
     <message>
         <source>Controls the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>En fazla <b>saniye başına kare</b> sayısını denetler. İlave kareler atlanacaktır. Bu değeri azaltmak atlanan karelerin sayısını arttıracak ve dosya boyutunu düşürecek.</translation>
     </message>
     <message>
         <source>Controls the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation><b>Kaliteyi</b> denetler. Bu değeri arttırmak görüntüyü daha iyi görünür yapacak ama dosya boyutunun artmasına neden olacak.</translation>
     </message>
     <message>
         <source>Holds the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bit oranını <b>saniye başına kilobit</b> olarak tutar. Bu değeri arttırmak görüntüyü daha iyi görünür yapacak ama dosya boyutunun artmasına neden olacak.</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal makine şu anda, tam ekran ya da özgün kipine değiştirmek için gereken en az <b>%1</b> görüntü belleği miktarından azına atanmış.</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>% %1</translation>
     </message>
     <message>
         <source>When checked, enables video recording for screen %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, ekran %1 için görüntü kaydını etkinleştirir.</translation>
     </message>
 </context>
 <context>
@@ -5353,11 +5353,11 @@
     </message>
     <message>
         <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal makine disklerini şifrelemek için kullanılacak şifreleyiciyi seçer.</translation>
     </message>
     <message>
         <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bu sanal makinenin anlık görüntülerinin saklanacağı yerin yolunu tutar. Anlık görüntülerin oldukça depolama alanı kaplayabileceğinden haberiniz olsun.</translation>
     </message>
 </context>
 <context>
@@ -5416,7 +5416,7 @@
     </message>
     <message>
         <source>Show at &Top of Screen</source>
-        <translation>Ekranın En Üstünde &Göster</translation>
+        <translation>Ekranın En Üstünde &göster</translation>
     </message>
     <message>
         <source>Allows to modify VM status-bar contents.</source>
@@ -5424,15 +5424,15 @@
     </message>
     <message>
         <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, tam ekran ve özgün kiplerinde Küçük Araç Çubuğunu gösterir.</translation>
     </message>
     <message>
         <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
+        <translation>&Tam Ekran/Özgün Kipinde göster</translation>
     </message>
     <message>
         <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, ekranın en altındaki varsayılan konumu yerine, ekranın en üstünde Küçük Araç Çubuğunu gösterir.</translation>
     </message>
 </context>
 <context>
@@ -5666,23 +5666,23 @@
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bu sanal bağdaştırıcının Anamakine İS'nin gerçek ağına nasıl takıldığını seçer.</translation>
     </message>
     <message>
         <source>Shows additional network adapter options.</source>
-        <translation type="unfinished"></translation>
+        <translation>İlave ağ bağdaştırıcısı seçeneklerini gösterir.</translation>
     </message>
     <message>
         <source>Holds the configuration settings for the network attachment driver. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ağ ek sürücüsü için yapılandırma ayarlarını tutar. Ayarlar <b>adı=değer</b> biçiminde olmalıdır ve sürücüye bağlı olacaktır. Yeni bir giriş eklemek için <b>shift-enter</b> kullanın.</translation>
     </message>
     <message>
         <source>When checked, the virtual network cable is plugged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, sanal ağ kablosu takılır.</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bağlantı noktası yönlendirme kurallarını yapılandırmak için bir pencere görüntüler.</translation>
     </message>
 </context>
 <context>
@@ -5764,23 +5764,23 @@
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">Şu anda belirtilmiş hiç IRQ yok.</translation>
+        <translation>Şu anda belirtilmiş hiç IRQ yok.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">Şu anda belirtilmiş hiç G/Ç bağlantı noktası yok.</translation>
+        <translation>Şu anda belirtilmiş hiç G/Ç bağlantı noktası yok.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">İki ya da daha fazla bağlantı noktası aynı ayarlara sahip.</translation>
+        <translation>İki ya da daha fazla bağlantı noktası aynı ayarlara sahip.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">Şu anda belirtilmiş hiç bağlantı noktası yolu yok.</translation>
+        <translation>Şu anda belirtilmiş hiç bağlantı noktası yolu yok.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Şu anda belirtilmiş kopya bağlantı noktası yolu var.</translation>
+        <translation>Şu anda belirtilmiş kopya bağlantı noktası yolu var.</translation>
     </message>
 </context>
 <context>
@@ -5933,27 +5933,27 @@
     </message>
     <message>
         <source>Add Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Paylaşılan Klasör Ekle</translation>
     </message>
     <message>
         <source>Edit Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Paylaşılan Klasörü Düzenle</translation>
     </message>
     <message>
         <source>Remove Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Paylaşılan Klasörü Kaldır</translation>
     </message>
     <message>
         <source>Adds new shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni paylaşılan klasör ekler.</translation>
     </message>
     <message>
         <source>Edits selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen paylaşılan klasörü düzenler.</translation>
     </message>
     <message>
         <source>Removes selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen paylaşılan klasörü kaldırır.</translation>
     </message>
 </context>
 <context>
@@ -6008,7 +6008,7 @@
     </message>
     <message>
         <source>When checked, this shared folder will be permanent.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, bu paylaşılan klasör kalıcı olacaktır.</translation>
     </message>
 </context>
 <context>
@@ -6104,31 +6104,31 @@
     </message>
     <message>
         <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bu seri bağlantı noktasının çalışma kipini seçer. Eğer <b>Bağlı değil</b> seçerseniz, misafir İS seri bağlantı noktasını algılayacaktır ama çalıştırılamayacaktır.</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, sanal makine <b>Yol/Adres</b> alanında belirtilmiş hat ya da yuvanın mevcut olduğunu varsayacak ve kullanmaya çalışacak. Aksi halde hat ya da yuva sanal makine tarafından başlatıldığında oluşturulacaktır.</translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">Şu anda belirtilmiş hiç IRQ yok.</translation>
+        <translation>Şu anda belirtilmiş hiç IRQ yok.</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">Şu anda belirtilmiş hiç G/Ç bağlantı noktası yok.</translation>
+        <translation>Şu anda belirtilmiş hiç G/Ç bağlantı noktası yok.</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">İki ya da daha fazla bağlantı noktası aynı ayarlara sahip.</translation>
+        <translation>İki ya da daha fazla bağlantı noktası aynı ayarlara sahip.</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">Şu anda belirtilmiş hiç bağlantı noktası yolu yok.</translation>
+        <translation>Şu anda belirtilmiş hiç bağlantı noktası yolu yok.</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">Şu anda belirtilmiş kopya bağlantı noktası yolu var.</translation>
+        <translation>Şu anda belirtilmiş kopya bağlantı noktası yolu var.</translation>
     </message>
 </context>
 <context>
@@ -6580,88 +6580,93 @@
     </message>
     <message>
         <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bu makine ve sanal kalıplar için tüm depolama denetleyicilerini ve bunlara takılı anamakine sürücülerini listeler.</translation>
     </message>
     <message>
         <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>Depolama Ağacı içinde şu anda seçilen depolama denetleyicisinin adını tutar.</translation>
     </message>
     <message>
         <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, anamakine G/Ç önbellekleme yeteneklerini kullanmaya izin verir.</translation>
     </message>
     <message>
         <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, misafir sistem çıkarttığında sanal disk kaldırılmayacaktır.</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, misafir sistem sanal diski bir katı hal aygıtı (SSD) gibi görecek.</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, misafir sistem sanal diski bir çalışırken-takılabilir aygıt gibi görecek.</translation>
     </message>
     <message>
         <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Sanal bir disk kalıbı dosyası seçin...</translation>
     </message>
     <message>
         <source>Image</source>
         <comment>storage image</comment>
-        <translation type="unfinished">Kalıp</translation>
+        <translation>Kalıp</translation>
     </message>
     <message>
         <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Öğeyi&nbsp;Genişletir/Daraltır.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Sabit&nbsp;disk&nbsp;ekler.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Optik&nbsp;sürücü&nbsp;ekler.</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>Disket&nbsp;sürücü&nbsp;ekler.</nobr></translation>
     </message>
     <message>
         <source>Adds new storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni depolama denetleyicisi ekler.</translation>
     </message>
     <message>
         <source>Removes selected storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen depolama denetleyicisini kaldırır.</translation>
     </message>
     <message>
         <source>Adds new storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni depolama eklentisi ekler.</translation>
     </message>
     <message>
         <source>Removes selected storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen depolama eklentisini kaldırır.</translation>
     </message>
     <message>
         <source>Create New Hard Disk...</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni Sabit Disk Oluştur...</translation>
     </message>
     <message>
         <source>Choose Virtual Hard Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal Sabit Disk Dosyası Seçin...</translation>
     </message>
     <message>
         <source>Choose Virtual Optical Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal Optik Disk Dosyası Seçin...</translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
-        <translation type="unfinished"></translation>
+        <source>Remove Disk from Virtual Drive</source>
+        <translation>Diski Sanal Sürücüden Kaldır</translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal Disket Dosyası Seçin...</translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation>Disk kalıbı seçin...</translation>
     </message>
 </context>
 <context>
@@ -6932,29 +6937,29 @@
     </message>
     <message>
         <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
+        <translation>İşaretlendiğinde, RTC aygıtı zamanı UTC olarak, aksi takdirde yerel (anamakine) zamanı olarak bildirecek. Unix genellikle donanım saatinin UTC'ye ayarlanmasını bekler.</translation>
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1 CPU</source>
         <comment>%1 is 1 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPU</translation>
     </message>
     <message>
         <source>%1 CPUs</source>
         <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPU</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>% %1</translation>
     </message>
 </context>
 <context>
@@ -7114,63 +7119,63 @@
     </message>
     <message>
         <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçildiğinde, bu makinenin sanal USB OHCI denetleyicisini etkinleştirir. USB OHCI denetleyicisi USB 1.0 desteği sağlar.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçildiğinde, bu makinenin sanal USB EHCI denetleyicisini etkinleştirir. USB EHCI denetleyicisi USB 2.0 desteği sağlar.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçildiğinde, bu makinenin sanal USB xHCI denetleyicisini etkinleştirir. USB xHCI denetleyicisi USB 3.0 desteği sağlar.</translation>
     </message>
     <message>
         <source>Add Empty Filter</source>
-        <translation type="unfinished">Boş Filtre Ekle</translation>
+        <translation>Boş Süzgeç Ekle</translation>
     </message>
     <message>
         <source>Add Filter From Device</source>
-        <translation type="unfinished">Aygıttan Filtre Ekle</translation>
+        <translation>Aygıttan Süzgeç Ekle</translation>
     </message>
     <message>
         <source>Edit Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Süzgeci Düzenle</translation>
     </message>
     <message>
         <source>Remove Filter</source>
-        <translation type="unfinished">Filtreyi Kaldır</translation>
+        <translation>Süzgeci Kaldır</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
-        <translation type="unfinished">Filtreyi Yukarı Taşı</translation>
+        <translation>Süzgeci Yukarı Taşı</translation>
     </message>
     <message>
         <source>Move Filter Down</source>
-        <translation type="unfinished">Filtreyi Aşağı Taşı</translation>
+        <translation>Süzgeci Aşağı Taşı</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="unfinished"></translation>
+        <translation>İlk olarak boş dizgilere ayarlanan tüm alanlarla yeni USB süzgeci ekler. Böyle bir süzgecin herhangi bir takılı USB aygıtla eşleşeceğini unutmayın.</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="unfinished"></translation>
+        <translation>Anamakine PC'ye takılmış seçilen USB aygıtın değerlerine ayarlanan tüm alanlar ile yeni USB süzgeci ekler.</translation>
     </message>
     <message>
         <source>Edits selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen USB süzgecini düzenler.</translation>
     </message>
     <message>
         <source>Removes selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen USB süzgecini kaldırır.</translation>
     </message>
     <message>
         <source>Moves selected USB filter up.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen USB süzgecini yukarı taşır.</translation>
     </message>
     <message>
         <source>Moves selected USB filter down.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen USB süzgecini aşağı taşır.</translation>
     </message>
 </context>
 <context>
@@ -7276,35 +7281,35 @@
     </message>
     <message>
         <source>Holds the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Satıcı Kimliği süzgecini tutar. <tt>X</tt> değerinin onaltılık bir rakam olduğu <i>tam eşleşme</i> dizgisi biçimi <tt>XXXX</tt>'dir. Boş bir dizgi herhangi bir değerle eşleşecektir.</translation>
     </message>
     <message>
         <source>Holds the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ürün Kimliği süzgecini tutar. <tt>X</tt> değerinin onaltılık bir rakam olduğu <i>tam eşleşme</i> dizgisi biçimi <tt>XXXX</tt>'dir. Boş bir dizgi herhangi bir değerle eşleşecektir.</translation>
     </message>
     <message>
         <source>Holds the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gözden geçirme numarası süzgecini tutar. <tt>I</tt> değerinin tam sayı kısmının ondalık bir rakam olduğu ve <tt>F</tt> değerinin kesirli kısmının ondalık bir rakam olduğu <i>tam eşleşme</i> dizgisi biçimi <tt>IIFF</tt>'dir. Boş bir dizgi herhangi bir değerle eşleşecektir.</translation>
     </message>
     <message>
         <source>Holds the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>Tam eşleşme</i> dizgisi olarak üretici süzgecini tutar. Boş bir dizgi herhangi bir değerle eşleşecektir.</translation>
     </message>
     <message>
         <source>Holds the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>Tam eşleşme</i> dizgisi olarak ürün adı süzgecini tutar. Boş bir dizgi herhangi bir değerle eşleşecektir.</translation>
     </message>
     <message>
         <source>Holds the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>Tam eşleşme</i> dizgisi olarak seri numarası süzgecini tutar. Boş bir dizgi herhangi bir değerle eşleşecektir.</translation>
     </message>
     <message>
         <source>Holds the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation><i>Tam eşleşme</i> dizgisi olarak USB bağlantı noktası süzgecini tutar. Boş bir dizgi herhangi bir değerle eşleşecektir.</translation>
     </message>
     <message>
         <source>Holds whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
-        <translation type="unfinished"></translation>
+        <translation>Bu süzgecin anamakine bilgisayarına yerel olarak takılı USB aygıtlara (<i>Hayır</i>), VRDP istemcilerinin bilgisayarlarına (<i>Evet</i>) ya da her ikisine de (<i>Herhangi</i>) uygulanıp uygulanmayacağını tutar.</translation>
     </message>
 </context>
 <context>
@@ -7349,7 +7354,7 @@
     </message>
     <message>
         <source>&Hard disks</source>
-        <translation type="unfinished"></translation>
+        <translation>&Sabit diskler</translation>
     </message>
 </context>
 <context>
@@ -9106,43 +9111,43 @@
     </message>
     <message>
         <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Bir ya da daha fazla disk kalıbı dosyaları şu anda erişilebilir değil. Sonuç olarak, daha sonra erişilebilir olana kadar bu dosyaları kullanan sanal makineleri işletemeyceksiniz.</p><p>Sanal Ortam Yöneticisi penceresini açmak için <b>Kontrol et</b> düğmesine basın ve hangi dosyaların erişilemez olduğunu görün, ya da bu mesajı yoksaymak için <b>Yoksay</b> düğmesine basın.</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Anlık görüntüyü silmek kaydedilmiş durum bilgisinin kaybolmasına neden olacak ve VirtualBox'ın anlık görüntüyle birlikte oluşturduğu birkaç kalıp dosyasına yayılmış depolama verisi bir dosyanın içerisine birleştirilecek. Bu uzunca bir işlem olabilir ve anlık görüntüdeki bilgi kurtarılamaz.</p><p>Seçilen <b>%1</b> anlık görüntüsünü silmek istediğnize emin misiniz?</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>%1 anlık görüntüsünü silmek geçici olarak daha fazla depolama alanı gerektirecek. En kötü durumda %2 kalıbının boyutu %3 kadar büyüyecek ancak bu dosya sisteminde sadece %4 boşluk var.</p><p>Birleştirme işlemi sırasında yetersiz disk alanında çalışmak VM yapılandırmasının ve kalıbın bozulmasıyla sunuçlanabilir, yani VM'in ve verisinin kaybolması.</p><p>Riski size ait olan anlık görüntüyü silerek devam edebilirsiniz.</p></tr [...]
     </message>
     <message>
         <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><nobr><b>%1</b></nobr> disk kalıbı dosyasını serbest bırakmak istediğinize emin misiniz?</p><p>Bu, şurada belirtilen sanal makine(ler)den bunu çıkartacak: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
-        <translation type="unfinished"></translation>
+        <translation><p><nobr><b>%1</b></nobr> sanal sabit diskinin depolama birimini silmek istediğinize emin misiniz?</p><p>Eğer <b>Sil</b>'i seçerseniz sonrasında belirtilmiş depolama birimi kalıcı olarak silinecektir. Bu işlem <b>geri alınamaz</b>.</p><p>Eğer <b>Tut</b>'u seçerseniz o zaman sabit disk sadece bilinen sabit diskler listesinden kaldırılacaktır ama daha sonra tekrar bu sab [...]
     </message>
     <message>
         <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>%1</b></nobr> disk kalıbı dosyasını açma başarısız.</translation>
     </message>
     <message>
         <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation><nobr><b>%1</b></nobr> disk kalıbı dosyasını kapama başarısız.</translation>
     </message>
     <message>
         <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sabit diski olmayan yeni bir sanal makine oluşturmak üzeresiniz. Bir tane ekleyene kadar makine üzerine bir işletim sistemi yükleyemeyeceksiniz. Bu arada sadece sanal optik diski kullanarak veya ağdan makineyi başlatabileceksiniz.</translation>
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Sanal makine penceresi şimdi <b>tam ekran</b> kipine değiştirilecektir. Her zaman <b>%1</b> tuşuna basarak pencereli kipe geri dönebilirsiniz.</p><p><i>Anamakine</i> tuşunun şu an <b>%2</b> olarak tanımlı olduğunu unutmayın.</p><p>Tam ekran kipinde ana menü çubuğu gizlenir unutmayın. <b>Anamakine+Home</b> tuş birleşimine basarak erişebilirsiniz.</p></translation>
     </message>
     <message>
         <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Yetersiz misafir görüntü belleğinden dolayı misafir ekranı tam ekran kipine değiştirilemedi.</p><p>Sanal makineyi en az <b>%1</b> görüntü belleğine sahip olacak şekilde yapılandırmalısınz.</p><p>Yine de tam ekran kipine değiştirmek için <b>Yoksay</b> düğmesine basın ya da işlemi iptal etmek için <b>İptal</b> düğmesine basın.</p></translation>
     </message>
 </context>
 <context>
@@ -9953,55 +9958,55 @@ bu basamağı atlayarak sabit diskleri Sanal Makine Ayarları penceresinden ekle
     <name>UIPortForwardingTable</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Adı</translation>
     </message>
     <message>
         <source>Protocol</source>
-        <translation type="unfinished">Protokol</translation>
+        <translation>Protokol</translation>
     </message>
     <message>
         <source>Host IP</source>
-        <translation type="unfinished">Anamakine IP</translation>
+        <translation>Anamakine IP</translation>
     </message>
     <message>
         <source>Host Port</source>
-        <translation type="unfinished">Anamakine B.Noktası</translation>
+        <translation>Anamakine B.Noktası</translation>
     </message>
     <message>
         <source>Guest IP</source>
-        <translation type="unfinished">Misafir IP</translation>
+        <translation>Misafir IP</translation>
     </message>
     <message>
         <source>Guest Port</source>
-        <translation type="unfinished">Misafir B.Noktası</translation>
+        <translation>Misafir B.Noktası</translation>
     </message>
     <message>
         <source>Contains a list of port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bağlantı noktası yönlendirme kurallarının listesini içerir.</translation>
     </message>
     <message>
         <source>Add New Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni Kural Ekle</translation>
     </message>
     <message>
         <source>Copy Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen Kuralı Kopyala</translation>
     </message>
     <message>
         <source>Remove Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen Kuralı Kaldır</translation>
     </message>
     <message>
         <source>Adds new port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni bağlantı noktası yönlendirme kuralı ekler.</translation>
     </message>
     <message>
         <source>Copies selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen bağlantı noktası yönlendirme kuralını kopyalar.</translation>
     </message>
     <message>
         <source>Removes selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen bağlantı noktası yönlendirme kuralını kaldırır.</translation>
     </message>
 </context>
 <context>
@@ -10239,7 +10244,7 @@ bu basamağı atlayarak sabit diskleri Sanal Makine Ayarları penceresinden ekle
     </message>
     <message>
         <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"><nobr>Gösterge varlığını değiştirmek için <b>tıklayın</b>.</nobr><br><nobr>Gösterge konumunu değiştirmek için <b>Sürükle ve Bırak</b>'ın.</nobr></translation>
+        <translation><nobr>Gösterge varlığını değiştirmek için <b>tıklayın</b>.</nobr><br><nobr>Gösterge konumunu değiştirmek için <b>Sürükle ve Bırak</b>'ın.</nobr></translation>
     </message>
 </context>
 <context>
@@ -10862,75 +10867,75 @@ bu basamağı atlayarak sabit diskleri Sanal Makine Ayarları penceresinden ekle
     </message>
     <message>
         <source>Copy Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal Sabit Diski Kopyala</translation>
     </message>
     <message>
         <source>Hard disk to copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopyalamak için sabit disk</translation>
     </message>
     <message>
         <source><p>Please select the virtual hard disk file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Lütfen kopyalamak istediğiniz sanal sabit disk dosyası zaten seçilmediyse seçin. Ya listeden birisini seçebilirsiniz ya da birini seçmek için listenin yanındaki klasör simgesini kullanabilirsiniz.</p></translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file to copy...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopyalamak için sanal sabit disk dosyasını seçin...</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Sabit disk dosyası türü</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lütfen yeni sanal sabit disk için kullanmak istediğiniz dosyanın türünü seçin. Eğer diğer sanallaştırma yazılımları ile kullanmaya ihtiyacınız yoksa bu ayarı değiştirmeden bırakabilirsiniz.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Fiziksel sabit diskte depolama</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>Lütfen yeni sanal sabit disk dosyasının kullanılmasına göre (değişken olarak ayrılan) büyüyüp büyümemesini ya da en fazla boyutunda (sabitlenmiş boyut) oluşturulup oluşturulmamasını seçin.</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>Değişken olarak ayrılan</b> sabit disk dosyası sadece fiziksel sabit sürücünüzdeki alanı doldurarak (en fazla <b>sabitlenmiş boyuta</b> kadar) kullanacak olmasına rağmen alan serbest kaldığında otomatik olarak tekrar küçülmeyecektir.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>Sabitlenmiş boyutlu</b> sabit disk dosyasını oluşturmak bazı sistemlerde uzun sürebilir ama kullanması çoğu kez en hızlı olandır.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Ayrıca sabit disk dosyasını her biri iki gigabayta kadar birkaç dosyaya <b>bölmeyi</b> seçebilirsiniz. Bu çoğunlukla eğer sanal makineyi kaldırılabilir USB aygıtlarda veya çok büyük dosyalarla başa çıkamayan bazı eski sistemlerde depolamak isterseniz faydalıdır.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Lütfen yeni sanal sabit disk dosyası için bir yer seçin</translation>
     </message>
     <message>
         <source>New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>Oluşturmak için yeni sabit disk</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lütfen aşağıdaki kutuya yeni sanal sabit disk dosyasının adını yazın ya da dosyanın içinde oluşturulacağı farklı bir klasörü seçmek için klasör simgesine tıklayın.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni sanal sabit disk dosyası için bir yer seçin...</translation>
     </message>
     <message>
         <source>Hard disk to &copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&Kopyalamak için sabit disk</translation>
     </message>
     <message>
         <source>&New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>Oluşturmak için &yeni sabit disk</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>Sabit disk dosyası &türü</translation>
     </message>
 </context>
 <context>
@@ -11033,7 +11038,7 @@ bu basamağı atlayarak sabit diskleri Sanal Makine Ayarları penceresinden ekle
     </message>
     <message>
         <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
-        <translation type="unfinished"></translation>
+        <translation><p>Lütfen oluşturmak istediğiniz çoğaltma türünü seçin.</p><p>Eğer <b>Tam çoğaltma</b> seçerseniz, orijinal sanal makinenin tam bir kopyası (tüm sanal sabit disk dosyaları dahil) oluşturulacaktır.</p><p>Eğer <b>Birbirine bağlantılı çoğaltma</b> seçerseniz, yeni bir sanal makine oluşturulacaktır ama sanal sabit disk dosyaları orijinal makinenin sanal sabit disk dosyalarına bağlanacaktır ve yeni sanal makineyi farkl [...]
     </message>
 </context>
 <context>
@@ -11391,51 +11396,51 @@ bu basamağı atlayarak sabit diskleri Sanal Makine Ayarları penceresinden ekle
     </message>
     <message>
         <source>Create Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal Sabit Disk Oluştur</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>Sabit disk dosyası türü</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lütfen yeni sanal sabit disk için kullanmak istediğiniz dosyanın türünü seçin. Eğer diğer sanallaştırma yazılımları ile kullanmaya ihtiyacınız yoksa bu ayarı değiştirmeden bırakabilirsiniz.</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Fiziksel sabit diskte depolama</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>Lütfen yeni sanal sabit disk dosyasının kullanılmasına göre (değişken olarak ayrılan) büyüyüp büyümemesini ya da en fazla boyutunda (sabitlenmiş boyut) oluşturulup oluşturulmamasını seçin.</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>Değişken olarak ayrılan</b> sabit disk dosyası sadece fiziksel sabit sürücünüzdeki alanı doldurarak (en fazla <b>sabitlenmiş boyuta</b> kadar) kullanacak olmasına rağmen alan serbest kaldığında otomatik olarak tekrar küçülmeyecektir.</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>Sabitlenmiş boyutlu</b> sabit disk dosyasını oluşturmak bazı sistemlerde uzun sürebilir ama kullanması çoğu kez en hızlı olandır.</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>Ayrıca sabit disk dosyasını her biri iki gigabayta kadar birkaç dosyaya <b>bölmeyi</b> seçebilirsiniz. Bu çoğunlukla eğer sanal makineyi kaldırılabilir USB aygıtlarda veya çok büyük dosyalarla başa çıkamayan bazı eski sistemlerde depolamak isterseniz faydalıdır.</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lütfen aşağıdaki kutuya yeni sanal sabit disk dosyasının adını yazın ya da dosyanın içinde oluşturulacağı farklı bir klasörü seçmek için klasör simgesine tıklayın.</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Yeni sanal sabit disk dosyası için bir yer seçin...</translation>
     </message>
     <message>
         <source>Select the size of the virtual hard disk in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>Megabayt olarak sanal sabit diskin boyutunu seçin. Bu boyut sabit diskteki depolanabilecek bir sanal makine dosya verisinin miktarını sınırlandırır.</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>Sabit disk dosyası &türü</translation>
     </message>
 </context>
 <context>
@@ -11514,27 +11519,27 @@ bu basamağı atlayarak sabit diskleri Sanal Makine Ayarları penceresinden ekle
     </message>
     <message>
         <source>Hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Sabit disk</translation>
     </message>
     <message>
         <source><p>If you wish you can add a virtual hard disk to the new machine. You can either create a new hard disk file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard disk is <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation>Eğer isterseniz yeni makineye sanal bir sabit disk ekleyebilirsiniz. Ya yeni bir sabit sürücü dosyası oluşturabilirsiniz ya da listeden veya klasör simgesini kullanarak başka bir yerden birini seçebilirsiniz.</p><p>Eğer daha karışık depolama ayarlamasına ihtiyacınız varsa bu adımı atlayabilir ve makine bir kere oluşturuldumu makine ayarlarından değişiklikleri yapabilirsiniz.</p><p>Sabit disk için önerilen boyut <b>%1</b>.</p> [...]
     </message>
     <message>
         <source>&Do not add a virtual hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal bir sabit disk &ekleme</translation>
     </message>
     <message>
         <source>&Create a virtual hard disk now</source>
-        <translation type="unfinished"></translation>
+        <translation>Şimdi sanal bir sabit disk &oluştur</translation>
     </message>
     <message>
         <source>&Use an existing virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Varolan sanal bir sabit disk dosyası &kullan</translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file...</source>
-        <translation type="unfinished">Sanal bir sabit disk dosyası seçin...</translation>
+        <translation>Sanal bir sabit disk dosyası seçin...</translation>
     </message>
 </context>
 <context>
@@ -12514,19 +12519,19 @@ Version %1</source>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>Farklı bir klasör seçmek için bir pencere görüntüler.</translation>
     </message>
     <message>
         <source>Displays a window to select a different file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Farklı bir dosya seçmek için bir pencere görüntüler.</translation>
     </message>
     <message>
         <source>Holds the folder path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klasör yolunu tutar.</translation>
     </message>
     <message>
         <source>Holds the file path.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dosya yolunu tutar.</translation>
     </message>
 </context>
 <context>
@@ -13679,7 +13684,7 @@ Version %1</source>
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Takılan bu sabit disk yeni olarak oluşturulmuş ayrımlanan sabit disk kullanımını dolaylı olarak gerçekleştirecektir.</translation>
+        <translation>Takılan bu sabit disk yeni olarak oluşturulmuş ayrımlanan sabit diski kullanarak dolaylı olarak gerçekleştirecektir.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -13689,7 +13694,7 @@ Version %1</source>
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Bu ana sabit disk aşağıdaki ayrımlanan sabit diskleri kullanarak dolaylı olarak takılır:</translation>
+        <translation>Bu ana sabit disk aşağıdaki ayrımlanan sabit diski kullanarak dolaylı olarak takılır:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -14403,20 +14408,20 @@ Version %1</source>
     </message>
     <message>
         <source>Please choose a virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Lütfen sanal bir sabit disk dosyası seçin</translation>
     </message>
     <message>
         <source>All virtual hard disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tüm sanal sabit disk dosyaları (%1)</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Medium Manager to inspect these files.</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>Bu sabit disk zincirindeki dosyaların bazıları erişilemez. Lütfen bu dosyaları incelemek için Sanal Ortam Yönetcisi'ni kullanın.</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>Lütfen yeni sanal sabit disk dosyası için bir yer seçin</translation>
     </message>
 </context>
 <context>
@@ -16078,19 +16083,19 @@ Bu özellik Misafir Eklentilerinin yüklü olmasını gerektirir.</qt></tr
     </message>
     <message>
         <source>Restore selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal makinenin seçilen anlık görüntüsünü geri yükle</translation>
     </message>
     <message>
         <source>Delete selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sanal makinenin seçilen anlık görüntüsünü sil</translation>
     </message>
     <message>
         <source>Display a window with selected snapshot details</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen anlık görüntünün ayrıntıları olan bir pencere görüntüle</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>Seçilen sanal makineyi çoğalt</translation>
     </message>
 </context>
 <context>
@@ -16146,7 +16151,7 @@ Bu özellik Misafir Eklentilerinin yüklü olmasını gerektirir.</qt></tr
     </message>
     <message>
         <source>Snapshot %1</source>
-        <translation type="unfinished">Anlık Görüntü %1</translation>
+        <translation>Anlık Görüntü %1</translation>
     </message>
 </context>
 <context>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
index f581504..ea81849 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
@@ -315,7 +315,7 @@
         <translation type="obsolete">&Інформація про сеанс</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Показувати інформацію про сеанс</translation>
     </message>
     <message>
@@ -395,11 +395,11 @@
         <translation type="obsolete">Дозволити або заборонити під'єднання віддаленої стільниці (RDP) до цієї машини</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
-        <translation type="obsolete">Вс&тановити гостьові доповнення...</translation>
+        <source>&Insert Guest Additions CD image...</source>
+        <translation type="unfinished">Вс&тановити гостьові доповнення...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Змонтувати гостьові доповнення з установчого образу</translation>
     </message>
     <message>
@@ -935,92 +935,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Webcams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Insert Guest Additions CD image...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&VirtualBox</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Вс&тановити гостьові доповнення...</translation>
     </message>
     <message>
-        <source>&Menu Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
+        <comment>new</comment>
+        <translation type="obsolete">Змонтувати гостьові доповнення з установчого образу</translation>
     </message>
     <message>
-        <source>&Menu Bar Settings...</source>
+        <source>&Webcams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Menu &Bar</source>
-        <translation type="unfinished"></translation>
+        <source>Network</source>
+        <translation type="obsolete">Мережа</translation>
     </message>
     <message>
-        <source>&Status Bar</source>
+        <source>&VirtualBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Status Bar Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>&File</source>
+        <translation type="unfinished">&Файл</translation>
     </message>
     <message>
-        <source>Show Status &Bar</source>
+        <source>&Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Input</source>
+        <source>&Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard</source>
+        <source>Minimize active window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Keyboard Settings...</source>
+        <source>Display the Network Operations Manager window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse</source>
+        <source>Display a window with product information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network</source>
-        <translation type="obsolete">Мережа</translation>
-    </message>
-    <message>
-        <source>&USB Settings...</source>
+        <source>&Preferences...</source>
+        <comment>global preferences window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Shared Folders</source>
+        <source>Display the global preferences window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show &Log...</source>
-        <comment>debug action</comment>
+        <source>Display the virtual machine settings window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>E&xtra Data Manager...</source>
+        <source>Display the virtual machine session information window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Extra Data Manager window</source>
+        <source>&Save State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&File</source>
-        <translation type="unfinished">&Файл</translation>
-    </message>
-    <message>
-        <source>&Window</source>
+        <source>Save the state of the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize</source>
+        <source>Send the ACPI Shutdown signal to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1036,174 +1022,174 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>S&cale Factor</source>
+        <source>&Minimize Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the %1 sequence to the virtual machine</source>
+        <source>Automatically resize the guest display when the window is resized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Mouse Integration</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable host mouse pointer integration</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Optical Drives</source>
+        <source>Enable guest display video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Floppy Drives</source>
+        <source>Allow remote desktop (RDP) connections to this machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&USB</source>
+        <source>&Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Logging</source>
-        <comment>debug action</comment>
+        <source>&Menu Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Normal Start</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Headless Start</source>
+        <source>Show Menu &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Detachable Start</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize active window</source>
+        <source>&Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the Network Operations Manager window</source>
+        <source>&Status Bar Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display a window with product information</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Preferences...</source>
-        <comment>global preferences window</comment>
+        <source>Show Status &Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window</source>
+        <source>S&cale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine session information window</source>
+        <source>&Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Save State</source>
+        <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of the virtual machine</source>
+        <source>&Keyboard Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to the virtual machine</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Minimize Window</source>
+        <source>&Insert %1</source>
+        <comment>that means send the %1 key sequence to the virtual machine</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically resize the guest display when the window is resized</source>
+        <source>Send the %1 sequence to the virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>&Mouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>&Mouse Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable guest display video capture</source>
+        <source>Enable host mouse pointer integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow remote desktop (RDP) connections to this machine</source>
+        <source>&Hard Disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>&Hard Disk Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>&Optical Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>&Floppy Drives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>&Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Insert %1</source>
-        <comment>that means send the %1 key sequence to the virtual machine</comment>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disks</source>
+        <source>&USB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hard Disk Settings...</source>
+        <source>&USB Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Network</source>
+        <source>&Drag and Drop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>&Shared Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Drag and Drop</source>
+        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>&Logging</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert the Guest Additions disk file into the virtual optical drive</source>
+        <source>Show &Log...</source>
+        <comment>debug action</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1250,6 +1236,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>E&xtra Data Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display the Extra Data Manager window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Create new virtual machine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1266,7 +1260,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1274,7 +1268,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1298,15 +1292,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&Normal Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Headless Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Start selected virtual machines in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>&Detachable Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1318,15 +1324,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1370,15 +1376,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1387,34 +1393,8 @@
     </message>
 </context>
 <context>
-    <name>UIActionPoolRuntime</name>
-    <message>
-        <source>Enable</source>
-        <comment>Virtual Screen</comment>
-        <translation type="obsolete">Ввімкнути</translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <comment>scale-factor</comment>
-        <translation type="obsolete">%1%</translation>
-    </message>
-</context>
-<context>
     <name>UIAddDiskEncryptionPasswordDialog</name>
     <message>
-        <source>%1 - Disk Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
-        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
         <source>Status</source>
         <comment>password table field</comment>
         <translation type="unfinished"></translation>
@@ -1438,6 +1418,19 @@
             <numerusform></numerusform>
         </translation>
     </message>
+    <message>
+        <source>%1 - Disk Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>This virtual machine is password protected. Please enter the %n encryption password(s) below.</source>
+        <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many passwords are in the list and doesn't need to be told).</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>UIApplianceEditorWidget</name>
@@ -3133,7 +3126,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
         <comment>details (network)</comment>
-        <translation>Загальний драйвер, «%1» {&nbsp;%2&nbsp;}</translation>
+        <translation type="obsolete">Загальний драйвер, «%1» {&nbsp;%2&nbsp;}</translation>
     </message>
     <message>
         <source>Adapter %1</source>
@@ -3245,83 +3238,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[Optical Drive]</source>
-        <comment>details (storage)</comment>
+        <source>Scale-factor</source>
+        <comment>details (display)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB Controller</source>
-        <comment>details (usb)</comment>
-        <translation type="unfinished">Контролер USB</translation>
+        <source>Unscaled HiDPI Video Output</source>
+        <comment>details (display)</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar Position</source>
-        <comment>details (user interface)</comment>
+        <source>Enabled</source>
+        <comment>details (display/Unscaled HiDPI Video Output)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>[Optical Drive]</source>
+        <comment>details (storage)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
-        <comment>details (user interface/mini-toolbar position)</comment>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini-toolbar</source>
+        <source>USB Controller</source>
+        <comment>details (usb)</comment>
+        <translation type="unfinished">Контролер USB</translation>
+    </message>
+    <message>
+        <source>Menu-bar</source>
         <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/mini-toolbar)</comment>
+        <source>Enabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scale-factor</source>
-        <comment>details (display)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/menu-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unscaled HiDPI Video Output</source>
-        <comment>details (display)</comment>
+        <source>Status-bar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
-        <comment>details (display/Unscaled HiDPI Video Output)</comment>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Menu-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Disabled</source>
+        <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Mini-toolbar Position</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <comment>details (user interface/menu-bar)</comment>
+        <source>Top</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status-bar</source>
-        <comment>details (user interface)</comment>
+        <source>Bottom</source>
+        <comment>details (user interface/mini-toolbar position)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <source>Mini-toolbar</source>
+        <comment>details (user interface)</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled</source>
-        <comment>details (user interface/status-bar)</comment>
+        <comment>details (user interface/mini-toolbar)</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4182,7 +4180,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4930,7 +4928,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
+        <comment>HDD tooltip</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4944,8 +4943,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
-        <comment>HDD tooltip</comment>
+        <source><p style='white-space:pre'><nobr>Indicates the activity of the display:</nobr>%1</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5268,38 +5266,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mini ToolBar:</source>
-        <translation type="obsolete">Зменшена панель інструментів:</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Якщо це позначено, показувати зменшену панель інструментів в повноекранному і ціловикроєному режимі.</translation>
-    </message>
-    <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">&Показувати в повноекранному/ціловикроєному</translation>
-    </message>
-    <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Якщо це позначено, показувати зменшену панель інструментів зверху екрана, а не, як типово, знизу.</translation>
-    </message>
-    <message>
-        <source>Show at &Top of Screen</source>
-        <translation type="obsolete">Показувати &зверху екрана</translation>
-    </message>
-    <message>
-        <source><i>About %1MB per 5 minute video</i></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&Screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5312,15 +5278,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">Просторове {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">Просторове {200%?}</translation>
+        <source>%</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>HiDPI Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5336,10 +5298,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5388,6 +5346,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>The virtual machine is set up to use hardware graphics acceleration and the operating system hint is set to Windows Vista or later. For best performance you should set the machine's video memory to at least <b>%1</b>.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote Display is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site as otherwise your VM will be started with Remote Display disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>%1 MB</source>
         <translation type="unfinished">%1 МБ</translation>
     </message>
@@ -5396,6 +5362,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1%</translation>
     </message>
     <message>
+        <source><i>About %1MB per 5 minute video</i></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>When checked, enables video recording for screen %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5411,8 +5381,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Показує шлях, де будуть зберігатися зрізи цієї машини. Майте на увазі, зрізи можуть займати доволі чимало дискового простору.</translation>
     </message>
     <message>
-        <source>Basi&c</source>
-        <translation>&Основне</translation>
+        <source>&Basic</source>
+        <translation type="obsolete">&Основне</translation>
     </message>
     <message>
         <source>Identification</source>
@@ -5455,8 +5425,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Керує об'ємом відеопам'яті, котра забезпечує віртуальну машину.</translation>
     </message>
     <message>
-        <source>A&dvanced</source>
-        <translation>&Додатково</translation>
+        <source>&Advanced</source>
+        <translation type="obsolete">&Додатково</translation>
     </message>
     <message>
         <source>Boo&t Order:</source>
@@ -5543,8 +5513,8 @@ p, li { white-space: pre-wrap; }
         <translation>Тека &зрізів:</translation>
     </message>
     <message>
-        <source>D&escription</source>
-        <translation>&Опис</translation>
+        <source>&Description</source>
+        <translation type="obsolete">&Опис</translation>
     </message>
     <message>
         <source>Holds the description of the virtual machine. The description field is useful for commenting on configuration details of the installed guest OS.</source>
@@ -5619,8 +5589,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">ви вибрали 64-ох бітну гостьову операційну систему для цієї віртуальної машини. Потрібна відповідна апаратна віртуалізація (VT-x/AMD-V), цю можливість буде автоматично ввімкнено.</translation>
     </message>
     <message>
-        <source>D&rag'n'Drop:</source>
-        <translation>&Перегування:</translation>
+        <source>&Drag'n'Drop:</source>
+        <translation type="obsolete">&Перегування:</translation>
     </message>
     <message>
         <source>Selects which data will be copied between the guest and the host OS by drag'n'drop. This feature requires Guest Additions to be installed in the guest OS.</source>
@@ -5635,6 +5605,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Basi&c</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A&dvanced</source>
+        <translation type="unfinished">&Додатково</translation>
+    </message>
+    <message>
+        <source>D&rag'n'Drop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>D&escription</source>
+        <translation type="unfinished">Опи&с</translation>
+    </message>
+    <message>
         <source>Enc&ryption</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5651,6 +5637,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&nter New Password:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5683,16 +5673,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Leave Unchanged</source>
-        <comment>cipher type</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
+        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
+        <source>Leave Unchanged</source>
+        <comment>cipher type</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5703,28 +5689,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation type="obsolete">Просторове {100%?}</translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="obsolete">Просторове {200%?}</translation>
-    </message>
-    <message>
         <source>Mini ToolBar:</source>
         <translation type="unfinished">Зменшена панель інструментів:</translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar in Fullscreen and Seamless modes.</source>
-        <translation type="obsolete">Якщо це позначено, показувати зменшену панель інструментів в повноекранному і ціловикроєному режимі.</translation>
+        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show in &Fullscreen/Seamless</source>
-        <translation type="obsolete">&Показувати в повноекранному/ціловикроєному</translation>
+        <source>Show in &Full-screen/Seamless</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="obsolete">Якщо це позначено, показувати зменшену панель інструментів зверху екрана, а не, як типово, знизу.</translation>
+        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show at &Top of Screen</source>
@@ -5734,18 +5712,6 @@ p, li { white-space: pre-wrap; }
         <source>Allows to modify VM status-bar contents.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UIMachineSettingsNetwork</name>
@@ -6409,23 +6375,23 @@ p, li { white-space: pre-wrap; }
         <translation>Показує базову адресу порту В/В цього послідовного порту. Правильне значення — ціле число від <tt>0</tt> до <tt>0xFFFF</tt>.</translation>
     </message>
     <message>
-        <source>&Connect to existing pipe/socket</source>
+        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Path/Address:</source>
+        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
+        <source>&Connect to existing pipe/socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
+        <source>&Path/Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
+        <source><p>In <b>Host Pipe</b> mode: Holds the path to the serial port's pipe on the host. Examples: "\\.\pipe\myvbox" or "/tmp/myvbox", for Windows and UNIX-like systems respectively.</p><p>In <b>Host Device</b> mode: Holds the host serial device name. Examples: "COM1" or "/dev/ttyS0".</p><p>In <b>Raw File</b> mode: Holds the file-path on the host system, where the seri [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6909,96 +6875,97 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add USB Controller</source>
+        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Hot-pluggable</source>
+        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Optical Drive</source>
+        <source>When checked, allows to use host I/O caching capabilities.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Floppy Drive</source>
+        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Optical &Drive:</source>
+        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
+        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>&Hot-pluggable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <source>Image</source>
+        <comment>storage image</comment>
+        <translation type="unfinished">Образ</translation>
     </message>
     <message>
-        <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
+        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
+        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
+        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
+        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
-        <comment>storage image</comment>
-        <translation type="unfinished">Образ</translation>
+        <source>Add USB Controller</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
+        <source>Add Optical Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
+        <source>Add Floppy Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
+        <source>Adds new storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
+        <source>Removes selected storage controller.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage controller.</source>
+        <source>Adds new storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage controller.</source>
+        <source>Removes selected storage attachment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds new storage attachment.</source>
+        <source>Optical &Drive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removes selected storage attachment.</source>
+        <source>Choose a virtual optical disk or a physical drive to use with the virtual drive. The virtual machine will see a disk inserted into the drive with the data in the file or on the disk in the physical drive as its contents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7014,7 +6981,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7270,35 +7237,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Paravirtualization Interface:</source>
+        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
+        <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>&Paravirtualization Interface:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>Selects the paravirtualization guest interface provider to be used by this virtual machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support a chip set of type ICH9 you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
+        <source>USB controller emulation is not currently enabled on the USB page. This is needed to support an emulated USB input device you have enabled for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
+        <source>The I/O APIC feature is not currently enabled in the Motherboard section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%</source>
+        <source>Hardware virtualization is not currently enabled in the Acceleration section of the System page. This is needed in order to support more than one virtual processor you have chosen for this VM. It will be done automatically if you confirm your changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7452,31 +7419,31 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">USB 2.0 тепер увімкнуто для цієї віртуальної машини. Однак, це потребує встановити <b>%1</b>. Будь ласка, встановіть пакунок розширень із сайту звантаження VirtualBox. Після цього ви зможете перезапустити USB 2.0. Покищо це вимкнуто, поки ви не скасуєте поточні зміни налаштувань.</translation>
     </message>
     <message>
-        <source>USB &1.1 (OHCI) Controller</source>
+        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &2.0 (EHCI) Controller</source>
+        <source>USB &1.1 (OHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB &3.0 (xHCI) Controller</source>
+        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
+        <source>USB &2.0 (EHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
+        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
+        <source>USB &3.0 (xHCI) Controller</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
+        <source>USB 2.0/3.0 is currently enabled for this virtual machine. However, this requires the <i>%1</i> to be installed. Please install the Extension Pack from the VirtualBox download site or disable USB 2.0/3.0 to be able to start the machine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7733,14 +7700,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished">Закрити</translation>
-    </message>
-    <message>
         <source>Switch</source>
         <translation type="unfinished">Перемкнути</translation>
     </message>
     <message>
+        <source>Close</source>
+        <translation type="unfinished">Закрити</translation>
+    </message>
+    <message>
         <source>Enable Menu Bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7984,15 +7951,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete"><p>Не вдалося завантажити файл мови <b><nobr>%1</nobr></b>. <p>Тимчасово буде встановлена англійська мова (вбудована). Будь ласка, перейдіть у діалог <b>Налаштування</b>, який можна відкрити з меню <b>Файл</b> головного вікна VirtualBox, і виберіть один з наявних мов на сторінці <b>Мова</b>.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update the Guest Additions to the current version by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Гостьові доповнення VirtualBox, які встановлено в гостьовій операційній системі занадто старі: поточна версія — %1, потрібна версія — %2. Деякі властивості, які потребують гостьових доповнень (інтеграцію миші, авторозмір гостьового термінала тощо), найімовірніше не будуть працювати як слід.</p><p>Будь ласка, оновіть гостьові доповнення до поточної версії вибравши <b>Встановити гостьові доповнення</b> з меню <b>Пр [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update the Guest Additions to the current version  by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Гостьові доповнення VirtualBox, які встановлено в гостьову операційну систему, застаріли: поточна версія — %1, потрібна версія — %2. Деякі властивості, які потребують гостьових доповнень (інтеграцію миші, авторозмір гостьового екрана тощо), не можуть працювати як слід.</p><p>Рекомендується оновити гостьові доповнення до поточної версії вибравши <b>Встановити гостьові доповнення</b> з меню <b>Пристрої</b>.&l [...]
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source>
+        <source><p>The VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of the Guest Additions by choosing <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu.</p></source>
         <translation type="obsolete"><p>Гостьові доповненя VirtualBox, які встановлені в гостьову операційну систему, — новіші, ніж версія VirtualBox: Встановлена версія — %1, Потрібна версія — %2.</p><p>Не підтримується використання найновішої версії доповнень зі старішою версією. Будь ласка, встановіть поточну версію гостьових доповнень вибравши <b>Встановити гостьові доповнення</b> в меню <b>Пристрої</b>.</p></translation>
     </message>
     <message>
@@ -8097,9 +8064,9 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Звантажити</translation>
     </message>
     <message>
-        <source>Mount</source>
+        <source>Insert</source>
         <comment>additions</comment>
-        <translation type="obsolete">Змонтувати</translation>
+        <translation type="unfinished">Змонтувати</translation>
     </message>
     <message>
         <source><p>The host key is currently defined as <b>%1</b>.</p></source>
@@ -8245,8 +8212,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Показати вікно з інформацією про продукцію</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Випущено нову версію VirtualBox! Версія <b>%1</b> доступна на <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Ви можете звантажити цю версію прямим посиланням:<p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation><p>Випущено нову версію VirtualBox! Версія <b>%1</b> доступна на <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Ви можете звантажити цю версію прямим посиланням:<p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source>
@@ -8376,8 +8343,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Перезап&исати</translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr& [...]
-        <translation type="obsolete"><p>Трапилась критична помилка під час роботи віртуальної машини і її виконання припинено.</p><p>Зверніться до спільноти за допомогою на сайті <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> або до вашої групи підтримки. Будь ласка, додайте свій журнал помилок <tt>VBox.log</tt> та зображення <tt>VBox.png</tt>, які ви можете знайти в теці <nobr><b>%1</b></nobr> [...]
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <translation><p>Трапилась критична помилка під час роботи віртуальної машини і її виконання припинено.</p><p>Зверніться до спільноти за допомогою на сайті <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> або до вашої групи підтримки. Будь ласка, додайте свій журнал помилок <tt>VBox.log</tt> та зображення <tt>VBox.png</tt>, які ви можете знайти в теці <nobr><b>%1</b></nobr>, і також опис [...]
     </message>
     <message>
         <source>hard disk</source>
@@ -8788,7 +8755,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Не вдалось від'єднати носій дискет (<nobr><b>%1</b></nobr>) із гнізда <i>%2</i> машини <b>%3</b>.</translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully started then s [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Machine</b> menu. If they are installed but the machine is not yet fully starte [...]
         <translation type="obsolete"><p>Гостьові доповнення VirtualBox не з'явились доступними на віртуальній машині, і без них неможливо використовувати спільні теки. Щоб використовувати їх усередині віртуальної машини, будь ласка, встановіть гостьові доповнення, якщо вони все ще не встановлені, або перевстановіть, якщо вони працюють некоректно, вибравши <b>Встановити гостьові доповнення</b> з меню <b>Машина</b>. Якщо вони встановлені, але машина поки  [...]
     </message>
     <message numerus="yes">
@@ -8852,8 +8819,8 @@ p, li { white-space: pre-wrap; }
         <translation><p>Зауважте, одиниці пам'яті цього носія не буде вилучено і це буде можливо згодом знову.</p></translation>
     </message>
     <message>
-        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Install Guest Additions</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully started then s [...]
-        <translation type="obsolete"><p>Гостьові доповнення VirtualBox не стали доступними для цієї віртуальної машини, а спільні теки неможливо використовувати без них. Щоб використовувати спільні теки всередині віртуальної машини, будь ласка, встановіть гостьові доповнення, якщо їх не встановлено, або перевстановіть їх, якщо вони працюють некоректно, вибравши <b>Встановити гостьові доповнення</b> з меню <b>Пристрої</b>. Якщо вони встановлені, однак машина  [...]
+        <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
+        <translation type="unfinished"><p>Гостьові доповнення VirtualBox не стали доступними для цієї віртуальної машини, а спільні теки неможливо використовувати без них. Щоб використовувати спільні теки всередині віртуальної машини, будь ласка, встановіть гостьові доповнення, якщо їх не встановлено, або перевстановіть їх, якщо вони працюють некоректно, вибравши <b>Встановити гостьові доповнення</b> з меню <b>Пристрої</b>. Якщо вони встановлені, однак машин [...]
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
@@ -9352,32 +9319,25 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source><p>The VirtualBox Guest Additions do not appear to be available on this virtual machine, and shared folders cannot be used without them. To use shared folders inside the virtual machine, please install the Guest Additions if they are not installed, or re-install them if they are not working correctly, by selecting <b>Insert Guest Additions CD image</b> from the <b>Devices</b> menu. If they are installed but the machine is not yet fully starte [...]
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete"><p>Гостьові доповнення VirtualBox не стали доступними для цієї віртуальної машини, а спільні теки неможливо використовувати без них. Щоб використовувати спільні теки всередині віртуальної машини, будь ласка, встановіть гостьові доповнення, якщо їх не встановлено, або перевстановіть їх, якщо вони працюють некоректно, вибравши <b>Встановити гостьові доповнення</b> з меню <b>Пристрої</b>. Якщо вони встановлені, однак машина  [...]
     </message>
     <message>
         <source>Insert</source>
-        <comment>additions</comment>
-        <translation type="unfinished"></translation>
+        <comment>additions-new</comment>
+        <translation type="obsolete">Змонтувати</translation>
     </message>
     <message>
-        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
+        <source>Failed to attach the webcam <b>%1</b> to the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
+        <source>Failed to detach the webcam <b>%1</b> from the virtual machine <b>%2</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
+        <source><p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9393,115 +9353,115 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to save the settings.</source>
+        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
+        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
+        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to save the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>You are about to add a new optical drive to controller <b>%1</b>.</p><p>Would you like to choose a virtual optical disk to put in the drive or to leave it empty for now?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source><p>Are you sure you want to delete the optical drive?</p><p>You will not be able to insert any optical disks or ISO images or install the Guest Additions without it!</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
+        <source>Failed to attach the optical drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
+        <source>Failed to attach the floppy drive (<nobr><b>%1</b></nobr>) to the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
+        <source>The current port forwarding rules are not valid. Rule names should be unique.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bad password or authentication failure.</source>
+        <source>The current port forwarding rules are not valid. Few rules have same host ports and conflicting IP addresses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nob [...]
+        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
+        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <source>Failed to detach the optical drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from host to guest failed.</source>
+        <source>Failed to detach the floppy drive (<nobr><b>%1</b></nobr>) from the slot <i>%2</i> of the machine <b>%3</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to cancel host to guest drag and drop operation.</source>
+        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drag and drop operation from guest to host failed.</source>
+        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
+        <source>Bad password or authentication failure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
+        <source><p>A critical error has occurred while running the virtual machine and the machine execution should be stopped.</p><p>For help, please see the Community section on <a href=https://www.virtualbox.org>https://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt>, which you can find in the virtual machine log directory, as well as a description of what you were doing when this  [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
+        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
+        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
+        <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
+        <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, as the machine has no optical drives. Please add a drive using the storage page of the virtual machine settings window.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
+        <source><p>The <b>VirtualBox Guest Additions</b> disk image file has been successfully downloaded from <nobr><a href="%1">%1</a></nobr> and saved locally as <nobr><b>%2</b>.</nobr></p><p>Do you wish to register this disk image file and insert it into the virtual optical drive?</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
+        <source>Drag and drop operation from host to guest failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
+        <source>Unable to cancel host to guest drag and drop operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
+        <source>Drag and drop operation from guest to host failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -9594,8 +9554,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UINameAndSystemEditor</name>
     <message>
-        <source>N&ame:</source>
-        <translation>&Назва:</translation>
+        <source>&Name:</source>
+        <translation type="obsolete">&Назва:</translation>
     </message>
     <message>
         <source>Holds the name of the virtual machine.</source>
@@ -9617,6 +9577,10 @@ p, li { white-space: pre-wrap; }
         <source>Selects the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
         <translation>Показує тип операційної системи, котру ви плануєте встановити на цю віртуальну машину, тобто гостьова операційна система.</translation>
     </message>
+    <message>
+        <source>N&ame:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UINetworkManager</name>
@@ -10620,18 +10584,14 @@ p, li { white-space: pre-wrap; }
         <translation>Файли віртуальної машини (%1)</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Ласкаво просимо до VirtualBox!</h3><p>У лівій частині цього вікна показується список віртуальних машин на вашому комп'ютері. Зараз список порожній, оскільки, поки що, ви не маєте створених віртуальних машин.<img src=:/welcome.png align=right/></p><p>Для того, щоб створити нову віртуальну машину, натисніть <b>Створити</b> в головному меню панелі інструментів, які розміщено зверху вікна.</p> [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation><h3>Ласкаво просимо до VirtualBox!</h3><p>У лівій частині цього вікна показується список віртуальних машин на вашому комп'ютері. Зараз список порожній, оскільки, поки що, ви не маєте створених віртуальних машин.<img src=:/welcome.png align=right/></p><p>Для того, щоб створити нову віртуальну машину, натисніть <b>Створити</b> в головному меню панелі інструментів, які розміщено зверху вікна.</p><p>Ви може [...]
     </message>
     <message>
         <source>Manager</source>
         <comment>Note: main window title which is pretended by the product name.</comment>
         <translation>Керування</translation>
     </message>
-    <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UISession</name>
@@ -10819,6 +10779,10 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>UIStatusBarEditorWidget</name>
     <message>
+        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished">Закрити</translation>
     </message>
@@ -10826,10 +10790,6 @@ p, li { white-space: pre-wrap; }
         <source>Enable Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UITextEditor</name>
@@ -10925,8 +10885,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Підсумок</translation>
     </message>
     <message>
-        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
-        <translation type="obsolete"><p>Вийшла нова версія VirtualBox! Версія <b>%1</b> доступна на <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>Ви можете звантажити цю версію прямим посиланням:</p><p><a href=%2>%3</a></p></translation>
+        <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version using the link:</p><p><a href=%2>%3</a></p></source>
+        <translation type="obsolete"><p>Вийшла нова версія VirtualBox! Версія <b>%1</b> доступна на <a href="https://www.virtualbox.org/">virtualbox.org</a>.</p><p>Ви можете звантажити цю версію прямим посиланням:</p><p><a href=%2>%3</a></p></translation>
     </message>
     <message>
         <source><p>Unable to obtain the new version information due to the following network error:</p><p><b>%1</b></p></source>
@@ -11018,159 +10978,98 @@ p, li { white-space: pre-wrap; }
     <name>UIVMInfoDialog</name>
     <message>
         <source>%1 - Session Information</source>
-        <translation>%1 — Інформація про сеанс</translation>
+        <translation type="unfinished">%1 — Інформація про сеанс</translation>
     </message>
     <message>
-        <source>&Details</source>
-        <translation type="obsolete">&Подробиці</translation>
+        <source>Configuration &Details</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Runtime</source>
-        <translation type="obsolete">&Час Роботи</translation>
+        <source>&Runtime Information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DMA Transfers</source>
-        <translation>Передавання DMA</translation>
+        <translation type="unfinished">Передавання DMA</translation>
     </message>
     <message>
         <source>PIO Transfers</source>
-        <translation>Передавання PIO</translation>
+        <translation type="unfinished">Передавання PIO</translation>
     </message>
     <message>
         <source>Data Read</source>
-        <translation>Дані зчитано</translation>
+        <translation type="unfinished">Дані зчитано</translation>
     </message>
     <message>
         <source>Data Written</source>
-        <translation>Дані записано</translation>
+        <translation type="unfinished">Дані записано</translation>
     </message>
     <message>
         <source>Data Transmitted</source>
-        <translation>Дані передано</translation>
+        <translation type="unfinished">Дані передано</translation>
     </message>
     <message>
         <source>Data Received</source>
-        <translation>Дані отримано</translation>
-    </message>
-    <message>
-        <source>Runtime Attributes</source>
-        <translation>Параметри часу обробки</translation>
-    </message>
-    <message>
-        <source>Screen Resolution</source>
-        <translation>Розширення екрана</translation>
-    </message>
-    <message>
-        <source>CD/DVD Statistics</source>
-        <translation type="obsolete">Статистика CD/DVD</translation>
-    </message>
-    <message>
-        <source>Network Adapter Statistics</source>
-        <translation type="obsolete">Статистика мережевого адаптера</translation>
-    </message>
-    <message>
-        <source>Version %1.%2</source>
-        <comment>guest additions</comment>
-        <translation type="obsolete">Версія %1.%2</translation>
+        <translation type="unfinished">Дані отримано</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest additions</comment>
-        <translation>Не виявлено</translation>
+        <translation type="unfinished">Не виявлено</translation>
     </message>
     <message>
         <source>Not Detected</source>
         <comment>guest os type</comment>
-        <translation>Не виявлено</translation>
-    </message>
-    <message>
-        <source>Guest Additions</source>
-        <translation>Гостьові доповнення</translation>
-    </message>
-    <message>
-        <source>Guest OS Type</source>
-        <translation>Тип гостьової операційної системи</translation>
-    </message>
-    <message>
-        <source>Hard Disk Statistics</source>
-        <translation type="obsolete">Статистика жорсткого диска</translation>
-    </message>
-    <message>
-        <source>No Hard Disks</source>
-        <translation type="obsolete">Нема жодного жорсткого диска</translation>
-    </message>
-    <message>
-        <source>No Network Adapters</source>
-        <translation>Нема жодного мережевого адаптера</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Ввімкнуте</translation>
-    </message>
-    <message>
-        <source>Disabled</source>
-        <comment>nested paging</comment>
-        <translation type="obsolete">Вимкнуте</translation>
-    </message>
-    <message>
-        <source>Nested Paging</source>
-        <translation type="obsolete">Вкладене заміщення сторінок</translation>
-    </message>
-    <message>
-        <source>UIVMInfoDialog</source>
-        <translation type="obsolete">UIVMInfoDialog</translation>
+        <translation type="unfinished">Не виявлено</translation>
     </message>
     <message>
         <source>Not Available</source>
-        <comment>details report (VRDP server port)</comment>
-        <translation type="obsolete">Недоступний</translation>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="unfinished">Недоступний</translation>
     </message>
     <message>
-        <source>Storage Statistics</source>
-        <translation>Статистика пам'яті</translation>
+        <source>Runtime Attributes</source>
+        <translation type="unfinished">Параметри часу обробки</translation>
     </message>
     <message>
-        <source>No Storage Devices</source>
-        <translation>Немає пристрою з накопичуванням пам'яті</translation>
+        <source>Screen Resolution</source>
+        <translation type="unfinished">Розширення екрана</translation>
     </message>
     <message>
-        <source>Network Statistics</source>
-        <translation>Статистика мережі</translation>
+        <source>VM Uptime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nested Paging</source>
-        <comment>details report</comment>
-        <translation type="obsolete">Вкладене заміщення сторінок</translation>
+        <source>Clipboard Mode</source>
+        <translation type="unfinished">Режим буфера</translation>
     </message>
     <message>
-        <source>Not Available</source>
-        <comment>details report (VRDE server port)</comment>
-        <translation>Недоступний</translation>
+        <source>Drag and Drop Mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clipboard Mode</source>
-        <translation>Режим буфера</translation>
+        <source>Guest Additions</source>
+        <translation type="unfinished">Гостьові доповнення</translation>
     </message>
     <message>
-        <source>Drag'n'Drop Mode</source>
-        <translation type="obsolete">Режим перетягування</translation>
+        <source>Guest OS Type</source>
+        <translation type="unfinished">Тип гостьової операційної системи</translation>
     </message>
     <message>
-        <source>Configuration &Details</source>
-        <translation type="unfinished"></translation>
+        <source>Storage Statistics</source>
+        <translation type="unfinished">Статистика пам'яті</translation>
     </message>
     <message>
-        <source>&Runtime Information</source>
-        <translation type="unfinished"></translation>
+        <source>No Storage Devices</source>
+        <translation type="unfinished">Немає пристрою з накопичуванням пам'яті</translation>
     </message>
     <message>
-        <source>VM Uptime</source>
-        <translation type="unfinished"></translation>
+        <source>Network Statistics</source>
+        <translation type="unfinished">Статистика мережі</translation>
     </message>
     <message>
-        <source>Drag and Drop Mode</source>
-        <translation type="unfinished"></translation>
+        <source>No Network Adapters</source>
+        <translation type="unfinished">Нема жодного мережевого адаптера</translation>
     </message>
 </context>
 <context>
@@ -12265,11 +12164,11 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Відкрити діалог для керування спільними теками</translation>
     </message>
     <message>
-        <source>&Install Guest Additions...</source>
+        <source>&Insert Guest Additions CD image...</source>
         <translation type="obsolete">Вс&тановити гостьові доповнення...</translation>
     </message>
     <message>
-        <source>Mount the Guest Additions installation image</source>
+        <source>Insert the Guest Additions disk file into the virtual drive</source>
         <translation type="obsolete">Змонтувати гостьові доповнення з установчого образу</translation>
     </message>
     <message>
@@ -12488,7 +12387,7 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">&Інформація про сеанс</translation>
     </message>
     <message>
-        <source>Show Session Information Dialog</source>
+        <source>Show Session Information Window</source>
         <translation type="obsolete">Показати інформацію про сеанс</translation>
     </message>
     <message>
@@ -12656,8 +12555,8 @@ p, li { white-space: pre-wrap; }
         <translation><перезавантажити до типових></translation>
     </message>
     <message>
-        <source>The actual default path value will be displayed after accepting the changes and opening this dialog again.</source>
-        <translation type="obsolete">Значення для фактичного шляху будуть показані після прийняття змін і відкриття діалогу знову.</translation>
+        <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
+        <translation type="unfinished">Значення для фактичного шляху будуть показані після прийняття змін і відкриття діалогу знову.</translation>
     </message>
     <message>
         <source><not selected></source>
@@ -12705,7 +12604,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>The actual default path value will be displayed after accepting the changes and opening this window again.</source>
-        <translation type="unfinished"></translation>
+        <comment>new</comment>
+        <translation type="obsolete">Значення для фактичного шляху будуть показані після прийняття змін і відкриття діалогу знову.</translation>
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
@@ -13875,7 +13775,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">Під'єднання цього жорсткого диска буде здійснюватись непрямим чином, використовуючи новостворені обчислення жорсткого диска.</translation>
+        <translation>Під'єднання цього жорсткого диска буде здійснюватись непрямим чином, використовуючи новостворені обчислення жорсткого диска.</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -13885,7 +13785,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
-        <translation type="unfinished">Цей базовий жорсткий диск не напряму під'єднано, використовуючи такі обчислення жорсткого диска:</translation>
+        <translation>Цей базовий жорсткий диск не напряму під'єднано, використовуючи такі обчислення жорсткого диска:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -14550,51 +14450,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">USB</translation>
     </message>
     <message>
-        <source>USB Port %1</source>
-        <comment>StorageSlot</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>off</source>
         <comment>guest monitor status</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paravirtualization Interface</source>
-        <comment>details report</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished">Типова</translation>
-    </message>
-    <message>
-        <source>Legacy</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimal</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyper-V</source>
-        <comment>ParavirtProvider</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New dynamically allocated storage</source>
-        <comment>MediumVariant</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Active</source>
         <comment>details report (VT-x/AMD-V)</comment>
         <translation type="unfinished">Активні</translation>
@@ -14625,6 +14485,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Paravirtualization Interface</source>
+        <comment>details report</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Taking Snapshot</source>
         <comment>MachineState</comment>
         <translation type="unfinished"></translation>
@@ -14635,6 +14500,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>None</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished">Типова</translation>
+    </message>
+    <message>
+        <source>Legacy</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimal</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hyper-V</source>
+        <comment>ParavirtProvider</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>KVM</source>
         <comment>ParavirtProvider</comment>
         <translation type="unfinished"></translation>
@@ -14645,6 +14535,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>New dynamically allocated storage</source>
+        <comment>MediumVariant</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>TCP</source>
         <comment>PortMode</comment>
         <translation type="unfinished">TCP</translation>
@@ -14665,6 +14560,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>USB Port %1</source>
+        <comment>StorageSlot</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>User interface</source>
         <comment>DetailsElementType</comment>
         <translation type="unfinished"></translation>
@@ -14674,16 +14574,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted</source>
-        <comment>medium</comment>
+        <source>Please choose a virtual hard disk file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please choose a virtual hard disk file</source>
+        <source>All virtual hard disk files (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All virtual hard disk files (%1)</source>
+        <source>Encrypted</source>
+        <comment>medium</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15002,15 +14902,15 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Створити новий віртуальний жорсткий диск</translation>
     </message>
     <message>
-        <source>UUID:</source>
+        <source><i>Not&nbsp;Encrypted</i></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><i>Not&nbsp;Encrypted</i></source>
+        <source>Encrypted with key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encrypted with key:</source>
+        <source>UUID:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -15133,8 +15033,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Не вдалось здійснити встановлення зв'язку.</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
-        <translation type="obsolete"><p>Будь ласка, заповніть реєстраційну форму, цим самим, ми будемо знати, що ви користуєтесь програмою VirtualBox і, за власним бажанням, отримаєте можливість бути в курсі новин і оновлень про VirtualBox.</p><p>Введіть ваше повне і'мя, користуючись латинськими символами, та адресу електронної пошти в нижніх полях. Будь ласка, майте на увазі, що ця інформація буде використовуватись лише для статистичних даних кількості користувачі [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Enter your full name using Latin characters and your e-mail address to the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed i [...]
+        <translation type="obsolete"><p>Будь ласка, заповніть реєстраційну форму, цим самим, ми будемо знати, що ви користуєтесь програмою VirtualBox і, за власним бажанням, отримаєте можливість бути в курсі новин і оновлень про VirtualBox.</p><p>Введіть ваше повне і'мя, користуючись латинськими символами, та адресу електронної пошти в нижніх полях. Будь ласка, майте на увазі, що ця інформація буде використовуватись лише для статистичних даних кількості користувачі [...]
     </message>
     <message>
         <source>Check this box if you do not want to receive mail from Sun Microsystems at the e-mail address specified above.</source>
@@ -15153,8 +15053,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Виберіть країну/територію</translation>
     </message>
     <message>
-        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
-        <translation type="obsolete"><p>Будь ласка, заповніть цю реєстраційну форму, щоб ми знали, що ви використуєте VirtualBox, і, за вашим бажанням, ми триматимемо вас у курсі всіх новин і оновлень щодо VirtualBox.</p><p>Будь ласка, використовуйте латинські символи для заповнення полів нижче. Будь ласка, майте на увазі, Sun Microsystems використовуватиме цю інформацію лише для збору статистичної інформації та розсилки новин. Власне, Sun Microsystems ніколи не надасть [...]
+        <source><p>Please fill out this registration form to let us know that you use VirtualBox and, optionally, to keep you informed about VirtualBox news and updates.</p><p>Please use Latin characters only to fill in  the fields below. Sun Microsystems will use this information only to gather product usage statistics and to send you VirtualBox newsletters. In particular, Sun Microsystems will never pass your data to third parties. Detailed information about how we us [...]
+        <translation type="obsolete"><p>Будь ласка, заповніть цю реєстраційну форму, щоб ми знали, що ви використуєте VirtualBox, і, за вашим бажанням, ми триматимемо вас у курсі всіх новин і оновлень щодо VirtualBox.</p><p>Будь ласка, використовуйте латинські символи для заповнення полів нижче. Будь ласка, майте на увазі, Sun Microsystems використовуватиме цю інформацію лише для збору статистичної інформації та розсилки новин. Власне, Sun Microsystems ніколи не надасть [...]
     </message>
     <message>
         <source>I &already have a Sun Online account:</source>
@@ -15306,8 +15206,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Призупинити роботу віртуально машини</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>F1</b> key to [...]
-        <translation type="obsolete"><h3>Ласкаво просимо до програми VirtualBox!</h3><p>Ліва частина цього вікна призначена для показу списку всіх віртуальних машин на вашому комп'ютері. Цей список зараз порожній, бо ви ще не створили жодної віртуальної машини.<img src=:/welcome.png align=right/></p><p>Щоб створити нову віртуальну машину, натисніть кнопку <b>Створити</b> на головній панелі інструментів, який знаходиться зверху вікна.&l [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>F1</b> key to [...]
+        <translation type="obsolete"><h3>Ласкаво просимо до програми VirtualBox!</h3><p>Ліва частина цього вікна призначена для показу списку всіх віртуальних машин на вашому комп'ютері. Цей список зараз порожній, бо ви ще не створили жодної віртуальної машини.<img src=:/welcome.png align=right/></p><p>Щоб створити нову віртуальну машину, натисніть кнопку <b>Створити</b> на головній панелі інструментів, який знаходиться зверху вікна.&l [...]
     </message>
     <message>
         <source>Log</source>
@@ -15319,8 +15219,8 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Sun VirtualBox</translation>
     </message>
     <message>
-        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
-        <translation type="obsolete"><h3>Ласкаво просимо до VirtualBox!</h3><p>У лівій частині цього вікна показується список віртуальних машин на вашому комп'ютері. Зараз список порожній, оскільки, поки що, ви не маєте створених віртуальних машин.<img src=:/welcome.png align=right/></p><p>Для того, щоб створити нову віртуальну машину, натисніть <b>Створити</b> в головному меню панелі інструментів, які розміщено зверху вікна.</p> [...]
+        <source><h3>Welcome to VirtualBox!</h3><p>The left part of this window is  a list of all virtual machines on your computer. The list is empty now because you haven't created any virtual machines yet.<img src=:/welcome.png align=right/></p><p>In order to create a new virtual machine, press the <b>New</b> button in the main tool bar located at the top of the window.</p><p>You can press the <b>%1</b> key to [...]
+        <translation type="obsolete"><h3>Ласкаво просимо до VirtualBox!</h3><p>У лівій частині цього вікна показується список віртуальних машин на вашому комп'ютері. Зараз список порожній, оскільки, поки що, ви не маєте створених віртуальних машин.<img src=:/welcome.png align=right/></p><p>Для того, щоб створити нову віртуальну машину, натисніть <b>Створити</b> в головному меню панелі інструментів, які розміщено зверху вікна.</p> [...]
     </message>
     <message>
         <source>Select a virtual machine file</source>
@@ -15862,6 +15762,149 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
+    <name>VBoxVMInformationDlg</name>
+    <message>
+        <source>%1 - Session Information</source>
+        <translation type="obsolete">%1 — Інформація про сеанс</translation>
+    </message>
+    <message>
+        <source>&Details</source>
+        <translation type="obsolete">&Подробиці</translation>
+    </message>
+    <message>
+        <source>&Runtime</source>
+        <translation type="obsolete">&Час Роботи</translation>
+    </message>
+    <message>
+        <source>DMA Transfers</source>
+        <translation type="obsolete">Передавання DMA</translation>
+    </message>
+    <message>
+        <source>PIO Transfers</source>
+        <translation type="obsolete">Передавання PIO</translation>
+    </message>
+    <message>
+        <source>Data Read</source>
+        <translation type="obsolete">Дані зчитано</translation>
+    </message>
+    <message>
+        <source>Data Written</source>
+        <translation type="obsolete">Дані записано</translation>
+    </message>
+    <message>
+        <source>Data Transmitted</source>
+        <translation type="obsolete">Дані передано</translation>
+    </message>
+    <message>
+        <source>Data Received</source>
+        <translation type="obsolete">Дані отримано</translation>
+    </message>
+    <message>
+        <source>Runtime Attributes</source>
+        <translation type="obsolete">Параметри часу обробки</translation>
+    </message>
+    <message>
+        <source>Screen Resolution</source>
+        <translation type="obsolete">Розширення екрана</translation>
+    </message>
+    <message>
+        <source>CD/DVD Statistics</source>
+        <translation type="obsolete">Статистика CD/DVD</translation>
+    </message>
+    <message>
+        <source>Network Adapter Statistics</source>
+        <translation type="obsolete">Статистика мережевого адаптера</translation>
+    </message>
+    <message>
+        <source>Version %1.%2</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Версія %1.%2</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest additions</comment>
+        <translation type="obsolete">Не виявлено</translation>
+    </message>
+    <message>
+        <source>Not Detected</source>
+        <comment>guest os type</comment>
+        <translation type="obsolete">Не виявлено</translation>
+    </message>
+    <message>
+        <source>Guest Additions</source>
+        <translation type="obsolete">Гостьові доповнення</translation>
+    </message>
+    <message>
+        <source>Guest OS Type</source>
+        <translation type="obsolete">Тип гостьової операційної системи</translation>
+    </message>
+    <message>
+        <source>Hard Disk Statistics</source>
+        <translation type="obsolete">Статистика жорсткого диска</translation>
+    </message>
+    <message>
+        <source>No Hard Disks</source>
+        <translation type="obsolete">Нема жодного жорсткого диска</translation>
+    </message>
+    <message>
+        <source>No Network Adapters</source>
+        <translation type="obsolete">Нема жодного мережевого адаптера</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Ввімкнуте</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <comment>nested paging</comment>
+        <translation type="obsolete">Вимкнуте</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <translation type="obsolete">Вкладене заміщення сторінок</translation>
+    </message>
+    <message>
+        <source>VBoxVMInformationDlg</source>
+        <translation type="obsolete">VBoxVMInformationDlg</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDP server port)</comment>
+        <translation type="obsolete">Недоступний</translation>
+    </message>
+    <message>
+        <source>Storage Statistics</source>
+        <translation type="obsolete">Статистика пам'яті</translation>
+    </message>
+    <message>
+        <source>No Storage Devices</source>
+        <translation type="obsolete">Немає пристрою з накопичуванням пам'яті</translation>
+    </message>
+    <message>
+        <source>Network Statistics</source>
+        <translation type="obsolete">Статистика мережі</translation>
+    </message>
+    <message>
+        <source>Nested Paging</source>
+        <comment>details report</comment>
+        <translation type="obsolete">Вкладене заміщення сторінок</translation>
+    </message>
+    <message>
+        <source>Not Available</source>
+        <comment>details report (VRDE server port)</comment>
+        <translation type="obsolete">Недоступний</translation>
+    </message>
+    <message>
+        <source>Clipboard Mode</source>
+        <translation type="obsolete">Режим буфера</translation>
+    </message>
+    <message>
+        <source>Drag'n'Drop Mode</source>
+        <translation type="obsolete">Режим перетягування</translation>
+    </message>
+</context>
+<context>
     <name>VBoxVMLogViewer</name>
     <message>
         <source>Log Viewer</source>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
index e53ef76..cabee1e 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
@@ -634,11 +634,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -650,23 +650,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -683,7 +683,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -691,11 +691,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -703,7 +703,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -770,7 +770,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -778,7 +778,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -806,11 +806,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -822,11 +822,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -834,7 +834,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -878,15 +878,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1388,11 +1388,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
-        <comment>details (network)</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Device Filters</source>
         <comment>details (usb)</comment>
         <translation type="unfinished"></translation>
@@ -1531,6 +1526,11 @@
         <comment>details (user interface/status-bar)</comment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Generic Driver, '%1' { %2 }</source>
+        <comment>details (network)</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UIGMachinePreview</name>
@@ -2144,7 +2144,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3652,10 +3652,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Image</source>
         <comment>storage image</comment>
         <translation type="unfinished"></translation>
@@ -3705,13 +3701,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsSystem</name>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
index fc66d19..f6c9531 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
@@ -1027,312 +1027,315 @@
     </message>
     <message>
         <source>Minimize active window</source>
-        <translation type="unfinished"></translation>
+        <translation>当前窗口最小化</translation>
     </message>
     <message>
         <source>Display the Network Operations Manager window</source>
-        <translation type="unfinished"></translation>
+        <translation>显示网络操作管理器</translation>
     </message>
     <message>
         <source>Display a window with product information</source>
-        <translation type="unfinished"></translation>
+        <translation>显示产品信息的对话框</translation>
     </message>
     <message>
         <source>&Preferences...</source>
         <comment>global preferences window</comment>
-        <translation type="unfinished">全局设定(&P)...</translation>
+        <translation>全局设定(&P)...</translation>
     </message>
     <message>
         <source>Display the global preferences window</source>
-        <translation type="unfinished"></translation>
+        <translation>打开全局设定界面</translation>
     </message>
     <message>
         <source>Display the virtual machine settings window</source>
-        <translation type="unfinished"></translation>
+        <translation>设置所选的虚拟电脑</translation>
     </message>
     <message>
         <source>Display the virtual machine session information window</source>
-        <translation type="unfinished"></translation>
+        <translation>显示虚拟电脑会话信息</translation>
     </message>
     <message>
         <source>&Save State</source>
-        <translation type="unfinished"></translation>
+        <translation>保存状态(&S)</translation>
     </message>
     <message>
         <source>Save the state of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>保存虚拟电脑的状态</translation>
     </message>
     <message>
         <source>Send the ACPI Shutdown signal to the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>发送ACPI电源按钮关闭信号到虚拟电脑</translation>
     </message>
     <message>
         <source>&Minimize Window</source>
-        <translation type="unfinished"></translation>
+        <translation>窗口最小化(&M)</translation>
     </message>
     <message>
         <source>Automatically resize the guest display when the window is resized</source>
-        <translation type="unfinished"></translation>
+        <translation>当窗口大小变动时自动调整虚拟电脑内的显示尺寸</translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
-        <translation type="unfinished"></translation>
+        <source>Take guest display screenshot</source>
+        <translation>屏幕截图</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure video capture</source>
+        <translation>打开虚拟电脑设定窗口配置录像功能</translation>
     </message>
     <message>
         <source>Enable guest display video capture</source>
-        <translation type="unfinished"></translation>
+        <translation>启用录像</translation>
     </message>
     <message>
         <source>Allow remote desktop (RDP) connections to this machine</source>
-        <translation type="unfinished"></translation>
+        <translation>启用到当前虚拟电脑的远程桌面(RDP)连接</translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure menu-bar</source>
+        <translation>打开对话框选配置菜单栏</translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable menu-bar</source>
+        <translation>启用菜单栏</translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
-        <translation type="unfinished"></translation>
+        <source>Display window to configure status-bar</source>
+        <translation>打开对话框选配置状态栏</translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
-        <translation type="unfinished"></translation>
+        <source>Enable status-bar</source>
+        <translation>启用状态栏</translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
-        <translation type="unfinished"></translation>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
+        <translation>打开全局设定界面设置热键</translation>
     </message>
     <message>
         <source>&Insert %1</source>
         <comment>that means send the %1 key sequence to the virtual machine</comment>
-        <translation type="unfinished">载入 %1 (&I)</translation>
+        <translation>载入 %1 (&I)</translation>
     </message>
     <message>
         <source>&Hard Disks</source>
-        <translation type="unfinished"></translation>
+        <translation>虚拟硬盘(&H)</translation>
     </message>
     <message>
         <source>&Hard Disk Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>虚拟硬盘设置(&H)...</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure hard disks</source>
+        <translation>打开虚拟电脑设定窗口配置虚拟硬盘功能</translation>
     </message>
     <message>
         <source>&Network</source>
-        <translation type="unfinished"></translation>
+        <translation>网络(&N)</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure network adapters</source>
+        <translation>打开虚拟电脑设定窗口配置网卡</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure USB devices</source>
+        <translation>打开虚拟电脑设定窗口配置USB设备</translation>
     </message>
     <message>
         <source>&Drag and Drop</source>
-        <translation type="unfinished"></translation>
+        <translation>拖放(&D)</translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
-        <translation type="unfinished"></translation>
+        <source>Display virtual machine settings window to configure shared folders</source>
+        <translation>打开虚拟电脑设定窗口配置共享文件夹</translation>
     </message>
     <message>
         <source>Insert the Guest Additions disk file into the virtual optical drive</source>
-        <translation type="unfinished"></translation>
+        <translation>打开增强功能包所在虚拟光盘</translation>
     </message>
     <message>
         <source>%1%</source>
         <comment>scale-factor</comment>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>Enable</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">启用</translation>
+        <translation>启用</translation>
     </message>
     <message>
         <source>Resize to %1x%2</source>
         <comment>Virtual Screen</comment>
-        <translation type="unfinished">重设为 %1x%2</translation>
+        <translation>重设为 %1x%2</translation>
     </message>
     <message>
         <source>Preview Monitor %1</source>
-        <translation type="unfinished">预览监视器 %1</translation>
+        <translation>预览监视器 %1</translation>
     </message>
     <message>
         <source>&Connect Network Adapter</source>
-        <translation type="unfinished"></translation>
+        <translation>启用网络连接(&C)</translation>
     </message>
     <message>
         <source>Connect Network Adapter &%1</source>
-        <translation type="unfinished"></translation>
+        <translation>启用网络连接 &%1</translation>
     </message>
     <message>
         <source>No USB Devices Connected</source>
-        <translation type="unfinished">没有连接 USB 设备</translation>
+        <translation>没有连接 USB 设备</translation>
     </message>
     <message>
         <source>No supported devices connected to the host PC</source>
-        <translation type="unfinished">没有可用设备连接到主机</translation>
+        <translation>没有可用设备连接到主机</translation>
     </message>
     <message>
         <source>No Webcams Connected</source>
-        <translation type="unfinished">没有连接摄像头</translation>
+        <translation>没有连接摄像头</translation>
     </message>
     <message>
         <source>No supported webcams connected to the host PC</source>
-        <translation type="unfinished">没有可用摄像头连接到主机</translation>
+        <translation>没有可用摄像头连接到主机</translation>
     </message>
     <message>
         <source>Create new virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>新建虚拟电脑</translation>
     </message>
     <message>
         <source>Add existing virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>注册一个已经存在的虚拟电脑</translation>
     </message>
     <message>
         <source>Rename selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <translation>重命名所选的虚拟电脑编组</translation>
     </message>
     <message>
         <source>&Ungroup</source>
-        <translation type="unfinished"></translation>
+        <translation>取消编组(&U)</translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
-        <translation type="unfinished"></translation>
+        <source>Ungroup items of selected virtual machine group</source>
+        <translation>解散选中的虚拟电脑编组</translation>
     </message>
     <message>
         <source>&Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>排序(&S)</translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort items of selected virtual machine group alphabetically</source>
+        <translation>将选中的虚拟电脑编组中的项目按字母排序</translation>
     </message>
     <message>
         <source>Add new group based on selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>从所选的项目创建新编组</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>复制所选的虚拟电脑</translation>
     </message>
     <message>
         <source>Remove selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>删除所选的虚拟电脑</translation>
     </message>
     <message>
         <source>Start selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>启动所选的虚拟电脑</translation>
     </message>
     <message>
         <source>Switch to the windows of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>切换到所选的虚拟电脑窗口</translation>
     </message>
     <message>
         <source>Start selected virtual machines in the background</source>
-        <translation type="unfinished"></translation>
+        <translation>在后台运行选中的虚拟电脑</translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
-        <translation type="unfinished"></translation>
+        <source>Start selected virtual machines with option of continuing in background</source>
+        <translation>启动所选虚拟电脑,并允许其可在后台继续运行</translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Suspend execution of selected virtual machines</source>
+        <translation>将正在运行的虚拟电脑暂停</translation>
     </message>
     <message>
         <source>Reset selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>重启所选的虚拟电脑</translation>
     </message>
     <message>
         <source>D&iscard Saved State...</source>
-        <translation type="unfinished"></translation>
+        <translation>清除保存的状态(&I)...</translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Discard saved state of selected virtual machines</source>
+        <translation>清除所选的虚拟电脑的保存状态</translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Show log files of selected virtual machines</source>
+        <translation>显示所选的虚拟电脑的日志文件</translation>
     </message>
     <message>
         <source>Re&fresh</source>
-        <translation type="unfinished"></translation>
+        <translation>刷新(&f)</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Refresh accessibility state of selected virtual machines</source>
+        <translation>刷新所选虚拟电脑的当前状态</translation>
     </message>
     <message>
         <source>S&how in Finder</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>MacOS</translatorcomment>
+        <translation>在文件搜索器Finder中显示(&h)</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Finder</source>
-        <translation type="unfinished"></translation>
+        <translation>在文件搜索器Finder中显示虚拟电脑的定义文件</translation>
     </message>
     <message>
         <source>S&how in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Windows</translatorcomment>
+        <translation>在资源管理器中显示(&h)</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in Explorer</source>
-        <translation type="unfinished"></translation>
+        <translation>在资源管理器中显示虚拟电脑的定义文件</translation>
     </message>
     <message>
         <source>S&how in File Manager</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Unix Linux</translatorcomment>
+        <translation>用文件管理器查看(&h)</translation>
     </message>
     <message>
         <source>Show the VirtualBox Machine Definition files in the File Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>在文件管理器中显示虚拟电脑的有关文件</translation>
     </message>
     <message>
         <source>Cr&eate Alias on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>在桌面上创建别名(&e)</translation>
     </message>
     <message>
         <source>Create alias files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>在桌面上创建虚拟电脑的别名</translation>
     </message>
     <message>
         <source>Cr&eate Shortcut on Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>创建桌面快捷方式(&e)</translation>
     </message>
     <message>
         <source>Create shortcut files to the VirtualBox Machine Definition files on your desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>在桌面上创建启动虚拟电脑的快捷方式</translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
-        <translation type="unfinished"></translation>
+        <source>Sort group of first selected virtual machine alphabetically</source>
+        <translation>将选中的第一个虚拟电脑的编组中的项目按字母排序</translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Save state of selected virtual machines</source>
+        <translation>保存虚拟电脑的状态</translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
+        <translation>发送ACPI电源按钮关闭信号到虚拟电脑</translation>
     </message>
     <message>
         <source>Power off selected virtual machines</source>
-        <translation type="unfinished"></translation>
+        <translation>关闭所选的虚拟电脑的电源</translation>
     </message>
 </context>
 <context>
@@ -1369,23 +1372,23 @@
     <message>
         <source>Status</source>
         <comment>password table field</comment>
-        <translation type="unfinished">状态</translation>
+        <translation>状态</translation>
     </message>
     <message>
         <source>ID</source>
         <comment>password table field</comment>
-        <translation type="unfinished">ID</translation>
+        <translation>ID</translation>
     </message>
     <message>
         <source>Password</source>
         <comment>password table field</comment>
-        <translation type="unfinished">密码</translation>
+        <translation>密码</translation>
     </message>
     <message numerus="yes">
         <source><nobr>Used by the following %n hard disk(s):</nobr><br>%1</source>
         <comment>This text is never used with n == 0. Feel free to drop the %n where possible, we only included it because of problems with Qt Linguist (but the user can see how many hard drives are in the tool-tip and doesn't need to be told).</comment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform><nobr>用于如下 %n 个硬盘:</nobr><br>%1</numerusform>
         </translation>
     </message>
 </context>
@@ -1505,19 +1508,19 @@
     </message>
     <message>
         <source>Storage Controller (IDE)</source>
-        <translation type="unfinished"></translation>
+        <translation>IDE 硬盘控制器</translation>
     </message>
     <message>
         <source>Storage Controller (SATA)</source>
-        <translation type="unfinished"></translation>
+        <translation>SATA 硬盘控制器</translation>
     </message>
     <message>
         <source>Storage Controller (SCSI)</source>
-        <translation type="unfinished"></translation>
+        <translation>SCSI 硬盘控制器</translation>
     </message>
     <message>
         <source>Storage Controller (SAS)</source>
-        <translation type="unfinished"></translation>
+        <translation>SAS 硬盘控制器</translation>
     </message>
 </context>
 <context>
@@ -2188,7 +2191,7 @@
     </message>
     <message>
         <source>Retrieving data ...</source>
-        <translation type="unfinished">获取数据...</translation>
+        <translation>获取数据...</translation>
     </message>
 </context>
 <context>
@@ -2788,9 +2791,9 @@
         <translation>通用驱动,“%1”</translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>通用驱动,“%1”{&nbsp;%2&nbsp;}</translation>
+        <translation>通用驱动,“%1”{ %2 }</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -2906,47 +2909,47 @@
     <message>
         <source>Scale-factor</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">缩放率</translation>
+        <translation>缩放率</translation>
     </message>
     <message>
         <source>Unscaled HiDPI Video Output</source>
         <comment>details (display)</comment>
-        <translation type="unfinished">原始 HiDPI 视频输出</translation>
+        <translation>原始 HiDPI 视频输出</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details (display/Unscaled HiDPI Video Output)</comment>
-        <translation type="unfinished"></translation>
+        <translation>启用</translation>
     </message>
     <message>
         <source>Menu-bar</source>
         <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <translation>菜单栏</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished"></translation>
+        <translation>已启用</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (user interface/menu-bar)</comment>
-        <translation type="unfinished"></translation>
+        <translation>已禁用</translation>
     </message>
     <message>
         <source>Status-bar</source>
         <comment>details (user interface)</comment>
-        <translation type="unfinished"></translation>
+        <translation>状态栏</translation>
     </message>
     <message>
         <source>Enabled</source>
         <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished"></translation>
+        <translation>已启用</translation>
     </message>
     <message>
         <source>Disabled</source>
         <comment>details (user interface/status-bar)</comment>
-        <translation type="unfinished"></translation>
+        <translation>已禁用</translation>
     </message>
 </context>
 <context>
@@ -3211,15 +3214,15 @@
     </message>
     <message>
         <source>Holds the maximum width which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>设定虚拟机的最大屏幕宽度。</translation>
     </message>
     <message>
         <source>Holds the maximum height which we would like the guest to use.</source>
-        <translation type="unfinished"></translation>
+        <translation>设定虚拟机的最大屏幕高度。</translation>
     </message>
     <message>
         <source>When checked, machine windows will be raised when the mouse pointer moves over them.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中时, 鼠标移到虚拟机窗口上则该窗口变为前置窗口。</translation>
     </message>
 </context>
 <context>
@@ -3270,19 +3273,19 @@
     </message>
     <message>
         <source>Add Package</source>
-        <translation type="unfinished"></translation>
+        <translation>添加包</translation>
     </message>
     <message>
         <source>Remove Package</source>
-        <translation type="unfinished"></translation>
+        <translation>移除包</translation>
     </message>
     <message>
         <source>Adds new package.</source>
-        <translation type="unfinished"></translation>
+        <translation>添加新包。</translation>
     </message>
     <message>
         <source>Removes selected package.</source>
-        <translation type="unfinished"></translation>
+        <translation>移除所选的包。</translation>
     </message>
 </context>
 <context>
@@ -3337,11 +3340,11 @@
     </message>
     <message>
         <source>Host Screensaver:</source>
-        <translation type="unfinished"></translation>
+        <translation>主机的屏幕保护程序:</translation>
     </message>
     <message>
         <source>&Disable When Running Virtual Machines</source>
-        <translation type="unfinished"></translation>
+        <translation>虚拟机正在运行时禁用(&D)</translation>
     </message>
 </context>
 <context>
@@ -3396,11 +3399,11 @@
     </message>
     <message>
         <source>Lists all available shortcuts which can be configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>列出所有可配置的快捷键。</translation>
     </message>
     <message>
         <source>Holds a sequence to filter the shortcut list.</source>
-        <translation type="unfinished"></translation>
+        <translation>输入内容过滤快捷键列表。</translation>
     </message>
 </context>
 <context>
@@ -3727,51 +3730,51 @@
     </message>
     <message>
         <source>Add NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>添加NAT网络</translation>
     </message>
     <message>
         <source>Remove NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>移除NAT网络</translation>
     </message>
     <message>
         <source>Edit NAT Network</source>
-        <translation type="unfinished"></translation>
+        <translation>编辑NAT网络</translation>
     </message>
     <message>
         <source>Adds new NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>添加新NAT网络。</translation>
     </message>
     <message>
         <source>Removes selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>移除选中的NAT网络。</translation>
     </message>
     <message>
         <source>Edits selected NAT network.</source>
-        <translation type="unfinished"></translation>
+        <translation>编辑NAT网络。</translation>
     </message>
     <message>
         <source>Add Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>添加仅主机(Host-Only)网络</translation>
     </message>
     <message>
         <source>Remove Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>删除仅主机(Host-Only)网络</translation>
     </message>
     <message>
         <source>Edit Host-only Network</source>
-        <translation type="unfinished"></translation>
+        <translation>编辑仅主机(Host-Only)网络</translation>
     </message>
     <message>
         <source>Adds new host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>添加仅主机(Host-Only)网络。</translation>
     </message>
     <message>
         <source>Removes selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>删除仅主机(Host-Only)网络。</translation>
     </message>
     <message>
         <source>Edits selected host-only network.</source>
-        <translation type="unfinished"></translation>
+        <translation>编辑仅主机(Host-Only)网络。</translation>
     </message>
 </context>
 <context>
@@ -3966,11 +3969,11 @@
     </message>
     <message>
         <source>When checked, manual configuration will be used for this network adapter.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中,将为该网络连接启用手动配置.</translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
-        <translation type="unfinished"></translation>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
+        <translation>选中, DHCP服务器在电脑开机时启用.</translation>
     </message>
 </context>
 <context>
@@ -4041,23 +4044,23 @@
     </message>
     <message>
         <source>When checked, this network will be enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中, 启用网络。</translation>
     </message>
     <message>
         <source>When checked, this network will support DHCP.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中, 网络支持DHCP分配IP地址。</translation>
     </message>
     <message>
         <source>When checked, this network will support IPv6.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中, 网络支持IPv6地址。</translation>
     </message>
     <message>
         <source>When checked, this network will be advertised as the default IPv6 route.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中, 确定将此网络建议为默认 IPv6 路径。</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>打开管理端口转发规则的对话框。</translation>
     </message>
 </context>
 <context>
@@ -4135,11 +4138,11 @@
     </message>
     <message>
         <source>Holds the proxy host.</source>
-        <translation type="unfinished"></translation>
+        <translation>更改代理主机。</translation>
     </message>
     <message>
         <source>Holds the proxy port.</source>
-        <translation type="unfinished"></translation>
+        <translation>更改代理端口。</translation>
     </message>
 </context>
 <context>
@@ -4194,7 +4197,7 @@
     </message>
     <message>
         <source>Selects how often the new version check should be performed. Note that if you want to completely disable this check, just clear the above check box.</source>
-        <translation type="unfinished"></translation>
+        <translation>指定应执行新版本检查的频率。请注意,如果您要完全禁用此检查,只需清除上面的复选框。</translation>
     </message>
 </context>
 <context>
@@ -4568,11 +4571,11 @@
     <message>
         <source><p style='white-space:pre'><nobr>Indicates the activity of the hard disks:</nobr>%1</p></source>
         <comment>HDD tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation><p style='white-space:pre'><nobr>指示虚拟硬盘活动状态:</nobr>%1</p></translation>
     </message>
     <message>
         <source>Indicates whether the host keyboard is captured by the guest OS:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;keyboard is not captured</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;keyboard is captured</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation>提示主机键盘是否被虚拟电脑捕获:<br><nobr><img src=:/hostkey_16px.png/>&nbsp;&nbsp;键盘未捕获</nobr><br><nobr><img src=:/hostkey_captured_16px.png/>&nbsp;&nbsp;键盘已被捕获</nobr></translation>
     </message>
 </context>
 <context>
@@ -4669,7 +4672,7 @@
     </message>
     <message>
         <source>Selects the audio output driver. The <b>Null Audio Driver</b> makes the guest see an audio card, however every access to it will be ignored.</source>
-        <translation type="unfinished"></translation>
+        <translation>选择声卡类型。选项  <b>虚空音频驱动</b> 让虚拟电脑拥有一张声卡,但其输出的声音将被忽略。</translation>
     </message>
 </context>
 <context>
@@ -4949,15 +4952,15 @@
     </message>
     <message>
         <source>&Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>屏幕(&S)</translation>
     </message>
     <message>
         <source>Scale Factor:</source>
-        <translation type="unfinished"></translation>
+        <translation>缩放率:</translation>
     </message>
     <message>
         <source>Controls the guest screen scale factor.</source>
-        <translation type="unfinished"></translation>
+        <translation>设置虚拟电脑屏幕缩放率。</translation>
     </message>
     <message>
         <source>100%</source>
@@ -4969,7 +4972,7 @@
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>HiDPI:</source>
@@ -4977,79 +4980,80 @@
     </message>
     <message>
         <source>When checked, guest screen contents will not be scaled up to compensate for high host screen resolutions.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中时,虚拟电脑显示内容将不缩放匹配主机高分辨率屏幕。</translation>
     </message>
     <message>
         <source>Use &Unscaled HiDPI Output</source>
-        <translation type="unfinished">用原始 HiDPI 输出(&U)</translation>
+        <translation>用原始高清 HiDPI 输出(&U)</translation>
     </message>
     <message>
         <source>Acceleration:</source>
-        <translation type="unfinished"></translation>
+        <translation>硬件加速:</translation>
     </message>
     <message>
         <source>HiDPI Support:</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>TODO</translatorcomment>
+        <translation>高清(HiDPI)支持:</translation>
     </message>
     <message>
         <source>Holds the VRDP Server port number. You may specify <tt>0</tt> (zero), to select port 3389, the standard port for RDP.</source>
-        <translation type="unfinished"></translation>
+        <translation>VRDP 服务器端口号. 指定 <tt>0</tt> (零) 将使用默认的端口号3389.</translation>
     </message>
     <message>
         <source>Selects the VRDP authentication method.</source>
-        <translation type="unfinished"></translation>
+        <translation>定义 VRDP 认证方式.</translation>
     </message>
     <message>
         <source>Holds the timeout for guest authentication, in milliseconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>指定客户认证超时时间,以毫秒为单位.</translation>
     </message>
     <message>
         <source>When checked, multiple simultaneous connections to the VM are permitted.</source>
-        <translation type="unfinished"></translation>
+        <translation>指定是否允许多个并发连接到虚拟电脑。</translation>
     </message>
     <message>
         <source>Holds the filename VirtualBox uses to save the recorded content.</source>
-        <translation type="unfinished"></translation>
+        <translation>将录制内容保存到的文件名。</translation>
     </message>
     <message>
         <source>Selects the resolution (frame size) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>设定录像视频的分辨率(帧大小)。</translation>
     </message>
     <message>
         <source>Holds the <b>horizontal</b> resolution (frame width) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>录像的<b>水平</b> 分辨率 (帧宽度) 。</translation>
     </message>
     <message>
         <source>Holds the <b>vertical</b> resolution (frame height) of the recorded video.</source>
-        <translation type="unfinished"></translation>
+        <translation>录像的<b>垂直</b> 分辨率 (帧高度) 。</translation>
     </message>
     <message>
         <source>Controls the maximum number of <b>frames per second</b>. Additional frames will be skipped. Reducing this value will increase the number of skipped frames and reduce the file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>设置最大的 <b>每秒帧数</b>。会跳过多余帧。设定小一点的值会跳过更多帧,文件会小些。</translation>
     </message>
     <message>
         <source>Controls the <b>quality</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>录像的 <b>品质</b>。增加此值可使录像看起来好些,但文件会大些。</translation>
     </message>
     <message>
         <source>Holds the bitrate in <b>kilobits per second</b>. Increasing this value will make the video look better at the cost of an increased file size.</source>
-        <translation type="unfinished"></translation>
+        <translation>比特率 <b>千比特每秒</b>。增加此值可使录像看起来好些,但文件会大些。</translation>
     </message>
     <message>
         <source>The virtual machine is currently assigned less than <b>%1</b> of video memory which is the minimum amount required to switch to full-screen or seamless mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>您分配了少于 <b>%1</b> 的显存,这会导致虚拟电脑无法切换到全屏模式或无缝模式。</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
     <message>
         <source>When checked, enables video recording for screen %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>启用屏幕 %1 录像。</translation>
     </message>
 </context>
 <context>
@@ -5205,11 +5209,11 @@
     </message>
     <message>
         <source>Selects the cipher to be used for encrypting the virtual machine disks.</source>
-        <translation type="unfinished"></translation>
+        <translation>显示加密虚拟硬盘所用算法。</translation>
     </message>
     <message>
         <source>Holds the path where snapshots of this virtual machine will be stored. Be aware that snapshots can take quite a lot of storage space.</source>
-        <translation type="unfinished"></translation>
+        <translation>指定用于存放备份的文件夹。需要注意的是备份会占用一定的磁盘空间.</translation>
     </message>
 </context>
 <context>
@@ -5277,15 +5281,15 @@
     </message>
     <message>
         <source>When checked, show the Mini ToolBar in full-screen and seamless modes.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中,将在全屏或无缝模式显示小工具栏。</translation>
     </message>
     <message>
         <source>Show in &Full-screen/Seamless</source>
-        <translation type="unfinished"></translation>
+        <translation>在全屏或无缝模式显示(&F)</translation>
     </message>
     <message>
         <source>When checked, show the Mini ToolBar at the top of the screen, rather than in its default position at the bottom of the screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中,小工具栏将出现在屏幕的顶部,而不是默认的底部位置。</translation>
     </message>
 </context>
 <context>
@@ -5456,23 +5460,24 @@
     </message>
     <message>
         <source>Selects how this virtual adapter is attached to the real network of the Host OS.</source>
-        <translation type="unfinished"></translation>
+        <translation>设置虚拟电脑内的网络连接以何种方式接入到主机上的真实网络.</translation>
     </message>
     <message>
         <source>Shows additional network adapter options.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>todo</translatorcomment>
+        <translation>显示或隐藏额外的网络设置选项。</translation>
     </message>
     <message>
         <source>Holds the configuration settings for the network attachment driver. The settings should be of the form <b>name=value</b> and will depend on the driver. Use <b>shift-enter</b> to add a new entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>在此输入将要使用的网络附件的任何配置设置。设置项的格式为<b>名称=值</b>,具体取值取决于驱动程序。使用 <b>shift-enter</b> 键来添加新项目。</translation>
     </message>
     <message>
         <source>When checked, the virtual network cable is plugged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中, 启用网络。</translation>
     </message>
     <message>
         <source>Displays a window to configure port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>打开管理端口转发规则的对话框。</translation>
     </message>
 </context>
 <context>
@@ -5524,23 +5529,23 @@
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">未指定IRQ。</translation>
+        <translation>未指定IRQ。</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">未指定I/O端口。</translation>
+        <translation>未指定I/O端口。</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">多个端口有同样的设置。</translation>
+        <translation>多个端口有同样的设置。</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">未指定端口路径。</translation>
+        <translation>未指定端口路径。</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">重复指定了端口路径。</translation>
+        <translation>重复指定了端口路径。</translation>
     </message>
 </context>
 <context>
@@ -5681,27 +5686,27 @@
     </message>
     <message>
         <source>Add Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>添加共享文件夹</translation>
     </message>
     <message>
         <source>Edit Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>编辑共享文件夹</translation>
     </message>
     <message>
         <source>Remove Shared Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>移除共享文件夹</translation>
     </message>
     <message>
         <source>Adds new shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>添加共享文件夹。</translation>
     </message>
     <message>
         <source>Edits selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>编辑选定的共享文件夹定义。</translation>
     </message>
     <message>
         <source>Removes selected shared folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>移除选定的共享文件夹定义。</translation>
     </message>
 </context>
 <context>
@@ -5756,7 +5761,7 @@
     </message>
     <message>
         <source>When checked, this shared folder will be permanent.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中时,该共享文件夹将是永久性的。</translation>
     </message>
 </context>
 <context>
@@ -5840,31 +5845,31 @@
     </message>
     <message>
         <source>Selects the working mode of this serial port. If you select <b>Disconnected</b>, the guest OS will detect the serial port but will not be able to operate it.</source>
-        <translation type="unfinished"></translation>
+        <translation>控制该串口的工作模式,如果您选择 <b>断开</b>, 虚拟电脑中的系统将检测到该串口,但无法进行操作.</translation>
     </message>
     <message>
         <source>When checked, the virtual machine will assume that the pipe or socket specified in the <b>Path/Address</b> field exists and try to use it. Otherwise, the pipe or socket will be created by the virtual machine when it starts.</source>
-        <translation type="unfinished"></translation>
+        <translation>如果选中,虚拟电脑将假设在 <b>路径/地址</b>域中指定的通道或套接字存在并尝试启用之,否则将在启动时创建之。</translation>
     </message>
     <message>
         <source>No IRQ is currently specified.</source>
-        <translation type="unfinished">未指定IRQ。</translation>
+        <translation>未指定IRQ。</translation>
     </message>
     <message>
         <source>No I/O port is currently specified.</source>
-        <translation type="unfinished">未指定I/O端口。</translation>
+        <translation>未指定I/O端口。</translation>
     </message>
     <message>
         <source>Two or more ports have the same settings.</source>
-        <translation type="unfinished">多个端口有同样的设置。</translation>
+        <translation>多个端口有同样的设置。</translation>
     </message>
     <message>
         <source>No port path is currently specified.</source>
-        <translation type="unfinished">未指定端口路径。</translation>
+        <translation>未指定端口路径。</translation>
     </message>
     <message>
         <source>There are currently duplicate port paths specified.</source>
-        <translation type="unfinished">重复指定了端口路径。</translation>
+        <translation>重复指定了端口路径。</translation>
     </message>
 </context>
 <context>
@@ -6287,91 +6292,99 @@
     </message>
     <message>
         <source>Encrypted with key:</source>
-        <translation type="unfinished"></translation>
+        <translation>加密密钥:</translation>
     </message>
     <message>
         <source>Lists all storage controllers for this machine and the virtual images and host drives attached to them.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>todo</translatorcomment>
+        <translation>包含分配给该虚拟电脑的所有存储控制器、虚拟硬盘、虚拟光盘、虚拟软盘,以及光驱和软驱。</translation>
     </message>
     <message>
         <source>Holds the name of the storage controller currently selected in the Storage Tree.</source>
-        <translation type="unfinished"></translation>
+        <translation>当前选中的存储树中的控制器的名称。</translation>
     </message>
     <message>
         <source>When checked, allows to use host I/O caching capabilities.</source>
-        <translation type="unfinished"></translation>
+        <translation>允许使用主机输入输出 (I/O) 缓存功能。</translation>
     </message>
     <message>
         <source>When checked, the virtual disk will not be removed when the guest system ejects it.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中时,虚拟机系统弹出光盘时将不会移出虚拟盘。</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a solid-state device.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中时,虚拟机系统会将虚拟磁盘视为固态设备。</translation>
     </message>
     <message>
         <source>When checked, the guest system will see the virtual disk as a hot-pluggable device.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中时,虚拟机系统会将虚拟磁盘视为热插拔设备。</translation>
     </message>
     <message>
         <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>todo</translatorcomment>
+        <translation type="obsolete">选择一个虚拟光盘...</translation>
     </message>
     <message>
         <source>Image</source>
         <comment>storage image</comment>
-        <translation type="unfinished">映像</translation>
+        <translation>映像</translation>
     </message>
     <message>
         <source><nobr>Expands/Collapses&nbsp;item.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>展开/折叠&nbsp;项目</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;hard&nbsp;disk.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>添加&nbsp;虚拟&nbsp;硬盘</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;optical&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>添加&nbsp;虚拟&nbsp;光驱</nobr></translation>
     </message>
     <message>
         <source><nobr>Adds&nbsp;floppy&nbsp;drive.</nobr></source>
-        <translation type="unfinished"></translation>
+        <translation><nobr>添加&nbsp;虚拟&nbsp;软驱</nobr></translation>
     </message>
     <message>
         <source>Adds new storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>添加存储控制器。</translation>
     </message>
     <message>
         <source>Removes selected storage controller.</source>
-        <translation type="unfinished"></translation>
+        <translation>移除所选的存储控制器。</translation>
     </message>
     <message>
         <source>Adds new storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>todo</translatorcomment>
+        <translation>添加存储附件。</translation>
     </message>
     <message>
         <source>Removes selected storage attachment.</source>
-        <translation type="unfinished"></translation>
+        <translation>移除所选的存储附件。</translation>
     </message>
     <message>
         <source>Create New Hard Disk...</source>
-        <translation type="unfinished"></translation>
+        <translation>创建一个新的虚拟硬盘...</translation>
     </message>
     <message>
         <source>Choose Virtual Hard Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>选择一个虚拟硬盘...</translation>
     </message>
     <message>
         <source>Choose Virtual Optical Disk File...</source>
-        <translation type="unfinished"></translation>
+        <translation>选择一个虚拟光盘文件...</translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
-        <translation type="unfinished"></translation>
+        <source>Remove Disk from Virtual Drive</source>
+        <translation>移除虚拟盘</translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
+        <translation>选择一个虚拟软盘...</translation>
+    </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6631,29 +6644,29 @@
     </message>
     <message>
         <source>When checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中时,RTC时钟设备将使用国际标准时间(UTC),否则使用当地(本机)时间。Unix系统通常预计硬件时钟设置为国际标准时间(UTC)。</translation>
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>%1 MB</source>
-        <translation type="unfinished">%1 MB</translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
         <source>%1 CPU</source>
         <comment>%1 is 1 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPU</translation>
     </message>
     <message>
         <source>%1 CPUs</source>
         <comment>%1 is host cpu count * 2 for now</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 CPU</translation>
     </message>
     <message>
         <source>%1%</source>
-        <translation type="unfinished">%1%</translation>
+        <translation>%1%</translation>
     </message>
 </context>
 <context>
@@ -6810,63 +6823,63 @@
     </message>
     <message>
         <source>When chosen, enables the virtual USB OHCI controller of this machine. The USB OHCI controller provides USB 1.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中时,在该虚拟电脑上启用 USB OHCI 控制器。该控制器将提供 USB 1.0支持.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB EHCI controller of this machine. The USB EHCI controller provides USB 2.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中时,在该虚拟电脑上启用 USB EHCI 控制器。该控制器将提供 USB 2.0支持.</translation>
     </message>
     <message>
         <source>When chosen, enables the virtual USB xHCI controller of this machine. The USB xHCI controller provides USB 3.0 support.</source>
-        <translation type="unfinished"></translation>
+        <translation>选中时,在该虚拟电脑上启用 USB xHCI 控制器。该控制器将提供 USB 3.0支持.</translation>
     </message>
     <message>
         <source>Add Empty Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>添加一个空的筛选器</translation>
     </message>
     <message>
         <source>Add Filter From Device</source>
-        <translation type="unfinished"></translation>
+        <translation>从设备列表中添加筛选器</translation>
     </message>
     <message>
         <source>Edit Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>编辑筛选器</translation>
     </message>
     <message>
         <source>Remove Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>删除筛选器</translation>
     </message>
     <message>
         <source>Move Filter Up</source>
-        <translation type="unfinished"></translation>
+        <translation>向上移动筛选器</translation>
     </message>
     <message>
         <source>Move Filter Down</source>
-        <translation type="unfinished"></translation>
+        <translation>向下移动筛选器</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields initially set to empty strings. Note that such a filter will match any attached USB device.</source>
-        <translation type="unfinished"></translation>
+        <translation>添加一个各个域的值都为空的USB筛选器。需要注意的是:这样的筛选器将会匹配所有连接到主机上的USB设备.</translation>
     </message>
     <message>
         <source>Adds new USB filter with all fields set to the values of the selected USB device attached to the host PC.</source>
-        <translation type="unfinished"></translation>
+        <translation>添加一个USB筛选器,并把其各个域的值设置为当前选中的已连接到主机上的USB设备.</translation>
     </message>
     <message>
         <source>Edits selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>编辑所选的USB筛选器.</translation>
     </message>
     <message>
         <source>Removes selected USB filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>删除所选的USB筛选器.</translation>
     </message>
     <message>
         <source>Moves selected USB filter up.</source>
-        <translation type="unfinished"></translation>
+        <translation>向上移动所选的USB筛选器.</translation>
     </message>
     <message>
         <source>Moves selected USB filter down.</source>
-        <translation type="unfinished"></translation>
+        <translation>向下移动所选的USB筛选器.</translation>
     </message>
 </context>
 <context>
@@ -6972,35 +6985,35 @@
     </message>
     <message>
         <source>Holds the vendor ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>定义供应商标识筛选器。其中<i>精确匹配</i> 字符串的格式为 <tt>XXXX</tt> 其中<tt>X</tt> 为十六进制字符, 空字符串会匹配所有值.</translation>
     </message>
     <message>
         <source>Holds the product ID filter. The <i>exact match</i> string format is <tt>XXXX</tt> where <tt>X</tt> is a hexadecimal digit. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>定义产品标识筛选器。其中<i>精确匹配</i> 字符串的格式为 <tt>XXXX</tt> 其中<tt>X</tt> 为十六进制字符.,空字符串会匹配所有值.</translation>
     </message>
     <message>
         <source>Holds the revision number filter. The <i>exact match</i> string format is <tt>IIFF</tt> where <tt>I</tt> is a decimal digit of the integer part and <tt>F</tt> is a decimal digit of the fractional part. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>定义修订版本号筛选器。其中<i>精确匹配</i> 字符串的格式为  <tt>IIFF</tt> ,其中<tt>I</tt> 为整数部分的十进制字符,而 <tt>F</tt>为小数部分的十进制字符。空字符串会匹配所有值。</translation>
     </message>
     <message>
         <source>Holds the manufacturer filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>定义制造商筛选器为一 <i>精确匹配</i> 字符串,空字符串会匹配所有值。</translation>
     </message>
     <message>
         <source>Holds the product name filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>定义产品筛选器为一 <i>精确匹配</i> 字符串,空字符串会匹配所有值.</translation>
     </message>
     <message>
         <source>Holds the serial number filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>定义序号筛选器为一 <i>精确匹配</i> 字符串,空字符串会匹配所有值.</translation>
     </message>
     <message>
         <source>Holds the host USB port filter as an <i>exact match</i> string. An empty string will match any value.</source>
-        <translation type="unfinished"></translation>
+        <translation>定义主机 USB 端口筛选器为一 <i>精确匹配</i> 字符串,空字符串会匹配所有值.</translation>
     </message>
     <message>
         <source>Holds whether this filter applies to USB devices attached locally to the host computer (<i>No</i>), to a VRDP client's computer (<i>Yes</i>), or both (<i>Any</i>).</source>
-        <translation type="unfinished"></translation>
+        <translation>指定是否将该筛选器应用到连接在本地电脑的USB设备 (<i>否</i>),连接在VRDP客户端的USB设备 (<i>是</i>),或两者的任何一个 (<i>任何</i>).</translation>
     </message>
 </context>
 <context>
@@ -7045,7 +7058,7 @@
     </message>
     <message>
         <source>&Hard disks</source>
-        <translation type="unfinished"></translation>
+        <translation>虚拟硬盘(&H)</translation>
     </message>
 </context>
 <context>
@@ -8573,63 +8586,65 @@
     </message>
     <message>
         <source>Failed to connect the network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>为虚拟电脑 <b>%1</b> 连接网线失败.</translation>
     </message>
     <message>
         <source>Failed to disconnect the network adapter cable of the virtual machine <b>%1</b>.</source>
-        <translation type="unfinished"></translation>
+        <translation>为虚拟电脑 <b>%1</b> 断开网线失败.</translation>
     </message>
     <message>
         <source>Drag and drop operation from host to guest failed.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>todo</translatorcomment>
+        <translation>拖放操作失败。</translation>
     </message>
     <message>
         <source>Unable to cancel host to guest drag and drop operation.</source>
-        <translation type="unfinished"></translation>
+        <translation>未能取消拖放操作。</translation>
     </message>
     <message>
         <source>Drag and drop operation from guest to host failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>拖放操作失败。</translation>
     </message>
     <message>
         <source><p>One or more disk image files are not currently accessible. As a result, you will not be able to operate virtual machines that use these files until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see which files are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>有一个或多个虚拟硬盘、光盘或软盘当前无法访问.。因此,你可能无法打开那些要使用这些介质的虚拟电脑直到它可以再次访问为止.</p><p>按 <b>检测</b> 打开虚拟介质管理器可以查看那些无法访问的介质,或按 <b>忽略</b> 忽略这个提示.</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot will cause the state information saved in it to be lost, and storage data spread over several image files that VirtualBox has created together with the snapshot will be merged into one file. This can be a lengthy process, and the information in the snapshot cannot be recovered.</p></p>Are you sure you want to delete the selected snapshot <b>%1</b>?</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>删除该备份意味着存放在该备份中的信息将完全丢失。 这个过程会花费较多时间,请耐心等待, 同时请注意:该操作一旦执行就无法撤销。</p></p>您确定要删除所选择的备份 <b>%1</b>?</p></translation>
     </message>
     <message>
         <source><p>Deleting the snapshot %1 will temporarily need more storage space. In the worst case the size of image %2 will grow by %3, however on this filesystem there is only %4 free.</p><p>Running out of storage space during the merge operation can result in corruption of the image and the VM configuration, i.e. loss of the VM and its data.</p><p>You may continue with deleting the snapshot at your own risk.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>删除备份 %1 将临时需要很多磁盘空间。最坏的打算,映像 %2 将增长 %3,然而,在该文件系统中只有 %4 的可用空间。</p><p>合并操作期间磁盘空间不足而继续运行,可能会导致映像和虚拟机配置的损坏,如丢失虚拟机及其数据。</p><p>您可以继续删除快照,但风险请自负。</p></translation>
     </message>
     <message>
         <source><p>Are you sure you want to release the disk image file <nobr><b>%1</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%2</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>您是否确定要释放虚拟盘 <nobr><b>%1</b></nobr>?</p><p>这会从下列虚拟电脑中解除绑定: <b>%2</b>.</p></translation>
     </message>
     <message>
         <source><p>Do you want to delete the storage unit of the virtual hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which mak [...]
-        <translation type="unfinished"></translation>
+        <translation><p>你是否要删除虚拟硬盘文件 <nobr><b>%1</b></nobr>?</p><p>如果你选择 <b>删除</b> 该硬盘文件将被永久性删除. 这个操作是<b>无法撤消的</b>.</p><p>如果你选择 <b>保留</b> 该虚拟硬盘只是从列表中删除, 但仍会保留在你的硬盘上, 因此今后还可将它添加到此列表中.</p></translation>
     </message>
     <message>
         <source>Failed to open the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>todo</translatorcomment>
+        <translation>打开虚拟盘文件<nobr><b>%1</b></nobr> 失败.</translation>
     </message>
     <message>
         <source>Failed to close the disk image file <nobr><b>%1</b></nobr>.</source>
-        <translation type="unfinished"></translation>
+        <translation>关闭虚拟盘文件<nobr><b>%1</b></nobr> 失败.</translation>
     </message>
     <message>
         <source>You are about to create a new virtual machine without a hard disk. You will not be able to install an operating system on the machine until you add one. In the mean time you will only be able to start the machine using a virtual optical disk or from the network.</source>
-        <translation type="unfinished"></translation>
+        <translation>你将新建一个没有虚拟硬盘的虚拟电脑。 只有添加了虚拟硬盘才能在虚拟电脑中安装操作系统。 目前你只能从虚拟光驱或网络上启动虚拟电脑。</translation>
     </message>
     <message>
         <source><p>The virtual machine window will be now switched to <b>full-screen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>.</p><p>Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in full-screen mode. You can access it by pressing <b>Host+Home</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>虚拟机窗口现在将切换为<b>全屏</b>模式。您可以按 <b>%1</b> 随时返回窗口模式。</p><p>注意,<b>主机(Host)</b>键当前定义为 <b>%2</b>。</p><p>注意,全屏模式下主菜单栏是隐藏的。您可以按 <b>主机键+Home</b> 来访问主菜单栏。</p></translation>
     </message>
     <message>
         <source><p>Could not switch the guest display to full-screen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to full-screen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>无法切换到全屏模式,因为虚拟电脑上没有足够的显存.</p><p>你应该重新设置虚拟电脑让它至少拥有 <b>%1</b> 的显存.</p><p>按 <b>忽略</b> 强制切换到全屏模式或按 <b>取消</b> 撤消该操作.</p></translation>
     </message>
 </context>
 <context>
@@ -9197,55 +9212,55 @@
     <name>UIPortForwardingTable</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>名称</translation>
     </message>
     <message>
         <source>Protocol</source>
-        <translation type="unfinished">协议</translation>
+        <translation>协议</translation>
     </message>
     <message>
         <source>Host IP</source>
-        <translation type="unfinished">主机IP</translation>
+        <translation>主机IP</translation>
     </message>
     <message>
         <source>Host Port</source>
-        <translation type="unfinished">主机端口</translation>
+        <translation>主机端口</translation>
     </message>
     <message>
         <source>Guest IP</source>
-        <translation type="unfinished">子系统IP</translation>
+        <translation>子系统IP</translation>
     </message>
     <message>
         <source>Guest Port</source>
-        <translation type="unfinished">子系统端口</translation>
+        <translation>子系统端口</translation>
     </message>
     <message>
         <source>Contains a list of port forwarding rules.</source>
-        <translation type="unfinished"></translation>
+        <translation>包含了端口转发规则的列表。</translation>
     </message>
     <message>
         <source>Add New Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>插入新规则</translation>
     </message>
     <message>
         <source>Copy Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>复制选定的规则</translation>
     </message>
     <message>
         <source>Remove Selected Rule</source>
-        <translation type="unfinished"></translation>
+        <translation>删除选定的规则</translation>
     </message>
     <message>
         <source>Adds new port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>该按钮添加新的端口转发规则。</translation>
     </message>
     <message>
         <source>Copies selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>复制选定的端口转发规则。</translation>
     </message>
     <message>
         <source>Removes selected port forwarding rule.</source>
-        <translation type="unfinished"></translation>
+        <translation>删除选定的端口转发规则。</translation>
     </message>
 </context>
 <context>
@@ -9487,7 +9502,7 @@
     </message>
     <message>
         <source><nobr><b>Click</b> to toggle indicator presence.</nobr><br><nobr><b>Drag&Drop</b> to change indicator position.</nobr></source>
-        <translation type="unfinished"><nobr><b>点击</b> 切换状态.</nobr><br><nobr><b>拖放</b> 更改位置.</nobr></translation>
+        <translation><nobr><b>点击</b> 切换状态.</nobr><br><nobr><b>拖放</b> 更改位置.</nobr></translation>
     </message>
 </context>
 <context>
@@ -9988,75 +10003,75 @@
     </message>
     <message>
         <source>Copy Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>复制虚拟硬盘</translation>
     </message>
     <message>
         <source>Hard disk to copy</source>
-        <translation type="unfinished"></translation>
+        <translation>要复制的硬盘</translation>
     </message>
     <message>
         <source><p>Please select the virtual hard disk file that you would like to copy if it is not already selected. You can either choose one from the list or use the folder icon beside the list to select one.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>请选择要复制的虚拟磁盘。您可以从列表中选择一个,或使用列表旁边的文件夹图标来选择一个虚拟磁盘文件。</p></translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file to copy...</source>
-        <translation type="unfinished"></translation>
+        <translation>选择一个虚拟硬盘...</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>虚拟硬盘文件类型</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>请选择您想要用于新建虚拟磁盘的文件类型。如果您不需要其他虚拟化软件使用它,您可以让此设置保持不更改状态。</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>存储在物理硬盘上</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>请选择新建虚拟硬盘文件是应该为其使用而分配(动态分配),还是应该创建完全分配(固定分配)。</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>动态分配</b>的虚拟磁盘只是逐渐占用物理硬盘的空间 (直至达到 <b>分配的大小</b>), 不过当其内部空间不用时不会自动缩减占用的物理硬盘空间。</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>固定大小</b>的虚拟磁盘文件可能在某些系统中要花很长时间来创建,但它往往使用起来较快。</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>您也可以选择将虚拟磁盘<b>分割</b>为 2GB 以下大小的几个文件。如果您想要在可移动 USB 设备或旧系统中存储虚拟机,这将会很有用,因为它们不能处理非常大型的文件。</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>请选择虚拟硬盘文件保存的位置</translation>
     </message>
     <message>
         <source>New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>要创建的新虚拟硬盘</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>请在下面的框中键入新建虚拟硬盘文件的名称,或单击文件夹图标来选择创建文件要保存到的文件夹。</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>选择虚拟硬盘文件保存的位置...</translation>
     </message>
     <message>
         <source>Hard disk to &copy</source>
-        <translation type="unfinished"></translation>
+        <translation>要复制的硬盘(&C)</translation>
     </message>
     <message>
         <source>&New hard disk to create</source>
-        <translation type="unfinished"></translation>
+        <translation>要创建的新虚拟硬盘(&N)</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>虚拟硬盘文件类型(&T)</translation>
     </message>
 </context>
 <context>
@@ -10161,7 +10176,7 @@
     </message>
     <message>
         <source><p>Please choose the type of clone you wish to create.</p><p>If you choose <b>Full clone</b>, an exact copy (including all virtual hard disk files) of the original virtual machine will be created.</p><p>If you choose <b>Linked clone</b>, a new machine will be created, but the virtual hard disk files will be tied to the virtual hard disk files of original machine and you will not be able to move the new virtual machine  [...]
-        <translation type="unfinished"></translation>
+        <translation><p>请选择创建副本的方式。</p><p>若选择 <b>完全复制</b>, 则生成一个与原虚拟电脑完整的副本(复制全部虚拟硬盘文件)。</p><p>若选择 <b>链接复制</b>,则生成一个新虚拟电脑,不过新虚拟电脑的虚拟硬盘是绑定到原虚拟电脑的虚拟硬盘的,因此这种副本要移动到别的电脑上的时候,需要将原虚拟电脑一并移动。</p></translation>
     </message>
 </context>
 <context>
@@ -10521,51 +10536,51 @@
     </message>
     <message>
         <source>Create Virtual Hard Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>创建虚拟硬盘</translation>
     </message>
     <message>
         <source>Hard disk file type</source>
-        <translation type="unfinished"></translation>
+        <translation>虚拟硬盘文件类型</translation>
     </message>
     <message>
         <source>Please choose the type of file that you would like to use for the new virtual hard disk. If you do not need to use it with other virtualization software you can leave this setting unchanged.</source>
-        <translation type="unfinished"></translation>
+        <translation>请选择您想要用于新建虚拟磁盘的文件类型。如果您不需要其他虚拟化软件使用它,您可以让此设置保持不更改状态。</translation>
     </message>
     <message>
         <source>Storage on physical hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>存储在物理硬盘上</translation>
     </message>
     <message>
         <source>Please choose whether the new virtual hard disk file should grow as it is used (dynamically allocated) or if it should be created at its maximum size (fixed size).</source>
-        <translation type="unfinished"></translation>
+        <translation>请选择新建虚拟硬盘文件是应该为其使用而分配(动态分配),还是应该创建完全分配(固定分配)。</translation>
     </message>
     <message>
         <source><p>A <b>dynamically allocated</b> hard disk file will only use space on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), although it will not shrink again automatically when space on it is freed.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>动态分配</b>的虚拟磁盘只是逐渐占用物理硬盘的空间 (直至达到 <b>分配的大小</b>), 不过当其内部空间不用时不会自动缩减占用的物理硬盘空间。</p></translation>
     </message>
     <message>
         <source><p>A <b>fixed size</b> hard disk file may take longer to create on some systems but is often faster to use.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p><b>固定大小</b>的虚拟磁盘文件可能在某些系统中要花很长时间来创建,但它往往使用起来较快。</p></translation>
     </message>
     <message>
         <source><p>You can also choose to <b>split</b> the hard disk file into several files of up to two gigabytes each. This is mainly useful if you wish to store the virtual machine on removable USB devices or old systems, some of which cannot handle very large files.</source>
-        <translation type="unfinished"></translation>
+        <translation><p>您也可以选择将虚拟磁盘<b>分割</b>为 2GB 以下大小的几个文件。如果您想要在可移动 USB 设备或旧系统中存储虚拟机,这将会很有用,因为它们不能处理非常大型的文件。</translation>
     </message>
     <message>
         <source>Please type the name of the new virtual hard disk file into the box below or click on the folder icon to select a different folder to create the file in.</source>
-        <translation type="unfinished"></translation>
+        <translation>请在下面的框中键入新建虚拟硬盘文件的名称,或单击文件夹图标来选择创建文件要保存到的文件夹。</translation>
     </message>
     <message>
         <source>Choose a location for new virtual hard disk file...</source>
-        <translation type="unfinished"></translation>
+        <translation>选择虚拟硬盘文件保存的位置...</translation>
     </message>
     <message>
         <source>Select the size of the virtual hard disk in megabytes. This size is the limit on the amount of file data that a virtual machine will be able to store on the hard disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>选择虚拟硬盘的大小。此大小为虚拟硬盘文件在实际硬盘中能用的极限大小。</translation>
     </message>
     <message>
         <source>Hard disk file &type</source>
-        <translation type="unfinished"></translation>
+        <translation>虚拟硬盘文件类型(&T)</translation>
     </message>
 </context>
 <context>
@@ -10657,27 +10672,27 @@
     </message>
     <message>
         <source>Hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>虚拟硬盘</translation>
     </message>
     <message>
         <source><p>If you wish you can add a virtual hard disk to the new machine. You can either create a new hard disk file or select one from the list or from another location using the folder icon.</p><p>If you need a more complex storage set-up you can skip this step and make the changes to the machine settings once the machine is created.</p><p>The recommended size of the hard disk is <b>%1</b>.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>你可以添加虚拟硬盘到新虚拟电脑中。新建一个虚拟硬盘文件或从列表或用文件夹图标从其他位置选择一个。</p><p>如果想更灵活地配置虚拟硬盘,也可以跳过这一步,在创建虚拟电脑之后在配置中设定。</p><p>建议的硬盘大小为 <b>%1</b>。</p></translation>
     </message>
     <message>
         <source>&Do not add a virtual hard disk</source>
-        <translation type="unfinished"></translation>
+        <translation>不添加虚拟硬盘(&D)</translation>
     </message>
     <message>
         <source>&Create a virtual hard disk now</source>
-        <translation type="unfinished"></translation>
+        <translation>现在创建虚拟硬盘(&C)</translation>
     </message>
     <message>
         <source>&Use an existing virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>使用已有的虚拟硬盘文件(&U)</translation>
     </message>
     <message>
         <source>Choose a virtual hard disk file...</source>
-        <translation type="unfinished">选择一个虚拟硬盘...</translation>
+        <translation>选择一个虚拟硬盘...</translation>
     </message>
 </context>
 <context>
@@ -10766,19 +10781,19 @@
     </message>
     <message>
         <source>Displays a window to select a different folder.</source>
-        <translation type="unfinished"></translation>
+        <translation>打开对话框选择另一文件夹.</translation>
     </message>
     <message>
         <source>Displays a window to select a different file.</source>
-        <translation type="unfinished"></translation>
+        <translation>打开对话框选择另一文件.</translation>
     </message>
     <message>
         <source>Holds the folder path.</source>
-        <translation type="unfinished"></translation>
+        <translation>文件夹路径。</translation>
     </message>
     <message>
         <source>Holds the file path.</source>
-        <translation type="unfinished"></translation>
+        <translation>文件路径。</translation>
     </message>
 </context>
 <context>
@@ -11658,7 +11673,7 @@
     <message>
         <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source>
         <comment>medium</comment>
-        <translation type="unfinished">分配此硬盘将间接使用最近创建的备份硬盘。</translation>
+        <translation>分配此硬盘将间接使用最近创建的备份硬盘。</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these files.</source>
@@ -11669,7 +11684,7 @@
         <source>This base hard disk is indirectly attached using the following differencing hard disk:</source>
         <comment>medium</comment>
         <translatorcomment>TODO</translatorcomment>
-        <translation type="unfinished">该基本硬盘是使用以下备份硬盘间接分配的:</translation>
+        <translation>该基本硬盘是使用以下备份硬盘间接分配的:</translation>
     </message>
     <message numerus="yes">
         <source>%n year(s)</source>
@@ -12450,24 +12465,24 @@
     <message>
         <source>Encrypted</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>已加密</translation>
     </message>
     <message>
         <source>Please choose a virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>选择一个虚拟硬盘</translation>
     </message>
     <message>
         <source>All virtual hard disk files (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>全部虚拟硬盘文件(%1)</translation>
     </message>
     <message>
         <source>Some of the files in this hard disk chain are inaccessible. Please use the Virtual Medium Manager to inspect these files.</source>
         <comment>medium</comment>
-        <translation type="unfinished"></translation>
+        <translation>该硬盘链中的某些介质不可访问。请使用“虚拟机介质管理器”来检查这些介质。</translation>
     </message>
     <message>
         <source>Please choose a location for new virtual hard disk file</source>
-        <translation type="unfinished"></translation>
+        <translation>请选择虚拟硬盘文件保存的位置</translation>
     </message>
 </context>
 <context>
@@ -12720,11 +12735,11 @@
     </message>
     <message>
         <source><i>Not&nbsp;Encrypted</i></source>
-        <translation type="unfinished"></translation>
+        <translation><i>未加密</i></translation>
     </message>
     <message>
         <source>Encrypted with key:</source>
-        <translation type="unfinished"></translation>
+        <translation>加密密钥:</translation>
     </message>
 </context>
 <context>
@@ -13148,19 +13163,19 @@
     </message>
     <message>
         <source>Restore selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>恢复虚拟电脑到所选备份时的状态</translation>
     </message>
     <message>
         <source>Delete selected snapshot of the virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>删除所选备份</translation>
     </message>
     <message>
         <source>Display a window with selected snapshot details</source>
-        <translation type="unfinished"></translation>
+        <translation>显示所选备份明细</translation>
     </message>
     <message>
         <source>Clone selected virtual machine</source>
-        <translation type="unfinished"></translation>
+        <translation>复制所选的虚拟电脑</translation>
     </message>
 </context>
 <context>
@@ -13197,7 +13212,7 @@
     </message>
     <message>
         <source>Snapshot %1</source>
-        <translation type="unfinished">备份 %1</translation>
+        <translation>备份 %1</translation>
     </message>
 </context>
 <context>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
index 127e455..3d938ed 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
@@ -887,11 +887,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Take a guest display screenshot</source>
+        <source>Take guest display screenshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure video capture</source>
+        <source>Display virtual machine settings window to configure video capture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -903,23 +903,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure menu-bar</source>
+        <source>Display window to configure menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable menu-bar visibility</source>
+        <source>Enable menu-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the window to configure status-bar</source>
+        <source>Display window to configure status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable status-bar visibility</source>
+        <source>Enable status-bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the global preferences window to configure keyboard shortcuts</source>
+        <source>Display global preferences window to configure keyboard shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -936,7 +936,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure hard disks</source>
+        <source>Display virtual machine settings window to configure hard disks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -944,11 +944,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure network adapters</source>
+        <source>Display virtual machine settings window to configure network adapters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure USB devices</source>
+        <source>Display virtual machine settings window to configure USB devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -956,7 +956,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display the virtual machine settings window to configure shared folders</source>
+        <source>Display virtual machine settings window to configure shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1023,7 +1023,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ungroup the items of selected virtual machine group</source>
+        <source>Ungroup items of selected virtual machine group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1031,7 +1031,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the items of selected virtual machine group alphabetically</source>
+        <source>Sort items of selected virtual machine group alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1059,11 +1059,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start selected virtual machines with the option of continuing them in the background</source>
+        <source>Start selected virtual machines with option of continuing in background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend the execution of selected virtual machines</source>
+        <source>Suspend execution of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1075,11 +1075,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Discard the saved state of selected virtual machines</source>
+        <source>Discard saved state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show the log files of selected virtual machines</source>
+        <source>Show log files of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1087,7 +1087,7 @@
         <translation type="unfinished">重新整理(&F)</translation>
     </message>
     <message>
-        <source>Refresh the accessibility state of selected virtual machines</source>
+        <source>Refresh accessibility state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1131,15 +1131,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort the group of first selected virtual machine alphabetically</source>
+        <source>Sort group of first selected virtual machine alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save the state of selected virtual machines</source>
+        <source>Save state of selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send the ACPI Shutdown signal to selected virtual machines</source>
+        <source>Send ACPI Shutdown signal to selected virtual machines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1707,9 +1707,9 @@
         <translation>通用驅動程式,「%1」</translation>
     </message>
     <message>
-        <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source>
+        <source>Generic Driver, '%1' { %2 }</source>
         <comment>details (network)</comment>
-        <translation>通用驅動程式,「%1」 {&nbsp;%2&nbsp;}</translation>
+        <translation type="unfinished">通用驅動程式,「%1」 { %2 }</translation>
     </message>
     <message>
         <source>Device Filters</source>
@@ -2546,7 +2546,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When checked, the DHCP Server will be enabled for this network on machine startup.</source>
+        <source>When checked, the DHCP Server will be enabled for this network on machine start-up.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -4477,10 +4477,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose a virtual disk image file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Image</source>
         <comment>storage image</comment>
         <translation type="unfinished">映像</translation>
@@ -4530,13 +4526,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Disk From Virtual Drive</source>
+        <source>Remove Disk from Virtual Drive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose Virtual Floppy Disk File...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose disk image...</source>
+        <comment>This is used for hard disks, optical media and floppies</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>UIMachineSettingsSystem</name>
diff --git a/src/VBox/Frontends/VirtualBox/nls/qt_eu.ts b/src/VBox/Frontends/VirtualBox/nls/qt_eu.ts
index 665cb52..db42c6d 100644
--- a/src/VBox/Frontends/VirtualBox/nls/qt_eu.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/qt_eu.ts
@@ -1,5292 +1,6535 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
+<!DOCTYPE TS><TS version="1.1" language="eu">
+<context>
+    <name>AudioOutput</name>
+    <message>
+        <location filename="" line="363"/>
+        <source><html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html></source>
+        <translation><html><b>%1</b> audio irakurketa gailuak ez du lan egiten.<br/><b>%2</b>-ra itzultzen.</html></translation>
+    </message>
+    <message>
+        <location filename="" line="363"/>
+        <source><html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html></source>
+        <translation><html><b>%1</b> audio irakurketa gailura aldatzen<br/>eskuragarri dagoena eta hobespentasun handiagoa duena.</html></translation>
+    </message>
+    <message>
+        <location filename="" line="363"/>
+        <source>Revert back to device '%1'</source>
+        <translation>Itzuli atzera '%1' gailura</translation>
+    </message>
+</context>
 <context>
     <name>MAC_APPLICATION_MENU</name>
     <message>
+        <location filename="" line="363"/>
         <source>Services</source>
-        <translation type="unfinished"></translation>
+        <translation>Zerbitzuak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Hide %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezkutatu %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Hide Others</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezkutatu Besteak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Show All</source>
-        <translation type="unfinished"></translation>
+        <translation>Erakutsi Denak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Preferences...</source>
-        <translation type="unfinished"></translation>
+        <translation>Hobespenak...</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Quit %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Utzi %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>About %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AudioOutput</name>
-    <message>
-        <source><html>The audio playback device <b>%1</b> does not work.<br/>Falling back to <b>%2</b>.</html></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source><html>Switching to the audio playback device <b>%1</b><br/>which just became available and has higher preference.</html></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Revert back to device '%1'</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-ri buruz</translation>
     </message>
 </context>
 <context>
     <name>Phonon::</name>
     <message>
+        <location filename="" line="363"/>
         <source>Notifications</source>
-        <translation type="unfinished"></translation>
+        <translation>Jakinarazpenak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Music</source>
-        <translation type="unfinished"></translation>
+        <translation>Musika</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Bideoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Communication</source>
-        <translation type="unfinished"></translation>
+        <translation>Hedabideak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Games</source>
-        <translation type="unfinished"></translation>
+        <translation>Jolasak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Accessibility</source>
-        <translation type="unfinished"></translation>
+        <translation>Sarbidetasuna</translation>
     </message>
 </context>
 <context>
     <name>Phonon::Gstreamer::Backend</name>
     <message>
+        <location filename="" line="363"/>
         <source>Warning: You do not seem to have the package gstreamer0.10-plugins-good installed.
           Some video features have been disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontuz: Ez dirudi gstreamer0.10-pluginak ongi ezarrita dituzunik.
+          Zenbait bideo ezaugarri ezgaitu egin dira.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Warning: You do not seem to have the base GStreamer plugins installed.
           All audio and video support has been disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontuz: Ez dirudi GStreamer pluginak ezarrita dituzunik.          Audio eta bideo sostengu guztiak ezgaitu egin dira</translation>
     </message>
 </context>
 <context>
     <name>Phonon::Gstreamer::MediaObject</name>
     <message>
+        <location filename="" line="363"/>
         <source>Cannot start playback. 
 
 Check your Gstreamer installation and make sure you 
 have libgstreamer-plugins-base installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da irakurketa hasi.
+
+Egiaztatu zure Gstreamer ezarpena eta zihurtatu
+libgstreamer-plugins-base ezarrita duzula.</translation>
     </message>
     <message numerus="yes">
+        <location filename="" line="363"/>
         <source>A required codec is missing. You need to install the following codec(s) to play this content: %0</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Beharrezko kodeka ez dago. Hurrengo kodeka ezarri behar duzu eduki hau irakurtzeko: %0</numerusform>
+            <numerusform>Beharrezko kodekak ez daude. Hurrengo kodekak ezarri behar dituzu eduki hau irakurtzeko: %0</numerusform>
         </translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not open media source.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa multimedia ituruburua irekitzea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid source type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Iturburu mota baliogabea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not locate media source.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa multimedia iturburua kokatzea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not open audio device. The device is already in use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa audio gailua irekitzea. Gailua jadanik erabiltzen dago.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not decode media source.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa multimedia iturburua dekodeatzea.</translation>
     </message>
 </context>
 <context>
     <name>Phonon::VolumeSlider</name>
     <message>
+        <location filename="" line="363"/>
         <source>Volume: %1%</source>
-        <translation type="unfinished"></translation>
+        <translation>Bolumena: %1%</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%</source>
-        <translation type="unfinished"></translation>
+        <translation>Erabili irristari hau bolumena ezartzeko. Ezkerreneko kopapena 0% da, eskuinekoena %1%</translation>
     </message>
 </context>
 <context>
     <name>Q3Accel</name>
     <message>
+        <location filename="" line="363"/>
         <source>%1, %2 not defined</source>
-        <translation type="unfinished"></translation>
+        <translation>%1, %2 zehaztu gabe</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Ambiguous %1 not handled</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 zehazgabea kudeatu gabe</translation>
     </message>
 </context>
 <context>
     <name>Q3DataTable</name>
     <message>
+        <location filename="" line="363"/>
         <source>True</source>
-        <translation type="unfinished"></translation>
+        <translation>Egia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>False</source>
-        <translation type="unfinished"></translation>
+        <translation>Faltsua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Insert</source>
-        <translation type="unfinished"></translation>
+        <translation>Txertatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Eguneratu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezabatu</translation>
     </message>
 </context>
 <context>
     <name>Q3FileDialog</name>
     <message>
+        <location filename="" line="363"/>
         <source>Copy or Move a File</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiatu edo Mugitu Agiri bat</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Read: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Irakurri: %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Write: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Idatzi: %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezeztatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiri Guztiak (*)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Izena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Neurria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Mota</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Eguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezaugarriak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ongi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Look &in:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilatu &hemen:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>File &name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiri &izena:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>File &type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiri &mota:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Back</source>
-        <translation type="unfinished"></translation>
+        <translation>Atzera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>One directory up</source>
-        <translation type="unfinished"></translation>
+        <translation>Igo zuzenbide bat</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Create New Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Sortu Agiritegi Berria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>List View</source>
-        <translation type="unfinished"></translation>
+        <translation>Zerrenda Ikuspegia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Detail View</source>
-        <translation type="unfinished"></translation>
+        <translation>Xehetasun Ikuspegia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Preview File Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Aurreikusi Agiri Argibideak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Preview File Contents</source>
-        <translation type="unfinished"></translation>
+        <translation>Aurreikusi Agiri Edukiak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Read-write</source>
-        <translation type="unfinished"></translation>
+        <translation>Irakur-idaztekoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Read-only</source>
-        <translation type="unfinished"></translation>
+        <translation>Irakurtzekoa-bakarrik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Write-only</source>
-        <translation type="unfinished"></translation>
+        <translation>Idaztekoa-bakarrik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Inaccessible</source>
-        <translation type="unfinished"></translation>
+        <translation>Eskuraezina</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Symlink to File</source>
-        <translation type="unfinished"></translation>
+        <translation>Lotura-sinbolikoa Agirira</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Symlink to Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Symlotura Zuzenbidera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Symlink to Special</source>
-        <translation type="unfinished"></translation>
+        <translation>Symlotura Berezira</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Dir</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuzenbidea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Special</source>
-        <translation type="unfinished"></translation>
+        <translation>Berezia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ireki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Save As</source>
-        <translation type="unfinished"></translation>
+        <translation>Gorde Honela</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Open</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ireki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Save</source>
-        <translation type="unfinished"></translation>
+        <translation>&Gorde</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>&Berreizendatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>E&zabatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>R&eload</source>
-        <translation type="unfinished"></translation>
+        <translation>&Birgertatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Sort by &Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Antolatu &Izenez</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Sort by &Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Antolatu &Neurriz</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Sort by &Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Antolatu &Egunez</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Unsorted</source>
-        <translation type="unfinished"></translation>
+        <translation>&Antolatugabe</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>Antolatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Show &hidden files</source>
-        <translation type="unfinished"></translation>
+        <translation>Eraklutsi e&zkutuko agiriak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>the file</source>
-        <translation type="unfinished"></translation>
+        <translation>agiria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>the directory</source>
-        <translation type="unfinished"></translation>
+        <translation>zuzenbidea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>the symlink</source>
-        <translation type="unfinished"></translation>
+        <translation>symlotura</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Delete %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezabatu %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source><qt>Are you sure you wish to delete %1 "%2"?</qt></source>
-        <translation type="unfinished"></translation>
+        <translation><qt>Zihur zaude %1 «%2» ezabatzea nahi duzula?</qt></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>&Bai</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&No</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ez</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>New Folder 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiritegi Berria 1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>New Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiritegi Berria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>New Folder %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiritegi Berria %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Find Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilatu  Zuzenbidea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Directories</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuzenbideak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuzenbidea:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1
 File not found.
 Check path and filename.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1
+Agiria ez da aurkitu.
+Egiaztatu helburua eta agirizena.</translation>
     </message>
 </context>
 <context>
     <name>Q3LocalFs</name>
     <message>
+        <location filename="" line="363"/>
         <source>Could not read directory
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa zuzenbidea sortzea
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not create directory
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa zuzenbidea sortzea
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not remove file or directory
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa agiria edo zuzenbidea kentzea
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not rename
 %1
 to
 %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa berrizendatzea
+%1
+honela
+%2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not open
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa irekitzea
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not write
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa idaztea
+%1</translation>
     </message>
 </context>
 <context>
     <name>Q3MainWindow</name>
     <message>
+        <location filename="" line="363"/>
         <source>Line up</source>
-        <translation type="unfinished"></translation>
+        <translation>Lerroan gora</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Customize...</source>
-        <translation type="unfinished"></translation>
+        <translation>Norbereratu...</translation>
     </message>
 </context>
 <context>
     <name>Q3NetworkProtocol</name>
     <message>
+        <location filename="" line="363"/>
         <source>Operation stopped by the user</source>
-        <translation type="unfinished"></translation>
+        <translation>Eragiketa erabiltzaileak geldiarazita</translation>
     </message>
 </context>
 <context>
     <name>Q3ProgressDialog</name>
     <message>
+        <location filename="" line="363"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezeztatu</translation>
     </message>
 </context>
 <context>
     <name>Q3TabDialog</name>
     <message>
+        <location filename="" line="363"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Ongi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezarri</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Laguntza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Berezkoak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezeztatu</translation>
     </message>
 </context>
 <context>
     <name>Q3TextEdit</name>
     <message>
+        <location filename="" line="363"/>
         <source>&Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>&Desegin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>&Berregin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ebaki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&Kopiatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>&Itsatsi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Garbitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu Denak</translation>
     </message>
 </context>
 <context>
     <name>Q3TitleBar</name>
     <message>
+        <location filename="" line="363"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation>Sistema</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Restore up</source>
-        <translation type="unfinished"></translation>
+        <translation>Leheneratu gora</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Minimize</source>
-        <translation type="unfinished"></translation>
+        <translation>Txikiengotu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Restore down</source>
-        <translation type="unfinished"></translation>
+        <translation>Leheneratu behera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Maximize</source>
-        <translation type="unfinished"></translation>
+        <translation>Handiengotu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Contains commands to manipulate the window</source>
-        <translation type="unfinished"></translation>
+        <translation>Leihoa manipulatzeko komandoak ditu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Puts a minimized back to normal</source>
-        <translation type="unfinished"></translation>
+        <translation>Txikiengotua atzera arrunt jartzen du</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Moves the window out of the way</source>
-        <translation type="unfinished"></translation>
+        <translation>Leihoa bidetik kanpo mugitzen du</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Puts a maximized window back to normal</source>
-        <translation type="unfinished"></translation>
+        <translation>Lehio handiendua atzera arrunt jartzen du</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Makes the window full screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Leihoa ikusleiho-osoko egiten du</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Closes the window</source>
-        <translation type="unfinished"></translation>
+        <translation>Leihoa isten du</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Holds the name of the window and contains controls to manipulate it</source>
-        <translation type="unfinished"></translation>
+        <translation>Leihoaren izena eta bere manipulatzeko aginteak ditu</translation>
     </message>
 </context>
 <context>
     <name>Q3ToolBar</name>
     <message>
+        <location filename="" line="363"/>
         <source>More...</source>
-        <translation type="unfinished"></translation>
+        <translation>Gehiago...</translation>
     </message>
 </context>
 <context>
     <name>Q3UrlOperator</name>
     <message>
+        <location filename="" line="363"/>
         <source>The protocol `%1' is not supported</source>
-        <translation type="unfinished"></translation>
+        <translation>`%1' protokoloa ez dago sostengaturik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The protocol `%1' does not support listing directories</source>
-        <translation type="unfinished"></translation>
+        <translation>`%1' protokoloak ez ditu zerrendaturiko zuzenbideak sostengatzen</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The protocol `%1' does not support creating new directories</source>
-        <translation type="unfinished"></translation>
+        <translation>`%1' protokoloak ez du zuzenbide berriak sortzea sostengatzen</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The protocol `%1' does not support removing files or directories</source>
-        <translation type="unfinished"></translation>
+        <translation>`%1' protokoloak ez du zuzenbideak edo agiriak kentzea sostengatzen</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The protocol `%1' does not support renaming files or directories</source>
-        <translation type="unfinished"></translation>
+        <translation>`%1' protokoloak ez du agiriak edo zuzenbideak berrizendatzea sostengatzen</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The protocol `%1' does not support getting files</source>
-        <translation type="unfinished"></translation>
+        <translation>`%1' protokoloak ez du agiriak lortzea sostengatzen</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The protocol `%1' does not support putting files</source>
-        <translation type="unfinished"></translation>
+        <translation>`%1' protokoloak ez du agiriak jartzea sostengatzen</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The protocol `%1' does not support copying or moving files or directories</source>
-        <translation type="unfinished"></translation>
+        <translation>`%1' protokoloak ez du agiriak edo zuzenbideak kopiatzea edo mugitzea sostengatzen</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>(unknown)</source>
-        <translation type="unfinished"></translation>
+        <translation>(ezezaguna)</translation>
     </message>
 </context>
 <context>
     <name>Q3Wizard</name>
     <message>
+        <location filename="" line="363"/>
         <source>&Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>E&zeztatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>< &Back</source>
-        <translation type="unfinished"></translation>
+        <translation>< &Atzera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Next ></source>
-        <translation type="unfinished"></translation>
+        <translation>&Hurrengoa ></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Finish</source>
-        <translation type="unfinished"></translation>
+        <translation>A&maitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&Laguntza</translation>
     </message>
 </context>
 <context>
     <name>QAbstractSocket</name>
     <message>
+        <location filename="" line="363"/>
         <source>Host not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostalaria ez da aurkitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connection refused</source>
-        <translation type="unfinished"></translation>
+        <translation>Elkarketa baztertuta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Socket operation timed out</source>
-        <translation type="unfinished"></translation>
+        <translation>Hartune eragiketa epez kanpo</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Socket is not connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Hartunea ez dago elkarketuta</translation>
     </message>
 </context>
 <context>
     <name>QAbstractSpinBox</name>
     <message>
+        <location filename="" line="363"/>
         <source>&Step up</source>
-        <translation type="unfinished"></translation>
+        <translation>Urratsa &gora</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Step &down</source>
-        <translation type="unfinished"></translation>
+        <translation>Urratsa &behera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>&Hautatu Denak</translation>
     </message>
 </context>
 <context>
     <name>QApplication</name>
     <message>
+        <location filename="" line="363"/>
         <source>Activate</source>
-        <translation type="unfinished"></translation>
+        <translation>Eragin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Executable '%1' requires Qt %2, found Qt %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>'%1' exekutagarriak Qt %2 behar du, aurkitu da Qt %3.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Incompatible Qt Library Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Bateraezintasun Qt Liburutegi Akatsa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>QT_LAYOUT_DIRECTION</source>
         <comment>Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment>
-        <translation type="unfinished"></translation>
+        <translation>EZES</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Activates the program's main window</source>
-        <translation type="unfinished"></translation>
+        <translation>Programaren leiho nagusia eragiten du</translation>
     </message>
 </context>
 <context>
     <name>QCheckBox</name>
     <message>
+        <location filename="" line="363"/>
         <source>Uncheck</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez Hautatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Check</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Toggle</source>
-        <translation type="unfinished"></translation>
+        <translation>Aldatu</translation>
     </message>
 </context>
 <context>
     <name>QColorDialog</name>
     <message>
+        <location filename="" line="363"/>
         <source>Hu&e:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Nabardura</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Sat:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Margoaset.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Val:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Bal:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Red:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Gorria:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Green:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Orlegia:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Bl&ue:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Urdina:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A&lpha channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>A&lfa bidea:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Basic colors</source>
-        <translation type="unfinished"></translation>
+        <translation>O&hinarrizko margoak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Custom colors</source>
-        <translation type="unfinished"></translation>
+        <translation>&Norbere margoak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Add to Custom Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>&Gehitu Norbere Margoetara</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Select color</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu margoa</translation>
     </message>
 </context>
 <context>
     <name>QComboBox</name>
     <message>
+        <location filename="" line="363"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ireki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>False</source>
-        <translation type="unfinished"></translation>
+        <translation>Faltsua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>True</source>
-        <translation type="unfinished"></translation>
+        <translation>Egia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxi</translation>
     </message>
 </context>
 <context>
     <name>QCoreApplication</name>
     <message>
+        <location filename="" line="363"/>
         <source>%1: permission denied</source>
         <comment>QSystemSemaphore</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1: baimena ukatuta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: already exists</source>
         <comment>QSystemSemaphore</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1: jadanik badago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: doesn't exists</source>
         <comment>QSystemSemaphore</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1: ez dago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: out of resources</source>
         <comment>QSystemSemaphore</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1: baliabideetatik kanpo</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: unknown error %2</source>
         <comment>QSystemSemaphore</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1: %2 akats ezezaguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: key is empty</source>
         <comment>QSystemSemaphore</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1: giltza hutsik dago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: unable to make key</source>
         <comment>QSystemSemaphore</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1: ezinezkoa giltza egitea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: ftok failed</source>
         <comment>QSystemSemaphore</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1: ftok hutsegitea</translation>
     </message>
 </context>
 <context>
     <name>QDB2Driver</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa elkarketatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to commit transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa aurkeztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to rollback transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa ezeztatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to set autocommit</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa berez-aurkeztu ezartzea</translation>
     </message>
 </context>
 <context>
     <name>QDB2Result</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to execute statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estamentua exekutatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to prepare statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa stamentua gertatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to bind variable</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa aldaera lotzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to fetch record %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa %1 grabaketa lortzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to fetch next</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa hurrengoa lortzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to fetch first</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa lehena lortzea</translation>
     </message>
 </context>
 <context>
     <name>QDateTimeEdit</name>
     <message>
+        <location filename="" line="363"/>
         <source>AM</source>
-        <translation type="unfinished"></translation>
+        <translation>GO</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>am</source>
-        <translation type="unfinished"></translation>
+        <translation>go</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>AR</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>pm</source>
-        <translation type="unfinished"></translation>
+        <translation>ar</translation>
     </message>
 </context>
 <context>
     <name>QDial</name>
     <message>
+        <location filename="" line="363"/>
         <source>QDial</source>
-        <translation type="unfinished"></translation>
+        <translation>QDial</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>SpeedoMeter</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiadura-Neurgailua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>SliderHandle</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristari Heldutokia</translation>
     </message>
 </context>
 <context>
     <name>QDialog</name>
     <message>
+        <location filename="" line="363"/>
         <source>What's This?</source>
-        <translation type="unfinished"></translation>
+        <translation>Zer da Hau?</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Done</source>
-        <translation type="unfinished"></translation>
+        <translation>Eginda</translation>
     </message>
 </context>
 <context>
     <name>QDialogButtonBox</name>
     <message>
+        <location filename="" line="363"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Ongi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Gorde</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ireki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezeztatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezarri</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Berrabiarazi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Laguntza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Don't Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez Gorde</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Discard</source>
-        <translation type="unfinished"></translation>
+        <translation>Baztertu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>&Bai</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Yes to &All</source>
-        <translation type="unfinished"></translation>
+        <translation>Bai G&uztiari</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&No</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ez</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>N&o to All</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez Guz&tiari</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Save All</source>
-        <translation type="unfinished"></translation>
+        <translation>Gorde Denak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Utzi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Retry</source>
-        <translation type="unfinished"></translation>
+        <translation>Bersaiatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Ignore</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezikusi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Restore Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Berrezarri Berezkoak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Close without Saving</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxi Gorde gabe</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ongi</translation>
     </message>
 </context>
 <context>
     <name>QDirModel</name>
     <message>
+        <location filename="" line="363"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Izena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Neurria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Kind</source>
         <comment>Match OS X Finder</comment>
-        <translation type="unfinished"></translation>
+        <translation>Mota</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Type</source>
         <comment>All other platforms</comment>
-        <translation type="unfinished"></translation>
+        <translation>Mota</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Date Modified</source>
-        <translation type="unfinished"></translation>
+        <translation>Aldatze Eguna</translation>
     </message>
 </context>
 <context>
     <name>QDockWidget</name>
     <message>
+        <location filename="" line="363"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Dock</source>
-        <translation type="unfinished"></translation>
+        <translation>Uztartu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Float</source>
-        <translation type="unfinished"></translation>
+        <translation>Gainean</translation>
     </message>
 </context>
 <context>
     <name>QDoubleSpinBox</name>
     <message>
+        <location filename="" line="363"/>
         <source>More</source>
-        <translation type="unfinished"></translation>
+        <translation>Gehiago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Less</source>
-        <translation type="unfinished"></translation>
+        <translation>Gutxiago</translation>
     </message>
 </context>
 <context>
     <name>QErrorMessage</name>
     <message>
+        <location filename="" line="363"/>
         <source>Debug Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Garbiketa  Mezua:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Warning:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontuz:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Fatal Error:</source>
-        <translation type="unfinished"></translation>
+        <translation>Akats Larria:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Show this message again</source>
-        <translation type="unfinished"></translation>
+        <translation>&Erakutsi mezu hau berriro</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ongi</translation>
     </message>
 </context>
 <context>
     <name>QFileDialog</name>
     <message>
+        <location filename="" line="363"/>
         <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiri Guztiak (*)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Directories</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuzenbideak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Open</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ireki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Save</source>
-        <translation type="unfinished"></translation>
+        <translation>&Gorde</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ireki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 already exists.
 Do you want to replace it?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 jadanik badago.
+Ordeztea nahi duzu?</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1
 File not found.
 Please verify the correct file name was given.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1
+Agiria ez da aurkitu.
+Mesedez egiaztatu emaniko agiri izena zuzena dela.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>My Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Nire Ordenagailua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Be&rrizendatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>E&zabatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Show &hidden files</source>
-        <translation type="unfinished"></translation>
+        <translation>Erakutsi  e&zkutuko agiriak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Back</source>
-        <translation type="unfinished"></translation>
+        <translation>Atzera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Parent Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Gaineko Zuzenbidea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>List View</source>
-        <translation type="unfinished"></translation>
+        <translation>Zerrenda Ikuspegia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Detail View</source>
-        <translation type="unfinished"></translation>
+        <translation>Xehetasun Ikuspegia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Files of type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiri mota:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuzenbidea:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1
 Directory not found.
 Please verify the correct directory name was given.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1
+Zuzenbidea ez da aurkitu.
+Mesedez egiaztatu emaniko zuzenbide izena zuzena dela.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>'%1' is write protected.
 Do you want to delete it anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>'%1' idaz-aurka babestuta dago.
+Horrela ere ezabatzea nahi duzu?</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Are sure you want to delete '%1'?</source>
-        <translation type="unfinished"></translation>
+        <translation>Zihur zaude '%1' ezabatzea nahi duzula?</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not delete directory.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa zuzenbidea ezabatzea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Save As</source>
-        <translation type="unfinished"></translation>
+        <translation>Gorde Honela</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Drive</source>
-        <translation type="unfinished"></translation>
+        <translation>Gidagailua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezezaguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Find Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilatu Zuzenbidea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Show </source>
-        <translation type="unfinished"></translation>
+        <translation>Erakutsi </translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Aurrera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>New Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiritegi Berria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&New Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiritegi &Berria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Choose</source>
-        <translation type="unfinished"></translation>
+        <translation>&Hautatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Kendu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>File &name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiri &izena:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Look in:</source>
-        <translation type="unfinished"></translation>
+        <translation>Begiratu hemen:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Create New Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Sortu Agiritegi Berria</translation>
     </message>
 </context>
 <context>
     <name>QFileSystemModel</name>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid filename</source>
-        <translation type="unfinished"></translation>
+        <translation>Agirizen baliogabea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source><b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks.</source>
-        <translation type="unfinished"></translation>
+        <translation><b>"%1" izena ezin da erabili.</b><p>Saiatu beste izen bat erabiltzen, hizki gutxiagokin edo puntuaketa marka gabe.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Izena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Neurria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Kind</source>
         <comment>Match OS X Finder</comment>
-        <translation type="unfinished"></translation>
+        <translation>Mota</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Type</source>
         <comment>All other platforms</comment>
-        <translation type="unfinished"></translation>
+        <translation>Mota</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Date Modified</source>
-        <translation type="unfinished"></translation>
+        <translation>Aldaketa Eguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>My Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Nire Ordenagailua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordenagailua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 TB</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 TB</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 GB</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 GB</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 MB</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 MB</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 KB</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 KB</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 bytes</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 byte</translation>
     </message>
 </context>
 <context>
     <name>QFontDatabase</name>
     <message>
+        <location filename="" line="363"/>
         <source>Normal</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrunta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Bold</source>
-        <translation type="unfinished"></translation>
+        <translation>Lodia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Demi Bold</source>
-        <translation type="unfinished"></translation>
+        <translation>Erdi Lodia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Black</source>
-        <translation type="unfinished"></translation>
+        <translation>Beltza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Demi</source>
-        <translation type="unfinished"></translation>
+        <translation>Erdia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Light</source>
-        <translation type="unfinished"></translation>
+        <translation>Argia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Italic</source>
-        <translation type="unfinished"></translation>
+        <translation>Etzana</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Oblique</source>
-        <translation type="unfinished"></translation>
+        <translation>Okerra</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Any</source>
-        <translation type="unfinished"></translation>
+        <translation>Edozein</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Latin</source>
-        <translation type="unfinished"></translation>
+        <translation>Latinera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Greek</source>
-        <translation type="unfinished"></translation>
+        <translation>Greziera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cyrillic</source>
-        <translation type="unfinished"></translation>
+        <translation>Ziriliarra</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Armenian</source>
-        <translation type="unfinished"></translation>
+        <translation>Armeniera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Hebrew</source>
-        <translation type="unfinished"></translation>
+        <translation>Hebraiera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Arabic</source>
-        <translation type="unfinished"></translation>
+        <translation>Arabiera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Syriac</source>
-        <translation type="unfinished"></translation>
+        <translation>Siriera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Thaana</source>
-        <translation type="unfinished"></translation>
+        <translation>Thaanaera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Devanagari</source>
-        <translation type="unfinished"></translation>
+        <translation>Devanagariera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Bengali</source>
-        <translation type="unfinished"></translation>
+        <translation>Bengaliera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Gurmukhi</source>
-        <translation type="unfinished"></translation>
+        <translation>Gurmukhiera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Gujarati</source>
-        <translation type="unfinished"></translation>
+        <translation>Guxaratiera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Oriya</source>
-        <translation type="unfinished"></translation>
+        <translation>Oriyaera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Tamil</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamilera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Telugu</source>
-        <translation type="unfinished"></translation>
+        <translation>Teluguera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Kannada</source>
-        <translation type="unfinished"></translation>
+        <translation>Kannadaera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Malayalam</source>
-        <translation type="unfinished"></translation>
+        <translation>Malayalamera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Sinhala</source>
-        <translation type="unfinished"></translation>
+        <translation>Sinhalaera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Thai</source>
-        <translation type="unfinished"></translation>
+        <translation>Thailandiera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Lao</source>
-        <translation type="unfinished"></translation>
+        <translation>Laosera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Tibetan</source>
-        <translation type="unfinished"></translation>
+        <translation>Tibetera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Myanmar</source>
-        <translation type="unfinished"></translation>
+        <translation>Myanmarrera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Georgian</source>
-        <translation type="unfinished"></translation>
+        <translation>Georgiera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Khmer</source>
-        <translation type="unfinished"></translation>
+        <translation>Khmerrera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Simplified Chinese</source>
-        <translation type="unfinished"></translation>
+        <translation>Txinera Arrundua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Traditional Chinese</source>
-        <translation type="unfinished"></translation>
+        <translation>Txinera Tradizionala</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Japanese</source>
-        <translation type="unfinished"></translation>
+        <translation>Japoniera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Korean</source>
-        <translation type="unfinished"></translation>
+        <translation>Koreaera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Vietnamese</source>
-        <translation type="unfinished"></translation>
+        <translation>Vietnamera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Symbol</source>
-        <translation type="unfinished"></translation>
+        <translation>Ikurra</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Ogham</source>
-        <translation type="unfinished"></translation>
+        <translation>Oghamera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Runic</source>
-        <translation type="unfinished"></translation>
+        <translation>Errunikoa</translation>
     </message>
 </context>
 <context>
     <name>QFontDialog</name>
     <message>
+        <location filename="" line="363"/>
         <source>&Font</source>
-        <translation type="unfinished"></translation>
+        <translation>&Hizkia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Font st&yle</source>
-        <translation type="unfinished"></translation>
+        <translation>Hizki &estiloa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Size</source>
-        <translation type="unfinished"></translation>
+        <translation>&Neurria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Effects</source>
-        <translation type="unfinished"></translation>
+        <translation>Eraginak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Stri&keout</source>
-        <translation type="unfinished"></translation>
+        <translation>&Marratua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Underline</source>
-        <translation type="unfinished"></translation>
+        <translation>&Azpimarratua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Sample</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagina</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Wr&iting System</source>
-        <translation type="unfinished"></translation>
+        <translation>I&dazketa Sistema</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Select Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu Hizkia</translation>
     </message>
 </context>
 <context>
     <name>QFtp</name>
     <message>
+        <location filename="" line="363"/>
         <source>Not connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Elkarketatu  gabe</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Host %1 not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostalaria %1 ez da aurkitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connection refused to host %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 hostalariak elkarketa bazteru du</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connected to host %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 hostalarira elkarketaturik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connection refused for data connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Elkarketa ukatua datu elkarketatik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Akats ezezaguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connecting to host failed:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Hutsegitea hostalariarekin elkarketatzerakoan:
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Login failed:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Saio haste hutsegitea:
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Listing directory failed:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuzenbide zerrendapen hutsegitea:
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Changing directory failed:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuzenbide aldaketa hutsegitea:
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Downloading file failed:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiri jeisketa hutsegitea:
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Uploading file failed:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiri igotze hutsegitea:
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Removing file failed:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiri kentze hutsegitea:
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Creating directory failed:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuzenbide sortze hutsegitea:
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Removing directory failed:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuzenbide kentze hutsegitea:
+%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connection closed</source>
-        <translation type="unfinished"></translation>
+        <translation>Elkarketa itxita</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Host %1 found</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 hostalaria aurkitu da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connection to %1 closed</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-rako elkarketa itxita</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Host found</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostalaria aurkitu da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connected to host</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostalarira elkarketaturik</translation>
     </message>
 </context>
 <context>
     <name>QHostInfo</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Akats ezezaguna</translation>
     </message>
 </context>
 <context>
     <name>QHostInfoAgent</name>
     <message>
+        <location filename="" line="363"/>
         <source>Host not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostalaria ez da aurkitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown address type</source>
-        <translation type="unfinished"></translation>
+        <translation>Helbide mota ezezaguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Akats ezezaguna</translation>
     </message>
 </context>
 <context>
     <name>QHttp</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Akats ezezaguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Request aborted</source>
-        <translation type="unfinished"></translation>
+        <translation>Eskaera utzita</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No server set to connect to</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez da zerbitzaririk ezarri hona elkarketatzeko</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Wrong content length</source>
-        <translation type="unfinished"></translation>
+        <translation>Eduki luzera okerra</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Server closed connection unexpectedly</source>
-        <translation type="unfinished"></translation>
+        <translation>Zerbitzariak elkarketa itxi du ustekabean</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connection refused</source>
-        <translation type="unfinished"></translation>
+        <translation>Elkarketa ukatua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Host %1 not found</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 hostalaria ez da aurkitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>HTTP request failed</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTP eskaera hutsegitea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid HTTP response header</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTP erantzun idazburu baliogabea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid HTTP chunked body</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTP zatiketa gorputz baliogabea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Host %1 found</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 hostalaria aurkitu da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connected to host %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 hostalarira elkarketaturik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connection to %1 closed</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-rako elkarketa itxita</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Host found</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostalaria aurkitu da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connected to host</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostalariari elkarketaturik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connection closed</source>
-        <translation type="unfinished"></translation>
+        <translation>Elkarketa itxita</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Proxy authentication required</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy egiaztapena beharrezkoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Authentication required</source>
-        <translation type="unfinished"></translation>
+        <translation>Egiaztapena beharrezkoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>HTTPS connection requested but SSL support not compiled in</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTPS elkarketa eskatuta baina SSL sostengua ez dago bilduta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connection refused (or timed out)</source>
-        <translation type="unfinished"></translation>
+        <translation>Elkarketa baztertuta (edo denboraz kanpo)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Proxy requires authentication</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxyak egiaztapen behar du</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Host requires authentication</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostalariak egiaztapena behar du</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Data corrupted</source>
-        <translation type="unfinished"></translation>
+        <translation>Datuak hondatuta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown protocol specified</source>
-        <translation type="unfinished"></translation>
+        <translation>Protokolo ezezaguna adierazi da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>SSL handshake failed</source>
-        <translation type="unfinished"></translation>
+        <translation>SSL eskuemate hutsegitea</translation>
     </message>
 </context>
 <context>
     <name>QHttpSocketEngine</name>
     <message>
+        <location filename="" line="363"/>
         <source>Authentication required</source>
-        <translation type="unfinished"></translation>
+        <translation>Egiaztapena beharrezkoa</translation>
     </message>
 </context>
 <context>
     <name>QIBaseDriver</name>
     <message>
+        <location filename="" line="363"/>
         <source>Error opening database</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa datubasea irekitzerakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not start transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa abiaraztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to commit transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa aurkeztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to rollback transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa ezeztatzea</translation>
     </message>
 </context>
 <context>
     <name>QIBaseResult</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to create BLOB</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa BLOB sortzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to write BLOB</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa BLOB idaztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to open BLOB</source>
-        <translation type="unfinished"></translation>
+        <translation>BLOB irekitzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to read BLOB</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa BLOB irakurtzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not find array</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da arraya aurkitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not get array data</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da array daturik lortu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not get query info</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da eskaera argibiderik lortu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not start transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da eskualdaketa hasi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to commit transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa aurkeztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not allocate statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da estamentua esleitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not prepare statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da estamentua gertatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not describe input statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da sarrera estamentua azaldu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not describe statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da estamentua azaldu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to close statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estamentua istea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to execute query</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskaera exekutatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not fetch next item</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da hurrengo gaia lortu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not get statement info</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da estamentu argibiderik lortu</translation>
     </message>
 </context>
 <context>
     <name>QIODevice</name>
     <message>
+        <location filename="" line="363"/>
         <source>Permission denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Baimena ukatuta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Too many open files</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiri gehiegi irekita</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No such file or directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez dago agiria edo zuzenbidea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No space left on device</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez da tokirik gelditzen gailuan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Akats ezezaguna</translation>
     </message>
 </context>
 <context>
     <name>QInputContext</name>
     <message>
+        <location filename="" line="363"/>
         <source>XIM</source>
-        <translation type="unfinished"></translation>
+        <translation>XIM</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>XIM input method</source>
-        <translation type="unfinished"></translation>
+        <translation>XIM sarrera metodoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Windows input method</source>
-        <translation type="unfinished"></translation>
+        <translation>Windows sarrera metodoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Mac OS X input method</source>
-        <translation type="unfinished"></translation>
+        <translation>Mac OS X sarrera metodoa</translation>
     </message>
 </context>
 <context>
     <name>QLibrary</name>
     <message>
+        <location filename="" line="363"/>
         <source>QLibrary::load_sys: Cannot load %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>QLibrary::load_sys: Ezin da gertatu %1 (%2)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>QLibrary::unload_sys: Cannot unload %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>QLibrary::unload_sys: Ezin da desgertatu %1 (%2)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>QLibrary::resolve_sys: Symbol "%1" undefined in %2 (%3)</source>
-        <translation type="unfinished"></translation>
+        <translation>QLibrary::resolve_sys: "%1" sinboloa zehaztugabe hemen %2 (%3)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not mmap '%1': %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da mmapatu '%1': %2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Plugin verification data mismatch in '%1'</source>
-        <translation type="unfinished"></translation>
+        <translation>Plugin egiaztapen datuak ez datoz bat hemen, '%1'</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not unmap '%1': %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da desmapatu '%1': %2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5]</source>
-        <translation type="unfinished"></translation>
+        <translation>'%1' pluginak Qt liburutegi bateraezina erabiltzen du. (%2.%3.%4) [%5]</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The plugin '%1' uses incompatible Qt library. Expected build key "%2", got "%3"</source>
-        <translation type="unfinished"></translation>
+        <translation>'%1' pluginak Qt liburutegi bateraezina erabiltzen du. Itxarondako eraiketa giltza "%2", lortua "%3"</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Akats ezezaguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The shared library was not found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Elkarbanatutako liburutegia ez da aurkitu.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The file '%1' is not a valid Qt plugin.</source>
-        <translation type="unfinished"></translation>
+        <translation>'%1' agiria ez da baliozko Qt plugina.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release libraries.)</source>
-        <translation type="unfinished"></translation>
+        <translation>'%1' pluginak Qt liburutegi bateraezina erabiltzen du. (Ezin dira garbiketa eta argitalpen liburutegiak nahastu.)</translation>
     </message>
 </context>
 <context>
     <name>QLineEdit</name>
     <message>
+        <location filename="" line="363"/>
         <source>&Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>&Desegin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>&Berregin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ebaki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&Kopiatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>&Itsasi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezabatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu Denak</translation>
     </message>
 </context>
 <context>
     <name>QLocalServer</name>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Name error</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Izen akatsa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Permission denied</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Baimena ukatuta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Address in use</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Helbidea erabilia da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Unknown error %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Akats ezezaguna %2</translation>
     </message>
 </context>
 <context>
     <name>QLocalSocket</name>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Connection refused</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Elkarketa baztertua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Remote closed</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Hurrunekoa itxita</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Invalid name</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Izen baliogabea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Socket access error</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Aho sarbie akatsa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Socket resource error</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Aho baliabide akatsa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Socket operation timed out</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Ahoa eragiketa epez kanpo</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Datagram too large</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Datagrama handiegia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Connection error</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Elkarketa akatsa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: The socket operation is not supported</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Aho eragiketa ez dago sostengaturik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: Unknown error %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Akats ezezaguna %2</translation>
     </message>
 </context>
 <context>
     <name>QMYSQLDriver</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to open database '</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa datubasea irekitzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa elkarketatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to begin transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa hastea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to commit transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa aurkeztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to rollback transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa ezeztatzea</translation>
     </message>
 </context>
 <context>
     <name>QMYSQLResult</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to fetch data</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa datuak lortzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to execute query</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskaera exekutatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to store result</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa emaitza biltegiratzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to prepare statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estamentua gertatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to reset statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estamentua berrezartzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to bind value</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa balioa lotzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to execute statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estametua exekutatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to bind outvalues</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa kanpo-balioak lotzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to store statement results</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estametu emaitzak biltegiratzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to execute next query</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa hurrengo eskaera exekutatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to store next result</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa hurrengo emaitza biltegiratzea</translation>
     </message>
 </context>
 <context>
     <name>QMdiArea</name>
     <message>
+        <location filename="" line="363"/>
         <source>(Untitled)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Izenburu gabea)</translation>
     </message>
 </context>
 <context>
     <name>QMdiSubWindow</name>
     <message>
+        <location filename="" line="363"/>
         <source>%1 - [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - [%2]</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Minimize</source>
-        <translation type="unfinished"></translation>
+        <translation>Txikiengotu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Restore Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Leheneratu Behera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>&Leheneratu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Move</source>
-        <translation type="unfinished"></translation>
+        <translation>&Mugitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Size</source>
-        <translation type="unfinished"></translation>
+        <translation>&Neurria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Mi&nimize</source>
-        <translation type="unfinished"></translation>
+        <translation>T&xikiengotu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Ma&ximize</source>
-        <translation type="unfinished"></translation>
+        <translation>&Handiengotu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Stay on &Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Eduki &Gainean</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Close</source>
-        <translation type="unfinished"></translation>
+        <translation>It&xi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>- [%1]</source>
-        <translation type="unfinished"></translation>
+        <translation>- [%1]</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Maximize</source>
-        <translation type="unfinished"></translation>
+        <translation>Handiengotu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unshade</source>
-        <translation type="unfinished"></translation>
+        <translation>Desitzaldu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Shade</source>
-        <translation type="unfinished"></translation>
+        <translation>Itzaldu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>Leheneratu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Laguntza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Menua</translation>
     </message>
 </context>
 <context>
     <name>QMenu</name>
     <message>
+        <location filename="" line="363"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ireki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Execute</source>
-        <translation type="unfinished"></translation>
+        <translation>Exekutatu</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
+        <location filename="" line="363"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Laguntza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Ongi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>About Qt</source>
-        <translation type="unfinished"></translation>
+        <translation>Qt-ri buruz</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source><p>This program uses Qt version %1.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Programa honek Qt %1 bertsio erabiltzen du.</p></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Show Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Erakutsi Xehetasunak...</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Hide Details...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezkutatu Xehetasunak...</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source><p>This program uses Qt Open Source Edition version %1.</p><p>Qt Open Source Edition is intended for the development of Open Source applications. You need a commercial Qt license for development of proprietary (closed source) applications.</p><p>Please see <a href="http://www.trolltech.com/company/model/">www.trolltech.com/company/model/</a> for an overview of Qt licensing.</p></source>
-        <translation type="unfinished"></translation>
+        <translation><p>Programa honek Qt Iturburu Irekia Edizioa %1 bertsioa erabiltzen du.</p><p>Qt Iturburu Irekia Edizioa Iturburu Irekiko aplikazioak garatzeko egina dago. Qt merkatal baimen bat behar duzu jabetzako (iturburu itxiko) aplikazioak garatzeko.</p><p>Mesedez ikusi <a href="http://www.trolltech.com/company/model/">www.trolltech.com/company/model/</a> Qt baimenari gainbegirada bat emateko.</p></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source><h3>About Qt</h3>%1<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is a Nokia product. See <a href="http://www.trolltech.com/qt/">www.trolltech.com/qt/&l [...]
-        <translation type="unfinished"></translation>
+        <translation><h3>Qt-ri buruz</h3>%1<p>Qt plataforma-anitzeko aplikazioen garapenerako C++ tresna-kit bat da.</p><p>Qt-k iturburu-bakarreko eramangarritasuna eskaintzen du MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, etal Unix merkatal aldaera nagusi guztien artean. Qt eskuragarri dago ere barneratutako gailuetarako Barneratutako Linux eta Windows CE-rako Qt-rekin.</p><p>Qt Nokia produktu bat da. Ikusi <a href="http://ww [...]
     </message>
 </context>
 <context>
     <name>QMultiInputContext</name>
     <message>
+        <location filename="" line="363"/>
         <source>Select IM</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu SM</translation>
     </message>
 </context>
 <context>
     <name>QMultiInputContextPlugin</name>
     <message>
+        <location filename="" line="363"/>
         <source>Multiple input method switcher</source>
-        <translation type="unfinished"></translation>
+        <translation>Sarrera anitz metodo aldagailua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Multiple input method switcher that uses the context menu of the text widgets</source>
-        <translation type="unfinished"></translation>
+        <translation>Idazki widgeten hitzingurua erabiltzen duen sarrera metodo anitz aldatzailea</translation>
     </message>
 </context>
 <context>
     <name>QNativeSocketEngine</name>
     <message>
+        <location filename="" line="363"/>
         <source>The remote host closed the connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Hurruneko hostalariak elkarketa itxi du</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Network operation timed out</source>
-        <translation type="unfinished"></translation>
+        <translation>Sare eragiketa denboraz kanpo</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Out of resources</source>
-        <translation type="unfinished"></translation>
+        <translation>Baliabide gabe</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unsupported socket operation</source>
-        <translation type="unfinished"></translation>
+        <translation>Sostegatu gabeko aho eragiketa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Protocol type not supported</source>
-        <translation type="unfinished"></translation>
+        <translation>Protokolo mota ez dago sostengaturik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid socket descriptor</source>
-        <translation type="unfinished"></translation>
+        <translation>Baliogabeko aho azaltzailea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Network unreachable</source>
-        <translation type="unfinished"></translation>
+        <translation>Sarea erdietsiezina</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Permission denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Baimena ukatuta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connection timed out</source>
-        <translation type="unfinished"></translation>
+        <translation>Elkarketa denboraz kanpo</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Connection refused</source>
-        <translation type="unfinished"></translation>
+        <translation>Elkarketa baztertuta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The bound address is already in use</source>
-        <translation type="unfinished"></translation>
+        <translation>Muga helbidea jadanik erabilia da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The address is not available</source>
-        <translation type="unfinished"></translation>
+        <translation>Helbidea ez dago eskuragarri</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The address is protected</source>
-        <translation type="unfinished"></translation>
+        <translation>Helbidea babestuta dago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to send a message</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa mezu bat bidaltzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to receive a message</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa mezu bat jasotzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to write</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa idaztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Network error</source>
-        <translation type="unfinished"></translation>
+        <translation>Sare akatsa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Another socket is already listening on the same port</source>
-        <translation type="unfinished"></translation>
+        <translation>Jadanik beste aho bat dago ataka berean aditzen</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to initialize non-blocking socket</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa blokeatze-gabeko ahoa abiaraztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to initialize broadcast socket</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa broadcast ahoa abiaraztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Attempt to use IPv6 socket on a platform with no IPv6 support</source>
-        <translation type="unfinished"></translation>
+        <translation>IPv6 ahoa erabiltzeko saiakera IPv6 sostengurik ez duen plataforma batean</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Host unreachable</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostalaria erdietsiezina</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Datagram was too large to send</source>
-        <translation type="unfinished"></translation>
+        <translation>Datagrama handiegia da bidaltzeko</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Operation on non-socket</source>
-        <translation type="unfinished"></translation>
+        <translation>Eragiketa aho-gabean</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Akats ezezaguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The proxy type is invalid for this operation</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy mota baliogabea da eragiketa honetarako</translation>
     </message>
 </context>
 <context>
     <name>QNetworkAccessFileBackend</name>
     <message>
+        <location filename="" line="363"/>
         <source>Request for opening non-local file %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez-tokiko %1 agiri irekitze eskaera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error opening %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa irekitzerakoan %1: %2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Write error writing to %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Idazketa akatsa %1-ra idazterakoan: %2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cannot open %1: Path is a directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da %1 ireki: Helburua zuzenbide bat da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Read error reading from %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Irakurketa akatsa %1-tik irakurtzerakoan: %2</translation>
     </message>
 </context>
 <context>
     <name>QNetworkAccessFtpBackend</name>
     <message>
+        <location filename="" line="363"/>
         <source>Cannot open %1: is a directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da %1 ireki: zuzenbide bat da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Logging in to %1 failed: authentication required</source>
-        <translation type="unfinished"></translation>
+        <translation>Saio haste hutsegitea %1: egiaztapena beharrezkoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error while downloading %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa %1 jeisketerakoan: %2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error while uploading %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa %1 igotzerakoan: %2</translation>
     </message>
 </context>
 <context>
     <name>QNetworkReply</name>
     <message>
+        <location filename="" line="363"/>
         <source>Error downloading %1 - server replied: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa %1 jeisterakoan- zerbitzariaren erantzuna: %2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Protocol "%1" is unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>"%1" protokoloa ezezaguna da</translation>
     </message>
 </context>
 <context>
     <name>QNetworkReplyImpl</name>
     <message>
+        <location filename="" line="363"/>
         <source>Operation canceled</source>
-        <translation type="unfinished"></translation>
+        <translation>Eragiketa ezeztatuta</translation>
     </message>
 </context>
 <context>
     <name>QOCIDriver</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to logon</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa saioa hastea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to initialize</source>
         <comment>QOCIDriver</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa abiaraztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to begin transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa hastea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to commit transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa aurkeztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to rollback transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa ezeztatzea</translation>
     </message>
 </context>
 <context>
     <name>QOCIResult</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to bind column for batch execute</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa zutabea lotzea multzo exekuziorako</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to execute batch statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa multzo estamentua exekutatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to goto next</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa hurrengora joatea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to alloc statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estamentua esleitzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to prepare statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estametua gertatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to bind value</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa balioa lotzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to execute select statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa hautaturiko estametua exekutatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to execute statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estametua exekutatzea</translation>
     </message>
 </context>
 <context>
     <name>QODBCDriver</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa elkarketatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to connect - Driver doesn't support all needed functionality</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa elkarketatzea - Gidatzaileak ez ditu beharrezko eginkizun guztiak sostengatzen</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to disable autocommit</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa berez-aurkeztea ezgaitzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to commit transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa aurkeztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to rollback transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa ezeztatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to enable autocommit</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa berez-aurkeztea gaitzea</translation>
     </message>
 </context>
 <context>
     <name>QODBCResult</name>
     <message>
+        <location filename="" line="363"/>
         <source>QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement attribute. Please check your ODBC driver configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>QODBCResult::reset: Ezinezkoa 'SQL_CURSOR_STATIC' estamentu ezaugarri bezala ezartzea. Mesedez egiaztatu zure ODBC gidagailu itxurapena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to execute statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estamentua exekutatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to fetch next</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa hurrengoa lortzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to prepare statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estametua gertatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to bind variable</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa aldaera lotzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to fetch last</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa azkena lortzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to fetch</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa lortzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to fetch first</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa lehena lortzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to fetch previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa aurrekoa lortzea</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
+        <location filename="" line="363"/>
         <source>Operation not supported on %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Eragiketa ez dago sostengaturik %1-ean</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid URI: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>URI baliogabea: %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Write error writing to %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Idazketa akatsa %1-ra idazterakoan: %2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Read error reading from %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Irakurketa akatsa %1-tik irakurtzerakoan: %2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Socket error on %1: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Socket akatsa %1:%2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Remote host closed the connection prematurely on %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Hurruneko hostalariak elkarketa goizegi itxi du %1-ean</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Protocol error: packet of size 0 received</source>
-        <translation type="unfinished"></translation>
+        <translation>Protokolo akatsa: 0 neurriko paketea jaso da</translation>
     </message>
 </context>
 <context>
     <name>QPPDOptionsModel</name>
     <message>
+        <location filename="" line="363"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Izena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Balioa</translation>
     </message>
 </context>
 <context>
     <name>QPSQLDriver</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa elkarketatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not begin transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa hasi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not commit transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa aurkeztu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Could not rollback transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin izan da eskualdaketa ezeztatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to subscribe</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinekoa harpidetzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to unsubscribe</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa harpidetza etetea</translation>
     </message>
 </context>
 <context>
     <name>QPSQLResult</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to create query</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskaera sortzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to prepare statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estamentua gertatzea</translation>
     </message>
 </context>
 <context>
     <name>QPageSetupWidget</name>
     <message>
+        <location filename="" line="363"/>
         <source>Centimeters (cm)</source>
-        <translation type="unfinished"></translation>
+        <translation>Metroehunen (me)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Millimeters (mm)</source>
-        <translation type="unfinished"></translation>
+        <translation>Metromilaenak (mm)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Inches (in)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hatzbeteak (hb)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Points (pt)</source>
-        <translation type="unfinished"></translation>
+        <translation>Puntoak (pt)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Forma</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Paper</source>
-        <translation type="unfinished"></translation>
+        <translation>Papera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialde neurria:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zabalera:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Height:</source>
-        <translation type="unfinished"></translation>
+        <translation>Garaiera:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Paper source:</source>
-        <translation type="unfinished"></translation>
+        <translation>Paper iturburua:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Orientation</source>
-        <translation type="unfinished"></translation>
+        <translation>Norabidea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Portrait</source>
-        <translation type="unfinished"></translation>
+        <translation>Argazkia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Landscape</source>
-        <translation type="unfinished"></translation>
+        <translation>Landargazkia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Reverse landscape</source>
-        <translation type="unfinished"></translation>
+        <translation>Alderantzizkatu landargazkia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Reverse portrait</source>
-        <translation type="unfinished"></translation>
+        <translation>Alderantzizkatu argazkia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Margins</source>
-        <translation type="unfinished"></translation>
+        <translation>Bazterrak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>top margin</source>
-        <translation type="unfinished"></translation>
+        <translation>goio bazterra</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>left margin</source>
-        <translation type="unfinished"></translation>
+        <translation>ezker bazterra</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>right margin</source>
-        <translation type="unfinished"></translation>
+        <translation>eskuin bazterra</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>bottom margin</source>
-        <translation type="unfinished"></translation>
+        <translation>beheko bazterra</translation>
     </message>
 </context>
 <context>
     <name>QPluginLoader</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown error</source>
-        <translation type="unfinished"></translation>
+        <translation>Akats ezezaguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The plugin was not loaded.</source>
-        <translation type="unfinished"></translation>
+        <translation>Plugina ez da gertatu.</translation>
     </message>
 </context>
 <context>
     <name>QPrintDialog</name>
     <message>
+        <location filename="" line="363"/>
         <source>locally connected</source>
-        <translation type="unfinished"></translation>
+        <translation>tokian elkarketaturik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Aliases: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Izenordea: %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>ezezaguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Print To File ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Irarkitu Agirira...</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>File %1 is not writable.
 Please choose a different file name.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 agiria ez da idazgarria.
+Mesedez hautatu agiri izen ezberdin bat.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 already exists.
 Do you want to overwrite it?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 badago jadanik..
+Gainidaztea nahi duzu?</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is a directory.
 Please choose a different file name.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 zuzenbide bat da.
+Mesedez hautatu agiri izen ezberdin bat.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A0</source>
-        <translation type="unfinished"></translation>
+        <translation>A0</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A1</source>
-        <translation type="unfinished"></translation>
+        <translation>A1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A2</source>
-        <translation type="unfinished"></translation>
+        <translation>A2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A3</source>
-        <translation type="unfinished"></translation>
+        <translation>A3</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A4</source>
-        <translation type="unfinished"></translation>
+        <translation>A4</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A5</source>
-        <translation type="unfinished"></translation>
+        <translation>A5</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A6</source>
-        <translation type="unfinished"></translation>
+        <translation>A6</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A7</source>
-        <translation type="unfinished"></translation>
+        <translation>A7</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A8</source>
-        <translation type="unfinished"></translation>
+        <translation>A8</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A9</source>
-        <translation type="unfinished"></translation>
+        <translation>A9</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>B0</source>
-        <translation type="unfinished"></translation>
+        <translation>B0</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>B1</source>
-        <translation type="unfinished"></translation>
+        <translation>B1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>B2</source>
-        <translation type="unfinished"></translation>
+        <translation>B2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>B3</source>
-        <translation type="unfinished"></translation>
+        <translation>B3</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>B4</source>
-        <translation type="unfinished"></translation>
+        <translation>B4</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>B5</source>
-        <translation type="unfinished"></translation>
+        <translation>B5</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>B6</source>
-        <translation type="unfinished"></translation>
+        <translation>B6</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>B7</source>
-        <translation type="unfinished"></translation>
+        <translation>B7</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>B8</source>
-        <translation type="unfinished"></translation>
+        <translation>B8</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>B9</source>
-        <translation type="unfinished"></translation>
+        <translation>B9</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>B10</source>
-        <translation type="unfinished"></translation>
+        <translation>B10</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>C5E</source>
-        <translation type="unfinished"></translation>
+        <translation>C5E</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>DLE</source>
-        <translation type="unfinished"></translation>
+        <translation>DLE</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Executive</source>
-        <translation type="unfinished"></translation>
+        <translation>Exekutiboa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Folio</source>
-        <translation type="unfinished"></translation>
+        <translation>Orria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Ledger</source>
-        <translation type="unfinished"></translation>
+        <translation>Salerosketa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Legal</source>
-        <translation type="unfinished"></translation>
+        <translation>Legezkoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Letter</source>
-        <translation type="unfinished"></translation>
+        <translation>Gutuna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Tabloid</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabloidea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>US Common #10 Envelope</source>
-        <translation type="unfinished"></translation>
+        <translation>AEB Arrunta #10 Gutuna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Custom</source>
-        <translation type="unfinished"></translation>
+        <translation>Norberea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Options >></source>
-        <translation type="unfinished"></translation>
+        <translation>A&ukerak >></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Print</source>
-        <translation type="unfinished"></translation>
+        <translation>&Irarkitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Options <<</source>
-        <translation type="unfinished"></translation>
+        <translation>A&ukerak <<</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Print to File (PDF)</source>
-        <translation type="unfinished"></translation>
+        <translation>Irarkitu Agirira (PDF)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Print to File (Postscript)</source>
-        <translation type="unfinished"></translation>
+        <translation>Irarkitu Agirira (Postscript)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Local file</source>
-        <translation type="unfinished"></translation>
+        <translation>Tokiko agiria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Write %1 file</source>
-        <translation type="unfinished"></translation>
+        <translation>Idatzi %1 agiria</translation>
     </message>
 </context>
 <context>
     <name>QPrintPreviewDialog</name>
     <message>
+        <location filename="" line="363"/>
         <source>Page Setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialde Ezarpena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Print Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Irarketa Aurreikuspena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Next page</source>
-        <translation type="unfinished"></translation>
+        <translation>Hurrengo orrialdea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Previous page</source>
-        <translation type="unfinished"></translation>
+        <translation>Aurreko orrialdea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>First page</source>
-        <translation type="unfinished"></translation>
+        <translation>Lehen orrialdea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Last page</source>
-        <translation type="unfinished"></translation>
+        <translation>Azken orrialdea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Fit width</source>
-        <translation type="unfinished"></translation>
+        <translation>Finkatu zabalera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Fit page</source>
-        <translation type="unfinished"></translation>
+        <translation>Finkatu orrialdea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Zoom in</source>
-        <translation type="unfinished"></translation>
+        <translation>Zooma gehitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Zoom out</source>
-        <translation type="unfinished"></translation>
+        <translation>Zooma gutxitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Portrait</source>
-        <translation type="unfinished"></translation>
+        <translation>Argazkia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Landscape</source>
-        <translation type="unfinished"></translation>
+        <translation>Landargazkia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Show single page</source>
-        <translation type="unfinished"></translation>
+        <translation>Erakutsi orrialde bakarra</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Show facing pages</source>
-        <translation type="unfinished"></translation>
+        <translation>Erautsi alderantzizko orrialdeak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Show overview of all pages</source>
-        <translation type="unfinished"></translation>
+        <translation>Erakutsi orrialde guztien gainikuspena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Print</source>
-        <translation type="unfinished"></translation>
+        <translation>Irarkitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialde ezarpena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxi</translation>
     </message>
 </context>
 <context>
     <name>QPrintPropertiesWidget</name>
     <message>
+        <location filename="" line="363"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Forma</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialdea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Aurreratua</translation>
     </message>
 </context>
 <context>
     <name>QPrintSettingsOutput</name>
     <message>
+        <location filename="" line="363"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Forma</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Copies</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Print range</source>
-        <translation type="unfinished"></translation>
+        <translation>Irarketa maila</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Print all</source>
-        <translation type="unfinished"></translation>
+        <translation>Irarkitu denak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Pages from</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialdeen forma</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>to</source>
-        <translation type="unfinished"></translation>
+        <translation>hona</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautapena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Output Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Irteera Ezarpenak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Copies:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiak:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Collate</source>
-        <translation type="unfinished"></translation>
+        <translation>Alderatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Reverse</source>
-        <translation type="unfinished"></translation>
+        <translation>Alderantzizkoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Aukerak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Color Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Margo Modua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Margoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Grayscale</source>
-        <translation type="unfinished"></translation>
+        <translation>Urdinabar-neurria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Duplex Printing</source>
-        <translation type="unfinished"></translation>
+        <translation>Irarketa Bikoitza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezer ez</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Long side</source>
-        <translation type="unfinished"></translation>
+        <translation>Alde luzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Short side</source>
-        <translation type="unfinished"></translation>
+        <translation>Alde laburra</translation>
     </message>
 </context>
 <context>
     <name>QPrintWidget</name>
     <message>
+        <location filename="" line="363"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Forma</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Printer</source>
-        <translation type="unfinished"></translation>
+        <translation>Irarkailua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&Izena:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>P&roperties</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ezaugarriak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kokalekua:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Aurreikuspena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mota:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Output &file:</source>
-        <translation type="unfinished"></translation>
+        <translation>Irteera &Agiria:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
 </context>
 <context>
     <name>QProgressDialog</name>
     <message>
+        <location filename="" line="363"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezeztatu</translation>
     </message>
 </context>
 <context>
     <name>QPushButton</name>
     <message>
+        <location filename="" line="363"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ireki</translation>
     </message>
 </context>
 <context>
     <name>QRadioButton</name>
     <message>
+        <location filename="" line="363"/>
         <source>Check</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu</translation>
     </message>
 </context>
 <context>
     <name>QRegExp</name>
     <message>
+        <location filename="" line="363"/>
         <source>no error occurred</source>
-        <translation type="unfinished"></translation>
+        <translation>ez da akatsik gertatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>disabled feature used</source>
-        <translation type="unfinished"></translation>
+        <translation>erabilitako ezaugarria ezgaituta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>bad char class syntax</source>
-        <translation type="unfinished"></translation>
+        <translation>hizki class joskera gaitza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>bad lookahead syntax</source>
-        <translation type="unfinished"></translation>
+        <translation>aurrerabegira joskera gaitza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>bad repetition syntax</source>
-        <translation type="unfinished"></translation>
+        <translation>errepikapen joskera gaitza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>invalid octal value</source>
-        <translation type="unfinished"></translation>
+        <translation>Octal balio baliogabea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>missing left delim</source>
-        <translation type="unfinished"></translation>
+        <translation>ezker muga ez dago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>unexpected end</source>
-        <translation type="unfinished"></translation>
+        <translation>ustekabeko amaiera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>met internal limit</source>
-        <translation type="unfinished"></translation>
+        <translation>met barne muga</translation>
     </message>
 </context>
 <context>
     <name>QSQLite2Driver</name>
     <message>
+        <location filename="" line="363"/>
         <source>Error to open database</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa datubasea irekitzerakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to begin transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa hastea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to commit transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa aurkeztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to rollback Transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa Eskualdaketa ezeztatzea</translation>
     </message>
 </context>
 <context>
     <name>QSQLite2Result</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to fetch results</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa emaitzak lortzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to execute statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estamentua exekutatzea</translation>
     </message>
 </context>
 <context>
     <name>QSQLiteDriver</name>
     <message>
+        <location filename="" line="363"/>
         <source>Error opening database</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa datubasea irekitzerakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error closing database</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa datubasea isterakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to begin transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa hastea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to commit transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa aurkeztea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to rollback transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa eskualdaketa ezeztatzea</translation>
     </message>
 </context>
 <context>
     <name>QSQLiteResult</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to fetch row</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa lerroa lortzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to execute statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estamentua exekutatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to reset statement</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa estamentua berrezartzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to bind parameters</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa parametroak lotzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Parameter count mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>Parametro zenbatekoa ez dator bat</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No query</source>
-        <translation type="unfinished"></translation>
+        <translation>Eskaerarik ez</translation>
     </message>
 </context>
 <context>
     <name>QScrollBar</name>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll here</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu hemen</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Left edge</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezker hertza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Goia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Right edge</source>
-        <translation type="unfinished"></translation>
+        <translation>Eskuin hertza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Behea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page left</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialde ezkerra</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page up</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialde goia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page right</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialde eskuina</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page down</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialde behea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll left</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu ezkerrera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll up</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu gora</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll right</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu eskuinera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll down</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu behera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Line up</source>
-        <translation type="unfinished"></translation>
+        <translation>Lerroan gora</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Position</source>
-        <translation type="unfinished"></translation>
+        <translation>Kokapena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Line down</source>
-        <translation type="unfinished"></translation>
+        <translation>Lerroan behera</translation>
     </message>
 </context>
 <context>
     <name>QSharedMemory</name>
     <message>
+        <location filename="" line="363"/>
         <source>%1: unable to set key on lock</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: ezinezkoa giltza ezartzea blokeatzean</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: create size is less then 0</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: sortu neurria 0 baino gutxiago da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: unable to lock</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: ezinezkoa blokeatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: unable to unlock</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: ezinezkoa desblokeatzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: permission denied</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: baimena ukatuta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: already exists</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: badago jadanik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: doesn't exists</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: ez dago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: out of resources</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: baliabide gabe</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: unknown error %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: akats ezezaguna %2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: key is empty</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: giltza hutsik dago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: unix key file doesn't exists</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: unix giltza agiria ez dago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: ftok failed</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: ftok hutsegitea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: unable to make key</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: ezinezkoa giltza egitea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: system-imposed size restrictions</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: sistemak-ezarritako neurri murrizketak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1: not attached</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: erantsi gabe</translation>
     </message>
 </context>
 <context>
     <name>QShortcut</name>
     <message>
+        <location filename="" line="363"/>
         <source>Space</source>
-        <translation type="unfinished"></translation>
+        <translation>Tartea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Esc</source>
-        <translation type="unfinished"></translation>
+        <translation>Irten</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Tab</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Backtab</source>
-        <translation type="unfinished"></translation>
+        <translation>Tab Atzera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Backspace</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezabatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Return</source>
-        <translation type="unfinished"></translation>
+        <translation>Sartu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Enter</source>
-        <translation type="unfinished"></translation>
+        <translation>Sartu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Ins</source>
-        <translation type="unfinished"></translation>
+        <translation>Txert</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Del</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezab</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Pause</source>
-        <translation type="unfinished"></translation>
+        <translation>Pausatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Print</source>
-        <translation type="unfinished"></translation>
+        <translation>Irarkitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>SysReq</source>
-        <translation type="unfinished"></translation>
+        <translation>Sis-Eskab</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Home</source>
-        <translation type="unfinished"></translation>
+        <translation>Hasiera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>End</source>
-        <translation type="unfinished"></translation>
+        <translation>Amaiera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezker</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Gora</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Eskuin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Behera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>PgUp</source>
-        <translation type="unfinished"></translation>
+        <translation>OrrGora</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>PgDown</source>
-        <translation type="unfinished"></translation>
+        <translation>OrrBehera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>CapsLock</source>
-        <translation type="unfinished"></translation>
+        <translation>LarriBlok</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>NumLock</source>
-        <translation type="unfinished"></translation>
+        <translation>ZenbBlok</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>ScrollLock</source>
-        <translation type="unfinished"></translation>
+        <translation>IrriskBlok</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Menua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Laguntza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Back</source>
-        <translation type="unfinished"></translation>
+        <translation>Atzera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Aurrera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Gelditu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Refresh</source>
-        <translation type="unfinished"></translation>
+        <translation>Berritu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Volume Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Jeitsi  Bolumena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Volume Mute</source>
-        <translation type="unfinished"></translation>
+        <translation>Mututu Bolumena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Volume Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Igo Bolumena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Bass Boost</source>
-        <translation type="unfinished"></translation>
+        <translation>Behe Bultzada</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Bass Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Hotslodi Gorapena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Bass Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Hotslodi Beherapena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Treble Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Hotsmehe Gorapena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Treble Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Hotsmehe Gorapena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Media Play</source>
-        <translation type="unfinished"></translation>
+        <translation>Multimedia Irakurri</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Media Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Multimedia Gelditu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Media Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Multimedia Aurrekoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Media Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Multimedia Hurrengoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Media Record</source>
-        <translation type="unfinished"></translation>
+        <translation>Multimedia Grabatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Favorites</source>
-        <translation type="unfinished"></translation>
+        <translation>Gogokoenak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Standby</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxaroten</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Open URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Ireki URL-a</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi Post@</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch Media</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi Multimedia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (0)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (0)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (1)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (2)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (3)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (3)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (4)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (4)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (5)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (5)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (6)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (6)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (7)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (7)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (8)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (8)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (9)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (9)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (A)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (A)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (B)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (B)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (C)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (C)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (D)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (D)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (E)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (E)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Launch (F)</source>
-        <translation type="unfinished"></translation>
+        <translation>Abiarazi (F)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Print Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Irark Ikusleihoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Orriald Gora</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Orriald Behera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Caps Lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Larri Blok</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Num Lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Zenb Blok</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Number Lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Zenbaki Blokeoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll Lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristari Blokeoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Insert</source>
-        <translation type="unfinished"></translation>
+        <translation>Txertatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezabatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Escape</source>
-        <translation type="unfinished"></translation>
+        <translation>Irten</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>System Request</source>
-        <translation type="unfinished"></translation>
+        <translation>Sistema Eskabidea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Select</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Bai</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Context1</source>
-        <translation type="unfinished"></translation>
+        <translation>Hitzingurua1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Context2</source>
-        <translation type="unfinished"></translation>
+        <translation>Hitzingurua2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Context3</source>
-        <translation type="unfinished"></translation>
+        <translation>Hitzingurua3</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Context4</source>
-        <translation type="unfinished"></translation>
+        <translation>Hitzingurua4</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Call</source>
-        <translation type="unfinished"></translation>
+        <translation>Deitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Hangup</source>
-        <translation type="unfinished"></translation>
+        <translation>Eskegi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Flip</source>
-        <translation type="unfinished"></translation>
+        <translation>Itzulikatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation>Ktrl</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Alt</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Meta</source>
-        <translation type="unfinished"></translation>
+        <translation>Meta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>+</source>
-        <translation type="unfinished"></translation>
+        <translation>+</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>F%1</source>
-        <translation type="unfinished"></translation>
+        <translation>F%1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Home Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Hasiera Orrialdea</translation>
     </message>
 </context>
 <context>
     <name>QSlider</name>
     <message>
+        <location filename="" line="363"/>
         <source>Page left</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialdean ezkerrera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page up</source>
-        <translation type="unfinished"></translation>
+        <translation>Orraialdean gora</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Position</source>
-        <translation type="unfinished"></translation>
+        <translation>Kokapena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page right</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialdean eskuinera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page down</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialdean behera</translation>
     </message>
 </context>
 <context>
     <name>QSocks5SocketEngine</name>
     <message>
+        <location filename="" line="363"/>
         <source>Socks5 timeout error connecting to socks server</source>
-        <translation type="unfinished"></translation>
+        <translation>Socks5 epemuga akatsa sock zerbitzariarekin elkarketatzean</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Network operation timed out</source>
-        <translation type="unfinished"></translation>
+        <translation>Sare eragiketa denboraz kanpo</translation>
     </message>
 </context>
 <context>
     <name>QSpinBox</name>
     <message>
+        <location filename="" line="363"/>
         <source>More</source>
-        <translation type="unfinished"></translation>
+        <translation>Gehiago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Less</source>
-        <translation type="unfinished"></translation>
+        <translation>Gutxiago</translation>
     </message>
 </context>
 <context>
     <name>QSql</name>
     <message>
+        <location filename="" line="363"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezabatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Delete this record?</source>
-        <translation type="unfinished"></translation>
+        <translation>Grabaketa hau ezabatu?</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Bai</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Insert</source>
-        <translation type="unfinished"></translation>
+        <translation>Txertatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Eguneratu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Save edits?</source>
-        <translation type="unfinished"></translation>
+        <translation>Editatua gorde?</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezeztatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Confirm</source>
-        <translation type="unfinished"></translation>
+        <translation>Baieztatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cancel your edits?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezeztatu edizioak?</translation>
     </message>
 </context>
 <context>
     <name>QSslSocket</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to write data: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa datuak idaztea: %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error while reading: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Akats irakurtzerakoan: %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error during SSL handshake: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa SSL esmuematerakoan: %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error creating SSL context (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa SSL hitzingurua sortzerakoan (%1)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid or empty cipher list (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Zifra zerrenda baliogabea edo hutsik (%1)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error creating SSL session, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa SSL saioa sortzerakoan, %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error creating SSL session: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa SSL saioa sortzerakoan, %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cannot provide a certificate with no key, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da egiaztagiri bat eman giltza gabe, %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error loading local certificate, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa tokiko egiaztagiria gertatzekoran, %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Error loading private key, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa giltza pribatua gertatzerakoan, %1</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Private key does not certificate public key, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Giltza pribatua ez da giltza publiko egiaztagiritua, %1</translation>
     </message>
 </context>
 <context>
     <name>QTDSDriver</name>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to open connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa elkarketa irekitzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unable to use database</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa datubasea erabiltzea</translation>
     </message>
 </context>
 <context>
     <name>QTabBar</name>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu Ezkerrera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu Eskuinera</translation>
     </message>
 </context>
 <context>
     <name>QTextControl</name>
     <message>
+        <location filename="" line="363"/>
         <source>&Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>&Desegin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>&Berregin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cu&t</source>
-        <translation type="unfinished"></translation>
+        <translation>&Ebaki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&Kopiatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Copy &Link Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiatu &Lotura Helbidea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>&Itsatsi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezabatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu Dena</translation>
     </message>
 </context>
 <context>
     <name>QToolButton</name>
     <message>
+        <location filename="" line="363"/>
         <source>Press</source>
-        <translation type="unfinished"></translation>
+        <translation>Sakatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Ireki</translation>
     </message>
 </context>
 <context>
     <name>QUdpSocket</name>
     <message>
+        <location filename="" line="363"/>
         <source>This platform does not support IPv6</source>
-        <translation type="unfinished"></translation>
+        <translation>Plataforma honek ez du IPv6 sostengatzen</translation>
     </message>
 </context>
 <context>
     <name>QUndoGroup</name>
     <message>
+        <location filename="" line="363"/>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>Desegin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>Berregin</translation>
     </message>
 </context>
 <context>
     <name>QUndoModel</name>
     <message>
+        <location filename="" line="363"/>
         <source><empty></source>
-        <translation type="unfinished"></translation>
+        <translation><hutsik></translation>
     </message>
 </context>
 <context>
     <name>QUndoStack</name>
     <message>
+        <location filename="" line="363"/>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>Desegin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>Berregin</translation>
     </message>
 </context>
 <context>
     <name>QUnicodeControlCharacterMenu</name>
     <message>
+        <location filename="" line="363"/>
         <source>LRM Left-to-right mark</source>
-        <translation type="unfinished"></translation>
+        <translation>EZES Ezkerretik-eskuinerako marka</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>RLM Right-to-left mark</source>
-        <translation type="unfinished"></translation>
+        <translation>ESEZ Eskuinetik-ezkerrerako marka</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>ZWJ Zero width joiner</source>
-        <translation type="unfinished"></translation>
+        <translation>ZWJ Huts zabalera bateratzailea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>ZWNJ Zero width non-joiner</source>
-        <translation type="unfinished"></translation>
+        <translation>ZWNJ Huts zabalera ez-bateratzailea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>ZWSP Zero width space</source>
-        <translation type="unfinished"></translation>
+        <translation>ZZTR Zero zabaleera tartea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>LRE Start of left-to-right embedding</source>
-        <translation type="unfinished"></translation>
+        <translation>EZESB Hasi ezker-eskuin barneratuz</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>RLE Start of right-to-left embedding</source>
-        <translation type="unfinished"></translation>
+        <translation>ESEZB Hasi eskuin-ezker- barneratuz</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>LRO Start of left-to-right override</source>
-        <translation type="unfinished"></translation>
+        <translation>EZESE Hasi ezker-eskuin ezeztatuz</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>RLO Start of right-to-left override</source>
-        <translation type="unfinished"></translation>
+        <translation>ESEZE Hasi eskuin-ezker ezeztatuz</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>PDF Pop directional formatting</source>
-        <translation type="unfinished"></translation>
+        <translation>PDF Pop direkzional fomatoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Insert Unicode control character</source>
-        <translation type="unfinished"></translation>
+        <translation>Txertatu Unicode aginte hizkia</translation>
     </message>
 </context>
 <context>
     <name>QWebFrame</name>
     <message>
+        <location filename="" line="363"/>
         <source>Request cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation>Eskabidea ezeztaturik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Request blocked</source>
-        <translation type="unfinished"></translation>
+        <translation>Eskabidea bloketaturik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cannot show URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa URL-a erakustea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Frame load interruped by policy change</source>
-        <translation type="unfinished"></translation>
+        <translation>Frame gertaketa etenda araudi aldaketagaitik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cannot show mimetype</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa mimemota erakustea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>File does not exist</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiria ez dago</translation>
     </message>
 </context>
 <context>
     <name>QWebPage</name>
     <message>
+        <location filename="" line="363"/>
         <source>Bad HTTP request</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTP eskaera gaitza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Submit</source>
         <comment>default label for Submit buttons in forms on web pages</comment>
-        <translation type="unfinished"></translation>
+        <translation>Aurkeztu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Submit</source>
         <comment>Submit (input element) alt text for <input> elements with no alt, title, or value</comment>
-        <translation type="unfinished"></translation>
+        <translation>Aurkeztu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Reset</source>
         <comment>default label for Reset buttons in forms on web pages</comment>
-        <translation type="unfinished"></translation>
+        <translation>Berrezarri</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>This is a searchable index. Enter search keywords: </source>
         <comment>text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index'</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hau bilaketa aurkibide bat da. Sartu bilaketa hitzak: </translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Choose File</source>
         <comment>title for file button used in HTML forms</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hautatu Agiria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No file selected</source>
         <comment>text to display in file button used in HTML forms when no file is selected</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ez da agiririk hautatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Open in New Window</source>
         <comment>Open in New Window context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ireki Leiho Berrian</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Save Link...</source>
         <comment>Download Linked File context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Gorde Lotura...</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Copy Link</source>
         <comment>Copy Link context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Kopiatu Lotura</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Open Image</source>
         <comment>Open Image in New Window context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ireki Irudia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Save Image</source>
         <comment>Download Image context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Gorde Irudia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Copy Image</source>
         <comment>Copy Link context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Kopiatu Irudia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Open Frame</source>
         <comment>Open Frame in New Window context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ireki Framea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Copy</source>
         <comment>Copy context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Kopiatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Go Back</source>
         <comment>Back context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Joan Atzera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Go Forward</source>
         <comment>Forward context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Joan Aurrera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Stop</source>
         <comment>Stop context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Gelditu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Reload</source>
         <comment>Reload context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Birgertatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cut</source>
         <comment>Cut context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ebaki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Paste</source>
         <comment>Paste context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Itsatsi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No Guesses Found</source>
         <comment>No Guesses Found context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ez da Gonbidaturik Aurkitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Ignore</source>
         <comment>Ignore Spelling context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ezikusi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Add To Dictionary</source>
         <comment>Learn Spelling context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Gehitu Hiztegira</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Search The Web</source>
         <comment>Search The Web context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Bilatu Webean</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Look Up In Dictionary</source>
         <comment>Look Up in Dictionary context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Begiratu Hiztegian</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Open Link</source>
         <comment>Open Link context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ireki Lotura</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Ignore</source>
         <comment>Ignore Grammar context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ezikusi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Spelling</source>
         <comment>Spelling and Grammar context sub-menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Egiaztapena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Show Spelling and Grammar</source>
         <comment>menu item title</comment>
-        <translation type="unfinished"></translation>
+        <translation>Erakutsi Egiaztapena eta Idazkera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Hide Spelling and Grammar</source>
         <comment>menu item title</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ezkutatu Egiaztapena eta Idazkera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Check Spelling</source>
         <comment>Check spelling context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Idaz Egiaztapena</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Check Spelling While Typing</source>
         <comment>Check spelling while typing context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Egiaztatu idazkera Idazterakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Check Grammar With Spelling</source>
         <comment>Check grammar with spelling context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Egiaztatu Idazkera Egiaztatzailearekin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Fonts</source>
         <comment>Font context sub-menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Hizkiak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Bold</source>
         <comment>Bold context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Lodi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Italic</source>
         <comment>Italic context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Etzana</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Underline</source>
         <comment>Underline context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Azpimarratuta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Outline</source>
         <comment>Outline context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ingurua</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Direction</source>
         <comment>Writing direction context sub-menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Norabidea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Default</source>
         <comment>Default writing direction context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Berezkoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>LTR</source>
         <comment>Left to Right context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>ESEZ</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>RTL</source>
         <comment>Right to Left context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>EZES</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Inspect</source>
         <comment>Inspect Element context menu item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ikertu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No recent searches</source>
         <comment>Label for only item in menu that appears when clicking on the search field image, when no searches have been performed</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ez dago bilaketa berririk</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Recent searches</source>
         <comment>label for first item in the menu that appears when clicking on the search field image, used as embedded menu title</comment>
-        <translation type="unfinished"></translation>
+        <translation>Bilaketa berriak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Clear recent searches</source>
         <comment>menu item in Recent Searches menu that empties menu's contents</comment>
-        <translation type="unfinished"></translation>
+        <translation>Garbitu bilaketa berriak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unknown</source>
         <comment>Unknown filesize FTP directory listing item</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ezezaguna</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 (%2x%3 pixels)</source>
         <comment>Title string for images</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 (%2x%3 pixel)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Web Inspector - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Web Ikerlea: %2</translation>
     </message>
 </context>
 <context>
     <name>QWhatsThisAction</name>
     <message>
+        <location filename="" line="363"/>
         <source>What's This?</source>
-        <translation type="unfinished"></translation>
+        <translation>Zer da Hau?</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
+        <location filename="" line="363"/>
         <source>*</source>
-        <translation type="unfinished"></translation>
+        <translation>*</translation>
     </message>
 </context>
 <context>
     <name>QWizard</name>
     <message>
+        <location filename="" line="363"/>
         <source>Go Back</source>
-        <translation type="unfinished"></translation>
+        <translation>Joan Atzera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation>Jarraitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Commit</source>
-        <translation type="unfinished"></translation>
+        <translation>Aurkeztu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Done</source>
-        <translation type="unfinished"></translation>
+        <translation>Eginda</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>Utzi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Laguntza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>< &Back</source>
-        <translation type="unfinished"></translation>
+        <translation>< &Atzera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Finish</source>
-        <translation type="unfinished"></translation>
+        <translation>A&maitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezeztatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&Laguntza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Next</source>
-        <translation type="unfinished"></translation>
+        <translation>&Hurrengoa</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Next ></source>
-        <translation type="unfinished"></translation>
+        <translation>&Hurrengoa ></translation>
     </message>
 </context>
 <context>
     <name>QWorkspace</name>
     <message>
+        <location filename="" line="363"/>
         <source>&Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>&Leheneratu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Move</source>
-        <translation type="unfinished"></translation>
+        <translation>&Mugitu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Size</source>
-        <translation type="unfinished"></translation>
+        <translation>&Neurria</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Mi&nimize</source>
-        <translation type="unfinished"></translation>
+        <translation>T&xikiengotu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Ma&ximize</source>
-        <translation type="unfinished"></translation>
+        <translation>&Handiengotu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Close</source>
-        <translation type="unfinished"></translation>
+        <translation>It&xi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Stay on &Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Eduki &Gainean</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Sh&ade</source>
-        <translation type="unfinished"></translation>
+        <translation>&Itzala</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 - [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - [%2]</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Minimize</source>
-        <translation type="unfinished"></translation>
+        <translation>Txikiengotu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Restore Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Leheneratu Behera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxi</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>&Unshade</source>
-        <translation type="unfinished"></translation>
+        <translation>It&zalgabe</translation>
     </message>
 </context>
 <context>
     <name>QXml</name>
     <message>
+        <location filename="" line="363"/>
         <source>no error occurred</source>
-        <translation type="unfinished"></translation>
+        <translation>ez da akatsik gertatu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>error triggered by consumer</source>
-        <translation type="unfinished"></translation>
+        <translation>akatsa kontsumitzaileak eragina</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>unexpected end of file</source>
-        <translation type="unfinished"></translation>
+        <translation>ustekabeko agiri amaiera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>more than one document type definition</source>
-        <translation type="unfinished"></translation>
+        <translation>agiri mota azalpen bat baino gehiago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>error occurred while parsing element</source>
-        <translation type="unfinished"></translation>
+        <translation>akatsa gertatu da gaia aztertzerakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>tag mismatch</source>
-        <translation type="unfinished"></translation>
+        <translation>etiketa ez dator bat</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>error occurred while parsing content</source>
-        <translation type="unfinished"></translation>
+        <translation>akatsa gertatu da edukia aztertzerakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>unexpected character</source>
-        <translation type="unfinished"></translation>
+        <translation>ustekabeko hizkia</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>invalid name for processing instruction</source>
-        <translation type="unfinished"></translation>
+        <translation>izen baliogabea agindua prozesatzeko</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>version expected while reading the XML declaration</source>
-        <translation type="unfinished"></translation>
+        <translation>itxarondako bertsioa XML adierazpena irakurtzerakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>wrong value for standalone declaration</source>
-        <translation type="unfinished"></translation>
+        <translation>balio okerra bakarkako adierezpenerako</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>encoding declaration or standalone declaration expected while reading the XML declaration</source>
-        <translation type="unfinished"></translation>
+        <translation>itxarondako kodeaketa adierazpen edo bakarkako adierazpena XML adierazpena irakurtzerakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>standalone declaration expected while reading the XML declaration</source>
-        <translation type="unfinished"></translation>
+        <translation>itxarondako bakarkako adierazpena XML adierazpena irakurtzerakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>error occurred while parsing document type definition</source>
-        <translation type="unfinished"></translation>
+        <translation>akatsa gertatu da agiri mota adiera aztertzerakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>letter is expected</source>
-        <translation type="unfinished"></translation>
+        <translation>hizkia itxarondakoa da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>error occurred while parsing comment</source>
-        <translation type="unfinished"></translation>
+        <translation>akatsa gertatu da aipamena aztertzerakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>error occurred while parsing reference</source>
-        <translation type="unfinished"></translation>
+        <translation>akatsa gertatu da xehetasuna aztertzerakoan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>internal general entity reference not allowed in DTD</source>
-        <translation type="unfinished"></translation>
+        <translation>barneko entitate xehetasun orokorra ez dago ahalbidetuta DTD-an</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>external parsed general entity reference not allowed in attribute value</source>
-        <translation type="unfinished"></translation>
+        <translation>kanpoko aztertutako entitate xehetasun orokorra ez dago ahalbidetuta ezaugarri balioan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>external parsed general entity reference not allowed in DTD</source>
-        <translation type="unfinished"></translation>
+        <translation>kanpoko aztertutako entitate xehetasun orokorra ez dago ahalbidetuta DTD-an</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>unparsed entity reference in wrong context</source>
-        <translation type="unfinished"></translation>
+        <translation>aztertugabeko entitate xehetasuna hitzinguru okerrean</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>recursive entities</source>
-        <translation type="unfinished"></translation>
+        <translation>entitate errekursiboak</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>error in the text declaration of an external entity</source>
-        <translation type="unfinished"></translation>
+        <translation>akatsa kanpoko entitate baten adierazpen idazkian</translation>
     </message>
 </context>
 <context>
     <name>QXmlStream</name>
     <message>
+        <location filename="" line="363"/>
         <source>Extra content at end of document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eduki gehigarria agiriaren amaieran.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid entity value.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entitate balio baliogabea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid XML character.</source>
-        <translation type="unfinished"></translation>
+        <translation>XML hizki baliogabea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Sequence ']]>' not allowed in content.</source>
-        <translation type="unfinished"></translation>
+        <translation>']]>' sekuentzia ez dago ahalbidetuta edukian.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Namespace prefix '%1' not declared</source>
-        <translation type="unfinished"></translation>
+        <translation>'%1' izentarte aurrizkia adierazi gabe</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Attribute redefined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezaugarria ber-zehaztuta.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unexpected character '%1' in public id literal.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustekabeko hizkia '%1' id publiko literalean.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid XML version string.</source>
-        <translation type="unfinished"></translation>
+        <translation>XML bertsio katea baliogabea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unsupported XML version.</source>
-        <translation type="unfinished"></translation>
+        <translation>XML bertsio sostengatu gabea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is an invalid encoding name.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kodeaketa izen baliogabea da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Encoding %1 is unsupported</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kodeaketa ez dago sostengaturik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Standalone accepts only yes or no.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bakarkakoak bai edo ez bakarrik onartzen du.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid attribute in XML declaration.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezaugarri baliogabea XML adierazpenean.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Premature end of document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiria goizegi amaitu da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Agiri baliogabea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Expected </source>
-        <translation type="unfinished"></translation>
+        <translation>Itxarondakoa </translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>, but got '</source>
-        <translation type="unfinished"></translation>
+        <translation>, baina lortu da '</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Unexpected '</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustekabekoa '</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Expected character data.</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxarondako hizki datua.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Recursive entity detected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entitate errekursiboa atzemanda.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Start tag expected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Itxarondako etiketa hasiera.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>XML declaration not at start of document.</source>
-        <translation type="unfinished"></translation>
+        <translation>XML adierazpena ez dago agiriaren hasieran.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>NDATA in parameter entity declaration.</source>
-        <translation type="unfinished"></translation>
+        <translation>NDATA parametro entitate adierazpenan.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is an invalid processing instruction name.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 prozesapen jarraipide izen baliogabea da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid processing instruction name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Prozesapen jarraipide izen baliogabea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Illegal namespace declaration.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legezkanpoko izentarte adierazpena.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid XML name.</source>
-        <translation type="unfinished"></translation>
+        <translation>XML izen baliogabea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Opening and ending tag mismatch.</source>
-        <translation type="unfinished"></translation>
+        <translation>Irekitze eta kodeatze etiketak ez datoz bat.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Reference to unparsed entity '%1'.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aztertugabeko entitate xehetasuna '%1'.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Entity '%1' not declared.</source>
-        <translation type="unfinished"></translation>
+        <translation>'%1' entitatea ez da adierazi.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Reference to external entity '%1' in attribute value.</source>
-        <translation type="unfinished"></translation>
+        <translation>'%1' kanpoko entitate xehetasuna ezaugarri balioan.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Invalid character reference.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hizki xehetasun baliogabea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Encountered incorrectly encoded content.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eduki oker kodeatua aurkitu da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The standalone pseudo attribute must appear after the encoding.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bakarkako sasi ezaugarria kodeaketaren ondoren agertu behar da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is an invalid PUBLIC identifier.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ezgutarazle PUBLIKOA da.</translation>
     </message>
 </context>
 <context>
     <name>QtXmlPatterns</name>
     <message>
+        <location filename="" line="363"/>
         <source>An %1-attribute with value %2 has already been declared.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-ezaugarri bat %2 balioarekin jadanik adierazi da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>An %1-attribute must have a valid %2 as value, which %3 isn't.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-ezaugarri batek %2 baliozkoa izan behar du balio bezala, %3 ez da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Network timeout.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sare epemuga.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Element %1 can't be serialized because it appears outside the document element.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 elementoa ezin da serializatu agiri elementutik kanpo agertzen delako.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Attribute %1 can't be serialized because it appears at the top level.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ezaugarria ezin da serializatu goiko mailan agertzen delako.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Year %1 is invalid because it begins with %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 urtea baliogabea da %2-rekin hasten delako.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Day %1 is outside the range %2..%3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 eguna mailaz kanpo dago, %2..%3.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Month %1 is outside the range %2..%3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 hilabetea mailaz kanpo dago, %2..%3.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Overflow: Can't represent date %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gainjarioa: Ezin da %1 data adierazi.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Day %1 is invalid for month %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 eguna baliogabea da %2 hilabeterako.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; </source>
-        <translation type="unfinished"></translation>
+        <translation>Denbora 24:%1:%2.%3 baliogabea da. Ordua 24 da, baina minutuak, segunduak eta segundumilaenak ez dira denak 0; </translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Time %1:%2:%3.%4 is invalid.</source>
-        <translation type="unfinished"></translation>
+        <translation>Denbora %1:%2:%3.%4 baliogabea da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Overflow: Date can't be represented.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gainjarioa: Data ezin da adierazi.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>At least one component must be present.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gutxienez osagi bat egon behar da bertan.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>At least one time component must appear after the %1-delimiter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gutxienez denbora osagi bat agertu behar da %1-mugatzailearen ondoren.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No operand in an integer division, %1, can be %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez dago eragilerik zatiketa oso batean, %1 izan behar da %2.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The first operand in an integer division, %1, cannot be infinity (%2).</source>
-        <translation type="unfinished"></translation>
+        <translation>Lehen eragilea zatiketa oso batean, %1 ezin da mugagabea izan (%2).</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The second operand in a division, %1, cannot be zero (%2).</source>
-        <translation type="unfinished"></translation>
+        <translation>Bigarren eragilea zatiketa batean, %1 ezin da huts izan (%2).</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is not a valid value of type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ez da %2 motako baliozko balio bat.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>When casting to %1 from %2, the source value cannot be %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-tik %2-ra bihuratzerakoan, iturburu balioa ezin da %3 izan.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Integer division (%1) by zero (%2) is undefined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatiketa osa (%1) hutsrekin (%2) zehaztugabea da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Division (%1) by zero (%2) is undefined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatiketa (%1) hutsrekin (%2) zehaztugabea da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Modulus division (%1) by zero (%2) is undefined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modulo zatiketa (%1) hutsrekin (%2) zehaztugabea da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Dividing a value of type %1 by %2 (not-a-number) is not allowed.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 motako balio bat %2-rekin zatitzea (ez-zenbaki-bat) ez dago ahalbidetuta.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 motako balio bat %2 edo %3-rekin zatitzea (gehi edo ken huts) ez dago ahalbidetuta.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 motako balio bat %2 edo %3-rekin biderkatzea (gehi edo ken mugagabe) ez dago ahalbidetuta.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A value of type %1 cannot have an Effective Boolean Value.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 motako balio batek ezin du Effective Boolean Balioa izan.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.</source>
-        <translation type="unfinished"></translation>
+        <translation>Effective Boolean Balioa ezin da kalkulatu bi edo gehiago balio atomiko dituen sekuentzia baterako.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Value %1 of type %2 exceeds maximum (%3).</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 motako %1 balioak gehinezkoa gainditzen du (%3).</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Value %1 of type %2 is below minimum (%3).</source>
-        <translation type="unfinished"></translation>
+        <translation>%2 motako %1 balioak gutxinekotik behera dago (%3).</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A value of type %1 must contain an even number of digits. The value %2 does not.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 motako balio batek zenbaki kopuru bikoiti bat izan behar du. %2 balioa ez da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is not valid as a value of type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ez da %2 motako baliozko balio bat.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Operator %1 cannot be used on type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 eragilea ezin da %2 motan erabili.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Operator %1 cannot be used on atomic values of type %2 and %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 eragilea ezin da %2 eta %3 motako balio atomikoetan erabili.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The namespace URI in the name for a computed attribute cannot be %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Izentarte URI-a konputaturiko ezaugarri batentzat ezin da %1 izan.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The name for a computed attribute cannot have the namespace URI %1 with the local name %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Konputaturiko ezaugarri batentzako izenak ezin du %1 izentarte URI-a izan %2 tokiko izenarekin.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Type error in cast, expected %1, received %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Akatsa bihurketan, itxarondakoa %1, jasotakoa %2.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No casting is possible with %1 as the target type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da bihurketarik egin %1 xede mota bezala hartuta.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>It is not possible to cast from %1 to %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da %1-tik %2-ra bihurtu.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Casting to %1 is not possible because it is an abstract type, and can therefore never be instantiated.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da %1-ra bihurtu mota abstraktokoa delako, eta hortaz inoiz ezin da eskabidetu.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>It's not possible to cast the value %1 of type %2 to %3</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da %2 motako %1 balioa %3-ra bihurtu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Failure when casting from %1 to %2: %3</source>
-        <translation type="unfinished"></translation>
+        <translation>Hutsegitea %1-tik %2-ra bihurtzerakoan: %3</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A comment cannot contain %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Aipamen batek ezin du %1 eduki</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A comment cannot end with a %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aipamen bat ezin da %1 batekin amaitu.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No comparisons can be done involving the type %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin dira alderaketak egin %1 mota barne hartuta.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Operator %1 is not available between atomic values of type %2 and %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 eragilea ez dago eskuragarri %2 eta %3 motako balio atomikoen artean.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezaugarri elkargune bat ezin da agiri elkargune baten azpikoa izan. Hortaz, %1 ezaugarria tokiz kanpo dago.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A library module cannot be evaluated directly. It must be imported from a main module.</source>
-        <translation type="unfinished"></translation>
+        <translation>Liburutegi modulo bat ezin da zuzenean aztertu. Modulo nagusi batetik inportatu behar da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A positional predicate must evaluate to a single numeric value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, is %2 invalid.</source>
-        <translation type="unfinished"></translation>
+        <translation>Xede izena prosezapen jarraipide batean ezin da %1 izan hizki larri xehe konbinazio batean. Hortaz, %2 baliogabea da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ez da baliozko xede izena prozesapen jarraipidean. Izan behar da %2 balio bat, adib. %3.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.</source>
-        <translation type="unfinished"></translation>
+        <translation>Helburu bateko azken urratsak elkarguneak edo balio atomikoak izan behar ditu. Ezin da bien arteko nahastura bat izan.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The data of a processing instruction cannot contain the string %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Prozesapen jarraipide bateko datuek ezin dute %1 katea izan</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No namespace binding exists for the prefix %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez dago izentarte loturarik %1 aurrizkiarentzat</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No namespace binding exists for the prefix %1 in %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez dago izentarte loturarik %1 aurrizkiarentzat hemen: %2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is an invalid %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2 baliogabe bat da</translation>
     </message>
     <message numerus="yes">
+        <location filename="" line="363"/>
         <source>%1 takes at most %n argument(s). %2 is therefore invalid.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1-ek gehienez %n argumento hartzen ditu. %2 hortaz baliogabea da.</numerusform>
+            <numerusform>%1-ek gehienez %n argumento hartzen ditu. %2 hortaz baliogabea da.</numerusform>
         </translation>
     </message>
     <message numerus="yes">
+        <location filename="" line="363"/>
         <source>%1 requires at least %n argument(s). %2 is therefore invalid.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1-ek gutxienez %n argumento behar ditu. %2 hortaz baliogabea da.</numerusform>
+            <numerusform>%1-ek gutxienez %n argumento behar ditu. %2 hortaz baliogabea da.</numerusform>
         </translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-ko lehen argumentoa ezin da %2 motakoa izan. Zenbaki motakoa izan behar da, xs:yearMonthDuration edo xs:dayTimeDuration.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-ko lehen argumentoa ezin da %2 motakoa izan. %3, %4, edo %5 motakoa izan behar da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-ko bigarren argumentoa ezin da %2 motakoa izan. %3, %4, edo %5 motakoa izan behar da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is not a valid XML 1.0 character.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ez da baliozko XML 1.0 hizkia.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The first argument to %1 cannot be of type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-ko lehen argumentoa ezin da %2 motakoa izan.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bi balioek eremu orekak badituzte, eremu oreka berdina izan behar dute. %1 eta %2 ez dira berdinak.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 was called.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 deituta.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 must be followed by %2 or %3, not at the end of the replacement string.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2 edo %3-z jarraitua izan behar da, ez kate ordezpenaren amaieran.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>In the replacement string, %1 must be followed by at least one digit when not escaped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordezkapen katean, %1 gutxienez zenbaki batez jarraitua izan behar da ez irtetzerakoan.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>In the replacement string, %1 can only be used to escape itself or %2, not %3</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordezkapen katean, %1 bera bakarrik edo %2 irtetzeko bakarrik erabili daiteke, ez %3</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 matches newline characters</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 bat dator lerroberri hizkiekin</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 and %2 match the start and end of a line.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 eta %2 bat datoz lerro baten hasiera eta amaierarekin.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Matches are case insensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>Bat etortzeek hizki larri-xeheak bereizten dituzte</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Whitespace characters are removed, except when they appear in character classes</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuriune hizkiak kendu egiten dira, hizki klaseetan agertzen direnean ezik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is an invalid regular expression pattern: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 adierazpen arrunt eredu baliogabea da: %2</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is an invalid flag for regular expressions. Valid flags are:</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ikur baliogabea da adierazpen arruntentzat. Baliozko ikurrak dira:</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lehen argumentoa sekuentzia huts bat edo huts-luzerako kate bat bada (ez izentartea), aurrizkia ezin da adierazi. %1 aurrizkia adierazi da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>It will not be possible to retrieve %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezingo da %1 berreskuratu.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The root node of the second argument to function %1 must be a document node. %2 is not a document node.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 funtzioko bigarren argumentoko erro elkargunea agiri elkargune bat izan behar da. %2 ez da agiri elkargune bat.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The default collection is undefined</source>
-        <translation type="unfinished"></translation>
+        <translation>Berezko bilduma zehazgabea da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 cannot be retrieved</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ezin da berreskuratu</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization).</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 normalkuntza forma ez dago sostengatua. Sostengaturiko formak dira  %2, %3, %4, eta %5, eta ezer ez, adib. kate hutsa (ez normalkuntza).</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A zone offset must be in the range %1..%2 inclusive. %3 is out of range.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eremu oreka %1..%2 barne mailan egon behar da. %3 mailaz kanpo dago.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is not a whole number of minutes.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ez da minutu zenbateko oso bat.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Required cardinality is %1; got cardinality %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The item %1 did not match the required type %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 gaia ez dator bat beharrezko %2 motarekin.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is an unknown schema type.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 eskema mota ezezaguna da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Only one %1 declaration can occur in the query prolog.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 adierazpen bakarra gertatu daiteke eskaera hitzaurrean.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The initialization of variable %1 depends on itself</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 aldaeraren abiarazpena bere mende dago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No variable by name %1 exists</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez dago %1 izenarentzako aldaerarik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The variable %1 is unused</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 aldaera erabiligabea da</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Version %1 is not supported. The supported XQuery version is 1.0.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 bertsioa ez dago sostengatuta. Sostengatutako XQuery bertsioa 1.0 da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kodeaketa baliogabea da. Latinezko hizkiak bakarrik izan behar ditu, ezin du zurigunerik izan, eta %2 adierazpen arruntarekin bat etorri behar da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No function with signature %1 is available</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez dago %1 sinadura duen funtziorik eskuragarri</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A default namespace declaration must occur before function, variable, and option declarations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Berezko izentarte adierazpen bat gertatau behar da eginkizunaren aurretik, aldaera, eta aukera aiderazpenak.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Namespace declarations must occur before function, variable, and option declarations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Izentarte adierazpen bat gertatau behar da eginkizunaren aurretik, aldaera, eta aukera aiderazpenak.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Module imports must occur before function, variable, and option declarations.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modulo inportazioak gertatau behar dira eginkizunaren aurretik, aldaera, eta aukera aiderazpenak.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>It is not possible to redeclare prefix %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da %1 aurrizkia berradierazi.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Only the prefix %1 can be declared to bind the namespace %2. By default, it is already bound to the prefix %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 aurrizkia bakarrik adierazi daitek %2 izentartea loturatzeko. Berez, jadanik %1 aurrizkiaren muga da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Prefix %1 is already declared in the prolog.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 aurrizkia jadanik hitzaurrean adierazi da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The name of an option must have a prefix. There is no default namespace for options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aukera baten izenak aurrizki bat izan behar du. Ez dago berezko izentarterik aukerentzat.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The Schema Import feature is not supported, and therefore %1 declarations cannot occur.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eskema inportazio ezaugarri ez dago sostengatuta, eta hortaz ezin dira %1 adierazpenak gertatu.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The target namespace of a %1 cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-ren xede izentartea ezin da hutsik egon.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The module import feature is not supported</source>
-        <translation type="unfinished"></translation>
+        <translation>Modulo inportazio ezaugarria ez dago sostengatuta</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A variable by name %1 has already been declared in the prolog.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 izenaren aldaera bat jadanik adierazi da hitzaurrean.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No value is available for the external variable by name %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez dago balio eskuragarririk %1 izenaren kanpoko aldaerentzat.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this)</source>
-        <translation type="unfinished"></translation>
+        <translation>Erabiltzaile batek adierazitako eginkizun baterako izentartea ezin da hutsik egon (saiatu aurrezehazturiko %1 aurrizkiarekin, hau bezalako kasuetarko dagoena)</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 izentartea gordeta dago; hortaz erabiltzaileak adierazitako eginzkizunek badaiteke hura ez erabiltzea. Saiatu aurrezehazturiko %2 aurrizkiarekin, hau bezalako kasuetarko dagoena.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Liburutegi modulo batean erabiltzaileak adierazitako eginkizun bateko izentartea moduloaren izentartearen baliokidea izan behar da. Beste hitz batzuekin, %1 izan behar da %2-ren ordez</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A function already exists with the signature %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jadanik badago eginkizun bat %1 sinadurarekin.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No external functions are supported. All supported functions can be used directly, without first declaring them as external</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez da kanpoko eginkizunik sostengatzen. Sostengaturiko eginkizun guztiak zuzenean erabili daitezke, lehenik kanpoko bezala adierazi gabe</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>An argument by name %1 has already been declared. Every argument name must be unique.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jadanik adierazi da %1 izena duen argumento bat. Argumento bakoitza bakarra izan behar da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Eskema Balioztapen Ezaugarria ez dago sostengatuta. Hortaz, %1-adierazpena badaiteke ez erabiltzea.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>None of the pragma expressions are supported. Therefore, a fallback expression must be present</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The %1-axis is unsupported in XQuery</source>
-        <translation type="unfinished"></translation>
+        <translation>%1-ardatza ez dago sostengatua XQueryn</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is not a valid numeric literal.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ez da baliozko zenbaki literala.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>No function by name %1 is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ez dago %1 izenik duen funtziorik eskuragarri.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The namespace URI cannot be the empty string when binding to a prefix, %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Izentarte URI-a ezin da kate hutsa izan aurrizki bati loturatzerakoan, %1.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is an invalid namespace URI.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 izentarte URI baliogabe bat da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>It is not possible to bind to the prefix %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezinezkoa da %1 aurrizkira lotzea</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 izentartea %2-rekin bakarrik izan daiteke lotua (eta da, edonola, aurre-adierazita).</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared).</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 aurrizkia %2-rekin bakarrik izan daiteke lotua (eta da, edonola, aurre-adierazita).</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Two namespace declaration attributes have the same name: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bi izentarte adierazpen ezaugarrik izen berdina dute: %1.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The namespace URI must be a constant and cannot use enclosed expressions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Izentarte URI-a aldagaitza izan behar da eta ezin ditu itxitako adierazpenak erabili.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>An attribute by name %1 has already appeared on this element.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jadanik agertzen da %1 izeneko ezaugarri bat elemento honetan.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>A direct element constructor is not well-formed. %1 is ended with %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuzeneko elemento eraikitzaile bat ez dago ongi-osatuta. %1 %2-rekin amaitzen da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The name %1 does not refer to any schema type.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 izenak ez du eskema motarik adierazten.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is not an atomic type. Casting is only possible to atomic types.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ez da mota atomiko bat. Bihurketa ez da ahalezkoa mota atomikoentzat.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is not a valid name for a processing-instruction. Therefore this name test will never match.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ez da prozesapen-jarraipide batentzako baliozko izena. Hortaz izen azterketa ez da inoiz berdinduko.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>%1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The name of an extension expression must be in a namespace.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hedapen adierazpen baten izena izentartean egon behar da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>empty</source>
-        <translation type="unfinished"></translation>
+        <translation>hutsik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>zero or one</source>
-        <translation type="unfinished"></translation>
+        <translation>huts edo bat</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>exactly one</source>
-        <translation type="unfinished"></translation>
+        <translation>bat zehaz-mehatz</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>one or more</source>
-        <translation type="unfinished"></translation>
+        <translation>bat edo gehiago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>zero or more</source>
-        <translation type="unfinished"></translation>
+        <translation>huts edo gehiago</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Required type is %1, but %2 was found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Beharrezko mota da %1, baina %2 aurkitu da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Promoting %1 to %2 may cause loss of precision.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>The focus is undefined.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fokua zehaztugabea da.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>It's not possible to add attributes after any other kind of node.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezin da ezaugarririk gehitu beste elkargune moten ondoren.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>An attribute by name %1 has already been created.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jadanik sortu da %1 izeneko ezaugarri bat.</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unicode Codepoint Collation bakarrik sostengatzen da (%1). %2 ez dago sostengatuta.</translation>
     </message>
 </context>
 <context>
     <name>VolumeSlider</name>
     <message>
+        <location filename="" line="363"/>
         <source>Muted</source>
-        <translation type="unfinished"></translation>
+        <translation>Mututurik</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Volume: %1%</source>
-        <translation type="unfinished"></translation>
+        <translation>Bolumena: %1%</translation>
     </message>
 </context>
 <context>
     <name>WebCore::PlatformScrollbar</name>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll here</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu hemen</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Left edge</source>
-        <translation type="unfinished"></translation>
+        <translation>Ezker hertza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Goren</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Right edge</source>
-        <translation type="unfinished"></translation>
+        <translation>Eskuin hertza</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Beheren</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page left</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialdean ezkerrera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page up</source>
-        <translation type="unfinished"></translation>
+        <translation>Orraialdean gora</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page right</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialdean eskuinera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Page down</source>
-        <translation type="unfinished"></translation>
+        <translation>Orrialdean behera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll left</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu ezkerrera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll up</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu gora</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll right</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu eskuinera</translation>
     </message>
     <message>
+        <location filename="" line="363"/>
         <source>Scroll down</source>
-        <translation type="unfinished"></translation>
+        <translation>Irristatu behera</translation>
     </message>
 </context>
 </TS>
diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp
index 32af823..0c256cb 100644
--- a/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp
@@ -4431,10 +4431,10 @@ bool VBoxQGLOverlay::onNotifyUpdate(ULONG uX, ULONG uY,
         const double yScaleFactor = mSizeInfo.visualState() == UIVisualStateType_Scale ?
                                     (double)scaledSize.height() / mSizeInfo.height() : dScaleFactor;
         /* Adjust corresponding viewport part: */
-        rect.moveTo(floor((double)rect.x() * xScaleFactor) - 1,
-                    floor((double)rect.y() * yScaleFactor) - 1);
-        rect.setSize(QSize(ceil((double)rect.width()  * xScaleFactor) + 2,
-                           ceil((double)rect.height() * yScaleFactor) + 2));
+        rect.moveTo((int)floor((double)rect.x() * xScaleFactor) - 1,
+                    (int)floor((double)rect.y() * yScaleFactor) - 1);
+        rect.setSize(QSize((int)ceil((double)rect.width()  * xScaleFactor) + 2,
+                           (int)ceil((double)rect.height() * yScaleFactor) + 2));
     }
 
 #ifdef Q_WS_MAC
@@ -4444,10 +4444,10 @@ bool VBoxQGLOverlay::onNotifyUpdate(ULONG uX, ULONG uY,
         const double dBackingScaleFactor = darwinBackingScaleFactor(mpViewport->window());
         if (dBackingScaleFactor > 1.0)
         {
-            rect.moveTo(floor((double)rect.x() / dBackingScaleFactor) - 1,
-                        floor((double)rect.y() / dBackingScaleFactor) - 1);
-            rect.setSize(QSize(ceil((double)rect.width()  / dBackingScaleFactor) + 2,
-                               ceil((double)rect.height() / dBackingScaleFactor) + 2));
+            rect.moveTo((int)floor((double)rect.x() / dBackingScaleFactor) - 1,
+                        (int)floor((double)rect.y() / dBackingScaleFactor) - 1);
+            rect.setSize(QSize((int)ceil((double)rect.width()  / dBackingScaleFactor) + 2,
+                               (int)ceil((double)rect.height() / dBackingScaleFactor) + 2));
         }
     }
 #endif /* Q_WS_MAC */
diff --git a/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp b/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp
index 2ef20fd..ceb6622 100644
--- a/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp
@@ -473,6 +473,7 @@ template<> QString toString(const KStorageBus &bus)
         case KStorageBus_SCSI:   return QApplication::translate("VBoxGlobal", "SCSI", "StorageBus");
         case KStorageBus_Floppy: return QApplication::translate("VBoxGlobal", "Floppy", "StorageBus");
         case KStorageBus_SAS:    return QApplication::translate("VBoxGlobal", "SAS", "StorageBus");
+        case KStorageBus_USB:    return QApplication::translate("VBoxGlobal", "USB", "StorageControllerType"); // TODO: change to proper context later
         default: AssertMsgFailed(("No text for %d", bus)); break;
     }
     return QString();
diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp
index 6d4f443..9a9c1df 100644
--- a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp
@@ -73,9 +73,9 @@ QSize QIDetailsBrowser::minimumSizeHint() const
     /* Get document size as the basis: */
     QSize documentSize = document()->size().toSize();
     /* But only document ideal-width can advice wise width: */
-    const int iDocumentIdealWidth = document()->idealWidth();
+    const int iDocumentIdealWidth = (int)document()->idealWidth();
     /* Moreover we should take document margins into account: */
-    const int iDocumentMargin = document()->documentMargin();
+    const int iDocumentMargin = (int)document()->documentMargin();
 
     /* Compose minimum size-hint on the basis of values above: */
     documentSize.setWidth(iDocumentIdealWidth + iDocumentMargin);
@@ -242,7 +242,7 @@ void QIArrowSplitter::prepare()
         {
             /* Determine icon metric: */
             const QStyle *pStyle = QApplication::style();
-            const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize) * .625;
+            const int iIconMetric = (int)(pStyle->pixelMetric(QStyle::PM_SmallIconSize) * .625);
             /* Configure button-layout: */
             pButtonLayout->setContentsMargins(0, 0, 0, 0);
             pButtonLayout->setSpacing(0);
diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsView.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsView.cpp
index aef0d8b..22b288f 100644
--- a/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsView.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsView.cpp
@@ -72,7 +72,7 @@ bool QIGraphicsView::event(QEvent *pEvent)
             {
                 /* Determine vertical shift (inverted): */
                 const QTouchEvent::TouchPoint point = pTouchEvent->touchPoints().first();
-                const int iShift = point.startPos().y() - point.pos().y();
+                const int iShift = (int)(point.startPos().y() - point.pos().y());
                 /* Calculate new scroll-bar value according calculated shift: */
                 int iNewScrollBarValue = m_iVerticalScrollBarPosition + iShift;
                 /* Make sure new scroll-bar value is within the minimum/maximum bounds: */
diff --git a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
index aaa2a5c..f59f1c9 100644
--- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
@@ -3576,8 +3576,8 @@ QList<int> UIExtraDataManager::extraDataManagerSplitterHints(QWidget *pWidget)
     }
     else
     {
-        hints << pWidget->width() * .9 * (1.0 / 3);
-        hints << pWidget->width() * .9 * (2.0 / 3);
+        hints << (int)(pWidget->width() * .9 * (1.0 / 3));
+        hints << (int)(pWidget->width() * .9 * (2.0 / 3));
     }
 
     /* Return hints: */
diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
index 760cde8..4499709 100644
--- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
@@ -1785,7 +1785,7 @@ void VBoxGlobal::prepareStorageMenu(QMenu &menu,
     QAction *pActionOpenExistingMedium = menu.addAction(UIIconPool::iconSet(":/select_file_16px.png"), QString(), pListener, pszSlotName);
     pActionOpenExistingMedium->setData(QVariant::fromValue(UIMediumTarget(strControllerName, currentAttachment.GetPort(), currentAttachment.GetDevice(),
                                                                           mediumType)));
-    pActionOpenExistingMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Choose a virtual disk image file..."));
+    pActionOpenExistingMedium->setText(QApplication::translate("UIMachineSettingsStorage", "Choose disk image...", "This is used for hard disks, optical media and floppies"));
 
 
     /* Insert separator: */
@@ -1831,6 +1831,7 @@ void VBoxGlobal::prepareStorageMenu(QMenu &menu,
 
     /* Get recent-medium list: */
     QStringList recentMediumList;
+    QStringList recentMediumListUsed;
     switch (mediumType)
     {
         case UIMediumType_HardDisk: recentMediumList = gEDataManager->recentListOfHardDrives(); break;
@@ -1841,6 +1842,11 @@ void VBoxGlobal::prepareStorageMenu(QMenu &menu,
     /* Prepare choose-recent-medium actions: */
     foreach (const QString &strRecentMediumLocationBase, recentMediumList)
     {
+        /* Confirm medium uniqueness: */
+        if (recentMediumListUsed.contains(strRecentMediumLocationBase))
+            continue;
+        /* Mark medium as known: */
+        recentMediumListUsed << strRecentMediumLocationBase;
         /* Convert separators to native: */
         const QString strRecentMediumLocation = QDir::toNativeSeparators(strRecentMediumLocationBase);
         /* Confirm medium presence: */
diff --git a/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp b/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
index a2dfd27..40278bb 100644
--- a/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
@@ -1135,7 +1135,7 @@ void UIMediumManager::prepareToolBar()
     {
         /* Configure tool-bar: */
         const QStyle *pStyle = QApplication::style();
-        const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize) * 1.375;
+        const int iIconMetric = (int)(pStyle->pixelMetric(QStyle::PM_SmallIconSize) * 1.375);
         m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
         m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
         m_pToolBar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm
index de05921..0e10281 100644
--- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm
+++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm
@@ -42,9 +42,9 @@
 {
     UICocoaButton *mRealTarget;
 }
-/* The next method used to be called initWithObject, but Xcode 4.1 preview 5 
+/* The next method used to be called initWithObject, but Xcode 4.1 preview 5
    cannot cope with that for some reason.  Hope this doesn't break anything... */
--(id)initWithObjectAndLionTrouble:(UICocoaButton*)object; 
+-(id)initWithObjectAndLionTrouble:(UICocoaButton*)object;
 -(IBAction)clicked:(id)sender;
 @end
 
@@ -214,8 +214,8 @@
 //    NSLog(NSStringFromSelector(commandSelector));
     /* Don't execute the selector for Enter & Escape. */
     if (   commandSelector == @selector(insertNewline:)
-	    || commandSelector == @selector(cancelOperation:))
-		return YES;
+            || commandSelector == @selector(cancelOperation:))
+                return YES;
     return NO;
 }
 @end
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
index 17f2c13..212a619 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
@@ -637,7 +637,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "Take Screensh&ot..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Take a guest display screenshot"));
+        setStatusTip(QApplication::translate("UIActionPool", "Take guest display screenshot"));
     }
 };
 
@@ -691,7 +691,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Video Capture Settings..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Display the virtual machine settings window to configure video capture"));
+        setStatusTip(QApplication::translate("UIActionPool", "Display virtual machine settings window to configure video capture"));
     }
 };
 
@@ -809,7 +809,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Menu Bar Settings..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Display the window to configure menu-bar"));
+        setStatusTip(QApplication::translate("UIActionPool", "Display window to configure menu-bar"));
     }
 };
 
@@ -841,7 +841,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "Show Menu &Bar"));
-        setStatusTip(QApplication::translate("UIActionPool", "Enable menu-bar visibility"));
+        setStatusTip(QApplication::translate("UIActionPool", "Enable menu-bar"));
     }
 };
 #endif /* !RT_OS_DARWIN */
@@ -896,7 +896,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Status Bar Settings..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Display the window to configure status-bar"));
+        setStatusTip(QApplication::translate("UIActionPool", "Display window to configure status-bar"));
     }
 };
 
@@ -927,7 +927,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "Show Status &Bar"));
-        setStatusTip(QApplication::translate("UIActionPool", "Enable status-bar visibility"));
+        setStatusTip(QApplication::translate("UIActionPool", "Enable status-bar"));
     }
 };
 
@@ -1029,7 +1029,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Keyboard Settings..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Display the global preferences window to configure keyboard shortcuts"));
+        setStatusTip(QApplication::translate("UIActionPool", "Display global preferences window to configure keyboard shortcuts"));
     }
 };
 
@@ -1303,7 +1303,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Hard Disk Settings..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Display the virtual machine settings window to configure hard disks"));
+        setStatusTip(QApplication::translate("UIActionPool", "Display virtual machine settings window to configure hard disks"));
     }
 };
 
@@ -1411,7 +1411,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Network Settings..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Display the virtual machine settings window to configure network adapters"));
+        setStatusTip(QApplication::translate("UIActionPool", "Display virtual machine settings window to configure network adapters"));
     }
 };
 
@@ -1468,7 +1468,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&USB Settings..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Display the virtual machine settings window to configure USB devices"));
+        setStatusTip(QApplication::translate("UIActionPool", "Display virtual machine settings window to configure USB devices"));
     }
 };
 
@@ -1597,7 +1597,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Shared Folders Settings..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Display the virtual machine settings window to configure shared folders"));
+        setStatusTip(QApplication::translate("UIActionPool", "Display virtual machine settings window to configure shared folders"));
     }
 };
 
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIAddDiskEncryptionPasswordDialog.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIAddDiskEncryptionPasswordDialog.cpp
index 50858ad..72a4fc9 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIAddDiskEncryptionPasswordDialog.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIAddDiskEncryptionPasswordDialog.cpp
@@ -609,7 +609,7 @@ void UIAddDiskEncryptionPasswordDialog::retranslateUi()
                                     "we only included it because of problems with Qt Linguist "
                                     "(but the user can see how many passwords are in the list "
                                     "and doesn't need to be told).",
-                                    m_encryptedMediums.size()));
+                                    m_encryptedMediums.uniqueKeys().size()));
 }
 
 void UIAddDiskEncryptionPasswordDialog::revalidate()
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp
index 6bb4f17..c54f177 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp
@@ -286,7 +286,7 @@ STDMETHODIMP UIDnDDataObject::GetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium)
         int rc;
         if (!mVaData.isValid())
         {
-            /* Note:  We're usig Qt::MoveAction because this speed up the whole operation
+            /* Note:  We're usig Qt::MoveAction because this speeds up the whole operation
              *        significantly: Instead of copying the data from the temporary location to
              *        the final destination we just move it.
              *
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp
index d56c8a9..dccef73 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp
@@ -103,7 +103,7 @@ Qt::DropAction UIDnDHandler::dragEnter(ulong screenID, int x, int y,
                                           toVBoxDnDActions(possibleActions),
                                           pMimeData->formats().toVector());
     if (m_dndTarget.isOk())
-        m_enmMode = DNDMODE_HOSTTOGUEST;
+        setMode(DNDMODE_HOSTTOGUEST);
 
     /* Set the DnD action returned by the guest. */
     return toQtDnDAction(result);
@@ -200,7 +200,7 @@ Qt::DropAction UIDnDHandler::dragDrop(ulong screenID, int x, int y,
      * the end of the current transfer direction. So reset the current
      * mode as well here.
      */
-    m_enmMode = DNDMODE_UNKNOWN;
+    setMode(DNDMODE_UNKNOWN);
 
     return toQtDnDAction(result);
 }
@@ -212,7 +212,7 @@ void UIDnDHandler::dragLeave(ulong screenID)
     if (m_enmMode == DNDMODE_HOSTTOGUEST)
     {
         m_dndTarget.Leave(screenID);
-        m_enmMode = DNDMODE_UNKNOWN;
+        setMode(DNDMODE_UNKNOWN);
     }
 }
 
@@ -220,22 +220,18 @@ void UIDnDHandler::dragLeave(ulong screenID)
  * Source -> Frontend.
  */
 
-int UIDnDHandler::dragStart(const QStringList &lstFormats,
-                            Qt::DropAction defAction, Qt::DropActions actions)
+int UIDnDHandler::dragStartInternal(const QStringList &lstFormats,
+                                    Qt::DropAction defAction, Qt::DropActions actions)
 {
     int rc = VINF_SUCCESS;
 
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
 
-    m_lstFormats = lstFormats;
-    m_defAction  = defAction;
-    m_actions    = actions;
-
-    LogFlowFunc(("m_defAction=0x%x\n", m_defAction));
-    LogFlowFunc(("Number of formats: %d\n", m_lstFormats.size()));
+    LogFlowFunc(("defAction=0x%x\n", defAction));
+    LogFlowFunc(("Number of formats: %d\n", lstFormats.size()));
 # ifdef DEBUG
-    for (int i = 0; i < m_lstFormats.size(); i++)
-        LogFlowFunc(("\tFormat %d: %s\n", i, m_lstFormats.at(i).toAscii().constData()));
+    for (int i = 0; i < lstFormats.size(); i++)
+        LogFlowFunc(("\tFormat %d: %s\n", i, lstFormats.at(i).toAscii().constData()));
 # endif
 
 # ifdef RT_OS_WINDOWS
@@ -243,18 +239,18 @@ int UIDnDHandler::dragStart(const QStringList &lstFormats,
     UIDnDDropSource *pDropSource = new UIDnDDropSource(m_pParent);
     if (!pDropSource)
         return VERR_NO_MEMORY;
-    UIDnDDataObject *pDataObject = new UIDnDDataObject(this, m_lstFormats);
+    UIDnDDataObject *pDataObject = new UIDnDDataObject(this, lstFormats);
     if (!pDataObject)
         return VERR_NO_MEMORY;
 
     DWORD dwOKEffects = DROPEFFECT_NONE;
-    if (m_actions)
+    if (actions)
     {
-        if (m_actions & Qt::CopyAction)
+        if (actions & Qt::CopyAction)
             dwOKEffects |= DROPEFFECT_COPY;
-        if (m_actions & Qt::MoveAction)
+        if (actions & Qt::MoveAction)
             dwOKEffects |= DROPEFFECT_MOVE;
-        if (m_actions & Qt::LinkAction)
+        if (actions & Qt::LinkAction)
             dwOKEffects |= DROPEFFECT_LINK;
     }
 
@@ -275,13 +271,17 @@ int UIDnDHandler::dragStart(const QStringList &lstFormats,
         return VERR_NO_MEMORY;
 
     /* Note: pMData is transferred to the QDrag object, so no need for deletion. */
-    m_pMIMEData = new UIDnDMIMEData(this, m_lstFormats, m_defAction, m_actions);
+    m_pMIMEData = new UIDnDMIMEData(this, lstFormats, defAction, actions);
     if (!m_pMIMEData)
     {
         delete pDrag;
         return VERR_NO_MEMORY;
     }
 
+    /* Invoke this handler as data needs to be retrieved. */
+    connect(m_pMIMEData, SIGNAL(getData(QString, QVariant::Type, QVariant&)),
+            this, SLOT(sltGetData(QString, QVariant::Type, QVariant&)));
+
     /* Inform the MIME data object of any changes in the current action. */
     connect(pDrag, SIGNAL(actionChanged(Qt::DropAction)),
             m_pMIMEData, SLOT(sltDropActionChanged(Qt::DropAction)));
@@ -291,7 +291,8 @@ int UIDnDHandler::dragStart(const QStringList &lstFormats,
      * This does not block Qt's event loop, however (on Windows it would).
      */
     pDrag->setMimeData(m_pMIMEData);
-    Qt::DropAction dropAction = pDrag->exec(m_actions, m_defAction);
+    LogFlowFunc(("Executing modal drag'n drop operation ...\n"));
+    Qt::DropAction dropAction = pDrag->exec(actions, defAction);
     LogRel3(("DnD: Ended with dropAction=%ld\n", UIDnDHandler::toVBoxDnDAction(dropAction)));
 
     /* Note: The UIDnDMimeData object will not be not accessible here anymore,
@@ -312,7 +313,7 @@ int UIDnDHandler::dragStart(const QStringList &lstFormats,
     return rc;
 }
 
-int UIDnDHandler::dragIsPending(ulong screenID)
+int UIDnDHandler::dragCheckPending(ulong screenID)
 {
     int rc;
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
@@ -330,7 +331,7 @@ int UIDnDHandler::dragIsPending(ulong screenID)
             return VINF_SUCCESS;
     }
 
-    QMutexLocker AutoWriteLock(&m_ReadLock);
+    QMutexLocker AutoWriteLock(&m_WriteLock);
     m_fIsPending = true;
     AutoWriteLock.unlock();
 
@@ -347,64 +348,36 @@ int UIDnDHandler::dragIsPending(ulong screenID)
      */
     CGuest guest = m_pSession->guest();
 
-    QVector<QString> vecFmtGuest;
-    QVector<KDnDAction> vecActions;
-    KDnDAction defaultAction = m_dndSource.DragIsPending(screenID, vecFmtGuest, vecActions);
-    LogFlowFunc(("defaultAction=%d, numFormats=%d, numActions=%d\n", defaultAction,
-                 vecFmtGuest.size(), vecActions.size()));
+    /* Clear our current data set. */
+    m_dataSource.lstFormats.clear();
+    m_dataSource.vecActions.clear();
 
-    QStringList lstFmtNative;
-    if (defaultAction != KDnDAction_Ignore)
-    {
-        LogRel3(("DnD: Number of supported guest actions: %d\n", vecActions.size()));
-        for (int i = 0; i < vecActions.size(); i++)
-            LogRel3(("\tAction %d: 0x%x\n", i, vecActions.at(i)));
-
-        /**
-         * Do guest -> host format conversion, if needed.
-         * On X11 this already maps to the Xdnd protocol.
-         ** @todo What about the MacOS Carbon Drag Manager? Needs testing.
-         *
-         * See: https://www.iana.org/assignments/media-types/media-types.xhtml
-         */
-        LogRel3(("DnD: Number of supported guest formats: %d\n", vecFmtGuest.size()));
-        for (int i = 0; i < vecFmtGuest.size(); i++)
-        {
-            const QString &strFmtGuest = vecFmtGuest.at(i);
-            LogRel3(("\tFormat %d: %s\n", i, strFmtGuest.toAscii().constData()));
-# ifdef RT_OS_WINDOWS
-            /* CF_TEXT -> Regular text. */
-            if (   strFmtGuest.contains("text/plain", Qt::CaseInsensitive)
-                && !lstFmtNative.contains("text/plain"))
-            {
-                lstFmtNative << "text/plain";
-            }
-            /* CF_HDROP -> URI list. */
-            else if (   strFmtGuest.contains("text/uri-list", Qt::CaseInsensitive)
-                     && !lstFmtNative.contains("text/uri-list"))
-            {
-                lstFmtNative << "text/uri-list";
-            }
-# else /* RT_OS_WINDOWS */
+    /* Ask the guest if there is a drag and drop operation pending (on the guest). */
+    QVector<QString> vecFormats;
+    m_dataSource.defaultAction = m_dndSource.DragIsPending(screenID, vecFormats, m_dataSource.vecActions);
 
-            /* On non-Windows just do a 1:1 mapping. */
-            lstFmtNative << strFmtGuest;
-#  ifdef RT_OS_MACOS
-            /** @todo Does the 1:1 format mapping apply on OS X? Needs testing! */
-#  endif
+    LogRel3(("DnD: Default action is: 0x%x\n", m_dataSource.defaultAction));
+    LogRel3(("DnD: Number of supported guest actions: %d\n", m_dataSource.vecActions.size()));
+        for (int i = 0; i < m_dataSource.vecActions.size(); i++)
+            LogRel3(("\tAction %d: 0x%x\n", i, m_dataSource.vecActions.at(i)));
 
-# endif /* !RT_OS_WINDOWS */
+    LogRel3(("DnD: Number of supported guest formats: %d\n", vecFormats.size()));
+        for (int i = 0; i < vecFormats.size(); i++)
+        {
+            const QString &strFmtGuest = vecFormats.at(i);
+            LogRel3(("\tFormat %d: %s\n", i, strFmtGuest.toAscii().constData()));
         }
 
-        LogRel3(("DnD: Number of supported host formats: %d\n", lstFmtNative.size()));
-        for (int i = 0; i < lstFmtNative.size(); i++)
-            LogRel3(("\tFormat %d: %s\n", i, lstFmtNative.at(i).toAscii().constData()));
-    }
-
-    if (!lstFmtNative.isEmpty())
+    if (   m_dataSource.defaultAction != KDnDAction_Ignore
+        && vecFormats.size())
     {
-        rc = dragStart(lstFmtNative,
-                       toQtDnDAction(defaultAction), toQtDnDActions(vecActions));
+        for (int i = 0; i < vecFormats.size(); i++)
+        {
+            const QString &strFormat = vecFormats.at(i);
+            m_dataSource.lstFormats << strFormat;
+        }
+
+        rc = VINF_SUCCESS; /* There's a valid pending drag and drop operation on the guest. */
     }
     else /* No format data from the guest arrived yet. */
         rc = VERR_NO_DATA;
@@ -425,24 +398,76 @@ int UIDnDHandler::dragIsPending(ulong screenID)
     return rc;
 }
 
-/**
- * Called by UIDnDMIMEData (Linux, OS X, Solaris) or UIDnDDataObject (Windows)
- * to start retrieving the actual data from the guest. This function will block
- * and show a modal progress dialog until the data transfer is complete.
- *
- * @return IPRT return code.
- * @param dropAction            Drop action to perform.
- * @param strMimeType           MIME data type.
- * @param vaType                Qt's variant type of the MIME data.
- * @param vaData                The actual MIME data.
- * @param pParent               Pointer to parent widget.
- */
+int UIDnDHandler::dragStart(ulong screenID)
+{
+    int rc;
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+
+    NOREF(screenID);
+
+    LogFlowFuncEnter();
+
+    /* Sanity checks. */
+    if (   !m_dataSource.lstFormats.size()
+        ||  m_dataSource.defaultAction == KDnDAction_Ignore
+        || !m_dataSource.vecActions.size())
+    {
+        return VERR_INVALID_PARAMETER;
+    }
+
+    setMode(DNDMODE_GUESTTOHOST);
+
+    rc = dragStartInternal(m_dataSource.lstFormats,
+                           toQtDnDAction(m_dataSource.defaultAction), toQtDnDActions(m_dataSource.vecActions));
+
+#else /* !VBOX_WITH_DRAG_AND_DROP_GH */
+
+    NOREF(screenID);
+
+    rc = VERR_NOT_SUPPORTED;
+
+#endif /* VBOX_WITH_DRAG_AND_DROP_GH */
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int UIDnDHandler::dragStop(ulong screenID)
+{
+    int rc;
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+
+    NOREF(screenID);
+
+    m_fIsPending = false;
+    rc = VINF_SUCCESS;
+
+#else /* !VBOX_WITH_DRAG_AND_DROP_GH */
+
+    NOREF(screenID);
+
+    rc = VERR_NOT_SUPPORTED;
+
+#endif /* VBOX_WITH_DRAG_AND_DROP_GH */
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
 int UIDnDHandler::retrieveData(      Qt::DropAction  dropAction,
                                const QString        &strMimeType,
                                      QVariant::Type  vaType,
                                      QVariant       &vaData)
 {
-    LogFlowFunc(("Retrieving data as type=%s (variant type=%ld)\n",
+    return retrieveDataInternal(dropAction, strMimeType, vaType, vaData);
+}
+
+int UIDnDHandler::retrieveDataInternal(      Qt::DropAction  dropAction,
+                                       const QString        &strMimeType,
+                                             QVariant::Type  vaType,
+                                             QVariant       &vaData)
+{
+    LogFlowFunc(("Retrieving data as type=%s (variant type=%RU32)\n",
                  strMimeType.toAscii().constData(), vaType));
 
     int rc = VINF_SUCCESS;
@@ -477,14 +502,17 @@ int UIDnDHandler::retrieveData(      Qt::DropAction  dropAction,
                     {
                         case QVariant::String:
                         {
-                            vaData = QVariant(QString(reinterpret_cast<const char*>(vecData.constData())));
+                            vaData = QVariant::fromValue(QString(reinterpret_cast<const char *>(vecData.constData())));
+                            Assert(vaData.type() == QVariant::String);
                             break;
                         }
 
                         case QVariant::ByteArray:
                         {
                             QByteArray ba(reinterpret_cast<const char*>(vecData.constData()), vecData.size());
-                            vaData = QVariant(ba);
+
+                            vaData = QVariant::fromValue(ba);
+                            Assert(vaData.type() == QVariant::ByteArray);
                             break;
                         }
 
@@ -493,7 +521,8 @@ int UIDnDHandler::retrieveData(      Qt::DropAction  dropAction,
                             QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
                             QStringList lstString = strData.split("\r\n", QString::SkipEmptyParts);
 
-                            vaData = QVariant(lstString);
+                            vaData = QVariant::fromValue(lstString);
+                            Assert(vaData.type() == QVariant::StringList);
                             break;
                         }
 
@@ -517,6 +546,24 @@ int UIDnDHandler::retrieveData(      Qt::DropAction  dropAction,
         rc = VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
     }
 
+    setMode(DNDMODE_UNKNOWN);
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+void UIDnDHandler::setMode(DNDMODE enmMode)
+{
+    QMutexLocker AutoWriteLock(&m_WriteLock);
+    m_enmMode = enmMode;
+    LogFlowFunc(("Mode is now: %RU32\n", m_enmMode));
+}
+
+int UIDnDHandler::sltGetData(const QString        &strMimeType,
+                                   QVariant::Type  vaType,
+                                   QVariant       &vaData)
+{
+    int rc = retrieveDataInternal(Qt::CopyAction, strMimeType, vaType, vaData);
     LogFlowFuncLeaveRC(rc);
     return rc;
 }
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h
index 705b209..14f65c2 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h
@@ -44,9 +44,9 @@ public:
     virtual ~UIDnDHandler(void);
 
     /**
-     * Current operation mode. 
-     * Note: The operation mode is independent of the machine's overall 
-     *       drag and drop mode. 
+     * Current operation mode.
+     * Note: The operation mode is independent of the machine's overall
+     *       drag and drop mode.
      */
     typedef enum DNDMODE
     {
@@ -61,6 +61,20 @@ public:
         DNDMODE_32BIT_HACK = 0x7fffffff
     } DNDMODE;
 
+    /**
+     * Drag and drop data set from the source.
+     */
+    typedef struct UIDnDDataSource
+    {
+        /** List of formats supported by the source. */
+        QStringList         lstFormats;
+        /** List of allowed drop actions from the source. */
+        QVector<KDnDAction> vecActions;
+        /** Default drop action from the source. */
+        KDnDAction          defaultAction;
+
+    } UIDnDDataSource;
+
     /* Frontend -> Target. */
     Qt::DropAction             dragEnter(ulong screenId, int x, int y, Qt::DropAction proposedAction, Qt::DropActions possibleActions, const QMimeData *pMimeData);
     Qt::DropAction             dragMove (ulong screenId, int x, int y, Qt::DropAction proposedAction, Qt::DropActions possibleActions, const QMimeData *pMimeData);
@@ -68,8 +82,9 @@ public:
     void                       dragLeave(ulong screenId);
 
     /* Source -> Frontend. */
-    int                        dragIsPending(ulong screenId);
-    int                        dragStart(const QStringList &lstFormats, Qt::DropAction defAction, Qt::DropActions actions);
+    int                        dragCheckPending(ulong screenId);
+    int                        dragStart(ulong screenId);
+    int                        dragStop(ulong screenID);
     int                        retrieveData(Qt::DropAction  dropAction, const QString &strMimeType, QVariant::Type vaType, QVariant &vaData);
 
 public:
@@ -79,6 +94,26 @@ public:
     static Qt::DropAction      toQtDnDAction(KDnDAction action);
     static Qt::DropActions     toQtDnDActions(const QVector<KDnDAction> &vecActions);
 
+public slots:
+
+    /**
+     * Called by UIDnDMIMEData (Linux, OS X, Solaris) to start retrieving the actual data
+     * from the guest. This function will block and show a modal progress dialog until
+     * the data transfer is complete.
+     *
+     * @return IPRT status code.
+     * @param strMimeType           MIME data type.
+     * @param vaType                Qt's variant type of the MIME data.
+     * @param vaData                Reference to QVariant where to store the retrieved data.
+     */
+    int                        sltGetData(const QString &strMimeType, QVariant::Type vaType, QVariant &vaData);
+
+protected:
+
+    int                        dragStartInternal(const QStringList &lstFormats, Qt::DropAction defAction, Qt::DropActions actions);
+    int                        retrieveDataInternal(Qt::DropAction dropAction, const QString &strMimeType, QVariant::Type vaType, QVariant &vaData);
+    void                       setMode(DNDMODE enmMode);
+
 protected:
 
     /** Pointer to UI session. */
@@ -92,18 +127,14 @@ protected:
     CDnDTarget        m_dndTarget;
     /** Current transfer direction. */
     DNDMODE           m_enmMode;
+    /** Current data from the source (if any).
+     *  At the momenet we only support one source at a time. */
+    UIDnDDataSource   m_dataSource;
     /** Flag indicating if a drag operation is pending currently. */
     bool              m_fIsPending;
     QMutex            m_ReadLock;
     QMutex            m_WriteLock;
 
-    /** List of formats supported by the source. */
-    QStringList       m_lstFormats;
-    /** Default drop action from the source. */
-    Qt::DropAction    m_defAction;
-    /** List of allowed drop actions from the source. */
-    Qt::DropActions   m_actions;
-
 #ifndef RT_OS_WINDOWS
     /** Pointer to MIMEData instance used for handling
      *  own MIME times on non-Windows host OSes. */
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp
index 2a007ff..339dfff 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp
@@ -20,17 +20,13 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 /* Qt includes: */
-# include <QApplication>
 # include <QFileInfo>
-# include <QKeyEvent>
 # include <QMimeData>
 # include <QStringList>
-# include <QTimer>
 # include <QUrl>
 
 /* GUI includes: */
 # include "UIDnDMIMEData.h"
-# include "UIMessageCenter.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -44,6 +40,7 @@ UIDnDMIMEData::UIDnDMIMEData(UIDnDHandler *pDnDHandler,
     : m_pDnDHandler(pDnDHandler)
     , m_lstFormats(lstFormats)
     , m_defAction(defAction)
+    , m_curAction(Qt::IgnoreAction)
     , m_actions(actions)
     , m_enmState(Dragging)
     , m_vaData(QVariant::Invalid)
@@ -55,36 +52,6 @@ UIDnDMIMEData::UIDnDMIMEData(UIDnDHandler *pDnDHandler,
     for (int i = 0; i < lstFormats.size(); i++)
         LogFlowFunc(("\tFormat %d: %s\n", i, lstFormats.at(i).toAscii().constData()));
 #endif
-
-     /**
-     * This is unbelievable hacky, but I didn't find another way. Stupid
-     * Qt QDrag interface is so less verbose, that we in principle know
-     * nothing about what happens when the user drag something around. It
-     * is possible that the target on the host requests data
-     * (@sa retrieveData) while the mouse button still is pressed. This
-     * isn't something we should support, because it would mean transferring
-     * the data from the guest while the mouse is still moving (think of
-     * transferring a 2GB file from the guest to the host ...). So the idea is
-     * to detect the mouse release event and only after this happened, allow
-     * data to be retrieved. Unfortunately the QDrag object eats all events
-     * while a drag is going on (see QDragManager in the Qt src's).
-     *
-     * So what we now are going to do is installing an event filter after the
-     * QDrag::exec is called, so that this event filter then would be
-     * the last in the event filter queue and therefore called before the
-     * one installed by the QDrag object (which then in turn would
-     * munch all events).
-     *
-     ** @todo Test this on all supported platforms (X11 works).
-     *
-     * Note: On Windows the above hack is not needed because as soon as Qt calls
-     *       OLE's DoDragDrop routine internally (via QtDrag::exec), no mouse
-     *       events will come through anymore. At this point DoDragDrop is modal
-     *       and will take care of all the input handling. */
-#ifndef RT_OS_WINDOWS
-    /* Install the event filter in a deferred way. */
-    QTimer::singleShot(0, this, SLOT(sltInstallEventFilter()));
-#endif
 }
 
 QStringList UIDnDMIMEData::formats(void) const
@@ -94,9 +61,9 @@ QStringList UIDnDMIMEData::formats(void) const
 
 bool UIDnDMIMEData::hasFormat(const QString &strMIMEType) const
 {
-    bool fRc = m_lstFormats.contains(strMIMEType);
-    LogFlowFunc(("%s: %RTbool (QtMimeData: %RTbool)\n",
-                 strMIMEType.toStdString().c_str(), fRc, QMimeData::hasFormat(strMIMEType)));
+    bool fRc = (m_curAction != Qt::IgnoreAction);
+    LogFlowFunc(("%s: %RTbool (QtMimeData: %RTbool, curAction=0x%x)\n",
+                 strMIMEType.toStdString().c_str(), fRc, QMimeData::hasFormat(strMIMEType), m_curAction));
     return fRc;
 }
 
@@ -111,8 +78,8 @@ bool UIDnDMIMEData::hasFormat(const QString &strMIMEType) const
  */
 QVariant UIDnDMIMEData::retrieveData(const QString &strMIMEType, QVariant::Type vaType) const
 {
-    LogFlowFunc(("state=%RU32, mimeType=%s, type=%d (%s)\n", m_enmState, strMIMEType.toStdString().c_str(),
-                 vaType, QVariant::typeToName(vaType)));
+    LogFlowFunc(("state=%RU32, curAction=0x%x, defAction=0x%x, mimeType=%s, type=%d (%s)\n",
+                 m_enmState, m_curAction, m_defAction, strMIMEType.toStdString().c_str(), vaType, QVariant::typeToName(vaType)));
 
     bool fCanDrop = true;
 
@@ -125,112 +92,60 @@ QVariant UIDnDMIMEData::retrieveData(const QString &strMIMEType, QVariant::Type
     /* On non-Windows our state gets updated via an own event filter
      * (see UIDnDMimeData::eventFilter). This filter will update the current
      * operation state for us (based on the mouse buttons). */
-    if (m_enmState != Dropped)
+    if (m_curAction == Qt::IgnoreAction)
     {
-        LogFlowFunc(("Not yet in 'dropped' state, so can't drop yet\n"));
+        LogFlowFunc(("Current drop action is 0x%x, so can't drop yet\n", m_curAction));
         fCanDrop = false;
     }
 #endif
 
-    /* Do we support the requested MIME type? */
-    if (   fCanDrop
-        && !m_lstFormats.contains(strMIMEType))
-    {
-        LogRel3(("DnD: Unsupported MIME type=%s\n", strMIMEType.toStdString().c_str()));
-        fCanDrop = false;
-    }
-
-    /* Supported types. See below in the switch statement. */
-    if (   fCanDrop
-        && !(
-             /* Plain text. */
-                vaType == QVariant::String
-             /* Binary data. */
-             || vaType == QVariant::ByteArray
-             /* URI list. */
-             || vaType == QVariant::List))
+    if (fCanDrop)
     {
-        LogRel3(("DnD: Unsupported data type=%d (%s)\n", vaType, QVariant::typeToName(vaType)));
-        fCanDrop = false;
-    }
-
-    LogRel3(("DnD: State=%ld, fCanDrop=%RTbool\n", m_enmState, fCanDrop));
+        /* Do we support the requested MIME type? */
+        if (!m_lstFormats.contains(strMIMEType))
+        {
+            LogRel(("DnD: Unsupported MIME type '%s'\n", strMIMEType.toStdString().c_str()));
+            fCanDrop = false;
+        }
 
-    if (!fCanDrop)
-    {
-        LogFlowFunc(("Skipping request, state=%RU32 ...\n", m_enmState));
-        return QMimeData::retrieveData(strMIMEType, vaType);
+        /* Supported types. See below in the switch statement. */
+        if (!(
+              /* Plain text. */
+                 vaType == QVariant::String
+              /* Binary data. */
+              || vaType == QVariant::ByteArray
+                 /* URI list. */
+              || vaType == QVariant::List))
+        {
+            LogRel(("DnD: Unsupported data type '%s'\n", QVariant::typeToName(vaType)));
+            fCanDrop = false;
+        }
     }
 
-    /* Note: The const_cast is used because this function needs to be const (otherwise
-     *       Qt won't call it), but we need the stuff in an unconst'ed way. */
-    int rc = const_cast<UIDnDMIMEData *>(this)->retrieveDataInternal(strMIMEType, vaType);
-
-    LogFlowFunc(("Returning rc=%Rrc, state=%RU32\n", rc, m_enmState));
-    return m_vaData;
-}
-
-#ifndef RT_OS_WINDOWS
-bool UIDnDMIMEData::eventFilter(QObject *pObject, QEvent *pEvent)
-{
-    bool fRemoveFilter = false;
+    LogRel3(("DnD: State=%ld, Action=0x%x, fCanDrop=%RTbool\n", m_enmState, m_curAction, fCanDrop));
 
-    if (pEvent)
+    if (fCanDrop)
     {
-        switch (pEvent->type())
-        {
-            case QEvent::MouseMove:
-            {
-                QMouseEvent *pMouseEvent = (QMouseEvent*)(pEvent);
-                AssertPtr(pMouseEvent);
-                LogFlowFunc(("MouseMove: x=%d, y=%d\n", pMouseEvent->globalX(), pMouseEvent->globalY()));
-
-                break;
-            }
+        QVariant vaData;
+        int rc = emit getData(strMIMEType, vaType, vaData);
 
-            case QEvent::MouseButtonRelease:
-            {
-                LogFlowFunc(("MouseButtonRelease\n"));
-                m_enmState = Dropped;
+        LogRel3(("DnD: Returning data of type=%s (requested MIME type=%s, requested type=%s), rc=%Rrc\n",
+                 vaData.typeName() ? vaData.typeName() : "<Invalid>",
+                 strMIMEType.toStdString().c_str(),
+                 QVariant::typeToName(vaType) ? QVariant::typeToName(vaType) : "<Invalid>", rc));
 
-                fRemoveFilter = true;
-                break;
-            }
-
-            case QEvent::KeyPress:
-            {
-                /* ESC pressed? */
-                if (static_cast<QKeyEvent*>(pEvent)->key() == Qt::Key_Escape)
-                {
-                    LogRel2(("DnD: ESC pressed, cancelling drag and drop operation\n"));
-                    m_enmState = Canceled;
-
-                    fRemoveFilter = true;
-                }
-                break;
-            }
-
-            default:
-                break;
-        }
-    }
-
-    if (fRemoveFilter)
-    {
-        LogFlowFunc(("Removing event filter ...\n"));
-        AssertPtr(qApp);
-        qApp->removeEventFilter(this);
+        if (RT_SUCCESS(rc))
+            return vaData;
     }
 
-    /* Do normal processing by Qt. */
-    return QObject::eventFilter(pObject, pEvent);
+    LogFlowFunc(("Skipping request, state=%RU32 ...\n", m_enmState));
+    return QVariant(QVariant::Invalid); /* Return a NULL variant. */
 }
-#endif /* !RT_OS_WINDOWS */
 
-int UIDnDMIMEData::setData(const QString &mimeType)
+int UIDnDMIMEData::setData(const QString &strMIMEType, const QVariant &vaData)
 {
     LogFlowFunc(("mimeType=%s, dataType=%s\n",
-                 mimeType.toAscii().constData(), m_vaData.typeName()));
+                 strMIMEType.toAscii().constData(), vaData.typeName()));
 
     int rc = VINF_SUCCESS;
 
@@ -238,19 +153,19 @@ int UIDnDMIMEData::setData(const QString &mimeType)
     {
         case QVariant::String: /* Plain text. */
         {
-            QMimeData::setText(m_vaData.toString());
+            QMimeData::setText(vaData.toString());
             break;
         }
 
         case QVariant::ByteArray: /* Raw byte data. */
         {
-            QMimeData::setData(mimeType, m_vaData.toByteArray());
+            QMimeData::setData(strMIMEType, vaData.toByteArray());
             break;
         }
 
         case QVariant::StringList: /* URI. */
         {
-            QList<QVariant> lstData = m_vaData.toList();
+            QList<QVariant> lstData = vaData.toList();
             QList<QUrl> lstURL;
             for (int i = 0; i < lstData.size(); i++)
             {
@@ -278,26 +193,6 @@ int UIDnDMIMEData::setData(const QString &mimeType)
     return rc;
 }
 
-int UIDnDMIMEData::retrieveDataInternal(const QString &strMIMEType, QVariant::Type vaType)
-{
-    LogFlowFunc(("state=%RU32, mimeType=%s, type=%d (%s)\n", m_enmState,
-                  strMIMEType.toStdString().c_str(), vaType, QVariant::typeToName(vaType)));
-
-    AssertPtr(m_pDnDHandler);
-    int rc = m_pDnDHandler->retrieveData(m_defAction, strMIMEType, vaType, m_vaData);
-    if (RT_SUCCESS(rc))
-    {
-        /* Nothing to do here yet. */
-    }
-    else if (rc == VERR_CANCELLED)
-        m_enmState = Canceled;
-    else
-        m_enmState = Error;
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
 /**
  * Issued by the QDrag object as soon as the current drop action has changed.
  *
@@ -306,18 +201,6 @@ int UIDnDMIMEData::retrieveDataInternal(const QString &strMIMEType, QVariant::Ty
 void UIDnDMIMEData::sltDropActionChanged(Qt::DropAction dropAction)
 {
     LogFlowFunc(("dropAction=0x%x\n", dropAction));
-    m_defAction = dropAction;
+    m_curAction = dropAction;
 }
 
-#ifndef RT_OS_WINDOWS
-/**
- * Issued by ourselves to install the event filter.
- */
-void UIDnDMIMEData::sltInstallEventFilter(void)
-{
-    LogFlowFunc(("Installing event filter ...\n"));
-    AssertPtr(qApp);
-    qApp->installEventFilter(this);
-}
-#endif
-
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.h
index 778a423..fb7497e 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.h
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.h
@@ -62,9 +62,9 @@ public:
 
     UIDnDMIMEData(UIDnDHandler *pDnDHandler, QStringList formats, Qt::DropAction defAction, Qt::DropActions actions);
 
-public:
+signals:
 
-    int setData(const QString &mimeType);
+     int getData(const QString &strMIMEType, QVariant::Type vaType, QVariant &vaData) const;
 
 public slots:
 
@@ -77,27 +77,35 @@ protected:
 
     virtual bool hasFormat(const QString &mimeType) const;
 
-    virtual QVariant retrieveData(const QString &mimeType, QVariant::Type type) const;
-
-#ifndef RT_OS_WINDOWS
-    bool eventFilter(QObject *pObject, QEvent *pEvent);
-#endif
+    virtual QVariant retrieveData(const QString &strMIMEType, QVariant::Type vaType) const;
     /** @}  */
 
-    int retrieveDataInternal(const QString &strMIMEType, QVariant::Type vaType);
+protected:
 
-protected slots:
+    /** @name Internal helper functions.
+     * @{ */
 
-#ifndef RT_OS_WINDOWS
-    void sltInstallEventFilter(void);
-#endif
+    /**
+     * Sets the object's MIME data according to the given
+     * MIME type and data.
+     *
+     * @returns IPRT status code.
+     * @param   strMIMEType             MIME type to set.
+     * @param   vaData                  Data to set.
+     * @remark
+     */
+    int setData(const QString &strMIMEType, const QVariant &vaData);
+    /** @}  */
 
 protected:
 
     UIDnDHandler     *m_pDnDHandler;
 
     QStringList       m_lstFormats;
+    /** Default action on successful drop operation. */
     Qt::DropAction    m_defAction;
+    /** Current action, based on QDrag's status. */
+    Qt::DropAction    m_curAction;
     Qt::DropActions   m_actions;
 
     mutable State     m_enmState;
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp
index cca01f6..2d59e50 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp
@@ -1169,10 +1169,8 @@ void UIFrameBufferPrivate::handleSetVisibleRegion(const QRegion &region)
 
 void UIFrameBufferPrivate::performResize(int iWidth, int iHeight)
 {
-    LogRel(("GUI: UIFrameBufferPrivate::performResize: Size=%dx%d\n", iWidth, iHeight));
-
     /* Make sure machine-view is assigned: */
-    AssertPtrReturnVoid(m_pMachineView);
+    AssertReturnVoidStmt(m_pMachineView, LogRel(("GUI: UIFrameBufferPrivate::performResize: Size=%dx%d\n", iWidth, iHeight)));
 
     /* Invalidate visible-region (if necessary): */
     if (m_pMachineView->machineLogic()->visualStateType() == UIVisualStateType_Seamless &&
@@ -1187,8 +1185,8 @@ void UIFrameBufferPrivate::performResize(int iWidth, int iHeight)
     /* If source-bitmap invalid: */
     if (m_sourceBitmap.isNull())
     {
-        LogRel(("GUI: UIFrameBufferPrivate::performResize: "
-                "Using fallback buffer since no source-bitmap is provided\n"));
+        LogRel(("GUI: UIFrameBufferPrivate::performResize: Size=%dx%d, "
+                "Using fallback buffer since no source bitmap is provided\n", iWidth, iHeight));
 
         /* Remember new size came from hint: */
         m_iWidth = iWidth;
@@ -1201,8 +1199,8 @@ void UIFrameBufferPrivate::performResize(int iWidth, int iHeight)
     /* If source-bitmap valid: */
     else
     {
-        LogRel(("GUI: UIFrameBufferPrivate::performResize: "
-                "Directly using source-bitmap content\n"));
+        LogRel(("GUI: UIFrameBufferPrivate::performResize: Size=%dx%d, "
+                "Directly using source bitmap content\n", iWidth, iHeight));
 
         /* Acquire source-bitmap attributes: */
         BYTE *pAddress = NULL;
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp
index e2ace3f..30ef009 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp
@@ -444,10 +444,6 @@ private:
         if (!fAdaptersPresent)
             hide();
 
-        /* Update icon for the 'Null' state: */
-        if (fAdaptersPresent && fCablesDisconnected)
-            setStateIcon(KDeviceActivity_Null, UIIconPool::iconSet(":/nw_disconnected_16px.png"));
-
         /* Update tool-tip: */
         setToolTip(strToolTip.arg(strFullData));
         /* Update indicator state: */
@@ -855,6 +851,9 @@ private:
         /* CPU Execution Cap feature: */
         QString strCPUExecCap = QString::number(machine.GetCPUExecutionCap());
 
+        /* Paravirtualization feature: */
+        const QString strParavirt = gpConverter->toString(machine.GetEffectiveParavirtProvider());
+
         /* Prepare tool-tip: */
         QString tip(QApplication::translate("UIIndicatorsPool",
                                             "Additional feature status:"
@@ -868,6 +867,12 @@ private:
                     .arg(VBoxGlobal::tr("Unrestricted Execution"), unrestrictExec)
                     .arg(VBoxGlobal::tr("Execution Cap", "details report"), strCPUExecCap));
 
+        // TODO: We had to use that large NLS above for now.
+        //       Later it should be reworked to be well-maintainable..
+        /* Separately add information about paravirtualization interface feature: */
+        tip += QApplication::translate("UIIndicatorsPool", "<br><nobr><b>%1:</b> %2</nobr>", "Virtualization Stuff LED")
+                                      .arg(VBoxGlobal::tr("Paravirtualization Interface", "details report"), strParavirt);
+
         /* CPU count: */
         int cpuCount = machine.GetCPUCount();
         if (cpuCount > 1)
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
index df82dcc..8791bf7 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
@@ -339,6 +339,14 @@ void UIMachineLogic::adjustMachineWindowsGeometry()
         pMachineWindow->adjustMachineViewSize();
 }
 
+void UIMachineLogic::sendMachineWindowsSizeHints()
+{
+    /* By default, the only thing we need is to
+     * send machine-view(s) size-hint(s) to the guest: */
+    foreach(UIMachineWindow *pMachineWindow, machineWindows())
+        pMachineWindow->sendMachineViewSizeHint();
+}
+
 #ifdef Q_WS_MAC
 void UIMachineLogic::updateDockIcon()
 {
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h
index 390468b..3b51da5 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h
@@ -127,6 +127,9 @@ public:
     /** Adjusts machine-window(s) geometry if necessary. */
     virtual void adjustMachineWindowsGeometry();
 
+    /** Send machine-window(s) size-hint(s) to the guest. */
+    virtual void sendMachineWindowsSizeHints();
+
     /* Wrapper to open Machine settings / Network page: */
     void openNetworkSettingsDialog() { sltOpenNetworkSettingsDialog(); }
 
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp
index 8fc18a9..dd344bd 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp
@@ -100,6 +100,15 @@ const int XKeyRelease = KeyRelease;
 #include <math.h>
 
 
+#ifdef DEBUG_andy
+/* Macro for debugging drag and drop actions which usually would
+ * go to Main's logging group. */
+# define DNDDEBUG(x) LogRel(x)
+#else
+# define DNDDEBUG(x)
+#endif
+
+
 /* static */
 UIMachineView* UIMachineView::create(  UIMachineWindow *pMachineWindow
                                      , ulong uScreenId
@@ -337,10 +346,10 @@ void UIMachineView::sltHandleNotifyUpdate(int iX, int iY, int iWidth, int iHeigh
         const double yScaleFactor = visualStateType() == UIVisualStateType_Scale ?
                                     (double)scaledSize.height() / frameBuffer()->height() : dScaleFactor;
         /* Adjust corresponding viewport part: */
-        rect.moveTo(floor((double)rect.x() * xScaleFactor) - 1,
-                    floor((double)rect.y() * yScaleFactor) - 1);
-        rect.setSize(QSize(ceil((double)rect.width()  * xScaleFactor) + 2,
-                           ceil((double)rect.height() * yScaleFactor) + 2));
+        rect.moveTo((int)floor((double)rect.x() * xScaleFactor) - 1,
+                    (int)floor((double)rect.y() * yScaleFactor) - 1);
+        rect.setSize(QSize((int)ceil((double)rect.width()  * xScaleFactor) + 2,
+                           (int)ceil((double)rect.height() * yScaleFactor) + 2));
     }
 
     /* Shift has to be scaled by the backing-scale-factor
@@ -354,10 +363,10 @@ void UIMachineView::sltHandleNotifyUpdate(int iX, int iY, int iWidth, int iHeigh
         const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
         if (dBackingScaleFactor > 1.0)
         {
-            rect.moveTo(floor((double)rect.x() / dBackingScaleFactor) - 1,
-                        floor((double)rect.y() / dBackingScaleFactor) - 1);
-            rect.setSize(QSize(ceil((double)rect.width()  / dBackingScaleFactor) + 2,
-                               ceil((double)rect.height() / dBackingScaleFactor) + 2));
+            rect.moveTo((int)floor((double)rect.x() / dBackingScaleFactor) - 1,
+                        (int)floor((double)rect.y() / dBackingScaleFactor) - 1);
+            rect.setSize(QSize((int)ceil((double)rect.width()  / dBackingScaleFactor) + 2,
+                               (int)ceil((double)rect.height() / dBackingScaleFactor) + 2));
         }
     }
 #endif /* Q_WS_MAC */
@@ -544,6 +553,9 @@ UIMachineView::UIMachineView(  UIMachineWindow *pMachineWindow
 #ifdef VBOX_WITH_VIDEOHWACCEL
     , m_fAccelerate2DVideo(bAccelerate2DVideo)
 #endif /* VBOX_WITH_VIDEOHWACCEL */
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    , m_fIsDraggingFromGuest(false)
+#endif
 {
     /* Load machine view settings: */
     loadMachineViewSettings();
@@ -1419,6 +1431,16 @@ void UIMachineView::paintEvent(QPaintEvent *pPaintEvent)
 }
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
+bool UIMachineView::dragAndDropCanAccept(void) const
+{
+    bool fAccept =  m_pDnDHandler
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+                 && !m_fIsDraggingFromGuest
+#endif
+                 && machine().GetDnDMode() != KDnDMode_Disabled;
+    return fAccept;
+}
+
 bool UIMachineView::dragAndDropIsActive(void) const
 {
     return (   m_pDnDHandler
@@ -1429,91 +1451,162 @@ void UIMachineView::dragEnterEvent(QDragEnterEvent *pEvent)
 {
     AssertPtrReturnVoid(pEvent);
 
-    if (!dragAndDropIsActive())
-        return;
+    int rc = dragAndDropCanAccept() ? VINF_SUCCESS : VERR_ACCESS_DENIED;
+    if (RT_SUCCESS(rc))
+    {
+        /* Get mouse-pointer location. */
+        const QPoint &cpnt = viewportToContents(pEvent->pos());
+
+        /* Ask the target for starting a DnD event. */
+        Qt::DropAction result = m_pDnDHandler->dragEnter(screenId(),
+                                                         frameBuffer()->convertHostXTo(cpnt.x()),
+                                                         frameBuffer()->convertHostYTo(cpnt.y()),
+                                                         pEvent->proposedAction(),
+                                                         pEvent->possibleActions(),
+                                                         pEvent->mimeData());
+
+        /* Set the DnD action returned by the guest. */
+        pEvent->setDropAction(result);
+        pEvent->accept();
+    }
 
-    /* Get mouse-pointer location. */
-    const QPoint &cpnt = viewportToContents(pEvent->pos());
+    DNDDEBUG(("DnD: dragEnterEvent ended with rc=%Rrc\n", rc));
+}
 
-    /* Ask the target for starting a DnD event. */
-    Qt::DropAction result = m_pDnDHandler->dragEnter(screenId(),
-                                                     frameBuffer()->convertHostXTo(cpnt.x()),
-                                                     frameBuffer()->convertHostYTo(cpnt.y()),
-                                                     pEvent->proposedAction(),
-                                                     pEvent->possibleActions(),
-                                                     pEvent->mimeData());
+void UIMachineView::dragMoveEvent(QDragMoveEvent *pEvent)
+{
+    AssertPtrReturnVoid(pEvent);
+
+    int rc = dragAndDropCanAccept() ? VINF_SUCCESS : VERR_ACCESS_DENIED;
+    if (RT_SUCCESS(rc))
+    {
+        /* Get mouse-pointer location. */
+        const QPoint &cpnt = viewportToContents(pEvent->pos());
+
+        /* Ask the guest for moving the drop cursor. */
+        Qt::DropAction result = m_pDnDHandler->dragMove(screenId(),
+                                                        frameBuffer()->convertHostXTo(cpnt.x()),
+                                                        frameBuffer()->convertHostYTo(cpnt.y()),
+                                                        pEvent->proposedAction(),
+                                                        pEvent->possibleActions(),
+                                                        pEvent->mimeData());
+
+        /* Set the DnD action returned by the guest. */
+        pEvent->setDropAction(result);
+        pEvent->accept();
+    }
 
-    /* Set the DnD action returned by the guest. */
-    pEvent->setDropAction(result);
-    pEvent->accept();
+    DNDDEBUG(("DnD: dragMoveEvent ended with rc=%Rrc\n", rc));
 }
 
-void UIMachineView::dragMoveEvent(QDragMoveEvent *pEvent)
+void UIMachineView::dragLeaveEvent(QDragLeaveEvent *pEvent)
 {
     AssertPtrReturnVoid(pEvent);
 
-    if (!dragAndDropIsActive())
-        return;
+    int rc = dragAndDropCanAccept() ? VINF_SUCCESS : VERR_ACCESS_DENIED;
+    if (RT_SUCCESS(rc))
+    {
+        m_pDnDHandler->dragLeave(screenId());
+
+        pEvent->accept();
+    }
 
-    /* Get mouse-pointer location. */
-    const QPoint &cpnt = viewportToContents(pEvent->pos());
+    DNDDEBUG(("DnD: dragLeaveEvent ended with rc=%Rrc\n", rc));
+}
 
-    /* Ask the guest for moving the drop cursor. */
-    Qt::DropAction result = m_pDnDHandler->dragMove(screenId(),
-                                                    frameBuffer()->convertHostXTo(cpnt.x()),
-                                                    frameBuffer()->convertHostYTo(cpnt.y()),
-                                                    pEvent->proposedAction(),
-                                                    pEvent->possibleActions(),
-                                                    pEvent->mimeData());
+int UIMachineView::dragCheckPending(void)
+{
+    int rc;
 
-    /* Set the DnD action returned by the guest. */
-    pEvent->setDropAction(result);
-    pEvent->accept();
+    if (!dragAndDropIsActive())
+        rc = VERR_ACCESS_DENIED;
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    else if (!m_fIsDraggingFromGuest)
+    {
+        /** @todo Add guest->guest DnD functionality here by getting
+         *        the source of guest B (when copying from B to A). */
+        rc = m_pDnDHandler->dragCheckPending(screenId());
+        if (RT_SUCCESS(rc))
+            m_fIsDraggingFromGuest = true;
+    }
+    else /* Already dragging, so report success. */
+        rc = VINF_SUCCESS;
+#else
+    rc = VERR_NOT_SUPPORTED;
+#endif
+
+    DNDDEBUG(("DnD: dragCheckPending ended with rc=%Rrc\n", rc));
+    return rc;
 }
 
-void UIMachineView::dragLeaveEvent(QDragLeaveEvent *pEvent)
+int UIMachineView::dragStart(void)
 {
-    AssertPtrReturnVoid(pEvent);
+    int rc;
 
     if (!dragAndDropIsActive())
-        return;
+        rc = VERR_ACCESS_DENIED;
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    else if (!m_fIsDraggingFromGuest)
+        rc = VERR_WRONG_ORDER;
+    else
+    {
+        /** @todo Add guest->guest DnD functionality here by getting
+         *        the source of guest B (when copying from B to A). */
+        rc = m_pDnDHandler->dragStart(screenId());
 
-    m_pDnDHandler->dragLeave(screenId());
+        m_fIsDraggingFromGuest = false;
+    }
+#else
+    rc = VERR_NOT_SUPPORTED;
+#endif
 
-    pEvent->accept();
+    DNDDEBUG(("DnD: dragStart ended with rc=%Rrc\n", rc));
+    return rc;
 }
 
-void UIMachineView::dragIsPending(void)
+int UIMachineView::dragStop(void)
 {
+    int rc;
+
     if (!dragAndDropIsActive())
-        return;
+        rc = VERR_ACCESS_DENIED;
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    else if (!m_fIsDraggingFromGuest)
+        rc = VERR_WRONG_ORDER;
+    else
+        rc = m_pDnDHandler->dragStop(screenId());
+#else
+    rc = VERR_NOT_SUPPORTED;
+#endif
 
-    /** @todo Add guest->guest DnD functionality here by getting
-     *        the source of guest B (when copying from B to A). */
-    m_pDnDHandler->dragIsPending(screenId());
+    DNDDEBUG(("DnD: dragStop ended with rc=%Rrc\n", rc));
+    return rc;
 }
 
 void UIMachineView::dropEvent(QDropEvent *pEvent)
 {
     AssertPtrReturnVoid(pEvent);
 
-    if (!dragAndDropIsActive())
-        return;
-
-    /* Get mouse-pointer location. */
-    const QPoint &cpnt = viewportToContents(pEvent->pos());
-
-    /* Ask the guest for dropping data. */
-    Qt::DropAction result = m_pDnDHandler->dragDrop(screenId(),
-                                                    frameBuffer()->convertHostXTo(cpnt.x()),
-                                                    frameBuffer()->convertHostYTo(cpnt.y()),
-                                                    pEvent->proposedAction(),
-                                                    pEvent->possibleActions(),
-                                                    pEvent->mimeData());
+    int rc = dragAndDropCanAccept() ? VINF_SUCCESS : VERR_ACCESS_DENIED;
+    if (RT_SUCCESS(rc))
+    {
+        /* Get mouse-pointer location. */
+        const QPoint &cpnt = viewportToContents(pEvent->pos());
+
+        /* Ask the guest for dropping data. */
+        Qt::DropAction result = m_pDnDHandler->dragDrop(screenId(),
+                                                        frameBuffer()->convertHostXTo(cpnt.x()),
+                                                        frameBuffer()->convertHostYTo(cpnt.y()),
+                                                        pEvent->proposedAction(),
+                                                        pEvent->possibleActions(),
+                                                        pEvent->mimeData());
+
+        /* Set the DnD action returned by the guest. */
+        pEvent->setDropAction(result);
+        pEvent->accept();
+    }
 
-    /* Set the DnD action returned by the guest. */
-    pEvent->setDropAction(result);
-    pEvent->accept();
+    DNDDEBUG(("DnD: dropEvent ended with rc=%Rrc\n", rc));
 }
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 
@@ -1597,7 +1690,7 @@ QSize UIMachineView::scaledForward(QSize size) const
     /* Take the scale-factor into account: */
     const double dScaleFactor = frameBuffer()->scaleFactor();
     if (dScaleFactor != 1.0)
-        size = QSize(size.width() * dScaleFactor, size.height() * dScaleFactor);
+        size = QSize((int)(size.width() * dScaleFactor), (int)(size.height() * dScaleFactor));
 
 #ifdef Q_WS_MAC
     /* Take the backing-scale-factor into account: */
@@ -1628,7 +1721,7 @@ QSize UIMachineView::scaledBackward(QSize size) const
     /* Take the scale-factor into account: */
     const double dScaleFactor = frameBuffer()->scaleFactor();
     if (dScaleFactor != 1.0)
-        size = QSize(size.width() / dScaleFactor, size.height() / dScaleFactor);
+        size = QSize((int)(size.width() / dScaleFactor), (int)(size.height() / dScaleFactor));
 
     /* Return result: */
     return size;
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h
index 1ace537..da54750 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h
@@ -93,6 +93,10 @@ public:
     /* Public setters: */
     virtual void setGuestAutoresizeEnabled(bool /* fEnabled */) {}
 
+    /** Send saved guest-screen size-hint to the guest.
+      * @note Reimplemented in sub-classes. Base implementation does nothing. */
+    virtual void resendSizeHint() {}
+
     /** Adjusts guest-screen size to correspond current visual-style.
       * @note Reimplemented in sub-classes. Base implementation does nothing. */
     virtual void adjustGuestScreenSize() {}
@@ -258,8 +262,14 @@ protected:
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
     /**
-     * Returns @true if drag and drop for this machine is active 
-     * (that is, host->guest, guest->host or bidirectional), @false if not. 
+     * Returns @true if the VM window can accept (start is, start) a drag and drop
+     * operation, @false if not.
+     */
+    bool dragAndDropCanAccept(void) const;
+
+    /**
+     * Returns @true if drag and drop for this machine is active
+     * (that is, host->guest, guest->host or bidirectional), @false if not.
      */
     bool dragAndDropIsActive(void) const;
 
@@ -293,7 +303,20 @@ protected:
      * Guest -> Host: Checks for a pending drag and drop event within the guest
      *                and (optionally) starts a drag and drop operation on the host.
      */
-    void dragIsPending(void);
+    int dragCheckPending(void);
+
+    /**
+     * Guest -> Host: Starts a drag and drop operation from guest to the host. This
+     *                internally either uses Qt's abstract QDrag methods or some other
+     *                OS-dependent implementation.
+     */
+    int dragStart(void);
+
+    /**
+     * Guest -> Host: Aborts (and resets) the current (pending) guest to host
+     *                drag and drop operation.
+     */
+    int dragStop(void);
 
     /**
      * Host -> Guest: Issued when the host drops data into the guest (VM) window.
@@ -353,6 +376,11 @@ protected:
 #ifdef VBOX_WITH_DRAG_AND_DROP
     /** Pointer to drag and drop handler instance. */
     UIDnDHandler *m_pDnDHandler;
+# ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    /** Flag indicating whether a guest->host drag currently is in
+     *  progress or not. */
+    bool m_fIsDraggingFromGuest;
+# endif
 #endif
 
     /* Friend classes: */
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp
index 3a39f0c..a23a94c 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp
@@ -229,6 +229,12 @@ void UIMachineWindow::adjustMachineViewSize()
     machineView()->adjustGuestScreenSize();
 }
 
+void UIMachineWindow::sendMachineViewSizeHint()
+{
+    /* Send machine-view size-hint to the guest: */
+    machineView()->resendSizeHint();
+}
+
 #ifdef VBOX_WITH_MASKED_SEAMLESS
 void UIMachineWindow::setMask(const QRegion &region)
 {
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h
index 921c359..8e05bd5 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h
@@ -84,6 +84,9 @@ public:
     /** Adjusts machine-view size to correspond current machine-window size. */
     virtual void adjustMachineViewSize();
 
+    /** Sends machine-view size-hint to the guest. */
+    virtual void sendMachineViewSizeHint();
+
 #ifdef VBOX_WITH_MASKED_SEAMLESS
     /* Virtual caller for base class setMask: */
     virtual void setMask(const QRegion &region);
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp
index f005fd4..7cb9ca6 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp
@@ -956,19 +956,32 @@ bool UIMouseHandler::mouseEvent(int iEventType, ulong uScreenId,
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
 # ifdef VBOX_WITH_DRAG_AND_DROP_GH
+            QPointer<UIMachineView> pView = m_views[uScreenId];
+            bool fHandleDnDPending = RT_BOOL(mouseButtons.testFlag(Qt::LeftButton));
+
+            /* Mouse pointer outside VM window? */
             if (   cpnt.x() < 0
                 || cpnt.x() > iCw - 1
                 || cpnt.y() < 0
                 || cpnt.y() > iCh - 1)
             {
-                bool fHandleDnDPending
-                    = RT_BOOL(mouseButtons.testFlag(Qt::LeftButton));
                 if (fHandleDnDPending)
                 {
-                    m_views[uScreenId]->dragIsPending();
-                    return true;
+                    LogRel2(("DnD: Drag and drop operation from guest to host started\n"));
+
+                    int rc = pView->dragCheckPending();
+                    if (RT_SUCCESS(rc))
+                    {
+                        pView->dragStart();
+                        return true; /* Bail out -- we're done here. */
+                    }
                 }
             }
+            else /* Inside VM window? */
+            {
+                if (fHandleDnDPending)
+                    pView->dragStop();
+            }
 # endif
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp
index f6b061e..7a0badd 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp
@@ -286,7 +286,11 @@ bool UISession::powerUp()
         machineLogic()->adjustMachineWindowsGeometry();
     }
     else
+    {
         msgCenter().showModalProgressDialog(progress, machineName(), ":/progress_start_90px.png");
+        /* After VM start, machine-window(s) size-hint(s) should be sent: */
+        machineLogic()->sendMachineWindowsSizeHints();
+    }
 
     /* Check for progress failure: */
     if (!progress.isOk() || progress.GetResultCode() != 0)
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp
index ab846c2..1b93660 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp
@@ -136,15 +136,22 @@ void UIMachineViewNormal::setGuestAutoresizeEnabled(bool fEnabled)
 
 void UIMachineViewNormal::resendSizeHint()
 {
-    const QSize sizeHint = guestSizeHint();
+    /* Get the last size hint, taking the scale factor into account. */
+    const QSize sizeHint = scaledBackward(guestSizeHint());
     LogRel(("GUI: UIMachineViewNormal::resendSizeHint: Restoring guest size-hint for screen %d to %dx%d\n",
             (int)screenId(), sizeHint.width(), sizeHint.height()));
-    /* Temporarily restrict the size to prevent a brief resize to the
-     * framebuffer dimensions (see @a UIMachineView::sizeHint()) before
-     * the following resize() is acted upon. */
-    setMaximumSize(sizeHint);
-    m_sizeHintOverride = sizeHint;
-    sltPerformGuestResize(sizeHint);
+    if (uisession()->isGuestSupportsGraphics())
+    {
+        /* Temporarily restrict the size to prevent a brief resize to the
+         * framebuffer dimensions (see @a UIMachineView::sizeHint()) before
+         * the following resize() is acted upon.  Expand current limitations
+         * too. */
+        setMaximumSize(sizeHint);
+        m_sizeHintOverride = sizeHint;
+    }
+    /** @todo What if not m_bIsGuestAutoresizeEnabled?  Just let the guest start
+     *        at the default 800x600? */
+    display().SetVideoModeHint(screenId(), true, false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
 }
 
 void UIMachineViewNormal::adjustGuestScreenSize()
diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp
index 79fc2f5..21d5819 100644
--- a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp
@@ -152,10 +152,12 @@ void UIMachineViewScale::applyMachineViewScaleFactor()
 
 void UIMachineViewScale::resendSizeHint()
 {
-    const QSize sizeHint = guestSizeHint();
+    const QSize sizeHint = scaledBackward(guestSizeHint());
     LogRel(("GUI: UIMachineViewScale::resendSizeHint: Restoring guest size-hint for screen %d to %dx%d\n",
             (int)screenId(), sizeHint.width(), sizeHint.height()));
-    sltPerformGuestResize(sizeHint);
+    /* Expand current limitations: */
+    setMaxGuestSize(sizeHint);
+    display().SetVideoModeHint(screenId(), true, false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
 }
 
 QSize UIMachineViewScale::sizeHint() const
diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp
index b438619..80cc84c 100644
--- a/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp
@@ -326,7 +326,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Ungroup"));
-        setStatusTip(QApplication::translate("UIActionPool", "Ungroup the items of selected virtual machine group"));
+        setStatusTip(QApplication::translate("UIActionPool", "Ungroup items of selected virtual machine group"));
     }
 };
 
@@ -349,7 +349,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Sort"));
-        setStatusTip(QApplication::translate("UIActionPool", "Sort the items of selected virtual machine group alphabetically"));
+        setStatusTip(QApplication::translate("UIActionPool", "Sort items of selected virtual machine group alphabetically"));
     }
 };
 
@@ -601,9 +601,7 @@ class UIActionSimpleStartNormal : public UIActionSimple
 public:
 
     UIActionSimpleStartNormal(UIActionPool *pParent)
-        : UIActionSimple(pParent,
-                         ":/vm_start_32px.png", ":/vm_start_16px.png",
-                         ":/vm_start_disabled_32px.png", ":/vm_start_disabled_16px.png") {}
+        : UIActionSimple(pParent, ":/vm_start_16px.png") {}
 
 protected:
 
@@ -626,9 +624,7 @@ class UIActionSimpleStartHeadless : public UIActionSimple
 public:
 
     UIActionSimpleStartHeadless(UIActionPool *pParent)
-        : UIActionSimple(pParent,
-                         ":/vm_start_32px.png", ":/vm_start_16px.png",
-                         ":/vm_start_disabled_32px.png", ":/vm_start_disabled_16px.png") {}
+        : UIActionSimple(pParent, ":/vm_start_headless_16px.png") {}
 
 protected:
 
@@ -651,9 +647,7 @@ class UIActionSimpleStartDetachable : public UIActionSimple
 public:
 
     UIActionSimpleStartDetachable(UIActionPool *pParent)
-        : UIActionSimple(pParent,
-                         ":/vm_start_32px.png", ":/vm_start_16px.png",
-                         ":/vm_start_disabled_32px.png", ":/vm_start_disabled_16px.png") {}
+        : UIActionSimple(pParent, ":/vm_start_separate_16px.png") {}
 
 protected:
 
@@ -665,7 +659,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Detachable Start"));
-        setStatusTip(QApplication::translate("UIActionPool", "Start selected virtual machines with the option of continuing them in the background"));
+        setStatusTip(QApplication::translate("UIActionPool", "Start selected virtual machines with option of continuing in background"));
     }
 };
 
@@ -693,7 +687,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Pause"));
-        setStatusTip(QApplication::translate("UIActionPool", "Suspend the execution of selected virtual machines"));
+        setStatusTip(QApplication::translate("UIActionPool", "Suspend execution of selected virtual machines"));
     }
 };
 
@@ -752,7 +746,7 @@ protected:
     {
         setIconText(QApplication::translate("UIActionPool", "Discard"));
         setName(QApplication::translate("UIActionPool", "D&iscard Saved State..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Discard the saved state of selected virtual machines"));
+        setStatusTip(QApplication::translate("UIActionPool", "Discard saved state of selected virtual machines"));
         setToolTip(text().remove('&').remove('.') +
                    (shortcut().toString().isEmpty() ? "" : QString(" (%1)").arg(shortcut().toString())));
     }
@@ -787,7 +781,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "Show &Log..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Show the log files of selected virtual machines"));
+        setStatusTip(QApplication::translate("UIActionPool", "Show log files of selected virtual machines"));
     }
 };
 
@@ -812,7 +806,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "Re&fresh"));
-        setStatusTip(QApplication::translate("UIActionPool", "Refresh the accessibility state of selected virtual machines"));
+        setStatusTip(QApplication::translate("UIActionPool", "Refresh accessibility state of selected virtual machines"));
     }
 };
 
@@ -894,7 +888,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Sort"));
-        setStatusTip(QApplication::translate("UIActionPool", "Sort the group of first selected virtual machine alphabetically"));
+        setStatusTip(QApplication::translate("UIActionPool", "Sort group of first selected virtual machine alphabetically"));
     }
 };
 
@@ -940,7 +934,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "&Save State"));
-        setStatusTip(QApplication::translate("UIActionPool", "Save the state of selected virtual machines"));
+        setStatusTip(QApplication::translate("UIActionPool", "Save state of selected virtual machines"));
     }
 };
 
@@ -968,7 +962,7 @@ protected:
     void retranslateUi()
     {
         setName(QApplication::translate("UIActionPool", "ACPI Sh&utdown"));
-        setStatusTip(QApplication::translate("UIActionPool", "Send the ACPI Shutdown signal to selected virtual machines"));
+        setStatusTip(QApplication::translate("UIActionPool", "Send ACPI Shutdown signal to selected virtual machines"));
     }
 };
 
diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
index 752afd4..9fe78c0 100644
--- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
@@ -1628,8 +1628,8 @@ void UISelectorWindow::loadSettings()
         if (sizes[0] == 0 && sizes[1] == 0)
         {
             /* Propose some 'default' based on current dialog width: */
-            sizes[0] = (double)width()     / 3 * .9;
-            sizes[1] = (double)width() * 2 / 3 * .9;
+            sizes[0] = (int)(width() * .9 * (1.0 / 3));
+            sizes[1] = (int)(width() * .9 * (2.0 / 3));
         }
         /* Pass hints to the splitter: */
         m_pSplitter->setSizes(sizes);
diff --git a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp
index b764510..fc50c3d 100644
--- a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp
@@ -390,7 +390,7 @@ VBoxSnapshotsWgt::VBoxSnapshotsWgt (QWidget *aParent)
 
     /* Determine icon metric: */
     const QStyle *pStyle = QApplication::style();
-    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize) * 1.375;
+    const int iIconMetric = (int)(pStyle->pixelMetric(QStyle::PM_SmallIconSize) * 1.375);
 
     /* ToolBar creation */
     UIToolBar *toolBar = new UIToolBar (this);
diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp
index 9be3f9f..6704f78 100644
--- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp
@@ -750,7 +750,7 @@ void UIGDetailsUpdateThreadNetwork::run()
                             QString strGenericDriverProperties(summarizeGenericProperties(adapter));
                             strAttachmentType = strGenericDriverProperties.isNull() ?
                                       strAttachmentType.arg(QApplication::translate("UIGDetails", "Generic Driver, '%1'", "details (network)").arg(adapter.GetGenericDriver())) :
-                                      strAttachmentType.arg(QApplication::translate("UIGDetails", "Generic Driver, '%1' { %2 }", "details (network)")
+                                      strAttachmentType.arg(QApplication::translate("UIGDetails", "Generic Driver, '%1' { %2 }", "details (network)")
                                                             .arg(adapter.GetGenericDriver(), strGenericDriverProperties));
                             break;
                         }
diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp
index 9edcf28..2b30e3d 100644
--- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp
@@ -536,7 +536,7 @@ QSize UIGMachinePreview::imageAspectRatioSize(const QSize &hostSize, const QSize
         /* Get host width: */
         iWidth = hostSize.width();
         /* And calculate height based on guest aspect ratio: */
-        iHeight = (double)iWidth / dGuestAspectRatio;
+        iHeight = (int)((double)iWidth / dGuestAspectRatio);
         /* But no more than host height: */
         iHeight = qMin(iHeight, hostSize.height());
     }
@@ -546,7 +546,7 @@ QSize UIGMachinePreview::imageAspectRatioSize(const QSize &hostSize, const QSize
         /* Get host height: */
         iHeight = hostSize.height();
         /* And calculate width based on guest aspect ratio: */
-        iWidth = (double)iHeight * dGuestAspectRatio;
+        iWidth = (int)((double)iHeight * dGuestAspectRatio);
         /* But no more than host width: */
         iWidth = qMin(iWidth, hostSize.width());
     }
diff --git a/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp b/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp
index 7909d30..010ade3 100644
--- a/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp
@@ -197,7 +197,7 @@ VBoxSettingsTreeViewSelector::VBoxSettingsTreeViewSelector (QWidget *aParent /*
     mTwSelector->setHorizontalScrollBarPolicy (Qt::ScrollBarAlwaysOff);
     mTwSelector->setRootIsDecorated (false);
     mTwSelector->setUniformRowHeights (true);
-    mTwSelector->setIconSize(QSize(1.5 * iIconMetric, 1.5 * iIconMetric));
+    mTwSelector->setIconSize(QSize((int)(1.5 * iIconMetric), (int)(1.5 * iIconMetric)));
     /* Add the columns */
     mTwSelector->headerItem()->setText (treeWidget_Category, "Category");
     mTwSelector->headerItem()->setText (treeWidget_Id, "[id]");
diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.ui b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.ui
index 2ff9e65..dc5236b 100644
--- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.ui
+++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.ui
@@ -185,7 +185,7 @@
           <string>&Enable Server</string>
          </property>
          <property name="toolTip">
-          <string>When checked, the DHCP Server will be enabled for this network on machine startup.</string>
+          <string>When checked, the DHCP Server will be enabled for this network on machine start-up.</string>
          </property>
         </widget>
        </item>
diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.ui b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.ui
index e9204ce..e8abec1 100644
--- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.ui
+++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.ui
@@ -129,7 +129,7 @@
       </item>
       <item row="5" column="2">
        <widget class="QPushButton" name="m_pButtonPortForwarding">
-        <property name="whatsThis">
+        <property name="toolTip">
          <string>Displays a window to configure port forwarding rules.</string>
         </property>
         <property name="text">
diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
index 375e21e..760070e 100644
--- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
@@ -153,7 +153,7 @@ void UIMachineSettingsDisplay::getFromCache()
 
     /* Load Screen data to page: */
     m_pEditorVideoScreenCount->setValue(displayData.m_cGuestScreenCount);
-    m_pEditorGuestScreenScale->setValue(displayData.m_dScaleFactor * 100);
+    m_pEditorGuestScreenScale->setValue((int)(displayData.m_dScaleFactor * 100));
 #ifdef Q_WS_MAC
     m_pCheckBoxUnscaledHiDPIOutput->setChecked(displayData.m_fUseUnscaledHiDPIOutput);
 #endif /* Q_WS_MAC */
diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp
index f0a3764..ed26749 100644
--- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp
@@ -62,7 +62,7 @@ UIMachineSettingsNetwork::UIMachineSettingsNetwork(UIMachineSettingsNetworkPage
 
     /* Determine icon metric: */
     const QStyle *pStyle = QApplication::style();
-    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize) * .625;
+    const int iIconMetric = (int)(pStyle->pixelMetric(QStyle::PM_SmallIconSize) * .625);
 
     /* Setup widgets: */
     m_pAdapterNameCombo->setInsertPolicy(QComboBox::NoInsert);
@@ -990,16 +990,20 @@ void UIMachineSettingsNetworkPage::saveFromCacheTo(QVariant &data)
                         /* Cable connected flag: */
                         adapter.SetCableConnected(adapterData.m_fCableConnected);
                         /* Redirect options: */
-                        QVector<QString> oldRedirects = adapter.GetNATEngine().GetRedirects();
-                        for (int i = 0; i < oldRedirects.size(); ++i)
-                            adapter.GetNATEngine().RemoveRedirect(oldRedirects[i].section(',', 0, 0));
-                        UIPortForwardingDataList newRedirects = adapterData.m_redirects;
-                        for (int i = 0; i < newRedirects.size(); ++i)
+                        if (adapterCache.base().m_attachmentType == KNetworkAttachmentType_NAT ||
+                            adapterCache.data().m_attachmentType == KNetworkAttachmentType_NAT)
                         {
-                            UIPortForwardingData newRedirect = newRedirects[i];
-                            adapter.GetNATEngine().AddRedirect(newRedirect.name, newRedirect.protocol,
-                                                               newRedirect.hostIp, newRedirect.hostPort.value(),
-                                                               newRedirect.guestIp, newRedirect.guestPort.value());
+                            QVector<QString> oldRedirects = adapter.GetNATEngine().GetRedirects();
+                            for (int i = 0; i < oldRedirects.size(); ++i)
+                                adapter.GetNATEngine().RemoveRedirect(oldRedirects[i].section(',', 0, 0));
+                            UIPortForwardingDataList newRedirects = adapterData.m_redirects;
+                            for (int i = 0; i < newRedirects.size(); ++i)
+                            {
+                                UIPortForwardingData newRedirect = newRedirects[i];
+                                adapter.GetNATEngine().AddRedirect(newRedirect.name, newRedirect.protocol,
+                                                                   newRedirect.hostIp, newRedirect.hostPort.value(),
+                                                                   newRedirect.guestIp, newRedirect.guestPort.value());
+                            }
                         }
                     }
                 }
diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp
index c1c9f2e..7766d4d 100644
--- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp
@@ -2926,7 +2926,7 @@ void UIMachineSettingsStorage::sltPrepareOpenMediumMenu()
                 addRecentMediumActions(pOpenMediumMenu, m_pMediumIdHolder->type());
                 /* Add "Eject current medium" action: */
                 pOpenMediumMenu->addSeparator();
-                QAction *pEjectCurrentMedium = pOpenMediumMenu->addAction(tr("Remove Disk From Virtual Drive"));
+                QAction *pEjectCurrentMedium = pOpenMediumMenu->addAction(tr("Remove Disk from Virtual Drive"));
                 pEjectCurrentMedium->setEnabled(!m_pMediumIdHolder->isNull());
                 pEjectCurrentMedium->setIcon(iconPool()->icon(CDUnmountEnabled, CDUnmountDisabled));
                 connect(pEjectCurrentMedium, SIGNAL(triggered(bool)), this, SLOT(sltUnmountDevice()));
@@ -2942,7 +2942,7 @@ void UIMachineSettingsStorage::sltPrepareOpenMediumMenu()
                 addRecentMediumActions(pOpenMediumMenu, m_pMediumIdHolder->type());
                 /* Add "Eject current medium" action: */
                 pOpenMediumMenu->addSeparator();
-                QAction *pEjectCurrentMedium = pOpenMediumMenu->addAction(tr("Remove Disk From Virtual Drive"));
+                QAction *pEjectCurrentMedium = pOpenMediumMenu->addAction(tr("Remove Disk from Virtual Drive"));
                 pEjectCurrentMedium->setEnabled(!m_pMediumIdHolder->isNull());
                 pEjectCurrentMedium->setIcon(iconPool()->icon(FDUnmountEnabled, FDUnmountDisabled));
                 connect(pEjectCurrentMedium, SIGNAL(triggered(bool)), this, SLOT(sltUnmountDevice()));
diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp
index 1b721a8..1c1d58c 100644
--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp
@@ -337,6 +337,10 @@ void UIProgressDialog::handleTimerEvent()
         /* Then cancel button: */
         m_fCancelEnabled = m_progress.GetCancelable();
         m_pCancelBtn->setEnabled(m_fCancelEnabled);
+
+        /* Notify listeners about the operation progress update: */
+        emit sigProgressChange(m_cOperations, m_progress.GetOperationDescription(),
+                               m_progress.GetOperation() + 1, m_progress.GetPercent());
     }
     else
         m_pEtaLbl->setText(m_strCancel);
diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h b/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h
index 68e4664..5183851 100644
--- a/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h
+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h
@@ -57,6 +57,16 @@ public:
     /* API: Run stuff: */
     int run(int aRefreshInterval);
 
+signals:
+
+    /** Notifies listeners about wrapped CProgress change.
+      * @param iOperations  holds the number of operations CProgress have,
+      * @param strOperation holds the description of the current CProgress operation,
+      * @param iOperation   holds the index of the current CProgress operation,
+      * @param iPercent     holds the percentage of the current CProgress operation. */
+    void sigProgressChange(ulong iOperations, QString strOperation,
+                           ulong iOperation, ulong iPercent);
+
 public slots:
 
     /* Handler: Show stuff: */
diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp
index 2311485..c0ed299 100644
--- a/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp
@@ -386,7 +386,7 @@ QTextLayout* UIGraphicsTextPane::buildTextLayout(const QFont &font, QPaintDevice
         line.setLineWidth(iWidth);
         iHeight += iLeading;
         line.setPosition(QPointF(0, iHeight));
-        iHeight += line.height();
+        iHeight += (int)line.height();
     }
     pTextLayout->endLayout();
 
diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
index 12a8d7a..bd71027 100644
--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
@@ -50,6 +50,7 @@ UIWizardNewVM::UIWizardNewVM(QWidget *pParent, const QString &strGroup /* = QStr
     , m_iSCSICount(0)
     , m_iFloppyCount(0)
     , m_iSASCount(0)
+    , m_iUSBCount(0)
 {
 #ifndef Q_WS_MAC
     /* Assign watermark: */
@@ -102,6 +103,8 @@ bool UIWizardNewVM::createVM()
 
     /* Selecting recommended Audio Controller: */
     m_machine.GetAudioAdapter().SetAudioController(type.GetRecommendedAudioController());
+    /* And the Audio Codec: */
+    m_machine.GetAudioAdapter().SetAudioCodec(type.GetRecommendedAudioCodec());
     /* Enabling audio by default: */
     m_machine.GetAudioAdapter().SetEnabled(true);
 
@@ -363,6 +366,14 @@ QString UIWizardNewVM::getNextControllerName(KStorageBus type)
                 strControllerName = QString("%1 %2").arg(strControllerName).arg(m_iSASCount);
             break;
         }
+        case KStorageBus_USB:
+        {
+            strControllerName = "USB";
+            ++m_iUSBCount;
+            if (m_iUSBCount > 1)
+                strControllerName = QString("%1 %2").arg(strControllerName).arg(m_iUSBCount);
+            break;
+        }
         default:
             break;
     }
diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h
index 729fa95..113f159 100644
--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h
+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h
@@ -77,6 +77,7 @@ private:
     int m_iSCSICount;
     int m_iFloppyCount;
     int m_iSASCount;
+    int m_iUSBCount;
 };
 
 #endif // __UIWizardNewVM_h__
diff --git a/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp b/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp
index 7c0d101..07e7a25 100644
--- a/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp
+++ b/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp
@@ -261,7 +261,7 @@ typedef struct HGSMIBUFFERCONTEXT
 } HGSMIBUFFERCONTEXT;
 
 /** Verify that the given offBuffer points to a valid buffer, which is within the area.
- * 
+ *
  * @returns VBox status and the buffer information in pBufferContext.
  * @param pArea          Area which supposed to contain the buffer.
  * @param offBuffer      The buffer location in the area.
diff --git a/src/VBox/GuestHost/HGSMI/Makefile.kmk b/src/VBox/GuestHost/HGSMI/Makefile.kmk
index cbff775..723a777 100644
--- a/src/VBox/GuestHost/HGSMI/Makefile.kmk
+++ b/src/VBox/GuestHost/HGSMI/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/GuestHost/Makefile.kmk b/src/VBox/GuestHost/Makefile.kmk
index dd27344..8fb8a48 100644
--- a/src/VBox/GuestHost/Makefile.kmk
+++ b/src/VBox/GuestHost/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2008-2014 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/GuestHost/OpenGL/Makefile.kmk b/src/VBox/GuestHost/OpenGL/Makefile.kmk
index ddbc933..eb2f0f6 100644
--- a/src/VBox/GuestHost/OpenGL/Makefile.kmk
+++ b/src/VBox/GuestHost/OpenGL/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2008-2013 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/GuestHost/OpenGL/include/cr_hash.h b/src/VBox/GuestHost/OpenGL/include/cr_hash.h
index 0f28c79..5130261 100644
--- a/src/VBox/GuestHost/OpenGL/include/cr_hash.h
+++ b/src/VBox/GuestHost/OpenGL/include/cr_hash.h
@@ -20,6 +20,7 @@ typedef struct CRHashTable CRHashTable;
 
 /* Callback function used for freeing/deleting table entries */
 typedef void (*CRHashtableCallback)(void *data);
+typedef void (*CRHashtableCallbackEx)(void *data1, void *data2);
 /* Callback function used for walking through table entries */
 typedef void (*CRHashtableWalkCallback)(unsigned long key, void *data1, void *data2);
 /* Callback function used for walking through allocated keys */
@@ -38,6 +39,7 @@ DECLEXPORT(void) crHashIdWalkKeys( CRHashIdPool *pool, CRHashIdWalkKeys walkFunc
 DECLEXPORT(CRHashTable *) crAllocHashtable( void );
 DECLEXPORT(CRHashTable *) crAllocHashtableEx( GLuint min, GLuint max );
 DECLEXPORT(void) crFreeHashtable( CRHashTable *hash, CRHashtableCallback deleteCallback );
+DECLEXPORT(void) crFreeHashtableEx( CRHashTable *hash, CRHashtableCallbackEx deleteCallback, void *pData );
 DECLEXPORT(void) crHashtableAdd( CRHashTable *h, unsigned long key, void *data );
 /* to ensure hash table pool id consistency, there is no crHashTableFreeKeys/UnregisterKey,
  * one should call crHashtableDelete to free unneeded keys, 
@@ -46,6 +48,7 @@ DECLEXPORT(GLuint) crHashtableAllocKeys( CRHashTable *h, GLsizei range );
 /* @return GL_TRUE if the id is allocated, and GL_FALSE if the id was already allocated */
 DECLEXPORT(GLboolean) crHashtableAllocRegisterKey( CRHashTable *h,  GLuint key);
 DECLEXPORT(void) crHashtableDelete( CRHashTable *h, unsigned long key, CRHashtableCallback deleteCallback );
+DECLEXPORT(void) crHashtableDeleteEx( CRHashTable *h, unsigned long key, CRHashtableCallbackEx deleteCallback, void *pData );
 DECLEXPORT(void) crHashtableDeleteBlock( CRHashTable *h, unsigned long key, GLsizei range, CRHashtableCallback deleteFunc );
 DECLEXPORT(void *) crHashtableSearch( const CRHashTable *h, unsigned long key );
 DECLEXPORT(void) crHashtableReplace( CRHashTable *h, unsigned long key, void *data, CRHashtableCallback deleteFunc);
diff --git a/src/VBox/GuestHost/OpenGL/spu_loader/dispatchheader.py b/src/VBox/GuestHost/OpenGL/spu_loader/dispatchheader.py
index 9249291..972f30c 100644
--- a/src/VBox/GuestHost/OpenGL/spu_loader/dispatchheader.py
+++ b/src/VBox/GuestHost/OpenGL/spu_loader/dispatchheader.py
@@ -48,6 +48,10 @@ print ''
 
 print 'struct _copy_list_node;'
 print ''
+print '/* Prototype for SPU internal state load/unload callbacks. */'
+print ''
+print 'typedef int (*SPUStateFunc_t)(void *);'
+print ''
 print '/* The SPU dispatch table */'
 print 'typedef struct _spu_dispatch_table {'
 
@@ -59,6 +63,8 @@ print """
 	struct _spu_dispatch_table *copy_of;
 	int mark;
 	void *server;		
+	SPUStateFunc_t spu_save_state; /* Save SPU internal state callback (optional) */
+	SPUStateFunc_t spu_load_state; /* Load SPU internal state callback (optional) */
 } SPUDispatchTable;
 
 struct _copy_list_node {
diff --git a/src/VBox/GuestHost/OpenGL/util/hash.c b/src/VBox/GuestHost/OpenGL/util/hash.c
index 46c782e..b247360 100644
--- a/src/VBox/GuestHost/OpenGL/util/hash.c
+++ b/src/VBox/GuestHost/OpenGL/util/hash.c
@@ -432,6 +432,47 @@ void crFreeHashtable( CRHashTable *hash, CRHashtableCallback deleteFunc )
     crFree( hash );
 }
 
+void crFreeHashtableEx(CRHashTable *hash, CRHashtableCallbackEx deleteFunc, void *pData)
+{
+    int i;
+    CRHashNode *entry, *next;
+
+    if (!hash) return;
+
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&hash->mutex);
+#endif
+
+    for (i = 0; i < CR_NUM_BUCKETS; i++)
+    {
+        entry = hash->buckets[i];
+        while (entry)
+        {
+            next = entry->next;
+            /* Clear the key in case crHashtableDelete() is called
+             * from this callback.
+             */
+            entry->key = 0;
+            if (deleteFunc && entry->data)
+            {
+                (*deleteFunc)(entry->data, pData);
+            }
+            crFree(entry);
+            entry = next;
+
+        }
+    }
+    crFreeHashIdPool(hash->idPool);
+
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&hash->mutex);
+    crFreeMutex(&hash->mutex);
+#endif
+
+    crFree(hash);
+}
+
+
 void crHashtableLock(CRHashTable *h)
 {
 #ifdef CHROMIUM_THREADSAFE
@@ -584,6 +625,41 @@ void crHashtableDelete( CRHashTable *h, unsigned long key, CRHashtableCallback d
 #endif
 }
 
+void crHashtableDeleteEx(CRHashTable *h, unsigned long key, CRHashtableCallbackEx deleteFunc, void *pData)
+{
+    unsigned int index = crHash( key );
+    CRHashNode *temp, *beftemp = NULL;
+
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&h->mutex);
+#endif
+    for (temp = h->buckets[index]; temp; temp = temp->next)
+    {
+        if (temp->key == key)
+            break;
+        beftemp = temp;
+    }
+    if (temp)
+    {
+        if (beftemp)
+            beftemp->next = temp->next;
+        else
+            h->buckets[index] = temp->next;
+        h->num_elements--;
+        if (temp->data && deleteFunc) {
+            (*deleteFunc)(temp->data, pData);
+        }
+
+        crFree(temp);
+    }
+
+    crHashIdPoolFreeBlock(h->idPool, key, 1);
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&h->mutex);
+#endif
+}
+
+
 void crHashtableDeleteBlock( CRHashTable *h, unsigned long key, GLsizei range, CRHashtableCallback deleteFunc )
 {
     /* XXX optimize someday */
diff --git a/src/VBox/GuestHost/OpenGL/util/util.def b/src/VBox/GuestHost/OpenGL/util/util.def
index cea8698..2b7ad85 100644
--- a/src/VBox/GuestHost/OpenGL/util/util.def
+++ b/src/VBox/GuestHost/OpenGL/util/util.def
@@ -77,6 +77,7 @@ crGetenv
 crSetenv
 crHashtableAdd
 crHashtableDelete
+crHashtableDeleteEx
 crHashtableSearch
 crHashtableReplace
 crHashtableNumElements
@@ -86,6 +87,7 @@ crHashtableAllocRegisterKey
 crAllocHashtable
 crAllocHashtableEx
 crFreeHashtable
+crFreeHashtableEx
 crHashtableGetDataKey
 crDetermineEndianness
 SWAPDOUBLE
diff --git a/src/VBox/GuestHost/OpenGL/util/vreg.cpp b/src/VBox/GuestHost/OpenGL/util/vreg.cpp
index f47f3d0..58da0e3 100644
--- a/src/VBox/GuestHost/OpenGL/util/vreg.cpp
+++ b/src/VBox/GuestHost/OpenGL/util/vreg.cpp
@@ -1591,9 +1591,7 @@ VBOXVREGDECL(int) VBoxVrCompositorEntryListIntersectAll(PVBOXVR_COMPOSITOR pComp
         bool fTmpChanged = false;
         int tmpRc = VBoxVrCompositorEntryListIntersect(pCompositor, pEntry, pList2, &fTmpChanged);
         if (RT_SUCCESS(tmpRc))
-        {
-            fChanged |= fChanged;
-        }
+            fChanged |= fTmpChanged;
         else
         {
             WARN(("VBoxVrCompositorEntryRegionsIntersect failed, rc %d", tmpRc));
@@ -1621,9 +1619,7 @@ VBOXVREGDECL(int) VBoxVrCompositorEntryRegionsIntersectAll(PVBOXVR_COMPOSITOR pC
         bool fTmpChanged = false;
         int tmpRc = VBoxVrCompositorEntryRegionsIntersect(pCompositor, pEntry, cRegions, paRegions, &fTmpChanged);
         if (RT_SUCCESS(tmpRc))
-        {
-            fChanged |= fChanged;
-        }
+            fChanged |= fTmpChanged;
         else
         {
             WARN(("VBoxVrCompositorEntryRegionsIntersect failed, rc %d", tmpRc));
diff --git a/src/VBox/GuestHost/SharedClipboard/Makefile.kmk b/src/VBox/GuestHost/SharedClipboard/Makefile.kmk
index f5c8a12..6c21ab1 100644
--- a/src/VBox/GuestHost/SharedClipboard/Makefile.kmk
+++ b/src/VBox/GuestHost/SharedClipboard/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Makefile.kmk b/src/VBox/HostDrivers/Makefile.kmk
index 72fa72b..ed97a78 100644
--- a/src/VBox/HostDrivers/Makefile.kmk
+++ b/src/VBox/HostDrivers/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -35,7 +35,7 @@ if  !defined(VBOX_ONLY_DOCS) \
    include $(PATH_SUB_CURRENT)/VBoxNetFlt/Makefile.kmk
   endif
  endif
- if1of ($(KBUILD_TARGET), darwin solaris linux freebsd)
+ if1of ($(KBUILD_TARGET), darwin solaris win linux freebsd)
   ifdef VBOX_WITH_NETADP
    include $(PATH_SUB_CURRENT)/VBoxNetAdp/Makefile.kmk
   else
diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk
index e455f46..82cd9b8 100644
--- a/src/VBox/HostDrivers/Support/Makefile.kmk
+++ b/src/VBox/HostDrivers/Support/Makefile.kmk
@@ -556,6 +556,9 @@ if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
  VBoxDrv_DEFS            += VBOX_PERMIT_MORE VBOX_PERMIT_EVEN_MORE
  #VBoxDrv_DEFS.debug      += DEBUG_DARWIN_GIP
  VBoxDrv_DEFS.darwin     := VBOX_WITH_HOST_VMX
+ ifdef VBOX_WITH_RAW_MODE
+  VBoxDrv_DEFS.darwin    += VBOX_WITH_RAW_MODE
+ endif
  VBoxDrv_DEFS.linux      := \
 	KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) MODULE CONFIG_VBOXDRV_AS_MISC
  ifdef VBOX_LINUX_VERSION_2_4
diff --git a/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp b/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp
index fcfb3cc..67ad6dc 100644
--- a/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp
+++ b/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPDrv.cpp b/src/VBox/HostDrivers/Support/SUPDrv.cpp
index 9a6458e..e66cea3 100644
--- a/src/VBox/HostDrivers/Support/SUPDrv.cpp
+++ b/src/VBox/HostDrivers/Support/SUPDrv.cpp
@@ -3759,6 +3759,10 @@ SUPR0DECL(void) SUPR0ResumeVTxOnCpu(bool fSuspended)
  *                                really can use VT-x or not.
  *
  * @remarks Must be called with preemption disabled.
+ *          The caller is also expected to check that the CPU is an Intel (or
+ *          VIA) CPU -and- that it supports VT-x.  Otherwise, this function
+ *          might throw a #GP fault as it tries to read/write MSRs that may not
+ *          be present!
  */
 SUPR0DECL(int) SUPR0GetVmxUsability(bool *pfIsSmxModeAmbiguous)
 {
@@ -3809,26 +3813,51 @@ SUPR0DECL(int) SUPR0GetVmxUsability(bool *pfIsSmxModeAmbiguous)
     else
     {
         /*
-         * MSR is not yet locked; we can change it ourselves here.
-         * Once the lock bit is set, this MSR can no longer be modified.
+         * MSR is not yet locked; we can change it ourselves here. Once the lock bit is set,
+         * this MSR can no longer be modified.
          *
-         * Set both the VMXON and SMX_VMXON bits as we can't determine SMX mode
+         * Set both the VMXON and SMX_VMXON bits (if supported) as we can't determine SMX mode
          * accurately. See @bugref{6873}.
+         *
+         * The reason we are being paranoid here and (re)checking is that we don't assume all callers
+         * of this function to check it like SUPR0QueryVTCaps() currently does. If we get something
+         * wrong here, we can throw a #GP and panic the box. This isn't a performance critical path.
          */
-        u64FeatMsr |= MSR_IA32_FEATURE_CONTROL_LOCK
-                    | MSR_IA32_FEATURE_CONTROL_SMX_VMXON
-                    | MSR_IA32_FEATURE_CONTROL_VMXON;
-        ASMWrMsr(MSR_IA32_FEATURE_CONTROL, u64FeatMsr);
-
-        /* Verify. */
-        u64FeatMsr     = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);
-        fMsrLocked     = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_LOCK);
-        fSmxVmxAllowed = fMsrLocked && RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_SMX_VMXON);
-        fVmxAllowed    = fMsrLocked && RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_VMXON);
-        if (fSmxVmxAllowed && fVmxAllowed)
-            rc = VINF_SUCCESS;
+        uint32_t fFeaturesECX, uDummy;
+        uint32_t uMaxId, uVendorEBX, uVendorECX, uVendorEDX;
+        ASMCpuId(0, &uMaxId, &uVendorEBX, &uVendorECX, &uVendorEDX);
+        ASMCpuId(1, &uDummy, &uDummy, &fFeaturesECX, &uDummy);
+        if (   ASMIsValidStdRange(uMaxId)
+            && (   ASMIsIntelCpuEx(     uVendorEBX, uVendorECX, uVendorEDX)
+                || ASMIsViaCentaurCpuEx(uVendorEBX, uVendorECX, uVendorEDX)))
+        {
+            bool fSmxVmxHwSupport = false;
+            if (   (fFeaturesECX & X86_CPUID_FEATURE_ECX_VMX)
+                && (fFeaturesECX & X86_CPUID_FEATURE_ECX_SMX))
+                fSmxVmxHwSupport = true;
+
+            u64FeatMsr |= MSR_IA32_FEATURE_CONTROL_LOCK
+                        | MSR_IA32_FEATURE_CONTROL_VMXON;
+            if (fSmxVmxHwSupport)
+                u64FeatMsr |= MSR_IA32_FEATURE_CONTROL_SMX_VMXON;
+
+            /* Commit. */
+            ASMWrMsr(MSR_IA32_FEATURE_CONTROL, u64FeatMsr);
+
+            /* Verify. */
+            u64FeatMsr     = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);
+            fMsrLocked     = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_LOCK);
+            fSmxVmxAllowed = fMsrLocked && RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_SMX_VMXON);
+            fVmxAllowed    = fMsrLocked && RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_VMXON);
+            if (   fVmxAllowed
+                && (   !fSmxVmxHwSupport
+                    || fSmxVmxAllowed))
+                rc = VINF_SUCCESS;
+            else
+                rc = VERR_VMX_MSR_LOCKING_FAILED;
+        }
         else
-            rc = VERR_VMX_MSR_LOCKING_FAILED;
+            rc = VERR_VMX_IPE_5;
     }
 
     if (pfIsSmxModeAmbiguous)
@@ -3898,10 +3927,9 @@ SUPR0DECL(int) SUPR0GetSvmUsability(bool fInitSvm)
  * @retval  VERR_UNSUPPORTED_CPU if not identifiable as an AMD, Intel or VIA
  *          (centaur) CPU.
  *
- * @param   pSession        The session handle.
  * @param   pfCaps          Where to store the capabilities.
  */
-SUPR0DECL(int) SUPR0QueryVTCaps(PSUPDRVSESSION pSession, uint32_t *pfCaps)
+int VBOXCALL supdrvQueryVTCapsInternal(uint32_t *pfCaps)
 {
     int  rc = VERR_UNSUPPORTED_CPU;
     bool fIsSmxModeAmbiguous = false;
@@ -3910,7 +3938,6 @@ SUPR0DECL(int) SUPR0QueryVTCaps(PSUPDRVSESSION pSession, uint32_t *pfCaps)
     /*
      * Input validation.
      */
-    AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
     AssertPtrReturn(pfCaps, VERR_INVALID_POINTER);
 
     *pfCaps = 0;
@@ -3993,6 +4020,36 @@ SUPR0DECL(int) SUPR0QueryVTCaps(PSUPDRVSESSION pSession, uint32_t *pfCaps)
     return rc;
 }
 
+/**
+ * Queries the AMD-V and VT-x capabilities of the calling CPU.
+ *
+ * @returns VBox status code.
+ * @retval  VERR_VMX_NO_VMX
+ * @retval  VERR_VMX_MSR_ALL_VMXON_DISABLED
+ * @retval  VERR_VMX_MSR_VMXON_DISABLED
+ * @retval  VERR_VMX_MSR_LOCKING_FAILED
+ * @retval  VERR_SVM_NO_SVM
+ * @retval  VERR_SVM_DISABLED
+ * @retval  VERR_UNSUPPORTED_CPU if not identifiable as an AMD, Intel or VIA
+ *          (centaur) CPU.
+ *
+ * @param   pSession        The session handle.
+ * @param   pfCaps          Where to store the capabilities.
+ */
+SUPR0DECL(int) SUPR0QueryVTCaps(PSUPDRVSESSION pSession, uint32_t *pfCaps)
+{
+    /*
+     * Input validation.
+     */
+    AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pfCaps, VERR_INVALID_POINTER);
+
+    /*
+     * Call common worker.
+     */
+    return supdrvQueryVTCapsInternal(pfCaps);
+}
+
 
 /**
  * Register a component factory with the support driver.
diff --git a/src/VBox/HostDrivers/Support/SUPDrv.d b/src/VBox/HostDrivers/Support/SUPDrv.d
index e83aadf..eff80be 100644
--- a/src/VBox/HostDrivers/Support/SUPDrv.d
+++ b/src/VBox/HostDrivers/Support/SUPDrv.d
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPDrvIDC.h b/src/VBox/HostDrivers/Support/SUPDrvIDC.h
index 7de0224..6e0ee73 100644
--- a/src/VBox/HostDrivers/Support/SUPDrvIDC.h
+++ b/src/VBox/HostDrivers/Support/SUPDrvIDC.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPDrvInternal.h b/src/VBox/HostDrivers/Support/SUPDrvInternal.h
index b7e392b..939e653 100644
--- a/src/VBox/HostDrivers/Support/SUPDrvInternal.h
+++ b/src/VBox/HostDrivers/Support/SUPDrvInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -941,6 +941,7 @@ PSUPDRVSESSION VBOXCALL supdrvSessionHashTabLookup(PSUPDRVDEVEXT pDevExt, RTPROC
                                                    PSUPDRVSESSION *ppOsSessionPtr);
 uint32_t VBOXCALL supdrvSessionRetain(PSUPDRVSESSION pSession);
 uint32_t VBOXCALL supdrvSessionRelease(PSUPDRVSESSION pSession);
+int VBOXCALL    supdrvQueryVTCapsInternal(uint32_t *pfCaps);
 
 /* SUPDrvGip.cpp */
 int  VBOXCALL   supdrvGipCreate(PSUPDRVDEVEXT pDevExt);
diff --git a/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp b/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp
index bdc2912..dc0ea23 100644
--- a/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp
+++ b/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPDrvTracerA.asm b/src/VBox/HostDrivers/Support/SUPDrvTracerA.asm
index cfd926e..89606b9 100644
--- a/src/VBox/HostDrivers/Support/SUPDrvTracerA.asm
+++ b/src/VBox/HostDrivers/Support/SUPDrvTracerA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2012 Oracle Corporation
+; Copyright (C) 2012-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPLib.cpp b/src/VBox/HostDrivers/Support/SUPLib.cpp
index c334cca..67d2d14 100644
--- a/src/VBox/HostDrivers/Support/SUPLib.cpp
+++ b/src/VBox/HostDrivers/Support/SUPLib.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPLibInternal.h b/src/VBox/HostDrivers/Support/SUPLibInternal.h
index c04dbe9..4a18628 100644
--- a/src/VBox/HostDrivers/Support/SUPLibInternal.h
+++ b/src/VBox/HostDrivers/Support/SUPLibInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPLibLdr.cpp b/src/VBox/HostDrivers/Support/SUPLibLdr.cpp
index 892ad1e..6bbd32a 100644
--- a/src/VBox/HostDrivers/Support/SUPLibLdr.cpp
+++ b/src/VBox/HostDrivers/Support/SUPLibLdr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPLibSem.cpp b/src/VBox/HostDrivers/Support/SUPLibSem.cpp
index 7df1891..1b34c3e 100644
--- a/src/VBox/HostDrivers/Support/SUPLibSem.cpp
+++ b/src/VBox/HostDrivers/Support/SUPLibSem.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPLibTracerA.asm b/src/VBox/HostDrivers/Support/SUPLibTracerA.asm
index c77881c..58b1e04 100644
--- a/src/VBox/HostDrivers/Support/SUPLibTracerA.asm
+++ b/src/VBox/HostDrivers/Support/SUPLibTracerA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2012 Oracle Corporation
+; Copyright (C) 2012-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPR0-def-lx.sed b/src/VBox/HostDrivers/Support/SUPR0-def-lx.sed
index 69efdd5..2e12a6e 100644
--- a/src/VBox/HostDrivers/Support/SUPR0-def-lx.sed
+++ b/src/VBox/HostDrivers/Support/SUPR0-def-lx.sed
@@ -3,7 +3,7 @@
 # IPRT - SED script for generating SUPR0.def - OS/2 LX.
 #
 
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPR0-def-pe.sed b/src/VBox/HostDrivers/Support/SUPR0-def-pe.sed
index 041b964..76d0e2b 100644
--- a/src/VBox/HostDrivers/Support/SUPR0-def-pe.sed
+++ b/src/VBox/HostDrivers/Support/SUPR0-def-pe.sed
@@ -3,7 +3,7 @@
 # IPRT - SED script for generating SUPR0.def
 #
 
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClient.c b/src/VBox/HostDrivers/Support/SUPR0IdcClient.c
index 7d7193c..97b7b4e 100644
--- a/src/VBox/HostDrivers/Support/SUPR0IdcClient.c
+++ b/src/VBox/HostDrivers/Support/SUPR0IdcClient.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c
index 4392607..555d4da 100644
--- a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c
+++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h b/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h
index dc165dd..f48c817 100644
--- a/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h
+++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c
index 0bccc5f..c05109c 100644
--- a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c
+++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp
index ef00d48..f733a41 100644
--- a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp
+++ b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
index 04b2331..422c82b 100644
--- a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
+++ b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedMainTemplate.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
index 232822c..03cce10 100644
--- a/src/VBox/HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
+++ b/src/VBox/HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedNoCrt.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedNoCrt.cpp
index 6354604..c1f25b4 100644
--- a/src/VBox/HostDrivers/Support/SUPR3HardenedNoCrt.cpp
+++ b/src/VBox/HostDrivers/Support/SUPR3HardenedNoCrt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
index 20c4cf1..d76804d 100644
--- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
+++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -117,9 +117,9 @@ static SUPINSTFILE const    g_aSupInstallFiles[] =
     {   kSupIFT_Dll,  kSupID_AppPrivArch,       false, "VBoxDD2R0.r0" },
 
 #ifdef VBOX_WITH_RAW_MODE
-    {   kSupIFT_Rc,   kSupID_AppPrivArch,       false, "VMMGC.gc" },
-    {   kSupIFT_Rc,   kSupID_AppPrivArch,       false, "VBoxDDGC.gc" },
-    {   kSupIFT_Rc,   kSupID_AppPrivArch,       false, "VBoxDD2GC.gc" },
+    {   kSupIFT_Rc,   kSupID_AppPrivArch,       false, "VMMRC.rc" },
+    {   kSupIFT_Rc,   kSupID_AppPrivArch,       false, "VBoxDDRC.rc" },
+    {   kSupIFT_Rc,   kSupID_AppPrivArch,       false, "VBoxDD2RC.rc" },
 #endif
 
     {   kSupIFT_Dll,  kSupID_SharedLib,         false, "VBoxRT" SUPLIB_DLL_SUFF },
diff --git a/src/VBox/HostDrivers/Support/SUPSvc.cpp b/src/VBox/HostDrivers/Support/SUPSvc.cpp
index c3921bc..5f981ed 100644
--- a/src/VBox/HostDrivers/Support/SUPSvc.cpp
+++ b/src/VBox/HostDrivers/Support/SUPSvc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp
index fe67b7f..beed1f1 100644
--- a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp
+++ b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp
index e4ec5c0..f17a443 100644
--- a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp
+++ b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/SUPSvcInternal.h b/src/VBox/HostDrivers/Support/SUPSvcInternal.h
index b510c8f..b2f50cc 100644
--- a/src/VBox/HostDrivers/Support/SUPSvcInternal.h
+++ b/src/VBox/HostDrivers/Support/SUPSvcInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp b/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp
index 2eff2e1..199360a 100644
--- a/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp
+++ b/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -113,7 +113,7 @@ static int              VBoxDrvDarwinErr2DarwinErr(int rc);
 static IOReturn         VBoxDrvDarwinSleepHandler(void *pvTarget, void *pvRefCon, UInt32 uMessageType, IOService *pProvider, void *pvMessageArgument, vm_size_t argSize);
 RT_C_DECLS_END
 
-static void             vboxdrvDarwinResolveSymbols(void);
+static int              vboxdrvDarwinResolveSymbols(void);
 static bool             vboxdrvDarwinCpuHasSMAP(void);
 
 
@@ -284,49 +284,55 @@ static kern_return_t    VBoxDrvDarwinStart(struct kmod_info *pKModInfo, void *pv
                 }
 
                 /*
-                 * Registering ourselves as a character device.
+                 * Resolve some extra kernel symbols.
                  */
-                g_iMajorDeviceNo = cdevsw_add(-1, &g_DevCW);
-                if (g_iMajorDeviceNo >= 0)
+                rc = vboxdrvDarwinResolveSymbols();
+                if (RT_SUCCESS(rc))
                 {
+
+                    /*
+                     * Registering ourselves as a character device.
+                     */
+                    g_iMajorDeviceNo = cdevsw_add(-1, &g_DevCW);
+                    if (g_iMajorDeviceNo >= 0)
+                    {
 #ifdef VBOX_WITH_HARDENING
-                    g_hDevFsDeviceSys = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
-                                                        UID_ROOT, GID_WHEEL, 0600, DEVICE_NAME_SYS);
+                        g_hDevFsDeviceSys = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
+                                                            UID_ROOT, GID_WHEEL, 0600, DEVICE_NAME_SYS);
 #else
-                    g_hDevFsDeviceSys = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
-                                                        UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_SYS);
+                        g_hDevFsDeviceSys = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
+                                                            UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_SYS);
 #endif
-                    if (g_hDevFsDeviceSys)
-                    {
-                        g_hDevFsDeviceUsr = devfs_make_node(makedev(g_iMajorDeviceNo, 1), DEVFS_CHAR,
-                                                            UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_USR);
-                        if (g_hDevFsDeviceUsr)
+                        if (g_hDevFsDeviceSys)
                         {
-                            LogRel(("VBoxDrv: version " VBOX_VERSION_STRING " r%d; IOCtl version %#x; IDC version %#x; dev major=%d\n",
-                                    VBOX_SVN_REV, SUPDRV_IOC_VERSION, SUPDRV_IDC_VERSION, g_iMajorDeviceNo));
-
-                            /* Register a sleep/wakeup notification callback */
-                            g_pSleepNotifier = registerPrioritySleepWakeInterest(&VBoxDrvDarwinSleepHandler, &g_DevExt, NULL);
-                            if (g_pSleepNotifier == NULL)
-                                LogRel(("VBoxDrv: register for sleep/wakeup events failed\n"));
-
-                            /* Find kernel symbols that are kind of optional. */
-                            vboxdrvDarwinResolveSymbols();
-                            return KMOD_RETURN_SUCCESS;
+                            g_hDevFsDeviceUsr = devfs_make_node(makedev(g_iMajorDeviceNo, 1), DEVFS_CHAR,
+                                                                UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME_USR);
+                            if (g_hDevFsDeviceUsr)
+                            {
+                                LogRel(("VBoxDrv: version " VBOX_VERSION_STRING " r%d; IOCtl version %#x; IDC version %#x; dev major=%d\n",
+                                        VBOX_SVN_REV, SUPDRV_IOC_VERSION, SUPDRV_IDC_VERSION, g_iMajorDeviceNo));
+
+                                /* Register a sleep/wakeup notification callback */
+                                g_pSleepNotifier = registerPrioritySleepWakeInterest(&VBoxDrvDarwinSleepHandler, &g_DevExt, NULL);
+                                if (g_pSleepNotifier == NULL)
+                                    LogRel(("VBoxDrv: register for sleep/wakeup events failed\n"));
+
+                                return KMOD_RETURN_SUCCESS;
+                            }
+
+                            LogRel(("VBoxDrv: devfs_make_node(makedev(%d,1),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME_USR));
+                            devfs_remove(g_hDevFsDeviceSys);
+                            g_hDevFsDeviceSys = NULL;
                         }
+                        else
+                            LogRel(("VBoxDrv: devfs_make_node(makedev(%d,0),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME_SYS));
 
-                        LogRel(("VBoxDrv: devfs_make_node(makedev(%d,1),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME_USR));
-                        devfs_remove(g_hDevFsDeviceSys);
-                        g_hDevFsDeviceSys = NULL;
+                        cdevsw_remove(g_iMajorDeviceNo, &g_DevCW);
+                        g_iMajorDeviceNo = -1;
                     }
                     else
-                        LogRel(("VBoxDrv: devfs_make_node(makedev(%d,0),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME_SYS));
-
-                    cdevsw_remove(g_iMajorDeviceNo, &g_DevCW);
-                    g_iMajorDeviceNo = -1;
+                        LogRel(("VBoxDrv: cdevsw_add failed (%d)\n", g_iMajorDeviceNo));
                 }
-                else
-                    LogRel(("VBoxDrv: cdevsw_add failed (%d)\n", g_iMajorDeviceNo));
                 RTSpinlockDestroy(g_Spinlock);
                 g_Spinlock = NIL_RTSPINLOCK;
             }
@@ -347,15 +353,18 @@ static kern_return_t    VBoxDrvDarwinStart(struct kmod_info *pKModInfo, void *pv
 
 
 /**
- * Resolves kernel symbols we want (but may do without).
+ * Resolves kernel symbols we need and some we just would like to have.
  */
-static void vboxdrvDarwinResolveSymbols(void)
+static int vboxdrvDarwinResolveSymbols(void)
 {
     RTDBGKRNLINFO hKrnlInfo;
     int rc = RTR0DbgKrnlInfoOpen(&hKrnlInfo, 0);
     if (RT_SUCCESS(rc))
     {
-        /* The VMX stuff. */
+        /*
+         * The VMX stuff - required with raw-mode (in theory for 64-bit on
+         * 32-bit too, but we never did that on darwin).
+         */
         int rc1 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "vmx_resume", (void **)&g_pfnVmxResume);
         int rc2 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "vmx_suspend", (void **)&g_pfnVmxSuspend);
         int rc3 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "vmx_use_count", (void **)&g_pVmxUseCount);
@@ -370,31 +379,40 @@ static void vboxdrvDarwinResolveSymbols(void)
             g_pfnVmxResume  = NULL;
             g_pfnVmxSuspend = NULL;
             g_pVmxUseCount  = NULL;
+#ifdef VBOX_WITH_RAW_MODE
+            rc = VERR_SYMBOL_NOT_FOUND;
+#endif
         }
 
+        if (RT_SUCCESS(rc))
+        {
 #ifdef SUPDRV_WITH_MSR_PROBER
-        /* MSR prober stuff. */
-        int rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "rdmsr_carefully", (void **)&g_pfnRdMsrCarefully);
-        if (RT_FAILURE(rc))
-            g_pfnRdMsrCarefully = NULL;
-        rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "rdmsr64_carefully", (void **)&g_pfnRdMsr64Carefully);
-        if (RT_FAILURE(rc))
-            g_pfnRdMsr64Carefully = NULL;
+            /*
+             * MSR prober stuff - optional!
+             */
+            int rc2 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "rdmsr_carefully", (void **)&g_pfnRdMsrCarefully);
+            if (RT_FAILURE(rc2))
+                g_pfnRdMsrCarefully = NULL;
+            rc2 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "rdmsr64_carefully", (void **)&g_pfnRdMsr64Carefully);
+            if (RT_FAILURE(rc2))
+                g_pfnRdMsr64Carefully = NULL;
 # ifdef RT_ARCH_AMD64 /* Missing 64 in name, so if implemented on 32-bit it could have different signature. */
-        rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "wrmsr_carefully", (void **)&g_pfnWrMsr64Carefully);
-        if (RT_FAILURE(rc))
+            rc2 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "wrmsr_carefully", (void **)&g_pfnWrMsr64Carefully);
+            if (RT_FAILURE(rc2))
 # endif
-            g_pfnWrMsr64Carefully = NULL;
+                g_pfnWrMsr64Carefully = NULL;
 
-        LogRel(("VBoxDrv: g_pfnRdMsrCarefully=%p g_pfnRdMsr64Carefully=%p g_pfnWrMsr64Carefully=%p\n",
-                g_pfnRdMsrCarefully, g_pfnRdMsr64Carefully, g_pfnWrMsr64Carefully));
+            LogRel(("VBoxDrv: g_pfnRdMsrCarefully=%p g_pfnRdMsr64Carefully=%p g_pfnWrMsr64Carefully=%p\n",
+                    g_pfnRdMsrCarefully, g_pfnRdMsr64Carefully, g_pfnWrMsr64Carefully));
 
 #endif /* SUPDRV_WITH_MSR_PROBER */
+        }
 
         RTR0DbgKrnlInfoRelease(hKrnlInfo);
     }
     else
         LogRel(("VBoxDrv: Failed to open kernel symbols, rc=%Rrc\n", rc));
+    return rc;
 }
 
 
@@ -883,6 +901,28 @@ IOReturn VBoxDrvDarwinSleepHandler(void * /* pvTarget */, void *pvRefCon, UInt32
 }
 
 
+#ifdef VBOX_WITH_HOST_VMX
+/**
+ * For cleaning up the mess we left behind on Yosemite with 4.3.28 and earlier.
+ *
+ * We ASSUME VT-x is supported by the CPU.
+ *
+ * @param   idCpu       Unused.
+ * @param   pvUser1     Unused.
+ * @param   pvUser2     Unused.
+ */
+static DECLCALLBACK(void) vboxdrvDarwinVmxEnableFix(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+{
+    RTCCUINTREG uCr4 = ASMGetCR4();
+    if (!(uCr4 & X86_CR4_VMXE))
+    {
+        uCr4 |= X86_CR4_VMXE;
+        ASMSetCR4(uCr4);
+    }
+}
+#endif
+
+
 /**
  * @copydoc SUPR0EnableVTx
  */
@@ -891,12 +931,45 @@ int VBOXCALL supdrvOSEnableVTx(bool fEnable)
 #ifdef VBOX_WITH_HOST_VMX
     int rc;
     if (   version_major >= 10 /* 10 = 10.6.x = Snow Leopard */
+# ifdef VBOX_WITH_RAW_MODE
         && g_pfnVmxSuspend
         && g_pfnVmxResume
-        && g_pVmxUseCount)
+        && g_pVmxUseCount
+# endif
+       )
     {
         if (fEnable)
         {
+            /*
+             * We screwed up on Yosemite and didn't notice that we weren't
+             * calling host_vmxon.  CR4.VMXE may therefore have been disabled
+             * by us.  So, first time around we make sure it's set so we won't
+             * crash in the pre-4.3.28/5.0RC1 upgrade scenario.
+             * See @bugref{7907}.
+             */
+            static bool volatile g_fDoneCleanup = false;
+            if (!g_fDoneCleanup)
+            {
+                if (version_major == 14 /* 14 = 10.10 = yosemite */)
+                {
+                    uint32_t fCaps;
+                    int rc = supdrvQueryVTCapsInternal(&fCaps);
+                    if (RT_SUCCESS(rc))
+                    {
+                        if (fCaps & SUPVTCAPS_VT_X)
+                            rc = RTMpOnAll(vboxdrvDarwinVmxEnableFix, NULL, NULL);
+                        else
+                            rc = VERR_VMX_NO_VMX;
+                    }
+                    if (RT_FAILURE(rc))
+                        return rc;
+                }
+                g_fDoneCleanup = true;
+            }
+
+            /*
+             * Call the kernel.
+             */
             rc = host_vmxon(false /* exclusive */);
             if (rc == VMX_OK)
                 rc = VINF_SUCCESS;
diff --git a/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp b/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp
index 7761a9b..abd4bb3 100644
--- a/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp
+++ b/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c
index 14e6a8c..cbdd544 100644
--- a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c
+++ b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/darwin/load.sh b/src/VBox/HostDrivers/Support/darwin/load.sh
index d7ba333..c0162e2 100755
--- a/src/VBox/HostDrivers/Support/darwin/load.sh
+++ b/src/VBox/HostDrivers/Support/darwin/load.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp b/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp
index 036cbe6..ab5e8a7 100644
--- a/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp
+++ b/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c
index ed08088..1f72066 100644
--- a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c
+++ b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/linux/Makefile b/src/VBox/HostDrivers/Support/linux/Makefile
index 77f6ca1..34162cd 100644
--- a/src/VBox/HostDrivers/Support/linux/Makefile
+++ b/src/VBox/HostDrivers/Support/linux/Makefile
@@ -5,7 +5,7 @@
 
 #
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
index c811058..1ac8c27 100644
--- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
@@ -1,10 +1,10 @@
-/* $Rev: 99782 $ */
+/* $Rev: 100877 $ */
 /** @file
  * VBoxDrv - The VirtualBox Support Driver - Linux specifics.
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c
index 2093052..f3fa21d 100644
--- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c
+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp
index 5e8358c..d6627fd 100644
--- a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp
+++ b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c
index 7bc8e6d..dc0bac6 100644
--- a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c
+++ b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp
index 71e3c0d..8642755 100644
--- a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp
+++ b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp
@@ -124,7 +124,7 @@ DECLASM(int) VBoxDrvInit(const char *pszArgs)
                            "\r\n"
                            "VirtualBox.org Support Driver for OS/2 version " VBOX_VERSION_STRING "\r\n"
                            "Copyright (C) 2007 Knut St. Osmundsen\r\n"
-                           "Copyright (C) 2007 Oracle Corporation\r\n");
+                           "Copyright (C) 2007-2015 Oracle Corporation\r\n");
                     g_cchInitText = strlen(&g_szInitText[0]);
                 }
                 return VINF_SUCCESS;
diff --git a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def
index 18550ae..417508b 100644
--- a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def
+++ b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2010 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp b/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp
index 1ee7655..9439d79 100644
--- a/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp
+++ b/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c
index 9f06939..0d02e82 100644
--- a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c
+++ b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c b/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c
index 21cabea..b8596dc 100644
--- a/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c
+++ b/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp b/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp
index e1d00b7..34401af 100644
--- a/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp
+++ b/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c
index c7ca7b3..e1890f0 100644
--- a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c
+++ b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf b/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf
index cd13611..1a0f70d 100644
--- a/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf
+++ b/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/Makefile.kmk b/src/VBox/HostDrivers/Support/testcase/Makefile.kmk
index 35722ee..5a768b0 100644
--- a/src/VBox/HostDrivers/Support/testcase/Makefile.kmk
+++ b/src/VBox/HostDrivers/Support/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/SUPInstall.cpp b/src/VBox/HostDrivers/Support/testcase/SUPInstall.cpp
index bcde4be..46b6624 100644
--- a/src/VBox/HostDrivers/Support/testcase/SUPInstall.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/SUPInstall.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp
index 81205d3..ef78807 100644
--- a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp b/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp
index 6c03ce7..5f612a0 100644
--- a/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/SUPUninstall.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp b/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp
index be9f72c..d08a5b5 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp
index a44565b..d2c36ec 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp
index 15274cf..8b91528 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp
index bcb4028..101082f 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp
index 27e426a..91faa34 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp
index 27a840d..1c987c4 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstNtQueryStuff.cpp b/src/VBox/HostDrivers/Support/testcase/tstNtQueryStuff.cpp
index 919e3c5..f56a39b 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstNtQueryStuff.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstNtQueryStuff.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstPage.cpp b/src/VBox/HostDrivers/Support/testcase/tstPage.cpp
index 759d86c..9ecdee7 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstPage.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstPage.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp
index 131fa2d..106c2ae 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp
index a69e917..bddfef7 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -105,7 +105,7 @@ int main(int argc, char **argv)
                 return 1;
 
             case 'V':
-                RTPrintf("$Revision: 83575 $\n");
+                RTPrintf("$Revision: 100877 $\n");
                 return 0;
 
             default:
diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp
index 9358cb0..0910e7f 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp
index bd73c05..85c08aa 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp
index 9235e30..27d1ffe 100644
--- a/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp
+++ b/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp
@@ -222,4 +222,3 @@ int main(int argc, char **argv)
     return RTTestSummaryAndDestroy(hTest);
 }
 
-
diff --git a/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp b/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
index f323d28..98641cc 100644
--- a/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm b/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm
index 9a9b45e..ae9297b 100644
--- a/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm
+++ b/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2014 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/SUPHardenedVerify-win.h b/src/VBox/HostDrivers/Support/win/SUPHardenedVerify-win.h
index 9b18df8..b1fe2b5 100644
--- a/src/VBox/HostDrivers/Support/win/SUPHardenedVerify-win.h
+++ b/src/VBox/HostDrivers/Support/win/SUPHardenedVerify-win.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp b/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp
index fc36616..3cea062 100644
--- a/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp b/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp
index af6582f..3120248 100644
--- a/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyProcess-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp b/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp
index d4129a6..c4050f3 100644
--- a/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c
index 1609983..019e122 100644
--- a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c
+++ b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/SUPR3HardenedMain-win.cpp b/src/VBox/HostDrivers/Support/win/SUPR3HardenedMain-win.cpp
index c0f8e6c..bcfe396 100644
--- a/src/VBox/HostDrivers/Support/win/SUPR3HardenedMain-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPR3HardenedMain-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainA-win.asm b/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainA-win.asm
index d6440e5..efe1305 100644
--- a/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainA-win.asm
+++ b/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainA-win.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2012-2014 Oracle Corporation
+; Copyright (C) 2012-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainImports-win.cpp b/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainImports-win.cpp
index 99a1751..49dda78 100644
--- a/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainImports-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPR3HardenedMainImports-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp b/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp
index b19a9bc..2a48486 100644
--- a/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp b/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp
index 435226b..ea0347b 100644
--- a/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/VBoxDrv.inf b/src/VBox/HostDrivers/Support/win/VBoxDrv.inf
index b7ad3e9..715cd27 100644
--- a/src/VBox/HostDrivers/Support/win/VBoxDrv.inf
+++ b/src/VBox/HostDrivers/Support/win/VBoxDrv.inf
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/VBoxSupLib-win.cpp b/src/VBox/HostDrivers/Support/win/VBoxSupLib-win.cpp
index 4768aff..a6a83c4 100644
--- a/src/VBox/HostDrivers/Support/win/VBoxSupLib-win.cpp
+++ b/src/VBox/HostDrivers/Support/win/VBoxSupLib-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/Support/win/winstub.com b/src/VBox/HostDrivers/Support/win/winstub.com
new file mode 100644
index 0000000..671e58c
Binary files /dev/null and b/src/VBox/HostDrivers/Support/win/winstub.com differ
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
index 221f3df..dede0bf 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
+++ b/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -91,6 +91,65 @@ $$(VBoxNetAdp.kext_0_OUTDIR)/Contents/Info.plist: $(PATH_SUB_CURRENT)/darwin/Inf
  	darwin/loadnetadp.sh
 endif # darwin
 
+ifeq ($(KBUILD_TARGET),win)
+ #
+ # VBoxNetAdp6.sys - The VirtualBox Adapter miniport driver.
+ #
+ SYSMODS.win += VBoxNetAdp6
+ VBoxNetAdp6_TEMPLATE = VBOXR0DRV
+ if defined(VBOX_SIGNING_MODE)
+  VBoxNetAdp6_INSTTYPE.win = none
+  VBoxNetAdp6_DEBUG_INSTTYPE.win = both
+ endif
+ VBoxNetAdp6_DEFS = IN_RT_R0 IN_SUP_STATIC
+ VBoxNetAdp6_INCS := $(PATH_SUB_CURRENT)
+ VBoxNetAdp6_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK)INCS
+ VBoxNetAdp6_SOURCES = \
+ 	win/VBoxNetAdp-win.cpp \
+ 	win/VBoxNetAdp-win.rc
+ VBoxNetAdp6_DEFS += NDIS_MINIPORT_DRIVER NDIS_WDM=1 BINARY_COMPATIBLE=0
+ VBoxNetAdp6_DEFS += NDIS60_MINIPORT=1 NDIS60=1
+ VBoxNetAdp6_LDFLAGS.win.x86 = -Entry:DriverEntry at 8
+ VBoxNetAdp6_LDFLAGS.win.amd64 = -Entry:DriverEntry
+ VBoxNetAdp6_LIBS.win = \
+ 	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/ntoskrnl.lib \
+ 	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/hal.lib \
+ 	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/ndis.lib \
+ 	$(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
+ VBoxNetAdp6_LIBS = \
+ 	$(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
+
+
+ INSTALLS.win += VBoxNetAdp6-inf
+ VBoxNetAdp6-inf_INST = $(INST_BIN)
+ VBoxNetAdp6-inf_MODE = a+r,u+w
+ VBoxNetAdp6-inf_SOURCES = \
+ 	$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.inf
+ VBoxNetAdp6-inf_CLEAN = $(VBoxNetAdp6-inf_SOURCES)
+ VBoxNetAdp6-inf_BLDDIRS = $(PATH_TARGET)/VBoxNetAdp6Cat.dir
+
+$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.inf: $(PATH_SUB_CURRENT)/win/VBoxNetAdp6.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+	$(call MSG_GENERATE,VBoxNetAdp6-inf,$@,$<)
+	$(call VBOX_EDIT_INF_FN,$<,$@)
+
+ ifdef VBOX_SIGNING_MODE
+VBoxNetAdp6-inf_SOURCES += \
+	$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.sys \
+	$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.cat
+
+$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.sys: $$(VBoxNetAdp6_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.cat: \
+		$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.sys \
+		$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.inf
+	$(call MSG_TOOL,Inf2Cat,VBoxNetFlt-inf,$@,$<)
+	$(call VBOX_MAKE_CAT_FN, $(@D),$@)
+
+ endif #  ifdef VBOX_SIGNING_MODE
+
+endif #ifeq ($(KBUILD_TARGET), win)
+
 ifeq ($(KBUILD_TARGET),linux)
  #
  # Install source files for compilation on Linux.
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c
index 36eec8e..57649ba 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c
+++ b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h
index 5c16bd3..889cb90 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h
+++ b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp b/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp
index e1a903b..01e93d9 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp
+++ b/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/darwin/loadnetadp.sh b/src/VBox/HostDrivers/VBoxNetAdp/darwin/loadnetadp.sh
index 4f556f3..257795e 100755
--- a/src/VBox/HostDrivers/VBoxNetAdp/darwin/loadnetadp.sh
+++ b/src/VBox/HostDrivers/VBoxNetAdp/darwin/loadnetadp.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile
index 6cc4296..4a1cd69 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile
+++ b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile
@@ -5,7 +5,7 @@
 
 #
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp
index 6f4bc31..8521b22 100755
--- a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp
+++ b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/files_vboxnetadp
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2007-2010 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
index 424168d..c440cfe 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
@@ -5,7 +5,7 @@
 
 #
 #
-# Copyright (C) 2006-2011 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
index 60833f8..0a805fb 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp b/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp
index 931ad7a..0d962dd 100755
--- a/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp
+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp
@@ -1,11 +1,11 @@
 #!/bin/sh
-# $Revision: 83575 $
+# $Revision: 100877 $
 ## @files
 # Shared file between Makefile.kmk and export_modules
 #
 
 #
-# Copyright (C) 2009-2011 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c b/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c
index 415e234..0feda73 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c
+++ b/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/solaris/vboxnet.conf b/src/VBox/HostDrivers/VBoxNetAdp/solaris/vboxnet.conf
index 0c9a4c1..433c2eb 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/solaris/vboxnet.conf
+++ b/src/VBox/HostDrivers/VBoxNetAdp/solaris/vboxnet.conf
@@ -1,7 +1,7 @@
 #
 # Solaris Host VBoxNet Configuration
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.cpp b/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.cpp
similarity index 90%
rename from src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.cpp
rename to src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.cpp
index f7ac91e..22d2dac 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.cpp
+++ b/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.cpp
@@ -3,7 +3,7 @@
  * VBoxNetAdp-win.cpp - NDIS6 Host-only Networking Driver, Windows-specific code.
  */
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ RT_C_DECLS_BEGIN
 RT_C_DECLS_END
 
 #include "VBoxNetAdp-win.h"
-#include "VBoxNetCmn-win.h"
+#include "VBox/VBoxNetCmn-win.h"
 
 /* Forward declarations */
 MINIPORT_INITIALIZE                vboxNetAdpWinInitializeEx;
@@ -172,7 +172,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinAllocAdapter(NDIS_HANDLE hAdapter, PVBOXNET
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
     PVBOXNETADP_ADAPTER pAdapter = NULL;
 
-    LogFlow(("==>"__FUNCTION__": adapter handle=%p\n", hAdapter));
+    LogFlow(("==>vboxNetAdpWinAllocAdapter: adapter handle=%p\n", hAdapter));
 
     *ppAdapter = NULL;
 
@@ -183,7 +183,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinAllocAdapter(NDIS_HANDLE hAdapter, PVBOXNET
     if (!pAdapter)
     {
         Status = NDIS_STATUS_RESOURCES;
-        Log((__FUNCTION__": Out of memory while allocating adapter context (size=%d)\n", sizeof(VBOXNETADP_ADAPTER)));
+        Log(("vboxNetAdpWinAllocAdapter: Out of memory while allocating adapter context (size=%d)\n", sizeof(VBOXNETADP_ADAPTER)));
     }
     else
     {
@@ -204,7 +204,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinAllocAdapter(NDIS_HANDLE hAdapter, PVBOXNET
 
         *ppAdapter = pAdapter;
     }
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetAdpWinAllocAdapter: status=0x%x\n", Status));
     return Status;
 }
 
@@ -226,7 +226,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinInitializeEx(IN NDIS_HANDLE NdisMiniportHan
     PVBOXNETADP_ADAPTER pAdapter = NULL;
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
 
-    LogFlow(("==>"__FUNCTION__": miniport=0x%x\n", NdisMiniportHandle));
+    LogFlow(("==>vboxNetAdpWinInitializeEx: miniport=0x%x\n", NdisMiniportHandle));
 
     do
     {
@@ -236,7 +236,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinInitializeEx(IN NDIS_HANDLE NdisMiniportHan
         Status = vboxNetAdpWinAllocAdapter(NdisMiniportHandle, &pAdapter, MiniportInitParameters->NetLuid.Value);
         if (Status != NDIS_STATUS_SUCCESS)
         {
-            Log((__FUNCTION__": Failed to allocate the adapter context with 0x%x\n", Status));
+            Log(("vboxNetAdpWinInitializeEx: Failed to allocate the adapter context with 0x%x\n", Status));
             break;
         }
 
@@ -252,7 +252,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinInitializeEx(IN NDIS_HANDLE NdisMiniportHan
                                             (PNDIS_MINIPORT_ADAPTER_ATTRIBUTES)&RAttrs);
         if (Status != NDIS_STATUS_SUCCESS)
         {
-            Log((__FUNCTION__": NdisMSetMiniportAttributes(registration) failed with 0x%x\n", Status));
+            Log(("vboxNetAdpWinInitializeEx: NdisMSetMiniportAttributes(registration) failed with 0x%x\n", Status));
             break;
         }
 
@@ -304,7 +304,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinInitializeEx(IN NDIS_HANDLE NdisMiniportHan
                                             (PNDIS_MINIPORT_ADAPTER_ATTRIBUTES)&GAttrs);
         if (Status != NDIS_STATUS_SUCCESS)
         {
-            Log((__FUNCTION__": NdisMSetMiniportAttributes(general) failed with 0x%x\n", Status));
+            Log(("vboxNetAdpWinInitializeEx: NdisMSetMiniportAttributes(general) failed with 0x%x\n", Status));
             break;
         }
     } while (false);
@@ -315,7 +315,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinInitializeEx(IN NDIS_HANDLE NdisMiniportHan
             vboxNetAdpWinFreeAdapter(pAdapter);
     }
 
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetAdpWinInitializeEx: status=0x%x\n", Status));
     return Status;
 }
 
@@ -323,17 +323,17 @@ DECLHIDDEN(VOID) vboxNetAdpWinHaltEx(IN NDIS_HANDLE MiniportAdapterContext,
                                      IN NDIS_HALT_ACTION HaltAction)
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinHaltEx\n"));
     // TODO: Stop something?
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetAdpWinHaltEx\n"));
 }
 
 DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinPause(IN NDIS_HANDLE MiniportAdapterContext,
                                            IN PNDIS_MINIPORT_PAUSE_PARAMETERS MiniportPauseParameters)
 {
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("==>vboxNetAdpWinPause\n"));
+    LogFlow(("<==vboxNetAdpWinPause: status=0x%x\n", Status));
     return Status;
 }
 
@@ -341,8 +341,8 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinRestart(IN NDIS_HANDLE MiniportAdapterConte
                                              IN PNDIS_MINIPORT_RESTART_PARAMETERS MiniportRestartParameters)
 {
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("==>vboxNetAdpWinRestart\n"));
+    LogFlow(("<==vboxNetAdpWinRestart: status=0x%x\n", Status));
     return Status;
 }
 
@@ -352,7 +352,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinOidRqQuery(PVBOXNETADP_ADAPTER pAdapter,
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
     struct _NDIS_OID_REQUEST::_REQUEST_DATA::_QUERY *pQuery = &pRequest->DATA.QUERY_INFORMATION;
 
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinOidRqQuery\n"));
 
     uint64_t u64Tmp = 0;
     ULONG ulTmp = 0;
@@ -454,7 +454,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinOidRqQuery(PVBOXNETADP_ADAPTER pAdapter,
         }
     }
 
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetAdpWinOidRqQuery: status=0x%x\n", Status));
     return Status;
 }
 
@@ -464,7 +464,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinOidRqSet(PVBOXNETADP_ADAPTER pAdapter,
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
     struct _NDIS_OID_REQUEST::_REQUEST_DATA::_SET *pSet = &pRequest->DATA.SET_INFORMATION;
 
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinOidRqSet\n"));
 
     switch (pSet->Oid)
     {
@@ -513,7 +513,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinOidRqSet(PVBOXNETADP_ADAPTER pAdapter,
             break;
     }
 
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetAdpWinOidRqSet: status=0x%x\n", Status));
     return Status;
 }
 
@@ -522,7 +522,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinOidRequest(IN NDIS_HANDLE MiniportAdapterCo
 {
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinOidRequest\n"));
     vboxNetCmnWinDumpOidRequest(__FUNCTION__, NdisRequest);
 
     switch (NdisRequest->RequestType)
@@ -546,7 +546,7 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinOidRequest(IN NDIS_HANDLE MiniportAdapterCo
             Status = NDIS_STATUS_NOT_SUPPORTED;
             break;
     }
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetAdpWinOidRequest: status=0x%x\n", Status));
     return Status;
 }
 
@@ -556,14 +556,14 @@ DECLHIDDEN(VOID) vboxNetAdpWinSendNetBufferLists(IN NDIS_HANDLE MiniportAdapterC
                                                  IN ULONG SendFlags)
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinSendNetBufferLists\n"));
     PNET_BUFFER_LIST pNbl = NetBufferLists;
     for (pNbl = NetBufferLists; pNbl; pNbl = NET_BUFFER_LIST_NEXT_NBL(pNbl))
         NET_BUFFER_LIST_STATUS(pNbl) = NDIS_STATUS_SUCCESS;
     NdisMSendNetBufferListsComplete(pAdapter->hAdapter, NetBufferLists,
                                     (SendFlags & NDIS_SEND_FLAGS_DISPATCH_LEVEL) ?
                                     NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL : 0);
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetAdpWinSendNetBufferLists\n"));
 }
 
 DECLHIDDEN(VOID) vboxNetAdpWinReturnNetBufferLists(IN NDIS_HANDLE MiniportAdapterContext,
@@ -571,26 +571,26 @@ DECLHIDDEN(VOID) vboxNetAdpWinReturnNetBufferLists(IN NDIS_HANDLE MiniportAdapte
                                                    IN ULONG ReturnFlags)
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    Log((__FUNCTION__": We should not be here!\n"));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinReturnNetBufferLists\n"));
+    Log(("vboxNetAdpWinReturnNetBufferLists: We should not be here!\n"));
+    LogFlow(("<==vboxNetAdpWinReturnNetBufferLists\n"));
 }
 
 DECLHIDDEN(VOID) vboxNetAdpWinCancelSend(IN NDIS_HANDLE MiniportAdapterContext,
                                          IN PVOID CancelId)
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    Log((__FUNCTION__": We should not be here!\n"));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinCancelSend\n"));
+    Log(("vboxNetAdpWinCancelSend: We should not be here!\n"));
+    LogFlow(("<==vboxNetAdpWinCancelSend\n"));
 }
 
 
 DECLHIDDEN(BOOLEAN) vboxNetAdpWinCheckForHangEx(IN NDIS_HANDLE MiniportAdapterContext)
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    LogFlow(("<=="__FUNCTION__" return false\n"));
+    LogFlow(("==>vboxNetAdpWinCheckForHangEx\n"));
+    LogFlow(("<==vboxNetAdpWinCheckForHangEx return false\n"));
     return FALSE;
 }
 
@@ -598,8 +598,8 @@ DECLHIDDEN(NDIS_STATUS) vboxNetAdpWinResetEx(IN NDIS_HANDLE MiniportAdapterConte
                                              OUT PBOOLEAN AddressingReset)
 {
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("==>vboxNetAdpWinResetEx\n"));
+    LogFlow(("<==vboxNetAdpWinResetEx: status=0x%x\n", Status));
     return Status;
 }
 
@@ -607,9 +607,9 @@ DECLHIDDEN(VOID) vboxNetAdpWinDevicePnPEventNotify(IN NDIS_HANDLE MiniportAdapte
                                                    IN PNET_DEVICE_PNP_EVENT NetDevicePnPEvent)
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    Log((__FUNCTION__": PnP event=%d\n", NetDevicePnPEvent->DevicePnPEvent));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinDevicePnPEventNotify\n"));
+    Log(("vboxNetAdpWinDevicePnPEventNotify: PnP event=%d\n", NetDevicePnPEvent->DevicePnPEvent));
+    LogFlow(("<==vboxNetAdpWinDevicePnPEventNotify\n"));
 }
 
 
@@ -617,30 +617,30 @@ DECLHIDDEN(VOID) vboxNetAdpWinShutdownEx(IN NDIS_HANDLE MiniportAdapterContext,
                                          IN NDIS_SHUTDOWN_ACTION ShutdownAction)
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    Log((__FUNCTION__": action=%d\n", ShutdownAction));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinShutdownEx\n"));
+    Log(("vboxNetAdpWinShutdownEx: action=%d\n", ShutdownAction));
+    LogFlow(("<==vboxNetAdpWinShutdownEx\n"));
 }
 
 DECLHIDDEN(VOID) vboxNetAdpWinCancelOidRequest(IN NDIS_HANDLE MiniportAdapterContext,
                                                IN PVOID RequestId)
 {
     PVBOXNETADP_ADAPTER pAdapter = (PVBOXNETADP_ADAPTER)MiniportAdapterContext;
-    LogFlow(("==>"__FUNCTION__"\n"));
-    Log((__FUNCTION__": req id=%p\n", RequestId));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinCancelOidRequest\n"));
+    Log(("vboxNetAdpWinCancelOidRequest: req id=%p\n", RequestId));
+    LogFlow(("<==vboxNetAdpWinCancelOidRequest\n"));
 }
 
 
 
 DECLHIDDEN(VOID) vboxNetAdpWinUnload(IN PDRIVER_OBJECT DriverObject)
 {
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetAdpWinUnload\n"));
     //vboxNetAdpWinDevDestroy(&g_VBoxNetAdpGlobals);
     if (g_VBoxNetAdpGlobals.hMiniportDriver)
         NdisMDeregisterMiniportDriver(g_VBoxNetAdpGlobals.hMiniportDriver);
     //NdisFreeSpinLock(&g_VBoxNetAdpGlobals.Lock);
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetAdpWinUnload\n"));
     RTR0Term();
 }
 
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.h b/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.h
similarity index 97%
rename from src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.h
rename to src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.h
index a8c7c9a..e378c85 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.h
+++ b/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.h
@@ -3,7 +3,7 @@
  * VBoxNetAdp-win.h - Host-only Miniport Driver, Windows-specific code.
  */
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.rc b/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.rc
similarity index 97%
rename from src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.rc
rename to src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.rc
index 1a1faa0..faaa63a 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp-win.rc
+++ b/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp-win.rc
@@ -3,7 +3,7 @@
  * VBoxNetAdp6 - Resource file containing version info and icon.
  */
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp6.inf b/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp6.inf
similarity index 98%
rename from src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp6.inf
rename to src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp6.inf
index 5c26849..83b4931 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetAdp6.inf
+++ b/src/VBox/HostDrivers/VBoxNetAdp/win/VBoxNetAdp6.inf
@@ -5,7 +5,7 @@
 ; Note: We use the same component id as the old NetAdp implementation ?
 ;
 ;
-; Copyright (C) 2014 Oracle Corporation
+; Copyright (C) 2014-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
index fbc5231..baffd55 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
+++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -156,9 +156,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
  VBoxNetLwf_SOURCES = VBoxNetFlt.c VBoxNetFlt.rc
  VBoxNetLwf_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK)INCS
  VBoxNetLwf_SOURCES.win = \
- 	win/ndis6/VBoxNetLwf-win.cpp
-# 	win/drv/VBoxNetLwfRt-win.cpp \
-# 	win/drv/VBoxNetLwf-win.rc
+ 	win/drv/VBoxNetLwf-win.cpp
  # with WINDDKWLH the WIN9X_COMPAT_SPINLOCK is needed to avoid inline declaration of KeInitializeSpinLock
  # otherwise the linker would complain about dumplicate _KeInitializeSpinLock at 4 definition
  # in ntoskrnl.lib and our object files
@@ -177,6 +175,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
  	$(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/ntoskrnl.lib \
  	$(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/hal.lib \
  	$(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/ndis.lib \
+ 	$(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/netio.lib \
  	$(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
  VBoxNetLwf_LIBS = \
  	$(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
@@ -190,7 +189,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
  VBoxNetLwf-inf_CLEAN = $(VBoxNetLwf-inf_SOURCES)
  VBoxNetLwf-inf_BLDDIRS = $(PATH_TARGET)/VBoxNetLwfCat.dir
 
-$(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.inf: $(PATH_SUB_CURRENT)/win/ndis6/VBoxNetLwf.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+$(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.inf: $(PATH_SUB_CURRENT)/win/drv/VBoxNetLwf.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
 	$(call MSG_GENERATE,VBoxNetLwf-inf,$@,$<)
 	$(call VBOX_EDIT_INF_FN,$<,$@)
 
@@ -448,63 +447,6 @@ $(PATH_TARGET)/VBoxNetAdpCat.dir/VBoxNetAdp.cat: \
 
  endif #  ifdef VBOX_SIGNING_MODE
 
- #
- # VBoxNetAdp6.sys - The VirtualBox Adapter miniport driver.
- #
- SYSMODS.win += VBoxNetAdp6
- VBoxNetAdp6_TEMPLATE = VBOXR0DRV
- #VBoxNetAdp6_INST = $(INST_VBOXNETADP)
- if defined(VBOX_SIGNING_MODE)
-  VBoxNetAdp6_INSTTYPE.win = none
-  VBoxNetAdp6_DEBUG_INSTTYPE.win = both
- endif
- VBoxNetAdp6_DEFS = IN_RT_R0 IN_SUP_STATIC
- VBoxNetAdp6_INCS := $(PATH_SUB_CURRENT)
- VBoxNetAdp6_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK)INCS
- VBoxNetAdp6_SOURCES = \
- 	win/ndis6/VBoxNetAdp-win.cpp \
- 	win/ndis6/VBoxNetAdp-win.rc
- VBoxNetAdp6_DEFS += NDIS_MINIPORT_DRIVER NDIS_WDM=1 BINARY_COMPATIBLE=0
- VBoxNetAdp6_DEFS += NDIS60_MINIPORT=1 NDIS60=1
- VBoxNetAdp6_LDFLAGS.win.x86 = -Entry:DriverEntry at 8
- VBoxNetAdp6_LDFLAGS.win.amd64 = -Entry:DriverEntry
- VBoxNetAdp6_LIBS.win = \
- 	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/ntoskrnl.lib \
- 	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/hal.lib \
- 	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/ndis.lib \
- 	$(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
- VBoxNetAdp6_LIBS = \
- 	$(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
-
-
- INSTALLS.win += VBoxNetAdp6-inf
- VBoxNetAdp6-inf_INST = $(INST_BIN)
- VBoxNetAdp6-inf_MODE = a+r,u+w
- VBoxNetAdp6-inf_SOURCES = \
- 	$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.inf
- VBoxNetAdp6-inf_CLEAN = $(VBoxNetAdp6-inf_SOURCES)
- VBoxNetAdp6-inf_BLDDIRS = $(PATH_TARGET)/VBoxNetAdp6Cat.dir
-
-$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.inf: $(PATH_SUB_CURRENT)/win/ndis6/VBoxNetAdp6.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
-	$(call MSG_GENERATE,VBoxNetAdp6-inf,$@,$<)
-	$(call VBOX_EDIT_INF_FN,$<,$@)
-
- ifdef VBOX_SIGNING_MODE
-VBoxNetAdp6-inf_SOURCES += \
-	$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.sys \
-	$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.cat
-
-$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.sys: $$(VBoxNetAdp6_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.cat: \
-		$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.sys \
-		$(PATH_TARGET)/VBoxNetAdp6Cat.dir/VBoxNetAdp6.inf
-	$(call MSG_TOOL,Inf2Cat,VBoxNetFlt-inf,$@,$<)
-	$(call VBOX_MAKE_CAT_FN, $(@D),$@)
-
- endif #  ifdef VBOX_SIGNING_MODE
-
 endif #ifeq ($(KBUILD_TARGET), win)
 
 else if1of ($(KBUILD_TARGET), linux solaris freebsd) ## @todo merge this with the mixed case stuff.
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c
index 3c54dd6..bd760a9 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c
+++ b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.rc b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.rc
index e7e89ff..1caa0a3 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.rc
+++ b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.rc
@@ -3,7 +3,7 @@
  * VBoxNetFlt - Resource file containing version info and icon.
  */
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h
index eba8701..7a6afba 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h
+++ b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp b/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp
index 2ddecc9..0240fc9 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -86,6 +86,11 @@ RT_C_DECLS_END
 #define VBOXNETFLT_DARWIN_TEST_SEG_SIZE 14
 #endif
 
+/* XXX: hidden undef #ifdef __APPLE__ */
+#define VBOX_IN_LOOPBACK(addr)  (((addr) & IN_CLASSA_NET) == 0x7f000000)
+#define VBOX_IN_LINKLOCAL(addr) (((addr) & IN_CLASSB_NET) == 0xa9fe0000)
+
+
 
 /*******************************************************************************
 *   Internal Functions                                                         *
@@ -1355,7 +1360,7 @@ int  vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
     {
         LogRel(("FIONBIO ok, but socket is blocking?!\n"));
         sock_close(pThis->u.s.pSysSock);
-        return rc;        
+        return rc;
     }
 
     struct kev_request req;
@@ -1399,7 +1404,10 @@ int  vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
             struct sockaddr_in *sin = (struct sockaddr_in *)&ss;
             u_int32_t u32Addr = ntohl(sin->sin_addr.s_addr);
 
-            if ((u32Addr >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
+            if (VBOX_IN_LOOPBACK(u32Addr))
+                continue;
+
+            if (ifaddr_ifnet(ifa) != pIfNet && VBOX_IN_LINKLOCAL(u32Addr))
                 continue;
 
             Log(("> inet %RTnaipv4\n", sin->sin_addr.s_addr));
@@ -1414,7 +1422,7 @@ int  vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
                 continue;
 
             /* link-local from other interfaces are out of scope */
-            if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr) && ifaddr_ifnet(ifa) != pIfNet)
+            if (ifaddr_ifnet(ifa) != pIfNet && IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))
                 continue;
 
             Log(("> inet6 %RTnaipv6\n", &sin6->sin6_addr));
@@ -1449,6 +1457,11 @@ static void vboxNetFltDarwinSysSockUpcall(socket_t pSysSock, void *pvData, int f
         return;
     }
 
+    struct net_event_data my_link;
+    ifnet_t pIfNet = pThis->u.s.pIfNet; /* XXX: retain? */
+    ifnet_family_t if_family = ifnet_family(pIfNet);
+    u_int32_t if_unit = ifnet_unit(pIfNet);
+
     for (;;) {
         mbuf_t m;
         size_t len = sizeof(struct kern_event_msg) - sizeof(u_int32_t)
@@ -1487,23 +1500,44 @@ static void vboxNetFltDarwinSysSockUpcall(socket_t pSysSock, void *pvData, int f
             }
 
             struct kev_in_data *iev = (struct kev_in_data *)msg->event_data;
+            struct net_event_data *link = &iev->link_data;
             PCRTNETADDRU pAddr = (PCRTNETADDRU)&iev->ia_addr;
+            u_int32_t u32Addr = ntohl(pAddr->IPv4.u);
+
+            if (VBOX_IN_LOOPBACK(u32Addr))
+            {
+                mbuf_freem(m);
+                continue;
+            }
+
+            if (   (link->if_family != if_family || link->if_unit != if_unit)
+                && VBOX_IN_LINKLOCAL(u32Addr))
+            {
+                mbuf_freem(m);
+                continue;
+            }
+
             switch (msg->event_code)
             {
                 case KEV_INET_NEW_ADDR:
-                    Log(("KEV_INET_NEW_ADDR %RTnaipv4\n", pAddr->IPv4));
+                    Log(("KEV_INET_NEW_ADDR %.*s%d: %RTnaipv4\n",
+                         IFNAMSIZ, link->if_name, link->if_unit, pAddr->IPv4.u));
+
                     pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
                         /* :fAdded */ true, kIntNetAddrType_IPv4, pAddr);
                     break;
 
                 case KEV_INET_ADDR_DELETED:
-                    Log(("KEV_INET_ADDR_DELETED %RTnaipv4\n", pAddr->IPv4));
+                    Log(("KEV_INET_ADDR_DELETED %.*s%d: %RTnaipv4\n",
+                         IFNAMSIZ, link->if_name, link->if_unit, pAddr->IPv4.u));
+
                     pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
-                        /* :fAdded */ false, kIntNetAddrType_IPv4, &iev->ia_addr);
+                        /* :fAdded */ false, kIntNetAddrType_IPv4, pAddr);
                     break;
 
                 default:
-                    Log(("KEV INET event %u addr %RTnaipv4\n", msg->event_code, pAddr->IPv4));
+                    Log(("KEV INET event %u %.*s%d: addr %RTnaipv4\n",
+                         msg->event_code, IFNAMSIZ, link->if_name, link->if_unit, pAddr->IPv4.u));
                     break;
             }
         }
@@ -1518,20 +1552,39 @@ static void vboxNetFltDarwinSysSockUpcall(socket_t pSysSock, void *pvData, int f
             }
 
             struct kev_in6_data *iev6 = (struct kev_in6_data *)msg->event_data;
+            struct net_event_data *link = &iev6->link_data;
             PCRTNETADDRU pAddr = (PCRTNETADDRU)&iev6->ia_addr.sin6_addr;
+
+            if (IN6_IS_ADDR_LOOPBACK(&iev6->ia_addr.sin6_addr))
+            {
+                mbuf_freem(m);
+                continue;
+            }
+
+            if (   (link->if_family != if_family || link->if_unit != if_unit)
+                && IN6_IS_ADDR_LINKLOCAL(&iev6->ia_addr.sin6_addr))
+            {
+                mbuf_freem(m);
+                continue;
+            }
+
+
+
             switch (msg->event_code)
             {
                 case KEV_INET6_NEW_USER_ADDR:
-                    Log(("KEV_INET6_NEW_USER_ADDR: %RTnaipv6\n", pAddr));
+                    Log(("KEV_INET6_NEW_USER_ADDR %.*s%d: %RTnaipv6\n",
+                         IFNAMSIZ, link->if_name, link->if_unit, pAddr));
                     goto kev_inet6_new;
 
                 case KEV_INET6_NEW_LL_ADDR:
-                    Log(("KEV_INET6_NEW_LL_ADDR: %RTnaipv6\n", pAddr));
-                    /* XXX: uwe: TODO: only interface we are attached to */
+                    Log(("KEV_INET6_NEW_LL_ADDR %.*s%d: %RTnaipv6\n",
+                         IFNAMSIZ, link->if_name, link->if_unit, pAddr));
                     goto kev_inet6_new;
 
                 case KEV_INET6_NEW_RTADV_ADDR:
-                    Log(("KEV_INET6_NEW_RTADV_ADDR: %RTnaipv6\n", pAddr));
+                    Log(("KEV_INET6_NEW_RTADV_ADDR %.*s%d: %RTnaipv6\n",
+                         IFNAMSIZ, link->if_name, link->if_unit, pAddr));
                     goto kev_inet6_new;
 
                 kev_inet6_new:
@@ -1540,13 +1593,16 @@ static void vboxNetFltDarwinSysSockUpcall(socket_t pSysSock, void *pvData, int f
                     break;
 
                 case KEV_INET6_ADDR_DELETED:
-                    Log(("KEV_INET6_ADDR_DELETED: %RTnaipv6\n", pAddr));
+                    Log(("KEV_INET6_ADDR_DELETED %.*s%d: %RTnaipv6\n",
+                         IFNAMSIZ, link->if_name, link->if_unit, pAddr));
+
                     pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
                         /* :fAdded */ false, kIntNetAddrType_IPv6, pAddr);
                     break;
 
                 default:
-                    Log(("KEV INET6 event %u addr %RTnaipv6\n", msg->event_code, pAddr));
+                    Log(("KEV INET6 event %u %.*s%d: addr %RTnaipv6\n",
+                         msg->event_code, IFNAMSIZ, link->if_name, link->if_unit, pAddr));
                     break;
             }
         }
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/darwin/loadnetflt.sh b/src/VBox/HostDrivers/VBoxNetFlt/darwin/loadnetflt.sh
index 0468973..5782259 100755
--- a/src/VBox/HostDrivers/VBoxNetFlt/darwin/loadnetflt.sh
+++ b/src/VBox/HostDrivers/VBoxNetFlt/darwin/loadnetflt.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile
index d386845..4a4df72 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile
+++ b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile
@@ -5,7 +5,7 @@
 
 #
 #
-# Copyright (C) 2006-2011 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt
index 691e18f..7f77a9e 100755
--- a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt
+++ b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2007-2010 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
index 195c872..c504e87 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
@@ -5,7 +5,7 @@
 
 #
 #
-# Copyright (C) 2006-2011 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
index 50fd939..8d3c237 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -89,6 +89,14 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOXNETFLTNOTIFIER;
 # define VBOX_NETDEV_NAME(dev)              ((dev)->reg_state != NETREG_REGISTERED ? "(unregistered net_device)" : (dev)->name)
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+# define VBOX_IPV4_IS_LOOPBACK(addr)        ipv4_is_loopback(addr)
+# define VBOX_IPV4_IS_LINKLOCAL_169(addr)   ipv4_is_linklocal_169(addr)
+#else
+# define VBOX_IPV4_IS_LOOPBACK(addr)        ((addr & htonl(IN_CLASSA_NET)) == htonl(0x7f000000))
+# define VBOX_IPV4_IS_LINKLOCAL_169(addr)   ((addr & htonl(IN_CLASSB_NET)) == htonl(0xa9fe0000))
+#endif
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
 # define VBOX_SKB_RESET_NETWORK_HDR(skb)    skb_reset_network_header(skb)
 # define VBOX_SKB_RESET_MAC_HDR(skb)        skb_reset_mac_header(skb)
@@ -1896,13 +1904,17 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign
     if (in_dev != NULL)
     {
         for_ifa(in_dev) {
-            if (IN_LOOPBACK(ntohl(ifa->ifa_address)))
+            if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
                 return NOTIFY_OK;
 
+            if (   dev != pThis->u.s.pDev
+                && VBOX_IPV4_IS_LINKLOCAL_169(ifa->ifa_address))
+                continue;
+
             Log(("%s: %s: IPv4 addr %RTnaipv4 mask %RTnaipv4\n",
                  __FUNCTION__, VBOX_NETDEV_NAME(dev),
                  ifa->ifa_address, ifa->ifa_mask));
-            
+
             pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
                 /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address);
         } endfor_ifa(in_dev);
@@ -1944,19 +1956,30 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign
 static int vboxNetFltLinuxNotifierIPv4Callback(struct notifier_block *self, unsigned long ulEventType, void *ptr)
 {
     PVBOXNETFLTINS     pThis = RT_FROM_MEMBER(self, VBOXNETFLTINS, u.s.NotifierIPv4);
-    struct net_device *pDev;
+    struct net_device *pDev, *pEventDev;
     struct in_ifaddr  *ifa   = (struct in_ifaddr *)ptr;
+    bool               fMyDev;
     int                rc    = NOTIFY_OK;
 
     pDev = vboxNetFltLinuxRetainNetDev(pThis);
-    Log(("VBoxNetFlt: %s: IPv4 event %s(0x%lx): addr %RTnaipv4 mask %RTnaipv4\n",
+    pEventDev = ifa->ifa_dev->dev;
+    fMyDev = (pDev == pEventDev);
+    Log(("VBoxNetFlt: %s: IPv4 event %s(0x%lx) %s: addr %RTnaipv4 mask %RTnaipv4\n",
          pDev ? VBOX_NETDEV_NAME(pDev) : "<???>",
          vboxNetFltLinuxGetNetDevEventName(ulEventType), ulEventType,
+         pEventDev ? VBOX_NETDEV_NAME(pEventDev) : "<???>",
          ifa->ifa_address, ifa->ifa_mask));
 
     if (pDev != NULL)
         vboxNetFltLinuxReleaseNetDev(pThis, pDev);
 
+    if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
+        return NOTIFY_OK;
+
+    if (   !fMyDev
+        && VBOX_IPV4_IS_LINKLOCAL_169(ifa->ifa_address))
+        return NOTIFY_OK;
+
     if (pThis->pSwitchPort->pfnNotifyHostAddress)
     {
         bool fAdded;
@@ -1966,7 +1989,7 @@ static int vboxNetFltLinuxNotifierIPv4Callback(struct notifier_block *self, unsi
             fAdded = false;
         else
             return NOTIFY_OK;
-            
+
         pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, fAdded,
                                                  kIntNetAddrType_IPv4, &ifa->ifa_local);
     }
@@ -1978,19 +2001,27 @@ static int vboxNetFltLinuxNotifierIPv4Callback(struct notifier_block *self, unsi
 static int vboxNetFltLinuxNotifierIPv6Callback(struct notifier_block *self, unsigned long ulEventType, void *ptr)
 {
     PVBOXNETFLTINS       pThis = RT_FROM_MEMBER(self, VBOXNETFLTINS, u.s.NotifierIPv6);
-    struct net_device   *pDev;
+    struct net_device   *pDev, *pEventDev;
     struct inet6_ifaddr *ifa   = (struct inet6_ifaddr *)ptr;
+    bool                 fMyDev;
     int                  rc    = NOTIFY_OK;
 
     pDev = vboxNetFltLinuxRetainNetDev(pThis);
-    Log(("VBoxNetFlt: %s: IPv6 event %s(0x%lx): %RTnaipv6\n",
+    pEventDev = ifa->idev->dev;
+    fMyDev = (pDev == pEventDev);
+    Log(("VBoxNetFlt: %s: IPv6 event %s(0x%lx) %s: %RTnaipv6\n",
          pDev ? VBOX_NETDEV_NAME(pDev) : "<???>",
          vboxNetFltLinuxGetNetDevEventName(ulEventType), ulEventType,
+         pEventDev ? VBOX_NETDEV_NAME(pEventDev) : "<???>",
          &ifa->addr));
 
     if (pDev != NULL)
         vboxNetFltLinuxReleaseNetDev(pThis, pDev);
 
+    if (   !fMyDev
+        && ipv6_addr_src_scope(&ifa->addr) <= IPV6_ADDR_SCOPE_LINKLOCAL)
+        return NOTIFY_OK;
+
     if (pThis->pSwitchPort->pfnNotifyHostAddress)
     {
         bool fAdded;
@@ -2000,7 +2031,7 @@ static int vboxNetFltLinuxNotifierIPv6Callback(struct notifier_block *self, unsi
             fAdded = false;
         else
             return NOTIFY_OK;
-            
+
         pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, fAdded,
                                                  kIntNetAddrType_IPv6, &ifa->addr);
     }
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt b/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt
index 49008be..3225e05 100755
--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt
+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2007-2011 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c b/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c
index c34f33a..d92c040 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c
+++ b/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c b/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c
index 06eea1f..a081ec8 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c
+++ b/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxbow.conf b/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxbow.conf
index 4b6c216..44c99db 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxbow.conf
+++ b/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxbow.conf
@@ -1,7 +1,7 @@
 #
 # Solaris Host VBoxBow (Crossbow) Configuration
 #
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf b/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf
index e7443f9..91c28ab 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf
+++ b/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf
@@ -1,7 +1,7 @@
 #
 # Solaris Host VBoxFlt Configuration
 #
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp
index 68c09ae..68b9e6b 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp
@@ -3,7 +3,7 @@
  * VBoxNetCfg.cpp - Network Configuration API.
  */
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -2122,12 +2122,50 @@ VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetLwfUninstall(IN INetCfg *pNc)
     return vboxNetCfgWinNetLwfUninstall(pNc, 0);
 }
 
+static void VBoxNetCfgWinFilterLimitWorkaround(void)
+{
+    /*
+     * Need to check if the system has a limit of installed filter drivers. If it
+     * has, bump the limit to 14, which the maximum value supported by Windows 7.
+     * Note that we only touch the limit if it is set to the default value (8).
+     * See @bugref{7899}.
+     */
+    HKEY hNetKey;
+    DWORD dwMaxNumFilters = 0;
+    DWORD cbMaxNumFilters = sizeof(dwMaxNumFilters);
+    LONG hr = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                           _T("SYSTEM\\CurrentControlSet\\Control\\Network"),
+                           0, KEY_QUERY_VALUE | KEY_SET_VALUE, &hNetKey);
+    if (SUCCEEDED(hr))
+    {
+        hr = RegQueryValueEx(hNetKey, _T("MaxNumFilters"), NULL, NULL,
+                             (LPBYTE)&dwMaxNumFilters, &cbMaxNumFilters);
+        if (SUCCEEDED(hr) && cbMaxNumFilters == sizeof(dwMaxNumFilters) && dwMaxNumFilters == 8)
+        {
+            dwMaxNumFilters = 14;
+            hr = RegSetValueEx(hNetKey, _T("MaxNumFilters"), 0, REG_DWORD,
+                             (LPBYTE)&dwMaxNumFilters, sizeof(dwMaxNumFilters));
+            if (SUCCEEDED(hr))
+                NonStandardLog("Adjusted the installed filter limit to 14...\n");
+            else
+                NonStandardLog("Failed to set MaxNumFilters, error code 0x%x\n", hr);
+        }
+        RegCloseKey(hNetKey);
+    }
+    else
+    {
+        NonStandardLog("Failed to open network key, error code 0x%x\n", hr);
+    }
+
+}
+
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetLwfInstall(IN INetCfg *pNc,
                                                        IN LPCWSTR const pInfFullPath)
 {
     HRESULT hr = vboxNetCfgWinNetLwfUninstall(pNc, SUOI_FORCEDELETE);
     if (SUCCEEDED(hr))
     {
+        VBoxNetCfgWinFilterLimitWorkaround();
         NonStandardLog("NetLwf will be installed ...\n");
         hr = vboxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETLWF_ID,
                                                  &GUID_DEVCLASS_NETSERVICE,
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetAdp.inf b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetAdp.inf
index da89d9c..c5aa5f0 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetAdp.inf
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetAdp.inf
@@ -3,7 +3,7 @@
 ; VBoxNetAdp.inf - VirtualBox Host-Only Driver inf file
 ;
 ;
-; Copyright (C) 2011 Oracle Corporation
+; Copyright (C) 2011-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt.inf b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt.inf
index d06b33a..7b41bb6 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt.inf
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFlt.inf
@@ -4,7 +4,7 @@
 ; Protocol edge
 ;
 ;
-; Copyright (C) 2011 Oracle Corporation
+; Copyright (C) 2011-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h
index 8951bfa..101ed30 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltCmn-win.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp
index 8dd5989..92bd21c 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp
@@ -4,7 +4,7 @@
  * Miniport edge
  */
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h
index 4e82bba..fc0931a 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM.inf b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM.inf
index 761b510..4129e39 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM.inf
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM.inf
@@ -4,7 +4,7 @@
 ; Miniport edge
 ;
 ;
-; Copyright (C) 2011 Oracle Corporation
+; Copyright (C) 2011-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp
index 5f0e560..bb6d489 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp
@@ -4,7 +4,7 @@
  * Protocol edge
  */
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.h b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.h
index a43dbc8..a1ae343 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.h
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.h
@@ -4,7 +4,7 @@
  * Protocol edge API
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp
index 88753ec..aa77afc 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp
@@ -4,7 +4,7 @@
  * NetFlt Runtime
  */
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h
index 7e6ca0c..58b13be 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h
@@ -4,7 +4,7 @@
  * NetFlt Runtime API
  */
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp
similarity index 83%
rename from src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp
rename to src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp
index 83b47e3..8226323 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp
@@ -3,7 +3,7 @@
  * VBoxNetLwf-win.cpp - NDIS6 Bridged Networking Driver, Windows-specific code.
  */
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -58,11 +58,14 @@ RT_C_DECLS_BEGIN
 #  undef  _interlockedbittestandset64
 #  undef  _interlockedbittestandreset64
 #  include <ndis.h>
+#  include <netioapi.h>
 #else
-//#  include <ntddk.h>
+#  include <ntddk.h>
+#  include <netioapi.h>
 /* can include ndis.h right away */
 #  include <ndis.h>
 #endif
+#include <mstcpip.h>
 RT_C_DECLS_END
 
 #if 0
@@ -77,13 +80,15 @@ typedef struct VBOXNETFLTWIN
 {
     /** filter module context handle */
     NDIS_HANDLE hModuleCtx;
+    /** IP address change notifier handle */
+    HANDLE hNotifier; /* Must be here as hModuleCtx may already be NULL when vboxNetFltOsDeleteInstance is called */
 } VBOXNETFLTWIN, *PVBOXNETFLTWIN;
 #define VBOXNETFLT_NO_PACKET_QUEUE
 #define VBOXNETFLT_OS_SPECFIC 1
 #include "VBoxNetFltInternal.h"
 
 #include "VBoxNetLwf-win.h"
-#include "VBoxNetCmn-win.h"
+#include "VBox/VBoxNetCmn-win.h"
 
 /* Forward declarations */
 FILTER_ATTACH vboxNetLwfWinAttach;
@@ -404,11 +409,11 @@ DECLINLINE(bool) vboxNetLwfWinChangeState(PVBOXNETLWF_MODULE pModuleCtx, uint32_
     {
         fSuccess = ASMAtomicCmpXchgU32(&pModuleCtx->enmState, enmNew, enmOld);
         if (fSuccess)
-            Log((__FUNCTION__": state change %s -> %s\n",
+            Log(("vboxNetLwfWinChangeState: state change %s -> %s\n",
                  vboxNetLwfWinStateToText(enmOld),
                  vboxNetLwfWinStateToText(enmNew)));
         else
-            Log((__FUNCTION__": failed state change %s (actual=%s) -> %s\n",
+            Log(("ERROR! vboxNetLwfWinChangeState: failed state change %s (actual=%s) -> %s\n",
                  vboxNetLwfWinStateToText(enmOld),
                  vboxNetLwfWinStateToText(ASMAtomicReadU32(&pModuleCtx->enmState)),
                  vboxNetLwfWinStateToText(enmNew)));
@@ -417,7 +422,7 @@ DECLINLINE(bool) vboxNetLwfWinChangeState(PVBOXNETLWF_MODULE pModuleCtx, uint32_
     else
     {
         uint32_t enmPrevState = ASMAtomicXchgU32(&pModuleCtx->enmState, enmNew);
-        Log((__FUNCTION__": state change %s -> %s\n",
+        Log(("vboxNetLwfWinChangeState: state change %s -> %s\n",
              vboxNetLwfWinStateToText(enmPrevState),
              vboxNetLwfWinStateToText(enmNew)));
     }
@@ -479,7 +484,7 @@ void inline vboxNetLwfWinOverridePacketFiltersUp(PVBOXNETLWF_MODULE pModuleCtx,
 NDIS_STATUS vboxNetLwfWinOidRequest(IN NDIS_HANDLE hModuleCtx,
                                     IN PNDIS_OID_REQUEST pOidRequest)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinOidRequest: module=%p\n", hModuleCtx));
     vboxNetCmnWinDumpOidRequest(__FUNCTION__, pOidRequest);
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
     PNDIS_OID_REQUEST pClone = NULL;
@@ -501,18 +506,18 @@ NDIS_STATUS vboxNetLwfWinOidRequest(IN NDIS_HANDLE hModuleCtx,
             && pOidRequest->DATA.SET_INFORMATION.Oid == OID_GEN_CURRENT_PACKET_FILTER)
         {
             ASMAtomicWriteBool(&pModuleCtx->fHostPromisc, !!(*(ULONG*)pOidRequest->DATA.SET_INFORMATION.InformationBuffer & NDIS_PACKET_TYPE_PROMISCUOUS));
-            Log((__FUNCTION__": host wanted to set packet filter value to:\n"));
+            Log(("vboxNetLwfWinOidRequest: host wanted to set packet filter value to:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pOidRequest->DATA.SET_INFORMATION.InformationBuffer);
             /* Keep adapter in promisc mode as long as we are active. */
             if (ASMAtomicReadBool(&pModuleCtx->fActive))
                 *(ULONG*)pClone->DATA.SET_INFORMATION.InformationBuffer |= NDIS_PACKET_TYPE_PROMISCUOUS;
-            Log5((__FUNCTION__": pass the following packet filters to miniport:\n"));
+            Log5(("vboxNetLwfWinOidRequest: pass the following packet filters to miniport:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pOidRequest->DATA.SET_INFORMATION.InformationBuffer);
         }
         if (pOidRequest->RequestType == NdisRequestSetInformation
             && pOidRequest->DATA.SET_INFORMATION.Oid == OID_TCP_OFFLOAD_CURRENT_CONFIG)
         {
-            Log5((__FUNCTION__": offloading set to:\n"));
+            Log5(("vboxNetLwfWinOidRequest: offloading set to:\n"));
             vboxNetLwfWinDumpSetOffloadSettings((PNDIS_OFFLOAD)pOidRequest->DATA.SET_INFORMATION.InformationBuffer);
         }
 
@@ -523,7 +528,7 @@ NDIS_STATUS vboxNetLwfWinOidRequest(IN NDIS_HANDLE hModuleCtx,
             /* Synchronous completion */
             pPrev = ASMAtomicXchgPtrT(&pModuleCtx->pPendingRequest, NULL, PNDIS_OID_REQUEST);
             Assert(pPrev == pClone);
-            Log5((__FUNCTION__": got the following packet filters from miniport:\n"));
+            Log5(("vboxNetLwfWinOidRequest: got the following packet filters from miniport:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pOidRequest->DATA.QUERY_INFORMATION.InformationBuffer);
             /*
              * The host does not expect the adapter to be in promisc mode,
@@ -532,7 +537,7 @@ NDIS_STATUS vboxNetLwfWinOidRequest(IN NDIS_HANDLE hModuleCtx,
             if (   pOidRequest->RequestType == NdisRequestQueryInformation
                 && pOidRequest->DATA.QUERY_INFORMATION.Oid == OID_GEN_CURRENT_PACKET_FILTER)
                 vboxNetLwfWinOverridePacketFiltersUp(pModuleCtx, (ULONG*)pOidRequest->DATA.QUERY_INFORMATION.InformationBuffer);
-            Log5((__FUNCTION__": reporting to the host the following packet filters:\n"));
+            Log5(("vboxNetLwfWinOidRequest: reporting to the host the following packet filters:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pOidRequest->DATA.QUERY_INFORMATION.InformationBuffer);
             vboxNetLwfWinCopyOidRequestResults(pClone, pOidRequest);
             NdisFreeCloneOidRequest(pModuleCtx->hFilter, pClone);
@@ -541,9 +546,9 @@ NDIS_STATUS vboxNetLwfWinOidRequest(IN NDIS_HANDLE hModuleCtx,
     }
     else
     {
-        Log((__FUNCTION__": NdisAllocateCloneOidRequest failed with 0x%x\n", Status));
+        Log(("ERROR! vboxNetLwfWinOidRequest: NdisAllocateCloneOidRequest failed with 0x%x\n", Status));
     }
-    LogFlow(("<=="__FUNCTION__": Status=0x%x\n", Status));
+    LogFlow(("<==vboxNetLwfWinOidRequest: Status=0x%x\n", Status));
     return Status;
 }
 
@@ -551,7 +556,7 @@ VOID vboxNetLwfWinOidRequestComplete(IN NDIS_HANDLE hModuleCtx,
                                      IN PNDIS_OID_REQUEST pRequest,
                                      IN NDIS_STATUS Status)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p req=%p status=0x%x\n", hModuleCtx, pRequest, Status));
+    LogFlow(("==>vboxNetLwfWinOidRequestComplete: module=%p req=%p status=0x%x\n", hModuleCtx, pRequest, Status));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
     PNDIS_OID_REQUEST pOriginal = *((PNDIS_OID_REQUEST*)(pRequest->SourceReserved));
     if (pOriginal)
@@ -560,15 +565,15 @@ VOID vboxNetLwfWinOidRequestComplete(IN NDIS_HANDLE hModuleCtx,
         PNDIS_OID_REQUEST pPrev = ASMAtomicXchgPtrT(&pModuleCtx->pPendingRequest, NULL, PNDIS_OID_REQUEST);
         Assert(pPrev == pRequest);
 
-        Log5((__FUNCTION__": completed rq type=%d oid=%x\n", pRequest->RequestType, pRequest->DATA.QUERY_INFORMATION.Oid));
+        Log5(("vboxNetLwfWinOidRequestComplete: completed rq type=%d oid=%x\n", pRequest->RequestType, pRequest->DATA.QUERY_INFORMATION.Oid));
         vboxNetLwfWinCopyOidRequestResults(pRequest, pOriginal);
         if (   pRequest->RequestType == NdisRequestQueryInformation
             && pRequest->DATA.QUERY_INFORMATION.Oid == OID_GEN_CURRENT_PACKET_FILTER)
         {
-            Log5((__FUNCTION__": underlying miniport reports its packet filters:\n"));
+            Log5(("vboxNetLwfWinOidRequestComplete: underlying miniport reports its packet filters:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pRequest->DATA.QUERY_INFORMATION.InformationBuffer);
             vboxNetLwfWinOverridePacketFiltersUp(pModuleCtx, (ULONG*)pRequest->DATA.QUERY_INFORMATION.InformationBuffer);
-            Log5((__FUNCTION__": reporting the following packet filters to upper protocol:\n"));
+            Log5(("vboxNetLwfWinOidRequestComplete: reporting the following packet filters to upper protocol:\n"));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pRequest->DATA.QUERY_INFORMATION.InformationBuffer);
         }
         NdisFreeCloneOidRequest(pModuleCtx->hFilter, pRequest);
@@ -577,12 +582,12 @@ VOID vboxNetLwfWinOidRequestComplete(IN NDIS_HANDLE hModuleCtx,
     else
     {
         /* This is not a clone, we originated it */
-        Log((__FUNCTION__": locally originated request (%p) completed, status=0x%x\n", pRequest, Status));
+        Log(("vboxNetLwfWinOidRequestComplete: locally originated request (%p) completed, status=0x%x\n", pRequest, Status));
         PVBOXNETLWF_OIDREQ pRqWrapper = RT_FROM_MEMBER(pRequest, VBOXNETLWF_OIDREQ, Request);
         pRqWrapper->Status = Status;
         NdisSetEvent(&pRqWrapper->Event);
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinOidRequestComplete\n"));
 }
 
 
@@ -594,7 +599,7 @@ static bool vboxNetLwfWinIsPromiscuous(PVBOXNETLWF_MODULE pModuleCtx)
 #if 0
 static NDIS_STATUS vboxNetLwfWinGetPacketFilter(PVBOXNETLWF_MODULE pModuleCtx)
 {
-    LogFlow(("==>"__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetLwfWinGetPacketFilter: module=%p\n", pModuleCtx));
     VBOXNETLWF_OIDREQ Rq;
     vboxNetLwfWinInitOidRequest(&Rq);
     Rq.Request.RequestType = NdisRequestQueryInformation;
@@ -604,25 +609,25 @@ static NDIS_STATUS vboxNetLwfWinGetPacketFilter(PVBOXNETLWF_MODULE pModuleCtx)
     NDIS_STATUS Status = vboxNetLwfWinSyncOidRequest(pModuleCtx, &Rq);
     if (Status != NDIS_STATUS_SUCCESS)
     {
-        Log((__FUNCTION__": vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed with 0x%x\n", Status));
+        Log(("ERROR! vboxNetLwfWinGetPacketFilter: vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed with 0x%x\n", Status));
         return FALSE;
     }
     if (Rq.Request.DATA.QUERY_INFORMATION.BytesWritten != sizeof(pModuleCtx->uPacketFilter))
     {
-        Log((__FUNCTION__": vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed to write neccessary amount (%d bytes), actually written %d bytes\n", sizeof(pModuleCtx->uPacketFilter), Rq.Request.DATA.QUERY_INFORMATION.BytesWritten));
+        Log(("ERROR! vboxNetLwfWinGetPacketFilter: vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed to write neccessary amount (%d bytes), actually written %d bytes\n", sizeof(pModuleCtx->uPacketFilter), Rq.Request.DATA.QUERY_INFORMATION.BytesWritten));
     }
 
-    Log5((__FUNCTION__": OID_GEN_CURRENT_PACKET_FILTER query returned the following filters:\n"));
+    Log5(("vboxNetLwfWinGetPacketFilter: OID_GEN_CURRENT_PACKET_FILTER query returned the following filters:\n"));
     vboxNetLwfWinDumpFilterTypes(pModuleCtx->uPacketFilter);
 
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetLwfWinGetPacketFilter: status=0x%x\n", Status));
     return Status;
 }
 #endif
 
 static NDIS_STATUS vboxNetLwfWinSetPacketFilter(PVBOXNETLWF_MODULE pModuleCtx, bool fPromisc)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p %s\n", pModuleCtx, fPromisc ? "promiscuous" : "normal"));
+    LogFlow(("==>vboxNetLwfWinSetPacketFilter: module=%p %s\n", pModuleCtx, fPromisc ? "promiscuous" : "normal"));
     ULONG uFilter = 0;
     VBOXNETLWF_OIDREQ Rq;
     vboxNetLwfWinInitOidRequest(&Rq);
@@ -633,16 +638,16 @@ static NDIS_STATUS vboxNetLwfWinSetPacketFilter(PVBOXNETLWF_MODULE pModuleCtx, b
     NDIS_STATUS Status = vboxNetLwfWinSyncOidRequest(pModuleCtx, &Rq);
     if (Status != NDIS_STATUS_SUCCESS)
     {
-        Log((__FUNCTION__": vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed with 0x%x\n", Status));
+        Log(("ERROR! vboxNetLwfWinSetPacketFilter: vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed with 0x%x\n", Status));
         return Status;
     }
     if (Rq.Request.DATA.QUERY_INFORMATION.BytesWritten != sizeof(uFilter))
     {
-        Log((__FUNCTION__": vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed to write neccessary amount (%d bytes), actually written %d bytes\n", sizeof(uFilter), Rq.Request.DATA.QUERY_INFORMATION.BytesWritten));
+        Log(("ERROR! vboxNetLwfWinSetPacketFilter: vboxNetLwfWinSyncOidRequest(query, OID_GEN_CURRENT_PACKET_FILTER) failed to write neccessary amount (%d bytes), actually written %d bytes\n", sizeof(uFilter), Rq.Request.DATA.QUERY_INFORMATION.BytesWritten));
         return NDIS_STATUS_FAILURE;
     }
 
-    Log5((__FUNCTION__": OID_GEN_CURRENT_PACKET_FILTER query returned the following filters:\n"));
+    Log5(("vboxNetLwfWinSetPacketFilter: OID_GEN_CURRENT_PACKET_FILTER query returned the following filters:\n"));
     vboxNetLwfWinDumpFilterTypes(uFilter);
 
     if (fPromisc)
@@ -658,7 +663,7 @@ static NDIS_STATUS vboxNetLwfWinSetPacketFilter(PVBOXNETLWF_MODULE pModuleCtx, b
             uFilter &= ~NDIS_PACKET_TYPE_PROMISCUOUS;
     }
 
-    Log5((__FUNCTION__": OID_GEN_CURRENT_PACKET_FILTER about to set the following filters:\n"));
+    Log5(("vboxNetLwfWinSetPacketFilter: OID_GEN_CURRENT_PACKET_FILTER about to set the following filters:\n"));
     vboxNetLwfWinDumpFilterTypes(uFilter);
 
     NdisResetEvent(&Rq.Event); /* need to reset as it has been set by query op */
@@ -669,10 +674,10 @@ static NDIS_STATUS vboxNetLwfWinSetPacketFilter(PVBOXNETLWF_MODULE pModuleCtx, b
     Status = vboxNetLwfWinSyncOidRequest(pModuleCtx, &Rq);
     if (Status != NDIS_STATUS_SUCCESS)
     {
-        Log((__FUNCTION__": vboxNetLwfWinSyncOidRequest(set, OID_GEN_CURRENT_PACKET_FILTER, vvv below vvv) failed with 0x%x\n", Status));
+        Log(("ERROR! vboxNetLwfWinSetPacketFilter: vboxNetLwfWinSyncOidRequest(set, OID_GEN_CURRENT_PACKET_FILTER, vvv below vvv) failed with 0x%x\n", Status));
         vboxNetLwfWinDumpFilterTypes(uFilter);
     }
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetLwfWinSetPacketFilter: status=0x%x\n", Status));
     return Status;
 }
 
@@ -759,7 +764,7 @@ static void vboxNetLwfWinDevDestroy(PVBOXNETLWFGLOBALS pGlobals)
 static NDIS_STATUS vboxNetLwfWinAttach(IN NDIS_HANDLE hFilter, IN NDIS_HANDLE hDriverCtx,
                                        IN PNDIS_FILTER_ATTACH_PARAMETERS pParameters)
 {
-    LogFlow(("==>"__FUNCTION__": filter=%p\n", hFilter));
+    LogFlow(("==>vboxNetLwfWinAttach: filter=%p\n", hFilter));
 
     PVBOXNETLWFGLOBALS pGlobals = (PVBOXNETLWFGLOBALS)hDriverCtx;
     AssertReturn(pGlobals, NDIS_STATUS_FAILURE);
@@ -770,7 +775,7 @@ static NDIS_STATUS vboxNetLwfWinAttach(IN NDIS_HANDLE hFilter, IN NDIS_HANDLE hD
                                                                       LowPoolPriority);
     if (!pModuleCtx)
         return NDIS_STATUS_RESOURCES;
-    Log4((__FUNCTION__ ": allocated module context 0x%p\n", pModuleCtx));
+    Log4(("vboxNetLwfWinAttach: allocated module context 0x%p\n", pModuleCtx));
 
     NdisZeroMemory(pModuleCtx, sizeof(VBOXNETLWF_MODULE));
 
@@ -785,6 +790,9 @@ static NDIS_STATUS vboxNetLwfWinAttach(IN NDIS_HANDLE hFilter, IN NDIS_HANDLE hD
         NdisFreeMemory(pModuleCtx, 0, 0);
         return NDIS_STATUS_FAILURE;
     }
+    DbgPrint("vboxNetLwfWinAttach: friendly name=%wZ\n", pParameters->BaseMiniportInstanceName);
+    DbgPrint("vboxNetLwfWinAttach: name=%Z\n", pModuleCtx->strMiniportName);
+
     Assert(pParameters->MacAddressLength == sizeof(RTMAC));
     NdisMoveMemory(&pModuleCtx->MacAddr, pParameters->CurrentMacAddress, RT_MIN(sizeof(RTMAC), pParameters->MacAddressLength));
     if (pParameters->DefaultOffloadConfiguration)
@@ -793,13 +801,9 @@ static NDIS_STATUS vboxNetLwfWinAttach(IN NDIS_HANDLE hFilter, IN NDIS_HANDLE hD
         pModuleCtx->fOffloadConfigValid = true;
     }
 
-    pModuleCtx->pGlobals = pGlobals;
-    pModuleCtx->hFilter  = hFilter;
+    pModuleCtx->pGlobals  = pGlobals;
+    pModuleCtx->hFilter   = hFilter;
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Attaching);
-    /* Insert into module chain */
-    NdisAcquireSpinLock(&pGlobals->Lock);
-    RTListPrepend(&pGlobals->listModules, &pModuleCtx->node);
-    NdisReleaseSpinLock(&pGlobals->Lock);
     /* Initialize transmission mutex and events */
     NDIS_INIT_MUTEX(&pModuleCtx->InTransmit);
 #ifdef VBOXNETLWF_SYNC_SEND
@@ -826,12 +830,12 @@ static NDIS_STATUS vboxNetLwfWinAttach(IN NDIS_HANDLE hFilter, IN NDIS_HANDLE hD
     pModuleCtx->hPool = NdisAllocateNetBufferListPool(hFilter, &PoolParams);
     if (!pModuleCtx->hPool)
     {
-        Log(("ERROR! "__FUNCTION__": NdisAllocateNetBufferListPool failed\n"));
+        Log(("ERROR! vboxNetLwfWinAttach: NdisAllocateNetBufferListPool failed\n"));
         RtlFreeAnsiString(&pModuleCtx->strMiniportName);
         NdisFreeMemory(pModuleCtx, 0, 0);
         return NDIS_STATUS_RESOURCES;
     }
-    Log4((__FUNCTION__ ": allocated NBL+NB pool 0x%p\n", pModuleCtx->hPool));
+    Log4(("vboxNetLwfWinAttach: allocated NBL+NB pool 0x%p\n", pModuleCtx->hPool));
 
     NDIS_FILTER_ATTRIBUTES Attributes;
     NdisZeroMemory(&Attributes, sizeof(Attributes));
@@ -844,24 +848,28 @@ static NDIS_STATUS vboxNetLwfWinAttach(IN NDIS_HANDLE hFilter, IN NDIS_HANDLE hD
     {
         Log(("ERROR! vboxNetLwfWinAttach: NdisFSetAttributes failed with 0x%x\n", Status));
         NdisFreeNetBufferListPool(pModuleCtx->hPool);
-        Log4((__FUNCTION__ ": freed NBL+NB pool 0x%p\n", pModuleCtx->hPool));
+        Log4(("vboxNetLwfWinAttach: freed NBL+NB pool 0x%p\n", pModuleCtx->hPool));
         RtlFreeAnsiString(&pModuleCtx->strMiniportName);
         NdisFreeMemory(pModuleCtx, 0, 0);
         return NDIS_STATUS_RESOURCES;
     }
+    /* Insert into module chain */
+    NdisAcquireSpinLock(&pGlobals->Lock);
+    RTListPrepend(&pGlobals->listModules, &pModuleCtx->node);
+    NdisReleaseSpinLock(&pGlobals->Lock);
 
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Paused);
 
     /// @todo Somehow the packet filter is 0 at this point: Status = vboxNetLwfWinGetPacketFilter(pModuleCtx);
     /// @todo We actually update it later in status handler, perhaps we should not do anything here.
 
-    LogFlow(("<=="__FUNCTION__": Status = 0x%x\n", Status));
+    LogFlow(("<==vboxNetLwfWinAttach: Status = 0x%x\n", Status));
     return Status;
 }
 
 static VOID vboxNetLwfWinDetach(IN NDIS_HANDLE hModuleCtx)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinDetach: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Detached, LwfState_Paused);
 
@@ -892,18 +900,18 @@ static VOID vboxNetLwfWinDetach(IN NDIS_HANDLE hModuleCtx)
     if (pModuleCtx->hPool)
     {
         NdisFreeNetBufferListPool(pModuleCtx->hPool);
-        Log4((__FUNCTION__ ": freed NBL+NB pool 0x%p\n", pModuleCtx->hPool));
+        Log4(("vboxNetLwfWinDetach: freed NBL+NB pool 0x%p\n", pModuleCtx->hPool));
     }
     RtlFreeAnsiString(&pModuleCtx->strMiniportName);
     NdisFreeMemory(hModuleCtx, 0, 0);
-    Log4((__FUNCTION__ ": freed module context 0x%p\n", pModuleCtx));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    Log4(("vboxNetLwfWinDetach: freed module context 0x%p\n", pModuleCtx));
+    LogFlow(("<==vboxNetLwfWinDetach\n"));
 }
 
 
 static NDIS_STATUS vboxNetLwfWinPause(IN NDIS_HANDLE hModuleCtx, IN PNDIS_FILTER_PAUSE_PARAMETERS pParameters)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinPause: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Pausing, LwfState_Running);
     /* Wait for pending send/indication operations to complete. */
@@ -913,14 +921,14 @@ static NDIS_STATUS vboxNetLwfWinPause(IN NDIS_HANDLE hModuleCtx, IN PNDIS_FILTER
 #endif /* !VBOXNETLWF_SYNC_SEND */
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Paused, LwfState_Pausing);
     NDIS_RELEASE_MUTEX(&pModuleCtx->InTransmit);
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinPause\n"));
     return NDIS_STATUS_SUCCESS; /* Failure is not an option */
 }
 
 
 static void vboxNetLwfWinIndicateOffload(PVBOXNETLWF_MODULE pModuleCtx, PNDIS_OFFLOAD pOffload)
 {
-    Log5((__FUNCTION__": offload config changed to:\n"));
+    Log5(("vboxNetLwfWinIndicateOffload: offload config changed to:\n"));
     vboxNetLwfWinDumpOffloadSettings(pOffload);
     NDIS_STATUS_INDICATION OffloadingIndication;
     NdisZeroMemory(&OffloadingIndication, sizeof(OffloadingIndication));
@@ -937,7 +945,7 @@ static void vboxNetLwfWinIndicateOffload(PVBOXNETLWF_MODULE pModuleCtx, PNDIS_OF
 
 static NDIS_STATUS vboxNetLwfWinRestart(IN NDIS_HANDLE hModuleCtx, IN PNDIS_FILTER_RESTART_PARAMETERS pParameters)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinRestart: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Restarting, LwfState_Paused);
 #if 1
@@ -979,20 +987,20 @@ static NDIS_STATUS vboxNetLwfWinRestart(IN NDIS_HANDLE hModuleCtx, IN PNDIS_FILT
             OffloadConfig.LsoV2.IPv6.IpExtensionHeadersSupported            = NDIS_OFFLOAD_NOT_SUPPORTED;
             OffloadConfig.LsoV2.IPv6.TcpOptionsSupported                    = NDIS_OFFLOAD_NOT_SUPPORTED;
             vboxNetLwfWinIndicateOffload(pModuleCtx, &OffloadConfig);
-            Log((__FUNCTION__": set offloading off\n"));
+            Log(("vboxNetLwfWinRestart: set offloading off\n"));
         }
         else
         {
             /* The filter is inactive -- restore offloading configuration. */
             vboxNetLwfWinIndicateOffload(pModuleCtx, &pModuleCtx->SavedOffloadConfig);
-            Log((__FUNCTION__": restored offloading config\n"));
+            Log(("vboxNetLwfWinRestart: restored offloading config\n"));
         }
     }
 #endif
 
     vboxNetLwfWinChangeState(pModuleCtx, LwfState_Running, LwfState_Restarting);
     NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
-    LogFlow(("<=="__FUNCTION__": Status = 0x%x\n", Status));
+    LogFlow(("<==vboxNetLwfWinRestart: Status = 0x%x\n", Status));
     return Status;
 }
 
@@ -1156,7 +1164,7 @@ DECLINLINE(void) vboxNetLwfWinDumpPacket(PCINTNETSG pSG, const char *cszText)
 static void vboxNetLwfWinDestroySG(PINTNETSG pSG)
 {
     NdisFreeMemory(pSG, 0, 0);
-    Log4((__FUNCTION__ ": freed SG 0x%p\n", pSG));
+    Log4(("vboxNetLwfWinDestroySG: freed SG 0x%p\n", pSG));
 }
 
 DECLINLINE(ULONG) vboxNetLwfWinCalcSegments(PNET_BUFFER pNetBuf)
@@ -1175,7 +1183,7 @@ DECLINLINE(void) vboxNetLwfWinFreeMdlChain(PMDL pMdl)
     {
         pMdlNext = pMdl->Next;
         NdisFreeMdl(pMdl);
-        Log4((__FUNCTION__ ": freed MDL 0x%p\n", pMdl));
+        Log4(("vboxNetLwfWinFreeMdlChain: freed MDL 0x%p\n", pMdl));
         pMdl = pMdlNext;
     }
 #endif /* VBOXNETLWF_SYNC_SEND */
@@ -1189,18 +1197,18 @@ DECLINLINE(void) vboxNetLwfWinFreeMdlChain(PMDL pMdl)
 static PNET_BUFFER_LIST vboxNetLwfWinSGtoNB(PVBOXNETLWF_MODULE pModule, PINTNETSG pSG)
 {
     AssertReturn(pSG->cSegsUsed >= 1, NULL);
-    LogFlow(("==>"__FUNCTION__": segments=%d\n", pSG->cSegsUsed));
+    LogFlow(("==>vboxNetLwfWinSGtoNB: segments=%d\n", pSG->cSegsUsed));
 
 #ifdef VBOXNETLWF_SYNC_SEND
     PINTNETSEG pSeg = pSG->aSegs;
     PMDL pMdl = NdisAllocateMdl(pModule->hFilter, pSeg->pv, pSeg->cb);
     if (!pMdl)
     {
-        Log(("ERROR! "__FUNCTION__": failed to allocate an MDL\n"));
-        LogFlow(("<=="__FUNCTION__": return NULL\n"));
+        Log(("ERROR! vboxNetLwfWinSGtoNB: failed to allocate an MDL\n"));
+        LogFlow(("<==vboxNetLwfWinSGtoNB: return NULL\n"));
         return NULL;
     }
-    Log4((__FUNCTION__ ": allocated Mdl 0x%p\n", pMdl));
+    Log4(("vboxNetLwfWinSGtoNB: allocated Mdl 0x%p\n", pMdl));
     PMDL pMdlCurr = pMdl;
     for (int i = 1; i < pSG->cSegsUsed; i++)
     {
@@ -1208,13 +1216,13 @@ static PNET_BUFFER_LIST vboxNetLwfWinSGtoNB(PVBOXNETLWF_MODULE pModule, PINTNETS
         pMdlCurr->Next = NdisAllocateMdl(pModule->hFilter, pSeg->pv, pSeg->cb);
         if (!pMdlCurr->Next)
         {
-            Log(("ERROR! "__FUNCTION__": failed to allocate an MDL\n"));
+            Log(("ERROR! vboxNetLwfWinSGtoNB: failed to allocate an MDL\n"));
             /* Tear down all MDL we chained so far */
             vboxNetLwfWinFreeMdlChain(pMdl);
             return NULL;
         }
         pMdlCurr = pMdlCurr->Next;
-        Log4((__FUNCTION__ ": allocated Mdl 0x%p\n", pMdlCurr));
+        Log4(("vboxNetLwfWinSGtoNB: allocated Mdl 0x%p\n", pMdlCurr));
     }
     PNET_BUFFER_LIST pBufList = NdisAllocateNetBufferAndNetBufferList(pModule->hPool,
                                                                       0 /* ContextSize */,
@@ -1224,13 +1232,13 @@ static PNET_BUFFER_LIST vboxNetLwfWinSGtoNB(PVBOXNETLWF_MODULE pModule, PINTNETS
                                                                       pSG->cbTotal);
     if (pBufList)
     {
-        Log4((__FUNCTION__ ": allocated NBL+NB 0x%p\n", pBufList));
+        Log4(("vboxNetLwfWinSGtoNB: allocated NBL+NB 0x%p\n", pBufList));
         pBufList->SourceHandle = pModule->hFilter;
         /** @todo Do we need to initialize anything else? */
     }
     else
     {
-        Log(("ERROR! "__FUNCTION__": failed to allocate an NBL+NB\n"));
+        Log(("ERROR! vboxNetLwfWinSGtoNB: failed to allocate an NBL+NB\n"));
         vboxNetLwfWinFreeMdlChain(pMdl);
     }
 #else /* !VBOXNETLWF_SYNC_SEND */
@@ -1251,13 +1259,13 @@ static PNET_BUFFER_LIST vboxNetLwfWinSGtoNB(PVBOXNETLWF_MODULE pModule, PINTNETS
                 NdisMoveMemory(pDst, pSG->aSegs[i].pv, pSG->aSegs[i].cb);
                 pDst += pSG->aSegs[i].cb;
             }
-            Log4((__FUNCTION__ ": allocated NBL+NB+MDL+Data 0x%p\n", pBufList));
+            Log4(("vboxNetLwfWinSGtoNB: allocated NBL+NB+MDL+Data 0x%p\n", pBufList));
             pBufList->SourceHandle = pModule->hFilter;
             /** @todo Do we need to initialize anything else? */
         }
         else
         {
-            Log((__FUNCTION__": failed to obtain the buffer pointer (size=%u)\n", pSG->cbTotal));
+            Log(("ERROR! vboxNetLwfWinSGtoNB: failed to obtain the buffer pointer (size=%u)\n", pSG->cbTotal));
             NdisAdvanceNetBufferDataStart(pBuffer, pSG->cbTotal, false, NULL); /** @todo why bother? */
             NdisFreeNetBufferList(pBufList);
             pBufList = NULL;
@@ -1265,12 +1273,12 @@ static PNET_BUFFER_LIST vboxNetLwfWinSGtoNB(PVBOXNETLWF_MODULE pModule, PINTNETS
     }
     else
     {
-        Log((__FUNCTION__": NdisRetreatNetBufferDataStart failed with 0x%x (size=%u)\n", Status, pSG->cbTotal));
+        Log(("ERROR! vboxNetLwfWinSGtoNB: NdisRetreatNetBufferDataStart failed with 0x%x (size=%u)\n", Status, pSG->cbTotal));
         NdisFreeNetBufferList(pBufList);
         pBufList = NULL;
     }
 #endif /* !VBOXNETLWF_SYNC_SEND */
-    LogFlow(("<=="__FUNCTION__": return %p\n", pBufList));
+    LogFlow(("<==vboxNetLwfWinSGtoNB: return %p\n", pBufList));
     return pBufList;
 }
 
@@ -1284,7 +1292,7 @@ static PINTNETSG vboxNetLwfWinNBtoSG(PVBOXNETLWF_MODULE pModule, PNET_BUFFER pNe
                                                                  VBOXNETLWF_MEM_TAG,
                                                                  NormalPoolPriority);
     AssertReturn(pSG, pSG);
-    Log4((__FUNCTION__ ": allocated SG 0x%p\n", pSG));
+    Log4(("vboxNetLwfWinNBtoSG: allocated SG 0x%p\n", pSG));
     IntNetSgInitTempSegs(pSG, cbPacket /*cbTotal*/, cSegs, cSegs /*cSegsUsed*/);
 
     int rc = NDIS_STATUS_SUCCESS;
@@ -1336,24 +1344,24 @@ static PINTNETSG vboxNetLwfWinNBtoSG(PVBOXNETLWF_MODULE pModule, PNET_BUFFER pNe
 
 VOID vboxNetLwfWinStatus(IN NDIS_HANDLE hModuleCtx, IN PNDIS_STATUS_INDICATION pIndication)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinStatus: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
-    Log((__FUNCTION__"Got status indication: %s\n", vboxNetLwfWinStatusToText(pIndication->StatusCode)));
+    Log(("vboxNetLwfWinStatus: Got status indication: %s\n", vboxNetLwfWinStatusToText(pIndication->StatusCode)));
     switch (pIndication->StatusCode)
     {
         case NDIS_STATUS_PACKET_FILTER:
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pIndication->StatusBuffer);
             vboxNetLwfWinOverridePacketFiltersUp(pModuleCtx, (ULONG*)pIndication->StatusBuffer);
-            Log((__FUNCTION__"Reporting status: %s\n", vboxNetLwfWinStatusToText(pIndication->StatusCode)));
+            Log(("vboxNetLwfWinStatus: Reporting status: %s\n", vboxNetLwfWinStatusToText(pIndication->StatusCode)));
             vboxNetLwfWinDumpFilterTypes(*(ULONG*)pIndication->StatusBuffer);
             break;
         case NDIS_STATUS_TASK_OFFLOAD_CURRENT_CONFIG:
-            Log5((__FUNCTION__": offloading currently set to:\n"));
+            Log5(("vboxNetLwfWinStatus: offloading currently set to:\n"));
             vboxNetLwfWinDumpOffloadSettings((PNDIS_OFFLOAD)pIndication->StatusBuffer);
             break;
     }
     NdisFIndicateStatus(pModuleCtx->hFilter, pIndication);
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinStatus\n"));
 }
 
 static bool vboxNetLwfWinForwardToIntNet(PVBOXNETLWF_MODULE pModuleCtx, PNET_BUFFER_LIST pBufLists, uint32_t fSrc)
@@ -1361,14 +1369,14 @@ static bool vboxNetLwfWinForwardToIntNet(PVBOXNETLWF_MODULE pModuleCtx, PNET_BUF
     /* We must not forward anything to the trunk unless it is ready to receive. */
     if (!ASMAtomicReadBool(&pModuleCtx->fActive))
     {
-        Log((__FUNCTION__": trunk is inactive, won't forward\n"));
+        Log(("vboxNetLwfWinForwardToIntNet: trunk is inactive, won't forward\n"));
         return false;
     }
 
     AssertReturn(pModuleCtx->pNetFlt, false);
     AssertReturn(pModuleCtx->pNetFlt->pSwitchPort, false);
     AssertReturn(pModuleCtx->pNetFlt->pSwitchPort->pfnRecv, false);
-    LogFlow(("==>"__FUNCTION__": module=%p\n", pModuleCtx));
+    LogFlow(("==>vboxNetLwfWinForwardToIntNet: module=%p\n", pModuleCtx));
     Assert(pBufLists);                                                   /* The chain must contain at least one list */
     Assert(NET_BUFFER_LIST_NEXT_NBL(pBufLists) == NULL); /* The caller is supposed to unlink the list from the chain */
     /*
@@ -1399,24 +1407,24 @@ static bool vboxNetLwfWinForwardToIntNet(PVBOXNETLWF_MODULE pModuleCtx, PNET_BUF
                 vboxNetLwfWinDestroySG(pSG);
             }
         }
-        Log((__FUNCTION__": list=%d buffers=%d\n", nLists, nBuffers));
+        Log(("vboxNetLwfWinForwardToIntNet: list=%d buffers=%d\n", nLists, nBuffers));
     }
-    Log((__FUNCTION__": lists=%d drop=%s don't=%s\n", nLists, fDropIt ? "true":"false", fDontDrop ? "true":"false"));
-    LogFlow(("<=="__FUNCTION__": return '%s'\n",
+    Log(("vboxNetLwfWinForwardToIntNet: lists=%d drop=%s don't=%s\n", nLists, fDropIt ? "true":"false", fDontDrop ? "true":"false"));
+    LogFlow(("<==vboxNetLwfWinForwardToIntNet: return '%s'\n",
              fDropIt ? (fDontDrop ? "do not drop (some)" : "drop it") : "do not drop (any)"));
     return fDropIt && !fDontDrop; /* Drop the list if ALL its buffers are being dropped! */
 }
 
 DECLINLINE(bool) vboxNetLwfWinIsRunning(PVBOXNETLWF_MODULE pModule)
 {
-    Log((__FUNCTION__": state=%d\n", ASMAtomicReadU32(&pModule->enmState)));
+    Log(("vboxNetLwfWinIsRunning: state=%d\n", ASMAtomicReadU32(&pModule->enmState)));
     return ASMAtomicReadU32(&pModule->enmState) == LwfState_Running;
 }
 
 VOID vboxNetLwfWinSendNetBufferLists(IN NDIS_HANDLE hModuleCtx, IN PNET_BUFFER_LIST pBufLists, IN NDIS_PORT_NUMBER nPort, IN ULONG fFlags)
 {
     size_t cb = 0;
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinSendNetBufferLists: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
 #ifdef VBOXNETLWF_NO_BYPASS
     if (!ASMAtomicReadBool(&pModule->fActive))
@@ -1465,12 +1473,12 @@ VOID vboxNetLwfWinSendNetBufferLists(IN NDIS_HANDLE hModuleCtx, IN PNET_BUFFER_L
         Assert((pBufLists == pPassHead) || (pBufLists == pDropHead));
         if (pPassHead)
         {
-            vboxNetLwfWinDumpPackets(__FUNCTION__": passing down", pPassHead);
+            vboxNetLwfWinDumpPackets("vboxNetLwfWinSendNetBufferLists: passing down", pPassHead);
             NdisFSendNetBufferLists(pModule->hFilter, pBufLists, nPort, fFlags);
         }
         if (pDropHead)
         {
-            vboxNetLwfWinDumpPackets(__FUNCTION__": consumed", pDropHead);
+            vboxNetLwfWinDumpPackets("vboxNetLwfWinSendNetBufferLists: consumed", pDropHead);
             NdisFSendNetBufferListsComplete(pModule->hFilter, pDropHead,
                                             fFlags & NDIS_SEND_FLAGS_DISPATCH_LEVEL ? NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL : 0);
         }
@@ -1481,18 +1489,18 @@ VOID vboxNetLwfWinSendNetBufferLists(IN NDIS_HANDLE hModuleCtx, IN PNET_BUFFER_L
         {
             NET_BUFFER_LIST_STATUS(pList) = NDIS_STATUS_PAUSED;
         }
-        vboxNetLwfWinDumpPackets(__FUNCTION__": consumed", pBufLists);
+        vboxNetLwfWinDumpPackets("vboxNetLwfWinSendNetBufferLists: consumed", pBufLists);
         NdisFSendNetBufferListsComplete(pModule->hFilter, pBufLists,
                                         fFlags & NDIS_SEND_FLAGS_DISPATCH_LEVEL ? NDIS_SEND_COMPLETE_FLAGS_DISPATCH_LEVEL : 0);
 
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinSendNetBufferLists\n"));
 }
 
 VOID vboxNetLwfWinSendNetBufferListsComplete(IN NDIS_HANDLE hModuleCtx, IN PNET_BUFFER_LIST pBufLists, IN ULONG fFlags)
 {
     size_t cb = 0;
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinSendNetBufferListsComplete: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
     PNET_BUFFER_LIST pList = pBufLists;
     PNET_BUFFER_LIST pNextList;
@@ -1517,13 +1525,13 @@ VOID vboxNetLwfWinSendNetBufferListsComplete(IN NDIS_HANDLE hModuleCtx, IN PNET_
                 NET_BUFFER_LIST_NEXT_NBL(pPrevList) = pNextList;
             else
                 pBufLists = pNextList;
-            Log((__FUNCTION__": our list %p, next=%p, previous=%p, head=%p\n", pList, pNextList, pPrevList, pBufLists));
+            Log(("vboxNetLwfWinSendNetBufferListsComplete: our list %p, next=%p, previous=%p, head=%p\n", pList, pNextList, pPrevList, pBufLists));
             NdisFreeNetBufferList(pList);
 #ifdef VBOXNETLWF_SYNC_SEND
-            Log4((__FUNCTION__ ": freed NBL+NB 0x%p\n", pList));
+            Log4(("vboxNetLwfWinSendNetBufferListsComplete: freed NBL+NB 0x%p\n", pList));
             KeSetEvent(&pModule->EventWire, 0, FALSE);
 #else /* !VBOXNETLWF_SYNC_SEND */
-            Log4((__FUNCTION__ ": freed NBL+NB+MDL+Data 0x%p\n", pList));
+            Log4(("vboxNetLwfWinSendNetBufferListsComplete: freed NBL+NB+MDL+Data 0x%p\n", pList));
             Assert(ASMAtomicReadS32(&pModule->cPendingBuffers) > 0);
             if (ASMAtomicDecS32(&pModule->cPendingBuffers) == 0)
                 NdisSetEvent(&pModule->EventSendComplete);
@@ -1532,7 +1540,7 @@ VOID vboxNetLwfWinSendNetBufferListsComplete(IN NDIS_HANDLE hModuleCtx, IN PNET_
         else
         {
             pPrevList = pList;
-            Log((__FUNCTION__": passing list %p, next=%p, previous=%p, head=%p\n", pList, pNextList, pPrevList, pBufLists));
+            Log(("vboxNetLwfWinSendNetBufferListsComplete: passing list %p, next=%p, previous=%p, head=%p\n", pList, pNextList, pPrevList, pBufLists));
         }
         pList = pNextList;
     }
@@ -1541,7 +1549,7 @@ VOID vboxNetLwfWinSendNetBufferListsComplete(IN NDIS_HANDLE hModuleCtx, IN PNET_
         /* There are still lists remaining in the chain, pass'em up */
         NdisFSendNetBufferListsComplete(pModule->hFilter, pBufLists, fFlags);
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinSendNetBufferListsComplete\n"));
 }
 
 VOID vboxNetLwfWinReceiveNetBufferLists(IN NDIS_HANDLE hModuleCtx,
@@ -1551,7 +1559,7 @@ VOID vboxNetLwfWinReceiveNetBufferLists(IN NDIS_HANDLE hModuleCtx,
                                         IN ULONG fFlags)
 {
     /// @todo Do we need loopback handling?
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinReceiveNetBufferLists: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
 #ifdef VBOXNETLWF_NO_BYPASS
     if (!ASMAtomicReadBool(&pModule->fActive))
@@ -1561,6 +1569,7 @@ VOID vboxNetLwfWinReceiveNetBufferLists(IN NDIS_HANDLE hModuleCtx,
          * overlying driver.
          */
         NdisFIndicateReceiveNetBufferLists(pModule->hFilter, pBufLists, nPort, nBufLists, fFlags);
+        LogFlow(("<==vboxNetLwfWinReceiveNetBufferLists: inactive trunk\n"));
         return;
     }
 #endif
@@ -1586,7 +1595,7 @@ VOID vboxNetLwfWinReceiveNetBufferLists(IN NDIS_HANDLE hModuleCtx,
                 {
                     PNET_BUFFER_LIST pNext = NET_BUFFER_LIST_NEXT_NBL(pList);
                     NET_BUFFER_LIST_NEXT_NBL(pList) = NULL; /* Unlink temporarily */
-                    vboxNetLwfWinDumpPackets(__FUNCTION__": passing up", pList);
+                    vboxNetLwfWinDumpPackets("vboxNetLwfWinReceiveNetBufferLists: passing up", pList);
                     NdisFIndicateReceiveNetBufferLists(pModule->hFilter, pList, nPort, nBufLists, fFlags);
                     NET_BUFFER_LIST_NEXT_NBL(pList) = pNext; /* Restore the link */
                 }
@@ -1594,7 +1603,7 @@ VOID vboxNetLwfWinReceiveNetBufferLists(IN NDIS_HANDLE hModuleCtx,
             else
             {
                 /* All NBLs must be indicated, do it in bulk. */
-                vboxNetLwfWinDumpPackets(__FUNCTION__": passing up", pBufLists);
+                vboxNetLwfWinDumpPackets("vboxNetLwfWinReceiveNetBufferLists: passing up", pBufLists);
                 NdisFIndicateReceiveNetBufferLists(pModule->hFilter, pBufLists, nPort, nBufLists, fFlags);
             }
         }
@@ -1636,12 +1645,12 @@ VOID vboxNetLwfWinReceiveNetBufferLists(IN NDIS_HANDLE hModuleCtx,
             Assert(nDrop + nPass == nBufLists);
             if (pPassHead)
             {
-                vboxNetLwfWinDumpPackets(__FUNCTION__": passing up", pPassHead);
+                vboxNetLwfWinDumpPackets("vboxNetLwfWinReceiveNetBufferLists: passing up", pPassHead);
                 NdisFIndicateReceiveNetBufferLists(pModule->hFilter, pPassHead, nPort, nPass, fFlags);
             }
             if (pDropHead)
             {
-                vboxNetLwfWinDumpPackets(__FUNCTION__": consumed", pDropHead);
+                vboxNetLwfWinDumpPackets("vboxNetLwfWinReceiveNetBufferLists: consumed", pDropHead);
                 NdisFReturnNetBufferLists(pModule->hFilter, pDropHead,
                                           fFlags & NDIS_RECEIVE_FLAGS_DISPATCH_LEVEL ? NDIS_RETURN_FLAGS_DISPATCH_LEVEL : 0);
             }
@@ -1650,18 +1659,18 @@ VOID vboxNetLwfWinReceiveNetBufferLists(IN NDIS_HANDLE hModuleCtx,
     }
     else
     {
-        vboxNetLwfWinDumpPackets(__FUNCTION__": consumed", pBufLists);
+        vboxNetLwfWinDumpPackets("vboxNetLwfWinReceiveNetBufferLists: consumed", pBufLists);
         if ((fFlags & NDIS_RECEIVE_FLAGS_RESOURCES) == 0)
             NdisFReturnNetBufferLists(pModule->hFilter, pBufLists,
                                       fFlags & NDIS_RECEIVE_FLAGS_DISPATCH_LEVEL ? NDIS_RETURN_FLAGS_DISPATCH_LEVEL : 0);
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinReceiveNetBufferLists\n"));
 }
 
 VOID vboxNetLwfWinReturnNetBufferLists(IN NDIS_HANDLE hModuleCtx, IN PNET_BUFFER_LIST pBufLists, IN ULONG fFlags)
 {
     size_t cb = 0;
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinReturnNetBufferLists: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
     PNET_BUFFER_LIST pList = pBufLists;
     PNET_BUFFER_LIST pNextList;
@@ -1688,10 +1697,10 @@ VOID vboxNetLwfWinReturnNetBufferLists(IN NDIS_HANDLE hModuleCtx, IN PNET_BUFFER
                 pBufLists = pNextList;
             NdisFreeNetBufferList(pList);
 #ifdef VBOXNETLWF_SYNC_SEND
-            Log4((__FUNCTION__ ": freed NBL+NB 0x%p\n", pList));
+            Log4(("vboxNetLwfWinReturnNetBufferLists: freed NBL+NB 0x%p\n", pList));
             KeSetEvent(&pModule->EventHost, 0, FALSE);
 #else /* !VBOXNETLWF_SYNC_SEND */
-            Log4((__FUNCTION__ ": freed NBL+NB+MDL+Data 0x%p\n", pList));
+            Log4(("vboxNetLwfWinReturnNetBufferLists: freed NBL+NB+MDL+Data 0x%p\n", pList));
             Assert(ASMAtomicReadS32(&pModule->cPendingBuffers) > 0);
             if (ASMAtomicDecS32(&pModule->cPendingBuffers) == 0)
                 NdisSetEvent(&pModule->EventSendComplete);
@@ -1706,12 +1715,12 @@ VOID vboxNetLwfWinReturnNetBufferLists(IN NDIS_HANDLE hModuleCtx, IN PNET_BUFFER
         /* There are still lists remaining in the chain, pass'em up */
         NdisFReturnNetBufferLists(pModule->hFilter, pBufLists, fFlags);
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinReturnNetBufferLists\n"));
 }
 
 NDIS_STATUS vboxNetLwfWinSetModuleOptions(IN NDIS_HANDLE hModuleCtx)
 {
-    LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
+    LogFlow(("==>vboxNetLwfWinSetModuleOptions: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
     NDIS_FILTER_PARTIAL_CHARACTERISTICS PChars;
 
@@ -1725,7 +1734,7 @@ NDIS_STATUS vboxNetLwfWinSetModuleOptions(IN NDIS_HANDLE hModuleCtx)
     if (ASMAtomicReadBool(&pModuleCtx->fActive))
 #endif
     {
-        Log((__FUNCTION__": active mode\n"));
+        Log(("vboxNetLwfWinSetModuleOptions: active mode\n"));
         PChars.SendNetBufferListsHandler = vboxNetLwfWinSendNetBufferLists;
         PChars.SendNetBufferListsCompleteHandler = vboxNetLwfWinSendNetBufferListsComplete;
         PChars.ReceiveNetBufferListsHandler = vboxNetLwfWinReceiveNetBufferLists;
@@ -1734,12 +1743,12 @@ NDIS_STATUS vboxNetLwfWinSetModuleOptions(IN NDIS_HANDLE hModuleCtx)
 #ifndef VBOXNETLWF_NO_BYPASS
     else
     {
-        Log((__FUNCTION__": bypass mode\n"));
+        Log(("vboxNetLwfWinSetModuleOptions: bypass mode\n"));
     }
 #endif
     NDIS_STATUS Status = NdisSetOptionalHandlers(pModuleCtx->hFilter,
                                                  (PNDIS_DRIVER_OPTIONAL_HANDLERS)&PChars);
-    LogFlow(("<=="__FUNCTION__": status=0x%x\n", Status));
+    LogFlow(("<==vboxNetLwfWinSetModuleOptions: status=0x%x\n", Status));
     return Status;
 }
 
@@ -1820,7 +1829,7 @@ static int vboxNetLwfWinStartInitIdcThread()
 
     if (ASMAtomicCmpXchgU32(&g_VBoxNetLwfGlobals.enmIdcState, LwfIdcState_Connecting, LwfIdcState_Disconnected))
     {
-        Log((__FUNCTION__": IDC state change Diconnected -> Connecting\n"));
+        Log(("vboxNetLwfWinStartInitIdcThread: IDC state change Diconnected -> Connecting\n"));
 
         NTSTATUS Status = PsCreateSystemThread(&g_VBoxNetLwfGlobals.hInitIdcThread,
                                                THREAD_ALL_ACCESS,
@@ -1829,14 +1838,14 @@ static int vboxNetLwfWinStartInitIdcThread()
                                                NULL,
                                                vboxNetLwfWinInitIdcWorker,
                                                &g_VBoxNetLwfGlobals);
-        Log((__FUNCTION__": create IDC initialization thread, status=0x%x\n", Status));
+        Log(("vboxNetLwfWinStartInitIdcThread: create IDC initialization thread, status=0x%x\n", Status));
         if (Status != STATUS_SUCCESS)
         {
             LogRel(("NETLWF: IDC initialization failed (system thread creation, status=0x%x)\n", Status));
             /*
              * We failed to init IDC and there will be no second chance.
              */
-            Log((__FUNCTION__": IDC state change Connecting -> Diconnected\n"));
+            Log(("vboxNetLwfWinStartInitIdcThread: IDC state change Connecting -> Diconnected\n"));
             ASMAtomicWriteU32(&g_VBoxNetLwfGlobals.enmIdcState, LwfIdcState_Disconnected);
         }
         rc = RTErrConvertFromNtStatus(Status);
@@ -1899,11 +1908,11 @@ NTSTATUS DriverEntry(IN PDRIVER_OBJECT pDriverObject, IN PUNICODE_STRING pRegist
 
 static VOID vboxNetLwfWinUnloadDriver(IN PDRIVER_OBJECT pDriver)
 {
-    LogFlow(("==>"__FUNCTION__": driver=%p\n", pDriver));
+    LogFlow(("==>vboxNetLwfWinUnloadDriver: driver=%p\n", pDriver));
     vboxNetLwfWinDevDestroy(&g_VBoxNetLwfGlobals);
     NdisFDeregisterFilterDriver(g_VBoxNetLwfGlobals.hFilterDriver);
     NdisFreeSpinLock(&g_VBoxNetLwfGlobals.Lock);
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetLwfWinUnloadDriver\n"));
     vboxNetLwfWinFini();
 }
 
@@ -1933,12 +1942,12 @@ static VOID vboxNetLwfWinInitIdcWorker(PVOID pvContext)
             {
                 /* The state has been changed (the only valid transition is to "Stopping"), undo init */
                 rc = vboxNetFltTryDeleteIdc(&g_VBoxNetFltGlobals);
-                Log((__FUNCTION__": state change (Connecting -> %s) while initializing IDC, deleted IDC, rc=0x%x\n",
+                Log(("vboxNetLwfWinInitIdcWorker: state change (Connecting -> %s) while initializing IDC, deleted IDC, rc=0x%x\n",
                      vboxNetLwfWinIdcStateToText(ASMAtomicReadU32(&pGlobals->enmIdcState)), rc));
             }
             else
             {
-                Log((__FUNCTION__": IDC state change Connecting -> Connected\n"));
+                Log(("vboxNetLwfWinInitIdcWorker: IDC state change Connecting -> Connected\n"));
             }
         }
         else
@@ -1958,7 +1967,7 @@ static int vboxNetLwfWinTryFiniIdc()
     PKTHREAD pThread = NULL;
     uint32_t enmPrevState = ASMAtomicXchgU32(&g_VBoxNetLwfGlobals.enmIdcState, LwfIdcState_Stopping);
 
-    Log((__FUNCTION__": IDC state change %s -> Stopping\n", vboxNetLwfWinIdcStateToText(enmPrevState)));
+    Log(("vboxNetLwfWinTryFiniIdc: IDC state change %s -> Stopping\n", vboxNetLwfWinIdcStateToText(enmPrevState)));
 
     switch (enmPrevState)
     {
@@ -1967,7 +1976,7 @@ static int vboxNetLwfWinTryFiniIdc()
             break;
         case LwfIdcState_Stopping:
             /* Impossible, but another thread is alreading doing FiniIdc, bail out */
-            Log(("ERROR: "__FUNCTION__"() called in 'Stopping' state\n"));
+            Log(("ERROR! vboxNetLwfWinTryFiniIdc: called in 'Stopping' state\n"));
             rc = VERR_INVALID_STATE;
             break;
         case LwfIdcState_Connecting:
@@ -1982,7 +1991,7 @@ static int vboxNetLwfWinTryFiniIdc()
             }
             else
             {
-                Log(("ERROR in "__FUNCTION__": ObReferenceObjectByHandle(%p) failed with 0x%x\n",
+                Log(("ERROR! vboxNetLwfWinTryFiniIdc: ObReferenceObjectByHandle(%p) failed with 0x%x\n",
                      g_VBoxNetLwfGlobals.hInitIdcThread, Status));
             }
             rc = RTErrConvertFromNtStatus(Status);
@@ -1990,7 +1999,7 @@ static int vboxNetLwfWinTryFiniIdc()
         case LwfIdcState_Connected:
             /* the worker succeeded in IDC init and terminated */
             rc = vboxNetFltTryDeleteIdc(&g_VBoxNetFltGlobals);
-            Log((__FUNCTION__": deleted IDC, rc=0x%x\n", rc));
+            Log(("vboxNetLwfWinTryFiniIdc: deleted IDC, rc=0x%x\n", rc));
             break;
     }
     return rc;
@@ -2045,8 +2054,8 @@ static int vboxNetLwfWinFini()
 
 bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThis)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p\n", pThis));
-    LogFlow(("<=="__FUNCTION__": return %RTbool\n", !ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost)));
+    LogFlow(("==>vboxNetFltOsMaybeRediscovered: instance=%p\n", pThis));
+    LogFlow(("<==vboxNetFltOsMaybeRediscovered: return %RTbool\n", !ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost)));
     /* AttachToInterface true if disconnected */
     return !ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost);
 }
@@ -2056,10 +2065,10 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, ui
     int rc = VINF_SUCCESS;
 
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)pThis->u.s.WinIf.hModuleCtx;
-    LogFlow(("==>"__FUNCTION__": instance=%p module=%p\n", pThis, pModule));
+    LogFlow(("==>vboxNetFltPortOsXmit: instance=%p module=%p\n", pThis, pModule));
     if (!pModule)
     {
-        LogFlow(("<=="__FUNCTION__": pModule is null, return %d\n", VERR_INTERNAL_ERROR));
+        LogFlow(("<==vboxNetFltPortOsXmit: pModule is null, return %d\n", VERR_INTERNAL_ERROR));
         return VERR_INTERNAL_ERROR;
     }
     /* Prevent going into "paused" state until all transmissions have been completed. */
@@ -2125,7 +2134,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, ui
         NTSTATUS Status = KeWaitForMultipleObjects(nEvents, aEvents, WaitAll, Executive, KernelMode, FALSE, &timeout, NULL);
         if (Status != STATUS_SUCCESS)
         {
-            Log(("ERROR! "__FUNCTION__": KeWaitForMultipleObjects() failed with 0x%x\n", Status));
+            Log(("ERROR! vboxNetFltPortOsXmit: KeWaitForMultipleObjects() failed with 0x%x\n", Status));
             if (Status == STATUS_TIMEOUT)
                 rc = VERR_TIMEOUT;
             else
@@ -2135,17 +2144,17 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, ui
 #endif /* VBOXNETLWF_SYNC_SEND */
     NDIS_RELEASE_MUTEX(&pModule->InTransmit);
 
-    LogFlow(("<=="__FUNCTION__": return %d\n", rc));
+    LogFlow(("<==vboxNetFltPortOsXmit: return %d\n", rc));
     return rc;
 }
 
 void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive)
 {
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)pThis->u.s.WinIf.hModuleCtx;
-    LogFlow(("==>"__FUNCTION__": instance=%p module=%p fActive=%RTbool\n", pThis, pModuleCtx, fActive));
+    LogFlow(("==>vboxNetFltPortOsSetActive: instance=%p module=%p fActive=%RTbool\n", pThis, pModuleCtx, fActive));
     if (!pModuleCtx)
     {
-        LogFlow(("<=="__FUNCTION__": pModuleCtx is null\n"));
+        LogFlow(("<==vboxNetFltPortOsSetActive: pModuleCtx is null\n"));
         return;
     }
 
@@ -2157,30 +2166,142 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive)
         /* Schedule restart to enable/disable bypass mode */
         NdisFRestartFilter(pModuleCtx->hFilter);
         Status = vboxNetLwfWinSetPacketFilter(pModuleCtx, fActive);
-        LogFlow(("<=="__FUNCTION__": vboxNetLwfWinSetPacketFilter() returned 0x%x\n", Status));
+        LogFlow(("<==vboxNetFltPortOsSetActive: vboxNetLwfWinSetPacketFilter() returned 0x%x\n", Status));
     }
     else
-        LogFlow(("<=="__FUNCTION__": no change, remain %sactive\n", fActive ? "":"in"));
+        LogFlow(("<==vboxNetFltPortOsSetActive: no change, remain %sactive\n", fActive ? "":"in"));
 }
 
 int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p\n", pThis));
-    LogFlow(("<=="__FUNCTION__": return 0\n"));
+    LogFlow(("==>vboxNetFltOsDisconnectIt: instance=%p\n", pThis));
+    LogFlow(("<==vboxNetFltOsDisconnectIt: return 0\n"));
     return VINF_SUCCESS;
 }
 
 int vboxNetFltOsConnectIt(PVBOXNETFLTINS pThis)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p\n", pThis));
-    LogFlow(("<=="__FUNCTION__": return 0\n"));
+    LogFlow(("==>vboxNetFltOsConnectIt: instance=%p\n", pThis));
+    LogFlow(("<==vboxNetFltOsConnectIt: return 0\n"));
     return VINF_SUCCESS;
 }
 
+/*
+ * Uncommenting the following line produces debug log messages on IP address changes,
+ * including wired interfaces. No actual calls to a switch port are made. This is for
+ * debug purposes only!
+ * #define VBOXNETLWFWIN_DEBUGIPADDRNOTIF 1
+ */
+static void vboxNetLwfWinIpAddrChangeCallback(IN PVOID pvCtx,
+                                              IN PMIB_UNICASTIPADDRESS_ROW pRow,
+                                              IN MIB_NOTIFICATION_TYPE enmNotifType)
+{
+    PVBOXNETFLTINS pThis = (PVBOXNETFLTINS)pvCtx;
+    PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)pThis->u.s.WinIf.hModuleCtx;
+
+    /* We are only interested in add or remove notifications. */
+    bool fAdded;
+    if (enmNotifType == MibAddInstance)
+        fAdded = true;
+    else if (enmNotifType == MibDeleteInstance)
+        fAdded = false;
+    else
+        return;
+
+    if (   pRow
+#ifndef VBOXNETLWFWIN_DEBUGIPADDRNOTIF
+        && pThis->pSwitchPort->pfnNotifyHostAddress
+#endif /* !VBOXNETLWFWIN_DEBUGIPADDRNOTIF */
+       )
+    {
+        switch (pRow->Address.si_family)
+        {
+            case AF_INET:
+                if (   IN4_IS_ADDR_LINKLOCAL(&pRow->Address.Ipv4.sin_addr)
+                    || pRow->Address.Ipv4.sin_addr.s_addr == IN4ADDR_LOOPBACK)
+                {
+                    Log(("vboxNetLwfWinIpAddrChangeCallback: ignoring %s address (%RTnaipv4)\n",
+                         pRow->Address.Ipv4.sin_addr.s_addr == IN4ADDR_LOOPBACK ? "loopback" : "link-local",
+                         pRow->Address.Ipv4.sin_addr));
+                    break;
+                }
+                Log(("vboxNetLwfWinIpAddrChangeCallback: %s IPv4 addr=%RTnaipv4 on luid=(%u,%u)\n",
+                     fAdded ? "add" : "remove", pRow->Address.Ipv4.sin_addr,
+                     pRow->InterfaceLuid.Info.IfType, pRow->InterfaceLuid.Info.NetLuidIndex));
+#ifndef VBOXNETLWFWIN_DEBUGIPADDRNOTIF
+                pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, fAdded, kIntNetAddrType_IPv4,
+                                                         &pRow->Address.Ipv4.sin_addr);
+#endif /* !VBOXNETLWFWIN_DEBUGIPADDRNOTIF */
+                break;
+            case AF_INET6:
+                if (Ipv6AddressScope(pRow->Address.Ipv6.sin6_addr.u.Byte) <= ScopeLevelLink)
+                {
+                    Log(("vboxNetLwfWinIpAddrChangeCallback: ignoring link-local address (%RTnaipv6)\n",
+                         &pRow->Address.Ipv6.sin6_addr));
+                    break;
+                }
+                Log(("vboxNetLwfWinIpAddrChangeCallback: %s IPv6 addr=%RTnaipv6 scope=%d luid=(%u,%u)\n",
+                     fAdded ? "add" : "remove", &pRow->Address.Ipv6.sin6_addr,
+                     Ipv6AddressScope(pRow->Address.Ipv6.sin6_addr.u.Byte),
+                     pRow->InterfaceLuid.Info.IfType, pRow->InterfaceLuid.Info.NetLuidIndex));
+#ifndef VBOXNETLWFWIN_DEBUGIPADDRNOTIF
+                pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, fAdded, kIntNetAddrType_IPv6,
+                                                         &pRow->Address.Ipv6.sin6_addr);
+#endif /* !VBOXNETLWFWIN_DEBUGIPADDRNOTIF */
+                break;
+        }
+    }
+    else
+        Log(("vboxNetLwfWinIpAddrChangeCallback: pRow=%p pfnNotifyHostAddress=%p\n",
+             pRow, pThis->pSwitchPort->pfnNotifyHostAddress));
+}
+
+void vboxNetLwfWinRegisterIpAddrNotifier(PVBOXNETFLTINS pThis)
+{
+    LogFlow(("==>vboxNetLwfWinRegisterIpAddrNotifier: instance=%p\n", pThis));
+    if (   pThis->pSwitchPort
+#ifndef VBOXNETLWFWIN_DEBUGIPADDRNOTIF
+        && pThis->pSwitchPort->pfnNotifyHostAddress
+#endif /* !VBOXNETLWFWIN_DEBUGIPADDRNOTIF */
+       )
+    {
+        NETIO_STATUS Status;
+        /* First we need to go over all host IP addresses and add them via pfnNotifyHostAddress. */
+        PMIB_UNICASTIPADDRESS_TABLE HostIpAddresses = NULL;
+        Status = GetUnicastIpAddressTable(AF_UNSPEC, &HostIpAddresses);
+        if (NETIO_SUCCESS(Status))
+        {
+            for (unsigned i = 0; i < HostIpAddresses->NumEntries; i++)
+                vboxNetLwfWinIpAddrChangeCallback(pThis, &HostIpAddresses->Table[i], MibAddInstance);
+        }
+        else
+            Log(("ERROR! vboxNetLwfWinRegisterIpAddrNotifier: GetUnicastIpAddressTable failed with %x\n", Status));
+        /* Now we can register a callback function to keep track of address changes. */
+        Status = NotifyUnicastIpAddressChange(AF_UNSPEC, vboxNetLwfWinIpAddrChangeCallback,
+                                              pThis, false, &pThis->u.s.WinIf.hNotifier);
+        if (NETIO_SUCCESS(Status))
+            Log(("vboxNetLwfWinRegisterIpAddrNotifier: notifier=%p\n", pThis->u.s.WinIf.hNotifier));
+        else
+            Log(("ERROR! vboxNetLwfWinRegisterIpAddrNotifier: NotifyUnicastIpAddressChange failed with %x\n", Status));
+    }
+    else
+        pThis->u.s.WinIf.hNotifier = NULL;
+    LogFlow(("<==vboxNetLwfWinRegisterIpAddrNotifier\n"));
+}
+
+void vboxNetLwfWinUnregisterIpAddrNotifier(PVBOXNETFLTINS pThis)
+{
+    Log(("vboxNetLwfWinUnregisterIpAddrNotifier: notifier=%p\n", pThis->u.s.WinIf.hNotifier));
+    if (pThis->u.s.WinIf.hNotifier)
+        CancelMibChangeNotify2(pThis->u.s.WinIf.hNotifier);
+}
+
 void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
 {
     PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)pThis->u.s.WinIf.hModuleCtx;
-    LogFlow(("==>"__FUNCTION__": instance=%p module=%p\n", pThis, pModuleCtx));
+    LogFlow(("==>vboxNetFltOsDeleteInstance: instance=%p module=%p\n", pThis, pModuleCtx));
+    /* Cancel IP address change notifications */
+    vboxNetLwfWinUnregisterIpAddrNotifier(pThis);
     /* Technically it is possible that the module has already been gone by now. */
     if (pModuleCtx)
     {
@@ -2188,7 +2309,7 @@ void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
         pModuleCtx->pNetFlt = NULL;
         pThis->u.s.WinIf.hModuleCtx = NULL;
     }
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("<==vboxNetFltOsDeleteInstance\n"));
 }
 
 static void vboxNetLwfWinReportCapabilities(PVBOXNETFLTINS pThis, PVBOXNETLWF_MODULE pModuleCtx)
@@ -2208,55 +2329,60 @@ static void vboxNetLwfWinReportCapabilities(PVBOXNETFLTINS pThis, PVBOXNETLWF_MO
 
 int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p context=%p\n", pThis, pvContext));
+    LogFlow(("==>vboxNetFltOsInitInstance: instance=%p context=%p\n", pThis, pvContext));
     AssertReturn(pThis, VERR_INVALID_PARAMETER);
-    Log((__FUNCTION__": trunk name=%s\n", pThis->szName));
+    Log(("vboxNetFltOsInitInstance: trunk name=%s\n", pThis->szName));
     ANSI_STRING strInst;
     RtlInitAnsiString(&strInst, pThis->szName);
     PVBOXNETLWF_MODULE pModuleCtx = NULL;
+    NdisAcquireSpinLock(&g_VBoxNetLwfGlobals.Lock);
     RTListForEach(&g_VBoxNetLwfGlobals.listModules, pModuleCtx, VBOXNETLWF_MODULE, node)
     {
-        DbgPrint(__FUNCTION__": evaluating module, name=%Z\n", pModuleCtx->strMiniportName);
+        DbgPrint("vboxNetFltOsInitInstance: evaluating module, name=%Z\n", pModuleCtx->strMiniportName);
         if (RtlEqualString(&strInst, &pModuleCtx->strMiniportName, TRUE))
         {
-            Log((__FUNCTION__": found matching module, name=%s\n", pThis->szName));
+            NdisReleaseSpinLock(&g_VBoxNetLwfGlobals.Lock);
+            Log(("vboxNetFltOsInitInstance: found matching module, name=%s\n", pThis->szName));
             pThis->u.s.WinIf.hModuleCtx = pModuleCtx;
             pModuleCtx->pNetFlt = pThis;
             vboxNetLwfWinReportCapabilities(pThis, pModuleCtx);
-            LogFlow(("<=="__FUNCTION__": return 0\n"));
+            vboxNetLwfWinRegisterIpAddrNotifier(pThis);
+            LogFlow(("<==vboxNetFltOsInitInstance: return 0\n"));
             return VINF_SUCCESS;
         }
     }
-    LogFlow(("<=="__FUNCTION__": return VERR_INTNET_FLT_IF_NOT_FOUND\n"));
+    NdisReleaseSpinLock(&g_VBoxNetLwfGlobals.Lock);
+    LogFlow(("<==vboxNetFltOsInitInstance: return VERR_INTNET_FLT_IF_NOT_FOUND\n"));
     return VERR_INTNET_FLT_IF_NOT_FOUND;
 }
 
 int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p\n", pThis));
+    LogFlow(("==>vboxNetFltOsPreInitInstance: instance=%p\n", pThis));
     pThis->u.s.WinIf.hModuleCtx = 0;
-    LogFlow(("<=="__FUNCTION__": return 0\n"));
+    pThis->u.s.WinIf.hNotifier  = NULL;
+    LogFlow(("<==vboxNetFltOsPreInitInstance: return 0\n"));
     return VINF_SUCCESS;
 }
 
 void vboxNetFltPortOsNotifyMacAddress(PVBOXNETFLTINS pThis, void *pvIfData, PCRTMAC pMac)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p data=%p mac=%RTmac\n", pThis, pvIfData, pMac));
-    LogFlow(("<=="__FUNCTION__"\n"));
+    LogFlow(("==>vboxNetFltPortOsNotifyMacAddress: instance=%p data=%p mac=%RTmac\n", pThis, pvIfData, pMac));
+    LogFlow(("<==vboxNetFltPortOsNotifyMacAddress\n"));
 }
 
 int vboxNetFltPortOsConnectInterface(PVBOXNETFLTINS pThis, void *pvIf, void **ppvIfData)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p if=%p data=%p\n", pThis, pvIf, ppvIfData));
-    LogFlow(("<=="__FUNCTION__": return 0\n"));
+    LogFlow(("==>vboxNetFltPortOsConnectInterface: instance=%p if=%p data=%p\n", pThis, pvIf, ppvIfData));
+    LogFlow(("<==vboxNetFltPortOsConnectInterface: return 0\n"));
     /* Nothing to do */
     return VINF_SUCCESS;
 }
 
 int vboxNetFltPortOsDisconnectInterface(PVBOXNETFLTINS pThis, void *pvIfData)
 {
-    LogFlow(("==>"__FUNCTION__": instance=%p data=%p\n", pThis, pvIfData));
-    LogFlow(("<=="__FUNCTION__": return 0\n"));
+    LogFlow(("==>vboxNetFltPortOsDisconnectInterface: instance=%p data=%p\n", pThis, pvIfData));
+    LogFlow(("<==vboxNetFltPortOsDisconnectInterface: return 0\n"));
     /* Nothing to do */
     return VINF_SUCCESS;
 }
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.h b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.h
similarity index 96%
rename from src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.h
rename to src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.h
index 3d26f22..8208825 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf-win.h
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.h
@@ -3,7 +3,7 @@
  * VBoxNetLwf-win.h - Bridged Networking Driver, Windows-specific code.
  */
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf.inf b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf.inf
similarity index 98%
rename from src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf.inf
rename to src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf.inf
index 1d17d70..5a967a5 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf.inf
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf.inf
@@ -3,7 +3,7 @@
 ; VBoxNetLwf.inf - VirtualBox Bridged Networking Driver inf file
 ;
 ;
-; Copyright (C) 2014 Oracle Corporation
+; Copyright (C) 2014-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp
index 92fcf9d..0ab0f80 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp
@@ -4,7 +4,7 @@
  * Used to filter Bridged Networking Driver bindings
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def
index 8aea0b6..b022bbc 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def
@@ -4,7 +4,7 @@
 ; Library def file
 ;
 ;
-; Copyright (C) 2011-2012 Oracle Corporation
+; Copyright (C) 2011-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
@@ -19,4 +19,4 @@ EXPORTS
     DllCanUnloadNow     PRIVATE
     DllGetClassObject   PRIVATE
     DllRegisterServer   PRIVATE
-    DllUnregisterServer PRIVATE
\ No newline at end of file
+    DllUnregisterServer PRIVATE
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h
index cf8087b..f9da916 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h
@@ -4,7 +4,7 @@
  * Used to filter Bridged Networking Driver bindings
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h
index 5cbf184..0c7c175 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjRc.h
@@ -4,7 +4,7 @@
  * Resource definitions
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjT.idl b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjT.idl
index 69d3c9a..8668a4e 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjT.idl
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobjT.idl
@@ -4,7 +4,7 @@
  * Type lib definition
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp
index 011a1ab..41cf306 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp
index 89c8b13..f8260e0 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp
index d89d60d..0779ea7 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp
index a4a5029..50b32af 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp
index 7073b16..f72825e 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp
index af26bde..703b6c7 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp
+++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxPci/Makefile.kmk b/src/VBox/HostDrivers/VBoxPci/Makefile.kmk
index d0c580c..dbff7a5 100644
--- a/src/VBox/HostDrivers/VBoxPci/Makefile.kmk
+++ b/src/VBox/HostDrivers/VBoxPci/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2011-2012 Oracle Corporation
+# Copyright (C) 2011-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxPci/VBoxPci.c b/src/VBox/HostDrivers/VBoxPci/VBoxPci.c
index 9eed3d7..c585387 100644
--- a/src/VBox/HostDrivers/VBoxPci/VBoxPci.c
+++ b/src/VBox/HostDrivers/VBoxPci/VBoxPci.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h b/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h
index a7f2ff3..598ebd5 100644
--- a/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h
+++ b/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxPci/linux/Makefile b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
index 1efa168..5ffd542 100644
--- a/src/VBox/HostDrivers/VBoxPci/linux/Makefile
+++ b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
@@ -5,7 +5,7 @@
 
 #
 #
-# Copyright (C) 2011 Oracle Corporation
+# Copyright (C) 2011-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
index 5ff080c..0a064bb 100644
--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci b/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci
index 434ed56..d8136fc 100755
--- a/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci
+++ b/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2011 Oracle Corporation
+# Copyright (C) 2011-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk b/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk
index efa1df0..e37b290 100644
--- a/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk
+++ b/src/VBox/HostDrivers/VBoxUSB/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp b/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp
index b0c33c3..a4bd9e3 100644
--- a/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp b/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp
index 0f4309e..56fa7d4 100644
--- a/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp
index 872213e..7aced78 100644
--- a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h
index 5ae85ac..2df3d5a 100644
--- a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h
+++ b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk b/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk
index c0f0cd3..275f982 100644
--- a/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk
+++ b/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp
index 41c0d62..59b4b0e 100644
--- a/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp
index ddf46a8..112130a 100644
--- a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h
index 4659d0b..961efde 100644
--- a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h
+++ b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/loadusb.sh b/src/VBox/HostDrivers/VBoxUSB/darwin/loadusb.sh
index 5cb673e..556f188 100755
--- a/src/VBox/HostDrivers/VBoxUSB/darwin/loadusb.sh
+++ b/src/VBox/HostDrivers/VBoxUSB/darwin/loadusb.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp
index 2346b09..03e1844 100644
--- a/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -206,7 +206,7 @@ int main(int argc, char **argv)
             case 'h':
                 return tstSyntax(argv[0]);
             case 'V':
-                RTPrintf("$Revision: 83575 $\n");
+                RTPrintf("$Revision: 100877 $\n");
                 return 0;
 
             default:
diff --git a/src/VBox/HostDrivers/VBoxUSB/solaris/Makefile.kmk b/src/VBox/HostDrivers/VBoxUSB/solaris/Makefile.kmk
index 3a2632d..d307652 100644
--- a/src/VBox/HostDrivers/VBoxUSB/solaris/Makefile.kmk
+++ b/src/VBox/HostDrivers/VBoxUSB/solaris/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp b/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp
index 4a0821b..72185cd 100644
--- a/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c b/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c
index f883209..999a0ac 100644
--- a/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c
+++ b/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c b/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c
index e3741bb..34259ff 100644
--- a/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c
+++ b/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusb.conf b/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusb.conf
index 070623f..4919b53 100644
--- a/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusb.conf
+++ b/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusb.conf
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (C) 2010 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusbmon.conf b/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusbmon.conf
index 55dabae..2fa649c 100644
--- a/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusbmon.conf
+++ b/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusbmon.conf
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (C) 2010 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp b/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp
index cd2d575..8ea8533 100644
--- a/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp
index b7eefa3..5e3522a 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp
@@ -4,7 +4,7 @@
  *
  * Installation code
  *
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp
index c28ed82..55d0c00 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp
@@ -4,7 +4,7 @@
  *
  * Installation code
  *
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk b/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk
index 01ba4f7..7496507 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk
+++ b/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp
index d332cbc..7f8f499 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -187,12 +187,12 @@ VBOXDRVTOOL_DECL(VOID) VBoxDrvToolRefWaitEqual(PVBOXDRVTOOL_REF pRef, uint32_t u
     LARGE_INTEGER Interval;
     Interval.QuadPart = -(int64_t) 2 /* ms */ * 10000;
     uint32_t cRefs;
-    size_t loops = 0; 
+    size_t loops = 0;
     KTIMER kTimer;
     NTSTATUS status = STATUS_SUCCESS;
 
     KeInitializeTimer(&kTimer);
-    
+
     while ((cRefs = ASMAtomicReadU32(&pRef->cRefs)) > u32Val && loops < 256)
     {
         Assert(cRefs >= u32Val);
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.h b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.h
index c2b9453..38fb287 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.h
+++ b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbIdc.h b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbIdc.h
index 4ad6bb9..a86af4b 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbIdc.h
+++ b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbIdc.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp
index 2a81d50..963e1d8 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.h b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.h
index 5ab5446..2d631a4 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.h
+++ b/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxUsbTool.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUSB.inf b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUSB.inf
index d02950e..9bde6ee 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUSB.inf
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUSB.inf
@@ -1,7 +1,7 @@
 ;
 ; VBox host drivers - USB drivers - Win32 USB device
 ;
-; Copyright (C) 2011 Oracle Corporation
+; Copyright (C) 2011-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbCmn.h b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbCmn.h
index 7e1bcfb..61512c1 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbCmn.h
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbCmn.h
@@ -3,7 +3,7 @@
  * VBoxUsmCmn.h - USB device. Common defs
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
index 91a1795..98c4875 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.cpp
@@ -3,7 +3,7 @@
  * VBoxUsbDev.cpp - USB device.
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h
index 764b01f..f217f0f 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h
@@ -3,7 +3,7 @@
  * VBoxUsbDev.h - USB device.
  */
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.cpp b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.cpp
index 7823280..326b0b5 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.cpp
@@ -3,7 +3,7 @@
  * USB PnP Handling
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -69,14 +69,14 @@ static NTSTATUS vboxUsbPnPMnCancelStopDevice(PVBOXUSBDEV_EXT pDevExt, PIRP pIrp)
 {
     ENMVBOXUSB_PNPSTATE enmState = vboxUsbPnPStateGet(pDevExt);
     NTSTATUS Status = STATUS_SUCCESS;
-   
+
     IoCopyCurrentIrpStackLocationToNext(pIrp);
     Status = VBoxDrvToolIoPostSync(pDevExt->pLowerDO, pIrp);
     if (NT_SUCCESS(Status) && enmState == ENMVBOXUSB_PNPSTATE_STOP_PENDING)
     {
         vboxUsbPnPStateRestore(pDevExt);
     }
-   
+
     Status = STATUS_SUCCESS;
     VBoxDrvToolIoComplete(pIrp, Status, 0);
     vboxUsbDdiStateRelease(pDevExt);
@@ -138,7 +138,7 @@ static NTSTATUS vboxUsbPnPMnCancelRemoveDevice(PVBOXUSBDEV_EXT pDevExt, PIRP pIr
     ENMVBOXUSB_PNPSTATE enmState = vboxUsbPnPStateGet(pDevExt);
     NTSTATUS Status = STATUS_SUCCESS;
     IoCopyCurrentIrpStackLocationToNext(pIrp);
-    
+
     Status = VBoxDrvToolIoPostSync(pDevExt->pLowerDO, pIrp);
 
     if (NT_SUCCESS(Status) &&
@@ -146,7 +146,7 @@ static NTSTATUS vboxUsbPnPMnCancelRemoveDevice(PVBOXUSBDEV_EXT pDevExt, PIRP pIr
     {
         vboxUsbPnPStateRestore(pDevExt);
     }
-    
+
     Status = STATUS_SUCCESS;
     VBoxDrvToolIoComplete(pIrp, Status, 0);
     vboxUsbDdiStateRelease(pDevExt);
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.h b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.h
index 2c7f6b3..adeedb1 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.h
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.h
@@ -3,7 +3,7 @@
  * USB PnP Handling
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp
index a3a0f1b..082e3d7 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp
@@ -3,7 +3,7 @@
  * USB Power state Handling
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.h b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.h
index d8d19e4..fc87553 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.h
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.h
@@ -3,7 +3,7 @@
  * USB Power state Handling
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp
index 75fd6ce..fec2cb0 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp
@@ -3,7 +3,7 @@
  * VBox USB R0 runtime
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1303,7 +1303,6 @@ static NTSTATUS vboxUsbRtUrbSend(PVBOXUSBDEV_EXT pDevExt, PIRP pIrp, PUSBSUP_URB
             }
             case USBSUP_TRANSFER_TYPE_ISOC:
             {
-                Assert(pUrbInfo->dir == USBSUP_DIRECTION_IN || pUrbInfo->type == USBSUP_TRANSFER_TYPE_BULK);
                 Assert(hPipe);
                 VBOXUSB_PIPE_INFO *pPipeInfo = vboxUsbRtGetPipeInfo(pDevExt, pUrbInfo->ep | ((pUrbInfo->dir == USBSUP_DIRECTION_IN) ? 0x80 : 0x00));
                 if (pPipeInfo == NULL)
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.h b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.h
index a01daa0..e3dcba1 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.h
+++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.h
@@ -3,7 +3,7 @@
  * VBox USB R0 runtime
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp b/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp
index 5ebf5a4..f59de25 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -662,14 +662,11 @@ static int usbLibDevStrDrEntryGetAll(HANDLE hHub, ULONG iPort, PUSB_DEVICE_DESCR
     /* Read string descriptor zero to determine what languages are available. */
     int rc = usbLibDevStrDrEntryGet(hHub, iPort, 0, 0, ppList);
     if (RT_FAILURE(rc))
-    {
-        AssertRC(rc);
         return rc;
-    }
 
-    PUSB_STRING_DESCRIPTOR pLandStrDr = &(*ppList)->StrDr;
-    USHORT *pIdLang = pLandStrDr->bString;
-    ULONG cIdLang = (pLandStrDr->bLength - RT_OFFSETOF(USB_STRING_DESCRIPTOR, bString)) / sizeof (*pIdLang);
+    PUSB_STRING_DESCRIPTOR pLangStrDr = &(*ppList)->StrDr;
+    USHORT *pIdLang = pLangStrDr->bString;
+    ULONG cIdLang = (pLangStrDr->bLength - RT_OFFSETOF(USB_STRING_DESCRIPTOR, bString)) / sizeof (*pIdLang);
 
     if (pDevDr->iManufacturer)
     {
@@ -700,6 +697,10 @@ static int usbLibDevStrDrEntryGetAll(HANDLE hHub, ULONG iPort, PUSB_DEVICE_DESCR
             break;
         }
 
+        /* This is invalid but was seen with a TerraTec Aureon 7.1 USB sound card. */
+        if (!pCmnDr->bLength)
+            break;
+
         switch (pCmnDr->bDescriptorType)
         {
             case USB_CONFIGURATION_DESCRIPTOR_TYPE:
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUSBMon.inf b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUSBMon.inf
index 7e8ec8f..78f4261 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUSBMon.inf
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUSBMon.inf
@@ -3,7 +3,7 @@
 ;
 ; Installation file
 ;
-; Copyright (C) 2011 Oracle Corporation
+; Copyright (C) 2011-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp
index 645f598..ae411e9 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp
@@ -3,7 +3,7 @@
  * VBox USB Monitor Device Filtering functionality
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.h b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.h
index 1d474b9..f0aea57 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.h
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.h
@@ -3,7 +3,7 @@
  * VBox USB Monitor Device Filtering functionality
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp
index a1a2492..e63b7ff 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.cpp
@@ -3,7 +3,7 @@
  * Driver Dispatch Table Hooking API
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.h b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.h
index 95139ff..772bb2f 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.h
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbHook.h
@@ -3,7 +3,7 @@
  * Driver Dispatch Table Hooking API impl
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
index f371544..96ad3b1 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.cpp
@@ -3,7 +3,7 @@
  * VBox USB Monitor
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -190,7 +190,7 @@ NTSTATUS VBoxUsbMonQueryBusRelations(PDEVICE_OBJECT pDevObj, PFILE_OBJECT pFileO
         return STATUS_INSUFFICIENT_RESOURCES;
     }
     pIrp->IoStatus.Status = STATUS_NOT_SUPPORTED;
-	
+
     pSl = IoGetNextIrpStackLocation(pIrp);
     pSl->MajorFunction = IRP_MJ_PNP;
     pSl->MinorFunction = IRP_MN_QUERY_DEVICE_RELATIONS;
@@ -1157,7 +1157,7 @@ typedef struct VBOXUSBMONHOOKDRIVERWALKER
 static void vboxUsbMonLogError(NTSTATUS ErrCode, NTSTATUS ReturnedStatus, ULONG uErrId, USHORT cbDumpData, PVOID pDumpData)
 {
     PIO_ERROR_LOG_PACKET pErrEntry;
-    
+
 
     /* Truncate dumps that do not fit into IO_ERROR_LOG_PACKET. */
     if (FIELD_OFFSET(IO_ERROR_LOG_PACKET, DumpData) + cbDumpData > ERROR_LOG_MAXIMUM_SIZE)
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.h b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.h
index b3f17f2..b88df2d 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.h
+++ b/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.h
@@ -3,7 +3,7 @@
  * VBox USB Monitor
  */
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp b/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp
index 3cf017e..fda8786 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp
+++ b/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp
@@ -4,7 +4,7 @@
  *
  * Installation code
  *
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxUSB/win/usbd/usbd.def b/src/VBox/HostDrivers/VBoxUSB/win/usbd/usbd.def
index d6977bb..f4ce1b1 100644
--- a/src/VBox/HostDrivers/VBoxUSB/win/usbd/usbd.def
+++ b/src/VBox/HostDrivers/VBoxUSB/win/usbd/usbd.def
@@ -1,7 +1,7 @@
 ;
 ; Export definitions
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/darwin/Makefile.kmk b/src/VBox/HostDrivers/darwin/Makefile.kmk
index 2b67cfd..0b3a7e2 100644
--- a/src/VBox/HostDrivers/darwin/Makefile.kmk
+++ b/src/VBox/HostDrivers/darwin/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/darwin/VBoxNetSend.h b/src/VBox/HostDrivers/darwin/VBoxNetSend.h
index 0aadc4c..cc59014 100644
--- a/src/VBox/HostDrivers/darwin/VBoxNetSend.h
+++ b/src/VBox/HostDrivers/darwin/VBoxNetSend.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/darwin/loadall.sh b/src/VBox/HostDrivers/darwin/loadall.sh
index cc81e8c..74cc5c2 100755
--- a/src/VBox/HostDrivers/darwin/loadall.sh
+++ b/src/VBox/HostDrivers/darwin/loadall.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/freebsd/Makefile b/src/VBox/HostDrivers/freebsd/Makefile
index 870dd1c..6ee5d14 100644
--- a/src/VBox/HostDrivers/freebsd/Makefile
+++ b/src/VBox/HostDrivers/freebsd/Makefile
@@ -4,7 +4,7 @@
 
 #
 #
-# Copyright (C) 2008-2010 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/freebsd/Makefile.kmk b/src/VBox/HostDrivers/freebsd/Makefile.kmk
index db05e0b..5bd1178 100644
--- a/src/VBox/HostDrivers/freebsd/Makefile.kmk
+++ b/src/VBox/HostDrivers/freebsd/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile
index 8c5fa1c..8f06523 100644
--- a/src/VBox/HostDrivers/linux/Makefile
+++ b/src/VBox/HostDrivers/linux/Makefile
@@ -4,7 +4,7 @@
 
 #
 #
-# Copyright (C) 2008-2011 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/linux/Makefile.kmk b/src/VBox/HostDrivers/linux/Makefile.kmk
index db8d133..77d7075 100644
--- a/src/VBox/HostDrivers/linux/Makefile.kmk
+++ b/src/VBox/HostDrivers/linux/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/linux/build_in_tmp b/src/VBox/HostDrivers/linux/build_in_tmp
index d7ddfb5..583c0cb 100755
--- a/src/VBox/HostDrivers/linux/build_in_tmp
+++ b/src/VBox/HostDrivers/linux/build_in_tmp
@@ -4,7 +4,7 @@
 # Script to build a kernel module in /tmp. Useful if the module sources
 # are installed in read-only directory. Not for DKMS!
 #
-# Copyright (C) 2007-2011 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/linux/dkms.conf b/src/VBox/HostDrivers/linux/dkms.conf
index 672c099..551517c 100644
--- a/src/VBox/HostDrivers/linux/dkms.conf
+++ b/src/VBox/HostDrivers/linux/dkms.conf
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/linux/do_Module.symvers b/src/VBox/HostDrivers/linux/do_Module.symvers
index a4a80fc..9b8cc5a 100755
--- a/src/VBox/HostDrivers/linux/do_Module.symvers
+++ b/src/VBox/HostDrivers/linux/do_Module.symvers
@@ -4,7 +4,7 @@
 # This script is used when building kernel modules from DKMS. I don't
 # know how to solve the problem of inter-module dependencies better.
 #
-# Copyright (C) 2008-2011 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/linux/do_dkms b/src/VBox/HostDrivers/linux/do_dkms
index a737e00..cc9c7d6 100755
--- a/src/VBox/HostDrivers/linux/do_dkms
+++ b/src/VBox/HostDrivers/linux/do_dkms
@@ -3,7 +3,7 @@
 #
 # Script to register/build/unregister a kernel module with DKMS.
 #
-# Copyright (C) 2010 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/linux/export_modules b/src/VBox/HostDrivers/linux/export_modules
index 7e0b6a7..42e049b 100755
--- a/src/VBox/HostDrivers/linux/export_modules
+++ b/src/VBox/HostDrivers/linux/export_modules
@@ -3,7 +3,7 @@
 #
 # Create a tar archive containing the sources of the vboxdrv kernel module
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/linux/load.sh b/src/VBox/HostDrivers/linux/load.sh
index 726059b..5340b06 100755
--- a/src/VBox/HostDrivers/linux/load.sh
+++ b/src/VBox/HostDrivers/linux/load.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/linux/loadall.sh b/src/VBox/HostDrivers/linux/loadall.sh
index f5d87b9..a22f7a2 100755
--- a/src/VBox/HostDrivers/linux/loadall.sh
+++ b/src/VBox/HostDrivers/linux/loadall.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/win/Makefile.kmk b/src/VBox/HostDrivers/win/Makefile.kmk
index 7a4f81e..840db4f 100644
--- a/src/VBox/HostDrivers/win/Makefile.kmk
+++ b/src/VBox/HostDrivers/win/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2011-2012 Oracle Corporation
+# Copyright (C) 2011-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/win/VBoxDbgLog.h b/src/VBox/HostDrivers/win/VBoxDbgLog.h
index 1702ae5..80a3195 100644
--- a/src/VBox/HostDrivers/win/VBoxDbgLog.h
+++ b/src/VBox/HostDrivers/win/VBoxDbgLog.h
@@ -1,11 +1,10 @@
 /* $Id: VBoxDbgLog.h $ */
-
 /** @file
  * Logging helper
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp b/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp
index 7e168a6..8e48103 100644
--- a/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp
+++ b/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp
@@ -3,7 +3,7 @@
  * VBoxDrvCfg.cpp - Windows Driver Manipulation API implementation
  */
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/win/load.cmd b/src/VBox/HostDrivers/win/load.cmd
index ecb4af1..fe412c8 100644
--- a/src/VBox/HostDrivers/win/load.cmd
+++ b/src/VBox/HostDrivers/win/load.cmd
@@ -5,7 +5,7 @@ rem Windows NT batch script for launching load.sh
 rem
 
 rem
-rem Copyright (C) 2009-2012 Oracle Corporation
+rem Copyright (C) 2009-2015 Oracle Corporation
 rem
 rem This file is part of VirtualBox Open Source Edition (OSE), as
 rem available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/win/load.sh b/src/VBox/HostDrivers/win/load.sh
index 0381067..f158a6b 100755
--- a/src/VBox/HostDrivers/win/load.sh
+++ b/src/VBox/HostDrivers/win/load.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2014 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/win/loadall.cmd b/src/VBox/HostDrivers/win/loadall.cmd
index 936d17f..abf8921 100644
--- a/src/VBox/HostDrivers/win/loadall.cmd
+++ b/src/VBox/HostDrivers/win/loadall.cmd
@@ -5,7 +5,7 @@ rem Windows NT batch script for launching loadall.sh
 rem
 
 rem
-rem Copyright (C) 2009-2012 Oracle Corporation
+rem Copyright (C) 2009-2015 Oracle Corporation
 rem
 rem This file is part of VirtualBox Open Source Edition (OSE), as
 rem available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/win/loadall.sh b/src/VBox/HostDrivers/win/loadall.sh
index 40460bf..028a01f 100755
--- a/src/VBox/HostDrivers/win/loadall.sh
+++ b/src/VBox/HostDrivers/win/loadall.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2014 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/DragAndDrop/Makefile.kmk b/src/VBox/HostServices/DragAndDrop/Makefile.kmk
index eb048e3..99bb7be 100644
--- a/src/VBox/HostServices/DragAndDrop/Makefile.kmk
+++ b/src/VBox/HostServices/DragAndDrop/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2011-2012 Oracle Corporation
+# Copyright (C) 2011-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/GuestControl/Makefile.kmk b/src/VBox/HostServices/GuestControl/Makefile.kmk
index 1a7e60f..529b27b 100644
--- a/src/VBox/HostServices/GuestControl/Makefile.kmk
+++ b/src/VBox/HostServices/GuestControl/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2011-2012 Oracle Corporation
+# Copyright (C) 2011-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk b/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk
index 01b32c1..4ced749 100644
--- a/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk
+++ b/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/GuestProperties/Makefile.kmk b/src/VBox/HostServices/GuestProperties/Makefile.kmk
index 8472a1f..a56c655 100644
--- a/src/VBox/HostServices/GuestProperties/Makefile.kmk
+++ b/src/VBox/HostServices/GuestProperties/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk b/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk
index f13ea5a..a5714ad 100644
--- a/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk
+++ b/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/HostChannel/Makefile.kmk b/src/VBox/HostServices/HostChannel/Makefile.kmk
index 4ec07d8..a545b50 100644
--- a/src/VBox/HostServices/HostChannel/Makefile.kmk
+++ b/src/VBox/HostServices/HostChannel/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/Makefile.kmk b/src/VBox/HostServices/Makefile.kmk
index acb26fd..cfd1b6b 100644
--- a/src/VBox/HostServices/Makefile.kmk
+++ b/src/VBox/HostServices/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/SharedClipboard/Makefile.kmk b/src/VBox/HostServices/SharedClipboard/Makefile.kmk
index c8c3184..43231b4 100644
--- a/src/VBox/HostServices/SharedClipboard/Makefile.kmk
+++ b/src/VBox/HostServices/SharedClipboard/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/SharedClipboard/testcase/Makefile.kmk b/src/VBox/HostServices/SharedClipboard/testcase/Makefile.kmk
index 99b0f9c..d4b3e76 100644
--- a/src/VBox/HostServices/SharedClipboard/testcase/Makefile.kmk
+++ b/src/VBox/HostServices/SharedClipboard/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2011-2012 Oracle Corporation
+# Copyright (C) 2011-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/SharedFolders/Makefile.kmk b/src/VBox/HostServices/SharedFolders/Makefile.kmk
index 9bbafa7..1646b09 100644
--- a/src/VBox/HostServices/SharedFolders/Makefile.kmk
+++ b/src/VBox/HostServices/SharedFolders/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk b/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk
index a2f6120..8e013d7 100644
--- a/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk
+++ b/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/SharedOpenGL/Makefile.kmk b/src/VBox/HostServices/SharedOpenGL/Makefile.kmk
index f237f6c..e4f7c76 100644
--- a/src/VBox/HostServices/SharedOpenGL/Makefile.kmk
+++ b/src/VBox/HostServices/SharedOpenGL/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2008-2014 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -118,6 +118,11 @@ VBoxOGLcrserverlib_INTERMEDIATES = \
         $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h \
 	$(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \
 	$(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h
+
+ifdef VBOX_WITH_CR_DISPLAY_LISTS
+VBoxOGLcrserverlib_INTERMEDIATES += $(VBOX_PATH_CROGL_GENFILES)/cr_dlm.h
+endif
+
 VBoxOGLcrserverlib_SOURCES := \
 	crserverlib/server_main.c \
 	crserverlib/server_boundsinfo.c \
diff --git a/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp b/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp
index 7a56d65..c45ed38 100644
--- a/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp
+++ b/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp
@@ -227,7 +227,7 @@ static DECLCALLBACK(int) svcLoadState(void *, uint32_t u32ClientID, void *pvClie
 
     if (rc==VERR_SSM_DATA_UNIT_FORMAT_CHANGED && ui32!=SHCROGL_SSM_VERSION)
     {
-        LogRel(("SHARED_CROPENGL svcLoadState: unsupported save state version %d\n", ui32));
+        LogRel(("OpenGL: svcLoadState: Unsupported save state version %d\n", ui32));
 
         /*@todo ugly hack, as we don't know size of stored opengl data try to read untill end of opengl data marker*/
         /*VBoxSharedCrOpenGL isn't last hgcm service now, so can't use SSMR3SkipToEndOfUnit*/
@@ -312,7 +312,7 @@ static DECLCALLBACK(int) svcLoadState(void *, uint32_t u32ClientID, void *pvClie
 
 static void svcClientVersionUnsupported(uint32_t minor, uint32_t major)
 {
-    LogRel(("SHARED_CROPENGL: unsupported client version %d.%d\n", minor, major));
+    LogRel(("OpenGL: Unsupported client version %d.%d\n", minor, major));
 
     /*MS's opengl32 tries to load our ICD around 30 times on failure...this is to prevent unnecessary spam*/
     static int shown = 0;
@@ -345,7 +345,7 @@ static CRVBOXSVCBUFFER_t* svcGetBuffer(uint32_t iBuffer, uint32_t cbBufferSize)
                     if (shown<20)
                     {
                         shown++;
-                        LogRel(("SHARED_CROPENGL svcGetBuffer: invalid buffer(%i) size %i instead of %i\n",
+                        LogRel(("OpenGL: svcGetBuffer: Invalid buffer(%i) size %i instead of %i\n",
                                 iBuffer, pBuffer->uiSize, cbBufferSize));
                     }
                     return NULL;
@@ -364,7 +364,7 @@ static CRVBOXSVCBUFFER_t* svcGetBuffer(uint32_t iBuffer, uint32_t cbBufferSize)
             pBuffer->pData = RTMemAlloc(cbBufferSize);
             if (!pBuffer->pData)
             {
-                LogRel(("SHARED_CROPENGL svcGetBuffer: not enough memory (%d)\n", cbBufferSize));
+                LogRel(("OpenGL: svcGetBuffer: Not enough memory (%d)\n", cbBufferSize));
                 RTMemFree(pBuffer);
                 return NULL;
             }
@@ -385,7 +385,7 @@ static CRVBOXSVCBUFFER_t* svcGetBuffer(uint32_t iBuffer, uint32_t cbBufferSize)
         }
         else
         {
-            LogRel(("SHARED_CROPENGL svcGetBuffer: not enough memory (%d)\n", sizeof(CRVBOXSVCBUFFER_t)));
+            LogRel(("OpenGL: svcGetBuffer: Not enough memory (%d)\n", sizeof(CRVBOXSVCBUFFER_t)));
         }
         return pBuffer;
     }
@@ -732,7 +732,7 @@ static DECLCALLBACK(void) svcCall (void *, VBOXHGCMCALLHANDLE callHandle, uint32
                 CRVBOXSVCBUFFER_t *pSvcBuffer = svcGetBuffer(iBuffer, 0);
                 if (!pSvcBuffer)
                 {
-                    LogRel(("SHARED_CROPENGL svcCall(WRITE_READ_BUFFERED): invalid buffer (%d)\n", iBuffer));
+                    LogRel(("OpenGL: svcCall(WRITE_READ_BUFFERED): Invalid buffer (%d)\n", iBuffer));
                     rc = VERR_INVALID_PARAMETER;
                     break;
                 }
@@ -1116,7 +1116,7 @@ static int svcHostCallPerform(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVC
         {
             if (cParms != 1)
             {
-                LogRel(("SHCRGL_HOST_FN_TAKE_SCREENSHOT: cParms invalid - %d", cParms));
+                LogRel(("OpenGL: SHCRGL_HOST_FN_TAKE_SCREENSHOT: cParms invalid - %d", cParms));
                 rc = VERR_INVALID_PARAMETER;
                 break;
             }
@@ -1171,7 +1171,7 @@ static int svcHostCallPerform(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVC
             /* Verify parameter count and types. */
             if (cParms != SHCRGL_CPARMS_DEV_RESIZE)
             {
-                LogRel(("SHCRGL_HOST_FN_DEV_RESIZE: cParms invalid - %d", cParms));
+                LogRel(("OpenGL: SHCRGL_HOST_FN_DEV_RESIZE: cParms invalid - %d", cParms));
                 rc = VERR_INVALID_PARAMETER;
                 break;
             }
@@ -1206,7 +1206,7 @@ static int svcHostCallPerform(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVC
             /* Verify parameter count and types. */
             if (cParms != SHCRGL_CPARMS_VIEWPORT_CHANGED)
             {
-                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: cParms invalid - %d", cParms));
+                LogRel(("OpenGL: SHCRGL_HOST_FN_VIEWPORT_CHANGED: cParms invalid - %d", cParms));
                 rc = VERR_INVALID_PARAMETER;
                 break;
             }
@@ -1215,7 +1215,7 @@ static int svcHostCallPerform(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVC
             {
                 if (paParms[i].type != VBOX_HGCM_SVC_PARM_32BIT)
                 {
-                    LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: param[%d] type invalid - %d", i, paParms[i].type));
+                    LogRel(("OpenGL: SHCRGL_HOST_FN_VIEWPORT_CHANGED: param[%d] type invalid - %d", i, paParms[i].type));
                     rc = VERR_INVALID_PARAMETER;
                     break;
                 }
@@ -1223,7 +1223,7 @@ static int svcHostCallPerform(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVC
 
             if (!RT_SUCCESS(rc))
             {
-                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: param validation failed, returning.."));
+                LogRel(("OpenGL: SHCRGL_HOST_FN_VIEWPORT_CHANGED: param validation failed, returning.."));
                 break;
             }
 
@@ -1236,7 +1236,7 @@ static int svcHostCallPerform(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVC
                     paParms[4].u.uint32  /* h */);
             if (!RT_SUCCESS(rc))
             {
-                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: crVBoxServerSetScreenViewport failed, rc %d", rc));
+                LogRel(("OpenGL: SHCRGL_HOST_FN_VIEWPORT_CHANGED: crVBoxServerSetScreenViewport failed, rc %d", rc));
             }
 
             crServerVBoxCompositionSetEnableStateGlobal(GL_TRUE);
@@ -1250,7 +1250,7 @@ static int svcHostCallPerform(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVC
             /* Verify parameter count and types. */
             if (cParms != SHCRGL_CPARMS_VIEWPORT_CHANGED)
             {
-                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: cParms invalid - %d", cParms));
+                LogRel(("OpenGL: SHCRGL_HOST_FN_VIEWPORT_CHANGED: cParms invalid - %d", cParms));
                 rc = VERR_INVALID_PARAMETER;
                 break;
             }
@@ -1259,7 +1259,7 @@ static int svcHostCallPerform(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVC
                     || !paParms[0].u.pointer.addr
                     || paParms[0].u.pointer.size != sizeof (CRVBOXHGCMVIEWPORT))
             {
-                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: param invalid - %d, %#x, %d",
+                LogRel(("OpenGL: SHCRGL_HOST_FN_VIEWPORT_CHANGED: param invalid - %d, %#x, %d",
                         paParms[0].type,
                         paParms[0].u.pointer.addr,
                         paParms[0].u.pointer.size));
@@ -1278,7 +1278,7 @@ static int svcHostCallPerform(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVC
                     pViewportInfo->height  /* h */);
             if (!RT_SUCCESS(rc))
             {
-                LogRel(("SHCRGL_HOST_FN_VIEWPORT_CHANGED: crVBoxServerSetScreenViewport failed, rc %d", rc));
+                LogRel(("OpenGL: SHCRGL_HOST_FN_VIEWPORT_CHANGED: crVBoxServerSetScreenViewport failed, rc %d", rc));
             }
 
             crServerVBoxCompositionSetEnableStateGlobal(GL_TRUE);
@@ -1386,7 +1386,7 @@ static int svcHostCallPerform(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVC
             rc = VBoxOglSetScaleFactor(pData->u32Screen, dScaleFactorW, dScaleFactorH);
 
             /* Log scaling factor rounded to nearest 'int' value (not so precise). */
-            LogRel(("OpenGL: Set 3D content scale factor to (%u, %u), multiplier %d (rc=%Rrc).\n",
+            LogRel(("OpenGL: Set 3D content scale factor to (%u, %u), multiplier %d (rc=%Rrc)\n",
                 pData->u32ScaleFactorWMultiplied,
                 pData->u32ScaleFactorHMultiplied,
                 (int)VBOX_OGL_SCALE_FACTOR_MULTIPLIER,
@@ -1410,7 +1410,7 @@ static int svcHostCallPerform(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVC
 
             CRVBOXHGCMSETUNSCALEDHIDPIOUTPUT *pData = (CRVBOXHGCMSETUNSCALEDHIDPIOUTPUT *)paParms[0].u.pointer.addr;
             crServerSetUnscaledHiDPI(pData->fUnscaledHiDPI);
-            LogRel(("OpenGL: Set OpenGL scale policy on HiDPI displays (fUnscaledHiDPI=%d).\n", pData->fUnscaledHiDPI));
+            LogRel(("OpenGL: Set OpenGL scale policy on HiDPI displays (fUnscaledHiDPI=%d)\n", pData->fUnscaledHiDPI));
             break;
         }
 
diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_lists.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_lists.c
index 89e9ce1..a1c21ef 100644
--- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_lists.c
+++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_lists.c
@@ -39,10 +39,12 @@
 
 static GLuint TranslateListID( GLuint id )
 {
+#ifndef VBOX_WITH_CR_DISPLAY_LISTS
     if (!cr_server.sharedDisplayLists) {
         int client = cr_server.curClient->number;
         return id + client * 100000;
     }
+#endif
     return id;
 }
 
diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c
index c6922a0..54c1097 100644
--- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c
+++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c
@@ -1683,8 +1683,13 @@ static int32_t crVBoxServerSaveStatePerform(PSSMHANDLE pSSM)
     }
 
 #ifdef VBOX_WITH_CR_DISPLAY_LISTS
-    rc = crDLMSaveState();
-    AssertRCReturn(rc, rc);
+    if (cr_server.head_spu->dispatch_table.spu_save_state)
+    {
+        rc = cr_server.head_spu->dispatch_table.spu_save_state("NULL");
+        AssertRCReturn(rc, rc);
+    }
+    else
+        crDebug("Do not save %s SPU state: no interface exported.", cr_server.head_spu->name);
 #endif
 
     rc = crServerPendSaveState(pSSM);
diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_misc.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_misc.c
index de7676d..8e39c4d 100644
--- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_misc.c
+++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_misc.c
@@ -708,8 +708,9 @@ DECLEXPORT(void) crDbgPrint(const char *format, ... )
     va_list args;
     static char txt[8092];
 
-    va_start( args, format );
-    vsprintf( txt, format, args );
+    va_start(args, format);
+    vsprintf(txt, format, args);
+    va_end(args);
 
     OutputDebugString(txt);
 }
diff --git a/src/VBox/HostServices/SharedOpenGL/dlm/dlm.c b/src/VBox/HostServices/SharedOpenGL/dlm/dlm.c
index 233f548..4b7c1a4 100644
--- a/src/VBox/HostServices/SharedOpenGL/dlm/dlm.c
+++ b/src/VBox/HostServices/SharedOpenGL/dlm/dlm.c
@@ -48,12 +48,12 @@ static void threadDestructor(void *tsd)
 {
     CRDLMContextState *listState = (CRDLMContextState *)tsd;
 
-    if (listState) {
-	if (listState->currentListInfo) {
-	    crdlm_free_list(listState->currentListInfo);
-	}
+    if (listState)
+    {
+        //if (listState->currentListInfo)
+        //    crdlm_free_list(listState->currentListInfo);
 
-	crFree(listState);
+        crFree(listState);
     }
 }
 #endif
@@ -143,7 +143,7 @@ void DLM_APIENTRY crDLMUseDLM(CRDLM *dlm)
  * It maintains an internal count of users, and will only actually destroy
  * itself when no one is still using the DLM.
  */
-void DLM_APIENTRY crDLMFreeDLM(CRDLM *dlm)
+void DLM_APIENTRY crDLMFreeDLM(CRDLM *dlm, SPUDispatchTable *dispatchTable)
 {
     /* We're about to change the displayLists hash; lock it first */
     DLM_LOCK(dlm)
@@ -156,12 +156,7 @@ void DLM_APIENTRY crDLMFreeDLM(CRDLM *dlm)
     dlm->userCount--;
     if (dlm->userCount == 0) {
 
-	/* Free the set of display lists.  As each one is freed, the
-	 * crdlm_free_list function will be called to free up its
-	 * internal resources.  The crdlm_free_list() routine is
-	 * cast to a (void *) to avoid warnings about being an
-	 */
-	crFreeHashtable(dlm->displayLists, crdlm_free_list);
+	crFreeHashtableEx(dlm->displayLists, crdlmFreeDisplayListResourcesCb, dispatchTable);
 	dlm->displayLists = NULL;
 
 	/* Must unlock before freeing the mutex */
@@ -268,32 +263,32 @@ CRDLMContextState DLM_APIENTRY *crDLMGetCurrentState(void)
  * is no longer going to be used.
  */
 
-void DLM_APIENTRY crDLMFreeContext(CRDLMContextState *state)
+void DLM_APIENTRY crDLMFreeContext(CRDLMContextState *state, SPUDispatchTable *dispatchTable)
 {
-	CRDLMContextState *listState = CURRENT_STATE();
+    CRDLMContextState *listState = CURRENT_STATE();
 
-	/* If we're currently using this context, release it first */
-	if (listState == state) {
-		crDLMSetCurrentState(NULL);
-	}
+    /* If we're currently using this context, release it first */
+    if (listState == state)
+        crDLMSetCurrentState(NULL);
 
-	/* Try to free the DLM.  This will either decrement the use count,
-	 * or will actually free the DLM, if we were the last user.
-	 */
-	crDLMFreeDLM(state->dlm);
-	state->dlm = NULL;
+    /* Try to free the DLM.  This will either decrement the use count,
+     * or will actually free the DLM, if we were the last user.
+     */
+    crDLMFreeDLM(state->dlm, dispatchTable);
+    state->dlm = NULL;
 
-	/* If any buffers still remain (e.g. because there was an open
-	 * display list), remove those as well.
-	 */
-	if (state->currentListInfo) {
-		crdlm_free_list((void *)state->currentListInfo);
-	}
-	state->currentListInfo = NULL;
-	state->currentListIdentifier = 0;
+    /* If any buffers still remain (e.g. because there was an open
+     * display list), remove those as well.
+     */
+    if (state->currentListInfo)
+    {
+        crdlmFreeDisplayListResourcesCb((void *)state->currentListInfo, (void *)dispatchTable);
+        state->currentListInfo = NULL;
+    }
+    state->currentListIdentifier = 0;
 
-	/* Free the state record itself */
-	crFree(state);
+    /* Free the state record itself */
+    crFree(state);
 }
 
 
@@ -613,90 +608,6 @@ int DLM_APIENTRY crDLMGetReferences(CRDLM *dlm, unsigned long listIdentifier,
     }
 }
 
-CRDLMError DLM_APIENTRY crDLMGetDLMBounds(CRDLM *dlm, unsigned long listIdentifier, CRDLMBounds *bounds)
-{
-	DLMListInfo *listInfo
-		= (DLMListInfo *) crHashtableSearch(dlm->displayLists, listIdentifier);
-	if (listInfo) {
-		*bounds = listInfo->bbox;
-		return GL_NO_ERROR;
-	}
-	else {
-		return GL_INVALID_OPERATION;
-	}
-}
-
-CRDLMError DLM_APIENTRY crDLMGetBounds(unsigned long listIdentifier, CRDLMBounds *bounds)
-{
-    CRDLMContextState *listState = CURRENT_STATE();
-    if (listState) {
-	return crDLMGetDLMBounds(listState->dlm, listIdentifier, bounds);
-    }
-    else {
-	return CRDLM_ERROR_STATE;
-    }
-}
-
-
-/**
- * Set the bounding box for a display list.
- */
-void DLM_APIENTRY crDLMSetDLMBounds(CRDLM *dlm, unsigned long listIdentifier,
-               double xmin, double ymin, double zmin,
-               double xmax, double ymax, double zmax)
-{
-	DLMListInfo *listInfo
-		= (DLMListInfo *) crHashtableSearch(dlm->displayLists, listIdentifier);
-	if (!listInfo) {
-		/* allocate a list info now */
-		CRDLMContextState *listState = CURRENT_STATE();
-		listInfo = (DLMListInfo *) crCalloc(sizeof(DLMListInfo));
-		crHashtableReplace(listState->dlm->displayLists,
-											 listIdentifier, listInfo, crdlm_free_list);
-	}
-	if (listInfo) {
-		listInfo->bbox.xmin = xmin;
-		listInfo->bbox.ymin = ymin;
-		listInfo->bbox.zmin = zmin;
-		listInfo->bbox.xmax = xmax;
-		listInfo->bbox.ymax = ymax;
-		listInfo->bbox.zmax = zmax;
-	}
-}
-
-void DLM_APIENTRY crDLMSetBounds(unsigned long listIdentifier,
-               double xmin, double ymin, double zmin,
-               double xmax, double ymax, double zmax)
-{
-    CRDLMContextState *listState = CURRENT_STATE();
-    if (listState) {
-	crDLMSetDLMBounds(listState->dlm, listIdentifier,
-	    xmin, ymin, zmin, xmax, ymax, zmax);
-    }
-}
-
-/**
- * Return GL_TRUE if the given list has a valid bounding box
- */
-GLboolean DLM_APIENTRY crDLMListHasDLMBounds(CRDLM *dlm, unsigned long listIdentifier)
-{
-	DLMListInfo *listInfo
-		= (DLMListInfo *) crHashtableSearch(dlm->displayLists, listIdentifier);
-	if (listInfo)
-		return listInfo->bbox.xmin != FLT_MAX;
-	else
-		return GL_FALSE;
-}
-
-GLboolean DLM_APIENTRY crDLMListHasBounds(unsigned long listIdentifier)
-{
-    CRDLMContextState *listState = CURRENT_STATE();
-    if (listState) {
-	return crDLMListHasDLMBounds(listState->dlm, listIdentifier);
-    }
-    return 0;
-}
-
 /*
  * Return id of list currently being compiled.  Returns 0 of there's no
  * current DLM state, or if no list is being compiled. 
@@ -733,7 +644,33 @@ void crdlm_error(int line, const char *file, GLenum error, const char *info)
 		(*ErrorCallback)(line, file, error, info);
 }
 
+static void crDLMSaveListsCb(unsigned long key, void *pData1, void *pData2 /* unused */ )
+{
+    DLMListInfo *pListInfo = (DLMListInfo*)pData1;
+
+    if (pListInfo)
+    {
+        crDebug("Saving Display Lists: found ID=%u, numInstances=%d, references=%p.",
+            key, pListInfo->numInstances, pListInfo->references);
+
+        DLMInstanceList *pInstance = pListInfo->first;
+        while (pInstance) {
+            crDebug("\t%p", pInstance->execute);
+            pInstance = pInstance->next;
+        }
+    }
+    else
+        crError("Saving Display Lists: found record with no data. Skipping.");
+}
+
 int32_t DLM_APIENTRY crDLMSaveState(void)
 {
+    CRDLMContextState *pListState = CURRENT_STATE();
+
+    if (pListState)
+        crHashtableWalk(pListState->dlm->displayLists, crDLMSaveListsCb, (void *)NULL);
+    else
+        crDebug("Saving Display Lists: no data to save.");
+
     return 0;
 }
diff --git a/src/VBox/HostServices/SharedOpenGL/dlm/dlm.h b/src/VBox/HostServices/SharedOpenGL/dlm/dlm.h
index e3b51df..2e6db46 100644
--- a/src/VBox/HostServices/SharedOpenGL/dlm/dlm.h
+++ b/src/VBox/HostServices/SharedOpenGL/dlm/dlm.h
@@ -25,7 +25,7 @@ extern CRDLMContextState *CRDLMCurrentState;
  * outside.
  */
 extern void crdlmWarning( int line, char *file, GLenum error, char *format, ... );
-extern void crdlm_free_list(/* DLMListInfo * */ void *listInfo);
+extern void crdlmFreeDisplayListResourcesCb(void *pParm1, void *pParam2);
 extern void crdlm_error(int line, const char *file, GLenum error, const char *info);
 
 #endif
diff --git a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_calllist.c b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_calllist.c
index 7138c9d..11545f2 100644
--- a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_calllist.c
+++ b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_calllist.c
@@ -1,4 +1,6 @@
 /* $Id: dlm_calllist.c $ */
+#if 0
+
 #include <stdio.h>
 #include "cr_spu.h"
 #include "cr_dlm.h"
@@ -61,3 +63,5 @@ void DLM_APIENTRY crDLMCompileCallLists( GLsizei n, GLenum type, const GLvoid *
 
 	crdlm_add_to_list((DLMInstanceList *)instance, executeCallLists);
 }
+
+#endif
diff --git a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_generated.py b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_generated.py
index 27a306c..9470a21 100644
--- a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_generated.py
+++ b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_generated.py
@@ -85,6 +85,7 @@ def wrap_struct(functionName):
 	print '	DLMInstanceList *next;'
 	print '	DLMInstanceList *stateNext;'
 	print '	int cbInstance;'
+	print '	VBoxDLOpCode iVBoxOpCode;'
 	print '	void (DLM_APIENTRY *execute)(DLMInstanceList *instance, SPUDispatchTable *dispatchTable);'
 	for (name, type, vecSize) in params:
 		# Watch out for the word "const" (which should be ignored)
@@ -322,6 +323,9 @@ def wrap_compile(functionName):
 	# We need to know instance size in bytes in order to save its state later.
 	print '\tinstance->cbInstance = sizeof(struct instance%s);' % functionName
 	
+	# Set OPCODE.
+	print '\tinstance->iVBoxOpCode = VBOX_DL_OPCODE_%s;' % functionName
+	
 	# If there's a pointer parameter, apply it.
 	if len(pointers) == 1:
 		print '\tif (%s == NULL) {' % (params[pointers[0]][0])
diff --git a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_header.py b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_header.py
index 703a18e..5464462 100644
--- a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_header.py
+++ b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_header.py
@@ -7,15 +7,17 @@ import apiutil
 # mode is "header" or "defs"
 mode = sys.argv[1]
 
+keys = apiutil.GetDispatchedFunctions(sys.argv[2]+"/APIspec.txt")
+
 # Any new function implemented in the DLM has to have an entry added here.
 # Each function has its return type, function name, and parameters provided.
 # We'll use these to generate both a header file, and a definition file.
 additionalFunctions = [
 	('CRDLM DLM_APIENTRY *', 'crDLMNewDLM', 'unsigned int configSize, const CRDLMConfig *config'),
 	('CRDLMContextState DLM_APIENTRY *', 'crDLMNewContext', 'CRDLM *dlm'),
-	('void DLM_APIENTRY', 'crDLMFreeContext', 'CRDLMContextState *state'),
+	('void DLM_APIENTRY', 'crDLMFreeContext', 'CRDLMContextState *state, SPUDispatchTable *dispatchTable'),
 	('void DLM_APIENTRY', 'crDLMUseDLM', 'CRDLM *dlm'),
-	('void DLM_APIENTRY','crDLMFreeDLM', 'CRDLM *dlm'),
+	('void DLM_APIENTRY','crDLMFreeDLM', 'CRDLM *dlm, SPUDispatchTable *dispatchTable'),
 	('void DLM_APIENTRY', 'crDLMSetCurrentState', 'CRDLMContextState *state'),
 	('CRDLMContextState DLM_APIENTRY *', 'crDLMGetCurrentState', 'void'),
 	('CRDLMReplayState DLM_APIENTRY', 'crDLMGetReplayState', 'void'),
@@ -35,22 +37,18 @@ additionalFunctions = [
 	('void DLM_APIENTRY', 'crDLMReplayListsState', 'GLsizei n, GLenum type, const GLvoid *lists, SPUDispatchTable *dispatchTable'),
 	('CRDLMError DLM_APIENTRY', 'crDLMDeleteListContent', 'CRDLM *dlm, unsigned long listIdentifier'),
 	('int DLM_APIENTRY', 'crDLMGetReferences', 'CRDLM *dlm, unsigned long listIdentifier, int firstIndex, int sizeofBuffer, unsigned int *buffer'),
-	('CRDLMError DLM_APIENTRY', 'crDLMGetDLMBounds', 'CRDLM *dlm, unsigned long listIdentifier, CRDLMBounds *bounds'),
-	('CRDLMError DLM_APIENTRY', 'crDLMGetBounds', 'unsigned long listIdentifier, CRDLMBounds *bounds'),
-	('void DLM_APIENTRY', 'crDLMSetDLMBounds', 'CRDLM *dlm, unsigned long listIdentifier, double xmin, double ymin, double zmin, double xmax, double ymax, double zmax'),
-	('void DLM_APIENTRY', 'crDLMSetBounds', 'unsigned long listIdentifier, double xmin, double ymin, double zmin, double xmax, double ymax, double zmax'),
 	('void DLM_APIENTRY', 'crDLMComputeBoundingBox', 'unsigned long listId'),
-	('GLboolean DLM_APIENTRY', 'crDLMListHasDLMBounds', 'CRDLM *dlm, unsigned long listIdentifier'),
-	('GLboolean DLM_APIENTRY', 'crDLMListHasBounds', 'unsigned long listIdentifier'),
 	('GLuint DLM_APIENTRY', 'crDLMGetCurrentList', 'void'),
 	('GLenum DLM_APIENTRY', 'crDLMGetCurrentMode', 'void'),
 	('void DLM_APIENTRY', 'crDLMErrorFunction', 'CRDLMErrorCallback callback'),
-	('void DLM_APIENTRY', 'crDLMNewList', 'GLuint listIdentifier, GLenum mode'),
-	('void DLM_APIENTRY', 'crDLMEndList', 'void'),
-	('void DLM_APIENTRY', 'crDLMDeleteLists', 'GLuint firstListIdentifier, GLsizei range'),
-	('GLboolean DLM_APIENTRY', 'crDLMIsList', 'GLuint list'),
-	('GLuint DLM_APIENTRY', 'crDLMGenLists', 'GLsizei range'),
-	('void DLM_APIENTRY', 'crDLMListBase', 'GLuint base'),
+	('void DLM_APIENTRY', 'crDLMNewList', 'GLuint list, GLenum mode, SPUDispatchTable *dispatchTable'),
+	('void DLM_APIENTRY', 'crDLMEndList', 'SPUDispatchTable *dispatchTable'),
+	('void DLM_APIENTRY', 'crDLMCallList', 'GLuint list, SPUDispatchTable *dispatchTable'),
+	('void DLM_APIENTRY', 'crDLMCallLists', 'GLsizei n, GLenum type, const GLvoid *lists, SPUDispatchTable *dispatchTable'),
+	('void DLM_APIENTRY', 'crDLMDeleteLists', 'GLuint list, GLsizei range, SPUDispatchTable *dispatchTable'),
+	('void DLM_APIENTRY', 'crDLMListBase', 'GLuint base, SPUDispatchTable *dispatchTable'),
+	('GLboolean DLM_APIENTRY', 'crDLMIsList', 'GLuint list, SPUDispatchTable *dispatchTable'),
+	('GLuint DLM_APIENTRY', 'crDLMGenLists', 'GLsizei range, SPUDispatchTable *dispatchTable'),
 	('int32_t DLM_APIENTRY', 'crDLMSaveState', 'void'),
 	#('void DLM_APIENTRY', 'crDLMListSent', 'CRDLM *dlm, unsigned long listIdentifier'),
 	#('GLboolean DLM_APIENTRY', 'crDLMIsListSent', 'CRDLM *dlm, unsigned long listIdentifier'),
@@ -58,7 +56,7 @@ additionalFunctions = [
 ]
 
 if mode == 'header':
-	print """#ifndef CR_DLM_H
+    print """#ifndef CR_DLM_H
 
 /* DO NOT EDIT.  This file is auto-generated by %s. */
 #define CR_DLM_H
@@ -78,7 +76,18 @@ if mode == 'header':
 #ifdef CHROMIUM_THREADSAFE
 #include "cr_threads.h"
 #endif
+""" % os.path.basename(sys.argv[0])
+
+    # Generate operation codes enum to be used for saving and restoring lists.
+    print "/* OpCodes codes enum to be used for saving and restoring lists. */"
+    print "typedef enum {"
+
+    for func_name in keys:
+        print "    VBOX_DL_OPCODE_%s," % func_name
 
+    print "} VBoxDLOpCode;"
+
+    print """
 /* 3D bounding box */
 typedef struct {
 	double xmin, xmax, ymin, ymax, zmin, zmax;
@@ -95,7 +104,8 @@ typedef enum {
 typedef struct DLMInstanceList {
 	struct DLMInstanceList *next;
 	struct DLMInstanceList *stateNext;
-	int    cbInstance;
+	int                     cbInstance;
+	VBoxDLOpCode            iVBoxOpCode; /* This field name should not interfere w/ OpenGL function parameters names (for example w/ param 'opcode' for glLogicOp()). */
 	void (*execute)(struct DLMInstanceList *instance, SPUDispatchTable *dispatchTable);
 } DLMInstanceList;
 
@@ -106,6 +116,7 @@ typedef struct {
 	CRHashTable *references; /* display lists that this display list calls */
 	CRDLMBounds bbox;
 	GLboolean listSent;
+	GLuint hwid;
 } DLMListInfo;
 
 typedef struct {
@@ -190,7 +201,7 @@ typedef void (*CRDLMErrorCallback)(int line, const char *file, GLenum error, con
 #ifdef __cplusplus
 extern "C" {
 #endif
-""" % os.path.basename(sys.argv[0])
+"""
 elif mode == 'defs':
 	apiutil.CopyrightDef()
 	print '''\t; DO NOT EDIT.  This code is generated by %s.
@@ -214,7 +225,7 @@ if mode == 'header':
 	print "/* auto-generated compilation functions begin here */"
 
 
-keys = apiutil.GetDispatchedFunctions(sys.argv[2]+"/APIspec.txt")
+
 for func_name in keys:
 	props = apiutil.Properties(func_name)
 	# We're interested in intercepting all calls that:
diff --git a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_lists.c b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_lists.c
index 4c3e473..d28c365 100644
--- a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_lists.c
+++ b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_lists.c
@@ -1,275 +1,428 @@
 /* $Id: dlm_lists.c $ */
+
+/** @file
+ * Implementation of all the Display Lists related routines:
+ *
+ *   glGenLists, glDeleteLists, glNewList, glEndList, glCallList, glCallLists,
+ *   glListBase and glIsList.
+ *
+ * Privide OpenGL IDs mapping between host and guest.
+ */
+
+/*
+ * Copyright (C) 2015 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
 #include <float.h>
 #include "cr_dlm.h"
 #include "cr_mem.h"
 #include "dlm.h"
 
 
-
-/* This file defines the display list functions such as NewList, EndList,
- * IsList, DeleteLists, etc.
- * Generally, SPUs will call these as needed to implement display lists.
- * See the expando, replicate, and tilesort SPUs for examples.
- *
- * The functions which compile GL functions into our display lists are named:
- *     void DLM_APIENTRY crdlm_<function name>
- * where <function_name> is the Chromium function name (which in 
- * turn is the GL function name with the "gl" prefix removed).
- *
- * All these entry points require that a CRDLMContextState structure
- * be created (with crDLMNewContext()) and assigned to the current
- * thread (with crDLMSetCurrentState()).
+/**
+ * Destroy each list entry.
  */
+static void crdlmFreeDisplayListElements(DLMInstanceList *instance)
+{
+    while (instance)
+    {
+        DLMInstanceList *nextInstance = instance->next;
+        crFree(instance);
+        instance = nextInstance;
+    }
+}
 
 
-/*
- * Begin compiling a list.
+/**
+ * A callback routine used when iterating over all
+ * available lists in order to remove them.
+ *
+ * NOTE: @param pParam2 might be NULL.
  */
-void DLM_APIENTRY
-crDLMNewList(GLuint listIdentifier, GLenum mode)
+void crdlmFreeDisplayListResourcesCb(void *pParm1, void *pParam2)
 {
-    DLMListInfo *listInfo;
-    CRDLMContextState *listState = CURRENT_STATE();
+    DLMListInfo      *pListInfo     = (DLMListInfo *)pParm1;
+    SPUDispatchTable *dispatchTable = (SPUDispatchTable *)pParam2;
 
-    /* Error checks: 0 is not a valid identifier, and
-     * we can't call NewList if NewList has been called
-     * more recently than EndList.
-     *
-     * The caller is expected to check for an improper
-     * mode parameter (GL_INVALID_ENUM), or for a NewList
-     * within a glBegin/glEnd (GL_INVALID_OPERATION).
-     */
-    if (listState == NULL)
+    if (pListInfo)
     {
-	crWarning("DLM error: NewList(%d,%d) called with no current state (%s line %d)\n",
-	    (int) listIdentifier, (int) mode, __FILE__, __LINE__);
-	return;
-    }
+        crdlmFreeDisplayListElements(pListInfo->first);
+        pListInfo->first = pListInfo->last = NULL;
 
-    if (listIdentifier == 0)
-    {
-	crdlm_error(__LINE__, __FILE__, GL_INVALID_VALUE,
-	     "NewList called with a list identifier of 0");
-	return;
-    }
+        /* The references list has no allocated information; it's
+         * just a set of entries.  So we don't need to free any
+         * information as each entry is deleted.
+         */
+        crFreeHashtable(pListInfo->references, NULL);
 
-    if (listState->currentListInfo != NULL)
-    {
-	char msg[1000];
-	sprintf(msg, "NewList called with display list %d while display list %d was already open",
-	    (int) listIdentifier, (int) listState->currentListIdentifier);
-	crdlm_error(__LINE__, __FILE__, GL_INVALID_OPERATION, msg);
-	return;
-    }
+        /* Free host OpenGL resources. */
+        if (dispatchTable)
+            dispatchTable->DeleteLists(pListInfo->hwid, 1);
 
-    listInfo = (DLMListInfo *) crCalloc(sizeof(DLMListInfo));
-    if (!(listInfo))
-    {
-	char msg[1000];
-	sprintf(msg, "could not allocate %u bytes of memory in NewList",
-	    (unsigned) sizeof(DLMListInfo));
-	crdlm_error(__LINE__, __FILE__, GL_OUT_OF_MEMORY, msg);									 
-	return;
+        crFree(pListInfo);
     }
+}
+
+
+/**
+ * Generate host and guest IDs, setup IDs mapping between host and guest.
+ */
+GLuint DLM_APIENTRY crDLMGenLists(GLsizei range, SPUDispatchTable *dispatchTable)
+{
+    CRDLMContextState *listState = CURRENT_STATE();
+    GLuint             idHostRangeStart = 0;
+    GLuint             idGuestRangeStart = 0;
+
+    crDebug("DLM: GenLists(%d) (DLM=%p).", range, listState ? listState->dlm : 0);
 
-    listInfo->first = listInfo->last = NULL;
-    listInfo->stateFirst = listInfo->stateLast = NULL;
-    listInfo->references = crAllocHashtable();
-    if (!(listInfo->references))
+    if (listState)
     {
-	crFree(listInfo);
-	crdlm_error(__LINE__, __FILE__, GL_OUT_OF_MEMORY,
-	    "could not allocate memory in NewList");
-	return;
+        idHostRangeStart = dispatchTable->GenLists(range);
+        if (idHostRangeStart > 0)
+        {
+            idGuestRangeStart = crHashtableAllocKeys(listState->dlm->displayLists, range);
+            if (idGuestRangeStart > 0)
+            {
+                GLuint i;
+                bool fSuccess = true;
+
+                /* Now have successfully generated IDs range for host and guest. Let's make IDs association. */
+                for (i = 0; i < (GLuint)range; i++)
+                {
+                    DLMListInfo *pListInfo;
+
+                    pListInfo = (DLMListInfo *)crCalloc(sizeof(DLMListInfo));
+                    if (pListInfo)
+                    {
+                        crMemset(pListInfo, 0, sizeof(DLMListInfo));
+                        pListInfo->hwid = idHostRangeStart + i;
+
+                        /* Insert pre-initialized list data which contains IDs mapping into the hash. */
+                        crHashtableReplace(listState->dlm->displayLists, idGuestRangeStart + i, pListInfo, NULL);
+                    }
+                    else
+                    {
+                        fSuccess = false;
+                        break;
+                    }
+                }
+
+                /* All structures allocated and initialized successfully. */
+                if (fSuccess)
+                    return idGuestRangeStart;
+
+                /* Rollback some data was not allocated. */
+                crDLMDeleteLists(idGuestRangeStart, range, NULL /* we do DeleteLists() later in this routine */ );
+            }
+            else
+                crDebug("DLM: Can't allocate Display List IDs range for the guest.");
+
+            dispatchTable->DeleteLists(idHostRangeStart, range);
+        }
+        else
+            crDebug("DLM: Can't allocate Display List IDs range on the host side.");
     }
-    listInfo->numInstances = 0;
-    listInfo->listSent = GL_FALSE;
-    listInfo->bbox.xmin = FLT_MAX;
-    listInfo->bbox.xmax = -FLT_MAX;
-    listInfo->bbox.ymin = FLT_MAX;
-    listInfo->bbox.ymax = -FLT_MAX;
-    listInfo->bbox.zmin = FLT_MAX;
-    listInfo->bbox.zmax = -FLT_MAX;
-
-    listState->currentListInfo = listInfo;
-    listState->currentListIdentifier = listIdentifier;
-    listState->currentListMode = mode;
+    else
+        crDebug("DLM: GenLists(%u) called with no current state.", range);
+
+    /* Can't reserve IDs range.  */
+    return 0;
 }
 
 
-/* This small utility routine is used to traverse a buffer
- * list, freeing each buffer.  It is used to free the buffer
- * list in the DLMListInfo structure, both when freeing the
- * entire structure and when freeing just the retained content.
+/**
+ * Release host and guest IDs, free memory resources.
  */
-static void free_instance_list(DLMInstanceList * instance)
+void DLM_APIENTRY crDLMDeleteLists(GLuint list, GLsizei range, SPUDispatchTable *dispatchTable)
 {
-	while (instance)
-	{
-		DLMInstanceList *nextInstance = instance->next;
-		crFree(instance);
-		instance = nextInstance;
-	}
+    CRDLMContextState *listState = CURRENT_STATE();
+
+    crDebug("DLM: DeleteLists(%u, %d) (DLM=%p).", list, range, listState ? listState->dlm : 0);
+
+    if (listState)
+    {
+        if (range >= 0)
+        {
+            int i;
+
+            /* Free resources: host memory, host IDs and guest IDs. */
+            DLM_LOCK(listState->dlm)
+            for (i = 0; i < range; i++)
+                crHashtableDeleteEx(listState->dlm->displayLists, list + i, crdlmFreeDisplayListResourcesCb, dispatchTable);
+            DLM_UNLOCK(listState->dlm)
+        }
+        else
+            crDebug("DLM: DeleteLists(%u, %d) not allowed.", list, range);
+    }
+    else
+        crDebug("DLM: DeleteLists(%u, %d) called with no current state.", list, range);
 }
 
-/* This utility routine frees a DLMListInfo structure and all
- * of its components.  It is used directly, when deleting a
- * single list; it is also used as a callback function for
- * hash tree operations (Free and Replace).
- *
- * The parameter is listed as a (void *) instead of a (DLMListInfo *)
- * in order that the function can be used as a callback routine for
- * the hash table functions.  The (void *) designation causes no
- * other harm, save disabling type-checking on the pointer argument
- * of the function.
+
+/**
+ * Start recording a list.
  */
-void crdlm_free_list(void *parm)
+void DLM_APIENTRY
+crDLMNewList(GLuint list, GLenum mode, SPUDispatchTable *dispatchTable)
 {
-	DLMListInfo *listInfo = (DLMListInfo *) parm;
-
-	free_instance_list(listInfo->first);
-	listInfo->first = listInfo->last = NULL;
+    DLMListInfo       *listInfo;
+    CRDLMContextState *listState = CURRENT_STATE();
 
-	/* The references list has no allocated information; it's
-	 * just a set of entries.  So we don't need to free any
-	 * information as each entry is deleted.
-	 */
-	crFreeHashtable(listInfo->references, NULL);
+    crDebug("DLM: NewList(%u, %u) (DLM=%p).", list, mode, listState ? listState->dlm : 0);
 
-	crFree(listInfo);
+    if (listState)
+    {
+        /* Valid list ID should be > 0. */
+        if (list > 0)
+        {
+            if (listState->currentListInfo == NULL)
+            {
+                listInfo = (DLMListInfo *)crHashtableSearch(listState->dlm->displayLists, list);
+                if (listInfo)
+                {
+                    listInfo->first = listInfo->last = NULL;
+                    listInfo->stateFirst = listInfo->stateLast = NULL;
+                    listInfo->references = crAllocHashtable();
+                    if (listInfo->references)
+                    {
+                        listInfo->numInstances = 0;
+                        listInfo->listSent = GL_FALSE;
+                        listInfo->bbox.xmin = FLT_MAX;
+                        listInfo->bbox.xmax = -FLT_MAX;
+                        listInfo->bbox.ymin = FLT_MAX;
+                        listInfo->bbox.ymax = -FLT_MAX;
+                        listInfo->bbox.zmin = FLT_MAX;
+                        listInfo->bbox.zmax = -FLT_MAX;
+
+                        listState->currentListInfo = listInfo;
+                        listState->currentListIdentifier = list;
+                        listState->currentListMode = mode;
+
+                        dispatchTable->NewList(listInfo->hwid, mode);
+
+                        crDebug("DLM: create new list with [guest, host] ID pair [%u, %u].", list, listInfo->hwid);
+
+                        return;
+                    }
+                    else
+                        crDebug("DLM: Could not allocate memory in NewList.");
+                }
+                else
+                    crDebug("DLM: Requested Display List %u was not previously reserved with glGenLists().", list);
+            }
+            else
+                crDebug("DLM: NewList called with display list %u while display list %u was already open.", list, listState->currentListIdentifier);
+        }
+        else
+            crDebug("DLM: NewList called with a list identifier of 0.");
+    }
+    else
+        crDebug("DLM: NewList(%u, %u) called with no current state.\n", list, mode);
 }
 
 
-void DLM_APIENTRY crDLMEndList(void)
+/**
+ * Stop recording a list.
+ */
+void DLM_APIENTRY crDLMEndList(SPUDispatchTable *dispatchTable)
 {
     CRDLMContextState *listState = CURRENT_STATE();
 
-    /* Error check: cannot call EndList without a (successful)
-     * preceding NewList.
-     *
-     * The caller is expected to check for glNewList within
-     * a glBegin/glEnd sequence.
-     */
-    if (listState == NULL)
-    {
-	crWarning("DLM error: EndList called with no current state (%s line %d)\n",
-	    __FILE__, __LINE__);
-	return;
-    }
-    if (listState->currentListInfo == NULL)
+    crDebug("DLM: EndList() (DLM=%p).", listState ? listState->dlm : 0);
+
+    if (listState)
     {
-	crdlm_error(__LINE__, __FILE__, GL_INVALID_OPERATION,
-	    "EndList called while no display list was open");
-	return;
-    }
+        /* Check if list was ever started. */
+        if (listState->currentListInfo)
+        {
+            /* reset the current state to show the list had been ended */
+            listState->currentListIdentifier = 0;
+            listState->currentListInfo = NULL;
+            listState->currentListMode = GL_FALSE;
+
+            dispatchTable->EndList();
+        }
+        else
+            crDebug("DLM: glEndList() is assuming glNewList() was issued previously.");
+    } 
+    else
+        crDebug("DLM: EndList called with no current state.");
+}
 
-    DLM_LOCK(listState->dlm)
 
-    /* This function will either replace the list information that's
-     * already present with our new list information, freeing the
-     * former list information; or will add the new information
-     * to the set of display lists, depending on whether the
-     * list already exists or not.
-     */
-    crHashtableReplace(listState->dlm->displayLists,
-	listState->currentListIdentifier,
-	listState->currentListInfo, crdlm_free_list);
+/**
+ * Execute list on hardware and cach ethis call if we currently recording a list.
+ */
+void DLM_APIENTRY crDLMCallList(GLuint list, SPUDispatchTable *dispatchTable)
+{
+    CRDLMContextState *listState = CURRENT_STATE();
 
-    DLM_UNLOCK(listState->dlm)
+    //crDebug("DLM: CallList(%u).", list);
 
-    /* reset the current state to show the list had been ended */
-    listState->currentListIdentifier = 0;
-    listState->currentListInfo = NULL;
-    listState->currentListMode = GL_FALSE;
+    if (listState)
+    {
+        DLMListInfo *listInfo;
+
+        /* Add to calls cache if we recording a list. */
+        if (listState->currentListInfo)
+            crDLMCompileCallList(list);
+
+        /* Find hwid for list. */
+        listInfo = (DLMListInfo *)crHashtableSearch(listState->dlm->displayLists, list);
+        if (listInfo)
+            dispatchTable->CallList(listInfo->hwid);
+        else
+            crDebug("DLM: CallList(%u) issued for non-existent list.", list);
+    }
+    else
+        crDebug("DLM: CallList(%u) called with no current state.", list);
 }
 
 
-void DLM_APIENTRY crDLMDeleteLists(GLuint firstListIdentifier, GLsizei range)
+/* Helper for crDLMCallLists().
+ * We need to extract list ID by index from array of given type and cast it to GLuint.
+ * Please replece it w/ something more elegant if better solution will be found!
+ */
+inline GLuint crDLMGetListByIndex(const GLvoid *aValues, GLsizei index, GLenum type)
 {
-	CRDLMContextState *listState = CURRENT_STATE();
-	register int i;
-
-	if (listState == NULL)
-	{
-		crWarning
-			("DLM error: DeleteLists(%d,%d) called with no current state (%s line %d)\n",
-			 (int) firstListIdentifier, (int) range, __FILE__, __LINE__);
-		return;
-	}
-	if (range < 0)
-	{
-		char msg[1000];
-		sprintf(msg, "DeleteLists called with range (%d) less than zero", (int) range);
-		crdlm_error(__LINE__, __FILE__, GL_INVALID_VALUE, msg);								 
-		return;
-	}
-
-	/* Interestingly, there doesn't seem to be an error for deleting
-	 * display list 0, which cannot exist.
-	 *
-	 * We could delete the desired lists by walking the entire hash of
-	 * display lists and looking for and deleting any in our range; or we
-	 * could delete lists one by one.  The former is faster if the hashing
-	 * algorithm is inefficient or if we're deleting all or most of our
-	 * lists; the latter is faster if we're deleting a relatively small
-	 * number of lists.
-	 *
-	 * For now, we'll go with the latter; it's also easier to implement
-	 * given the current functions available.
-	 */
-	DLM_LOCK(listState->dlm)
-	for (i = 0; i < range; i++)
-	{
-		crHashtableDelete(listState->dlm->displayLists, 
-				  firstListIdentifier + i, crdlm_free_list);
-	}
-	DLM_UNLOCK(listState->dlm)
+    GLuint element = 0;
+
+    switch (type)
+    {
+#define CRDLM_LIST_BY_INDEX_HANDLE_TYPE(_type_name, _size_of_type) \
+        case _type_name: \
+        { \
+            crMemcpy((void *)&element, (void *)((void *)(aValues) + (index * (_size_of_type))) \
+            , (_size_of_type)); \
+            break; \
+        }
+
+        CRDLM_LIST_BY_INDEX_HANDLE_TYPE(GL_BYTE,            sizeof(GLbyte));
+        CRDLM_LIST_BY_INDEX_HANDLE_TYPE(GL_UNSIGNED_BYTE,   sizeof(GLubyte));
+        CRDLM_LIST_BY_INDEX_HANDLE_TYPE(GL_SHORT,           sizeof(GLshort));
+        CRDLM_LIST_BY_INDEX_HANDLE_TYPE(GL_UNSIGNED_SHORT,  sizeof(GLushort));
+        CRDLM_LIST_BY_INDEX_HANDLE_TYPE(GL_INT,             sizeof(GLint));
+        CRDLM_LIST_BY_INDEX_HANDLE_TYPE(GL_UNSIGNED_INT,    sizeof(GLuint));
+        CRDLM_LIST_BY_INDEX_HANDLE_TYPE(GL_FLOAT,           sizeof(GLfloat));
+        CRDLM_LIST_BY_INDEX_HANDLE_TYPE(GL_2_BYTES,         2);
+        CRDLM_LIST_BY_INDEX_HANDLE_TYPE(GL_3_BYTES,         3);
+        CRDLM_LIST_BY_INDEX_HANDLE_TYPE(GL_4_BYTES,         4);
+
+        default:
+            crError("DLM: attempt to pass to crDLMCallLists() unknown type: %u.", index);
+
+#undef CRDLM_LIST_BY_INDEX_HANDLE_TYPE
+    }
+
+    return element;
 }
 
-GLboolean DLM_APIENTRY crDLMIsList(GLuint list)
+/**
+ * Execute lists on hardware and cach ethis call if we currently recording a list.
+ */
+void DLM_APIENTRY crDLMCallLists(GLsizei n, GLenum type, const GLvoid *lists, SPUDispatchTable *dispatchTable)
 {
-	CRDLMContextState *listState = CURRENT_STATE();
-
-	if (listState == NULL)
-	{
-		crWarning
-			("DLM error: IsLists(%d) called with no current state (%s line %d)\n",
-			 (int) list, __FILE__, __LINE__);
-		return 0;
-	}
+    CRDLMContextState *listState = CURRENT_STATE();
 
-	if (list == 0)
-		return GL_FALSE;
+    crDebug("DLM: CallLists(%d, %u, %p).", n, type, lists);
 
-	return crHashtableIsKeyUsed(listState->dlm->displayLists, list);
+    if (listState)
+    {
+        GLsizei i;
+
+        /* Add to calls cache if we recording a list. */
+        if (listState->currentListInfo)
+            crDLMCompileCallLists(n, type, lists);
+
+        /* This is sad, but we need to translate guest IDs into host ones.
+         * Since spec does not promise that @param lists conain contiguous set of IDs,
+         * the only way to do that is to iterate over each guest ID and perform translation.
+         * This might have negative performance impact. */
+        for (i = 0; i < n; i++)
+        {
+            DLMListInfo *listInfo;
+            GLuint guest_id = crDLMGetListByIndex(lists, n, type);
+
+            if (guest_id > 0)
+            {
+                listInfo = (DLMListInfo *)crHashtableSearch(listState->dlm->displayLists, guest_id);
+                if (listInfo)
+                    dispatchTable->CallList(listInfo->hwid);
+                else
+                    crDebug("DLM: CallLists(%d, %u, %p) was unabbe to resolve host ID for guest ID %u.", n, type, lists, guest_id);
+            }
+            else
+                crDebug("DLM: CallLists(%d, %u, %p) received bad array of IDs.", n, type, lists);
+        }
+    }
+    else
+        crDebug("DLM: CallLists(%d, %u, %p) called with no current state.", n, type, lists);
 }
 
-GLuint DLM_APIENTRY crDLMGenLists(GLsizei range)
+
+/**
+ * Set list base, remember its value and add call to the cache.
+ */
+void DLM_APIENTRY crDLMListBase(GLuint base, SPUDispatchTable *dispatchTable)
 {
-	CRDLMContextState *listState = CURRENT_STATE();
+    CRDLMContextState *listState = CURRENT_STATE();
 
-	if (listState == NULL)
-	{
-		crWarning
-			("DLM error: GenLists(%d) called with no current state (%s line %d)\n",
-			 (int) range, __FILE__, __LINE__);
-		return 0;
-	}
+    crDebug("DLM: ListBase(%u).", base);
 
-	return crHashtableAllocKeys(listState->dlm->displayLists, range);
+    if (listState)
+    {
+        listState->listBase = base;
+        crDLMCompileListBase(base);
+        dispatchTable->ListBase(base);
+    }
+    else
+        crDebug("DLM: ListBase(%u) called with no current state.", base);
 }
 
-void DLM_APIENTRY crDLMListBase( GLuint base )
+
+/**
+ * Check if specified list ID belongs to valid Display List.
+ * Positive result is only returned in case both conditions below are satisfied:
+ *
+ *   - given list found in DLM hash table (i.e., it was previously allocated
+ *     with crDLMGenLists and still not released with crDLMDeleteLists);
+ *
+ *   - list is valid on the host side.
+ */
+GLboolean DLM_APIENTRY crDLMIsList(GLuint list, SPUDispatchTable *dispatchTable)
 {
-	CRDLMContextState *listState = CURRENT_STATE();
+    CRDLMContextState *listState = CURRENT_STATE();
+
+    crDebug("DLM: IsList(%u).", list);
 
-	if (listState == NULL)
-	{
-		crWarning
-			("DLM error: ListBase(%d) called with no current state (%s line %d)\n",
-			 (int) base, __FILE__, __LINE__);
-		return;
-	}
+    if (listState)
+    {
+        if (list > 0)
+        {
+            DLMListInfo *listInfo = (DLMListInfo *)crHashtableSearch(listState->dlm->displayLists, list);
+            if (listInfo)
+            {
+                if (dispatchTable->IsList(listInfo->hwid))
+                    return true;
+                else
+                    crDebug("DLM: list [%u, %u] not found on the host side.", list, listInfo->hwid);
+            }
+            else
+                crDebug("DLM: list %u not found in guest cache.", list);
+        }
+        else
+            crDebug("DLM: IsList(%u) is not allowed.", list);
+    }
+    else
+        crDebug("DLM: IsList(%u) called with no current state.", list);
 
-	listState->listBase = base;
+    return false;
 }
diff --git a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_special b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_special
index cd20a30..bcbd643 100644
--- a/src/VBox/HostServices/SharedOpenGL/dlm/dlm_special
+++ b/src/VBox/HostServices/SharedOpenGL/dlm/dlm_special
@@ -10,8 +10,8 @@ MultiDrawElementsEXT
 # dlm_calllist.c: since the DLM can manage state stored
 # inside display lists, we can manage state updates for
 # these sorts of elements.
-CallList
-CallLists
+#CallList
+#CallLists
 
 # Calls to be ignored.
 #VBoxConCreate
diff --git a/src/VBox/HostServices/SharedOpenGL/expando/expando_special b/src/VBox/HostServices/SharedOpenGL/expando/expando_special
index 18fdeed..9a8cd56 100644
--- a/src/VBox/HostServices/SharedOpenGL/expando/expando_special
+++ b/src/VBox/HostServices/SharedOpenGL/expando/expando_special
@@ -5,6 +5,7 @@ NewList
 EndList
 DeleteLists
 GenLists
+ListBase
 IsList
 CallList
 CallLists
diff --git a/src/VBox/HostServices/SharedOpenGL/expando/expandospu.c b/src/VBox/HostServices/SharedOpenGL/expando/expandospu.c
index f029349..063c49e 100644
--- a/src/VBox/HostServices/SharedOpenGL/expando/expandospu.c
+++ b/src/VBox/HostServices/SharedOpenGL/expando/expandospu.c
@@ -1,10 +1,27 @@
 /* $Id: expandospu.c $ */
+/** @file
+ * Implementation of routines which Expando SPU explicitly overrides.
+ */
+
 /* Copyright (c) 2001, Stanford University
  * All rights reserved
  *
  * See the file LICENSE.txt for information on redistributing this software.
  */
 
+
+/*
+ * Copyright (C) 2015 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
 #include <stdio.h>
 #include "cr_spu.h"
 #include "cr_dlm.h"
@@ -14,145 +31,152 @@
 extern GLint EXPANDOSPU_APIENTRY
 expandoCreateContext(const char *displayName, GLint visBits, GLint shareCtx)
 {
-	ExpandoContextState *contextState;
-	GLint contextId;
-
-	/* Allocate our own per-context record */
-	contextState = crCalloc(sizeof(ExpandoContextState));
-	if (contextState == NULL) {
-	    crError("expando: couldn't allocate per-context state");
-	    return 0;
-	}
-
-	/* Get an official context ID from our super */
-	contextId = expando_spu.super.CreateContext(displayName, visBits, shareCtx);
-
-	/* Supplement that with our DLM.  In a more correct situation, we should
-	 * see if we've been called through glXCreateContext, which has a parameter
-	 * for sharing DLMs.  We don't currently get that information, so for now
-	 * give each context its own DLM.
-	 */
-	contextState->dlm = crDLMNewDLM(0, NULL);
-	if (!contextState->dlm) {
-		crError("expando: couldn't get DLM!");
-	}
-
-	contextState->dlmContext = crDLMNewContext(contextState->dlm);
-	if (!contextState->dlmContext) {
-		crError("expando: couldn't get dlmContext");
-	}
-
-	/* The DLM needs us to use the state tracker to track client
-	 * state, so we can compile client-state-using functions correctly.
-	 */
-	contextState->State = crStateCreateContext(NULL, visBits, NULL);
-
-	/* Associate the Expando context with the user context. */
-	crHashtableAdd(expando_spu.contextTable, contextId, (void *)contextState);
-
-	return contextId;
+    ExpandoContextState *contextState;
+
+    /* Allocate our own per-context record */
+    contextState = crCalloc(sizeof(ExpandoContextState));
+    if (contextState)
+    {
+        GLint contextId;
+
+        /* Get an official context ID from our super */
+        contextId = expando_spu.super.CreateContext(displayName, visBits, shareCtx);
+
+        /* Supplement that with our DLM.  In a more correct situation, we should
+         * see if we've been called through glXCreateContext, which has a parameter
+         * for sharing DLMs.  We don't currently get that information, so for now
+         * give each context its own DLM.
+         */
+        contextState->dlm = crDLMNewDLM(0, NULL);
+        if (contextState->dlm)
+        {
+            contextState->dlmContext = crDLMNewContext(contextState->dlm);
+            if (contextState->dlmContext)
+            {
+                /* The DLM needs us to use the state tracker to track client
+                 * state, so we can compile client-state-using functions correctly.
+                 */
+                contextState->State = crStateCreateContext(NULL, visBits, NULL);
+
+                /* Associate the Expando context with the user context. */
+                crHashtableAdd(expando_spu.contextTable, contextId, (void *)contextState);
+
+                crDebug("Expando SPU: created context %d (contextState=%p, contextState->dlm=%p, "
+                        "contextState->dlmContext=%p, contextState->State=%p).",
+                        contextId, contextState, contextState->dlm, contextState->dlmContext, contextState->State);
+
+                return contextId;
+            }
+            else
+                crError("Expando SPU: can't allocate new DLM context.");
+
+            crDLMFreeDLM(contextState->dlm, &expando_spu.super);
+        }
+        else
+            crError("Expando SPU: can't allocate new DLM.");
+
+        crFree(contextState);
+    }
+    else
+        crError("Expando SPU: couldn't allocate per-context state");
+
+    return 0;
 }
 
 void expando_free_context_state(void *data)
 {
-    ExpandoContextState *expandoContextState = (ExpandoContextState *)data;
+    ExpandoContextState *contextState = (ExpandoContextState *)data;
+
+    crDebug("Expando SPU: destroying context internals: "
+            "contextState=%p, contextState->dlm=%p, contextState->dlmContext=%p, contextState->State=%p",
+            contextState, contextState->dlm, contextState->dlmContext, contextState->State);
 
-    crDLMFreeContext(expandoContextState->dlmContext);
-    crDLMFreeDLM(expandoContextState->dlm);
-    crStateDestroyContext(expandoContextState->State);
-    crFree(expandoContextState);
+    crDLMFreeContext(contextState->dlmContext, &expando_spu.super);
+    crDLMFreeDLM(contextState->dlm, &expando_spu.super);
+    crStateDestroyContext(contextState->State);
+    crFree(contextState);
 }
 
-extern void EXPANDOSPU_APIENTRY
+void EXPANDOSPU_APIENTRY
 expandoDestroyContext(GLint contextId)
 {
-	/* Destroy our context information */
-	crHashtableDelete(expando_spu.contextTable, contextId, 
-				expando_free_context_state);
+    crDebug("Expando SPU: destroy context %d.", contextId);
+
+    /* Destroy our context information */
+    crHashtableDelete(expando_spu.contextTable, contextId, expando_free_context_state);
 
-	/* Pass along the destruction to our super. */
-	expando_spu.super.DestroyContext(contextId);
+    /* Pass along the destruction to our super. */
+    expando_spu.super.DestroyContext(contextId);
 }
 
-extern void EXPANDOSPU_APIENTRY
+void EXPANDOSPU_APIENTRY
 expandoMakeCurrent(GLint crWindow, GLint nativeWindow, GLint contextId)
 {
-	ExpandoContextState *expandoContextState;
-
-	expando_spu.super.MakeCurrent(crWindow, nativeWindow, contextId);
-
-	expandoContextState = crHashtableSearch(expando_spu.contextTable, contextId);
-	if (expandoContextState) {
-	    crDLMSetCurrentState(expandoContextState->dlmContext);
-	    crStateMakeCurrent(expandoContextState->State);
-	}
-	else {
-	    crDLMSetCurrentState(NULL);
-	    crStateMakeCurrent(NULL);
-	}
+    ExpandoContextState *expandoContextState;
+
+    expando_spu.super.MakeCurrent(crWindow, nativeWindow, contextId);
+
+    expandoContextState = crHashtableSearch(expando_spu.contextTable, contextId);
+    if (expandoContextState)
+    {
+        crDebug("Expando SPU: switch to context %d.", contextId);
+
+        crDLMSetCurrentState(expandoContextState->dlmContext);
+        crStateMakeCurrent(expandoContextState->State);
+    }
+    else
+    {
+        crDebug("Expando SPU: can't switch to context %d: not found.", contextId);
+
+        crDLMSetCurrentState(NULL);
+        crStateMakeCurrent(NULL);
+    }
 }
 
 extern void EXPANDOSPU_APIENTRY
 expandoNewList(GLuint list, GLenum mode)
 {
-    crDebug("Expando SPU: expandoNewList()");
-	crDLMNewList(list, mode);
+    crDLMNewList(list, mode, &expando_spu.super);
 }
 
 extern void EXPANDOSPU_APIENTRY
 expandoEndList(void)
 {
-    crDebug("Expando SPU: expandoEndList()");
-	crDLMEndList();
+    crDLMEndList(&expando_spu.super);
 }
 
 extern void EXPANDOSPU_APIENTRY
 expandoDeleteLists(GLuint first, GLsizei range)
 {
-	crDLMDeleteLists(first, range);
+    crDLMDeleteLists(first, range, &expando_spu.super);
 }
 
 extern GLuint EXPANDOSPU_APIENTRY
 expandoGenLists(GLsizei range)
 {
-	 return crDLMGenLists(range);
+    return crDLMGenLists(range, &expando_spu.super);
+}
+
+void EXPANDOSPU_APIENTRY
+expandoListBase(GLuint base)
+{
+    crDLMListBase(base, &expando_spu.super);
 }
 
 extern GLboolean EXPANDOSPU_APIENTRY
 expandoIsList(GLuint list)
 {
-	 return crDLMIsList(list);
+    return crDLMIsList(list, &expando_spu.super);
 }
 
 extern void EXPANDOSPU_APIENTRY
 expandoCallList(GLuint list)
 {
-	GLenum mode = crDLMGetCurrentMode();
-	if (mode != GL_FALSE) {
-		crDLMCompileCallList(list);
-		if (mode == GL_COMPILE) return;
-	}
-
-	/* Instead of passing through the CallList,
-	 * expand it into its components.  This will cause
-	 * a recursion if there are any compiled CallList
-	 * elements within the display list.
-	 */
-	crDLMReplayList(list, &expando_spu.self);
+    crDLMCallList(list, &expando_spu.super);
 }
 
 extern void EXPANDOSPU_APIENTRY
 expandoCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-	GLenum mode = crDLMGetCurrentMode();
-	if (mode != GL_FALSE) {
-		crDLMCompileCallLists(n, type, lists);
-		if (mode == GL_COMPILE) return;
-	}
-	/* Instead of passing through the CallLists,
-	 * expand it into its components.  This will cause
-	 * a recursion if there are any compiled CallLists
-	 * elements within the display list.
-	 */
-	crDLMReplayLists(n, type, lists, &expando_spu.self);
+    crDLMCallLists(n, type, lists, &expando_spu.super);
 }
diff --git a/src/VBox/HostServices/SharedOpenGL/expando/expandospu.h b/src/VBox/HostServices/SharedOpenGL/expando/expandospu.h
index e905c54..dad5e12 100644
--- a/src/VBox/HostServices/SharedOpenGL/expando/expandospu.h
+++ b/src/VBox/HostServices/SharedOpenGL/expando/expandospu.h
@@ -61,6 +61,7 @@ extern void EXPANDOSPU_APIENTRY expandoNewList(GLuint list, GLenum mode);
 extern void EXPANDOSPU_APIENTRY expandoEndList(void);
 extern void EXPANDOSPU_APIENTRY expandoDeleteLists(GLuint first, GLsizei range);
 extern GLuint EXPANDOSPU_APIENTRY expandoGenLists(GLsizei range);
+extern void EXPANDOSPU_APIENTRY expandoListBase(GLuint base);
 extern GLboolean EXPANDOSPU_APIENTRY expandoIsList(GLuint list);
 extern  void EXPANDOSPU_APIENTRY expandoCallList(GLuint list);
 extern void EXPANDOSPU_APIENTRY expandoCallLists(GLsizei n, GLenum type, const GLvoid *lists);
diff --git a/src/VBox/HostServices/SharedOpenGL/expando/expandospu_init.c b/src/VBox/HostServices/SharedOpenGL/expando/expandospu_init.c
index b353c4c..7b07108 100644
--- a/src/VBox/HostServices/SharedOpenGL/expando/expandospu_init.c
+++ b/src/VBox/HostServices/SharedOpenGL/expando/expandospu_init.c
@@ -19,6 +19,14 @@ static SPUFunctions expando_functions = {
 	_cr_expando_table /* THE ACTUAL FUNCTIONS */
 };
 
+static int
+expandoSPUSaveState(void *pData)
+{
+    crDebug("Saving state of Expando SPU.");
+    crDLMSaveState();
+    return 0;
+}
+
 static SPUFunctions *
 expandoSPUInit( int id, SPU *child, SPU *self,
 								 unsigned int context_id,
@@ -48,6 +56,9 @@ expandoSPUInit( int id, SPU *child, SPU *self,
 	/* We'll be using the state tracker for each context */
 	crStateInit();
 
+    /* Export optional interfaces for SPU save/restore. */
+    self->dispatch_table.spu_save_state = expandoSPUSaveState;
+
 	return &expando_functions;
 }
 
diff --git a/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m b/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m
index 16c39fd..12fa263 100644
--- a/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m
+++ b/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m
@@ -2469,8 +2469,8 @@ DECLINLINE(void) vboxNSRectToRectStretched(const NSRect *pR, RTRECT *pRect, floa
     NSRect backingBounds = [self safeConvertRectToBacking:&regularBounds];
     glViewport(0, 0, backingBounds.size.width, backingBounds.size.height);
 
-    crDebug("HiDPI: vboxPresentToViewCS: up-scaling is %s (backingStretchFactor=%d).",
-        render_spu.fUnscaledHiDPI ? "OFF" : "ON", (int)backingStretchFactor);
+    //crDebug("HiDPI: vboxPresentToViewCS: up-scaling is %s (backingStretchFactor=%d).",
+    //    render_spu.fUnscaledHiDPI ? "OFF" : "ON", (int)backingStretchFactor);
 #  endif
 
     glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0);
diff --git a/src/VBox/HostServices/auth/Makefile.kmk b/src/VBox/HostServices/auth/Makefile.kmk
index 02ce75e..36e8617 100644
--- a/src/VBox/HostServices/auth/Makefile.kmk
+++ b/src/VBox/HostServices/auth/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostServices/testcase/Makefile.kmk b/src/VBox/HostServices/testcase/Makefile.kmk
index c8d8e4d..9e5e347 100644
--- a/src/VBox/HostServices/testcase/Makefile.kmk
+++ b/src/VBox/HostServices/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ImageMounter/VBoxFUSE/Makefile.kmk b/src/VBox/ImageMounter/VBoxFUSE/Makefile.kmk
index 914d2b1..ada53d9 100644
--- a/src/VBox/ImageMounter/VBoxFUSE/Makefile.kmk
+++ b/src/VBox/ImageMounter/VBoxFUSE/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/common/Makefile.kmk b/src/VBox/Installer/common/Makefile.kmk
index 5c300de..b0f91d1 100644
--- a/src/VBox/Installer/common/Makefile.kmk
+++ b/src/VBox/Installer/common/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/darwin/DiskImage/VirtualBox_Uninstall.tool b/src/VBox/Installer/darwin/DiskImage/VirtualBox_Uninstall.tool
index 9f5150f..9635bd6 100755
--- a/src/VBox/Installer/darwin/DiskImage/VirtualBox_Uninstall.tool
+++ b/src/VBox/Installer/darwin/DiskImage/VirtualBox_Uninstall.tool
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2007-2013 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -80,7 +80,17 @@ test -f /usr/bin/VBoxHeadless                      && my_files+=("/usr/bin/VBoxH
 test -f /usr/bin/vboxwebsrv                        && my_files+=("/usr/bin/vboxwebsrv")
 test -f /usr/bin/VBoxBalloonCtrl                   && my_files+=("/usr/bin/VBoxBalloonCtrl")
 test -f /usr/bin/VBoxAutostart                     && my_files+=("/usr/bin/VBoxAutostart")
+test -f /usr/bin/VBoxDTrace                        && my_files+=("/usr/bin/VBoxDTrace")
 test -f /usr/bin/vbox-img                          && my_files+=("/usr/bin/vbox-img")
+test -f /usr/local/bin/VirtualBox                  && my_files+=("/usr/local/bin/VirtualBox")
+test -f /usr/local/bin/VBoxManage                  && my_files+=("/usr/local/bin/VBoxManage")
+test -f /usr/local/bin/VBoxVRDP                    && my_files+=("/usr/local/bin/VBoxVRDP")
+test -f /usr/local/bin/VBoxHeadless                && my_files+=("/usr/local/bin/VBoxHeadless")
+test -f /usr/local/bin/vboxwebsrv                  && my_files+=("/usr/local/bin/vboxwebsrv")
+test -f /usr/local/bin/VBoxBalloonCtrl             && my_files+=("/usr/local/bin/VBoxBalloonCtrl")
+test -f /usr/local/bin/VBoxAutostart               && my_files+=("/usr/local/bin/VBoxAutostart")
+test -f /usr/local/bin/VBoxDTrace                  && my_files+=("/usr/local/bin/VBoxDTrace")
+test -f /usr/local/bin/vbox-img                    && my_files+=("/usr/local/bin/vbox-img")
 test -d /Library/Receipts/VirtualBoxCLI.pkg/       && my_directories+=("/Library/Receipts/VirtualBoxCLI.pkg/")
 test -f /Library/LaunchDaemons/org.virtualbox.startup.plist && my_files+=("/Library/LaunchDaemons/org.virtualbox.startup.plist")
 
diff --git a/src/VBox/Installer/darwin/Makefile.kmk b/src/VBox/Installer/darwin/Makefile.kmk
index cedac76..592b769 100644
--- a/src/VBox/Installer/darwin/Makefile.kmk
+++ b/src/VBox/Installer/darwin/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -451,10 +451,14 @@ VBOX_DI_VBAPP_OTHER_UNIVERSAL_BINS = \
 	MacOS/VBoxDDR0.r0 \
 	MacOS/VBoxDD2R0.r0
 
-VBOX_DI_VBAPP_OTHER_BINS = \
-	MacOS/VMMGC.gc \
-	MacOS/VBoxDDGC.gc \
-	MacOS/VBoxDD2GC.gc
+ifdef VBOX_WITH_RAW_MODE
+ VBOX_DI_VBAPP_OTHER_BINS = \
+	MacOS/VMMRC.rc \
+	MacOS/VBoxDDRC.rc \
+	MacOS/VBoxDD2RC.rc
+else
+ VBOX_DI_VBAPP_OTHER_BINS =
+endif
 
 VBOX_DI_VBAPP_DUPLICATED_RESOURCE_FILES = \
 	Resources/virtualbox.icns \
@@ -806,42 +810,42 @@ $(VBOX_PATH_PACK_TMP)/Packages/VirtualBoxCLI.pkg: \
 		$(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.res/English.lproj
 	$(MKDIR) -p -m 0755 \
 		$(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr \
-		$(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin
+		$(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin
 	@# Generate the wrapper scripts.
-	$(APPEND) -tn  $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VirtualBox \
+	$(APPEND) -tn  $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VirtualBox \
 		'#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VirtualBox "$$@"'
-	$(APPEND) -tn  $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxManage \
+	$(APPEND) -tn  $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxManage \
 		'#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxManage "$$@"'
-	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxVRDP \
+	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxVRDP \
 		'#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxHeadless "$$@"'
-	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxHeadless \
+	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxHeadless \
 		'#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxHeadless "$$@"'
 ifdef VBOX_WITH_WEBSERVICES
-	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/vboxwebsrv \
+	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/vboxwebsrv \
 		'#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/vboxwebsrv "$$@"'
 endif
 if defined(VBOX_WITH_VBOX_IMG) || defined(VBOX_WITH_TESTCASES)
-	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/vbox-img \
+	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/vbox-img \
 		'#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/vbox-img "$$@"'
 endif
-	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxBalloonCtrl \
+	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxBalloonCtrl \
 		'#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxBalloonCtrl "$$@"'
-	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxAutostart \
+	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxAutostart \
 		'#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxAutostart "$$@"'
 ifdef VBOX_WITH_DTRACE
-	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxDTrace \
+	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/VBoxDTrace \
 		'#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxDTrace "$$@"'
 endif
 	@# Set the correct owners and file permissions.
-	sudo chmod 0755 $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/*
+	sudo chmod 0755 $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin/*
 	sudo chown    root:admin $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root
 	sudo chown -R root:wheel $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr
 	@# Build the package.
 	$(VBOX_PKGBUILD) \
-       	--root   $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin \
+       	--root   $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/local/bin \
 		--identifier org.virtualbox.pkg.virtualboxcli \
 		--version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
-		--install-location /usr/bin \
+		--install-location /usr/local/bin \
 		--ownership preserve \
 		$(if $(VBOX_MACOSX_INSTALLER_SIGN),--sign "$(VBOX_MACOSX_INSTALLER_SIGN)",) \
 		$@
diff --git a/src/VBox/Installer/darwin/VBoxKEXTs/postflight b/src/VBox/Installer/darwin/VBoxKEXTs/postflight
index 4cbfea1..d602688 100755
--- a/src/VBox/Installer/darwin/VBoxKEXTs/postflight
+++ b/src/VBox/Installer/darwin/VBoxKEXTs/postflight
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2007-2013 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/darwin/VirtualBox/VBoxAutostartDarwin.sh b/src/VBox/Installer/darwin/VirtualBox/VBoxAutostartDarwin.sh
index 16c1dfd..afceaec 100755
--- a/src/VBox/Installer/darwin/VirtualBox/VBoxAutostartDarwin.sh
+++ b/src/VBox/Installer/darwin/VirtualBox/VBoxAutostartDarwin.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/darwin/VirtualBox/preflight b/src/VBox/Installer/darwin/VirtualBox/preflight
index 9c26485..377d04a 100755
--- a/src/VBox/Installer/darwin/VirtualBox/preflight
+++ b/src/VBox/Installer/darwin/VirtualBox/preflight
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (C) 2007-2013 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist b/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist
index 61700a5..307ec24 100644
--- a/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist
+++ b/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 #
-# Copyright (C) 2008-2014 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/freebsd/Makefile.kmk b/src/VBox/Installer/freebsd/Makefile.kmk
index 8332b9b..ec5d1ce 100644
--- a/src/VBox/Installer/freebsd/Makefile.kmk
+++ b/src/VBox/Installer/freebsd/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -114,11 +114,11 @@ VBOX_FBSD_STRIP_BIN = \
 
 # Do not remove relocation information of these binaries
 VBOX_FBSD_STRIP_OBJ = \
-	VBoxDD2GC.gc \
+	VBoxDD2RC.rc \
 	VBoxDD2R0.r0 \
-	VBoxDDGC.gc \
+	VBoxDDRC.rc \
 	VBoxDDR0.r0 \
-	VMMGC.gc \
+	VMMRC.rc \
 	VMMR0.r0
 
 # Do not strip anything of these files
diff --git a/src/VBox/Installer/freebsd/pkg_plist b/src/VBox/Installer/freebsd/pkg_plist
index 09bd557..44b77b4 100644
--- a/src/VBox/Installer/freebsd/pkg_plist
+++ b/src/VBox/Installer/freebsd/pkg_plist
@@ -55,11 +55,11 @@ bin/VBoxHeadless
 bin/VBoxSDL
 bin/vboxwebsrv
 @mode 644
-lib/virtualbox/VBoxDDGC.gc
-lib/virtualbox/VBoxDD2GC.gc
+lib/virtualbox/VBoxDDRC.rc
+lib/virtualbox/VBoxDD2RC.rc
 lib/virtualbox/VBoxDDR0.r0
 lib/virtualbox/VBoxDD2R0.r0
-lib/virtualbox/VMMGC.gc
+lib/virtualbox/VMMRC.rc
 lib/virtualbox/VMMR0.r0
 lib/virtualbox/License-7.html
 lib/virtualbox/vboxdrv.tar.gz
diff --git a/src/VBox/Installer/freebsd/postdeinstall.sh b/src/VBox/Installer/freebsd/postdeinstall.sh
index 69ef190..94f351e 100755
--- a/src/VBox/Installer/freebsd/postdeinstall.sh
+++ b/src/VBox/Installer/freebsd/postdeinstall.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/freebsd/postinstall.sh b/src/VBox/Installer/freebsd/postinstall.sh
index 0a50901..e5b5bb2 100755
--- a/src/VBox/Installer/freebsd/postinstall.sh
+++ b/src/VBox/Installer/freebsd/postinstall.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/Makefile.include.footer b/src/VBox/Installer/linux/Makefile.include.footer
index bcc6a38..c2eb18a 100644
--- a/src/VBox/Installer/linux/Makefile.include.footer
+++ b/src/VBox/Installer/linux/Makefile.include.footer
@@ -3,7 +3,7 @@
 #
 # See Makefile.include.header for details of how to use this.
 #
-# Copyright (C) 2006-2011 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/Makefile.include.header b/src/VBox/Installer/linux/Makefile.include.header
index cadc090..a9bc168 100644
--- a/src/VBox/Installer/linux/Makefile.include.header
+++ b/src/VBox/Installer/linux/Makefile.include.header
@@ -3,7 +3,7 @@
 #
 # (For 2.6.x, the main file must be called 'Makefile'!)
 #
-# Copyright (C) 2006-2011 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/Makefile.kmk b/src/VBox/Installer/linux/Makefile.kmk
index cb87c99..c4f4e82 100644
--- a/src/VBox/Installer/linux/Makefile.kmk
+++ b/src/VBox/Installer/linux/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -184,9 +184,9 @@ VBOX_LNX_STRIP_OBJ = \
 
 ifdef VBOX_WITH_RAW_MODE
  VBOX_LNX_STRIP_OBJ += \
-	VBoxDD2GC.gc \
-	VBoxDDGC.gc \
-	VMMGC.gc
+	VBoxDD2RC.rc \
+	VBoxDDRC.rc \
+	VMMRC.rc
 endif
 
 # Do not strip anything of these files
diff --git a/src/VBox/Installer/linux/VBox.sh b/src/VBox/Installer/linux/VBox.sh
index 3f4b61c..85bcc9c 100755
--- a/src/VBox/Installer/linux/VBox.sh
+++ b/src/VBox/Installer/linux/VBox.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2016 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/VBoxCreateUSBNode.sh b/src/VBox/Installer/linux/VBoxCreateUSBNode.sh
index ebf6254..b4bf6bb 100755
--- a/src/VBox/Installer/linux/VBoxCreateUSBNode.sh
+++ b/src/VBox/Installer/linux/VBoxCreateUSBNode.sh
@@ -6,7 +6,7 @@
 #
 
 #
-# Copyright (C) 2010-2011 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/VBoxSysInfo.sh b/src/VBox/Installer/linux/VBoxSysInfo.sh
index cf1f326..45c5b83 100755
--- a/src/VBox/Installer/linux/VBoxSysInfo.sh
+++ b/src/VBox/Installer/linux/VBoxSysInfo.sh
@@ -5,7 +5,7 @@
 # Installer (Unix-like)
 # Information about the host system/Linux distribution
 
-# Copyright (C) 2006-2011 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/deffiles b/src/VBox/Installer/linux/deffiles
index a69278f..c37dbb7 100755
--- a/src/VBox/Installer/linux/deffiles
+++ b/src/VBox/Installer/linux/deffiles
@@ -62,12 +62,15 @@ DEFAULT_FILE_NAMES=" \
     VBoxVRDP \
     VBoxHeadless \
     VBoxHeadless.so \
-    VBoxDD2GC.gc \
+    VBoxDD2RC.rc \
     VBoxDD2R0.r0 \
-    VBoxDDGC.gc \
+    VBoxDD2GC.gc \
+    VBoxDDRC.rc \
     VBoxDDR0.r0 \
-    VMMGC.gc \
+    VBoxDDGC.gc \
+    VMMRC.rc \
     VMMR0.r0 \
+    VMMGC.gc \
     vboxefi.fv \
     vboxefi64.fv \
     vboxwebsrv \
diff --git a/src/VBox/Installer/linux/distributions_rpm b/src/VBox/Installer/linux/distributions_rpm
index 575d3fa..0b1852b 100644
--- a/src/VBox/Installer/linux/distributions_rpm
+++ b/src/VBox/Installer/linux/distributions_rpm
@@ -1,3 +1,5 @@
+openSUSE132     = OPENSUSE_13_2
+openSUSE131     = OPENSUSE_13_1
 openSUSE123     = OPENSUSE_12_3
 openSUSE114     = OPENSUSE_11_4
 openSUSE113     = OPENSUSE_11_3
diff --git a/src/VBox/Installer/linux/install.sh b/src/VBox/Installer/linux/install.sh
index ecf8a42..fd4ea7c 100755
--- a/src/VBox/Installer/linux/install.sh
+++ b/src/VBox/Installer/linux/install.sh
@@ -4,7 +4,7 @@
 # VirtualBox linux installation script
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/install_service/Makefile.kmk b/src/VBox/Installer/linux/install_service/Makefile.kmk
index 812a75e..2513a27 100644
--- a/src/VBox/Installer/linux/install_service/Makefile.kmk
+++ b/src/VBox/Installer/linux/install_service/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/install_service/generate_service_file.cpp b/src/VBox/Installer/linux/install_service/generate_service_file.cpp
index 75911ef..44d5ba5 100644
--- a/src/VBox/Installer/linux/install_service/generate_service_file.cpp
+++ b/src/VBox/Installer/linux/install_service/generate_service_file.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/install_service/init_template.sh b/src/VBox/Installer/linux/install_service/init_template.sh
index 9debff7..f4b0008 100755
--- a/src/VBox/Installer/linux/install_service/init_template.sh
+++ b/src/VBox/Installer/linux/install_service/init_template.sh
@@ -2,7 +2,7 @@
 #
 # VirtualBox generic init script.
 #
-# Copyright (C) 2012-2013 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/install_service/install_service.sh b/src/VBox/Installer/linux/install_service/install_service.sh
index 3064628..bfb88db 100755
--- a/src/VBox/Installer/linux/install_service/install_service.sh
+++ b/src/VBox/Installer/linux/install_service/install_service.sh
@@ -3,7 +3,7 @@
 #
 # Script to install services within a VirtualBox installation.
 #
-# Copyright (C) 2012-2013 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/installer-common.sh b/src/VBox/Installer/linux/installer-common.sh
index 5bb51b8..acccec2 100644
--- a/src/VBox/Installer/linux/installer-common.sh
+++ b/src/VBox/Installer/linux/installer-common.sh
@@ -2,7 +2,7 @@
 # VirtualBox installer shell routines
 #
 
-# Copyright (C) 2007-2011 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/routines.sh b/src/VBox/Installer/linux/routines.sh
index 8f720a9..ad82f43 100644
--- a/src/VBox/Installer/linux/routines.sh
+++ b/src/VBox/Installer/linux/routines.sh
@@ -2,7 +2,7 @@
 # VirtualBox installer shell routines
 #
 
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/rpm/LocalConfig.kmk b/src/VBox/Installer/linux/rpm/LocalConfig.kmk
index 0acfee8..f256565 100644
--- a/src/VBox/Installer/linux/rpm/LocalConfig.kmk
+++ b/src/VBox/Installer/linux/rpm/LocalConfig.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec b/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
index 966c4eb..61f5bb4 100644
--- a/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ b/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -75,7 +75,7 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/share/virtualbox
 install -m 755 -d $RPM_BUILD_ROOT/usr/share/mime/packages
 mv VBoxEFI32.fd $RPM_BUILD_ROOT/usr/lib/virtualbox || true
 mv VBoxEFI64.fd $RPM_BUILD_ROOT/usr/lib/virtualbox || true
-mv *.gc $RPM_BUILD_ROOT/usr/lib/virtualbox
+mv *.rc $RPM_BUILD_ROOT/usr/lib/virtualbox
 mv *.r0 $RPM_BUILD_ROOT/usr/lib/virtualbox
 mv *.rel $RPM_BUILD_ROOT/usr/lib/virtualbox || true
 mv VBoxNetDHCP $RPM_BUILD_ROOT/usr/lib/virtualbox
diff --git a/src/VBox/Installer/linux/rpm/rules b/src/VBox/Installer/linux/rpm/rules
index 4f9dc13..0c6f5a2 100755
--- a/src/VBox/Installer/linux/rpm/rules
+++ b/src/VBox/Installer/linux/rpm/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/run-inst.sh b/src/VBox/Installer/linux/run-inst.sh
index 3834ac6..1617941 100755
--- a/src/VBox/Installer/linux/run-inst.sh
+++ b/src/VBox/Installer/linux/run-inst.sh
@@ -5,7 +5,7 @@
 # for Linux Guest Additions
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/runasroot.sh b/src/VBox/Installer/linux/runasroot.sh
index 41125ce..f8f2681 100755
--- a/src/VBox/Installer/linux/runasroot.sh
+++ b/src/VBox/Installer/linux/runasroot.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2009-2011 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh b/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh
index fd76d1e..bec0f28 100755
--- a/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh
+++ b/src/VBox/Installer/linux/scripts/VBoxHeadlessXOrg.sh
@@ -3,7 +3,7 @@
 #
 # VirtualBox X Server auto-start service.
 #
-# Copyright (C) 2012-2013 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/scripts/check_module_dependencies.sh b/src/VBox/Installer/linux/scripts/check_module_dependencies.sh
index b3baf03..2b4c307 100755
--- a/src/VBox/Installer/linux/scripts/check_module_dependencies.sh
+++ b/src/VBox/Installer/linux/scripts/check_module_dependencies.sh
@@ -4,7 +4,7 @@
 # VirtualBox linux installation script
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/scripts/install.sh b/src/VBox/Installer/linux/scripts/install.sh
index f3e565e..38a784c 100755
--- a/src/VBox/Installer/linux/scripts/install.sh
+++ b/src/VBox/Installer/linux/scripts/install.sh
@@ -3,7 +3,7 @@
 #
 # Script to handle VirtualBox installation on a Linux host.
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/sh-utils.sh b/src/VBox/Installer/linux/sh-utils.sh
index dc9e0e8..7904b4c 100644
--- a/src/VBox/Installer/linux/sh-utils.sh
+++ b/src/VBox/Installer/linux/sh-utils.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2009-2011 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/testcase/Makefile.kmk b/src/VBox/Installer/linux/testcase/Makefile.kmk
index c1d8d8d..0c7cb41 100644
--- a/src/VBox/Installer/linux/testcase/Makefile.kmk
+++ b/src/VBox/Installer/linux/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/testcase/tstHeadlessXOrg.sh b/src/VBox/Installer/linux/testcase/tstHeadlessXOrg.sh
index ba00e85..3e865a0 100755
--- a/src/VBox/Installer/linux/testcase/tstHeadlessXOrg.sh
+++ b/src/VBox/Installer/linux/testcase/tstHeadlessXOrg.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2012-2013 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/testcase/tstInstallInit.sh b/src/VBox/Installer/linux/testcase/tstInstallInit.sh
index f90a512..ead707c 100755
--- a/src/VBox/Installer/linux/testcase/tstInstallInit.sh
+++ b/src/VBox/Installer/linux/testcase/tstInstallInit.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2012-2013 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/testcase/tstInstaller.sh b/src/VBox/Installer/linux/testcase/tstInstaller.sh
index 46518cc..c84f47d 100755
--- a/src/VBox/Installer/linux/testcase/tstInstaller.sh
+++ b/src/VBox/Installer/linux/testcase/tstInstaller.sh
@@ -4,7 +4,7 @@
 # VirtualBox linux installation script unit test
 
 #
-# Copyright (C) 2007-2011 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/testcase/tstInstallerLinux.sh b/src/VBox/Installer/linux/testcase/tstInstallerLinux.sh
index d2708ed..634ae59 100755
--- a/src/VBox/Installer/linux/testcase/tstInstallerLinux.sh
+++ b/src/VBox/Installer/linux/testcase/tstInstallerLinux.sh
@@ -4,7 +4,7 @@
 # VirtualBox linux installation script unit test
 
 #
-# Copyright (C) 2007-2011 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/uninstall.sh b/src/VBox/Installer/linux/uninstall.sh
index b3517cd..4f0bc08 100755
--- a/src/VBox/Installer/linux/uninstall.sh
+++ b/src/VBox/Installer/linux/uninstall.sh
@@ -4,7 +4,7 @@
 # VirtualBox linux uninstallation script
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/vboxautostart-service.sh b/src/VBox/Installer/linux/vboxautostart-service.sh
index 33462e1..6563d2d 100755
--- a/src/VBox/Installer/linux/vboxautostart-service.sh
+++ b/src/VBox/Installer/linux/vboxautostart-service.sh
@@ -2,7 +2,7 @@
 #
 # VirtualBox autostart service init script.
 #
-# Copyright (C) 2012 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/vboxballoonctrl-service.sh b/src/VBox/Installer/linux/vboxballoonctrl-service.sh
index e10b86a..708f386 100755
--- a/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+++ b/src/VBox/Installer/linux/vboxballoonctrl-service.sh
@@ -2,7 +2,7 @@
 #
 # VirtualBox watchdog daemon init script.
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/vboxdrv.sh.in b/src/VBox/Installer/linux/vboxdrv.sh.in
index 82bbdbf..0343d94 100755
--- a/src/VBox/Installer/linux/vboxdrv.sh.in
+++ b/src/VBox/Installer/linux/vboxdrv.sh.in
@@ -3,7 +3,7 @@
 # Linux kernel module init script
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/linux/vboxweb-service.sh b/src/VBox/Installer/linux/vboxweb-service.sh
index 4d6d4dd..dbca551 100755
--- a/src/VBox/Installer/linux/vboxweb-service.sh
+++ b/src/VBox/Installer/linux/vboxweb-service.sh
@@ -2,7 +2,7 @@
 #
 # VirtualBox web service API daemon init script.
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/Makefile.kmk b/src/VBox/Installer/solaris/Makefile.kmk
index 7ed3aba..42f556b 100644
--- a/src/VBox/Installer/solaris/Makefile.kmk
+++ b/src/VBox/Installer/solaris/Makefile.kmk
@@ -373,11 +373,11 @@ SOLARIS_STRIP_OBJS.MODE    := 0644
 SOLARIS_STRIP_OBJS.SRC     := $(PATH_STAGE_BIN)
 SOLARIS_STRIP_OBJS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)
 SOLARIS_STRIP_OBJS = \
-	VBoxDD2GC.gc \
+	VBoxDD2RC.rc \
 	VBoxDD2R0.r0 \
-	VBoxDDGC.gc \
+	VBoxDDRC.rc \
 	VBoxDDR0.r0 \
-	VMMGC.gc \
+	VMMRC.rc \
 	VMMR0.r0
 
 ## @def SOLARIS_NO_STRIP
diff --git a/src/VBox/Installer/solaris/VBoxISAExec.c b/src/VBox/Installer/solaris/VBoxISAExec.c
index ed33f19..754d038 100644
--- a/src/VBox/Installer/solaris/VBoxISAExec.c
+++ b/src/VBox/Installer/solaris/VBoxISAExec.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/VBoxZoneAccess.c b/src/VBox/Installer/solaris/VBoxZoneAccess.c
index 5ec8c30..55ae684 100644
--- a/src/VBox/Installer/solaris/VBoxZoneAccess.c
+++ b/src/VBox/Installer/solaris/VBoxZoneAccess.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/checkinstall.sh b/src/VBox/Installer/solaris/checkinstall.sh
index c148500..10fd2bd 100755
--- a/src/VBox/Installer/solaris/checkinstall.sh
+++ b/src/VBox/Installer/solaris/checkinstall.sh
@@ -50,7 +50,7 @@ checkdep_svr4()
 checkdep_ips()
 {
     if test -z "$1"; then
-        errorprint "Missing argument to checkdep_svr4"
+        errorprint "Missing argument to checkdep_ips"
         return 1
     fi
     # using "list" without "-a" only lists installed pkgs which is what we need
@@ -60,7 +60,25 @@ checkdep_ips()
     fi
     PKG_MISSING_IPS="$PKG_MISSING_IPS $1"
     return 1
+}
 
+checkdep_ips_either()
+{
+    if test -z "$1" || test -z "$2"; then
+        errorprint "Missing argument to checkdep_ips_either"
+        return 1
+    fi
+    # using "list" without "-a" only lists installed pkgs which is what we need
+    $BIN_PKG $BASEDIR_OPT list "$1" >/dev/null 2>&1
+    if test $? -eq 0; then
+        return 0
+    fi
+    $BIN_PKG $BASEDIR_OPT list "$2" >/dev/null 2>&1
+    if test $? -eq 0; then
+        return 0
+    fi
+    PKG_MISSING_IPS="$PKG_MISSING_IPS $1 or $2"
+    return 1
 }
 
 disable_service()
@@ -116,7 +134,7 @@ infoprint "Checking package dependencies..."
 
 if test -x "$BIN_PKG"; then
     checkdep_ips "runtime/python-26"
-    checkdep_ips "system/library/iconv/utf-8"
+    checkdep_ips_either "system/library/iconv/utf-8" "system/library/iconv/iconv-core"
 else
     PKG_MISSING_IPS="runtime/python-26 system/library/iconv/utf-8"
 fi
@@ -212,7 +230,7 @@ fi
 for i in 1 2 3 4 5 6 7 8 9 10; do
     $BIN_SVCS -H "svc:/application/virtualbox/autostart"   >/dev/null 2>&1 ||
     $BIN_SVCS -H "svc:/application/virtualbox/webservice"  >/dev/null 2>&1 ||
-    $BIN_SVCS -H "svc:/application/virtualbox/zoneaccess"  >/dev/null 2>&1 || 
+    $BIN_SVCS -H "svc:/application/virtualbox/zoneaccess"  >/dev/null 2>&1 ||
     $BIN_SVCS -H "svc:/application/virtualbox/balloonctrl" >/dev/null 2>&1 || break
     if test "${i}" = "1"; then
         printf "Waiting for services from previous installation to be removed."
diff --git a/src/VBox/Installer/solaris/makepackage.sh b/src/VBox/Installer/solaris/makepackage.sh
index c46c6a1..ac24f22 100755
--- a/src/VBox/Installer/solaris/makepackage.sh
+++ b/src/VBox/Installer/solaris/makepackage.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/pkginstall.sh b/src/VBox/Installer/solaris/pkginstall.sh
index 79b0d7c..6a84faa 100755
--- a/src/VBox/Installer/solaris/pkginstall.sh
+++ b/src/VBox/Installer/solaris/pkginstall.sh
@@ -9,7 +9,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/postinstall.sh b/src/VBox/Installer/solaris/postinstall.sh
index 6264ac6..74d7f7b 100755
--- a/src/VBox/Installer/solaris/postinstall.sh
+++ b/src/VBox/Installer/solaris/postinstall.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/preremove.sh b/src/VBox/Installer/solaris/preremove.sh
index 388980f..55857d5 100755
--- a/src/VBox/Installer/solaris/preremove.sh
+++ b/src/VBox/Installer/solaris/preremove.sh
@@ -7,7 +7,7 @@
 #
 # VirtualBox preremove script for Solaris.
 #
-# Copyright (C) 2007-2013 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/smf-vboxautostart.sh b/src/VBox/Installer/solaris/smf-vboxautostart.sh
index 6e0332b..757cdbd 100755
--- a/src/VBox/Installer/solaris/smf-vboxautostart.sh
+++ b/src/VBox/Installer/solaris/smf-vboxautostart.sh
@@ -1,7 +1,7 @@
 #!/sbin/sh
 # $Id: smf-vboxautostart.sh $
 
-# Copyright (C) 2012-2014 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh b/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh
index 9ad8a81..8605d5c 100755
--- a/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh
+++ b/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh
@@ -1,7 +1,7 @@
 #!/sbin/sh
 # $Id: smf-vboxballoonctrl.sh $
 
-# Copyright (C) 2008-2014 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/smf-vboxwebsrv.sh b/src/VBox/Installer/solaris/smf-vboxwebsrv.sh
index 2219d56..93e1983 100755
--- a/src/VBox/Installer/solaris/smf-vboxwebsrv.sh
+++ b/src/VBox/Installer/solaris/smf-vboxwebsrv.sh
@@ -1,7 +1,7 @@
 #!/sbin/sh
 # $Id: smf-vboxwebsrv.sh $
 
-# Copyright (C) 2008-2014 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/vboxconfig.sh b/src/VBox/Installer/solaris/vboxconfig.sh
index 3c93f05..3f297a9 100755
--- a/src/VBox/Installer/solaris/vboxconfig.sh
+++ b/src/VBox/Installer/solaris/vboxconfig.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2009-2013 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/virtualbox-autostart.xml b/src/VBox/Installer/solaris/virtualbox-autostart.xml
index e523b9f..f90502d 100644
--- a/src/VBox/Installer/solaris/virtualbox-autostart.xml
+++ b/src/VBox/Installer/solaris/virtualbox-autostart.xml
@@ -4,7 +4,7 @@
 # Solaris SMF service manifest for VirtualBox autostart service.
 # $Id$
 
-    Copyright (C) 2012 Oracle Corporation
+    Copyright (C) 2012-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/virtualbox-balloonctrl.xml b/src/VBox/Installer/solaris/virtualbox-balloonctrl.xml
index 5150f05..6919c9a 100644
--- a/src/VBox/Installer/solaris/virtualbox-balloonctrl.xml
+++ b/src/VBox/Installer/solaris/virtualbox-balloonctrl.xml
@@ -4,7 +4,7 @@
 # Solaris SMF service manifest for VirtualBox balloon control service.
 # $Id: virtualbox-balloonctrl.xml $
 
-    Copyright (C) 2008-2013 Oracle Corporation
+    Copyright (C) 2008-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/virtualbox-webservice.xml b/src/VBox/Installer/solaris/virtualbox-webservice.xml
index 50af4f9..1b88209 100644
--- a/src/VBox/Installer/solaris/virtualbox-webservice.xml
+++ b/src/VBox/Installer/solaris/virtualbox-webservice.xml
@@ -4,7 +4,7 @@
 # Solaris SMF service manifest for VirtualBox webservice server.
 # $Id$
 
-    Copyright (C) 2008-2012 Oracle Corporation
+    Copyright (C) 2008-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/solaris/virtualbox-zoneaccess.xml b/src/VBox/Installer/solaris/virtualbox-zoneaccess.xml
index 9ca6122..c6d1410 100644
--- a/src/VBox/Installer/solaris/virtualbox-zoneaccess.xml
+++ b/src/VBox/Installer/solaris/virtualbox-zoneaccess.xml
@@ -3,7 +3,7 @@
 #
 # Solaris SMF service manifest for Solaris Zone Access.
 #
-    Copyright (C) 2008-2012 Oracle Corporation
+    Copyright (C) 2008-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/InstallHelper/Makefile.kmk b/src/VBox/Installer/win/InstallHelper/Makefile.kmk
index 43564e3..caed5c6 100644
--- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk
+++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp b/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp
index 463cd9e..db6336a 100644
--- a/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp
+++ b/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/InstallHelper/VBoxCommon.h b/src/VBox/Installer/win/InstallHelper/VBoxCommon.h
index f1b5202..cd3b004 100644
--- a/src/VBox/Installer/win/InstallHelper/VBoxCommon.h
+++ b/src/VBox/Installer/win/InstallHelper/VBoxCommon.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp b/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp
index aa40883..70a1dc6 100644
--- a/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp
+++ b/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -308,7 +308,7 @@ static LONG installBrandingValue(MSIHANDLE hModule,
         WCHAR wszKey[_MAX_PATH];
 
         if (wcsicmp(L"General", pwszSection) != 0)
-            swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%s\\VirtualBox\\Branding\\", VBOX_VENDOR_SHORT, pwszSection);
+            swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%s\\VirtualBox\\Branding\\%s", VBOX_VENDOR_SHORT, pwszSection);
         else
             swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%s\\VirtualBox\\Branding", VBOX_VENDOR_SHORT);
 
@@ -337,8 +337,8 @@ UINT CopyDir(MSIHANDLE hModule, const WCHAR *pwszDestDir, const WCHAR *pwszSourc
     WCHAR wszDest[_MAX_PATH + 1];
     WCHAR wszSource[_MAX_PATH + 1];
 
-    swprintf_s(wszDest, RT_ELEMENTS(wszDest), L"%s%c", pwszDestDir, '\0');
-    swprintf_s(wszSource, RT_ELEMENTS(wszSource), L"%s%c", pwszSourceDir, '\0');
+    swprintf_s(wszDest, RT_ELEMENTS(wszDest), L"%s%c", pwszDestDir, L'\0');
+    swprintf_s(wszSource, RT_ELEMENTS(wszSource), L"%s%c", pwszSourceDir, L'\0');
 
     SHFILEOPSTRUCTW s = {0};
     s.hwnd = NULL;
@@ -367,7 +367,7 @@ UINT RemoveDir(MSIHANDLE hModule, const WCHAR *pwszDestDir)
     UINT rc;
     WCHAR wszDest[_MAX_PATH + 1];
 
-    swprintf_s(wszDest, RT_ELEMENTS(wszDest), L"%s%c", pwszDestDir, '\0');
+    swprintf_s(wszDest, RT_ELEMENTS(wszDest), L"%s%c", pwszDestDir, L'\0');
 
     SHFILEOPSTRUCTW s = {0};
     s.hwnd = NULL;
@@ -396,8 +396,8 @@ UINT RenameDir(MSIHANDLE hModule, const WCHAR *pwszDestDir, const WCHAR *pwszSou
     WCHAR wszDest[_MAX_PATH + 1];
     WCHAR wszSource[_MAX_PATH + 1];
 
-    swprintf_s(wszDest, RT_ELEMENTS(wszDest), L"%s%c", pwszDestDir, '\0');
-    swprintf_s(wszSource, RT_ELEMENTS(wszSource), L"%s%c", pwszSourceDir, '\0');
+    swprintf_s(wszDest, RT_ELEMENTS(wszDest), L"%s%c", pwszDestDir, L'\0');
+    swprintf_s(wszSource, RT_ELEMENTS(wszSource), L"%s%c", pwszSourceDir, L'\0');
 
     SHFILEOPSTRUCTW s = {0};
     s.hwnd = NULL;
diff --git a/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.def b/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.def
index 620acd8..2c36c3f 100644
--- a/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.def
+++ b/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.def
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2008-2012 Oracle Corporation
+; Copyright (C) 2008-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
@@ -24,8 +24,8 @@ EXPORTS
     UninstallBranding
     InstallNetFlt
     UninstallNetFlt
-	UninstallNetAdp
-	InstallNetLwf
+        UninstallNetAdp
+        InstallNetLwf
     UninstallNetLwf
     UninstallTAPInstances
     CreateHostOnlyInterface
@@ -35,4 +35,3 @@ EXPORTS
     Ndis6CreateHostOnlyInterface
     Ndis6UpdateHostOnlyInterfaces
 
-
diff --git a/src/VBox/Installer/win/Makefile.kmk b/src/VBox/Installer/win/Makefile.kmk
index c1f7acb..98733c3 100644
--- a/src/VBox/Installer/win/Makefile.kmk
+++ b/src/VBox/Installer/win/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -57,7 +57,7 @@ endif
 #
 # List of merge modules to use.
 #
-VBOX_INSTALLER_MERGE_MODULES = App USB NetAdp NetFlt Python
+VBOX_INSTALLER_MERGE_MODULES = App USB NetAdp NetFlt NetAdp6 NetLwf Python
 ifeq ($(KBUILD_TARGET_ARCH),amd64)
  VBOX_INSTALLER_MERGE_MODULES += COM32On64
 endif
diff --git a/src/VBox/Installer/win/NLS/de_DE.wxl b/src/VBox/Installer/win/NLS/de_DE.wxl
index a214f04..909e535 100644
--- a/src/VBox/Installer/win/NLS/de_DE.wxl
+++ b/src/VBox/Installer/win/NLS/de_DE.wxl
@@ -4,7 +4,7 @@
     <!--
             Language Definition Include for VirtualBox WiX script.
 
-            Copyright (C) 2011-2014 Oracle Corporation
+            Copyright (C) 2011-2015 Oracle Corporation
 
             This file is part of VirtualBox Open Source Edition (OSE), as
             available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/NLS/en_US.wxl b/src/VBox/Installer/win/NLS/en_US.wxl
index 1c84a74..a1cfd86 100644
--- a/src/VBox/Installer/win/NLS/en_US.wxl
+++ b/src/VBox/Installer/win/NLS/en_US.wxl
@@ -4,7 +4,7 @@
     <!--
             Language Definition Include for VirtualBox WiX script.
 
-            Copyright (C) 2011-2014 Oracle Corporation
+            Copyright (C) 2011-2015 Oracle Corporation
 
             This file is part of VirtualBox Open Source Edition (OSE), as
             available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/NLS/fa_IR.wxl b/src/VBox/Installer/win/NLS/fa_IR.wxl
index 54cc15b..ca8b2cc 100644
--- a/src/VBox/Installer/win/NLS/fa_IR.wxl
+++ b/src/VBox/Installer/win/NLS/fa_IR.wxl
@@ -4,7 +4,7 @@
     <!--
             Language Definition Include for VirtualBox WiX script.
 
-            Copyright (C) 2011-2014 Oracle Corporation
+            Copyright (C) 2011-2015 Oracle Corporation
 
             This file is part of VirtualBox Open Source Edition (OSE), as
             available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/NLS/fr_FR.wxl b/src/VBox/Installer/win/NLS/fr_FR.wxl
index 11a7f02..011564c 100644
--- a/src/VBox/Installer/win/NLS/fr_FR.wxl
+++ b/src/VBox/Installer/win/NLS/fr_FR.wxl
@@ -4,7 +4,7 @@
     <!--
             Language Definition Include for VirtualBox WiX script.
 
-            Copyright (C) 2011-2014 Oracle Corporation
+            Copyright (C) 2011-2015 Oracle Corporation
 
             This file is part of VirtualBox Open Source Edition (OSE), as
             available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/NLS/it_IT.wxl b/src/VBox/Installer/win/NLS/it_IT.wxl
index 8519be0..79b72aa 100644
--- a/src/VBox/Installer/win/NLS/it_IT.wxl
+++ b/src/VBox/Installer/win/NLS/it_IT.wxl
@@ -4,7 +4,7 @@
     <!--
             Language Definition Include for VirtualBox WiX script.
 
-            Copyright (C) 2011-2014 Oracle Corporation
+            Copyright (C) 2011-2015 Oracle Corporation
 
             This file is part of VirtualBox Open Source Edition (OSE), as
             available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/NLS/tr_TR.wxl b/src/VBox/Installer/win/NLS/tr_TR.wxl
index cea17a2..7cfd0d0 100644
--- a/src/VBox/Installer/win/NLS/tr_TR.wxl
+++ b/src/VBox/Installer/win/NLS/tr_TR.wxl
@@ -4,7 +4,7 @@
     <!--
             Language Definition Include for VirtualBox WiX script.
 
-            Copyright (C) 2011-2014 Oracle Corporation
+            Copyright (C) 2011-2015 Oracle Corporation
 
             This file is part of VirtualBox Open Source Edition (OSE), as
             available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/NLS/zh_TW.wxl b/src/VBox/Installer/win/NLS/zh_TW.wxl
index 606ef14..81b4619 100644
--- a/src/VBox/Installer/win/NLS/zh_TW.wxl
+++ b/src/VBox/Installer/win/NLS/zh_TW.wxl
@@ -4,7 +4,7 @@
     <!--
             Language Definition Include for VirtualBox WiX script.
 
-            Copyright (C) 2011-2014 Oracle Corporation
+            Copyright (C) 2011-2015 Oracle Corporation
 
             This file is part of VirtualBox Open Source Edition (OSE), as
             available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Properties.wxi b/src/VBox/Installer/win/Properties.wxi
index 60ea881..1243098 100644
--- a/src/VBox/Installer/win/Properties.wxi
+++ b/src/VBox/Installer/win/Properties.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2014 Oracle Corporation
+    Copyright (C) 2014-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Resources/Makefile.kmk b/src/VBox/Installer/win/Resources/Makefile.kmk
index fab83a4..9266623 100644
--- a/src/VBox/Installer/win/Resources/Makefile.kmk
+++ b/src/VBox/Installer/win/Resources/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Resources/VBoxRes.rc b/src/VBox/Installer/win/Resources/VBoxRes.rc
index a92e6c6..d275ecf 100644
--- a/src/VBox/Installer/win/Resources/VBoxRes.rc
+++ b/src/VBox/Installer/win/Resources/VBoxRes.rc
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Resources/dummy.cpp b/src/VBox/Installer/win/Resources/dummy.cpp
index 5a40e36..0b5233e 100644
--- a/src/VBox/Installer/win/Resources/dummy.cpp
+++ b/src/VBox/Installer/win/Resources/dummy.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Resources/resource.h b/src/VBox/Installer/win/Resources/resource.h
index ddc2615..2c1babc 100644
--- a/src/VBox/Installer/win/Resources/resource.h
+++ b/src/VBox/Installer/win/Resources/resource.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk
index 5117edd..ade10e5 100644
--- a/src/VBox/Installer/win/Stub/Makefile.kmk
+++ b/src/VBox/Installer/win/Stub/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Stub/VBoxStub.cpp b/src/VBox/Installer/win/Stub/VBoxStub.cpp
index 7540f50..98d06b0 100644
--- a/src/VBox/Installer/win/Stub/VBoxStub.cpp
+++ b/src/VBox/Installer/win/Stub/VBoxStub.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Stub/VBoxStub.h b/src/VBox/Installer/win/Stub/VBoxStub.h
index e50bca0..ddc3fdb 100644
--- a/src/VBox/Installer/win/Stub/VBoxStub.h
+++ b/src/VBox/Installer/win/Stub/VBoxStub.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Stub/VBoxStub.rc b/src/VBox/Installer/win/Stub/VBoxStub.rc
index 97f78dd..9baba72 100644
--- a/src/VBox/Installer/win/Stub/VBoxStub.rc
+++ b/src/VBox/Installer/win/Stub/VBoxStub.rc
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Stub/VBoxStubCertUtil.cpp b/src/VBox/Installer/win/Stub/VBoxStubCertUtil.cpp
index cfa3b5e..83843e7 100644
--- a/src/VBox/Installer/win/Stub/VBoxStubCertUtil.cpp
+++ b/src/VBox/Installer/win/Stub/VBoxStubCertUtil.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Stub/VBoxStubCertUtil.h b/src/VBox/Installer/win/Stub/VBoxStubCertUtil.h
index 59bf084..6bed4ab 100644
--- a/src/VBox/Installer/win/Stub/VBoxStubCertUtil.h
+++ b/src/VBox/Installer/win/Stub/VBoxStubCertUtil.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/Stub/resource.h b/src/VBox/Installer/win/Stub/resource.h
index fbc557a..98e9f5a 100644
--- a/src/VBox/Installer/win/Stub/resource.h
+++ b/src/VBox/Installer/win/Stub/resource.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/StubBld/Makefile.kmk b/src/VBox/Installer/win/StubBld/Makefile.kmk
index 9e4622b..b792172 100644
--- a/src/VBox/Installer/win/StubBld/Makefile.kmk
+++ b/src/VBox/Installer/win/StubBld/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp b/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp
index b0ad0cb..9d3842c 100644
--- a/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp
+++ b/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/StubBld/VBoxStubBld.h b/src/VBox/Installer/win/StubBld/VBoxStubBld.h
index 49919f9..1ae7137 100644
--- a/src/VBox/Installer/win/StubBld/VBoxStubBld.h
+++ b/src/VBox/Installer/win/StubBld/VBoxStubBld.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/UserInterface.wxi b/src/VBox/Installer/win/UserInterface.wxi
index 1905851..b9aa7aa 100644
--- a/src/VBox/Installer/win/UserInterface.wxi
+++ b/src/VBox/Installer/win/UserInterface.wxi
@@ -2,7 +2,7 @@
 <!--
     User interface include for VirtualBox WiX script.
 
-    Copyright (C) 2006-2012 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeApp.wxi b/src/VBox/Installer/win/VBoxMergeApp.wxi
index 76df976..43bfbe5 100644
--- a/src/VBox/Installer/win/VBoxMergeApp.wxi
+++ b/src/VBox/Installer/win/VBoxMergeApp.wxi
@@ -1,7 +1,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
@@ -241,12 +241,12 @@
         <File Id="file_VBoxRes.dll" Name="VBoxRes.dll"
               Source="$(env.PATH_OUT)\bin\VBoxRes.dll" />
 
-        <File Id="file_VMMGC.gc" Name="VMMGC.gc"
-              Source="$(env.PATH_OUT)\bin\VMMGC.gc" />
-        <File Id="file_VBoxDDGC.gc" Name="VBoxDDGC.gc"
-              Source="$(env.PATH_OUT)\bin\VBoxDDGC.gc" />
-        <File Id="file_VBoxDD2GC.gc" Name="VBoxDD2GC.gc"
-              Source="$(env.PATH_OUT)\bin\VBoxDD2GC.gc" />
+        <File Id="file_VMMRC.rc" Name="VMMRC.rc"
+              Source="$(env.PATH_OUT)\bin\VMMRC.rc" />
+        <File Id="file_VBoxDDRC.rc" Name="VBoxDDRC.rc"
+              Source="$(env.PATH_OUT)\bin\VBoxDDRC.rc" />
+        <File Id="file_VBoxDD2RC.rc" Name="VBoxDD2RC.rc"
+              Source="$(env.PATH_OUT)\bin\VBoxDD2RC.rc" />
 
         <File Id="file_VMMR0.r0" Name="VMMR0.r0"
               Source="$(env.PATH_OUT)\bin\VMMR0.r0" />
diff --git a/src/VBox/Installer/win/VBoxMergeApp.wxs b/src/VBox/Installer/win/VBoxMergeApp.wxs
index d6bd3cc..293e667 100644
--- a/src/VBox/Installer/win/VBoxMergeApp.wxs
+++ b/src/VBox/Installer/win/VBoxMergeApp.wxs
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeAppCA.wxi b/src/VBox/Installer/win/VBoxMergeAppCA.wxi
index 4a620ea..ca18e64 100644
--- a/src/VBox/Installer/win/VBoxMergeAppCA.wxi
+++ b/src/VBox/Installer/win/VBoxMergeAppCA.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2014 Oracle Corporation
+    Copyright (C) 2014-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeAppSeq.wxi b/src/VBox/Installer/win/VBoxMergeAppSeq.wxi
index aafb38f..afa7e85 100644
--- a/src/VBox/Installer/win/VBoxMergeAppSeq.wxi
+++ b/src/VBox/Installer/win/VBoxMergeAppSeq.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi b/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi
index 8edf6fe..d2c68cf 100644
--- a/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi
+++ b/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs b/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs
index 21848c7..66fba93 100644
--- a/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs
+++ b/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeCOM32On64CA.wxi b/src/VBox/Installer/win/VBoxMergeCOM32On64CA.wxi
index 4a620ea..ca18e64 100644
--- a/src/VBox/Installer/win/VBoxMergeCOM32On64CA.wxi
+++ b/src/VBox/Installer/win/VBoxMergeCOM32On64CA.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2014 Oracle Corporation
+    Copyright (C) 2014-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeCOM32On64Seq.wxi b/src/VBox/Installer/win/VBoxMergeCOM32On64Seq.wxi
index 4a620ea..ca18e64 100644
--- a/src/VBox/Installer/win/VBoxMergeCOM32On64Seq.wxi
+++ b/src/VBox/Installer/win/VBoxMergeCOM32On64Seq.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2014 Oracle Corporation
+    Copyright (C) 2014-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetAdp.wxi b/src/VBox/Installer/win/VBoxMergeNetAdp.wxi
index d167451..0e240ec 100644
--- a/src/VBox/Installer/win/VBoxMergeNetAdp.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetAdp.wxi
@@ -1,7 +1,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetAdp.wxs b/src/VBox/Installer/win/VBoxMergeNetAdp.wxs
index 95e1183..b3f4b44 100644
--- a/src/VBox/Installer/win/VBoxMergeNetAdp.wxs
+++ b/src/VBox/Installer/win/VBoxMergeNetAdp.wxs
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetAdp6.wxi b/src/VBox/Installer/win/VBoxMergeNetAdp6.wxi
index df48828..3b34c51 100644
--- a/src/VBox/Installer/win/VBoxMergeNetAdp6.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetAdp6.wxi
@@ -1,7 +1,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs b/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs
index 81ee41f..5a9dada 100644
--- a/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs
+++ b/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetAdp6CA.wxi b/src/VBox/Installer/win/VBoxMergeNetAdp6CA.wxi
index c278c80..29c39e8 100644
--- a/src/VBox/Installer/win/VBoxMergeNetAdp6CA.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetAdp6CA.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetAdp6Seq.wxi b/src/VBox/Installer/win/VBoxMergeNetAdp6Seq.wxi
index bbb0752..648da63 100644
--- a/src/VBox/Installer/win/VBoxMergeNetAdp6Seq.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetAdp6Seq.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetAdpCA.wxi b/src/VBox/Installer/win/VBoxMergeNetAdpCA.wxi
index 249227a..69d0f06 100644
--- a/src/VBox/Installer/win/VBoxMergeNetAdpCA.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetAdpCA.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi b/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi
index 6226fd4..a20803a 100644
--- a/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetAdpSeq.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetFlt.wxi b/src/VBox/Installer/win/VBoxMergeNetFlt.wxi
index b8a8f30..2e5c692 100644
--- a/src/VBox/Installer/win/VBoxMergeNetFlt.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetFlt.wxi
@@ -1,7 +1,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetFlt.wxs b/src/VBox/Installer/win/VBoxMergeNetFlt.wxs
index 27b4d5e..0df6304 100644
--- a/src/VBox/Installer/win/VBoxMergeNetFlt.wxs
+++ b/src/VBox/Installer/win/VBoxMergeNetFlt.wxs
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetFltCA.wxi b/src/VBox/Installer/win/VBoxMergeNetFltCA.wxi
index f383c1d..641743d 100644
--- a/src/VBox/Installer/win/VBoxMergeNetFltCA.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetFltCA.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi b/src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi
index cf5cf1e..6f0d799 100644
--- a/src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetFltSeq.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetLwf.wxi b/src/VBox/Installer/win/VBoxMergeNetLwf.wxi
index 5cb5793..1b6b048 100644
--- a/src/VBox/Installer/win/VBoxMergeNetLwf.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetLwf.wxi
@@ -1,7 +1,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetLwf.wxs b/src/VBox/Installer/win/VBoxMergeNetLwf.wxs
index 927b175..3096c44 100644
--- a/src/VBox/Installer/win/VBoxMergeNetLwf.wxs
+++ b/src/VBox/Installer/win/VBoxMergeNetLwf.wxs
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetLwfCA.wxi b/src/VBox/Installer/win/VBoxMergeNetLwfCA.wxi
index c0babbd..8c008a2 100644
--- a/src/VBox/Installer/win/VBoxMergeNetLwfCA.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetLwfCA.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeNetLwfSeq.wxi b/src/VBox/Installer/win/VBoxMergeNetLwfSeq.wxi
index 8d8f8ef..4fbd3d4 100644
--- a/src/VBox/Installer/win/VBoxMergeNetLwfSeq.wxi
+++ b/src/VBox/Installer/win/VBoxMergeNetLwfSeq.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergePython.wxi b/src/VBox/Installer/win/VBoxMergePython.wxi
index 2e59bfd..7ac5920 100644
--- a/src/VBox/Installer/win/VBoxMergePython.wxi
+++ b/src/VBox/Installer/win/VBoxMergePython.wxi
@@ -1,7 +1,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergePython.wxs b/src/VBox/Installer/win/VBoxMergePython.wxs
index bb2e9a8..960b7ed 100644
--- a/src/VBox/Installer/win/VBoxMergePython.wxs
+++ b/src/VBox/Installer/win/VBoxMergePython.wxs
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergePythonCA.wxi b/src/VBox/Installer/win/VBoxMergePythonCA.wxi
index 23130d2..16ded0a 100644
--- a/src/VBox/Installer/win/VBoxMergePythonCA.wxi
+++ b/src/VBox/Installer/win/VBoxMergePythonCA.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergePythonSeq.wxi b/src/VBox/Installer/win/VBoxMergePythonSeq.wxi
index 0abf5de..a1737eb 100644
--- a/src/VBox/Installer/win/VBoxMergePythonSeq.wxi
+++ b/src/VBox/Installer/win/VBoxMergePythonSeq.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeUSB.wxi b/src/VBox/Installer/win/VBoxMergeUSB.wxi
index 2ed2386..7cb526c 100644
--- a/src/VBox/Installer/win/VBoxMergeUSB.wxi
+++ b/src/VBox/Installer/win/VBoxMergeUSB.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeUSB.wxs b/src/VBox/Installer/win/VBoxMergeUSB.wxs
index 1f9a3bc..c60de3c 100644
--- a/src/VBox/Installer/win/VBoxMergeUSB.wxs
+++ b/src/VBox/Installer/win/VBoxMergeUSB.wxs
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeUSBCA.wxi b/src/VBox/Installer/win/VBoxMergeUSBCA.wxi
index 4a620ea..ca18e64 100644
--- a/src/VBox/Installer/win/VBoxMergeUSBCA.wxi
+++ b/src/VBox/Installer/win/VBoxMergeUSBCA.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2014 Oracle Corporation
+    Copyright (C) 2014-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VBoxMergeUSBSeq.wxi b/src/VBox/Installer/win/VBoxMergeUSBSeq.wxi
index 4a620ea..ca18e64 100644
--- a/src/VBox/Installer/win/VBoxMergeUSBSeq.wxi
+++ b/src/VBox/Installer/win/VBoxMergeUSBSeq.wxi
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2014 Oracle Corporation
+    Copyright (C) 2014-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Installer/win/VirtualBox.wxs b/src/VBox/Installer/win/VirtualBox.wxs
index 59645e7..f9c191e 100644
--- a/src/VBox/Installer/win/VirtualBox.wxs
+++ b/src/VBox/Installer/win/VirtualBox.wxs
@@ -2,7 +2,7 @@
 <!--
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2014 Oracle Corporation
+    Copyright (C) 2014-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
@@ -425,6 +425,7 @@
                      Absent="allow" AllowAdvertise="no" >
     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
                 <MergeRef Id="msm_VBoxNetworkFlt" />
+                <MergeRef Id="msm_VBoxNetworkLwf" />
     <?else ?>
                 <ComponentRef Id="cp_NetFltDriver" />
                 <ComponentRef Id="cp_NetLwfDriver" />
@@ -436,6 +437,7 @@
                      Absent="allow" AllowAdvertise="no" >
     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
                 <MergeRef Id="msm_VBoxNetworkAdp" />
+                <MergeRef Id="msm_VBoxNetworkAdp6" />
     <?else ?>
                 <ComponentRef Id="cp_NetAdpDriver" />
                 <ComponentRef Id="cp_NetAdp6Driver" />
diff --git a/src/VBox/Installer/win/VirtualBox_TypeLib.xsl b/src/VBox/Installer/win/VirtualBox_TypeLib.xsl
index 15fd770..d0c803b 100644
--- a/src/VBox/Installer/win/VirtualBox_TypeLib.xsl
+++ b/src/VBox/Installer/win/VirtualBox_TypeLib.xsl
@@ -5,7 +5,7 @@
  *  type library definitions for VirtualBox COM components
  *  from the generic interface definition expressed in XML.
 
-    Copyright (C) 2007-2012 Oracle Corporation
+    Copyright (C) 2007-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Main/Config.kmk b/src/VBox/Main/Config.kmk
index aa773e3..f6706d5 100644
--- a/src/VBox/Main/Config.kmk
+++ b/src/VBox/Main/Config.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Main/cbinding/Makefile.kmk b/src/VBox/Main/cbinding/Makefile.kmk
index 7f7f278..e384045 100644
--- a/src/VBox/Main/cbinding/Makefile.kmk
+++ b/src/VBox/Main/cbinding/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2014 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Main/cbinding/capiidl.xsl b/src/VBox/Main/cbinding/capiidl.xsl
index 720619a..3e11bcf 100644
--- a/src/VBox/Main/cbinding/capiidl.xsl
+++ b/src/VBox/Main/cbinding/capiidl.xsl
@@ -1771,6 +1771,7 @@ typedef PCVBOXCAPI (*PFNVBOXGETXPCOMCFUNCTIONS)(unsigned uVersion);
 <xsl:template match="interface" mode="vtab_flat">
   <xsl:param name="iface"/>
 
+  <xsl:variable name="name" select="@name"/>
   <xsl:variable name="extends" select="@extends"/>
   <xsl:choose>
     <xsl:when test="$extends='$unknown'">
@@ -1835,10 +1836,37 @@ typedef PCVBOXCAPI (*PFNVBOXGETXPCOMCFUNCTIONS)(unsigned uVersion);
   <xsl:apply-templates select="attribute | if/attribute">
     <xsl:with-param name="iface" select="$iface"/>
   </xsl:apply-templates>
+  <xsl:variable name="reservedAttributes" select="@reservedAttributes"/>
+  <xsl:if test="$reservedAttributes > 0">
+    <!-- tricky way to do a "for" loop without recursion -->
+    <xsl:for-each select="(//*)[position() <= $reservedAttributes]">
+      <xsl:text>    nsresult (*GetInternalAndReservedAttribute</xsl:text>
+      <xsl:value-of select="concat(position(), $name)"/>
+      <xsl:text>)(</xsl:text>
+      <xsl:value-of select="$iface"/>
+      <xsl:text> *pThis, PRUint32 *reserved);&#x0A;</xsl:text>
+      <xsl:text>    nsresult (*SetInternalAndReservedAttribute</xsl:text>
+      <xsl:value-of select="concat(position(), $name)"/>
+      <xsl:text>)(</xsl:text>
+      <xsl:value-of select="$iface"/>
+      <xsl:text> *pThis, PRUint32 reserved);&#x0A;&#x0A;</xsl:text>
+    </xsl:for-each>
+  </xsl:if>
   <!-- methods -->
   <xsl:apply-templates select="method | if/method">
     <xsl:with-param name="iface" select="$iface"/>
   </xsl:apply-templates>
+  <xsl:variable name="reservedMethods" select="@reservedMethods"/>
+  <xsl:if test="$reservedMethods > 0">
+    <!-- tricky way to do a "for" loop without recursion -->
+    <xsl:for-each select="(//*)[position() <= $reservedMethods]">
+      <xsl:text>    nsresult (*InternalAndReservedMethod</xsl:text>
+      <xsl:value-of select="concat(position(), $name)"/>
+      <xsl:text>)(</xsl:text>
+      <xsl:value-of select="$iface"/>
+      <xsl:text> *pThis);&#x0A;&#x0A;</xsl:text>
+    </xsl:for-each>
+  </xsl:if>
 </xsl:template>
 
 
diff --git a/src/VBox/Main/glue/glue-java.xsl b/src/VBox/Main/glue/glue-java.xsl
index a119664..ba50e2a 100644
--- a/src/VBox/Main/glue/glue-java.xsl
+++ b/src/VBox/Main/glue/glue-java.xsl
@@ -58,7 +58,7 @@
 <xsl:template name="fileheader">
   <xsl:param name="name" />
   <xsl:text>/*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of the VirtualBox SDK, as available from
  * http://www.virtualbox.org.  This library is free software; you can
@@ -3169,6 +3169,13 @@ public class VirtualBoxManager
     {
     }
 
+    public String getClientAPIVersion()
+    {
+        return "]]></xsl:text>
+    <xsl:value-of select="substring($G_vboxApiSuffix, 2)" />
+    <xsl:text><![CDATA[";
+    }
+
     public IVirtualBox getVBox()
     {
         return this.vbox;
@@ -3835,6 +3842,13 @@ public class VirtualBoxManager
         throw new VBoxException("Disconnect doesn't make sense for local bindings");
     }
 
+    public String getClientAPIVersion()
+    {
+        return "]]></xsl:text>
+    <xsl:value-of select="substring($G_vboxApiSuffix, 2)" />
+    <xsl:text><![CDATA[";
+    }
+
     public IVirtualBox getVBox()
     {
         return this.vbox;
@@ -3877,7 +3891,6 @@ public class VirtualBoxManager
 
     public void waitForEvents(long tmo)
     {
-        // what to do here?
         try
         {
           Thread.sleep(tmo);
@@ -4618,6 +4631,13 @@ public class VirtualBoxManager
         }
     }
 
+    public String getClientAPIVersion()
+    {
+        return "]]></xsl:text>
+    <xsl:value-of select="substring($G_vboxApiSuffix, 2)" />
+    <xsl:text><![CDATA[";
+    }
+
     public IVirtualBox getVBox()
     {
         return this.vbox;
@@ -4673,6 +4693,13 @@ public class VirtualBoxManager
 
     public void waitForEvents(long tmo)
     {
+        try
+        {
+          Thread.sleep(tmo);
+        }
+        catch (InterruptedException ie)
+        {
+        }
     }
 
     protected void finalize() throws Throwable
diff --git a/src/VBox/Main/glue/tests/TestVBox.java b/src/VBox/Main/glue/tests/TestVBox.java
index 48b8446..c3bea12 100644
--- a/src/VBox/Main/glue/tests/TestVBox.java
+++ b/src/VBox/Main/glue/tests/TestVBox.java
@@ -72,6 +72,8 @@ public class TestVBox
                     processEvent(ev);
                     es.eventProcessed(listener, ev);
                 }
+                // process system event queue
+                mgr.waitForEvents(0);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -114,6 +116,8 @@ public class TestVBox
                                    + ", PAE: " + paeEnabled);
             }
         }
+        // process system event queue
+        mgr.waitForEvents(0);
     }
 
     static boolean progressBar(VirtualBoxManager mgr, IProgress p, long waitMillis)
@@ -121,7 +125,9 @@ public class TestVBox
         long end = System.currentTimeMillis() + waitMillis;
         while (!p.getCompleted())
         {
+            // process system event queue
             mgr.waitForEvents(0);
+            // wait for completion of the task, but at most 200 msecs
             p.waitForCompletion(200);
             if (System.currentTimeMillis() >= end)
                 return false;
@@ -139,6 +145,8 @@ public class TestVBox
         IProgress p = m.launchVMProcess(session, "gui", "");
         progressBar(mgr, p, 10000);
         session.unlockMachine();
+        // process system event queue
+        mgr.waitForEvents(0);
     }
 
     static void testMultiServer()
@@ -162,6 +170,9 @@ public class TestVBox
             progressBar(mgr2, p2, 10000);
             session1.unlockMachine();
             session2.unlockMachine();
+            // process system event queue
+            mgr1.waitForEvents(0);
+            mgr2.waitForEvents(0);
         } finally {
             mgr1.cleanup();
             mgr2.cleanup();
@@ -182,6 +193,8 @@ public class TestVBox
             System.out.print(new String(buf));
             off += buf.length;
         }
+        // process system event queue
+        mgr.waitForEvents(0);
     }
 
     static void printErrorInfo(VBoxException e)
@@ -264,6 +277,8 @@ public class TestVBox
             e.printStackTrace();
         }
 
+        // process system event queue
+        mgr.waitForEvents(0);
         if (ws)
         {
             try {
diff --git a/src/VBox/Main/glue/tests/TestVBoxNATEngine.java b/src/VBox/Main/glue/tests/TestVBoxNATEngine.java
index 8f28420..7ffed27 100644
--- a/src/VBox/Main/glue/tests/TestVBoxNATEngine.java
+++ b/src/VBox/Main/glue/tests/TestVBoxNATEngine.java
@@ -4,7 +4,7 @@
  * be used to connect to the webservice and (XP)COM APIs. */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -14,7 +14,7 @@
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-import org.virtualbox_4_3.*;
+import org.virtualbox_5_0.*;
 import java.util.List;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -84,12 +84,17 @@ public class TestVBoxNATEngine
             name = "<inaccessible>";
             inaccessible = true;
         }            
+
+        // process system event queue
+        mgr.waitForEvents(0);
     }
 
     static void testStart(VirtualBoxManager mgr, IVirtualBox vbox, IMachine vm)
     {
         System.out.println("\nAttempting to start VM '" + vm.getName() + "'");
         mgr.startVm(vm.getName(), null, 7000);
+        // process system event queue
+        mgr.waitForEvents(0);
     }
 
     public TestVBoxNATEngine(String[] args)
@@ -151,7 +156,6 @@ public class TestVBoxNATEngine
                     {
                         testEnumeration(mgr, vbox, vm);
                         testStart(mgr, vbox, vm);
-                        //testEvents(mgr, vbox.getEventSource());
                     }
                     System.out.println("done, press Enter...");
                     int ch = System.in.read();
@@ -167,6 +171,9 @@ public class TestVBoxNATEngine
                 e.printStackTrace();
             }
 
+        // process system event queue
+        mgr.waitForEvents(0);
+
         if (ws)
             {
                 try {
diff --git a/src/VBox/Main/idl/VirtualBox.dtd b/src/VBox/Main/idl/VirtualBox.dtd
index ef4ae34..bf73e88 100644
--- a/src/VBox/Main/idl/VirtualBox.dtd
+++ b/src/VBox/Main/idl/VirtualBox.dtd
@@ -5,7 +5,7 @@
      It is still the only sort-of-documentation available about what is valid
      XIDL syntax.
 
-     Copyright (C) 2008-2013 Oracle Corporation
+     Copyright (C) 2008-2015 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
      available from http://www.virtualbox.org. This file is free software;
@@ -75,6 +75,8 @@
     <!ATTLIST interface wrap-hint-server CDATA #IMPLIED>
     <!-- DTrace has a probe name length limit, so dtracename helps dealing with excessivly long names. -->
     <!ATTLIST interface dtracename CDATA #IMPLIED>
+    <!ATTLIST interface reservedAttributes CDATA #IMPLIED>
+    <!ATTLIST interface reservedMethods CDATA #IMPLIED>
   <!ELEMENT class (interface)>                                <!-- done -->
     <!ATTLIST class name CDATA #REQUIRED>
     <!ATTLIST class uuid CDATA #REQUIRED>
diff --git a/src/VBox/Main/idl/VirtualBox.xidl b/src/VBox/Main/idl/VirtualBox.xidl
index a6e5991..67191c0 100644
--- a/src/VBox/Main/idl/VirtualBox.xidl
+++ b/src/VBox/Main/idl/VirtualBox.xidl
@@ -1500,8 +1500,11 @@
   -->
 
   <interface name="INATNetwork" extends="$unknown"
-    uuid="a63c75da-4c99-4e9d-8351-eb73651c18cc"
-    wsmap="managed">
+    uuid="4bbc405d-f268-4483-9a52-f43ffdbf67f8"
+    wsmap="managed"
+    reservedMethods="2" reservedAttributes="8"
+    >
+
     <attribute name="networkName" type="wstring">
       <desc>
         TBD: the idea, technically we can start any number of the NAT networks,
@@ -1682,8 +1685,9 @@
 
   <interface
     name="IDHCPServer" extends="$unknown"
-    uuid="ff0774c5-1f62-4bc3-919c-7fc942bf1d25"
+    uuid="00c8f974-92c5-44a1-8f3f-702469fdd04b"
     wsmap="managed"
+    reservedMethods="2" reservedAttributes="6"
     >
     <desc>
       The IDHCPServer interface represents the VirtualBox DHCP server configuration.
@@ -1850,8 +1854,9 @@
 
   <interface
     name="IVirtualBox" extends="$unknown"
-    uuid="3afa096e-2cad-4cb0-aba2-47fe3fc62bd8"
+    uuid="0169423f-46b4-cde9-91af-1e9d5b6cd945"
     wsmap="managed"
+    reservedMethods="8" reservedAttributes="12"
     >
     <desc>
       The IVirtualBox interface represents the main interface exposed by the
@@ -1917,6 +1922,14 @@
       </desc>
     </attribute>
 
+    <attribute name="APIRevision" type="long long" readonly="yes">
+      <desc>
+        To be defined exactly, but we need something that the Validation Kit
+        can use to figure which methods and attributes can safely be used on a
+        continuously changing trunk (and occasional branch).
+      </desc>
+    </attribute>
+
     <attribute name="homeFolder" type="wstring" readonly="yes">
       <desc>
         Full path to the directory where the global settings file,
@@ -2967,8 +2980,9 @@
 
   <interface
     name="IAppliance" extends="$unknown"
-    uuid="a529d52c-cf23-4936-9150-e8a6ce77fdad"
+    uuid="8398f026-4add-4474-5bc3-2f9f2140b23e"
     wsmap="managed"
+    reservedMethods="8" reservedAttributes="8"
     >
     <desc>
         Represents a platform-independent appliance in OVF format. An instance of this is returned
@@ -3230,7 +3244,7 @@
       </desc>
 
       <param name="identifiers" type="wstring" dir="return" safearray="yes">
-        The list of password identifiers required for export on success.
+        <desc>The list of password identifiers required for export on success.</desc>
       </param>
     </method>
 
@@ -3240,10 +3254,10 @@
       </desc>
 
       <param name="passwordId" type="wstring" dir="in">
-        The password identifier to get the medium identifiers for.
+        <desc>The password identifier to get the medium identifiers for.</desc>
       </param>
       <param name="identifiers" type="uuid" mod="string" dir="return" safearray="yes">
-        The list of medium identifiers returned on success.
+        <desc>The list of medium identifiers returned on success.</desc>
       </param>
     </method>
 
@@ -3315,8 +3329,9 @@
 
   <interface
     name="IVirtualSystemDescription" extends="$unknown"
-    uuid="d7525e6c-531a-4c51-8e04-41235083a3d8"
+    uuid="316c99a2-405d-41af-8508-46889144d067"
     wsmap="managed"
+    reservedMethods="4" reservedAttributes="4"
     >
 
     <desc>Represents one virtual system (machine) in an appliance. This interface is used in
@@ -3907,8 +3922,9 @@
 
   <interface
     name="IBIOSSettings" extends="$unknown"
-    uuid="38b54279-dc35-4f5e-a431-835b867c6b5e"
+    uuid="c5b5afe3-4a6f-05eb-c9b6-4dbf98538b67"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="8"
     >
     <desc>
         The IBIOSSettings interface represents BIOS settings of the virtual
@@ -4164,10 +4180,11 @@
 
   <interface
     name="IMachine" extends="$unknown"
-    uuid="6bf820b3-a08f-49a7-ac08-b88efbd3a313"
+    uuid="703510de-8d5e-411b-a25b-378b03382bac"
     wsmap="managed"
     wrap-hint-server-addinterfaces="IInternalMachineControl"
     wrap-hint-server="manualaddinterfaces"
+    reservedMethods="8" reservedAttributes="16"
     >
     <desc>
       The IMachine interface represents a virtual machine, or guest, created
@@ -7571,12 +7588,37 @@ and "VAR" for unsetting. -->
       </param>
     </method>
 
+    <method name="applyDefaults">
+      <desc>
+        Applies the defaults for the configured guest OS type. This is
+        primarily for getting sane settings straight after creating a
+        new VM, but it can also be applied later.
+
+        <note>
+          This is primarily a shortcut, centralizing the tedious job of
+          getting the recommended settings and translating them into
+          settings updates. The settings are made at the end of the call,
+          but not saved.
+        </note>
+
+        <result name="E_NOTIMPL">
+          This method is not implemented yet.
+        </result>
+      </desc>
+      <param name="flags" type="wstring" dir="in">
+        <desc>
+          Additional flags, to be defined later.
+        </desc>
+      </param>
+    </method>
+
   </interface>
 
   <interface
     name="IEmulatedUSB" extends="$unknown"
-    uuid="38cc4dfd-8bb2-4d40-aebe-699eead8c2dd"
+    uuid="6e253ee8-477a-2497-6759-88b8292a5af0"
     wsmap="managed"
+    reservedMethods="4" reservedAttributes="4"
     >
     <desc>
       Manages emulated USB devices.
@@ -7615,8 +7657,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IVRDEServerInfo" extends="$unknown"
-    uuid="714434a1-58c3-4aab-9049-7652c5df113b"
+    uuid="c39ef4d6-7532-45e8-96da-eb5986ae76e4"
     wsmap="struct"
+    reservedAttributes="8"
     >
     <desc>
       Contains information about the remote desktop (VRDE) server capabilities and status.
@@ -7723,8 +7766,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IConsole" extends="$unknown"
-    uuid="650b5f05-8258-4ee9-b518-89c515ca5dd9"
+    uuid="872da645-4a9b-1727-bee2-5585105b9eed"
     wsmap="managed"
+    reservedMethods="8" reservedAttributes="8"
     >
     <desc>
       The IConsole interface represents an interface to control virtual
@@ -8378,8 +8422,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IHostNetworkInterface" extends="$unknown"
-    uuid="f6e556f9-d598-409b-898c-8ba99d9b05ae"
+    uuid="455f8c45-44a0-a470-ba20-27890b96dba9"
     wsmap="managed"
+    reservedMethods="2" reservedAttributes="4"
     >
     <desc>
       Represents one of host's network interfaces. IP V6 address and network
@@ -8483,8 +8528,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IHostVideoInputDevice" extends="$unknown"
-    uuid="a1ceae44-d65e-4156-9359-d390f93ee9a0"
+    uuid="e8c25d4d-ac97-4c16-b3e2-81bd8a57cc27"
     wsmap="managed"
+    reservedAttributes="4"
     >
     <desc>
       Represents one of host's video capture devices, for example a webcam.
@@ -8505,8 +8551,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IHost" extends="$unknown"
-    uuid="93269330-48ca-4096-b4a2-1189df336267"
+    uuid="afca788c-4477-787d-60b2-3fa70e56fbbc"
     wsmap="managed"
+    reservedMethods="2" reservedAttributes="12"
     >
     <desc>
       The IHost interface represents the physical machine that this VirtualBox
@@ -8979,8 +9026,9 @@ and "VAR" for unsetting. -->
   <interface
     name="ISystemProperties"
     extends="$unknown"
-    uuid="2dc77d62-27e7-4e6e-87eb-b41ae0d555da"
+    uuid="0eb668d2-495e-5a36-8890-29999b5f030c"
     wsmap="managed"
+    reservedMethods="4" reservedAttributes="16"
     >
     <desc>
       The ISystemProperties interface represents global properties of the given
@@ -9047,12 +9095,24 @@ and "VAR" for unsetting. -->
       </desc>
     </attribute>
 
+    <attribute name="rawModeSupported" type="boolean" readonly="yes">
+      <desc>
+        Indicates whether VirtualBox was built with raw-mode support.
+
+        When this reads as False, the <link to="HWVirtExPropertyType::Enabled"/>
+        setting will be ignored and assumed to be True.
+      </desc>
+    </attribute>
+
     <attribute name="exclusiveHwVirt" type="boolean">
       <desc>
         Exclusive use of hardware virtualization by VirtualBox. When enabled,
         VirtualBox assumes it can obtain full and exclusive access to the VT-x
         or AMD-V feature of the host. To share hardware virtualization with
         other hypervisors, this property must be disabled.
+
+        <note>This is ignored on OS X, the kernel mediates hardware
+          access there.</note>
       </desc>
     </attribute>
 
@@ -9395,7 +9455,7 @@ and "VAR" for unsetting. -->
         given storage controller</desc>
 
       <param name="controllerType" type="StorageControllerType" dir="in">
-        <desc>The storage controller to the setting for.</desc>
+        <desc>The storage controller type to get the setting for.</desc>
       </param>
 
       <param name="enabled" type="boolean" dir="return">
@@ -9408,7 +9468,7 @@ and "VAR" for unsetting. -->
         hot-plugging devices.</desc>
 
       <param name="controllerType" type="StorageControllerType" dir="in">
-        <desc>The storage controller to check for.</desc>
+        <desc>The storage controller to check the setting for.</desc>
       </param>
 
       <param name="hotplugCapable" type="boolean" dir="return">
@@ -9443,8 +9503,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IGuestOSType" extends="$unknown"
-    uuid="ced74f7e-4c08-4d19-883a-017496ada2e1"
+    uuid="03cd409d-20f5-43f9-8de1-4a129620990b"
     wsmap="struct"
+    reservedAttributes="16"
     >
     <desc>
     </desc>
@@ -9546,7 +9607,11 @@ and "VAR" for unsetting. -->
     </attribute>
 
     <attribute name="recommendedAudioController" type="AudioControllerType" readonly="yes">
-      <desc>Recommended audio type.</desc>
+      <desc>Recommended audio controller type.</desc>
+    </attribute>
+
+    <attribute name="recommendedAudioCodec" type="AudioCodecType" readonly="yes">
+      <desc>Recommended audio codec type.</desc>
     </attribute>
 
     <attribute name="recommendedFloppy" type="boolean" readonly="yes">
@@ -9670,8 +9735,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IAdditionsFacility" extends="$unknown"
-    uuid="54992946-6af1-4e49-98ec-58b558b7291e"
+    uuid="f2f7fae4-4a06-81fc-a916-78b2da1fa0e5"
     wsmap="struct"
+    reservedAttributes="2"
     >
     <desc>
       Structure representing a Guest Additions facility.
@@ -10660,8 +10726,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IDnDBase" extends="$unknown"
-    uuid="a9630a67-7238-4b0e-9a58-364b1dd3d032"
+    uuid="4132147b-42f8-cd96-7570-6a8800e3342c"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>Base abstract interface for drag'n drop.</desc>
 
@@ -10708,8 +10775,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IDnDSource" extends="IDnDBase"
-    uuid="b69c400d-be63-4255-898a-e706d66b1637"
+    uuid="d23a9ca3-42da-c94b-8aec-21968e08355d"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>Abstract interface for handling drag'n drop sources.</desc>
 
@@ -10788,8 +10856,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IDnDTarget" extends="IDnDBase"
-    uuid="25ac16fa-316d-4934-9a7f-fe02f6739bef"
+    uuid="ff5befc3-4ba3-7903-2aa4-43988ba11554"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>Abstract interface for handling drag'n drop targets.</desc>
 
@@ -10958,8 +11027,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IGuestSession" extends="$unknown"
-    uuid="3cbf62cf-c9cd-48c6-9623-d1dbe54ca557"
+    uuid="486fd828-4c6b-239b-a846-c4bb69e41038"
     wsmap="managed"
+    reservedMethods="8" reservedAttributes="8"
     >
     <desc>
       A guest session represents one impersonated user account in the guest, so
@@ -12158,8 +12228,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IProcess" extends="$unknown"
-    uuid="064cf1ca-4c0f-50b5-8f8e-e8b4bfa76c33"
+    uuid="2e20707d-4325-9a83-83cf-3faf5b97457c"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="4"
     >
     <desc>
       Abstract parent interface for processes handled by VirtualBox.
@@ -12359,8 +12430,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IDirectory" extends="$unknown"
-    uuid="1b70dd03-26d7-483a-8877-89bbb0f87b70"
+    uuid="f73650f4-4506-50ca-045a-23a0e32ea508"
     wsmap="managed"
+    reservedMethods="2" reservedAttributes="4"
     >
     <desc>
       Abstract parent interface for directories handled by VirtualBox.
@@ -12414,8 +12486,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IFile" extends="$unknown"
-    uuid="540804bf-4ca6-dd43-800c-bfb9765f96fe"
+    uuid="14c66b23-404c-f24a-3cc1-ee9501d44f2a"
     wsmap="managed"
+    reservedMethods="4" reservedAttributes="4"
     >
     <desc>
       Abstract parent interface for files handled by VirtualBox.
@@ -12679,8 +12752,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IFsObjInfo" extends="$unknown"
-    uuid="37b30bc6-4506-58e4-bc43-fbbca92b4548"
+    uuid="d344626e-4b0a-10bc-9c2b-68973052de16"
     wsmap="managed"
+    reservedAttributes="4"
     >
     <desc>
       Abstract parent interface for VirtualBox file system object information.
@@ -12801,8 +12875,9 @@ and "VAR" for unsetting. -->
 
   <interface
     name="IGuest" extends="$unknown"
-    uuid="97927199-7e1f-4094-97ab-92333e727843"
+    uuid="13a11514-402e-022e-6180-c3944de3f9c8"
     wsmap="managed"
+    reservedMethods="8" reservedAttributes="16"
     >
     <desc>
       The IGuest interface represents information about the operating system
@@ -13128,8 +13203,9 @@ useful to the API client. -->
 
   <interface
     name="IProgress" extends="$unknown"
-    uuid="c20238e4-3221-4d3f-8891-81ce92d9f913"
+    uuid="77faf1c0-489d-b123-274c-5a95e77ab286"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>
         The IProgress interface is used to track and control
@@ -13375,8 +13451,9 @@ useful to the API client. -->
 
   <interface
     name="ISnapshot" extends="$unknown"
-    uuid="0472823b-c6e7-472a-8e9f-d732e86b8463"
+    uuid="5732f030-4194-ec8b-c761-e1a99327e9f0"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>
       The ISnapshot interface represents a snapshot of the virtual
@@ -13707,8 +13784,9 @@ useful to the API client. -->
 
   <interface
     name="IMediumAttachment" extends="$unknown"
-    uuid="4b252567-5d4e-4db8-b3c8-569ec1c9236c"
+    uuid="3785b3f7-7b5f-4000-8842-ad0cc6ab30b7"
     wsmap="struct"
+    reservedAttributes="4"
     >
     <desc>
       The IMediumAttachment interface links storage media to virtual machines.
@@ -13949,8 +14027,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IMedium" extends="$unknown"
-    uuid="9680d99b-3550-4e14-8fc4-82ad1426cbde"
+    uuid="4afe423b-43e0-e9d0-82e8-ceb307940dda"
     wsmap="managed"
+    reservedMethods="4" reservedAttributes="8"
     >
     <desc>
       The IMedium interface represents virtual storage for a machine's
@@ -15380,8 +15459,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IMediumFormat" extends="$unknown"
-    uuid="6238e1cf-a17d-4ec1-8172-418bfb22b93a"
+    uuid="10f337fb-422e-e57e-661b-0998ac309175"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>
         The IMediumFormat interface represents a medium format.
@@ -15500,8 +15580,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IToken" extends="$unknown"
-    uuid="3b1c4797-e289-4d4c-b74c-50c9b86a36f8"
+    uuid="20479eaf-d8ed-44cf-85ac-c83a26c95a4d"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>
       The IToken interface represents a token passed to an API client, which
@@ -15553,8 +15634,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IKeyboard" extends="$unknown"
-    uuid="585cc5e8-349c-41c6-899d-d9a38e3f4126"
+    uuid="da91d4c9-4c02-fdb1-c5ac-d89e22e81302"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>
       The IKeyboard interface represents the virtual machine's keyboard. Used
@@ -15673,8 +15755,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IMousePointerShape" extends="$unknown"
-    uuid="4609f3e1-839a-4edd-b57f-cc4584b39173"
+    uuid="e04e5545-4a0f-f9d2-5bef-f9b25b6557ed"
     wsmap="managed"
+    reservedAttributes="2"
     >
     <desc>
       The guest mouse pointer description.
@@ -15746,8 +15829,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IMouse" extends="$unknown"
-    uuid="4c3fa51c-7b9a-4ecf-97f0-d75a945bd26c"
+    uuid="ee35adb0-4748-3e12-e7fd-5aad957bba0f"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>
       The IMouse interface represents the virtual machine's mouse. Used in
@@ -16060,7 +16144,7 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IFramebuffer" extends="$unknown"
-    uuid="dd07f843-be2e-4cae-83fe-8bf5d33c80e9"
+    uuid="8b82295f-415f-1aa1-17fd-9fbbac8edf44"
     wsmap="managed"
     >
     <attribute name="width" type="unsigned long" readonly="yes">
@@ -16127,6 +16211,15 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
       </desc>
     </attribute>
 
+    <attribute name="capabilities" type="FramebufferCapabilities" safearray="yes" readonly="yes">
+      <desc>
+        Capabilities of the framebuffer instance.
+
+        For the meaning of individual capability flags see
+        <link to="FramebufferCapabilities"/>.
+      </desc>
+    </attribute>
+
     <method name="notifyUpdate">
       <desc>
         Informs about an update.
@@ -16285,20 +16378,11 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
       </param>
     </method>
 
-    <attribute name="capabilities" type="FramebufferCapabilities" safearray="yes" readonly="yes">
-      <desc>
-        Capabilities of the framebuffer instance.
-
-        For the meaning of individual capability flags see
-        <link to="FramebufferCapabilities"/>.
-      </desc>
-    </attribute>
-
   </interface>
 
   <interface
     name="IFramebufferOverlay" extends="IFramebuffer"
-    uuid="0bcc1c7e-e415-47d2-bfdb-e4c705fb0f47"
+    uuid="af398a9a-6b76-4805-8fab-00a9dcf4732b"
     wsmap="managed"
     >
     <desc>
@@ -16365,9 +16449,10 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IDisplay" extends="$unknown"
-    uuid="94a7faa2-7792-42a3-8535-00770eca1f53"
+    uuid="7303a66d-433b-25a4-f9a8-fcadf87e0c2a"
     wsmap="managed"
     wrap-hint-server-addinterfaces="IEventListener"
+    reservedMethods="4" reservedAttributes="2"
     >
     <desc>
       The IDisplay interface represents the virtual machine's display.
@@ -16769,8 +16854,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="INetworkAdapter" extends="$unknown"
-    uuid="efa0f965-63c7-4c60-afdf-b1cc9943b9c0"
+    uuid="e925c2aa-4fe4-aaf6-91c5-e9b8ea4151ee"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="4"
     >
     <desc>
         Represents a virtual network adapter that is attached to a virtual machine.
@@ -17006,8 +17092,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="ISerialPort" extends="$unknown"
-    uuid="937f6970-5103-4745-b78e-d28dcf1479a8"
+    uuid="cb0a4a29-43a3-9040-0c25-34845db7b042"
     wsmap="managed"
+    reservedAttributes="2"
     >
 
     <desc>
@@ -17096,8 +17183,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IParallelPort" extends="$unknown"
-    uuid="0c925f06-dd10-4b77-8de8-294d738c3214"
+    uuid="788b87df-7708-444b-9eef-c116ce423d39"
     wsmap="managed"
+    reservedAttributes="4"
     >
 
     <desc>
@@ -17156,8 +17244,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IMachineDebugger" extends="$unknown"
-    uuid="ae7afb78-4265-8c03-ccb9-33a7970057e3"
+    uuid="9c0f5269-47ae-ee34-c2fe-53a16e388925"
     wsmap="managed"
+    reservedMethods="16" reservedAttributes="16"
     >
     <method name="dumpGuestCore">
       <desc>
@@ -17648,8 +17737,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IUSBDeviceFilters" extends="$unknown"
-    uuid="2ab550b2-53cc-4c2e-ae07-0adf4114e75c"
+    uuid="9709db9b-3346-49d6-8f1c-41b0c4784ff2"
     wsmap="managed"
+    reservedMethods="2" reservedAttributes="2"
     >
 
     <attribute name="deviceFilters" type="IUSBDeviceFilter" readonly="yes" safearray="yes">
@@ -17792,8 +17882,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IUSBController" extends="$unknown"
-    uuid="2598fa52-3044-4ff5-8a61-2b09088a9e3c"
+    uuid="0c293c51-4810-e174-4f78-199376c63bbe"
     wsmap="managed"
+    reservedAttributes="2"
     >
 
     <attribute name="name" type="wstring">
@@ -17877,8 +17968,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IUSBDevice" extends="$unknown"
-    uuid="8d826296-e04f-4e86-9310-cb85b19becde"
+    uuid="5915d179-83c7-4f2b-a323-9a97f46f4e29"
     wsmap="managed"
+    reservedAttributes="4"
     >
     <desc>
       The IUSBDevice interface represents a virtual USB device attached to the
@@ -17972,8 +18064,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IUSBDeviceFilter" extends="$unknown"
-    uuid="d6831fb4-1a94-4c2c-96ef-8d0d6192066d"
+    uuid="45587218-4289-ef4e-8e6a-e5b07816b631"
     wsmap="managed"
+    reservedAttributes="8"
     >
     <desc>
       The IUSBDeviceFilter interface represents an USB device filter used
@@ -18218,8 +18311,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IHostUSBDevice" extends="IUSBDevice"
-    uuid="173b4b44-d268-4334-a00d-b6521c9a740a"
+    uuid="c19073dd-cc7b-431b-98b2-951fda8eab89"
     wsmap="managed"
+    reservedAttributes="4"
     >
     <desc>
       The IHostUSBDevice interface represents a physical USB device attached
@@ -18271,8 +18365,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IHostUSBDeviceFilter" extends="IUSBDeviceFilter"
-    uuid="4cc70246-d74a-400f-8222-3900489c0374"
+    uuid="01adb2d6-aedf-461c-be2c-99e91bdad8a1"
     wsmap="managed"
+    reservedAttributes="8"
     >
     <desc>
       The IHostUSBDeviceFilter interface represents a global filter for a
@@ -18356,10 +18451,37 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
     <const name="HDA"   value="2"/>
   </enum>
 
+  <enum
+    name="AudioCodecType"
+    uuid="7b406301-f520-420c-9805-8ce11c086370"
+    >
+    <desc>
+      The exact variant of audio codec hardware presented
+      to the guest; see <link to="IAudioAdapter::audioCodec" />.
+    </desc>
+
+    <const name="Null"          value="0">
+      <desc>@c null value. Never used by the API.</desc>
+    </const>
+    <const name="SB16"          value="1">
+      <desc>SB16; this is the only option for the SB16 device.</desc>
+    </const>
+    <const name="STAC9700"      value="2">
+      <desc>A STAC9700 AC'97 codec.</desc>
+    </const>
+    <const name="AD1980"        value="3">
+      <desc>An AD1980 AC'97 codec. Recommended for Linux guests.</desc>
+    </const>
+    <const name="STAC9221"      value="4">
+      <desc>A STAC9221 HDA codec.</desc>
+    </const>
+  </enum>
+
   <interface
     name="IAudioAdapter" extends="$unknown"
-    uuid="280cc7f7-eddc-48b6-9bbb-5b1e8d761c0e"
+    uuid="aeccc0a8-e0a0-427f-b946-c42063f54d81"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>
         The IAudioAdapter interface represents the virtual audio adapter of
@@ -18387,7 +18509,15 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
     </attribute>
     <attribute name="audioController" type="AudioControllerType">
       <desc>
-        The audio hardware we emulate.
+        The emulated audio controller.
+      </desc>
+    </attribute>
+    <attribute name="audioCodec" type="AudioCodecType">
+      <desc>
+        The exact variant of audio codec hardware presented
+        to the guest.
+        For HDA and SB16, only one variant is available, but for AC'97,
+        there are several.
       </desc>
     </attribute>
     <attribute name="audioDriver" type="AudioDriverType">
@@ -18458,8 +18588,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IVRDEServer" extends="$unknown"
-    uuid="d38de40a-c2c1-4e95-b5a4-167b05f5694c"
+    uuid="6e758489-453a-6f98-9cb9-2da2cb8eabb5"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
 
     <attribute name="enabled" type="boolean">
@@ -18551,8 +18682,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="ISharedFolder" extends="$unknown"
-    uuid="8388da11-b559-4574-a5b7-2bd7acd5cef8"
+    uuid="15aabe95-e594-4e18-9222-b5e83a23f1da"
     wsmap="struct"
+    reservedAttributes="4"
     >
     <desc>
       The ISharedFolder interface represents a folder in the host computer's
@@ -19303,9 +19435,10 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="ISession" extends="$unknown"
-    uuid="3d4f472c-aac8-4387-94be-54042bcd8901"
+    uuid="7844aa05-b02e-4cdd-a04f-ade4a762e6b7"
     wsmap="managed"
     wrap-hint-server-addinterfaces="IInternalSessionControl"
+    reservedMethods="3" reservedAttributes="4"
     >
     <desc>
       The ISession interface represents a client process and allows for locking
@@ -19513,8 +19646,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IStorageController" extends="$unknown"
-    uuid="802bb9c0-fe71-43ab-b55a-322fdf77358f"
+    uuid="49b19d41-4a75-7bd5-c124-259acba3c41d"
     wsmap="managed"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>
         Represents a storage controller that is attached to a virtual machine
@@ -19730,7 +19864,8 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IPerformanceMetric" extends="$unknown"
-    uuid="2a1a60ae-9345-4019-ad53-d34ba41cbfe9" wsmap="managed"
+    uuid="81314d14-fd1c-411a-95c5-e9bb1414e632" wsmap="managed"
+    reservedAttributes="8"
     >
     <desc>
       The IPerformanceMetric interface represents parameters of the given
@@ -19792,8 +19927,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IPerformanceCollector" extends="$unknown"
-    uuid="e22e1acb-ac4a-43bb-a31c-17321659b0c6"
+    uuid="b14290ad-cd54-400c-b858-797bcb82570e"
     wsmap="managed"
+    reservedMethods="4" reservedAttributes="8"
     >
     <desc>
       The IPerformanceCollector interface represents a service that collects
@@ -20172,8 +20308,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="INATEngine" extends="$unknown"
-    uuid="26451b99-3b2d-4dcb-8e4b-d63654218175"
+    uuid="c1cdb6bf-44cb-e334-66fa-469a17fd09df"
     wsmap="managed"
+    reservedMethods="2" reservedAttributes="4"
     >
     <desc>Interface for managing a NAT engine which is used with a virtual machine. This
       allows for changing NAT behavior such as port-forwarding rules. This interface is
@@ -20288,8 +20425,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IExtPackPlugIn" extends="$unknown"
-    uuid="58000040-e718-4746-bbce-4b86d96da461"
+    uuid="c8e667b2-4234-1f9c-6508-afa9cea4efa1"
     wsmap="suppress"
+    reservedAttributes="2"
     >
     <desc>
       Interface for keeping information about a plug-in that ships with an
@@ -20313,8 +20451,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IExtPackBase" extends="$unknown"
-    uuid="f79b75d8-2890-4f34-ffff-ffffa144e82c"
+    uuid="4bd17415-4438-8657-e78e-80a40713a23c"
     wsmap="suppress"
+    reservedMethods="1" reservedAttributes="4"
     >
     <desc>
       Interface for querying information about an extension pack as well as
@@ -20438,8 +20577,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IExtPackFile" extends="IExtPackBase"
-    uuid="b6b49f55-efcc-4f08-b486-56e8d8afb10b"
+    uuid="4c7f4bf6-4671-2f75-0fbb-a99f6218cdfc"
     wsmap="suppress"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>
       Extension pack file (aka tarball, .vbox-extpack) representation returned
@@ -20477,8 +20617,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IExtPackManager" extends="$unknown"
-    uuid="3295e6ce-b051-47b2-9514-2c588bfe7554"
+    uuid="edba9d10-45d8-b440-1712-46ac0c9bc4c5"
     wsmap="suppress"
+    reservedMethods="1" reservedAttributes="2"
     >
     <desc>
       Interface for managing VirtualBox Extension Packs.
@@ -20614,8 +20755,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
   -->
   <interface
     name="IBandwidthGroup" extends="$unknown"
-    uuid="badea2d7-0261-4146-89f0-6a57cc34833d"
+    uuid="31587f93-2d12-4d7c-ba6d-ce51d0d5b265"
     wsmap="managed"
+    reservedAttributes="4"
     >
     <desc>Represents one bandwidth group.</desc>
 
@@ -20644,8 +20786,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
   -->
   <interface
     name="IBandwidthControl" extends="$unknown"
-    uuid="e2eb3930-d2f4-4f87-be17-0707e30f019f"
+    uuid="48c7f4c0-c9d6-4742-957c-a6fd52e8c4ae"
     wsmap="managed"
+    reservedMethods="2" reservedAttributes="2"
     >
     <desc>
       Controls the bandwidth groups of one machine used to cap I/O done by a VM.
@@ -20716,8 +20859,9 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
 
   <interface
     name="IVirtualBoxClient" extends="$unknown"
-    uuid="d191281f-b0cb-4d83-a8fa-0d9fd6ba234c"
+    uuid="d2937a8e-cb8d-4382-90ba-b7da78a74573"
     wsmap="suppress"
+    reservedMethods="4" reservedAttributes="4"
     >
     <desc>
       Convenience interface for client applications. Treat this as a
@@ -23122,6 +23266,7 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
     <!-- network name is common setting for all event types -->
     <attribute name="networkName" type="wstring" readonly="yes"/>
   </interface>
+
   <!-- base class for start/stop events -->
   <interface name="INATNetworkStartStopEvent" extends="INATNetworkChangedEvent"
              uuid="269d8f6b-fa1e-4cee-91c7-6d8496bea3c1"
@@ -23147,6 +23292,7 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
              wsmap="managed" autogen="VBoxEvent" id="OnNATNetworkCreationDeletion">
     <attribute name="creationEvent" type="boolean" readonly="yes"/>
   </interface>
+
   <interface name="INATNetworkSettingEvent" extends="INATNetworkAlterEvent"
              uuid="9db3a9e6-7f29-4aae-a627-5a282c83092c"
              wsmap="managed" autogen="VBoxEvent" id="OnNATNetworkSetting">
@@ -23156,6 +23302,7 @@ Snapshot 1 (B.vdi)            Snapshot 1 (B.vdi)
     <attribute name="advertiseDefaultIPv6RouteEnabled" type="boolean" readonly="yes" dtracename="advertiseDefIPv6Route"/>
     <attribute name="needDhcpServer" type="boolean" readonly="yes"/>
   </interface>
+
   <interface name="INATNetworkPortForwardEvent" extends="INATNetworkAlterEvent"
              uuid="2514881b-23d0-430a-a7ff-7ed7f05534bc"
              wsmap="managed" autogen="VBoxEvent" id="OnNATNetworkPortForward">
diff --git a/src/VBox/Main/idl/apiwrap-server.xsl b/src/VBox/Main/idl/apiwrap-server.xsl
index 6c908b5..ca2bda3 100644
--- a/src/VBox/Main/idl/apiwrap-server.xsl
+++ b/src/VBox/Main/idl/apiwrap-server.xsl
@@ -1512,6 +1512,7 @@ Returns empty if not needed, non-empty ('yes') if needed. -->
     <xsl:param name="dtracetopclass"/>
     <xsl:param name="pmode"/>
 
+    <xsl:variable name="name" select="@name"/>
     <!-- first recurse to emit all base interfaces -->
     <xsl:variable name="extends" select="@extends"/>
     <xsl:if test="$extends and not($extends='$unknown') and not($extends='$errorinfo')">
@@ -1528,14 +1529,14 @@ Returns empty if not needed, non-empty ('yes') if needed. -->
         <xsl:when test="$pmode='code'">
             <xsl:text>//
 </xsl:text>
-            <xsl:value-of select="concat('// ', @name, ' properties')"/>
+            <xsl:value-of select="concat('// ', $name, ' properties')"/>
             <xsl:text>
 //
 
 </xsl:text>
         </xsl:when>
         <xsl:when test="$pmode != 'dtrace-probes'">
-            <xsl:value-of select="concat($G_sNewLine, '    // ', $pmode, ' ', @name, ' properties', $G_sNewLine)"/>
+            <xsl:value-of select="concat($G_sNewLine, '    // ', $pmode, ' ', $name, ' properties', $G_sNewLine)"/>
         </xsl:when>
     </xsl:choose>
     <xsl:choose>
@@ -1543,6 +1544,15 @@ Returns empty if not needed, non-empty ('yes') if needed. -->
             <xsl:apply-templates select="./attribute | ./if" mode="public">
                 <xsl:with-param name="emitmode" select="'attribute'"/>
             </xsl:apply-templates>
+            <xsl:variable name="reservedAttributes" select="@reservedAttributes"/>
+            <xsl:if test="$reservedAttributes > 0">
+                <!-- tricky way to do a "for" loop without recursion -->
+                <xsl:for-each select="(//*)[position() <= $reservedAttributes]">
+                    <xsl:text>    STDMETHOD(COMGETTER(InternalAndReservedAttribute</xsl:text>
+                    <xsl:value-of select="concat(position(), $name)"/>
+                    <xsl:text>))(ULONG *aReserved);&#x0A;</xsl:text>
+                </xsl:for-each>
+            </xsl:if>
         </xsl:when>
         <xsl:when test="$pmode='wrapped'">
             <xsl:apply-templates select="./attribute | ./if" mode="wrapped">
@@ -1555,6 +1565,19 @@ Returns empty if not needed, non-empty ('yes') if needed. -->
                 <xsl:with-param name="dtracetopclass" select="$dtracetopclass"/>
                 <xsl:with-param name="emitmode" select="'attribute'"/>
             </xsl:apply-templates>
+            <xsl:variable name="reservedAttributes" select="@reservedAttributes"/>
+            <xsl:if test="$reservedAttributes > 0">
+                <!-- tricky way to do a "for" loop without recursion -->
+                <xsl:for-each select="(//*)[position() <= $reservedAttributes]">
+                    <xsl:value-of select="concat('STDMETHODIMP ', $topclass, 'Wrap::COMGETTER(InternalAndReservedAttribute', position(), $name, ')(ULONG *aReserved)&#x0A;')"/>
+                    <xsl:text>{
+    NOREF(aReserved);
+    return E_NOTIMPL;
+}
+
+</xsl:text>
+                </xsl:for-each>
+            </xsl:if>
         </xsl:when>
         <xsl:when test="$pmode = 'dtrace-probes'">
             <xsl:apply-templates select="./attribute | ./if" mode="dtrace-probes">
@@ -2116,6 +2139,7 @@ Returns empty if not needed, non-empty ('yes') if needed. -->
     <xsl:param name="pmode"/>
     <xsl:param name="dtracetopclass"/>
 
+    <xsl:variable name="name" select="@name"/>
     <!-- first recurse to emit all base interfaces -->
     <xsl:variable name="extends" select="@extends"/>
     <xsl:if test="$extends and not($extends='$unknown') and not($extends='$errorinfo')">
@@ -2132,7 +2156,7 @@ Returns empty if not needed, non-empty ('yes') if needed. -->
         <xsl:when test="$pmode='code'">
             <xsl:text>//
 </xsl:text>
-            <xsl:value-of select="concat('// ', @name, ' methods')"/>
+            <xsl:value-of select="concat('// ', $name, ' methods')"/>
             <xsl:text>
 //
 
@@ -2140,7 +2164,7 @@ Returns empty if not needed, non-empty ('yes') if needed. -->
         </xsl:when>
         <xsl:when test="$pmode='dtrace-probes'"/>
         <xsl:otherwise>
-            <xsl:value-of select="concat($G_sNewLine, '    // ', $pmode, ' ', @name, ' methods', $G_sNewLine)"/>
+            <xsl:value-of select="concat($G_sNewLine, '    // ', $pmode, ' ', $name, ' methods', $G_sNewLine)"/>
         </xsl:otherwise>
     </xsl:choose>
     <xsl:choose>
@@ -2148,6 +2172,15 @@ Returns empty if not needed, non-empty ('yes') if needed. -->
             <xsl:apply-templates select="./method | ./if" mode="public">
                 <xsl:with-param name="emitmode" select="'method'"/>
             </xsl:apply-templates>
+            <xsl:variable name="reservedMethods" select="@reservedMethods"/>
+            <xsl:if test="$reservedMethods > 0">
+                <!-- tricky way to do a "for" loop without recursion -->
+                <xsl:for-each select="(//*)[position() <= $reservedMethods]">
+                    <xsl:text>    STDMETHOD(InternalAndReservedMethod</xsl:text>
+                    <xsl:value-of select="concat(position(), $name)"/>
+                    <xsl:text>)();&#x0A;</xsl:text>
+                </xsl:for-each>
+            </xsl:if>
         </xsl:when>
         <xsl:when test="$pmode='wrapped'">
             <xsl:apply-templates select="./method | ./if" mode="wrapped">
@@ -2160,6 +2193,18 @@ Returns empty if not needed, non-empty ('yes') if needed. -->
                 <xsl:with-param name="dtracetopclass" select="$dtracetopclass"/>
                 <xsl:with-param name="emitmode" select="'method'"/>
             </xsl:apply-templates>
+            <xsl:variable name="reservedMethods" select="@reservedMethods"/>
+            <xsl:if test="$reservedMethods > 0">
+                <!-- tricky way to do a "for" loop without recursion -->
+                <xsl:for-each select="(//*)[position() <= $reservedMethods]">
+                    <xsl:value-of select="concat('STDMETHODIMP ', $topclass, 'Wrap::InternalAndReservedMethod', position(), $name, '()&#x0A;')"/>
+                    <xsl:text>{
+    return E_NOTIMPL;
+}
+
+</xsl:text>
+                </xsl:for-each>
+            </xsl:if>
         </xsl:when>
         <xsl:when test="$pmode='dtrace-probes'">
             <xsl:apply-templates select="./method | ./if" mode="dtrace-probes">
diff --git a/src/VBox/Main/idl/comimpl.xsl b/src/VBox/Main/idl/comimpl.xsl
index 6d4c67d..9344e7f 100644
--- a/src/VBox/Main/idl/comimpl.xsl
+++ b/src/VBox/Main/idl/comimpl.xsl
@@ -13,7 +13,7 @@
         rather trivial container classes for their read-only attributes.
         Further extension to other interfaces is possible and anticipated.
 
-    Copyright (C) 2010-2014 Oracle Corporation
+    Copyright (C) 2010-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Main/idl/midl.xsl b/src/VBox/Main/idl/midl.xsl
index 5e20c76..04c7653 100644
--- a/src/VBox/Main/idl/midl.xsl
+++ b/src/VBox/Main/idl/midl.xsl
@@ -5,7 +5,7 @@
  *  A template to generate a MS IDL compatible interface definition file
  *  from the generic interface definition expressed in XML.
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
@@ -200,7 +200,8 @@
     oleautomation
 ]
 <xsl:text>interface </xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:variable name="name" select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text> : </xsl:text>
   <xsl:choose>
     <xsl:when test="@extends='$unknown'">IDispatch</xsl:when>
@@ -214,13 +215,31 @@ warning MIDL2460 : dual interface should be derived from IDispatch : IVirtualBox
   <xsl:text>{&#x0A;</xsl:text>
   <!-- attributes (properties) -->
   <xsl:apply-templates select="attribute"/>
+  <xsl:variable name="reservedAttributes" select="@reservedAttributes"/>
+  <xsl:if test="$reservedAttributes > 0">
+    <!-- tricky way to do a "for" loop without recursion -->
+    <xsl:for-each select="(//*)[position() <= $reservedAttributes]">
+      <xsl:text>    [propget] HRESULT InternalAndReservedAttribute</xsl:text>
+      <xsl:value-of select="concat(position(), $name)"/>
+      <xsl:text> ([out, retval] ULONG *aReserved);&#x0A;&#x0A;</xsl:text>
+    </xsl:for-each>
+  </xsl:if>
   <!-- methods -->
   <xsl:apply-templates select="method"/>
+  <xsl:variable name="reservedMethods" select="@reservedMethods"/>
+  <xsl:if test="$reservedMethods > 0">
+    <!-- tricky way to do a "for" loop without recursion -->
+    <xsl:for-each select="(//*)[position() <= $reservedMethods]">
+      <xsl:text>    HRESULT InternalAndReservedMethod</xsl:text>
+      <xsl:value-of select="concat(position(), $name)"/>
+      <xsl:text>();&#x0A;&#x0A;</xsl:text>
+    </xsl:for-each>
+  </xsl:if>
   <!-- 'if' enclosed elements, unsorted -->
   <xsl:apply-templates select="if"/>
   <!-- -->
   <xsl:text>}; /* interface </xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text> */&#x0A;&#x0A;</xsl:text>
   <!-- Interface implementation forwarder macro -->
   <xsl:text>/* Interface implementation forwarder macro */&#x0A;</xsl:text>
@@ -230,7 +249,7 @@ warning MIDL2460 : dual interface should be derived from IDispatch : IVirtualBox
   <xsl:apply-templates select="if" mode="forwarder"/>
   <!-- 2) COM_FORWARD_Interface_TO(smth) -->
   <xsl:text>cpp_quote("#define COM_FORWARD_</xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text>_TO(smth) </xsl:text>
   <xsl:apply-templates select="attribute" mode="forwarder">
     <xsl:with-param name="nameOnly" select="'yes'"/>
@@ -244,15 +263,15 @@ warning MIDL2460 : dual interface should be derived from IDispatch : IVirtualBox
   <xsl:text>")&#x0A;</xsl:text>
   <!-- 3) COM_FORWARD_Interface_TO_OBJ(obj) -->
   <xsl:text>cpp_quote("#define COM_FORWARD_</xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text>_TO_OBJ(obj) COM_FORWARD_</xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text>_TO ((obj)->)")&#x0A;</xsl:text>
   <!-- 4) COM_FORWARD_Interface_TO_BASE(base) -->
   <xsl:text>cpp_quote("#define COM_FORWARD_</xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text>_TO_BASE(base) COM_FORWARD_</xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text>_TO (base::)")&#x0A;</xsl:text>
   <!-- end -->
   <xsl:text>&#x0A;</xsl:text>
diff --git a/src/VBox/Main/idl/xpidl.xsl b/src/VBox/Main/idl/xpidl.xsl
index 8582f81..a8b8d76 100644
--- a/src/VBox/Main/idl/xpidl.xsl
+++ b/src/VBox/Main/idl/xpidl.xsl
@@ -5,7 +5,7 @@
  *  A template to generate a XPCOM IDL compatible interface definition file
  *  from the generic interface definition expressed in XML.
 
-    Copyright (C) 2006-2014 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
@@ -190,7 +190,8 @@
     scriptable
 ]
 <xsl:text>interface </xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:variable name="name" select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text> : </xsl:text>
   <xsl:choose>
       <xsl:when test="@extends='$unknown'">nsISupports</xsl:when>
@@ -201,13 +202,31 @@
   <xsl:text>{&#x0A;</xsl:text>
   <!-- attributes (properties) -->
   <xsl:apply-templates select="attribute"/>
+  <xsl:variable name="reservedAttributes" select="@reservedAttributes"/>
+  <xsl:if test="$reservedAttributes > 0">
+    <!-- tricky way to do a "for" loop without recursion -->
+    <xsl:for-each select="(//*)[position() <= $reservedAttributes]">
+      <xsl:text>    readonly attribute unsigned long InternalAndReservedAttribute</xsl:text>
+      <xsl:value-of select="concat(position(), $name)"/>
+      <xsl:text>;&#x0A;&#x0A;</xsl:text>
+    </xsl:for-each>
+  </xsl:if>
   <!-- methods -->
   <xsl:apply-templates select="method"/>
+  <xsl:variable name="reservedMethods" select="@reservedMethods"/>
+  <xsl:if test="$reservedMethods > 0">
+    <!-- tricky way to do a "for" loop without recursion -->
+    <xsl:for-each select="(//*)[position() <= $reservedMethods]">
+      <xsl:text>    void InternalAndReservedMethod</xsl:text>
+      <xsl:value-of select="concat(position(), $name)"/>
+      <xsl:text>();&#x0A;&#x0A;</xsl:text>
+    </xsl:for-each>
+  </xsl:if>
   <!-- 'if' enclosed elements, unsorted -->
   <xsl:apply-templates select="if"/>
   <!-- -->
   <xsl:text>}; /* interface </xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text> */&#x0A;&#x0A;</xsl:text>
   <!-- Interface implementation forwarder macro -->
   <xsl:text>/* Interface implementation forwarder macro */&#x0A;</xsl:text>
@@ -218,28 +237,28 @@
   <xsl:apply-templates select="if" mode="forwarder"/>
   <!-- 2) COM_FORWARD_Interface_TO(smth) -->
   <xsl:text>#define COM_FORWARD_</xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text>_TO(smth) NS_FORWARD_</xsl:text>
   <xsl:call-template name="string-to-upper">
-    <xsl:with-param name="str" select="@name"/>
+    <xsl:with-param name="str" select="$name"/>
   </xsl:call-template>
   <xsl:text> (smth)&#x0A;</xsl:text>
   <!-- 3) COM_FORWARD_Interface_TO_OBJ(obj) -->
   <xsl:text>#define COM_FORWARD_</xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text>_TO_OBJ(obj) COM_FORWARD_</xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text>_TO ((obj)->)&#x0A;</xsl:text>
   <!-- 4) COM_FORWARD_Interface_TO_BASE(base) -->
   <xsl:text>#define COM_FORWARD_</xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text>_TO_BASE(base) COM_FORWARD_</xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text>_TO (base::)&#x0A;&#x0A;</xsl:text>
   <!-- -->
   <xsl:text>// for compatibility with Win32&#x0A;</xsl:text>
   <xsl:text>VBOX_EXTERN_C const nsID IID_</xsl:text>
-  <xsl:value-of select="@name"/>
+  <xsl:value-of select="$name"/>
   <xsl:text>;&#x0A;</xsl:text>
   <xsl:text>%}&#x0A;&#x0A;</xsl:text>
   <!-- end -->
diff --git a/src/VBox/Main/include/AudioAdapterImpl.h b/src/VBox/Main/include/AudioAdapterImpl.h
index 257e0e8..48e6029 100644
--- a/src/VBox/Main/include/AudioAdapterImpl.h
+++ b/src/VBox/Main/include/AudioAdapterImpl.h
@@ -64,6 +64,8 @@ private:
     HRESULT setAudioDriver(AudioDriverType_T aAudioDriver);
     HRESULT getAudioController(AudioControllerType_T *aAudioController);
     HRESULT setAudioController(AudioControllerType_T aAudioController);
+    HRESULT getAudioCodec(AudioCodecType_T *aAudioCodec);
+    HRESULT setAudioCodec(AudioCodecType_T aAudioCodec);
     HRESULT getPropertiesList(std::vector<com::Utf8Str>& aProperties);
     HRESULT getProperty(const com::Utf8Str &aKey, com::Utf8Str &aValue);
     HRESULT setProperty(const com::Utf8Str &aKey, const com::Utf8Str &aValue);
diff --git a/src/VBox/Main/include/ConsoleImpl.h b/src/VBox/Main/include/ConsoleImpl.h
index a2665c3..eaa7442 100644
--- a/src/VBox/Main/include/ConsoleImpl.h
+++ b/src/VBox/Main/include/ConsoleImpl.h
@@ -974,11 +974,6 @@ private:
 
     ComPtr<IEventListener> mVmListener;
 
-#ifdef RT_OS_WINDOWS
-    /** Use NDIS6 network drivers. */
-    bool mfNDIS6;
-#endif /* RT_OS_WINDOWS */
-
     friend struct VMTask;
 };
 
diff --git a/src/VBox/Main/include/DHCPServerImpl.h b/src/VBox/Main/include/DHCPServerImpl.h
index a600185..98a94d4 100644
--- a/src/VBox/Main/include/DHCPServerImpl.h
+++ b/src/VBox/Main/include/DHCPServerImpl.h
@@ -92,9 +92,9 @@ public:
 
 private:
     HRESULT encodeOption(com::Utf8Str &aEncoded,
-			 uint32_t aOptCode, const DhcpOptValue &aOptValue);
+                         uint32_t aOptCode, const DhcpOptValue &aOptValue);
     int addOption(DhcpOptionMap &aMap,
-		  DhcpOpt_T aOption, const com::Utf8Str &aValue);
+                  DhcpOpt_T aOption, const com::Utf8Str &aValue);
 
     // wrapped IDHCPServer properties
     HRESULT getEventSource(ComPtr<IEventSource> &aEventSource);
diff --git a/src/VBox/Main/include/DisplayImpl.h b/src/VBox/Main/include/DisplayImpl.h
index ca3d50f..254fb9c 100644
--- a/src/VBox/Main/include/DisplayImpl.h
+++ b/src/VBox/Main/include/DisplayImpl.h
@@ -178,6 +178,7 @@ public:
 
     int i_notifyCroglResize(const PVBVAINFOVIEW pView, const PVBVAINFOSCREEN pScreen, void *pvVRAM);
 
+    int  i_saveVisibleRegion(uint32_t cRect, PRTRECT pRect);
     int  i_handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect);
     int  i_handleQueryVisibleRegion(uint32_t *pcRect, PRTRECT pRect);
 
@@ -396,6 +397,13 @@ private:
     bool mfSourceBitmapEnabled;
     bool volatile fVGAResizing;
 
+    /** Are we in seamless mode?  Not saved, as we exit seamless on saving. */
+    bool        mfSeamlessEnabled;
+    /** Last set seamless visible region, number of rectangles. */
+    uint32_t    mcRectVisibleRegion;
+    /** Last set seamless visible region, data.  Freed on final clean-up. */
+    PRTRECT     mpRectVisibleRegion;
+
     bool        mfVideoAccelVRDP;
     uint32_t    mfu32SupportedOrders;
     int32_t volatile mcVideoAccelVRDPRefs;
diff --git a/src/VBox/Main/include/Global.h b/src/VBox/Main/include/Global.h
index 2ee1a14..5ab0a2d 100644
--- a/src/VBox/Main/include/Global.h
+++ b/src/VBox/Main/include/Global.h
@@ -76,6 +76,7 @@ public:
         const StorageBus_T             hdStorageBusType;
         const ChipsetType_T            chipsetType;
         const AudioControllerType_T    audioControllerType;
+        const AudioCodecType_T         audioCodecType;
     };
 
     static const OSType sOSTypes[];
diff --git a/src/VBox/Main/include/GuestDnDSourceImpl.h b/src/VBox/Main/include/GuestDnDSourceImpl.h
index e1acc25..5d87e7c 100644
--- a/src/VBox/Main/include/GuestDnDSourceImpl.h
+++ b/src/VBox/Main/include/GuestDnDSourceImpl.h
@@ -92,7 +92,7 @@ protected:
     int i_receiveData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout);
     int i_receiveRawData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout);
     int i_receiveURIData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout);
-    int i_updateProcess(PRECVDATACTX pCtx, uint32_t cbDataAdd);
+    int i_updateProcess(PRECVDATACTX pCtx, uint64_t cbDataAdd);
 
 protected:
 
diff --git a/src/VBox/Main/include/GuestImpl.h b/src/VBox/Main/include/GuestImpl.h
index b7e5214..a3f1ce2 100644
--- a/src/VBox/Main/include/GuestImpl.h
+++ b/src/VBox/Main/include/GuestImpl.h
@@ -94,6 +94,7 @@ public:
     void i_setSupportedFeatures(uint32_t aCaps);
     HRESULT i_setStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal);
     BOOL i_isPageFusionEnabled();
+    void i_setCpuCount(uint32_t aCpus) { mCpus = aCpus; }
     static HRESULT i_setErrorStatic(HRESULT aResultCode, const Utf8Str &aText)
     {
         return setErrorInternal(aResultCode, getStaticClassIID(), getStaticComponentName(), aText, false, true);
@@ -208,9 +209,13 @@ private:
     uint64_t                        mNetStatTx;
     uint64_t                        mNetStatLastTs;
     ULONG                           mCurrentGuestStat[GUESTSTATTYPE_MAX];
+    ULONG                           mCurrentGuestCpuUserStat[VMM_MAX_CPU_COUNT];
+    ULONG                           mCurrentGuestCpuKernelStat[VMM_MAX_CPU_COUNT];
+    ULONG                           mCurrentGuestCpuIdleStat[VMM_MAX_CPU_COUNT];
     ULONG                           mVmValidStats;
     BOOL                            mCollectVMMStats;
     BOOL                            mfPageFusionEnabled;
+    uint32_t                        mCpus;
 
     const ComObjPtr<Console>        mParent;
 
diff --git a/src/VBox/Main/include/GuestOSTypeImpl.h b/src/VBox/Main/include/GuestOSTypeImpl.h
index 9862dfa..f121108 100644
--- a/src/VBox/Main/include/GuestOSTypeImpl.h
+++ b/src/VBox/Main/include/GuestOSTypeImpl.h
@@ -74,6 +74,7 @@ private:
     HRESULT getRecommendedRTCUseUTC(BOOL *aRecommendedRTCUseUTC);
     HRESULT getRecommendedChipset(ChipsetType_T *aChipsetType);
     HRESULT getRecommendedAudioController(AudioControllerType_T *aAudioController);
+    HRESULT getRecommendedAudioCodec(AudioCodecType_T *aAudioCodec);
     HRESULT getRecommendedFloppy(BOOL *aRecommendedFloppy);
     HRESULT getRecommendedUSB(BOOL *aRecommendedUSB);
     HRESULT getRecommendedTFReset(BOOL *aRecommendedTFReset);
@@ -97,6 +98,7 @@ private:
     const StorageBus_T mHDStorageBusType;
     const ChipsetType_T mChipsetType;
     const AudioControllerType_T mAudioControllerType;
+    const AudioCodecType_T mAudioCodecType;
 };
 
 #endif // ____H_GUESTOSTYPEIMPL
diff --git a/src/VBox/Main/include/MachineDebuggerImpl.h b/src/VBox/Main/include/MachineDebuggerImpl.h
index 13e650f..b753f46 100644
--- a/src/VBox/Main/include/MachineDebuggerImpl.h
+++ b/src/VBox/Main/include/MachineDebuggerImpl.h
@@ -137,7 +137,7 @@ private:
     typedef DECLCALLBACK(int) FNLOGGETSTR(PRTLOGGER, char *, size_t);
     /** Function pointer.  */
     typedef FNLOGGETSTR *PFNLOGGETSTR;
-    HRESULT i_logStringProps(PRTLOGGER pLogger, PFNLOGGETSTR pfnLogGetStr, const char *pszLogGetStr, Utf8Str aSettings);
+    HRESULT i_logStringProps(PRTLOGGER pLogger, PFNLOGGETSTR pfnLogGetStr, const char *pszLogGetStr, Utf8Str *pstrSettings);
 
     Console * const mParent;
     /** @name Flags whether settings have been queued because they could not be sent
diff --git a/src/VBox/Main/include/MachineImpl.h b/src/VBox/Main/include/MachineImpl.h
index 6bf374d..ff801c6 100644
--- a/src/VBox/Main/include/MachineImpl.h
+++ b/src/VBox/Main/include/MachineImpl.h
@@ -1201,6 +1201,7 @@ private:
                                 ComPtr<IProgress> &aProgress);
     HRESULT restoreSnapshot(const ComPtr<ISnapshot> &aSnapshot,
                             ComPtr<IProgress> &aProgress);
+    HRESULT applyDefaults(const com::Utf8Str &aFlags);
 
     // wrapped IInternalMachineControl properties
 
diff --git a/src/VBox/Main/include/Performance.h b/src/VBox/Main/include/Performance.h
index f0e5680..de29478 100644
--- a/src/VBox/Main/include/Performance.h
+++ b/src/VBox/Main/include/Performance.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -881,16 +881,13 @@ namespace pm
     class Filter
     {
     public:
-        Filter(ComSafeArrayIn(IN_BSTR, metricNames),
-               ComSafeArrayIn(IUnknown * , objects));
-        Filter(const com::Utf8Str name, const ComPtr<IUnknown> &aObject);
+        Filter(const std::vector<com::Utf8Str> &metricNames,
+               const std::vector<ComPtr<IUnknown> > &objects);
+        Filter(const com::Utf8Str &name, const ComPtr<IUnknown> &aObject);
         static bool patternMatch(const char *pszPat, const char *pszName,
                                  bool fSeenColon = false);
         bool match(const ComPtr<IUnknown> object, const RTCString &name) const;
     private:
-        void init(ComSafeArrayIn(IN_BSTR, metricNames),
-                  ComSafeArrayIn(IUnknown * , objects));
-
         typedef std::pair<const ComPtr<IUnknown>, const RTCString> FilterElement;
         typedef std::list<FilterElement> ElementList;
 
diff --git a/src/VBox/Main/include/PerformanceImpl.h b/src/VBox/Main/include/PerformanceImpl.h
index 4ffbe77..a4fa26e 100644
--- a/src/VBox/Main/include/PerformanceImpl.h
+++ b/src/VBox/Main/include/PerformanceImpl.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -20,7 +20,8 @@
 #ifndef ____H_PERFORMANCEIMPL
 #define ____H_PERFORMANCEIMPL
 
-#include "VirtualBoxBase.h"
+#include "PerformanceCollectorWrap.h"
+#include "PerformanceMetricWrap.h"
 
 #include <VBox/com/com.h>
 #include <VBox/com/array.h>
@@ -45,52 +46,33 @@ namespace pm
 /* Each second we obtain new CPU load stats. */
 #define VBOX_USAGE_SAMPLER_MIN_INTERVAL 1000
 
-class HostUSBDevice;
-
 class ATL_NO_VTABLE PerformanceMetric :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IPerformanceMetric)
+    public PerformanceMetricWrap
 {
 public:
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(PerformanceMetric, IPerformanceMetric)
-
-    DECLARE_NOT_AGGREGATABLE (PerformanceMetric)
-
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-    BEGIN_COM_MAP (PerformanceMetric)
-        VBOX_DEFAULT_INTERFACE_ENTRIES (IPerformanceMetric)
-    END_COM_MAP()
-
-    DECLARE_EMPTY_CTOR_DTOR (PerformanceMetric)
+    DECLARE_EMPTY_CTOR_DTOR(PerformanceMetric)
 
     HRESULT FinalConstruct();
     void FinalRelease();
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (pm::Metric *aMetric);
-    HRESULT init (pm::BaseMetric *aMetric);
+    HRESULT init(pm::Metric *aMetric);
+    HRESULT init(pm::BaseMetric *aMetric);
     void uninit();
 
-    // IPerformanceMetric properties
-    STDMETHOD(COMGETTER(MetricName)) (BSTR *aMetricName);
-    STDMETHOD(COMGETTER(Object)) (IUnknown **anObject);
-    STDMETHOD(COMGETTER(Description)) (BSTR *aDescription);
-    STDMETHOD(COMGETTER(Period)) (ULONG *aPeriod);
-    STDMETHOD(COMGETTER(Count)) (ULONG *aCount);
-    STDMETHOD(COMGETTER(Unit)) (BSTR *aUnit);
-    STDMETHOD(COMGETTER(MinimumValue)) (LONG *aMinValue);
-    STDMETHOD(COMGETTER(MaximumValue)) (LONG *aMaxValue);
-
-    // IPerformanceMetric methods
-
-    // public methods only for internal purposes
-
-    // public methods for internal purposes only
-    // (ensure there is a caller and a read lock before calling them!)
-
 private:
 
+    // wrapped IPerformanceMetric properties
+    HRESULT getMetricName(com::Utf8Str &aMetricName);
+    HRESULT getObject(ComPtr<IUnknown> &aObject);
+    HRESULT getDescription(com::Utf8Str &aDescription);
+    HRESULT getPeriod(ULONG *aPeriod);
+    HRESULT getCount(ULONG *aCount);
+    HRESULT getUnit(com::Utf8Str &aUnit);
+    HRESULT getMinimumValue(LONG *aMinimumValue);
+    HRESULT getMaximumValue(LONG *aMaximumValue);
+
     struct Data
     {
         /* Constructor. */
@@ -99,12 +81,12 @@ private:
         {
         }
 
-        Bstr             name;
+        Utf8Str          name;
         ComPtr<IUnknown> object;
-        Bstr             description;
+        Utf8Str          description;
         ULONG            period;
         ULONG            count;
-        Bstr             unit;
+        Utf8Str          unit;
         LONG             min;
         LONG             max;
     };
@@ -114,22 +96,11 @@ private:
 
 
 class ATL_NO_VTABLE PerformanceCollector :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IPerformanceCollector)
+    public PerformanceCollectorWrap
 {
 public:
 
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(PerformanceCollector, IPerformanceCollector)
-
-    DECLARE_NOT_AGGREGATABLE (PerformanceCollector)
-
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-    BEGIN_COM_MAP(PerformanceCollector)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IPerformanceCollector)
-    END_COM_MAP()
-
-    DECLARE_EMPTY_CTOR_DTOR (PerformanceCollector)
+    DECLARE_EMPTY_CTOR_DTOR(PerformanceCollector)
 
     HRESULT FinalConstruct();
     void FinalRelease();
@@ -138,43 +109,12 @@ public:
     HRESULT init();
     void uninit();
 
-    // IPerformanceCollector properties
-    STDMETHOD(COMGETTER(MetricNames)) (ComSafeArrayOut (BSTR, metricNames));
-
-    // IPerformanceCollector methods
-    STDMETHOD(GetMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
-                           ComSafeArrayIn (IUnknown *, objects),
-                           ComSafeArrayOut (IPerformanceMetric *, outMetrics));
-    STDMETHOD(SetupMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
-                             ComSafeArrayIn (IUnknown *, objects),
-                             ULONG aPeriod, ULONG aCount,
-                             ComSafeArrayOut (IPerformanceMetric *,
-                                              outMetrics));
-    STDMETHOD(EnableMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
-                              ComSafeArrayIn (IUnknown *, objects),
-                              ComSafeArrayOut (IPerformanceMetric *,
-                                               outMetrics));
-    STDMETHOD(DisableMetrics) (ComSafeArrayIn (IN_BSTR, metricNames),
-                               ComSafeArrayIn (IUnknown *, objects),
-                               ComSafeArrayOut (IPerformanceMetric *,
-                                                outMetrics));
-    STDMETHOD(QueryMetricsData) (ComSafeArrayIn (IN_BSTR, metricNames),
-                                 ComSafeArrayIn (IUnknown *, objects),
-                                 ComSafeArrayOut (BSTR, outMetricNames),
-                                 ComSafeArrayOut (IUnknown *, outObjects),
-                                 ComSafeArrayOut (BSTR, outUnits),
-                                 ComSafeArrayOut (ULONG, outScales),
-                                 ComSafeArrayOut (ULONG, outSequenceNumbers),
-                                 ComSafeArrayOut (ULONG, outDataIndices),
-                                 ComSafeArrayOut (ULONG, outDataLengths),
-                                 ComSafeArrayOut (LONG, outData));
-
     // public methods only for internal purposes
 
-    void registerBaseMetric (pm::BaseMetric *baseMetric);
-    void registerMetric (pm::Metric *metric);
-    void unregisterBaseMetricsFor (const ComPtr<IUnknown> &object, const Utf8Str name = "*");
-    void unregisterMetricsFor (const ComPtr<IUnknown> &object, const Utf8Str name = "*");
+    void registerBaseMetric(pm::BaseMetric *baseMetric);
+    void registerMetric(pm::Metric *metric);
+    void unregisterBaseMetricsFor(const ComPtr<IUnknown> &object, const Utf8Str name = "*");
+    void unregisterMetricsFor(const ComPtr<IUnknown> &object, const Utf8Str name = "*");
     void registerGuest(pm::CollectorGuest* pGuest);
     void unregisterGuest(pm::CollectorGuest* pGuest);
 
@@ -188,10 +128,41 @@ public:
     pm::CollectorGuestManager *getGuestManager() { return m.gm; };
 
 private:
-    HRESULT toIPerformanceMetric(pm::Metric *src, IPerformanceMetric **dst);
-    HRESULT toIPerformanceMetric(pm::BaseMetric *src, IPerformanceMetric **dst);
 
-    static void staticSamplerCallback (RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick);
+    // wrapped IPerformanceCollector properties
+    HRESULT getMetricNames(std::vector<com::Utf8Str> &aMetricNames);
+
+    // wrapped IPerformanceCollector methods
+    HRESULT getMetrics(const std::vector<com::Utf8Str> &aMetricNames,
+                       const std::vector<ComPtr<IUnknown> > &aObjects,
+                       std::vector<ComPtr<IPerformanceMetric> > &aMetrics);
+    HRESULT setupMetrics(const std::vector<com::Utf8Str> &aMetricNames,
+                         const std::vector<ComPtr<IUnknown> > &aObjects,
+                         ULONG aPeriod,
+                         ULONG aCount,
+                         std::vector<ComPtr<IPerformanceMetric> > &aAffectedMetrics);
+    HRESULT enableMetrics(const std::vector<com::Utf8Str> &aMetricNames,
+                          const std::vector<ComPtr<IUnknown> > &aObjects,
+                          std::vector<ComPtr<IPerformanceMetric> > &aAffectedMetrics);
+    HRESULT disableMetrics(const std::vector<com::Utf8Str> &aMetricNames,
+                           const std::vector<ComPtr<IUnknown> > &aObjects,
+                           std::vector<ComPtr<IPerformanceMetric> > &aAffectedMetrics);
+    HRESULT queryMetricsData(const std::vector<com::Utf8Str> &aMetricNames,
+                             const std::vector<ComPtr<IUnknown> > &aObjects,
+                             std::vector<com::Utf8Str> &aReturnMetricNames,
+                             std::vector<ComPtr<IUnknown> > &aReturnObjects,
+                             std::vector<com::Utf8Str> &aReturnUnits,
+                             std::vector<ULONG> &aReturnScales,
+                             std::vector<ULONG> &aReturnSequenceNumbers,
+                             std::vector<ULONG> &aReturnDataIndices,
+                             std::vector<ULONG> &aReturnDataLengths,
+                             std::vector<LONG> &aReturnData);
+
+
+    HRESULT toIPerformanceMetric(pm::Metric *src, ComPtr<IPerformanceMetric> &dst);
+    HRESULT toIPerformanceMetric(pm::BaseMetric *src, ComPtr<IPerformanceMetric> &dst);
+
+    static void staticSamplerCallback(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick);
     void samplerCallback(uint64_t iTick);
 
     const Utf8Str& getFailedGuestName();
diff --git a/src/VBox/Main/include/RemoteUSBDeviceImpl.h b/src/VBox/Main/include/RemoteUSBDeviceImpl.h
index 6de2ac4..a464046 100644
--- a/src/VBox/Main/include/RemoteUSBDeviceImpl.h
+++ b/src/VBox/Main/include/RemoteUSBDeviceImpl.h
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -21,29 +21,17 @@
 #ifndef ____H_REMOTEUSBDEVICEIMPL
 #define ____H_REMOTEUSBDEVICEIMPL
 
-#include "VirtualBoxBase.h"
+#include "HostUSBDeviceWrap.h"
 
 struct _VRDEUSBDEVICEDESC;
 typedef _VRDEUSBDEVICEDESC VRDEUSBDEVICEDESC;
 
 class ATL_NO_VTABLE RemoteUSBDevice :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IHostUSBDevice)
+    public HostUSBDeviceWrap
 {
 public:
 
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(RemoteUSBDevice, IHostUSBDevice)
-
-    DECLARE_NOT_AGGREGATABLE (RemoteUSBDevice)
-
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-    BEGIN_COM_MAP (RemoteUSBDevice)
-        COM_INTERFACE_ENTRY  (IHostUSBDevice)
-        VBOX_DEFAULT_INTERFACE_ENTRIES  (IUSBDevice)
-    END_COM_MAP()
-
-    DECLARE_EMPTY_CTOR_DTOR (RemoteUSBDevice)
+    DECLARE_EMPTY_CTOR_DTOR(RemoteUSBDevice)
 
     HRESULT FinalConstruct();
     void FinalRelease();
@@ -52,33 +40,15 @@ public:
     HRESULT init(uint32_t u32ClientId, VRDEUSBDEVICEDESC *pDevDesc, bool fDescExt);
     void uninit();
 
-    // IUSBDevice properties
-    STDMETHOD(COMGETTER(Id)) (BSTR *aId);
-    STDMETHOD(COMGETTER(VendorId)) (USHORT *aVendorId);
-    STDMETHOD(COMGETTER(ProductId)) (USHORT *aProductId);
-    STDMETHOD(COMGETTER(Revision)) (USHORT *aRevision);
-    STDMETHOD(COMGETTER(Manufacturer)) (BSTR *aManufacturer);
-    STDMETHOD(COMGETTER(Product)) (BSTR *aProduct);
-    STDMETHOD(COMGETTER(SerialNumber)) (BSTR *aSerialNumber);
-    STDMETHOD(COMGETTER(Address)) (BSTR *aAddress);
-    STDMETHOD(COMGETTER(Port)) (USHORT *aPort);
-    STDMETHOD(COMGETTER(Version)) (USHORT *aVersion);
-    STDMETHOD(COMGETTER(PortVersion)) (USHORT *aPortVersion);
-    STDMETHOD(COMGETTER(Speed)) (USBConnectionSpeed_T *aSpeed);
-    STDMETHOD(COMGETTER(Remote)) (BOOL *aRemote);
-
-    // IHostUSBDevice properties
-    STDMETHOD(COMGETTER(State)) (USBDeviceState_T *aState);
-
     // public methods only for internal purposes
-    bool dirty (void) const { return mData.dirty; }
-    void dirty (bool aDirty) { mData.dirty = aDirty; }
+    bool dirty(void) const { return mData.dirty; }
+    void dirty(bool aDirty) { mData.dirty = aDirty; }
 
-    uint16_t devId (void) const { return mData.devId; }
-    uint32_t clientId (void) { return mData.clientId; }
+    uint16_t devId(void) const { return mData.devId; }
+    uint32_t clientId(void) { return mData.clientId; }
 
-    bool captured (void) const { return mData.state == USBDeviceState_Captured; }
-    void captured (bool aCaptured)
+    bool captured(void) const { return mData.state == USBDeviceState_Captured; }
+    void captured(bool aCaptured)
     {
         if (aCaptured)
         {
@@ -94,10 +64,30 @@ public:
 
 private:
 
+    // wrapped IUSBDevice properties
+    HRESULT getId(com::Guid &aId);
+    HRESULT getVendorId(USHORT *aVendorId);
+    HRESULT getProductId(USHORT *aProductId);
+    HRESULT getRevision(USHORT *aRevision);
+    HRESULT getManufacturer(com::Utf8Str &aManufacturer);
+    HRESULT getProduct(com::Utf8Str &aProduct);
+    HRESULT getSerialNumber(com::Utf8Str &aSerialNumber);
+    HRESULT getAddress(com::Utf8Str &aAddress);
+    HRESULT getPort(USHORT *aPort);
+    HRESULT getVersion(USHORT *aVersion);
+    HRESULT getPortVersion(USHORT *aPortVersion);
+    HRESULT getSpeed(USBConnectionSpeed_T *aSpeed);
+    HRESULT getRemote(BOOL *aRemote);
+
+    // wrapped IHostUSBDevice properties
+    HRESULT getState(USBDeviceState_T *aState);
+
+
     struct Data
     {
-        Data() : vendorId (0), productId (0), revision (0), port (0), version (1),
-                 portVersion (1), speed (USBConnectionSpeed_Null), dirty (FALSE), devId (0), clientId (0) {}
+        Data() : vendorId(0), productId(0), revision(0), port(0), version(1),
+                 portVersion(1), speed(USBConnectionSpeed_Null), dirty(FALSE),
+                 devId(0), clientId(0) {}
 
         const Guid id;
 
@@ -105,11 +95,11 @@ private:
         const uint16_t productId;
         const uint16_t revision;
 
-        const Bstr manufacturer;
-        const Bstr product;
-        const Bstr serialNumber;
+        const Utf8Str manufacturer;
+        const Utf8Str product;
+        const Utf8Str serialNumber;
 
-        const Bstr address;
+        const Utf8Str address;
 
         const uint16_t port;
         const uint16_t version;
diff --git a/src/VBox/Main/include/SessionImpl.h b/src/VBox/Main/include/SessionImpl.h
index 9d619ae..676d575 100644
--- a/src/VBox/Main/include/SessionImpl.h
+++ b/src/VBox/Main/include/SessionImpl.h
@@ -140,7 +140,7 @@ private:
     HRESULT cancelSaveStateWithReason();
 
 
-    HRESULT i_unlockMachine(bool aFinalRelease, bool aFromServer);
+    HRESULT i_unlockMachine(bool aFinalRelease, bool aFromServer, AutoWriteLock &aLockW);
 
     SessionState_T mState;
     SessionType_T mType;
diff --git a/src/VBox/Main/include/StorageControllerImpl.h b/src/VBox/Main/include/StorageControllerImpl.h
index 81b9662..1306519 100644
--- a/src/VBox/Main/include/StorageControllerImpl.h
+++ b/src/VBox/Main/include/StorageControllerImpl.h
@@ -55,8 +55,6 @@ public:
     void i_setBootable(BOOL fBootable);
     void i_rollback();
     void i_commit();
-    HRESULT i_getIDEEmulationPort (LONG DevicePosition, LONG *aPortNumber);
-    HRESULT i_setIDEEmulationPort (LONG DevicePosition, LONG aPortNumber);
 
     // public methods for internal purposes only
     // (ensure there is a caller and a read lock before calling them!)
diff --git a/src/VBox/Main/include/SystemPropertiesImpl.h b/src/VBox/Main/include/SystemPropertiesImpl.h
index adffa9f..4fefab9 100644
--- a/src/VBox/Main/include/SystemPropertiesImpl.h
+++ b/src/VBox/Main/include/SystemPropertiesImpl.h
@@ -69,6 +69,7 @@ private:
     HRESULT getSerialPortCount(ULONG *aSerialPortCount);
     HRESULT getParallelPortCount(ULONG *aParallelPortCount);
     HRESULT getMaxBootPosition(ULONG *aMaxBootPosition);
+    HRESULT getRawModeSupported(BOOL *aRawModeSupported);
     HRESULT getExclusiveHwVirt(BOOL *aExclusiveHwVirt);
     HRESULT setExclusiveHwVirt(BOOL aExclusiveHwVirt);
     HRESULT getDefaultMachineFolder(com::Utf8Str &aDefaultMachineFolder);
diff --git a/src/VBox/Main/include/USBDeviceImpl.h b/src/VBox/Main/include/USBDeviceImpl.h
index 777589a..b1dbfae 100644
--- a/src/VBox/Main/include/USBDeviceImpl.h
+++ b/src/VBox/Main/include/USBDeviceImpl.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -30,13 +30,13 @@ class ATL_NO_VTABLE OUSBDevice :
 {
 public:
 
-    DECLARE_EMPTY_CTOR_DTOR (OUSBDevice)
+    DECLARE_EMPTY_CTOR_DTOR(OUSBDevice)
 
     HRESULT FinalConstruct();
     void FinalRelease();
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (IUSBDevice *a_pUSBDevice);
+    HRESULT init(IUSBDevice *a_pUSBDevice);
     void uninit();
 
     // public methods only for internal purposes
@@ -61,8 +61,9 @@ private:
 
     struct Data
     {
-        Data() : vendorId (0), productId (0), revision (0), port (0),
-                 version (1), portVersion (1), speed (USBConnectionSpeed_Null), remote (FALSE) {}
+        Data() : vendorId(0), productId(0), revision(0), port(0),
+                 version(1), portVersion(1), speed(USBConnectionSpeed_Null),
+                 remote(FALSE) {}
 
         /** The UUID of this device. */
         const Guid id;
diff --git a/src/VBox/Main/include/VirtualBoxImpl.h b/src/VBox/Main/include/VirtualBoxImpl.h
index 0a6daea..2d47353 100644
--- a/src/VBox/Main/include/VirtualBoxImpl.h
+++ b/src/VBox/Main/include/VirtualBoxImpl.h
@@ -254,6 +254,7 @@ private:
     HRESULT getRevision(ULONG *aRevision);
     HRESULT getPackageType(com::Utf8Str &aPackageType);
     HRESULT getAPIVersion(com::Utf8Str &aAPIVersion);
+    HRESULT getAPIRevision(LONG64 *aAPIRevision);
     HRESULT getHomeFolder(com::Utf8Str &aHomeFolder);
     HRESULT getSettingsFilePath(com::Utf8Str &aSettingsFilePath);
     HRESULT getHost(ComPtr<IHost> &aHost);
diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp
index 26eab30..314ae13 100644
--- a/src/VBox/Main/src-all/Global.cpp
+++ b/src/VBox/Main/src-all/Global.cpp
@@ -32,349 +32,349 @@ const Global::OSType Global::sOSTypes[] =
     { "Other",   "Other",             "Other",              "Other/Unknown",
       VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,
         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 },
     { "Other",   "Other",             "Other_64",           "Other/Unknown (64-bit)",
       VBOXOSTYPE_Unknown_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
+      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 },
     { "Windows", "Microsoft Windows", "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16  },
     { "Windows", "Microsoft Windows", "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16  },
     { "Windows", "Microsoft Windows", "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16  },
     { "Windows", "Microsoft Windows", "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
     { "Windows", "Microsoft Windows", "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16  },
     { "Windows", "Microsoft Windows", "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  },
-    { "Windows", "Microsoft Windows", "WindowsXP",          "Windows XP (32 bit)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "Windows", "Microsoft Windows", "WindowsXP",          "Windows XP (32-bit)",
       VBOXOSTYPE_WinXP,            VBOXOSHINT_USBTABLET,
        192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-    { "Windows", "Microsoft Windows", "WindowsXP_64",       "Windows XP (64 bit)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "Windows", "Microsoft Windows", "WindowsXP_64",       "Windows XP (64-bit)",
       VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
        512,  16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-    { "Windows", "Microsoft Windows", "Windows2003",        "Windows 2003 (32 bit)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "Windows", "Microsoft Windows", "Windows2003",        "Windows 2003 (32-bit)",
       VBOXOSTYPE_Win2k3,           VBOXOSHINT_USBTABLET,
        512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-    { "Windows", "Microsoft Windows", "Windows2003_64",     "Windows 2003 (64 bit)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "Windows", "Microsoft Windows", "Windows2003_64",     "Windows 2003 (64-bit)",
       VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
        512,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA  },
-    { "Windows", "Microsoft Windows", "WindowsVista",       "Windows Vista (32 bit)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "WindowsVista",       "Windows Vista (32-bit)",
       VBOXOSTYPE_WinVista,         VBOXOSHINT_USBTABLET,
-       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-    { "Windows", "Microsoft Windows", "WindowsVista_64",    "Windows Vista (64 bit)",
+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "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  },
-    { "Windows", "Microsoft Windows", "Windows2008",        "Windows 2008 (32 bit)",
+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "Windows2008",        "Windows 2008 (32-bit)",
       VBOXOSTYPE_Win2k8,           VBOXOSHINT_USBTABLET,
-       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-    { "Windows", "Microsoft Windows", "Windows2008_64",     "Windows 2008 (64 bit)",
+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "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  },
-    { "Windows", "Microsoft Windows", "Windows7",           "Windows 7 (32 bit)",
+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "Windows7",           "Windows 7 (32-bit)",
       VBOXOSTYPE_Win7,             VBOXOSHINT_USBTABLET,
-       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-    { "Windows", "Microsoft Windows", "Windows7_64",        "Windows 7 (64 bit)",
+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "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  },
-    { "Windows", "Microsoft Windows", "Windows8",           "Windows 8 (32 bit)",
+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "Windows8",           "Windows 8 (32-bit)",
       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  },
-    { "Windows", "Microsoft Windows", "Windows8_64",        "Windows 8 (64 bit)",
+       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "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  },
-    { "Windows", "Microsoft Windows", "Windows81",          "Windows 8.1 (32 bit)",
+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "Windows81",          "Windows 8.1 (32-bit)",
       VBOXOSTYPE_Win81,            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  },
-    { "Windows", "Microsoft Windows", "Windows81_64",       "Windows 8.1 (64 bit)",
+       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "Windows81_64",       "Windows 8.1 (64-bit)",
       VBOXOSTYPE_Win81_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  },
-    { "Windows", "Microsoft Windows", "Windows2012_64",     "Windows 2012 (64 bit)",
+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "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  },
-    { "Windows", "Microsoft Windows", "Windows10",          "Windows 10 (32 bit)",
+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "Windows10",          "Windows 10 (32-bit)",
       VBOXOSTYPE_Win10,            VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
-       1024,128, 32 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-    { "Windows", "Microsoft Windows", "Windows10_64",       "Windows 10 (64 bit)",
+       1024,128, 32 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "Windows10_64",       "Windows 10 (64-bit)",
       VBOXOSTYPE_Win10_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-       2048,128, 32 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-    { "Windows", "Microsoft Windows", "WindowsNT",          "Other Windows (32 bit)",
+       2048,128, 32 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "Windows", "Microsoft Windows", "WindowsNT",          "Other Windows (32-bit)",
       VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
        512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
     { "Windows", "Microsoft Windows", "WindowsNT_64",       "Other Windows (64-bit)",
       VBOXOSTYPE_WinNT_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
        512,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
     { "Linux",   "Linux",             "Linux22",            "Linux 2.2",
       VBOXOSTYPE_Linux22,         VBOXOSHINT_RTCUTC,
         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-    { "Linux",   "Linux",             "Linux24",            "Linux 2.4 (32 bit)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Linux24",            "Linux 2.4 (32-bit)",
       VBOXOSTYPE_Linux24,         VBOXOSHINT_RTCUTC,
        128,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-    { "Linux",   "Linux",             "Linux24_64",         "Linux 2.4 (64 bit)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Linux24_64",         "Linux 2.4 (64-bit)",
       VBOXOSTYPE_Linux24_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
        128,   4,  4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-    { "Linux",   "Linux",             "Linux26",            "Linux 2.6 / 3.x / 4.x (32 bit)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Linux26",            "Linux 2.6 / 3.x / 4.x (32-bit)",
       VBOXOSTYPE_Linux26,         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",             "Linux26_64",         "Linux 2.6 / 3.x / 4.x (64 bit)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Linux26_64",         "Linux 2.6 / 3.x / 4.x (64-bit)",
       VBOXOSTYPE_Linux26_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",             "ArchLinux",          "Arch Linux (32 bit)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "ArchLinux",          "Arch Linux (32-bit)",
       VBOXOSTYPE_ArchLinux,       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",             "ArchLinux_64",       "Arch Linux (64 bit)",
+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "ArchLinux_64",       "Arch Linux (64-bit)",
       VBOXOSTYPE_ArchLinux_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",             "Debian",             "Debian (32 bit)",
+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Debian",             "Debian (32-bit)",
       VBOXOSTYPE_Debian,          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",             "Debian_64",          "Debian (64 bit)",
+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Debian_64",          "Debian (64-bit)",
       VBOXOSTYPE_Debian_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",             "OpenSUSE",           "openSUSE (32 bit)",
+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980},
+    { "Linux",   "Linux",             "OpenSUSE",           "openSUSE (32-bit)",
       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)",
+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "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 (32 bit)",
+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Fedora",             "Fedora (32-bit)",
       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)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "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 (32 bit)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Gentoo",             "Gentoo (32-bit)",
       VBOXOSTYPE_Gentoo,          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",             "Gentoo_64",          "Gentoo (64 bit)",
+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Gentoo_64",          "Gentoo (64-bit)",
       VBOXOSTYPE_Gentoo_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",             "Mandriva",           "Mandriva (32 bit)",
+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Mandriva",           "Mandriva (32-bit)",
       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)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "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 (32 bit)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "RedHat",             "Red Hat (32-bit)",
       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)",
+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "RedHat_64",          "Red Hat (64-bit)",
       VBOXOSTYPE_RedHat_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
        768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-    { "Linux",   "Linux",             "Turbolinux",         "Turbolinux (32 bit)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Turbolinux",         "Turbolinux (32-bit)",
       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)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "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 (32 bit)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Ubuntu",             "Ubuntu (32-bit)",
       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)",
+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "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 (32 bit)",
+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Xandros",            "Xandros (32-bit)",
       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)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "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 (32 bit)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Oracle",             "Oracle (32-bit)",
       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)",
+       768,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Oracle_64",          "Oracle (64-bit)",
       VBOXOSTYPE_Oracle_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
        768,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-    { "Linux",   "Linux",             "Linux",              "Other Linux (32 bit)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
+    { "Linux",   "Linux",             "Linux",              "Other Linux (32-bit)",
       VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
        256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980  },
     { "Linux",   "Linux",             "Linux_64",           "Other Linux (64-bit)",
       VBOXOSTYPE_Linux_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-    { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier (32 bit)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier (32-bit)",
       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)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "Solaris", "Solaris",           "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 (32 bit)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "Solaris", "Solaris",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later (32-bit)",
       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)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "Solaris", "Solaris",           "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)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "Solaris", "Solaris",           "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 (32 bit)",
+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "BSD",     "BSD",               "FreeBSD",            "FreeBSD (32-bit)",
       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)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "BSD",     "BSD",               "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 (32 bit)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "BSD",     "BSD",               "OpenBSD",            "OpenBSD (32-bit)",
       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)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "BSD",     "BSD",               "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 (32 bit)",
-      VBOXOSTYPE_NetBSD,          VBOXOSHINT_NONE,
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "BSD",     "BSD",               "NetBSD",             "NetBSD (32-bit)",
+      VBOXOSTYPE_NetBSD,          VBOXOSHINT_RTCUTC,
         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)",
-      VBOXOSTYPE_NetBSD_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
+    { "BSD",     "BSD",               "NetBSD_64",          "NetBSD (64-bit)",
+      VBOXOSTYPE_NetBSD_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
     { "OS2",     "IBM OS/2",          "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16  },
     { "OS2",     "IBM OS/2",          "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16  },
     { "OS2",     "IBM OS/2",          "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16  },
     { "OS2",     "IBM OS/2",          "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
     { "OS2",     "IBM OS/2",          "OS21x",              "OS/2 1.x",
       VBOXOSTYPE_OS21x,           VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB | VBOXOSHINT_TFRESET,
         8, 4, 500 * _1M, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16  },
     { "OS2",     "IBM OS/2",          "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 (32 bit)",
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16  },
+    { "MacOS",   "Mac OS X",          "MacOS",              "Mac OS X (32-bit)",
       VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE
                                 | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
       2048,   4, 20 * _1G64, NetworkAdapterType_I82545EM, 0,
        StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA,
-      ChipsetType_ICH9, AudioControllerType_HDA  },
-    { "MacOS",   "Mac OS X",          "MacOS_64",           "Mac OS X (64 bit)",
+      ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "MacOS",   "Mac OS X",          "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_RTCUTC | VBOXOSHINT_USBTABLET,
       2048,   4, 20 * _1G64, NetworkAdapterType_I82545EM, 0,
       StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA,
-      ChipsetType_ICH9, AudioControllerType_HDA  },
-    { "MacOS",   "Mac OS X",          "MacOS106",           "Mac OS X 10.6 Snow Leopard (32 bit)",
+      ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "MacOS",   "Mac OS X",          "MacOS106",           "Mac OS X 10.6 Snow Leopard (32-bit)",
       VBOXOSTYPE_MacOS106,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE
                                 | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
       2048,   4, 20 * _1G64, NetworkAdapterType_I82545EM, 0,
        StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA,
-      ChipsetType_ICH9, AudioControllerType_HDA  },
-    { "MacOS",   "Mac OS X",          "MacOS106_64",        "Mac OS X 10.6 Snow Leopard (64 bit)",
+      ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "MacOS",   "Mac OS X",          "MacOS106_64",        "Mac OS X 10.6 Snow Leopard (64-bit)",
       VBOXOSTYPE_MacOS106_x64,    VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT
                                 | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
       2048,   4, 20 * _1G64, NetworkAdapterType_I82545EM, 0,
       StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA,
-      ChipsetType_ICH9, AudioControllerType_HDA  },
-    { "MacOS",   "Mac OS X",          "MacOS107_64",        "Mac OS X 10.7 Lion (64 bit)",
+      ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "MacOS",   "Mac OS X",          "MacOS107_64",        "Mac OS X 10.7 Lion (64-bit)",
       VBOXOSTYPE_MacOS107_x64,    VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT
                                 | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
       2048,   4, 20 * _1G64, NetworkAdapterType_I82545EM, 0,
       StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA,
-      ChipsetType_ICH9, AudioControllerType_HDA  },
-    { "MacOS",   "Mac OS X",          "MacOS108_64",        "Mac OS X 10.8 Mountain Lion (64 bit)",  /* Aka "Mountain Kitten". */
+      ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "MacOS",   "Mac OS X",          "MacOS108_64",        "Mac OS X 10.8 Mountain Lion (64-bit)",  /* Aka "Mountain Kitten". */
       VBOXOSTYPE_MacOS108_x64,    VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT
                                 | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
       2048,   4, 20 * _1G64, NetworkAdapterType_I82545EM, 0,
       StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA,
-      ChipsetType_ICH9, AudioControllerType_HDA  },
-    { "MacOS",   "Mac OS X",          "MacOS109_64",        "Mac OS X 10.9 Mavericks (64 bit)", /* Not to be confused with McCain. */
+      ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221  },
+    { "MacOS",   "Mac OS X",          "MacOS109_64",        "Mac OS X 10.9 Mavericks (64-bit)", /* Not to be confused with McCain. */
       VBOXOSTYPE_MacOS109_x64,    VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT
                                 | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
       2048,   4, 20 * _1G64, NetworkAdapterType_I82545EM, 0,
       StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA,
-      ChipsetType_ICH9, AudioControllerType_HDA  },
+      ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221  },
     { "Other",   "Other",             "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16  },
     { "Other",   "Other",             "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
     { "Other",   "Other",             "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  },
+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
     { "Other",   "Other",             "QNX",                "QNX",
 #ifdef VBOX_WITH_RAW_RING1
       VBOXOSTYPE_QNX,             VBOXOSHINT_NONE,
@@ -382,11 +382,11 @@ const Global::OSType Global::sOSTypes[] =
       VBOXOSTYPE_QNX,             VBOXOSHINT_HWVIRTEX,
 #endif
        512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
+      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
     { "Other",   "Other",             "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  },
+        StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700  },
 };
 
 uint32_t Global::cOSTypes = RT_ELEMENTS(Global::sOSTypes);
diff --git a/src/VBox/Main/src-client/ConsoleImpl.cpp b/src/VBox/Main/src-client/ConsoleImpl.cpp
index 8d8e08f..60f81fd 100644
--- a/src/VBox/Main/src-client/ConsoleImpl.cpp
+++ b/src/VBox/Main/src-client/ConsoleImpl.cpp
@@ -380,10 +380,6 @@ Console::Console()
     , mVMStateChangeCallbackDisabled(false)
     , mfUseHostClipboard(true)
     , mMachineState(MachineState_PoweredOff)
-#ifdef RT_OS_WINDOWS
-    , mfNDIS6(true)
-#endif /* RT_OS_WINDOWS */
-
 {
 }
 
@@ -500,6 +496,10 @@ HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl, Loc
         rc = mGuest->init(this);
         AssertComRCReturnRC(rc);
 
+        ULONG cCpus = 1;
+        rc = mMachine->COMGETTER(CPUCount)(&cCpus);
+        mGuest->i_setCpuCount(cCpus);
+
         unconst(mKeyboard).createObject();
         rc = mKeyboard->init(this);
         AssertComRCReturnRC(rc);
@@ -1104,7 +1104,7 @@ int Console::i_VRDPClientLogon(uint32_t u32ClientId, const char *pszUser, const
         {
             guestJudgement = AuthGuestNotReacted;
 
-            // @todo r=dj locking required here for m_pVMMDev?
+            /** @todo r=dj locking required here for m_pVMMDev? */
             PPDMIVMMDEVPORT pDevPort;
             if (    (m_pVMMDev)
                  && ((pDevPort = m_pVMMDev->getVMMDevPort()))
@@ -1254,7 +1254,7 @@ int Console::i_VRDPClientLogon(uint32_t u32ClientId, const char *pszUser, const
         }
     }
 
-    // @todo r=dj locking required here for m_pVMMDev?
+    /** @todo r=dj locking required here for m_pVMMDev? */
     if (   fProvideGuestCredentials
         && m_pVMMDev)
     {
@@ -1329,7 +1329,7 @@ void Console::i_VRDPClientConnect(uint32_t u32ClientId)
     {
         pPort->pfnVRDPChange(pPort,
                              true,
-                             VRDP_EXPERIENCE_LEVEL_FULL); // @todo configurable
+                             VRDP_EXPERIENCE_LEVEL_FULL); /** @todo configurable */
     }
 
     NOREF(u32ClientId);
@@ -3895,6 +3895,7 @@ DECLCALLBACK(int) Console::i_detachStorageDevice(Console *pThis,
 
         CFGMR3Dump(pCtlInst);
     }
+#ifdef VBOX_WITH_USB
     else
     {
         /* Find the correct USB device in the list. */
@@ -3910,6 +3911,7 @@ DECLCALLBACK(int) Console::i_detachStorageDevice(Console *pThis,
         AssertRCReturn(rc, rc);
         pThis->mUSBStorageDevices.erase(it);
     }
+#endif
 
     LogFlowFunc(("Returning %Rrc\n", rcRet));
     return rcRet;
@@ -6239,20 +6241,41 @@ HRESULT Console::i_resume(Reason_T aReason, AutoWriteLock &alock)
     }
     else
     {
-        VMRESUMEREASON enmReason = VMRESUMEREASON_USER;
+        VMRESUMEREASON enmReason;
         if (aReason == Reason_HostResume)
         {
             /*
              * Host resume may be called multiple times successively. We don't want to VMR3Resume->vmR3Resume->vmR3TrySetState()
-             * to assert on us, hence check for the VM state here and bail if it's already in the 'running' state.
+             * to assert on us, hence check for the VM state here and bail if it's not in the 'suspended' state.
              * See @bugref{3495}.
+             *
+             * Also, don't resume the VM through a host-resume unless it was suspended due to a host-suspend.
              */
-            enmReason = VMRESUMEREASON_HOST_RESUME;
-            if (VMR3GetStateU(ptrVM.rawUVM()) == VMSTATE_RUNNING)
+            if (VMR3GetStateU(ptrVM.rawUVM()) != VMSTATE_SUSPENDED)
+            {
+                LogRel(("Ignoring VM resume request, VM is currently not suspended\n"));
+                return S_OK;
+            }
+            if (VMR3GetSuspendReason(ptrVM.rawUVM()) != VMSUSPENDREASON_HOST_SUSPEND)
+            {
+                LogRel(("Ignoring VM resume request, VM was not suspended due to host-suspend\n"));
                 return S_OK;
+            }
+
+            enmReason = VMRESUMEREASON_HOST_RESUME;
+        }
+        else
+        {
+            /*
+             * Any other reason to resume the VM throws an error when the VM was suspended due to a host suspend.
+             * See @bugref{7836}.
+             */
+            if (   VMR3GetStateU(ptrVM.rawUVM()) == VMSTATE_SUSPENDED
+                && VMR3GetSuspendReason(ptrVM.rawUVM()) == VMSUSPENDREASON_HOST_SUSPEND)
+                return setError(VBOX_E_INVALID_VM_STATE, tr("VM is paused due to host power management"));
+
+            enmReason = aReason == Reason_Snapshot ? VMRESUMEREASON_STATE_SAVED : VMRESUMEREASON_USER;
         }
-        else if (aReason == Reason_Snapshot)
-            enmReason = VMRESUMEREASON_STATE_SAVED;
 
         // for snapshots: no state change callback, VBoxSVC does everything
         if (aReason == Reason_Snapshot)
@@ -8502,19 +8525,19 @@ int Console::i_changeDnDMode(DnDMode_T aDnDMode)
     {
         default:
         case DnDMode_Disabled:
-            LogRel(("Changed drag and drop mode to: Off\n"));
+            LogRel(("Drag and drop mode: Off\n"));
             parm.u.uint32 = VBOX_DRAG_AND_DROP_MODE_OFF;
             break;
         case DnDMode_GuestToHost:
-            LogRel(("Changed drag and drop mode to: Guest to Host\n"));
+            LogRel(("Drag and drop mode: Guest to Host\n"));
             parm.u.uint32 = VBOX_DRAG_AND_DROP_MODE_GUEST_TO_HOST;
             break;
         case DnDMode_HostToGuest:
-            LogRel(("Changed drag and drop mode to: Host to Guest\n"));
+            LogRel(("Drag and drop mode: Host to Guest\n"));
             parm.u.uint32 = VBOX_DRAG_AND_DROP_MODE_HOST_TO_GUEST;
             break;
         case DnDMode_Bidirectional:
-            LogRel(("Changed drag and drop mode to: Bidirectional\n"));
+            LogRel(("Drag and drop mode: Bidirectional\n"));
             parm.u.uint32 = VBOX_DRAG_AND_DROP_MODE_BIDIRECTIONAL;
             break;
     }
diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-client/ConsoleImpl2.cpp
index 409fd9a..ad7e9cf 100644
--- a/src/VBox/Main/src-client/ConsoleImpl2.cpp
+++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp
@@ -748,8 +748,6 @@ DECLCALLBACK(int) Console::i_configConstructor(PUVM pUVM, PVM pVM, void *pvConso
 
 /**
  * Report versions of installed drivers to release log.
- *
- * WARNING! This method has a side effect -- it modifies mfNDIS6.
  */
 void Console::i_reportDriverVersions()
 {
@@ -763,9 +761,6 @@ void Console::i_reportDriverVersions()
     LPVOID  pVerInfo      = NULL;
     DWORD   cbVerInfo     = 0;
 
-    /* Assume NDIS6 */
-    mfNDIS6 = true;
-
     do
     {
         cNeeded = GetWindowsDirectory(szSystemRoot, RT_ELEMENTS(szSystemRoot));
@@ -820,8 +815,6 @@ void Console::i_reportDriverVersions()
             {
                 if (_tcsnicmp(TEXT("vbox"), szDriver, 4))
                     continue;
-                if (_tcsnicmp(TEXT("vboxnetflt"), szDriver, 10) == 0)
-                    mfNDIS6 = false;
             }
             else
                 continue;
@@ -852,7 +845,7 @@ void Console::i_reportDriverVersions()
                         break;
                     }
                 }
-                        
+
                 if (GetFileVersionInfo(pszDrv, NULL, cbVerInfo, pVerInfo))
                 {
                     UINT   cbSize = 0;
@@ -1026,10 +1019,11 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock)
         }
 #endif
 
-        /* Not necessary, but to make sure these two settings end up in the release log. */
         BOOL fPageFusion = FALSE;
         hrc = pMachine->COMGETTER(PageFusionEnabled)(&fPageFusion);                         H();
-        InsertConfigInteger(pRoot, "PageFusion",           fPageFusion); /* boolean */
+        InsertConfigInteger(pRoot, "PageFusionAllowed",    fPageFusion); /* boolean */
+
+        /* Not necessary, but makes sure this setting ends up in the release log. */
         ULONG ulBalloonSize = 0;
         hrc = pMachine->COMGETTER(MemoryBalloonSize)(&ulBalloonSize);                       H();
         InsertConfigInteger(pRoot, "MemBalloonSize",       ulBalloonSize);
@@ -2700,6 +2694,8 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock)
         {
             AudioControllerType_T audioController;
             hrc = audioAdapter->COMGETTER(AudioController)(&audioController);               H();
+            AudioCodecType_T audioCodec;
+            hrc = audioAdapter->COMGETTER(AudioCodec)(&audioCodec);                         H();
             switch (audioController)
             {
                 case AudioControllerType_AC97:
@@ -2710,6 +2706,15 @@ int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock)
                     InsertConfigInteger(pInst, "Trusted",          1); /* boolean */
                     hrc = pBusMgr->assignPCIDevice("ichac97", pInst);                       H();
                     InsertConfigNode(pInst,    "Config", &pCfg);
+                    switch (audioCodec)
+                    {
+                        case AudioCodecType_STAC9700:
+                            InsertConfigString(pCfg,   "Codec", "STAC9700");
+                            break;
+                        case AudioCodecType_AD1980:
+                            InsertConfigString(pCfg,   "Codec", "AD1980");
+                            break;
+                    }
                     break;
                 }
                 case AudioControllerType_SB16:
@@ -4441,6 +4446,29 @@ int Console::i_configMediumProperties(PCFGMNODE pCur, IMedium *pMedium, bool *pf
     return hrc;
 }
 
+
+#ifdef RT_OS_WINDOWS
+DECLINLINE(bool) IsNdis6(void)
+{
+    LogFlowFunc(("entry\n"));
+    HANDLE hFile = CreateFile(L"\\\\.\\VBoxNetLwf",
+                              0,
+                              FILE_SHARE_READ | FILE_SHARE_WRITE,
+                              NULL,
+                              OPEN_EXISTING,
+                              0,
+                              NULL);
+    bool fNdis6 = hFile != INVALID_HANDLE_VALUE;
+    if (fNdis6)
+        CloseHandle(hFile);
+    else
+        LogFunc(("CreateFile failed with 0x%x\n", GetLastError()));
+    LogFlowFunc(("return %s\n", fNdis6 ? "true" : "false"));
+    return fNdis6;
+}
+#endif /* RT_OS_WINDOWS */
+
+
 /**
  *  Construct the Network configuration tree
  *
@@ -5295,7 +5323,7 @@ int Console::i_configNetwork(const char *pszDevice,
                 CoTaskMemFree(pswzBindName);
 
                 /* The old NDIS5.1 version of driver uses TRUNKTYPE_NETADP */
-                trunkType = mfNDIS6 ? TRUNKTYPE_NETFLT : TRUNKTYPE_NETADP;
+                trunkType = IsNdis6() ? TRUNKTYPE_NETFLT : TRUNKTYPE_NETADP;
                 InsertConfigInteger(pCfg, "TrunkType", trunkType == TRUNKTYPE_NETFLT ? kIntNetTrunkType_NetFlt : kIntNetTrunkType_NetAdp);
 
                 pAdaptorComponent.setNull();
diff --git a/src/VBox/Main/src-client/DisplayImpl.cpp b/src/VBox/Main/src-client/DisplayImpl.cpp
index b5e759b..7946eab 100644
--- a/src/VBox/Main/src-client/DisplayImpl.cpp
+++ b/src/VBox/Main/src-client/DisplayImpl.cpp
@@ -109,6 +109,9 @@ HRESULT Display::FinalConstruct()
     mfu32SupportedOrders = 0;
     mcVideoAccelVRDPRefs = 0;
 
+    mfSeamlessEnabled = false;
+    mpRectVisibleRegion = NULL;
+
 #ifdef VBOX_WITH_CROGL
     mfCrOglDataHidden = false;
 #endif
@@ -156,6 +159,7 @@ void Display::FinalRelease()
     uninit();
 
     videoAccelDestroy(&mVideoAccelLegacy);
+    i_saveVisibleRegion(0, NULL);
 
     if (RTCritSectIsInitialized(&mVideoAccelLock))
     {
@@ -953,6 +957,10 @@ int Display::i_handleDisplayResize(unsigned uScreenId, uint32_t bpp, void *pvVRA
     LogRelFlowFunc(("Calling VRDP\n"));
     mParent->i_consoleVRDPServer()->SendResize();
 
+    /* And re-send the seamless rectangles if necessary. */
+    if (mfSeamlessEnabled)
+        i_handleSetVisibleRegion(mcRectVisibleRegion, mpRectVisibleRegion);
+
     LogRelFlowFunc(("[%d]: default format %d\n", uScreenId, pFBInfo->fDefaultFormat));
 
     return VINF_SUCCESS;
@@ -1124,6 +1132,10 @@ void Display::i_handleUpdateVBVAInputMapping(int32_t xOrigin, int32_t yOrigin, u
     yInputMappingOrigin = yOrigin;
     cxInputMapping      = cx;
     cyInputMapping      = cy;
+
+    /* Re-send the seamless rectangles if necessary. */
+    if (mfSeamlessEnabled)
+        i_handleSetVisibleRegion(mcRectVisibleRegion, mpRectVisibleRegion);
 }
 
 /**
@@ -1248,6 +1260,28 @@ static bool displayIntersectRect(RTRECT *prectResult,
     return false;
 }
 
+int Display::i_saveVisibleRegion(uint32_t cRect, PRTRECT pRect)
+{
+    RTRECT *pRectVisibleRegion = NULL;
+
+    if (pRect == mpRectVisibleRegion)
+        return VINF_SUCCESS;
+    if (cRect != 0)
+    {
+        pRectVisibleRegion = (RTRECT *)RTMemAlloc(cRect * sizeof(RTRECT));
+        if (!pRectVisibleRegion)
+        {
+            return VERR_NO_MEMORY;
+        }
+        memcpy(pRectVisibleRegion, pRect, cRect * sizeof(RTRECT));
+    }
+    if (mpRectVisibleRegion)
+        RTMemFree(mpRectVisibleRegion);
+    mcRectVisibleRegion = cRect;
+    mpRectVisibleRegion = pRectVisibleRegion;
+    return VINF_SUCCESS;
+}
+
 int Display::i_handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect)
 {
     RTRECT *pVisibleRegion = (RTRECT *)RTMemTmpAlloc(  RT_MAX(cRect, 1)
@@ -1256,6 +1290,12 @@ int Display::i_handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect)
     {
         return VERR_NO_TMP_MEMORY;
     }
+    int rc = i_saveVisibleRegion(cRect, pRect);
+    if (RT_FAILURE(rc))
+    {
+        RTMemTmpFree(pVisibleRegion);
+        return rc;
+    }
 
     unsigned uScreenId;
     for (uScreenId = 0; uScreenId < mcMonitors; uScreenId++)
@@ -1268,10 +1308,10 @@ int Display::i_handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect)
             /* Prepare a new array of rectangles which intersect with the framebuffer.
              */
             RTRECT rectFramebuffer;
-            rectFramebuffer.xLeft   = pFBInfo->xOrigin;
-            rectFramebuffer.yTop    = pFBInfo->yOrigin;
-            rectFramebuffer.xRight  = pFBInfo->xOrigin + pFBInfo->w;
-            rectFramebuffer.yBottom = pFBInfo->yOrigin + pFBInfo->h;
+            rectFramebuffer.xLeft   = pFBInfo->xOrigin - xInputMappingOrigin;
+            rectFramebuffer.yTop    = pFBInfo->yOrigin - yInputMappingOrigin;
+            rectFramebuffer.xRight  = rectFramebuffer.xLeft + pFBInfo->w;
+            rectFramebuffer.yBottom = rectFramebuffer.yTop  + pFBInfo->h;
 
             uint32_t cRectVisibleRegion = 0;
 
@@ -1280,10 +1320,10 @@ int Display::i_handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect)
             {
                 if (displayIntersectRect(&pVisibleRegion[cRectVisibleRegion], &pRect[i], &rectFramebuffer))
                 {
-                    pVisibleRegion[cRectVisibleRegion].xLeft -= pFBInfo->xOrigin;
-                    pVisibleRegion[cRectVisibleRegion].yTop -= pFBInfo->yOrigin;
-                    pVisibleRegion[cRectVisibleRegion].xRight -= pFBInfo->xOrigin;
-                    pVisibleRegion[cRectVisibleRegion].yBottom -= pFBInfo->yOrigin;
+                    pVisibleRegion[cRectVisibleRegion].xLeft -= rectFramebuffer.xLeft;
+                    pVisibleRegion[cRectVisibleRegion].yTop -= rectFramebuffer.yTop;
+                    pVisibleRegion[cRectVisibleRegion].xRight -= rectFramebuffer.xLeft;
+                    pVisibleRegion[cRectVisibleRegion].yBottom -= rectFramebuffer.yTop;
 
                     cRectVisibleRegion++;
                 }
@@ -1312,7 +1352,7 @@ int Display::i_handleSetVisibleRegion(uint32_t cRect, PRTRECT pRect)
                 pCtl->aParms[0].u.pointer.addr = pRectsCopy;
                 pCtl->aParms[0].u.pointer.size = cRect * sizeof(RTRECT);
 
-                int rc = i_crCtlSubmit(&pCtl->Hdr, sizeof(*pCtl), i_displayCrCmdFree, pCtl);
+                rc = i_crCtlSubmit(&pCtl->Hdr, sizeof(*pCtl), i_displayCrCmdFree, pCtl);
                 if (!RT_SUCCESS(rc))
                 {
                     AssertMsgFailed(("crCtlSubmit failed (rc=%Rrc)\n", rc));
@@ -1765,6 +1805,7 @@ HRESULT Display::setSeamlessMode(BOOL enabled)
         if (pVMMDevPort)
             pVMMDevPort->pfnRequestSeamlessChange(pVMMDevPort, !!enabled);
     }
+    mfSeamlessEnabled = enabled;
 
 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
     if (!enabled)
diff --git a/src/VBox/Main/src-client/GuestDnDPrivate.cpp b/src/VBox/Main/src-client/GuestDnDPrivate.cpp
index af32cc4..65f3df7 100644
--- a/src/VBox/Main/src-client/GuestDnDPrivate.cpp
+++ b/src/VBox/Main/src-client/GuestDnDPrivate.cpp
@@ -834,8 +834,6 @@ void GuestDnDBase::msgQueueClear(void)
 
 int GuestDnDBase::sendCancel(void)
 {
-    LogFlowFunc(("Generating cancel request ...\n"));
-
     int rc;
     try
     {
@@ -849,6 +847,7 @@ int GuestDnDBase::sendCancel(void)
         rc = VERR_NO_MEMORY;
     }
 
+    LogFlowFunc(("Generated cancelling request, rc=%Rrc\n", rc));
     return rc;
 }
 
@@ -873,17 +872,17 @@ int GuestDnDBase::waitForEvent(RTMSINTERVAL msTimeout, GuestDnDCallbackEvent &Ev
             break;
         }
         else if (rc == VERR_TIMEOUT) /* Continue waiting. */
-            continue;
+            rc = VINF_SUCCESS;
 
         if (   msTimeout != RT_INDEFINITE_WAIT
             && RTTimeMilliTS() - tsStart > msTimeout)
         {
             rc = VERR_TIMEOUT;
-            LogFlowFunc(("Guest did not respond within time\n"));
+            LogRel2(("DnD: Error: Guest did not respond within time\n"));
         }
         else if (pResp->isProgressCanceled()) /** @todo GuestDnDResponse *pResp needs to go. */
         {
-            LogFlowFunc(("Canceled by user\n"));
+            LogRel2(("DnD: Operation was canceled by user\n"));
             rc = VERR_CANCELLED;
         }
 
diff --git a/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp b/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp
index 1822763..834d49d 100644
--- a/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp
+++ b/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp
@@ -258,7 +258,7 @@ HRESULT GuestDnDSource::dragIsPending(ULONG uScreenId, std::vector<com::Utf8Str>
         GuestDnDResponse *pResp = GuestDnDInst()->response();
         if (pResp)
         {
-            if (pResp->waitForGuestResponse() == VERR_TIMEOUT)
+            if (pResp->waitForGuestResponse(5000 /* Timeout in ms */) == VERR_TIMEOUT)
                 fFetchResult = false;
 
             if (isDnDIgnoreAction(pResp->defAction()))
@@ -423,20 +423,24 @@ Utf8Str GuestDnDSource::i_guestErrorToString(int guestRc)
         case VERR_ACCESS_DENIED:
             strError += Utf8StrFmt(tr("For one or more guest files or directories selected for transferring to the host your guest "
                                       "user does not have the appropriate access rights for. Please make sure that all selected "
-                                      "elements can be accessed and that your guest user has the appropriate rights."));
+                                      "elements can be accessed and that your guest user has the appropriate rights"));
             break;
 
         case VERR_NOT_FOUND:
             /* Should not happen due to file locking on the guest, but anyway ... */
             strError += Utf8StrFmt(tr("One or more guest files or directories selected for transferring to the host were not"
                                       "found on the guest anymore. This can be the case if the guest files were moved and/or"
-                                      "altered while the drag and drop operation was in progress."));
+                                      "altered while the drag and drop operation was in progress"));
             break;
 
         case VERR_SHARING_VIOLATION:
             strError += Utf8StrFmt(tr("One or more guest files or directories selected for transferring to the host were locked. "
                                       "Please make sure that all selected elements can be accessed and that your guest user has "
-                                      "the appropriate rights."));
+                                      "the appropriate rights"));
+            break;
+
+        case VERR_TIMEOUT:
+            strError += Utf8StrFmt(tr("The guest was not able to retrieve the drag and drop data within time"));
             break;
 
         default:
@@ -525,6 +529,7 @@ int GuestDnDSource::i_onReceiveData(PRECVDATACTX pCtx, const void *pvData, uint3
                     rc = pCtx->mURI.lstURI.RootFromURIData(&pCtx->mData.vecData[0], pCtx->mData.vecData.size(), 0 /* uFlags */);
                     if (RT_SUCCESS(rc))
                     {
+                        /* Reset processed bytes. */
                         pCtx->mData.cbProcessed = 0;
 
                         /*
@@ -533,7 +538,13 @@ int GuestDnDSource::i_onReceiveData(PRECVDATACTX pCtx, const void *pvData, uint3
                          */
                         pCtx->mData.cbToProcess = cbTotalSize;
 
-                        LogFlowFunc(("URI data => cbToProcess=%RU64\n", pCtx->mData.cbToProcess));
+                        /* Update our process with the data we already received.
+                         * Note: The total size will consist of the meta data (in vecData) and
+                         *       the actual accumulated file/directory data from the guest. */
+                        rc = i_updateProcess(pCtx, (uint64_t)pCtx->mData.vecData.size());
+
+                        LogFlowFunc(("URI data => cbProcessed=%RU64, cbToProcess=%RU64, rc=%Rrc\n",
+                                     pCtx->mData.cbProcessed, pCtx->mData.cbToProcess, rc));
                     }
                 }
             }
@@ -562,49 +573,13 @@ int GuestDnDSource::i_onReceiveDir(PRECVDATACTX pCtx, const char *pszPath, uint3
     {
         rc = RTDirCreateFullPath(pszDir, fMode);
         if (RT_FAILURE(rc))
-            LogRel2(("DnD: Error creating guest directory \"%s\" on the host, rc=%Rrc\n", pszDir, rc));
+            LogRel2(("DnD: Error creating guest directory '%s' on the host, rc=%Rrc\n", pszDir, rc));
 
         RTStrFree(pszDir);
     }
     else
          rc = VERR_NO_MEMORY;
 
-    if (RT_SUCCESS(rc))
-    {
-        if (mDataBase.mProtocolVersion <= 2)
-        {
-            /*
-             * Protocols v1/v2 do *not* send root element names (files/directories)
-             * in URI format. The initial GUEST_DND_GH_SND_DATA message(s) however
-             * did take those element names into account, but *with* URI decoration
-             * when it comes to communicating the total bytes being sent.
-             *
-             * So translate the path into a valid URI path and add the resulting
-             * length (+ "\r\n" and termination) to the total bytes received
-             * to keep the accounting right.
-             */
-            char *pszPathURI = RTUriCreate("file" /* pszScheme */, "/" /* pszAuthority */,
-                                           pszPath /* pszPath */,
-                                           NULL /* pszQuery */, NULL /* pszFragment */);
-            if (pszPathURI)
-            {
-                bool fHasPath = RTPathHasPath(pszPath); /* Use original data received. */
-                if (!fHasPath) /* Root path? */
-                {
-                    cbPath  = strlen(pszPathURI);
-                    cbPath += 3;                  /* Include "\r" + "\n" + termination -- see above. */
-
-                    rc = i_updateProcess(pCtx, cbPath);
-                }
-
-                LogFlowFunc(("URI pszPathURI=%s, fHasPath=%RTbool, cbPath=%RU32\n", pszPathURI, fHasPath, cbPath));
-                RTStrFree(pszPathURI);
-            }
-            else
-                rc = VERR_NO_MEMORY;
-        }
-    }
-
     LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -624,16 +599,17 @@ int GuestDnDSource::i_onReceiveFileHdr(PRECVDATACTX pCtx, const char *pszPath, u
 
     do
     {
-        if (!pCtx->mURI.objURI.IsComplete())
+        if (    pCtx->mURI.objURI.IsOpen()
+            && !pCtx->mURI.objURI.IsComplete())
         {
-            LogFlowFunc(("Warning: Object \"%s\" not complete yet\n", pCtx->mURI.objURI.GetDestPath().c_str()));
+            LogFlowFunc(("Warning: Object '%s' not complete yet\n", pCtx->mURI.objURI.GetDestPath().c_str()));
             rc = VERR_INVALID_PARAMETER;
             break;
         }
 
         if (pCtx->mURI.objURI.IsOpen()) /* File already opened? */
         {
-            LogFlowFunc(("Warning: Current opened object is \"%s\"\n", pCtx->mURI.objURI.GetDestPath().c_str()));
+            LogFlowFunc(("Warning: Current opened object is '%s'\n", pCtx->mURI.objURI.GetDestPath().c_str()));
             rc = VERR_WRONG_ORDER;
             break;
         }
@@ -681,42 +657,6 @@ int GuestDnDSource::i_onReceiveFileHdr(PRECVDATACTX pCtx, const char *pszPath, u
             break;
         }
 
-        if (mDataBase.mProtocolVersion <= 2)
-        {
-            /*
-             * Protocols v1/v2 do *not* send root element names (files/directories)
-             * in URI format. The initial GUEST_DND_GH_SND_DATA message(s) however
-             * did take those element names into account, but *with* URI decoration
-             * when it comes to communicating the total bytes being sent.
-             *
-             * So translate the path into a valid URI path and add the resulting
-             * length (+ "\r\n" and termination) to the total bytes received
-             * to keep the accounting right.
-             */
-            char *pszPathURI = RTUriCreate("file" /* pszScheme */, "/" /* pszAuthority */,
-                                           pszPath /* pszPath */,
-                                           NULL /* pszQuery */, NULL /* pszFragment */);
-            if (pszPathURI)
-            {
-                bool fHasPath = RTPathHasPath(pszPath); /* Use original data received. */
-                if (!fHasPath) /* Root path? */
-                {
-                    cbPath  = strlen(pszPathURI);
-                    cbPath += 3;                  /* Include "\r" + "\n" + termination -- see above. */
-
-                    rc = i_updateProcess(pCtx, cbPath);
-                }
-
-                LogFlowFunc(("URI pszPathURI=%s, fHasPath=%RTbool, cbPath=%RU32\n", pszPathURI, fHasPath, cbPath));
-                RTStrFree(pszPathURI);
-            }
-            else
-            {
-                rc = VERR_NO_MEMORY;
-                break;
-            }
-        }
-
     } while (0);
 
     LogFlowFuncLeaveRC(rc);
@@ -735,14 +675,14 @@ int GuestDnDSource::i_onReceiveFileData(PRECVDATACTX pCtx, const void *pvData, u
     {
         if (pCtx->mURI.objURI.IsComplete())
         {
-            LogFlowFunc(("Warning: Object \"%s\" already completed\n", pCtx->mURI.objURI.GetDestPath().c_str()));
+            LogFlowFunc(("Warning: Object '%s' already completed\n", pCtx->mURI.objURI.GetDestPath().c_str()));
             rc = VERR_WRONG_ORDER;
             break;
         }
 
         if (!pCtx->mURI.objURI.IsOpen()) /* File opened on host? */
         {
-            LogFlowFunc(("Warning: Object \"%s\" not opened\n", pCtx->mURI.objURI.GetDestPath().c_str()));
+            LogFlowFunc(("Warning: Object '%s' not opened\n", pCtx->mURI.objURI.GetDestPath().c_str()));
             rc = VERR_WRONG_ORDER;
             break;
         }
@@ -775,7 +715,10 @@ int GuestDnDSource::i_onReceiveFileData(PRECVDATACTX pCtx, const void *pvData, u
             }
         }
         else
-            LogRel(("DnD: Error writing guest file to host to \"%s\": %Rrc\n", pCtx->mURI.objURI.GetDestPath().c_str(), rc));
+        {
+            /** @todo What to do when the host's disk is full? */
+            LogRel(("DnD: Error writing guest file to host to '%s': %Rrc\n", pCtx->mURI.objURI.GetDestPath().c_str(), rc));
+        }
 
     } while (0);
 
@@ -908,15 +851,7 @@ int GuestDnDSource::i_receiveRawData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout)
         if (RT_SUCCESS(rc))
         {
             rc = waitForEvent(msTimeout, pCtx->mCallback, pCtx->mpResp);
-            if (RT_FAILURE(rc))
-            {
-                if (rc == VERR_CANCELLED)
-                    rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_CANCELLED, VINF_SUCCESS);
-                else if (rc != VERR_GSTDND_GUEST_ERROR) /* Guest-side error are already handled in the callback. */
-                    rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_ERROR, rc,
-                                                   GuestDnDSource::i_hostErrorToString(rc));
-            }
-            else
+            if (RT_SUCCESS(rc))
                 rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_COMPLETE, VINF_SUCCESS);
         }
 
@@ -931,10 +866,21 @@ int GuestDnDSource::i_receiveRawData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout)
 #undef REGISTER_CALLBACK
 #undef UNREGISTER_CALLBACK
 
-    if (rc == VERR_CANCELLED)
+    if (RT_FAILURE(rc))
     {
-        int rc2 = sendCancel();
-        AssertRC(rc2);
+        if (rc == VERR_CANCELLED)
+        {
+            int rc2 = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_CANCELLED, VINF_SUCCESS);
+            AssertRC(rc2);
+
+            rc2 = sendCancel();
+            AssertRC(rc2);
+        }
+        else if (rc != VERR_GSTDND_GUEST_ERROR) /* Guest-side error are already handled in the callback. */
+        {
+            rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_ERROR,
+                                           rc, GuestDnDSource::i_hostErrorToString(rc));
+        }
     }
 
     LogFlowFuncLeaveRC(rc);
@@ -999,17 +945,13 @@ int GuestDnDSource::i_receiveURIData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout)
         rc = pInst->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
         if (RT_SUCCESS(rc))
         {
+            LogFlowFunc(("Waiting ...\n"));
+
             rc = waitForEvent(msTimeout, pCtx->mCallback, pCtx->mpResp);
-            if (RT_FAILURE(rc))
-            {
-                if (rc == VERR_CANCELLED)
-                    rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_CANCELLED, VINF_SUCCESS);
-                else if (rc != VERR_GSTDND_GUEST_ERROR) /* Guest-side error are already handled in the callback. */
-                    rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_ERROR, rc,
-                                                   GuestDnDSource::i_hostErrorToString(rc));
-            }
-            else
+            if (RT_SUCCESS(rc))
                 rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_COMPLETE, VINF_SUCCESS);
+
+            LogFlowFunc(("Waiting ended with rc=%Rrc\n", rc));
         }
 
     } while (0);
@@ -1029,10 +971,21 @@ int GuestDnDSource::i_receiveURIData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout)
 
     int rc2;
 
-    if (rc == VERR_CANCELLED)
+    if (RT_FAILURE(rc))
     {
-        rc2 = sendCancel();
-        AssertRC(rc2);
+        if (rc == VERR_CANCELLED)
+        {
+            rc2 = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_CANCELLED, VINF_SUCCESS);
+            AssertRC(rc2);
+
+            rc2 = sendCancel();
+            AssertRC(rc2);
+        }
+        else if (rc != VERR_GSTDND_GUEST_ERROR) /* Guest-side error are already handled in the callback. */
+        {
+            rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_ERROR,
+                                           rc, GuestDnDSource::i_hostErrorToString(rc));
+        }
     }
 
     if (RT_FAILURE(rc))
@@ -1196,11 +1149,14 @@ DECLCALLBACK(int) GuestDnDSource::i_receiveURIDataCallback(uint32_t uMsg, void *
             AssertReturn(DragAndDropSvc::CB_MAGIC_DND_GH_EVT_ERROR == pCBData->hdr.u32Magic, VERR_INVALID_PARAMETER);
 
             pCtx->mpResp->reset();
+
             if (RT_SUCCESS(pCBData->rc))
                 pCBData->rc = VERR_GENERAL_FAILURE; /* Make sure some error is set. */
-            rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_ERROR, pCBData->rc);
+
+            rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_ERROR, pCBData->rc,
+                                           GuestDnDSource::i_guestErrorToString(pCBData->rc));
             if (RT_SUCCESS(rc))
-                rcCallback = pCBData->rc;
+                rcCallback = VERR_GSTDND_GUEST_ERROR;
             break;
         }
 #endif /* VBOX_WITH_DRAG_AND_DROP_GH */
@@ -1260,10 +1216,13 @@ DECLCALLBACK(int) GuestDnDSource::i_receiveURIDataCallback(uint32_t uMsg, void *
     return rc; /* Tell the guest. */
 }
 
-int GuestDnDSource::i_updateProcess(PRECVDATACTX pCtx, uint32_t cbDataAdd)
+int GuestDnDSource::i_updateProcess(PRECVDATACTX pCtx, uint64_t cbDataAdd)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
 
+    LogFlowFunc(("cbProcessed=%RU64 (+ %RU64 = %RU64), cbToProcess=%RU64\n",
+                 pCtx->mData.cbProcessed, cbDataAdd, pCtx->mData.cbProcessed + cbDataAdd, pCtx->mData.cbToProcess));
+
     pCtx->mData.cbProcessed += cbDataAdd;
     Assert(pCtx->mData.cbProcessed <= pCtx->mData.cbToProcess);
 
diff --git a/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp b/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp
index 04f6059..c52af7d 100644
--- a/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp
+++ b/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp
@@ -614,20 +614,24 @@ Utf8Str GuestDnDTarget::i_guestErrorToString(int guestRc)
         case VERR_ACCESS_DENIED:
             strError += Utf8StrFmt(tr("For one or more guest files or directories selected for transferring to the host your guest "
                                       "user does not have the appropriate access rights for. Please make sure that all selected "
-                                      "elements can be accessed and that your guest user has the appropriate rights."));
+                                      "elements can be accessed and that your guest user has the appropriate rights"));
             break;
 
         case VERR_NOT_FOUND:
             /* Should not happen due to file locking on the guest, but anyway ... */
             strError += Utf8StrFmt(tr("One or more guest files or directories selected for transferring to the host were not"
                                       "found on the guest anymore. This can be the case if the guest files were moved and/or"
-                                      "altered while the drag and drop operation was in progress."));
+                                      "altered while the drag and drop operation was in progress"));
             break;
 
         case VERR_SHARING_VIOLATION:
             strError += Utf8StrFmt(tr("One or more guest files or directories selected for transferring to the host were locked. "
                                       "Please make sure that all selected elements can be accessed and that your guest user has "
-                                      "the appropriate rights."));
+                                      "the appropriate rights"));
+            break;
+
+        case VERR_TIMEOUT:
+            strError += Utf8StrFmt(tr("The guest was not able to process the drag and drop data within time"));
             break;
 
         default:
@@ -830,8 +834,8 @@ int GuestDnDTarget::i_sendFileData(PSENDDATACTX pCtx, GuestDnDMsg *pMsg, DnDURIO
      * In protocol version 2 we only do this once with HOST_DND_HG_SND_FILE_HDR. */
     if (mDataBase.mProtocolVersion <= 1)
     {
-        pMsg->setNextString(aFile.GetSourcePath().c_str());                  /* pvName */
-        pMsg->setNextUInt32((uint32_t)(aFile.GetSourcePath().length() + 1)); /* cbName */
+        pMsg->setNextString(aFile.GetDestPath().c_str());                  /* pvName */
+        pMsg->setNextUInt32((uint32_t)(aFile.GetDestPath().length() + 1)); /* cbName */
     }
     else
     {
diff --git a/src/VBox/Main/src-client/GuestImpl.cpp b/src/VBox/Main/src-client/GuestImpl.cpp
index ac44af3..0225040 100644
--- a/src/VBox/Main/src-client/GuestImpl.cpp
+++ b/src/VBox/Main/src-client/GuestImpl.cpp
@@ -103,6 +103,9 @@ HRESULT Guest::init(Console *aParent)
     for (unsigned i = 0 ; i < GUESTSTATTYPE_MAX; i++)
         mCurrentGuestStat[i] = 0;
     mVmValidStats = pm::VMSTATMASK_NONE;
+    RT_ZERO(mCurrentGuestCpuUserStat);
+    RT_ZERO(mCurrentGuestCpuKernelStat);
+    RT_ZERO(mCurrentGuestCpuIdleStat);
 
     mMagic = GUEST_MAGIC;
     int vrc = RTTimerLRCreate(&mStatTimer, 1000 /* ms */,
@@ -113,6 +116,8 @@ HRESULT Guest::init(Console *aParent)
     if (SUCCEEDED(hr))
         hr = mEventSource->init();
 
+    mCpus = 1;
+
 #ifdef VBOX_WITH_DRAG_AND_DROP
     try
     {
@@ -702,6 +707,26 @@ HRESULT Guest::i_setStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal)
     if (enmType >= GUESTSTATTYPE_MAX)
         return E_INVALIDARG;
 
+    if (aCpuId < VMM_MAX_CPU_COUNT)
+    {
+        ULONG *paCpuStats;
+        switch (enmType)
+        {
+            case GUESTSTATTYPE_CPUUSER:   paCpuStats = mCurrentGuestCpuUserStat;   break;
+            case GUESTSTATTYPE_CPUKERNEL: paCpuStats = mCurrentGuestCpuKernelStat; break;
+            case GUESTSTATTYPE_CPUIDLE:   paCpuStats = mCurrentGuestCpuIdleStat;   break;
+            default:                      paCpuStats = NULL;                       break;
+        }
+        if (paCpuStats)
+        {
+            paCpuStats[aCpuId] = aVal;
+            aVal = 0;
+            for (uint32_t i = 0; i < mCpus && i < VMM_MAX_CPU_COUNT; i++)
+                aVal += paCpuStats[i];
+            aVal /= mCpus;
+        }
+    }
+
     mCurrentGuestStat[enmType] = aVal;
     mVmValidStats |= indexToPerfMask[enmType];
     return S_OK;
@@ -1079,4 +1104,3 @@ void Guest::i_setSupportedFeatures(uint32_t aCaps)
                      0 /*fFlags*/, &TimeSpecTS);
     /** @todo Add VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING */
 }
-
diff --git a/src/VBox/Main/src-client/MachineDebuggerImpl.cpp b/src/VBox/Main/src-client/MachineDebuggerImpl.cpp
index b782609..82df83e 100644
--- a/src/VBox/Main/src-client/MachineDebuggerImpl.cpp
+++ b/src/VBox/Main/src-client/MachineDebuggerImpl.cpp
@@ -454,11 +454,8 @@ HRESULT MachineDebugger::setLogEnabled(BOOL aLogEnabled)
 }
 
 HRESULT MachineDebugger::i_logStringProps(PRTLOGGER pLogger, PFNLOGGETSTR pfnLogGetStr,
-                                          const char *pszLogGetStr, Utf8Str astrSettings)
+                                          const char *pszLogGetStr, Utf8Str *pstrSettings)
 {
-    BSTR *a_pbstrSettings = new BSTR;
-    astrSettings.cloneTo(a_pbstrSettings);
-
     /* Make sure the VM is powered up. */
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     Console::SafeVMPtr ptrVM(mParent);
@@ -469,8 +466,7 @@ HRESULT MachineDebugger::i_logStringProps(PRTLOGGER pLogger, PFNLOGGETSTR pfnLog
     /* Make sure we've got a logger. */
     if (!pLogger)
     {
-        Bstr bstrEmpty;
-        bstrEmpty.cloneTo(a_pbstrSettings);
+        *pstrSettings = "";
         return S_OK;
     }
 
@@ -480,25 +476,20 @@ HRESULT MachineDebugger::i_logStringProps(PRTLOGGER pLogger, PFNLOGGETSTR pfnLog
     {
         char *pszBuf = (char *)RTMemTmpAlloc(cbBuf);
         AssertReturn(pszBuf, E_OUTOFMEMORY);
-
-        int rc = pfnLogGetStr(pLogger, pszBuf, cbBuf);
-        if (RT_SUCCESS(rc))
+        int vrc = pstrSettings->reserveNoThrow(cbBuf);
+        if (RT_SUCCESS(vrc))
         {
-            try
-            {
-                Bstr bstrRet(pszBuf);
-                bstrRet.detachTo(a_pbstrSettings);
-                hrc = S_OK;
-            }
-            catch (std::bad_alloc)
+            vrc = pfnLogGetStr(pLogger, pstrSettings->mutableRaw(), cbBuf);
+            if (RT_SUCCESS(vrc))
             {
-                hrc = E_OUTOFMEMORY;
+                pstrSettings->jolt();
+                return S_OK;
             }
-            RTMemTmpFree(pszBuf);
-            return hrc;
+            *pstrSettings = "";
+            AssertReturn(vrc == VERR_BUFFER_OVERFLOW, setError(VBOX_E_IPRT_ERROR, tr("%s returned %Rrc"), pszLogGetStr, vrc));
         }
-        RTMemTmpFree(pszBuf);
-        AssertReturn(rc == VERR_BUFFER_OVERFLOW, setError(VBOX_E_IPRT_ERROR, tr("%s returned %Rrc"), pszLogGetStr, rc));
+        else
+            return E_OUTOFMEMORY;
 
         /* try again with a bigger buffer. */
         cbBuf *= 2;
@@ -508,40 +499,32 @@ HRESULT MachineDebugger::i_logStringProps(PRTLOGGER pLogger, PFNLOGGETSTR pfnLog
 
 HRESULT MachineDebugger::getLogDbgFlags(com::Utf8Str &aLogDbgFlags)
 {
-    HRESULT hrc = i_logStringProps(RTLogGetDefaultInstance(), RTLogGetFlags, "RTGetFlags", aLogDbgFlags);
-
-    return hrc;
+    return i_logStringProps(RTLogGetDefaultInstance(), RTLogGetFlags, "RTGetFlags", &aLogDbgFlags);
 }
 
 HRESULT MachineDebugger::getLogDbgGroups(com::Utf8Str &aLogDbgGroups)
 {
-    HRESULT hrc = i_logStringProps(RTLogGetDefaultInstance(), RTLogGetGroupSettings, "RTLogGetGroupSettings", aLogDbgGroups);
-
-    return hrc;
+    return i_logStringProps(RTLogGetDefaultInstance(), RTLogGetGroupSettings, "RTLogGetGroupSettings", &aLogDbgGroups);
 }
 
 HRESULT MachineDebugger::getLogDbgDestinations(com::Utf8Str &aLogDbgDestinations)
 {
-    HRESULT hrc = i_logStringProps(RTLogGetDefaultInstance(), RTLogGetDestinations, "RTLogGetDestinations", aLogDbgDestinations);
-    return hrc;
+    return i_logStringProps(RTLogGetDefaultInstance(), RTLogGetDestinations, "RTLogGetDestinations", &aLogDbgDestinations);
 }
 
 HRESULT MachineDebugger::getLogRelFlags(com::Utf8Str &aLogRelFlags)
 {
-    HRESULT hrc = i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetFlags, "RTGetFlags", aLogRelFlags);
-    return hrc;
+    return i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetFlags, "RTGetFlags", &aLogRelFlags);
 }
 
 HRESULT MachineDebugger::getLogRelGroups(com::Utf8Str &aLogRelGroups)
 {
-    HRESULT hrc = i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetGroupSettings, "RTLogGetGroupSettings", aLogRelGroups);
-    return hrc;
+    return i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetGroupSettings, "RTLogGetGroupSettings", &aLogRelGroups);
 }
 
 HRESULT MachineDebugger::getLogRelDestinations(com::Utf8Str &aLogRelDestinations)
 {
-    HRESULT hrc = i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetDestinations, "RTLogGetDestinations", aLogRelDestinations);
-    return hrc;
+    return i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetDestinations, "RTLogGetDestinations", &aLogRelDestinations);
 }
 
 /**
diff --git a/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp b/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp
index 8409640..d4131ff 100644
--- a/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp
+++ b/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -33,7 +33,7 @@
 // constructor / destructor
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (RemoteUSBDevice)
+DEFINE_EMPTY_CTOR_DTOR(RemoteUSBDevice)
 
 HRESULT RemoteUSBDevice::FinalConstruct()
 {
@@ -54,7 +54,7 @@ void RemoteUSBDevice::FinalRelease()
 /**
  * Initializes the remote USB device object.
  */
-HRESULT RemoteUSBDevice::init (uint32_t u32ClientId, VRDEUSBDEVICEDESC *pDevDesc, bool fDescExt)
+HRESULT RemoteUSBDevice::init(uint32_t u32ClientId, VRDEUSBDEVICEDESC *pDevDesc, bool fDescExt)
 {
     LogFlowThisFunc(("u32ClientId=%d,pDevDesc=%p\n", u32ClientId, pDevDesc));
 
@@ -68,12 +68,12 @@ HRESULT RemoteUSBDevice::init (uint32_t u32ClientId, VRDEUSBDEVICEDESC *pDevDesc
     unconst(mData.productId)    = pDevDesc->idProduct;
     unconst(mData.revision)     = pDevDesc->bcdRev;
 
-    unconst(mData.manufacturer) = pDevDesc->oManufacturer? (char *)pDevDesc + pDevDesc->oManufacturer: "";
-    unconst(mData.product)      = pDevDesc->oProduct? (char *)pDevDesc + pDevDesc->oProduct: "";
-    unconst(mData.serialNumber) = pDevDesc->oSerialNumber? (char *)pDevDesc + pDevDesc->oSerialNumber: "";
+    unconst(mData.manufacturer) = pDevDesc->oManufacturer ? (char *)pDevDesc + pDevDesc->oManufacturer : "";
+    unconst(mData.product)      = pDevDesc->oProduct ? (char *)pDevDesc + pDevDesc->oProduct : "";
+    unconst(mData.serialNumber) = pDevDesc->oSerialNumber ? (char *)pDevDesc + pDevDesc->oSerialNumber : "";
 
     char id[64];
-    RTStrPrintf(id, sizeof (id), REMOTE_USB_BACKEND_PREFIX_S "0x%08X&0x%08X", pDevDesc->id, u32ClientId);
+    RTStrPrintf(id, sizeof(id), REMOTE_USB_BACKEND_PREFIX_S "0x%08X&0x%08X", pDevDesc->id, u32ClientId);
     unconst(mData.address)      = id;
 
     unconst(mData.port)         = pDevDesc->idPort;
@@ -164,169 +164,103 @@ void RemoteUSBDevice::uninit()
 // IUSBDevice properties
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(Id) (BSTR *aId)
+HRESULT RemoteUSBDevice::getId(com::Guid &aId)
 {
-    CheckComArgOutPointerValid(aId);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* this is const, no need to lock */
-    mData.id.toUtf16().detachTo(aId);
+    aId = mData.id;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(VendorId) (USHORT *aVendorId)
+HRESULT RemoteUSBDevice::getVendorId(USHORT *aVendorId)
 {
-    CheckComArgOutPointerValid(aVendorId);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* this is const, no need to lock */
     *aVendorId = mData.vendorId;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(ProductId) (USHORT *aProductId)
+HRESULT RemoteUSBDevice::getProductId(USHORT *aProductId)
 {
-    CheckComArgOutPointerValid(aProductId);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* this is const, no need to lock */
     *aProductId = mData.productId;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(Revision) (USHORT *aRevision)
+HRESULT RemoteUSBDevice::getRevision(USHORT *aRevision)
 {
-    CheckComArgOutPointerValid(aRevision);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* this is const, no need to lock */
     *aRevision = mData.revision;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(Manufacturer) (BSTR *aManufacturer)
+HRESULT RemoteUSBDevice::getManufacturer(com::Utf8Str &aManufacturer)
 {
-    CheckComArgOutPointerValid(aManufacturer);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* this is const, no need to lock */
-    mData.manufacturer.cloneTo(aManufacturer);
+    aManufacturer = mData.manufacturer;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(Product) (BSTR *aProduct)
+HRESULT RemoteUSBDevice::getProduct(com::Utf8Str &aProduct)
 {
-    CheckComArgOutPointerValid(aProduct);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* this is const, no need to lock */
-    mData.product.cloneTo(aProduct);
+    aProduct = mData.product;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(SerialNumber) (BSTR *aSerialNumber)
+HRESULT RemoteUSBDevice::getSerialNumber(com::Utf8Str &aSerialNumber)
 {
-    CheckComArgOutPointerValid(aSerialNumber);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* this is const, no need to lock */
-    mData.serialNumber.cloneTo(aSerialNumber);
+    aSerialNumber = mData.serialNumber;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(Address) (BSTR *aAddress)
+HRESULT RemoteUSBDevice::getAddress(com::Utf8Str &aAddress)
 {
-    CheckComArgOutPointerValid(aAddress);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* this is const, no need to lock */
-    mData.address.cloneTo(aAddress);
+    aAddress = mData.address;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(Port) (USHORT *aPort)
+HRESULT RemoteUSBDevice::getPort(USHORT *aPort)
 {
-    CheckComArgOutPointerValid(aPort);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* this is const, no need to lock */
     *aPort = mData.port;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(Version) (USHORT *aVersion)
+HRESULT RemoteUSBDevice::getVersion(USHORT *aVersion)
 {
-    CheckComArgOutPointerValid(aVersion);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* this is const, no need to lock */
     *aVersion = mData.version;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(PortVersion) (USHORT *aPortVersion)
+HRESULT RemoteUSBDevice::getPortVersion(USHORT *aPortVersion)
 {
-    CheckComArgOutPointerValid(aPortVersion);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* this is const, no need to lock */
     *aPortVersion = mData.portVersion;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(Speed) (USBConnectionSpeed_T *aSpeed)
+HRESULT RemoteUSBDevice::getSpeed(USBConnectionSpeed_T *aSpeed)
 {
-    CheckComArgOutPointerValid(aSpeed);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* this is const, no need to lock */
     *aSpeed = mData.speed;
 
     return S_OK;
 }
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(Remote) (BOOL *aRemote)
+HRESULT RemoteUSBDevice::getRemote(BOOL *aRemote)
 {
-    CheckComArgOutPointerValid(aRemote);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* RemoteUSBDevice is always remote. */
     /* this is const, no need to lock */
     *aRemote = TRUE;
@@ -337,13 +271,8 @@ STDMETHODIMP RemoteUSBDevice::COMGETTER(Remote) (BOOL *aRemote)
 // IHostUSBDevice properties
 ////////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(State) (USBDeviceState_T *aState)
+HRESULT RemoteUSBDevice::getState(USBDeviceState_T *aState)
 {
-    CheckComArgOutPointerValid(aState);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     *aState = mData.state;
diff --git a/src/VBox/Main/src-client/SessionImpl.cpp b/src/VBox/Main/src-client/SessionImpl.cpp
index a4c5223..988bc2a 100644
--- a/src/VBox/Main/src-client/SessionImpl.cpp
+++ b/src/VBox/Main/src-client/SessionImpl.cpp
@@ -122,7 +122,7 @@ void Session::uninit()
         Assert(mState == SessionState_Locked ||
                mState == SessionState_Spawning);
 
-        HRESULT rc = i_unlockMachine(true /* aFinalRelease */, false /* aFromServer */);
+        HRESULT rc = i_unlockMachine(true /* aFinalRelease */, false /* aFromServer */, alock);
         AssertComRC(rc);
     }
 
@@ -239,8 +239,7 @@ HRESULT Session::unlockMachine()
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     CHECK_OPEN();
-
-    return i_unlockMachine(false /* aFinalRelease */, false /* aFromServer */);
+    return i_unlockMachine(false /* aFinalRelease */, false /* aFromServer */, alock);
 }
 
 // IInternalSessionControl methods
@@ -534,7 +533,7 @@ HRESULT Session::uninitialize()
                         VBOX_E_INVALID_VM_STATE);
 
         /* close ourselves */
-        rc = i_unlockMachine(false /* aFinalRelease */, true /* aFromServer */);
+        rc = i_unlockMachine(false /* aFinalRelease */, true /* aFromServer */, alock);
     }
     else if (getObjectState().getState() == ObjectState::InUninit)
     {
@@ -1057,20 +1056,22 @@ HRESULT Session::cancelSaveStateWithReason()
  *
  *  @param aFinalRelease    called as a result of FinalRelease()
  *  @param aFromServer      called as a result of Uninitialize()
+ *  @param pLockW           The write lock this object is protected with.
+ *                          Must be acquired already and will be released
+ *                          and later reacquired during the unlocking.
  *
  *  @note To be called only from #uninit(), #UnlockMachine() or #Uninitialize().
- *  @note Locks this object for writing.
  */
-HRESULT Session::i_unlockMachine(bool aFinalRelease, bool aFromServer)
+HRESULT Session::i_unlockMachine(bool aFinalRelease, bool aFromServer, AutoWriteLock &aLockW)
 {
     LogFlowThisFuncEnter();
     LogFlowThisFunc(("aFinalRelease=%d, isFromServer=%d\n",
                       aFinalRelease, aFromServer));
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     LogFlowThisFunc(("mState=%s, mType=%d\n", Global::stringifySessionState(mState), mType));
 
+    Assert(aLockW.isWriteLockOnCurrentThread());
+
     if (mState != SessionState_Locked)
     {
         Assert(mState == SessionState_Spawning);
@@ -1136,13 +1137,15 @@ HRESULT Session::i_unlockMachine(bool aFinalRelease, bool aFromServer)
          *  we need to release the lock to avoid deadlocks. The state is already
          *  SessionState_Closing here, so it's safe.
          */
-        alock.release();
+        aLockW.release();
+
+        Assert(!aLockW.isWriteLockOnCurrentThread());
 
         LogFlowThisFunc(("Calling mControl->OnSessionEnd()...\n"));
         HRESULT rc = mControl->OnSessionEnd(this, progress.asOutParam());
         LogFlowThisFunc(("mControl->OnSessionEnd()=%08X\n", rc));
 
-        alock.acquire();
+        aLockW.acquire();
 
         /*
          *  If we get E_UNEXPECTED this means that the direct session has already
diff --git a/src/VBox/Main/src-client/xpcom/module.cpp b/src/VBox/Main/src-client/xpcom/module.cpp
index 5f6ad5c..d32ac42 100644
--- a/src/VBox/Main/src-client/xpcom/module.cpp
+++ b/src/VBox/Main/src-client/xpcom/module.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -38,11 +38,6 @@
 
 // XPCOM glue code unfolding
 
-#ifndef VBOX_COM_INPROC_API_CLIENT
-NS_DECL_CLASSINFO(RemoteUSBDevice)
-NS_IMPL_THREADSAFE_ISUPPORTS2_CI(RemoteUSBDevice, IHostUSBDevice, IUSBDevice)
-#endif /* VBOX_COM_INPROC_API_CLIENT */
-
 /*
  * Declare extern variables here to tell the compiler that
  * NS_DECL_CLASSINFO(SessionWrap)
diff --git a/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp b/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp
index 062dcba..1e2a3e5 100644
--- a/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp
+++ b/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp
@@ -1887,7 +1887,16 @@ int main(int argc, char **argv)
             case OPT_STDERR:
             case OPT_STDOUT:
             {
+# ifdef RT_OS_WINDOWS
+                PRTUTF16 pwszName = NULL;
+                rc = RTStrToUtf16(ValueUnion.psz, &pwszName);
+                if (RT_FAILURE(rc))
+                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "Error converting '%s' to UTF-16: %Rrc\n", ValueUnion.psz, rc);
+                FILE *pFile = _wfreopen(pwszName, L"r+", ch == OPT_STDOUT ? stdout : stderr);
+                RTUtf16Free(pwszName);
+# else
                 FILE *pFile = freopen(ValueUnion.psz, "r+", ch == OPT_STDOUT ? stdout : stderr);
+# endif
                 if (!pFile)
                 {
                     rc = RTErrConvertFromErrno(errno);
diff --git a/src/VBox/Main/src-server/ApplianceImplIO.cpp b/src/VBox/Main/src-server/ApplianceImplIO.cpp
index 10b22c9..4776f8d 100644
--- a/src/VBox/Main/src-server/ApplianceImplIO.cpp
+++ b/src/VBox/Main/src-server/ApplianceImplIO.cpp
@@ -660,6 +660,9 @@ int fssRdOnlyCreateInterfaceForTarFile(const char *pszFilename, PFSSRDONLYINTERF
             PFSSRDONLYINTERFACEIO pThis = (PFSSRDONLYINTERFACEIO)RTMemAllocZ(sizeof(*pThis));
             if (pThis)
             {
+                RTVfsIoStrmRelease(hVfsIos);
+                RTVfsFileRelease(hVfsFile);
+
                 pThis->CoreIo.pfnOpen                = fssRdOnly_Open;
                 pThis->CoreIo.pfnClose               = fssRdOnly_Close;
                 pThis->CoreIo.pfnDelete              = notImpl_Delete;
@@ -681,7 +684,6 @@ int fssRdOnlyCreateInterfaceForTarFile(const char *pszFilename, PFSSRDONLYINTERF
                 *ppTarIo = pThis;
                 return VINF_SUCCESS;
             }
-
             RTVfsFsStrmRelease(hVfsFss);
         }
         RTVfsIoStrmRelease(hVfsIos);
diff --git a/src/VBox/Main/src-server/ApplianceImplImport.cpp b/src/VBox/Main/src-server/ApplianceImplImport.cpp
index 663d185..cbe2321 100644
--- a/src/VBox/Main/src-server/ApplianceImplImport.cpp
+++ b/src/VBox/Main/src-server/ApplianceImplImport.cpp
@@ -961,17 +961,19 @@ HRESULT Appliance::i_readFSOVF(TaskOVF *pTask)
                 vrc = RTFileOpen(&pFile, strMfFile.c_str(), RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE);
                 if (RT_SUCCESS(vrc) && pFile != NULL)
                 {
-                    uint64_t cbFile = 0;
-                    uint64_t maxFileSize = _1M;
+                    uint64_t cbFile64 = 0;
+                    uint32_t maxFileSize = _1M;
                     size_t cbRead = 0;
+                    size_t cbFile;
                     void  *pBuf; /** @todo r=bird: You leak this buffer! throwing stuff is evil. */
 
-                    vrc = RTFileGetSize(pFile, &cbFile);
-                    if (cbFile > maxFileSize)
+                    vrc = RTFileGetSize(pFile, &cbFile64);
+                    if (cbFile64 > maxFileSize)
                         throw setError(VBOX_E_FILE_ERROR,
                                 tr("Size of the manifest file '%s' is bigger than 1Mb. Check it, please."),
                                 RTPathFilename(strMfFile.c_str()));
 
+                    cbFile = (size_t)cbFile64;    /* We know it's <= 1M. */
                     if (RT_SUCCESS(vrc))
                        pBuf = RTMemAllocZ(cbFile);
                     else
@@ -2443,7 +2445,7 @@ void Appliance::i_importOneDiskImage(const ovf::DiskImage &di,
 
             if ((pszSuff = RTPathSuffix(strTargetPath->c_str()))!=NULL)
             {
-                /* 
+                /*
                  * Figure out which format the user like to have. Default is VMDK
                  * or it can be VDI if according command-line option is set
                  */
diff --git a/src/VBox/Main/src-server/AudioAdapterImpl.cpp b/src/VBox/Main/src-server/AudioAdapterImpl.cpp
index 65a3260..c1c864a 100644
--- a/src/VBox/Main/src-server/AudioAdapterImpl.cpp
+++ b/src/VBox/Main/src-server/AudioAdapterImpl.cpp
@@ -32,12 +32,14 @@ struct AudioAdapterData
     AudioAdapterData() :
         mEnabled(false),
         mAudioDriver(AudioDriverType_Null),
-        mAudioController(AudioControllerType_AC97)
+        mAudioController(AudioControllerType_AC97),
+        mAudioCodec(AudioCodecType_STAC9700)
     {}
 
     BOOL mEnabled;
     AudioDriverType_T mAudioDriver;
     AudioControllerType_T mAudioController;
+    AudioCodecType_T mAudioCodec;
     settings::StringsMap  properties;
 };
 
@@ -347,6 +349,75 @@ HRESULT AudioAdapter::setAudioController(AudioControllerType_T aAudioController)
     return rc;
 }
 
+HRESULT AudioAdapter::getAudioCodec(AudioCodecType_T *aAudioCodec)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aAudioCodec = mData->m->mAudioCodec;
+
+    return S_OK;
+}
+
+HRESULT AudioAdapter::setAudioCodec(AudioCodecType_T aAudioCodec)
+{
+    /* the machine needs to be mutable */
+    AutoMutableStateDependency adep(mParent);
+    if (FAILED(adep.rc())) return adep.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = S_OK;
+
+    /*
+     * which audio hardware type are we supposed to use?
+     */
+    switch (mData->m->mAudioController)
+    {
+        case AudioControllerType_AC97:
+        {
+            if (   (aAudioCodec != AudioCodecType_STAC9700)
+                && (aAudioCodec != AudioCodecType_AD1980))
+                rc = E_INVALIDARG;
+            break;
+        }
+
+        case AudioControllerType_SB16:
+        {
+            if (aAudioCodec != AudioCodecType_SB16)
+                rc = E_INVALIDARG;
+            break;
+        }
+
+        case AudioControllerType_HDA:
+        {
+            if (aAudioCodec != AudioCodecType_STAC9221)
+                rc = E_INVALIDARG;
+            break;
+        }
+
+        default:
+            AssertMsgFailed (("Wrong audio controller type %d\n",
+                              mData->m->mAudioController));
+            rc = E_FAIL;
+    }
+
+    if (!SUCCEEDED(rc))
+        return setError(rc,
+                        tr ("Invalid audio codec type %d"),
+                        aAudioCodec);
+
+    if (mData->m->mAudioCodec != aAudioCodec)
+    {
+        mData->m.backup();
+        mData->m->mAudioCodec = aAudioCodec;
+        alock.release();
+        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);  // mParent is const, needs no locking
+        mParent->i_setModified(Machine::IsModified_AudioAdapter);
+    }
+
+    return rc;
+}
+
 HRESULT AudioAdapter::getPropertiesList(std::vector<com::Utf8Str>& aProperties)
 {
     using namespace settings;
@@ -436,6 +507,7 @@ HRESULT AudioAdapter::i_loadSettings(const settings::AudioAdapter &data)
 
     mData->m->mEnabled = data.fEnabled;
     mData->m->mAudioController = data.controllerType;
+    mData->m->mAudioCodec = data.codecType;
     mData->m->mAudioDriver = data.driverType;
 
     settings::StringsMap::const_iterator cit = data.properties.begin();
@@ -464,6 +536,7 @@ HRESULT AudioAdapter::i_saveSettings(settings::AudioAdapter &data)
 
     data.fEnabled = !!mData->m->mEnabled;
     data.controllerType = mData->m->mAudioController;
+    data.codecType = mData->m->mAudioCodec;
     data.driverType = mData->m->mAudioDriver;
 
     settings::StringsMap::const_iterator cit = mData->m->properties.begin();
diff --git a/src/VBox/Main/src-server/GuestOSTypeImpl.cpp b/src/VBox/Main/src-server/GuestOSTypeImpl.cpp
index a13bb45..4587ce6 100644
--- a/src/VBox/Main/src-server/GuestOSTypeImpl.cpp
+++ b/src/VBox/Main/src-server/GuestOSTypeImpl.cpp
@@ -37,6 +37,7 @@ GuestOSType::GuestOSType()
     , mHDStorageBusType(StorageBus_IDE)
     , mChipsetType(ChipsetType_PIIX3)
     , mAudioControllerType(AudioControllerType_AC97)
+    , mAudioCodecType(AudioCodecType_STAC9700)
 {
 }
 
@@ -125,6 +126,7 @@ HRESULT GuestOSType::init(const Global::OSType &ostype)/*const char *aFamilyId,
     unconst(mHDStorageBusType)          = ostype.hdStorageBusType;
     unconst(mChipsetType)               = ostype.chipsetType;
     unconst(mAudioControllerType)       = ostype.audioControllerType;
+    unconst(mAudioCodecType)            = ostype.audioCodecType;
 
     /* Confirm a successful initialization when it's the case */
     autoInitSpan.setSucceeded();
@@ -370,6 +372,14 @@ HRESULT GuestOSType::getRecommendedAudioController(AudioControllerType_T *aAudio
 }
 
 
+HRESULT GuestOSType::getRecommendedAudioCodec(AudioCodecType_T *aAudioCodec)
+{
+    *aAudioCodec = mAudioCodecType;
+
+    return S_OK;
+}
+
+
 HRESULT GuestOSType::getRecommendedFloppy(BOOL *aRecommendedFloppy)
 {
     /* Value is constant during life time, no need to lock */
diff --git a/src/VBox/Main/src-server/HostDnsService.cpp b/src/VBox/Main/src-server/HostDnsService.cpp
index eb56bcd..ab2304b 100644
--- a/src/VBox/Main/src-server/HostDnsService.cpp
+++ b/src/VBox/Main/src-server/HostDnsService.cpp
@@ -51,7 +51,7 @@ bool HostDnsInformation::equals(const HostDnsInformation &info, uint32_t fLaxCom
     {
         std::set<std::string> l(servers.begin(), servers.end());
         std::set<std::string> r(info.servers.begin(), info.servers.end());
-        
+
         fSameServers = (l == r);
     }
 
diff --git a/src/VBox/Main/src-server/HostDnsService.h b/src/VBox/Main/src-server/HostDnsService.h
index 6531df7..b78ba17 100644
--- a/src/VBox/Main/src-server/HostDnsService.h
+++ b/src/VBox/Main/src-server/HostDnsService.h
@@ -185,7 +185,7 @@ class HostDnsServiceSolaris : public HostDnsServiceResolvConf
     HostDnsServiceSolaris(){}
     ~HostDnsServiceSolaris(){}
     virtual HRESULT init(VirtualBox *virtualbox) {
-	return HostDnsServiceResolvConf::init(virtualbox, "/etc/resolv.conf");
+        return HostDnsServiceResolvConf::init(virtualbox, "/etc/resolv.conf");
     }
 };
 
@@ -196,7 +196,7 @@ class HostDnsServiceLinux : public HostDnsServiceResolvConf
     HostDnsServiceLinux():HostDnsServiceResolvConf(true){}
     virtual ~HostDnsServiceLinux();
     virtual HRESULT init(VirtualBox *virtualbox) {
-	return HostDnsServiceResolvConf::init(virtualbox, "/etc/resolv.conf");
+        return HostDnsServiceResolvConf::init(virtualbox, "/etc/resolv.conf");
     }
 
   protected:
@@ -211,7 +211,7 @@ class HostDnsServiceFreebsd: public HostDnsServiceResolvConf
     HostDnsServiceFreebsd(){}
     ~HostDnsServiceFreebsd(){}
     virtual HRESULT init(VirtualBox *virtualbox) {
-	return HostDnsServiceResolvConf::init(virtualbox, "/etc/resolv.conf");
+        return HostDnsServiceResolvConf::init(virtualbox, "/etc/resolv.conf");
     }
 };
 
@@ -223,7 +223,7 @@ class HostDnsServiceOs2 : public HostDnsServiceResolvConf
     ~HostDnsServiceOs2(){}
     /* XXX: \\MPTN\\ETC should be taken from environment variable ETC  */
     virtual HRESULT init(VirtualBox *virtualbox) {
-	return HostDnsServiceResolvConf::init(virtualbox, "\\MPTN\\ETC\\RESOLV2");
+        return HostDnsServiceResolvConf::init(virtualbox, "\\MPTN\\ETC\\RESOLV2");
     }
 };
 
diff --git a/src/VBox/Main/src-server/HostImpl.cpp b/src/VBox/Main/src-server/HostImpl.cpp
index fa6f740..70f8bb2 100644
--- a/src/VBox/Main/src-server/HostImpl.cpp
+++ b/src/VBox/Main/src-server/HostImpl.cpp
@@ -27,6 +27,8 @@
 # include "HostUSBDeviceImpl.h"
 # include "USBDeviceFilterImpl.h"
 # include "USBProxyService.h"
+#else
+# include "VirtualBoxImpl.h"
 #endif // VBOX_WITH_USB
 
 #include "HostNetworkInterfaceImpl.h"
@@ -1646,7 +1648,7 @@ HRESULT Host::findUSBDeviceByAddress(const com::Utf8Str &aName,
                          aName.c_str());
 
 #else   /* !VBOX_WITH_USB */
-    NOREF(aAddress);
+    NOREF(aName);
     NOREF(aDevice);
     return E_NOTIMPL;
 #endif  /* !VBOX_WITH_USB */
diff --git a/src/VBox/Main/src-server/MachineImpl.cpp b/src/VBox/Main/src-server/MachineImpl.cpp
index c5836cf..ddc3c48 100644
--- a/src/VBox/Main/src-server/MachineImpl.cpp
+++ b/src/VBox/Main/src-server/MachineImpl.cpp
@@ -9125,17 +9125,6 @@ HRESULT Machine::i_loadStorageControllers(const settings::Storage &data,
         rc = pCtl->COMSETTER(UseHostIOCache)(ctlData.fUseHostIOCache);
         if (FAILED(rc)) return rc;
 
-        /* Set IDE emulation settings (only for AHCI controller). */
-        if (ctlData.controllerType == StorageControllerType_IntelAhci)
-        {
-            if (    (FAILED(rc = pCtl->i_setIDEEmulationPort(0, ctlData.lIDE0MasterEmulationPort)))
-                 || (FAILED(rc = pCtl->i_setIDEEmulationPort(1, ctlData.lIDE0SlaveEmulationPort)))
-                 || (FAILED(rc = pCtl->i_setIDEEmulationPort(2, ctlData.lIDE1MasterEmulationPort)))
-                 || (FAILED(rc = pCtl->i_setIDEEmulationPort(3, ctlData.lIDE1SlaveEmulationPort)))
-               )
-                return rc;
-        }
-
         /* Load the attached devices now. */
         rc = i_loadStorageDevices(pCtl,
                                   ctlData,
@@ -10396,17 +10385,6 @@ HRESULT Machine::i_saveStorageControllers(settings::Storage &data)
         ComAssertComRCRet(rc, rc);
         ctl.fUseHostIOCache = !!fUseHostIOCache;
 
-        /* Save IDE emulation settings. */
-        if (ctl.controllerType == StorageControllerType_IntelAhci)
-        {
-            if (    (FAILED(rc = pCtl->i_getIDEEmulationPort(0, (LONG*)&ctl.lIDE0MasterEmulationPort)))
-                 || (FAILED(rc = pCtl->i_getIDEEmulationPort(1, (LONG*)&ctl.lIDE0SlaveEmulationPort)))
-                 || (FAILED(rc = pCtl->i_getIDEEmulationPort(2, (LONG*)&ctl.lIDE1MasterEmulationPort)))
-                 || (FAILED(rc = pCtl->i_getIDEEmulationPort(3, (LONG*)&ctl.lIDE1SlaveEmulationPort)))
-               )
-                ComAssertComRCRet(rc, rc);
-        }
-
         /* save the devices now. */
         rc = i_saveStorageDevices(pCtl, ctl);
         ComAssertComRCRet(rc, rc);
@@ -14764,3 +14742,18 @@ HRESULT Machine::reportVmStatistics(ULONG aValidStats,
     NOREF(aVmNetTx);
     ReturnComNotImplemented();
 }
+
+HRESULT Machine::applyDefaults(const com::Utf8Str &aFlags)
+{
+    NOREF(aFlags);
+    ReturnComNotImplemented();
+}
+
+/* This isn't handled entirely by the wrapper generator yet. */
+#ifdef VBOX_WITH_XPCOM
+NS_DECL_CLASSINFO(SessionMachine)
+NS_IMPL_THREADSAFE_ISUPPORTS2_CI(SessionMachine, IMachine, IInternalMachineControl)
+
+NS_DECL_CLASSINFO(SnapshotMachine)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(SnapshotMachine, IMachine)
+#endif
diff --git a/src/VBox/Main/src-server/MachineImplCloneVM.cpp b/src/VBox/Main/src-server/MachineImplCloneVM.cpp
index 4013389..9681c5b 100644
--- a/src/VBox/Main/src-server/MachineImplCloneVM.cpp
+++ b/src/VBox/Main/src-server/MachineImplCloneVM.cpp
@@ -45,6 +45,7 @@ typedef struct
 typedef struct
 {
     RTCList<MEDIUMTASK>     chain;
+    DeviceType_T            devType;
     bool                    fCreateDiffs;
     bool                    fAttachLinked;
 } MEDIUMTASKCHAIN;
@@ -102,7 +103,7 @@ struct MachineCloneVMPrivate
     /* MachineCloneVM::start helper: */
     HRESULT createMachineList(const ComPtr<ISnapshot> &pSnapshot, RTCList< ComObjPtr<Machine> > &machineList) const;
     inline void updateProgressStats(MEDIUMTASKCHAIN &mtc, bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight) const;
-    inline HRESULT addSaveState(const ComObjPtr<Machine> &machine, ULONG &uCount, ULONG &uTotalWeight);
+    inline HRESULT addSaveState(const ComObjPtr<Machine> &machine, bool fAttachCurrent, ULONG &uCount, ULONG &uTotalWeight);
     inline HRESULT queryBaseName(const ComPtr<IMedium> &pMedium, Utf8Str &strBaseName) const;
     HRESULT queryMediasForMachineState(const RTCList<ComObjPtr<Machine> > &machineList,
                                        bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight);
@@ -199,7 +200,7 @@ void MachineCloneVMPrivate::updateProgressStats(MEDIUMTASKCHAIN &mtc, bool fAtta
     }
 }
 
-HRESULT MachineCloneVMPrivate::addSaveState(const ComObjPtr<Machine> &machine, ULONG &uCount, ULONG &uTotalWeight)
+HRESULT MachineCloneVMPrivate::addSaveState(const ComObjPtr<Machine> &machine, bool fAttachCurrent, ULONG &uCount, ULONG &uTotalWeight)
 {
     Bstr bstrSrcSaveStatePath;
     HRESULT rc = machine->COMGETTER(StateFilePath)(bstrSrcSaveStatePath.asOutParam());
@@ -207,7 +208,14 @@ HRESULT MachineCloneVMPrivate::addSaveState(const ComObjPtr<Machine> &machine, U
     if (!bstrSrcSaveStatePath.isEmpty())
     {
         SAVESTATETASK sst;
-        sst.snapshotUuid     = machine->i_getSnapshotId();
+        if (fAttachCurrent)
+        {
+            /* Make this saved state part of "current state" of the target
+             * machine, whether it is part of a snapshot or not. */
+            sst.snapshotUuid.clear();
+        }
+        else
+            sst.snapshotUuid = machine->i_getSnapshotId();
         sst.strSaveStateFile = bstrSrcSaveStatePath;
         uint64_t cbSize;
         int vrc = RTFileQuerySize(sst.strSaveStateFile.c_str(), &cbSize);
@@ -240,7 +248,7 @@ HRESULT MachineCloneVMPrivate::queryMediasForMachineState(const RTCList<ComObjPt
                                                           bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight)
 {
     /* This mode is pretty straightforward. We didn't need to know about any
-     * parent/children relationship and therefor simply adding all directly
+     * parent/children relationship and therefore simply adding all directly
      * attached images of the source VM as cloning targets. The IMedium code
      * take than care to merge any (possibly) existing parents into the new
      * image. */
@@ -262,20 +270,23 @@ HRESULT MachineCloneVMPrivate::queryMediasForMachineState(const RTCList<ComObjPt
             rc = pAtt->COMGETTER(Type)(&type);
             if (FAILED(rc)) return rc;
 
-            /* Only harddisk's are of interest. */
-            if (type != DeviceType_HardDisk)
+            /* Only harddisks and floppies are of interest. */
+            if (   type != DeviceType_HardDisk
+                && type != DeviceType_Floppy)
                 continue;
 
             /* Valid medium attached? */
             ComPtr<IMedium> pSrcMedium;
             rc = pAtt->COMGETTER(Medium)(pSrcMedium.asOutParam());
             if (FAILED(rc)) return rc;
+
             if (pSrcMedium.isNull())
                 continue;
 
             /* Create the medium task chain. In this case it will always
              * contain one image only. */
             MEDIUMTASKCHAIN mtc;
+            mtc.devType       = type;
             mtc.fCreateDiffs  = fCreateDiffs;
             mtc.fAttachLinked = fAttachLinked;
 
@@ -308,7 +319,7 @@ HRESULT MachineCloneVMPrivate::queryMediasForMachineState(const RTCList<ComObjPt
             llMedias.append(mtc);
         }
         /* Add the save state files of this machine if there is one. */
-        rc = addSaveState(machine, uCount, uTotalWeight);
+        rc = addSaveState(machine, true /*fAttachCurrent*/, uCount, uTotalWeight);
         if (FAILED(rc)) return rc;
     }
 
@@ -345,9 +356,10 @@ HRESULT MachineCloneVMPrivate::queryMediasForMachineAndChildStates(const RTCList
      * included.
      *
      * Note: This still leads to media chains which can have the same medium
-     * included. This case is handled in "run" and therefor not critical, but
+     * included. This case is handled in "run" and therefore not critical, but
      * it leads to wrong progress infos which isn't nice. */
 
+    Assert(!fAttachLinked);
     HRESULT rc = S_OK;
     std::map<ComPtr<IMedium>, uint32_t> mediaHist; /* Our usage histogram for the medias */
     for (size_t i = 0; i < machineList.size(); ++i)
@@ -368,8 +380,9 @@ HRESULT MachineCloneVMPrivate::queryMediasForMachineAndChildStates(const RTCList
             rc = pAtt->COMGETTER(Type)(&type);
             if (FAILED(rc)) return rc;
 
-            /* Only harddisk's are of interest. */
-            if (type != DeviceType_HardDisk)
+            /* Only harddisks and floppies are of interest. */
+            if (   type != DeviceType_HardDisk
+                && type != DeviceType_Floppy)
                 continue;
 
             /* Valid medium attached? */
@@ -381,6 +394,7 @@ HRESULT MachineCloneVMPrivate::queryMediasForMachineAndChildStates(const RTCList
                 continue;
 
             MEDIUMTASKCHAIN mtc;
+            mtc.devType       = type;
             mtc.fCreateDiffs  = fCreateDiffs;
             mtc.fAttachLinked = fAttachLinked;
 
@@ -411,8 +425,15 @@ HRESULT MachineCloneVMPrivate::queryMediasForMachineAndChildStates(const RTCList
             llMedias.append(mtc);
         }
         /* Add the save state files of this machine if there is one. */
-        rc = addSaveState(machine, uCount, uTotalWeight);
+        rc = addSaveState(machine, false /*fAttachCurrent*/, uCount, uTotalWeight);
         if (FAILED(rc)) return rc;
+        /* If this is the newly created current state, make sure that the
+         * saved state is also attached to it. */
+        if (fCreateDiffs)
+        {
+            rc = addSaveState(machine, true /*fAttachCurrent*/, uCount, uTotalWeight);
+            if (FAILED(rc)) return rc;
+        }
     }
     /* Build up the index list of the image chain. Unfortunately we can't do
      * that in the previous loop, cause there we go from child -> parent and
@@ -484,6 +505,7 @@ HRESULT MachineCloneVMPrivate::queryMediasForAllStates(const RTCList<ComObjPtr<M
     /* In this case we create a exact copy of the original VM. This means just
      * adding all directly and indirectly attached disk images to the worker
      * list. */
+    Assert(!fAttachLinked);
     HRESULT rc = S_OK;
     for (size_t i = 0; i < machineList.size(); ++i)
     {
@@ -503,14 +525,16 @@ HRESULT MachineCloneVMPrivate::queryMediasForAllStates(const RTCList<ComObjPtr<M
             rc = pAtt->COMGETTER(Type)(&type);
             if (FAILED(rc)) return rc;
 
-            /* Only harddisk's are of interest. */
-            if (type != DeviceType_HardDisk)
+            /* Only harddisks and floppies are of interest. */
+            if (   type != DeviceType_HardDisk
+                && type != DeviceType_Floppy)
                 continue;
 
             /* Valid medium attached? */
             ComPtr<IMedium> pSrcMedium;
             rc = pAtt->COMGETTER(Medium)(pSrcMedium.asOutParam());
             if (FAILED(rc)) return rc;
+
             if (pSrcMedium.isNull())
                 continue;
 
@@ -518,6 +542,7 @@ HRESULT MachineCloneVMPrivate::queryMediasForAllStates(const RTCList<ComObjPtr<M
              * not interested of any child's not attached to this VM. So this
              * will not create a full copy of the base/child relationship.) */
             MEDIUMTASKCHAIN mtc;
+            mtc.devType       = type;
             mtc.fCreateDiffs  = fCreateDiffs;
             mtc.fAttachLinked = fAttachLinked;
 
@@ -548,8 +573,15 @@ HRESULT MachineCloneVMPrivate::queryMediasForAllStates(const RTCList<ComObjPtr<M
             llMedias.append(mtc);
         }
         /* Add the save state files of this machine if there is one. */
-        rc = addSaveState(machine, uCount, uTotalWeight);
+        rc = addSaveState(machine, false /*fAttachCurrent*/, uCount, uTotalWeight);
         if (FAILED(rc)) return rc;
+        /* If this is the newly created current state, make sure that the
+         * saved state is also attached to it. */
+        if (fCreateDiffs)
+        {
+            rc = addSaveState(machine, true /*fAttachCurrent*/, uCount, uTotalWeight);
+            if (FAILED(rc)) return rc;
+        }
     }
     /* Build up the index list of the image chain. Unfortunately we can't do
      * that in the previous loop, cause there we go from child -> parent and
@@ -622,7 +654,8 @@ void MachineCloneVMPrivate::updateStorageLists(settings::StorageControllersList
              it4 != llAttachments.end();
              ++it4)
         {
-            if (   it4->deviceType == DeviceType_HardDisk
+            if (   (   it4->deviceType == DeviceType_HardDisk
+                    || it4->deviceType == DeviceType_Floppy)
                 && it4->uuid == bstrOldId)
             {
                 it4->uuid = bstrNewId;
@@ -972,6 +1005,8 @@ HRESULT MachineCloneVM::run()
 
         /* Reset media registry. */
         trgMCF.mediaRegistry.llHardDisks.clear();
+        trgMCF.mediaRegistry.llDvdImages.clear();
+        trgMCF.mediaRegistry.llFloppyImages.clear();
         /* If we got a valid snapshot id, replace the hardware/storage section
          * with the stuff from the snapshot. */
         settings::Snapshot sn;
@@ -981,8 +1016,6 @@ HRESULT MachineCloneVM::run()
                 throw p->setError(E_FAIL,
                                   p->tr("Could not find data to snapshots '%s'"), d->snapshotId.toString().c_str());
 
-
-
         if (d->mode == CloneMode_MachineState)
         {
             if (sn.uuid.isValid() && !sn.uuid.isZero())
@@ -1007,9 +1040,6 @@ HRESULT MachineCloneVM::run()
 
                 /* Current state is under root snapshot. */
                 trgMCF.uuidCurrentSnapshot = sn.uuid;
-                /* There will be created a new differencing image based on this
-                 * snapshot. So reset the modified state. */
-                trgMCF.fCurrentStateModified = false;
             }
             /* The snapshot will be the root one. */
             trgMCF.llFirstSnapshot.clear();
@@ -1128,7 +1158,11 @@ HRESULT MachineCloneVM::run()
 
                         /* Default format? */
                         Utf8Str strDefaultFormat;
-                        p->mParent->i_getDefaultHardDiskFormat(strDefaultFormat);
+                        if (mtc.devType == DeviceType_HardDisk)
+                            p->mParent->i_getDefaultHardDiskFormat(strDefaultFormat);
+                        else
+                            strDefaultFormat = "RAW";
+
                         Bstr bstrSrcFormat(strDefaultFormat);
 
                         ULONG srcVar = MediumVariant_Standard;
@@ -1206,26 +1240,28 @@ HRESULT MachineCloneVM::run()
                                            Utf8Str(bstrSrcFormat),
                                            strFile,
                                            Guid::Empty /* empty media registry */,
-                                           DeviceType_HardDisk);
+                                           mtc.devType);
                         if (FAILED(rc)) throw rc;
 
                         /* Update the new uuid. */
                         pTarget->i_updateId(newId);
 
-                        srcLock.release();
                         /* Do the disk cloning. */
                         ComPtr<IProgress> progress2;
 
                         ComObjPtr<Medium> pLMedium = static_cast<Medium*>((IMedium*)pMedium);
+                        srcLock.release();
                         rc = pLMedium->i_cloneToEx(pTarget,
                                                    srcVar,
                                                    pNewParent,
                                                    progress2.asOutParam(),
                                                    uSrcParentIdx,
                                                    uTrgParentIdx);
+                        srcLock.acquire();
                         if (FAILED(rc)) throw rc;
 
                         /* Wait until the async process has finished. */
+                        srcLock.release();
                         rc = d->pProgress->WaitForAsyncProgressCompletion(progress2);
                         srcLock.acquire();
                         if (FAILED(rc)) throw rc;
@@ -1245,14 +1281,18 @@ HRESULT MachineCloneVM::run()
                         MediumType_T type;
                         rc = pMedium->COMGETTER(Type)(&type);
                         if (FAILED(rc)) throw rc;
+                        trgLock.release();
+                        srcLock.release();
                         rc = pTarget->COMSETTER(Type)(type);
+                        srcLock.acquire();
+                        trgLock.acquire();
                         if (FAILED(rc)) throw rc;
                         map.insert(TStrMediumPair(Utf8Str(bstrSrcId), pTarget));
-                        /* register the new harddisk */
+                        /* register the new medium */
                         {
                             AutoWriteLock tlock(p->mParent->i_getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
                             rc = p->mParent->i_registerMedium(pTarget, &pTarget,
-                                                            tlock);
+                                                              tlock);
                             if (FAILED(rc)) throw rc;
                         }
                         /* This medium becomes the parent of the next medium in the
@@ -1395,6 +1435,33 @@ HRESULT MachineCloneVM::run()
             if (FAILED(rc)) throw rc;
             rc = d->pTrgMachine->i_loadMachineDataFromSettings(trgMCF, &d->pTrgMachine->mData->mUuid);
             if (FAILED(rc)) throw rc;
+
+            /* Fix up the "current state modified" flag to what it should be,
+             * as the value guessed in i_loadMachineDataFromSettings can be
+             * quite far off the logical value for the cloned VM. */
+            if (d->mode == CloneMode_MachineState)
+                d->pTrgMachine->mData->mCurrentStateModified = FALSE;
+            else if (   d->mode == CloneMode_MachineAndChildStates
+                && sn.uuid.isValid()
+                && !sn.uuid.isZero())
+            {
+                if (!d->pOldMachineState.isNull())
+                {
+                    /* There will be created a new differencing image based on
+                     * this snapshot. So reset the modified state. */
+                    d->pTrgMachine->mData->mCurrentStateModified = FALSE;
+                }
+                else
+                    d->pTrgMachine->mData->mCurrentStateModified = p->mData->mCurrentStateModified;
+            }
+            else if (d->mode == CloneMode_AllStates)
+                d->pTrgMachine->mData->mCurrentStateModified = p->mData->mCurrentStateModified;
+
+            /* If the target machine has saved state we MUST adjust the machine
+             * state, otherwise saving settings will drop the information. */
+            if (trgMCF.strStateFile.isNotEmpty())
+                d->pTrgMachine->i_setMachineState(MachineState_Saved);
+
             /* save all VM data */
             bool fNeedsGlobalSaveSettings = false;
             rc = d->pTrgMachine->i_saveSettings(&fNeedsGlobalSaveSettings, Machine::SaveS_Force);
@@ -1417,6 +1484,9 @@ HRESULT MachineCloneVM::run()
     }
     catch (HRESULT rc2)
     {
+        /* Error handling code only works correctly without locks held. */
+        trgLock.release();
+        srcLock.release();
         rc = rc2;
     }
     catch (...)
@@ -1442,7 +1512,7 @@ HRESULT MachineCloneVM::run()
         {
             const ComObjPtr<Medium> &pMedium = newMedia.at(i - 1);
             mrc = pMedium->i_deleteStorage(NULL /* aProgress */,
-                                         true /* aWait */);
+                                           true /* aWait */);
             pMedium->Close();
         }
         /* Delete the snapshot folder when not empty. */
diff --git a/src/VBox/Main/src-server/MediumImpl.cpp b/src/VBox/Main/src-server/MediumImpl.cpp
index 0ea15ff..82cc77c 100644
--- a/src/VBox/Main/src-server/MediumImpl.cpp
+++ b/src/VBox/Main/src-server/MediumImpl.cpp
@@ -3227,10 +3227,10 @@ HRESULT Medium::getEncryptionSettings(com::Utf8Str &aCipher, com::Utf8Str &aPass
         ComObjPtr<Medium> pBase = i_getBase();
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
+        /* Check whether encryption is configured for this medium. */
         settings::StringsMap::iterator it = pBase->m->mapProperties.find("CRYPT/KeyStore");
         if (it == pBase->m->mapProperties.end())
-            throw setError(VBOX_E_NOT_SUPPORTED,
-                           tr("The image is not configured for encryption"));
+            throw VBOX_E_NOT_SUPPORTED;
 
 # ifdef VBOX_WITH_EXTPACK
         static const Utf8Str strExtPackPuel("Oracle VM VirtualBox Extension Pack");
diff --git a/src/VBox/Main/src-server/NetworkAdapterImpl.cpp b/src/VBox/Main/src-server/NetworkAdapterImpl.cpp
index 9ff1c55..94685bf 100644
--- a/src/VBox/Main/src-server/NetworkAdapterImpl.cpp
+++ b/src/VBox/Main/src-server/NetworkAdapterImpl.cpp
@@ -784,7 +784,7 @@ HRESULT NetworkAdapter::getPromiscModePolicy(NetworkAdapterPromiscModePolicy_T *
 HRESULT NetworkAdapter::setPromiscModePolicy(NetworkAdapterPromiscModePolicy_T aPromiscModePolicy)
 {
     /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(mParent);
+    AutoMutableOrSavedOrRunningStateDependency adep(mParent);
     if (FAILED(adep.rc())) return adep.rc();
 
     switch (aPromiscModePolicy)
diff --git a/src/VBox/Main/src-server/Performance.cpp b/src/VBox/Main/src-server/Performance.cpp
index 4958356..10f1947 100644
--- a/src/VBox/Main/src-server/Performance.cpp
+++ b/src/VBox/Main/src-server/Performance.cpp
@@ -1332,93 +1332,42 @@ const char * AggregateMax::getName()
     return "max";
 }
 
-Filter::Filter(ComSafeArrayIn(IN_BSTR, metricNames),
-               ComSafeArrayIn(IUnknown *, objects))
+Filter::Filter(const std::vector<com::Utf8Str> &metricNames,
+               const std::vector<ComPtr<IUnknown> > &objects)
 {
-    /*
-     * Let's work around null/empty safe array mess. I am not sure there is
-     * a way to pass null arrays via webservice, I haven't found one. So I
-     * guess the users will be forced to use empty arrays instead. Constructing
-     * an empty SafeArray is a bit awkward, so what we do in this method is
-     * actually convert null arrays to empty arrays and pass them down to
-     * init() method. If someone knows how to do it better, please be my guest,
-     * fix it.
-     */
-    if (ComSafeArrayInIsNull(metricNames))
+    if (!objects.size())
     {
-        com::SafeArray<BSTR> nameArray;
-        if (ComSafeArrayInIsNull(objects))
+        if (metricNames.size())
         {
-            com::SafeIfaceArray<IUnknown> objectArray;
-            objectArray.reset(0);
-            init(ComSafeArrayAsInParam(nameArray),
-                 ComSafeArrayAsInParam(objectArray));
-        }
-        else
-        {
-            com::SafeIfaceArray<IUnknown> objectArray(ComSafeArrayInArg(objects));
-            init(ComSafeArrayAsInParam(nameArray),
-                 ComSafeArrayAsInParam(objectArray));
-        }
-    }
-    else
-    {
-        com::SafeArray<IN_BSTR> nameArray(ComSafeArrayInArg(metricNames));
-        if (ComSafeArrayInIsNull(objects))
-        {
-            com::SafeIfaceArray<IUnknown> objectArray;
-            objectArray.reset(0);
-            init(ComSafeArrayAsInParam(nameArray),
-                 ComSafeArrayAsInParam(objectArray));
-        }
-        else
-        {
-            com::SafeIfaceArray<IUnknown> objectArray(ComSafeArrayInArg(objects));
-            init(ComSafeArrayAsInParam(nameArray),
-                 ComSafeArrayAsInParam(objectArray));
-        }
-    }
-}
-
-Filter::Filter(const com::Utf8Str name, const ComPtr<IUnknown> &aObject)
-{
-    processMetricList(name, aObject);
-}
-
-void Filter::init(ComSafeArrayIn(IN_BSTR, metricNames),
-                  ComSafeArrayIn(IUnknown *, objects))
-{
-    com::SafeArray<IN_BSTR> nameArray(ComSafeArrayInArg(metricNames));
-    com::SafeIfaceArray<IUnknown> objectArray(ComSafeArrayInArg(objects));
-
-    if (!objectArray.size())
-    {
-        if (nameArray.size())
-        {
-            for (size_t i = 0; i < nameArray.size(); ++i)
-                processMetricList(com::Utf8Str(nameArray[i]), ComPtr<IUnknown>());
+            for (size_t i = 0; i < metricNames.size(); ++i)
+                processMetricList(metricNames[i], ComPtr<IUnknown>());
         }
         else
             processMetricList("*", ComPtr<IUnknown>());
     }
     else
     {
-        for (size_t i = 0; i < objectArray.size(); ++i)
-            switch (nameArray.size())
+        for (size_t i = 0; i < objects.size(); ++i)
+            switch (metricNames.size())
             {
                 case 0:
-                    processMetricList("*", objectArray[i]);
+                    processMetricList("*", objects[i]);
                     break;
                 case 1:
-                    processMetricList(com::Utf8Str(nameArray[0]), objectArray[i]);
+                    processMetricList(metricNames[0], objects[i]);
                     break;
                 default:
-                    processMetricList(com::Utf8Str(nameArray[i]), objectArray[i]);
+                    processMetricList(metricNames[i], objects[i]);
                     break;
             }
     }
 }
 
+Filter::Filter(const com::Utf8Str &name, const ComPtr<IUnknown> &aObject)
+{
+    processMetricList(name, aObject);
+}
+
 void Filter::processMetricList(const com::Utf8Str &name, const ComPtr<IUnknown> object)
 {
     size_t startPos = 0;
diff --git a/src/VBox/Main/src-server/PerformanceImpl.cpp b/src/VBox/Main/src-server/PerformanceImpl.cpp
index 1cfa2cc..fb8d221 100644
--- a/src/VBox/Main/src-server/PerformanceImpl.cpp
+++ b/src/VBox/Main/src-server/PerformanceImpl.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -189,10 +189,9 @@ HRESULT PerformanceCollector::init()
     mMagic = MAGIC;
 
     /* Start resource usage sampler */
-    int vrc = RTTimerLRCreate (&m.sampler, VBOX_USAGE_SAMPLER_MIN_INTERVAL,
-                               &PerformanceCollector::staticSamplerCallback, this);
-    AssertMsgRC (vrc, ("Failed to create resource usage "
-                       "sampling timer(%Rra)\n", vrc));
+    int vrc = RTTimerLRCreate(&m.sampler, VBOX_USAGE_SAMPLER_MIN_INTERVAL,
+                              &PerformanceCollector::staticSamplerCallback, this);
+    AssertMsgRC(vrc, ("Failed to create resource usage sampling timer(%Rra)\n", vrc));
     if (RT_FAILURE(vrc))
         rc = E_FAIL;
 
@@ -243,9 +242,8 @@ void PerformanceCollector::uninit()
     m.gm->destroyUnregistered();
 
     /* Destroy resource usage sampler */
-    int vrc = RTTimerLRDestroy (m.sampler);
-    AssertMsgRC (vrc, ("Failed to destroy resource usage "
-                       "sampling timer (%Rra)\n", vrc));
+    int vrc = RTTimerLRDestroy(m.sampler);
+    AssertMsgRC(vrc, ("Failed to destroy resource usage sampling timer (%Rra)\n", vrc));
     m.sampler = NULL;
 
     //delete m.factory;
@@ -262,24 +260,13 @@ void PerformanceCollector::uninit()
 // IPerformanceCollector properties
 ////////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP PerformanceCollector::COMGETTER(MetricNames)(ComSafeArrayOut(BSTR, theMetricNames))
+HRESULT PerformanceCollector::getMetricNames(std::vector<com::Utf8Str> &aMetricNames)
 {
-    if (ComSafeArrayOutIsNull(theMetricNames))
-        return E_POINTER;
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    com::SafeArray<BSTR> metricNames(RT_ELEMENTS(g_papcszMetricNames));
+    aMetricNames.resize(RT_ELEMENTS(g_papcszMetricNames));
     for (size_t i = 0; i < RT_ELEMENTS(g_papcszMetricNames); i++)
-    {
-        Bstr tmp(g_papcszMetricNames[i]); /* gcc-3.3 cruft */
-        tmp.cloneTo(&metricNames[i]);
-    }
-    //gMetricNames.detachTo(ComSafeArrayOutArg(theMetricNames));
-    metricNames.detachTo(ComSafeArrayOutArg(theMetricNames));
+        aMetricNames[i] = g_papcszMetricNames[i];
 
     return S_OK;
 }
@@ -287,25 +274,25 @@ STDMETHODIMP PerformanceCollector::COMGETTER(MetricNames)(ComSafeArrayOut(BSTR,
 // IPerformanceCollector methods
 ////////////////////////////////////////////////////////////////////////////////
 
-HRESULT PerformanceCollector::toIPerformanceMetric(pm::Metric *src, IPerformanceMetric **dst)
+HRESULT PerformanceCollector::toIPerformanceMetric(pm::Metric *src, ComPtr<IPerformanceMetric> &dst)
 {
     ComObjPtr<PerformanceMetric> metric;
     HRESULT rc = metric.createObject();
     if (SUCCEEDED(rc))
-        rc = metric->init (src);
+        rc = metric->init(src);
     AssertComRCReturnRC(rc);
-    metric.queryInterfaceTo(dst);
+    dst = metric;
     return rc;
 }
 
-HRESULT PerformanceCollector::toIPerformanceMetric(pm::BaseMetric *src, IPerformanceMetric **dst)
+HRESULT PerformanceCollector::toIPerformanceMetric(pm::BaseMetric *src, ComPtr<IPerformanceMetric> &dst)
 {
     ComObjPtr<PerformanceMetric> metric;
     HRESULT rc = metric.createObject();
     if (SUCCEEDED(rc))
-        rc = metric->init (src);
+        rc = metric->init(src);
     AssertComRCReturnRC(rc);
-    metric.queryInterfaceTo(dst);
+    dst = metric;
     return rc;
 }
 
@@ -317,58 +304,44 @@ const Utf8Str& PerformanceCollector::getFailedGuestName()
     return mUnknownGuest;
 }
 
-STDMETHODIMP PerformanceCollector::GetMetrics(ComSafeArrayIn(IN_BSTR, metricNames),
-                                              ComSafeArrayIn(IUnknown *, objects),
-                                              ComSafeArrayOut(IPerformanceMetric *, outMetrics))
+HRESULT PerformanceCollector::getMetrics(const std::vector<com::Utf8Str> &aMetricNames,
+                                         const std::vector<ComPtr<IUnknown> > &aObjects,
+                                         std::vector<ComPtr<IPerformanceMetric> > &aMetrics)
 {
-    LogFlowThisFuncEnter();
-    //LogFlowThisFunc(("mState=%d, mType=%d\n", mState, mType));
-
     HRESULT rc = S_OK;
 
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    pm::Filter filter (ComSafeArrayInArg (metricNames),
-                       ComSafeArrayInArg (objects));
+    pm::Filter filter(aMetricNames, aObjects);
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     MetricList filteredMetrics;
     MetricList::iterator it;
     for (it = m.metrics.begin(); it != m.metrics.end(); ++it)
-        if (filter.match ((*it)->getObject(), (*it)->getName()))
-            filteredMetrics.push_back (*it);
+        if (filter.match((*it)->getObject(), (*it)->getName()))
+            filteredMetrics.push_back(*it);
 
-    com::SafeIfaceArray<IPerformanceMetric> retMetrics (filteredMetrics.size());
+    aMetrics.resize(filteredMetrics.size());
     int i = 0;
     for (it = filteredMetrics.begin(); it != filteredMetrics.end(); ++it)
     {
         ComObjPtr<PerformanceMetric> metric;
         rc = metric.createObject();
         if (SUCCEEDED(rc))
-            rc = metric->init (*it);
+            rc = metric->init(*it);
         AssertComRCReturnRC(rc);
-        LogFlow (("PerformanceCollector::GetMetrics() store a metric at "
-                  "retMetrics[%d]...\n", i));
-        metric.queryInterfaceTo(&retMetrics[i++]);
+        LogFlow(("PerformanceCollector::GetMetrics() store a metric at retMetrics[%d]...\n", i));
+        aMetrics[i++] = metric;
     }
-    retMetrics.detachTo(ComSafeArrayOutArg(outMetrics));
-    LogFlowThisFuncLeave();
     return rc;
 }
 
-STDMETHODIMP PerformanceCollector::SetupMetrics(ComSafeArrayIn(IN_BSTR, metricNames),
-                                                ComSafeArrayIn(IUnknown *, objects),
-                                                ULONG aPeriod,
-                                                ULONG aCount,
-                                                ComSafeArrayOut(IPerformanceMetric *, outMetrics))
+HRESULT PerformanceCollector::setupMetrics(const std::vector<com::Utf8Str> &aMetricNames,
+                                           const std::vector<ComPtr<IUnknown> > &aObjects,
+                                           ULONG aPeriod,
+                                           ULONG aCount,
+                                           std::vector<ComPtr<IPerformanceMetric> > &aAffectedMetrics)
 {
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    pm::Filter filter(ComSafeArrayInArg (metricNames),
-                      ComSafeArrayInArg (objects));
+    pm::Filter filter(aMetricNames, aObjects);
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -378,21 +351,21 @@ STDMETHODIMP PerformanceCollector::SetupMetrics(ComSafeArrayIn(IN_BSTR, metricNa
     for (it = m.baseMetrics.begin(); it != m.baseMetrics.end(); ++it)
         if (filter.match((*it)->getObject(), (*it)->getName()))
         {
-            LogFlow (("PerformanceCollector::SetupMetrics() setting period to %u,"
-                      " count to %u for %s\n", aPeriod, aCount, (*it)->getName()));
+            LogFlow(("PerformanceCollector::SetupMetrics() setting period to %u, count to %u for %s\n",
+                     aPeriod, aCount, (*it)->getName()));
             (*it)->init(aPeriod, aCount);
             if (aPeriod == 0 || aCount == 0)
             {
-                LogFlow (("PerformanceCollector::SetupMetrics() disabling %s\n",
-                          (*it)->getName()));
+                LogFlow(("PerformanceCollector::SetupMetrics() disabling %s\n",
+                         (*it)->getName()));
                 rc = (*it)->disable();
                 if (FAILED(rc))
                     break;
             }
             else
             {
-                LogFlow (("PerformanceCollector::SetupMetrics() enabling %s\n",
-                          (*it)->getName()));
+                LogFlow(("PerformanceCollector::SetupMetrics() enabling %s\n",
+                         (*it)->getName()));
                 rc = (*it)->enable();
                 if (FAILED(rc))
                     break;
@@ -400,14 +373,11 @@ STDMETHODIMP PerformanceCollector::SetupMetrics(ComSafeArrayIn(IN_BSTR, metricNa
             filteredMetrics.push_back(*it);
         }
 
-    com::SafeIfaceArray<IPerformanceMetric> retMetrics(filteredMetrics.size());
+    aAffectedMetrics.resize(filteredMetrics.size());
     int i = 0;
     for (it = filteredMetrics.begin();
          it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
-        rc = toIPerformanceMetric(*it, &retMetrics[i++]);
-    retMetrics.detachTo(ComSafeArrayOutArg(outMetrics));
-
-    LogFlowThisFuncLeave();
+        rc = toIPerformanceMetric(*it, aAffectedMetrics[i++]);
 
     if (FAILED(rc))
         return setError(E_FAIL, "Failed to setup metrics for '%s'",
@@ -415,15 +385,11 @@ STDMETHODIMP PerformanceCollector::SetupMetrics(ComSafeArrayIn(IN_BSTR, metricNa
     return rc;
 }
 
-STDMETHODIMP PerformanceCollector::EnableMetrics(ComSafeArrayIn(IN_BSTR, metricNames),
-                                                 ComSafeArrayIn(IUnknown *, objects),
-                                                 ComSafeArrayOut(IPerformanceMetric *, outMetrics))
+HRESULT PerformanceCollector::enableMetrics(const std::vector<com::Utf8Str> &aMetricNames,
+                                            const std::vector<ComPtr<IUnknown> > &aObjects,
+                                            std::vector<ComPtr<IPerformanceMetric> > &aAffectedMetrics)
 {
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    pm::Filter filter(ComSafeArrayInArg(metricNames),
-                      ComSafeArrayInArg(objects));
+    pm::Filter filter(aMetricNames, aObjects);
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); /* Write lock is not needed atm since we are */
                                 /* fiddling with enable bit only, but we */
@@ -441,12 +407,11 @@ STDMETHODIMP PerformanceCollector::EnableMetrics(ComSafeArrayIn(IN_BSTR, metricN
             filteredMetrics.push_back(*it);
         }
 
-    com::SafeIfaceArray<IPerformanceMetric> retMetrics(filteredMetrics.size());
+    aAffectedMetrics.resize(filteredMetrics.size());
     int i = 0;
     for (it = filteredMetrics.begin();
          it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
-        rc = toIPerformanceMetric(*it, &retMetrics[i++]);
-    retMetrics.detachTo(ComSafeArrayOutArg(outMetrics));
+        rc = toIPerformanceMetric(*it, aAffectedMetrics[i++]);
 
     LogFlowThisFuncLeave();
 
@@ -456,15 +421,11 @@ STDMETHODIMP PerformanceCollector::EnableMetrics(ComSafeArrayIn(IN_BSTR, metricN
     return rc;
 }
 
-STDMETHODIMP PerformanceCollector::DisableMetrics(ComSafeArrayIn(IN_BSTR, metricNames),
-                                                  ComSafeArrayIn(IUnknown *, objects),
-                                                  ComSafeArrayOut(IPerformanceMetric *, outMetrics))
+HRESULT PerformanceCollector::disableMetrics(const std::vector<com::Utf8Str> &aMetricNames,
+                                             const std::vector<ComPtr<IUnknown> > &aObjects,
+                                             std::vector<ComPtr<IPerformanceMetric> > &aAffectedMetrics)
 {
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    pm::Filter filter(ComSafeArrayInArg(metricNames),
-                      ComSafeArrayInArg(objects));
+    pm::Filter filter(aMetricNames, aObjects);
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); /* Write lock is not needed atm since we are */
                                 /* fiddling with enable bit only, but we */
@@ -482,12 +443,11 @@ STDMETHODIMP PerformanceCollector::DisableMetrics(ComSafeArrayIn(IN_BSTR, metric
             filteredMetrics.push_back(*it);
         }
 
-    com::SafeIfaceArray<IPerformanceMetric> retMetrics(filteredMetrics.size());
+    aAffectedMetrics.resize(filteredMetrics.size());
     int i = 0;
     for (it = filteredMetrics.begin();
          it != filteredMetrics.end() && SUCCEEDED(rc); ++it)
-        rc = toIPerformanceMetric(*it, &retMetrics[i++]);
-    retMetrics.detachTo(ComSafeArrayOutArg(outMetrics));
+        rc = toIPerformanceMetric(*it, aAffectedMetrics[i++]);
 
     LogFlowThisFuncLeave();
 
@@ -497,22 +457,18 @@ STDMETHODIMP PerformanceCollector::DisableMetrics(ComSafeArrayIn(IN_BSTR, metric
     return rc;
 }
 
-STDMETHODIMP PerformanceCollector::QueryMetricsData(ComSafeArrayIn (IN_BSTR, metricNames),
-                                                    ComSafeArrayIn (IUnknown *, objects),
-                                                    ComSafeArrayOut(BSTR, outMetricNames),
-                                                    ComSafeArrayOut(IUnknown *, outObjects),
-                                                    ComSafeArrayOut(BSTR, outUnits),
-                                                    ComSafeArrayOut(ULONG, outScales),
-                                                    ComSafeArrayOut(ULONG, outSequenceNumbers),
-                                                    ComSafeArrayOut(ULONG, outDataIndices),
-                                                    ComSafeArrayOut(ULONG, outDataLengths),
-                                                    ComSafeArrayOut(LONG, outData))
+HRESULT PerformanceCollector::queryMetricsData(const std::vector<com::Utf8Str> &aMetricNames,
+                                               const std::vector<ComPtr<IUnknown> > &aObjects,
+                                               std::vector<com::Utf8Str> &aReturnMetricNames,
+                                               std::vector<ComPtr<IUnknown> > &aReturnObjects,
+                                               std::vector<com::Utf8Str> &aReturnUnits,
+                                               std::vector<ULONG> &aReturnScales,
+                                               std::vector<ULONG> &aReturnSequenceNumbers,
+                                               std::vector<ULONG> &aReturnDataIndices,
+                                               std::vector<ULONG> &aReturnDataLengths,
+                                               std::vector<LONG> &aReturnData)
 {
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    pm::Filter filter(ComSafeArrayInArg(metricNames),
-                      ComSafeArrayInArg(objects));
+    pm::Filter filter(aMetricNames, aObjects);
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -521,53 +477,43 @@ STDMETHODIMP PerformanceCollector::QueryMetricsData(ComSafeArrayIn (IN_BSTR, met
     MetricList filteredMetrics;
     MetricList::iterator it;
     for (it = m.metrics.begin(); it != m.metrics.end(); ++it)
-        if (filter.match ((*it)->getObject(), (*it)->getName()))
+        if (filter.match((*it)->getObject(), (*it)->getName()))
         {
-            filteredMetrics.push_back (*it);
+            filteredMetrics.push_back(*it);
             flatSize += (*it)->getLength();
         }
 
     int i = 0;
     size_t flatIndex = 0;
     size_t numberOfMetrics = filteredMetrics.size();
-    com::SafeArray<BSTR> retNames(numberOfMetrics);
-    com::SafeIfaceArray<IUnknown> retObjects(numberOfMetrics);
-    com::SafeArray<BSTR> retUnits(numberOfMetrics);
-    com::SafeArray<ULONG> retScales(numberOfMetrics);
-    com::SafeArray<ULONG> retSequenceNumbers(numberOfMetrics);
-    com::SafeArray<ULONG> retIndices(numberOfMetrics);
-    com::SafeArray<ULONG> retLengths(numberOfMetrics);
-    com::SafeArray<LONG> retData(flatSize);
+    aReturnMetricNames.resize(numberOfMetrics);
+    aReturnObjects.resize(numberOfMetrics);
+    aReturnUnits.resize(numberOfMetrics);
+    aReturnScales.resize(numberOfMetrics);
+    aReturnSequenceNumbers.resize(numberOfMetrics);
+    aReturnDataIndices.resize(numberOfMetrics);
+    aReturnDataLengths.resize(numberOfMetrics);
+    aReturnData.resize(flatSize);
 
     for (it = filteredMetrics.begin(); it != filteredMetrics.end(); ++it, ++i)
     {
         ULONG *values, length, sequenceNumber;
         /* @todo We may want to revise the query method to get rid of excessive alloc/memcpy calls. */
         (*it)->query(&values, &length, &sequenceNumber);
-        LogFlow (("PerformanceCollector::QueryMetricsData() querying metric %s "
-                  "returned %d values.\n", (*it)->getName(), length));
-        memcpy(retData.raw() + flatIndex, values, length * sizeof(*values));
+        LogFlow(("PerformanceCollector::QueryMetricsData() querying metric %s returned %d values.\n",
+                 (*it)->getName(), length));
+        memcpy(&aReturnData[flatIndex], values, length * sizeof(*values));
         RTMemFree(values);
-        Bstr tmp((*it)->getName());
-        tmp.detachTo(&retNames[i]);
-        (*it)->getObject().queryInterfaceTo(&retObjects[i]);
-        tmp = (*it)->getUnit();
-        tmp.detachTo(&retUnits[i]);
-        retScales[i] = (*it)->getScale();
-        retSequenceNumbers[i] = sequenceNumber;
-        retLengths[i] = length;
-        retIndices[i] = (ULONG)flatIndex;
+        aReturnMetricNames[i] = (*it)->getName();
+        aReturnObjects[i] = (*it)->getObject();
+        aReturnUnits[i] = (*it)->getUnit();
+        aReturnScales[i] = (*it)->getScale();
+        aReturnSequenceNumbers[i] = sequenceNumber;
+        aReturnDataIndices[i] = (ULONG)flatIndex;
+        aReturnDataLengths[i] = length;
         flatIndex += length;
     }
 
-    retNames.detachTo(ComSafeArrayOutArg(outMetricNames));
-    retObjects.detachTo(ComSafeArrayOutArg(outObjects));
-    retUnits.detachTo(ComSafeArrayOutArg(outUnits));
-    retScales.detachTo(ComSafeArrayOutArg(outScales));
-    retSequenceNumbers.detachTo(ComSafeArrayOutArg(outSequenceNumbers));
-    retIndices.detachTo(ComSafeArrayOutArg(outDataIndices));
-    retLengths.detachTo(ComSafeArrayOutArg(outDataLengths));
-    retData.detachTo(ComSafeArrayOutArg(outData));
     return S_OK;
 }
 
@@ -583,7 +529,7 @@ void PerformanceCollector::registerBaseMetric(pm::BaseMetric *baseMetric)
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     Log7(("{%p} " LOG_FN_FMT ": obj=%p name=%s\n", this, __PRETTY_FUNCTION__,
           (void *)baseMetric->getObject(), baseMetric->getName()));
-    m.baseMetrics.push_back (baseMetric);
+    m.baseMetrics.push_back(baseMetric);
     //LogFlowThisFuncLeave();
 }
 
@@ -595,7 +541,7 @@ void PerformanceCollector::registerMetric(pm::Metric *metric)
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     Log7(("{%p} " LOG_FN_FMT ": obj=%p name=%s\n", this, __PRETTY_FUNCTION__, (void *)metric->getObject(), metric->getName()));
-    m.metrics.push_back (metric);
+    m.metrics.push_back(metric);
     //LogFlowThisFuncLeave();
 }
 
@@ -691,13 +637,13 @@ void PerformanceCollector::resumeSampling()
 void PerformanceCollector::staticSamplerCallback(RTTIMERLR hTimerLR, void *pvUser,
                                                  uint64_t iTick)
 {
-    AssertReturnVoid (pvUser != NULL);
+    AssertReturnVoid(pvUser != NULL);
     PerformanceCollector *collector = static_cast <PerformanceCollector *> (pvUser);
     Assert(collector->mMagic == MAGIC);
     if (collector->mMagic == MAGIC)
         collector->samplerCallback(iTick);
 
-    NOREF (hTimerLR);
+    NOREF(hTimerLR);
 }
 
 /*
@@ -774,8 +720,8 @@ void PerformanceCollector::samplerCallback(uint64_t iTick)
     m.gm->destroyUnregistered();
 
     /* Finally, collect the data */
-    std::for_each (toBeCollected.begin(), toBeCollected.end(),
-                   std::mem_fun (&pm::BaseMetric::collect));
+    std::for_each(toBeCollected.begin(), toBeCollected.end(),
+                  std::mem_fun(&pm::BaseMetric::collect));
     Log4(("{%p} " LOG_FN_FMT ": LEAVE\n", this, __PRETTY_FUNCTION__));
 }
 
@@ -805,7 +751,7 @@ void PerformanceMetric::FinalRelease()
 {
     LogFlowThisFunc(("\n"));
 
-    uninit ();
+    uninit();
 
     BaseFinalRelease();
 }
@@ -815,6 +761,10 @@ void PerformanceMetric::FinalRelease()
 
 HRESULT PerformanceMetric::init(pm::Metric *aMetric)
 {
+    /* Enclose the state transition NotReady->InInit->Ready */
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+
     m.name        = aMetric->getName();
     m.object      = aMetric->getObject();
     m.description = aMetric->getDescription();
@@ -823,11 +773,17 @@ HRESULT PerformanceMetric::init(pm::Metric *aMetric)
     m.unit        = aMetric->getUnit();
     m.min         = aMetric->getMinValue();
     m.max         = aMetric->getMaxValue();
+
+    autoInitSpan.setSucceeded();
     return S_OK;
 }
 
 HRESULT PerformanceMetric::init(pm::BaseMetric *aMetric)
 {
+    /* Enclose the state transition NotReady->InInit->Ready */
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+
     m.name        = aMetric->getName();
     m.object      = aMetric->getObject();
     m.description = "";
@@ -836,61 +792,76 @@ HRESULT PerformanceMetric::init(pm::BaseMetric *aMetric)
     m.unit        = aMetric->getUnit();
     m.min         = aMetric->getMinValue();
     m.max         = aMetric->getMaxValue();
+
+    autoInitSpan.setSucceeded();
     return S_OK;
 }
 
 void PerformanceMetric::uninit()
 {
+    /* Enclose the state transition Ready->InUninit->NotReady */
+    AutoUninitSpan autoUninitSpan(this);
+    if (autoUninitSpan.uninitDone())
+    {
+        LogFlowThisFunc(("Already uninitialized.\n"));
+        LogFlowThisFuncLeave();
+        return;
+    }
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(MetricName)(BSTR *aMetricName)
+HRESULT PerformanceMetric::getMetricName(com::Utf8Str &aMetricName)
 {
-    /// @todo (r=dmik) why do all these getters not do AutoCaller and
-    /// AutoReadLock? Is the underlying metric a constant object?
-
-    m.name.cloneTo(aMetricName);
+    /* this is const, no need to lock */
+    aMetricName = m.name;
     return S_OK;
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(Object)(IUnknown **anObject)
+HRESULT PerformanceMetric::getObject(ComPtr<IUnknown> &aObject)
 {
-    m.object.queryInterfaceTo(anObject);
+    /* this is const, no need to lock */
+    aObject = m.object;
     return S_OK;
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(Description)(BSTR *aDescription)
+HRESULT PerformanceMetric::getDescription(com::Utf8Str &aDescription)
 {
-    m.description.cloneTo(aDescription);
+    /* this is const, no need to lock */
+    aDescription = m.description;
     return S_OK;
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(Period)(ULONG *aPeriod)
+HRESULT PerformanceMetric::getPeriod(ULONG *aPeriod)
 {
+    /* this is const, no need to lock */
     *aPeriod = m.period;
     return S_OK;
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(Count)(ULONG *aCount)
+HRESULT PerformanceMetric::getCount(ULONG *aCount)
 {
+    /* this is const, no need to lock */
     *aCount = m.count;
     return S_OK;
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(Unit)(BSTR *aUnit)
+HRESULT PerformanceMetric::getUnit(com::Utf8Str &aUnit)
 {
-    m.unit.cloneTo(aUnit);
+    /* this is const, no need to lock */
+    aUnit = m.unit;
     return S_OK;
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(MinimumValue)(LONG *aMinValue)
+HRESULT PerformanceMetric::getMinimumValue(LONG *aMinimumValue)
 {
-    *aMinValue = m.min;
+    /* this is const, no need to lock */
+    *aMinimumValue = m.min;
     return S_OK;
 }
 
-STDMETHODIMP PerformanceMetric::COMGETTER(MaximumValue)(LONG *aMaxValue)
+HRESULT PerformanceMetric::getMaximumValue(LONG *aMaximumValue)
 {
-    *aMaxValue = m.max;
+    /* this is const, no need to lock */
+    *aMaximumValue = m.max;
     return S_OK;
 }
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/src/VBox/Main/src-server/ProgressProxyImpl.cpp b/src/VBox/Main/src-server/ProgressProxyImpl.cpp
index b9dcca5..404e89f 100644
--- a/src/VBox/Main/src-server/ProgressProxyImpl.cpp
+++ b/src/VBox/Main/src-server/ProgressProxyImpl.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -17,12 +17,6 @@
 
 #include <iprt/types.h>
 
-#if defined (VBOX_WITH_XPCOM)
-#include <nsIServiceManager.h>
-#include <nsIExceptionService.h>
-#include <nsCOMPtr.h>
-#endif /* defined (VBOX_WITH_XPCOM) */
-
 #include "ProgressProxyImpl.h"
 
 #include "VirtualBoxImpl.h"
@@ -697,5 +691,9 @@ STDMETHODIMP ProgressProxy::SetNextOperation(IN_BSTR bstrNextOperationDescriptio
     return E_NOTIMPL;
 }
 
-/* vi: set tabstop=4 shiftwidth=4 expandtab: */
+#ifdef VBOX_WITH_XPCOM
+NS_DECL_CLASSINFO(ProgressProxy)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ProgressProxy, IProgress)
+#endif
 
+/* vi: set tabstop=4 shiftwidth=4 expandtab: */
diff --git a/src/VBox/Main/src-server/StorageControllerImpl.cpp b/src/VBox/Main/src-server/StorageControllerImpl.cpp
index e318fa7..e9526be 100644
--- a/src/VBox/Main/src-server/StorageControllerImpl.cpp
+++ b/src/VBox/Main/src-server/StorageControllerImpl.cpp
@@ -49,11 +49,7 @@ struct BackupableStorageControllerData
           mInstance(0),
           mPortCount(2),
           fUseHostIOCache(true),
-          fBootable(false),
-          mPortIde0Master(0),
-          mPortIde0Slave(1),
-          mPortIde1Master(2),
-          mPortIde1Slave(3)
+          fBootable(false)
     { }
 
     /** Unique name of the storage controller. */
@@ -70,16 +66,6 @@ struct BackupableStorageControllerData
     BOOL fUseHostIOCache;
     /** Whether it is possible to boot from disks attached to this controller. */
     BOOL fBootable;
-
-    /** The following is only for the SATA controller atm. */
-    /** Port which acts as primary master for ide emulation. */
-    ULONG mPortIde0Master;
-    /** Port which acts as primary slave for ide emulation. */
-    ULONG mPortIde0Slave;
-    /** Port which acts as secondary master for ide emulation. */
-    ULONG mPortIde1Master;
-    /** Port which acts as secondary slave for ide emulation. */
-    ULONG mPortIde1Slave;
 };
 
 struct StorageController::Data
@@ -658,80 +644,6 @@ HRESULT StorageController::getBootable(BOOL *fBootable)
 // public methods only for internal purposes
 /////////////////////////////////////////////////////////////////////////////
 
-HRESULT StorageController::i_getIDEEmulationPort(LONG DevicePosition, LONG *aPortNumber)
-{
-    CheckComArgOutPointerValid(aPortNumber);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (m->bd->mStorageControllerType != StorageControllerType_IntelAhci)
-        return setError(E_NOTIMPL,
-                        tr("Invalid controller type"));
-
-    switch (DevicePosition)
-    {
-        case 0:
-            *aPortNumber = m->bd->mPortIde0Master;
-            break;
-        case 1:
-            *aPortNumber = m->bd->mPortIde0Slave;
-            break;
-        case 2:
-            *aPortNumber = m->bd->mPortIde1Master;
-            break;
-        case 3:
-            *aPortNumber = m->bd->mPortIde1Slave;
-            break;
-        default:
-            return E_INVALIDARG;
-    }
-
-    return S_OK;
-}
-
-HRESULT StorageController::i_setIDEEmulationPort(LONG DevicePosition, LONG aPortNumber)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(m->pParent);
-    if (FAILED(adep.rc())) return adep.rc();
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (m->bd->mStorageControllerType != StorageControllerType_IntelAhci)
-        return setError(E_NOTIMPL,
-                        tr("Invalid controller type"));
-
-    if (aPortNumber < 0 || aPortNumber >= 30)
-        return setError(E_INVALIDARG,
-                        tr("Invalid port number: %ld (must be in range [%lu, %lu])"),
-                        aPortNumber, 0, 29);
-
-    switch (DevicePosition)
-    {
-        case 0:
-            m->bd->mPortIde0Master = aPortNumber;
-            break;
-        case 1:
-            m->bd->mPortIde0Slave = aPortNumber;
-            break;
-        case 2:
-            m->bd->mPortIde1Master = aPortNumber;
-            break;
-        case 3:
-            m->bd->mPortIde1Slave = aPortNumber;
-            break;
-        default:
-            return E_INVALIDARG;
-    }
-
-    return S_OK;
-}
-
 const Utf8Str& StorageController::i_getName() const
 {
     return m->bd->strName;
diff --git a/src/VBox/Main/src-server/SystemPropertiesImpl.cpp b/src/VBox/Main/src-server/SystemPropertiesImpl.cpp
index 9ffb6d2..d90f4ed 100644
--- a/src/VBox/Main/src-server/SystemPropertiesImpl.cpp
+++ b/src/VBox/Main/src-server/SystemPropertiesImpl.cpp
@@ -276,6 +276,17 @@ HRESULT SystemProperties::getMaxBootPosition(ULONG *aMaxBootPosition)
 }
 
 
+HRESULT SystemProperties::getRawModeSupported(BOOL *aRawModeSupported)
+{
+#ifdef VBOX_WITH_RAW_MODE
+    *aRawModeSupported = TRUE;
+#else
+    *aRawModeSupported = FALSE;
+#endif
+    return S_OK;
+}
+
+
 HRESULT SystemProperties::getExclusiveHwVirt(BOOL *aExclusiveHwVirt)
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
diff --git a/src/VBox/Main/src-server/VirtualBoxImpl.cpp b/src/VBox/Main/src-server/VirtualBoxImpl.cpp
index 1ac62cc..19007e7 100644
--- a/src/VBox/Main/src-server/VirtualBoxImpl.cpp
+++ b/src/VBox/Main/src-server/VirtualBoxImpl.cpp
@@ -876,6 +876,25 @@ HRESULT VirtualBox::getAPIVersion(com::Utf8Str &aAPIVersion)
     return S_OK;
 }
 
+HRESULT VirtualBox::getAPIRevision(LONG64 *aAPIRevision)
+{
+    AssertCompile(VBOX_VERSION_MAJOR < 128 && VBOX_VERSION_MAJOR > 0);
+    AssertCompile((uint64_t)VBOX_VERSION_MINOR < 256);
+    uint64_t uRevision = ((uint64_t)VBOX_VERSION_MAJOR << 56)
+                       | ((uint64_t)VBOX_VERSION_MINOR << 48);
+
+    if (VBOX_VERSION_BUILD >= 51 && (VBOX_VERSION_BUILD & 1)) /* pre-release trunk */
+        uRevision |= (uint64_t)VBOX_VERSION_BUILD << 40;
+
+    /** @todo This needs to be the same in OSE and non-OSE, preferrably
+     *        only changing when actual API changes happens. */
+    uRevision |= 0;
+
+    *aAPIRevision = uRevision;
+
+    return S_OK;
+}
+
 HRESULT VirtualBox::getHomeFolder(com::Utf8Str &aHomeFolder)
 {
     /* mHomeDir is const and doesn't need a lock */
diff --git a/src/VBox/Main/src-server/xpcom/server.cpp b/src/VBox/Main/src-server/xpcom/server.cpp
index 96b4537..dd13e67 100644
--- a/src/VBox/Main/src-server/xpcom/server.cpp
+++ b/src/VBox/Main/src-server/xpcom/server.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2004-2014 Oracle Corporation
+ * Copyright (C) 2004-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -99,31 +99,6 @@
 extern nsIClassInfo *NS_CLASSINFO_NAME(VirtualBoxWrap);
 NS_DECL_CI_INTERFACE_GETTER(VirtualBoxWrap)
 
-// The declarations/implementations of the various XPCOM helper data structures
-// and functions have to be removed bit by bit, as the conversion to the
-// automatically generated wrappers makes them obsolete.
-
-/* implement nsISupports parts of our objects with support for nsIClassInfo */
-NS_DECL_CLASSINFO(SessionMachine)
-NS_IMPL_THREADSAFE_ISUPPORTS2_CI(SessionMachine, IMachine, IInternalMachineControl)
-
-NS_DECL_CLASSINFO(SnapshotMachine)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(SnapshotMachine, IMachine)
-
-NS_DECL_CLASSINFO(ProgressProxy)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ProgressProxy, IProgress)
-
-#ifdef VBOX_WITH_USB
-
-#endif
-
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-NS_DECL_CLASSINFO(PerformanceCollector)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(PerformanceCollector, IPerformanceCollector)
-NS_DECL_CLASSINFO(PerformanceMetric)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(PerformanceMetric, IPerformanceMetric)
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
-
 ////////////////////////////////////////////////////////////////////////////////
 
 static bool gAutoShutdown = false;
diff --git a/src/VBox/Main/testcase/Makefile.kmk b/src/VBox/Main/testcase/Makefile.kmk
index 6cbac0e..126cd89 100644
--- a/src/VBox/Main/testcase/Makefile.kmk
+++ b/src/VBox/Main/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2004-2014 Oracle Corporation
+# Copyright (C) 2004-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Main/webservice/vboxweb.cpp b/src/VBox/Main/webservice/vboxweb.cpp
index ed9e3ac..c04fc06 100644
--- a/src/VBox/Main/webservice/vboxweb.cpp
+++ b/src/VBox/Main/webservice/vboxweb.cpp
@@ -50,6 +50,10 @@
 #include <iprt/stream.h>
 #include <iprt/asm.h>
 
+#ifndef RT_OS_WINDOWS
+# include <signal.h>
+#endif
+
 // workaround for compile problems on gcc 4.1
 #ifdef __GNUC__
 #pragma GCC visibility push(default)
@@ -142,6 +146,7 @@ static uint64_t         g_uHistoryFileSize = 100 * _1M; // max 100MB per file
 bool                    g_fVerbose = false;             // be verbose
 
 static bool             g_fDaemonize = false;           // run in background.
+static volatile bool    g_fKeepRunning = true;          // controlling the exit
 
 const WSDLT_ID          g_EmptyWSDLID;                  // for NULL MORs
 
@@ -365,8 +370,8 @@ public:
 
         int rc = RTThreadCreate(&m_pThread,
                                 fntWrapper,
-                                this,             // pvUser
-                                0,               // cbStack,
+                                this,           // pvUser
+                                0,              // cbStack
                                 RTTHREADTYPE_MAIN_HEAVY_WORKER,
                                 0,
                                 m_strThread.c_str());
@@ -400,7 +405,7 @@ public:
     static int fntWrapper(RTTHREAD pThread, void *pvThread)
     {
         SoapThread *pst = (SoapThread*)pvThread;
-        pst->process();     // this never returns really
+        pst->process();
         return 0;
     }
 
@@ -434,6 +439,21 @@ public:
 
     ~SoapQ()
     {
+        /* Tell the threads to terminate. */
+        RTSemEventMultiSignal(m_event);
+        {
+            util::AutoWriteLock qlock(m_mutex COMMA_LOCKVAL_SRC_POS);
+            int i = 0;
+            while (m_llAllThreads.size() && i++ <= 30)
+            {
+                qlock.release();
+                RTThreadSleep(1000);
+                RTSemEventMultiSignal(m_event);
+                qlock.acquire();
+            }
+            WebLog("ending queue processing (%d out of %d threads idle)\n", m_cIdleThreads, m_llAllThreads.size());
+        }
+
         RTSemEventMultiDestroy(m_event);
     }
 
@@ -488,11 +508,14 @@ public:
      */
     SOAP_SOCKET get(size_t &cIdleThreads, size_t &cThreads)
     {
-        while (1)
+        while (g_fKeepRunning)
         {
             // wait for something to happen
             RTSemEventMultiWait(m_event, RT_INDEFINITE_WAIT);
 
+            if (!g_fKeepRunning)
+                break;
+
             util::AutoWriteLock qlock(m_mutex COMMA_LOCKVAL_SRC_POS);
             if (!m_llSocketsQ.empty())
             {
@@ -514,6 +537,7 @@ public:
 
             // nothing to do: keep looping
         }
+        return SOAP_INVALID_SOCKET;
     }
 
     /**
@@ -526,6 +550,24 @@ public:
         ++m_cIdleThreads;
     }
 
+    /**
+     * To be called by a worker thread when signing off, i.e. no longer
+     * willing to process requests.
+     */
+    void signoff(SoapThread *th)
+    {
+        {
+            util::AutoWriteLock thrLock(g_pThreadsLockHandle COMMA_LOCKVAL_SRC_POS);
+            size_t c = g_mapThreads.erase(th->m_pThread);
+            AssertReturnVoid(c == 1);
+        }
+        {
+            util::AutoWriteLock qlock(m_mutex COMMA_LOCKVAL_SRC_POS);
+            m_llAllThreads.remove(th);
+            --m_cIdleThreads;
+        }
+    }
+
     const struct soap       *m_soap;            // soap structure created by main(), passed to constructor
 
     util::WriteLockHandle   m_mutex;
@@ -549,12 +591,15 @@ void SoapThread::process()
 {
     WebLog("New SOAP thread started\n");
 
-    while (1)
+    while (g_fKeepRunning)
     {
         // wait for a socket to arrive on the queue
         size_t cIdleThreads = 0, cThreads = 0;
         m_soap->socket = m_pQ->get(cIdleThreads, cThreads);
 
+        if (!soap_valid_socket(m_soap->socket))
+            continue;
+
         WebLog("Processing connection from IP=%lu.%lu.%lu.%lu socket=%d (%d out of %d threads idle)\n",
                (m_soap->ip >> 24) & 0xFF,
                (m_soap->ip >> 16) & 0xFF,
@@ -586,6 +631,7 @@ void SoapThread::process()
         // tell the queue we're idle again
         m_pQ->done();
     }
+    m_pQ->signoff(this);
 }
 
 /****************************************************************************
@@ -630,7 +676,7 @@ public:
                     WebLog("VBoxSVC became unavailable\n");
                     {
                         util::AutoWriteLock vlock(g_pVirtualBoxLockHandle COMMA_LOCKVAL_SRC_POS);
-                        g_pVirtualBox = NULL;
+                        g_pVirtualBox.setNull();
                     }
                     {
                         // we're messing with websessions, so lock them
@@ -872,14 +918,16 @@ static void doQueuesLoop()
         g_pSoapQ = new SoapQ(&soap);
 
         for (uint64_t i = 1;
-             ;
+             g_fKeepRunning;
              i++)
         {
             // call gSOAP to handle incoming SOAP connection
+            soap.accept_timeout = 10;
             s = soap_accept(&soap);
-            if (s < 0)
+            if (!soap_valid_socket(s))
             {
-                WebLogSoapError(&soap);
+                if (soap.errnum)
+                    WebLogSoapError(&soap);
                 continue;
             }
 
@@ -888,6 +936,15 @@ static void doQueuesLoop()
             size_t cItemsOnQ = g_pSoapQ->add(s);
             WebLog("Request %llu on socket %d queued for processing (%d items on Q)\n", i, s, cItemsOnQ);
         }
+
+        delete g_pSoapQ;
+        g_pSoapQ = NULL;
+
+        WebLog("ending SOAP request handling\n");
+
+        delete g_pSoapQ;
+        g_pSoapQ = NULL;
+
     }
     soap_done(&soap); // close master socket and detach environment
 
@@ -911,12 +968,60 @@ static int fntQPumper(RTTHREAD ThreadSelf, void *pvUser)
 
     doQueuesLoop();
 
+    thrLock.acquire();
+    g_mapThreads.erase(RTThreadSelf());
     return 0;
 }
 
 #ifdef RT_OS_WINDOWS
 // Required for ATL
 static CComModule _Module;
+
+/**
+ * "Signal" handler for cleanly terminating the event loop.
+ */
+static BOOL WINAPI websrvSignalHandler(DWORD dwCtrlType)
+{
+    bool fEventHandled = FALSE;
+    switch (dwCtrlType)
+    {
+        /* User pressed CTRL+C or CTRL+BREAK or an external event was sent
+         * via GenerateConsoleCtrlEvent(). */
+        case CTRL_BREAK_EVENT:
+        case CTRL_CLOSE_EVENT:
+        case CTRL_C_EVENT:
+        case CTRL_LOGOFF_EVENT:
+        case CTRL_SHUTDOWN_EVENT:
+            ASMAtomicWriteBool(&g_fKeepRunning, false);
+            fEventHandled = TRUE;
+            break;
+        default:
+            break;
+    }
+    return fEventHandled;
+}
+#else
+class ForceQuitEvent : public com::NativeEvent
+{
+    void *handler()
+    {
+        LogFlowFunc(("\n"));
+
+        ASMAtomicWriteBool(&g_fKeepRunning, false);
+
+        return NULL;
+    }
+};
+
+/**
+ * Signal handler for cleanly terminating the event loop.
+ */
+static void websrvSignalHandler(int iSignal)
+{
+    NOREF(iSignal);
+    com::NativeEventQueue *pQ = com::NativeEventQueue::getMainEventQueue();
+    pQ->postEvent(new ForceQuitEvent());
+}
 #endif
 
 
@@ -1199,33 +1304,48 @@ int main(int argc, char *argv[])
     g_pThreadsLockHandle = new util::RWLockHandle(util::LOCKCLASS_OBJECTSTATE);
 
     // SOAP queue pumper thread
-    rc = RTThreadCreate(NULL,
+    RTTHREAD threadQPumper;
+    rc = RTThreadCreate(&threadQPumper,
                         fntQPumper,
                         NULL,        // pvUser
                         0,           // cbStack (default)
                         RTTHREADTYPE_MAIN_WORKER,
-                        0,           // flags
+                        RTTHREADFLAGS_WAITABLE,
                         "SQPmp");
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Cannot start SOAP queue pumper thread: %Rrc", rc);
 
     // watchdog thread
+    RTTHREAD threadWatchdog = NIL_RTTHREAD;
     if (g_iWatchdogTimeoutSecs > 0)
     {
         // start our watchdog thread
-        rc = RTThreadCreate(NULL,
+        rc = RTThreadCreate(&threadWatchdog,
                             fntWatchdog,
                             NULL,
                             0,
                             RTTHREADTYPE_MAIN_WORKER,
-                            0,
+                            RTTHREADFLAGS_WAITABLE,
                             "Watchdog");
         if (RT_FAILURE(rc))
             return RTMsgErrorExit(RTEXITCODE_FAILURE, "Cannot start watchdog thread: %Rrc", rc);
     }
 
+#ifdef RT_OS_WINDOWS
+    if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)websrvSignalHandler, TRUE /* Add handler */))
+    {
+        rc = RTErrConvertFromWin32(GetLastError());
+        RTMsgError("Unable to install console control handler, rc=%Rrc\n", rc);
+    }
+#else
+    signal(SIGINT,   websrvSignalHandler);
+# ifdef SIGBREAK
+    signal(SIGBREAK, websrvSignalHandler);
+# endif
+#endif
+
     com::NativeEventQueue *pQ = com::NativeEventQueue::getMainEventQueue();
-    for (;;)
+    while (g_fKeepRunning)
     {
         // we have to process main event queue
         WEBDEBUG(("Pumping COM event queue\n"));
@@ -1234,6 +1354,25 @@ int main(int argc, char *argv[])
             RTMsgError("processEventQueue -> %Rrc", rc);
     }
 
+    WebLog("requested termination, cleaning up\n");
+
+#ifdef RT_OS_WINDOWS
+    if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE)websrvSignalHandler, FALSE /* Remove handler */))
+    {
+        rc = RTErrConvertFromWin32(GetLastError());
+        RTMsgError("Unable to remove console control handler, rc=%Rrc\n", rc);
+    }
+#else
+    signal(SIGINT,   SIG_DFL);
+# ifdef SIGBREAK
+    signal(SIGBREAK, SIG_DFL);
+# endif
+#endif
+
+    RTThreadWait(threadQPumper, 30000, NULL);
+    if (threadWatchdog != NIL_RTTHREAD)
+        RTThreadWait(threadWatchdog, g_iWatchdogCheckInterval * 1000 + 10000, NULL);
+
     /* VirtualBoxClient events unregistration. */
     if (vboxClientListener)
     {
@@ -1244,6 +1383,24 @@ int main(int argc, char *argv[])
         vboxClientListener.setNull();
     }
 
+    {
+        util::AutoWriteLock vlock(g_pVirtualBoxLockHandle COMMA_LOCKVAL_SRC_POS);
+        g_pVirtualBox.setNull();
+    }
+    {
+        util::AutoWriteLock lock(g_pWebsessionsLockHandle COMMA_LOCKVAL_SRC_POS);
+        WebsessionsMapIterator it = g_mapWebsessions.begin(),
+                               itEnd = g_mapWebsessions.end();
+        while (it != itEnd)
+        {
+            WebServiceSession *pWebsession = it->second;
+            WEBDEBUG(("SVC unavailable: websession %#llx stale, deleting\n", pWebsession->getID()));
+            delete pWebsession;
+            it = g_mapWebsessions.begin();
+        }
+    }
+    g_pVirtualBoxClient.setNull();
+
     com::Shutdown();
 
     return 0;
@@ -1272,7 +1429,7 @@ int fntWatchdog(RTTHREAD ThreadSelf, void *pvUser)
 
     WEBDEBUG(("Watchdog thread started\n"));
 
-    while (1)
+    while (g_fKeepRunning)
     {
         WEBDEBUG(("Watchdog: sleeping %d seconds\n", g_iWatchdogCheckInterval));
         RTThreadSleep(g_iWatchdogCheckInterval * 1000);
@@ -1310,7 +1467,10 @@ int fntWatchdog(RTTHREAD ThreadSelf, void *pvUser)
         }
     }
 
-    WEBDEBUG(("Watchdog thread ending\n"));
+    thrLock.acquire();
+    g_mapThreads.erase(RTThreadSelf());
+
+    WebLog("ending Watchdog thread\n");
     return 0;
 }
 
diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp
index 3faa419..2fe01e1 100644
--- a/src/VBox/Main/xml/Settings.cpp
+++ b/src/VBox/Main/xml/Settings.cpp
@@ -2125,10 +2125,6 @@ bool StorageController::operator==(const StorageController &s) const
                   && (ulPortCount               == s.ulPortCount)
                   && (ulInstance                == s.ulInstance)
                   && (fUseHostIOCache           == s.fUseHostIOCache)
-                  && (lIDE0MasterEmulationPort  == s.lIDE0MasterEmulationPort)
-                  && (lIDE0SlaveEmulationPort   == s.lIDE0SlaveEmulationPort)
-                  && (lIDE1MasterEmulationPort  == s.lIDE1MasterEmulationPort)
-                  && (lIDE1SlaveEmulationPort   == s.lIDE1SlaveEmulationPort)
                   && (llAttachedDevices         == s.llAttachedDevices)
                 )
            );
@@ -2654,6 +2650,38 @@ void MachineConfigFile::readAudioAdapter(const xml::ElementNode &elmAudioAdapter
             throw ConfigFileError(this, &elmAudioAdapter, N_("Invalid value '%s' in AudioAdapter/@controller attribute"), strTemp.c_str());
     }
 
+    if (elmAudioAdapter.getAttributeValue("codec", strTemp))
+    {
+        if (strTemp == "SB16")
+            aa.codecType = AudioCodecType_SB16;
+        else if (strTemp == "STAC9700")
+            aa.codecType = AudioCodecType_STAC9700;
+        else if (strTemp == "AD1980")
+            aa.codecType = AudioCodecType_AD1980;
+        else if (strTemp == "STAC9221")
+            aa.codecType = AudioCodecType_STAC9221;
+        else
+            throw ConfigFileError(this, &elmAudioAdapter, N_("Invalid value '%s' in AudioAdapter/@codec attribute"), strTemp.c_str());
+    }
+    else
+    {
+        /* No codec attribute provided; use defaults. */
+        switch (aa.controllerType)
+        {
+            case AudioControllerType_AC97:
+                aa.codecType = AudioCodecType_STAC9700;
+                break;
+            case AudioControllerType_SB16:
+                aa.codecType = AudioCodecType_SB16;
+                break;
+            case AudioControllerType_HDA:
+                aa.codecType = AudioCodecType_STAC9221;
+                break;
+            default:
+                Assert(false);  /* We just checked the controller type above. */
+        }
+    }
+
     if (elmAudioAdapter.getAttributeValue("driver", strTemp))
     {
         // settings before 1.3 used lower case so make sure this is case-insensitive
@@ -2719,11 +2747,6 @@ void MachineConfigFile::readStorageControllerAttributes(const xml::ElementNode &
                                                         StorageController &sctl)
 {
     elmStorageController.getAttributeValue("PortCount", sctl.ulPortCount);
-    elmStorageController.getAttributeValue("IDE0MasterEmulationPort", sctl.lIDE0MasterEmulationPort);
-    elmStorageController.getAttributeValue("IDE0SlaveEmulationPort", sctl.lIDE0SlaveEmulationPort);
-    elmStorageController.getAttributeValue("IDE1MasterEmulationPort", sctl.lIDE1MasterEmulationPort);
-    elmStorageController.getAttributeValue("IDE1SlaveEmulationPort", sctl.lIDE1SlaveEmulationPort);
-
     elmStorageController.getAttributeValue("useHostIOCache", sctl.fUseHostIOCache);
 }
 
@@ -4725,6 +4748,33 @@ void MachineConfigFile::buildHardwareXML(xml::ElementNode &elmParent,
     }
     pelmAudio->setAttribute("controller", pcszController);
 
+    const char *pcszCodec;
+    switch (hw.audioAdapter.codecType)
+    {
+        /* Only write out the setting for non-default AC'97 codec
+         * and leave the rest alone.
+         */
+#if 0
+        case AudioCodecType_SB16:
+            pcszCodec = "SB16";
+            break;
+        case AudioCodecType_STAC9221:
+            pcszCodec = "STAC9221";
+            break;
+        case AudioCodecType_STAC9700:
+            pcszCodec = "STAC9700";
+            break;
+#endif
+        case AudioCodecType_AD1980:
+            pcszCodec = "AD1980";
+            break;
+        default:
+            /* Don't write out anything if unknown. */
+            pcszCodec = NULL;
+    }
+    if (pcszCodec)
+        pelmAudio->setAttribute("codec", pcszCodec);
+
     if (m->sv >= SettingsVersion_v1_10)
     {
         xml::ElementNode *pelmRTC = pelmHardware->createChild("RTC");
@@ -5062,10 +5112,10 @@ void MachineConfigFile::buildStorageControllersXML(xml::ElementNode &elmParent,
 
         if (sc.controllerType == StorageControllerType_IntelAhci)
         {
-            pelmController->setAttribute("IDE0MasterEmulationPort", sc.lIDE0MasterEmulationPort);
-            pelmController->setAttribute("IDE0SlaveEmulationPort", sc.lIDE0SlaveEmulationPort);
-            pelmController->setAttribute("IDE1MasterEmulationPort", sc.lIDE1MasterEmulationPort);
-            pelmController->setAttribute("IDE1SlaveEmulationPort", sc.lIDE1SlaveEmulationPort);
+            pelmController->setAttribute("IDE0MasterEmulationPort", 0);
+            pelmController->setAttribute("IDE0SlaveEmulationPort", 1);
+            pelmController->setAttribute("IDE1MasterEmulationPort", 2);
+            pelmController->setAttribute("IDE1SlaveEmulationPort", 3);
         }
 
         for (AttachedDevicesList::const_iterator it2 = sc.llAttachedDevices.begin();
diff --git a/src/VBox/Makefile.kmk b/src/VBox/Makefile.kmk
index 6801ee4..26fb2d2 100644
--- a/src/VBox/Makefile.kmk
+++ b/src/VBox/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/DHCP/ClientDataInt.h b/src/VBox/NetworkServices/DHCP/ClientDataInt.h
index 3c544ef..ddfcb4c 100644
--- a/src/VBox/NetworkServices/DHCP/ClientDataInt.h
+++ b/src/VBox/NetworkServices/DHCP/ClientDataInt.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/DHCP/Config.cpp b/src/VBox/NetworkServices/DHCP/Config.cpp
index 2a4f7dc..31ea542 100644
--- a/src/VBox/NetworkServices/DHCP/Config.cpp
+++ b/src/VBox/NetworkServices/DHCP/Config.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1053,7 +1053,7 @@ static int parseDhcpOptionText(const char *pszText,
 static int fillDhcpOption(RawOption &opt, const std::string &OptText, int OptEncoding)
 {
     int rc;
- 
+
     if (OptEncoding == DhcpOptEncoding_Hex)
     {
         if (OptText.empty())
diff --git a/src/VBox/NetworkServices/DHCP/Config.h b/src/VBox/NetworkServices/DHCP/Config.h
index cbba334..da669b5 100644
--- a/src/VBox/NetworkServices/DHCP/Config.h
+++ b/src/VBox/NetworkServices/DHCP/Config.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/DHCP/Makefile.kmk b/src/VBox/NetworkServices/DHCP/Makefile.kmk
index c9cf388..d1b5125 100644
--- a/src/VBox/NetworkServices/DHCP/Makefile.kmk
+++ b/src/VBox/NetworkServices/DHCP/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/DHCP/NetworkManagerDhcp.cpp b/src/VBox/NetworkServices/DHCP/NetworkManagerDhcp.cpp
index e9c1178..c33fba2 100644
--- a/src/VBox/NetworkServices/DHCP/NetworkManagerDhcp.cpp
+++ b/src/VBox/NetworkServices/DHCP/NetworkManagerDhcp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp b/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp
index 820ac26..5f5f725 100644
--- a/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp
+++ b/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp b/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp
index 3142bbd..444a4b0 100644
--- a/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp
+++ b/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/Makefile.kmk b/src/VBox/NetworkServices/Makefile.kmk
index 7d0e87e..56a3c54 100644
--- a/src/VBox/NetworkServices/Makefile.kmk
+++ b/src/VBox/NetworkServices/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/Makefile.kmk b/src/VBox/NetworkServices/NAT/Makefile.kmk
index 36106a9..f6c9d6c 100644
--- a/src/VBox/NetworkServices/NAT/Makefile.kmk
+++ b/src/VBox/NetworkServices/NAT/Makefile.kmk
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/RTWinPoll.cpp b/src/VBox/NetworkServices/NAT/RTWinPoll.cpp
index b23fee4..66c4160 100644
--- a/src/VBox/NetworkServices/NAT/RTWinPoll.cpp
+++ b/src/VBox/NetworkServices/NAT/RTWinPoll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/RTWinSocketPair.cpp b/src/VBox/NetworkServices/NAT/RTWinSocketPair.cpp
index 8a9a458..5445f4f 100644
--- a/src/VBox/NetworkServices/NAT/RTWinSocketPair.cpp
+++ b/src/VBox/NetworkServices/NAT/RTWinSocketPair.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp b/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp
index 284d88b..9c52865 100644
--- a/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp
+++ b/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -787,7 +787,7 @@ int VBoxNetLwipNAT::natServiceProcessRegisteredPf(VECNATSERVICEPF& vecRules)
 }
 
 
-/** 
+/**
  * Main thread. Starts also the LWIP thread.
  */
 int VBoxNetLwipNAT::init()
diff --git a/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp b/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp
index f22376d..c2afc4f 100644
--- a/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp
+++ b/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/dhcp6.h b/src/VBox/NetworkServices/NAT/dhcp6.h
index 8b972d3..ed53020 100644
--- a/src/VBox/NetworkServices/NAT/dhcp6.h
+++ b/src/VBox/NetworkServices/NAT/dhcp6.h
@@ -1,10 +1,10 @@
-/* $Id$ */
+/* $Id: dhcp6.h $ */
 /** @file
  * NAT Network - DHCPv6 protocol definitions.
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/fwtcp.c b/src/VBox/NetworkServices/NAT/fwtcp.c
index f20d32a..57d9489 100644
--- a/src/VBox/NetworkServices/NAT/fwtcp.c
+++ b/src/VBox/NetworkServices/NAT/fwtcp.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/fwudp.c b/src/VBox/NetworkServices/NAT/fwudp.c
index 508894f..6deb812 100644
--- a/src/VBox/NetworkServices/NAT/fwudp.c
+++ b/src/VBox/NetworkServices/NAT/fwudp.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/lwipopts.h b/src/VBox/NetworkServices/NAT/lwipopts.h
index 9eeebab..105fc2b 100644
--- a/src/VBox/NetworkServices/NAT/lwipopts.h
+++ b/src/VBox/NetworkServices/NAT/lwipopts.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/portfwd.c b/src/VBox/NetworkServices/NAT/portfwd.c
index a81a715..013654d 100644
--- a/src/VBox/NetworkServices/NAT/portfwd.c
+++ b/src/VBox/NetworkServices/NAT/portfwd.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/portfwd.h b/src/VBox/NetworkServices/NAT/portfwd.h
index 1178b5c..4b04007 100644
--- a/src/VBox/NetworkServices/NAT/portfwd.h
+++ b/src/VBox/NetworkServices/NAT/portfwd.h
@@ -1,10 +1,10 @@
-/* $Id$ */
+/* $Id: portfwd.h $ */
 /** @file
  * NAT Network - port-forwarding rules, definitions and declarations.
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/proxy.c b/src/VBox/NetworkServices/NAT/proxy.c
index e15b632..8b3f430 100644
--- a/src/VBox/NetworkServices/NAT/proxy.c
+++ b/src/VBox/NetworkServices/NAT/proxy.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/proxy.h b/src/VBox/NetworkServices/NAT/proxy.h
index fd4cc07..f2cc7ad 100644
--- a/src/VBox/NetworkServices/NAT/proxy.h
+++ b/src/VBox/NetworkServices/NAT/proxy.h
@@ -1,10 +1,10 @@
-/* $Id$ */
+/* $Id: proxy.h $ */
 /** @file
  * NAT Network - common definitions and declarations.
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/proxy_dhcp6ds.c b/src/VBox/NetworkServices/NAT/proxy_dhcp6ds.c
index d834feb..f97211b 100644
--- a/src/VBox/NetworkServices/NAT/proxy_dhcp6ds.c
+++ b/src/VBox/NetworkServices/NAT/proxy_dhcp6ds.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/proxy_pollmgr.c b/src/VBox/NetworkServices/NAT/proxy_pollmgr.c
index 48df1c3..0c497a9 100644
--- a/src/VBox/NetworkServices/NAT/proxy_pollmgr.c
+++ b/src/VBox/NetworkServices/NAT/proxy_pollmgr.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/proxy_pollmgr.h b/src/VBox/NetworkServices/NAT/proxy_pollmgr.h
index 677d104..e16481d 100644
--- a/src/VBox/NetworkServices/NAT/proxy_pollmgr.h
+++ b/src/VBox/NetworkServices/NAT/proxy_pollmgr.h
@@ -1,10 +1,10 @@
-/* $Id$ */
+/* $Id: proxy_pollmgr.h $ */
 /** @file
  * NAT Network - poll manager, definitions and declarations.
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/proxy_rtadvd.c b/src/VBox/NetworkServices/NAT/proxy_rtadvd.c
index 4107188..f25acd8 100644
--- a/src/VBox/NetworkServices/NAT/proxy_rtadvd.c
+++ b/src/VBox/NetworkServices/NAT/proxy_rtadvd.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/proxy_tftpd.c b/src/VBox/NetworkServices/NAT/proxy_tftpd.c
index 9f06a9f..1c4c300 100644
--- a/src/VBox/NetworkServices/NAT/proxy_tftpd.c
+++ b/src/VBox/NetworkServices/NAT/proxy_tftpd.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/pxdns.c b/src/VBox/NetworkServices/NAT/pxdns.c
index dd56bf2..add5a7e 100644
--- a/src/VBox/NetworkServices/NAT/pxdns.c
+++ b/src/VBox/NetworkServices/NAT/pxdns.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/pxping.c b/src/VBox/NetworkServices/NAT/pxping.c
index 563b2e5..7f07c47 100644
--- a/src/VBox/NetworkServices/NAT/pxping.c
+++ b/src/VBox/NetworkServices/NAT/pxping.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/pxping_win.c b/src/VBox/NetworkServices/NAT/pxping_win.c
index 82402fb..9498ee6 100644
--- a/src/VBox/NetworkServices/NAT/pxping_win.c
+++ b/src/VBox/NetworkServices/NAT/pxping_win.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/pxremap.c b/src/VBox/NetworkServices/NAT/pxremap.c
index 28058ee..5fc1628 100644
--- a/src/VBox/NetworkServices/NAT/pxremap.c
+++ b/src/VBox/NetworkServices/NAT/pxremap.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/pxremap.h b/src/VBox/NetworkServices/NAT/pxremap.h
index c5cba0b..b0b038d 100644
--- a/src/VBox/NetworkServices/NAT/pxremap.h
+++ b/src/VBox/NetworkServices/NAT/pxremap.h
@@ -1,10 +1,10 @@
-/* $Id$ */
+/* $Id: pxremap.h $ */
 /** @file
  * NAT Network - Loopback remapping, declarations and definitions.
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/pxtcp.c b/src/VBox/NetworkServices/NAT/pxtcp.c
index 6486eaa..92e8f50 100644
--- a/src/VBox/NetworkServices/NAT/pxtcp.c
+++ b/src/VBox/NetworkServices/NAT/pxtcp.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/pxtcp.h b/src/VBox/NetworkServices/NAT/pxtcp.h
index a1043e8..fb8e5ca 100644
--- a/src/VBox/NetworkServices/NAT/pxtcp.h
+++ b/src/VBox/NetworkServices/NAT/pxtcp.h
@@ -1,10 +1,10 @@
-/* $Id$ */
+/* $Id: pxtcp.h $ */
 /** @file
  * NAT Network - TCP proxy, internal interface declarations.
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/pxudp.c b/src/VBox/NetworkServices/NAT/pxudp.c
index 5476e3b..f216ad1 100644
--- a/src/VBox/NetworkServices/NAT/pxudp.c
+++ b/src/VBox/NetworkServices/NAT/pxudp.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/rtmon_bsd.c b/src/VBox/NetworkServices/NAT/rtmon_bsd.c
index 8596880..c6721b4 100644
--- a/src/VBox/NetworkServices/NAT/rtmon_bsd.c
+++ b/src/VBox/NetworkServices/NAT/rtmon_bsd.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/rtmon_linux.c b/src/VBox/NetworkServices/NAT/rtmon_linux.c
index 3e8716b..11aafe6 100644
--- a/src/VBox/NetworkServices/NAT/rtmon_linux.c
+++ b/src/VBox/NetworkServices/NAT/rtmon_linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/rtmon_win.c b/src/VBox/NetworkServices/NAT/rtmon_win.c
index a1bf1cd..2625261 100644
--- a/src/VBox/NetworkServices/NAT/rtmon_win.c
+++ b/src/VBox/NetworkServices/NAT/rtmon_win.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/tftp.h b/src/VBox/NetworkServices/NAT/tftp.h
index eb5e698..42df909 100644
--- a/src/VBox/NetworkServices/NAT/tftp.h
+++ b/src/VBox/NetworkServices/NAT/tftp.h
@@ -1,10 +1,10 @@
-/* $Id$ */
+/* $Id: tftp.h $ */
 /** @file
  * NAT Network - Definitions for TFTP protocol.
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/winpoll.h b/src/VBox/NetworkServices/NAT/winpoll.h
index 3e59a6d..915dc85 100644
--- a/src/VBox/NetworkServices/NAT/winpoll.h
+++ b/src/VBox/NetworkServices/NAT/winpoll.h
@@ -1,10 +1,10 @@
-/* $Id$ */
+/* $Id: winpoll.h $ */
 /** @file
  * NAT Network - poll(2) for winsock, definitions and declarations.
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NAT/winutils.h b/src/VBox/NetworkServices/NAT/winutils.h
index c738375..fc83bed 100644
--- a/src/VBox/NetworkServices/NAT/winutils.h
+++ b/src/VBox/NetworkServices/NAT/winutils.h
@@ -1,10 +1,10 @@
-/* $Id$ */
+/* $Id: winutils.h $ */
 /** @file
  * NAT Network - winsock compatibility shim.
  */
 
 /*
- * Copyright (C) 2013-2014 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp b/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp
index 0c1f853..f75a4ef 100644
--- a/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp
+++ b/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp
index 9c9d87e..3ed3ac7 100644
--- a/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp
+++ b/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h b/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h
index aaca08d..ac99e28 100644
--- a/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h
+++ b/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp
index f9f7388..2a85cfa 100644
--- a/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp
+++ b/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetLib.h b/src/VBox/NetworkServices/NetLib/VBoxNetLib.h
index 2f7f699..982dec7 100644
--- a/src/VBox/NetworkServices/NetLib/VBoxNetLib.h
+++ b/src/VBox/NetworkServices/NetLib/VBoxNetLib.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp
index 12ff0e4..7285860 100644
--- a/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp
+++ b/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp
index 508e07d..56f0aaf 100644
--- a/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp
+++ b/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NetLib/VBoxPortForwardString.h b/src/VBox/NetworkServices/NetLib/VBoxPortForwardString.h
index 3026452..16b28e1 100644
--- a/src/VBox/NetworkServices/NetLib/VBoxPortForwardString.h
+++ b/src/VBox/NetworkServices/NetLib/VBoxPortForwardString.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NetLib/cpp/utils.h b/src/VBox/NetworkServices/NetLib/cpp/utils.h
index 21224b3..adba457 100644
--- a/src/VBox/NetworkServices/NetLib/cpp/utils.h
+++ b/src/VBox/NetworkServices/NetLib/cpp/utils.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NetLib/shared_ptr.h b/src/VBox/NetworkServices/NetLib/shared_ptr.h
index d1c3a4e..0624504 100644
--- a/src/VBox/NetworkServices/NetLib/shared_ptr.h
+++ b/src/VBox/NetworkServices/NetLib/shared_ptr.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/NetworkServices/NetLib/utils.h b/src/VBox/NetworkServices/NetLib/utils.h
index 9b334b5..5140bb2 100644
--- a/src/VBox/NetworkServices/NetLib/utils.h
+++ b/src/VBox/NetworkServices/NetLib/utils.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/RDP/client-1.8.3/Makefile.kmk b/src/VBox/RDP/client-1.8.3/Makefile.kmk
index 2cb89a2..dc9234e 100644
--- a/src/VBox/RDP/client-1.8.3/Makefile.kmk
+++ b/src/VBox/RDP/client-1.8.3/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/.scm-settings b/src/VBox/Runtime/.scm-settings
index 84ef39a..358739a 100644
--- a/src/VBox/Runtime/.scm-settings
+++ b/src/VBox/Runtime/.scm-settings
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation 
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/Makefile.kmk b/src/VBox/Runtime/Makefile.kmk
index a8c2138..77446e9 100644
--- a/src/VBox/Runtime/Makefile.kmk
+++ b/src/VBox/Runtime/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp b/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp
index d6712e2..3ec7575 100644
--- a/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp
+++ b/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/VBox/dbus.cpp b/src/VBox/Runtime/VBox/dbus.cpp
index c9a6bec..ddd22e1 100644
--- a/src/VBox/Runtime/VBox/dbus.cpp
+++ b/src/VBox/Runtime/VBox/dbus.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/VBox/errmsgvboxcom.xsl b/src/VBox/Runtime/VBox/errmsgvboxcom.xsl
index 03dea8b..1032cb1 100644
--- a/src/VBox/Runtime/VBox/errmsgvboxcom.xsl
+++ b/src/VBox/Runtime/VBox/errmsgvboxcom.xsl
@@ -6,7 +6,7 @@
  *  %Rhrc format specifier) as they are defined in the VirtualBox interface
  *  definition file (src/VBox/Main/idl/VirtualBox.xidl).
 
-    Copyright (C) 2006-2012 Oracle Corporation
+    Copyright (C) 2006-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/VBox/log-vbox.cpp b/src/VBox/Runtime/VBox/log-vbox.cpp
index 097ae94..bfb9dbf 100644
--- a/src/VBox/Runtime/VBox/log-vbox.cpp
+++ b/src/VBox/Runtime/VBox/log-vbox.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/VBox/logbackdoor.cpp b/src/VBox/Runtime/VBox/logbackdoor.cpp
index 956d8a4..46d617a 100644
--- a/src/VBox/Runtime/VBox/logbackdoor.cpp
+++ b/src/VBox/Runtime/VBox/logbackdoor.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/alloc/alloc.cpp b/src/VBox/Runtime/common/alloc/alloc.cpp
index d470944..2c32217 100644
--- a/src/VBox/Runtime/common/alloc/alloc.cpp
+++ b/src/VBox/Runtime/common/alloc/alloc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/alloc/heapoffset.cpp b/src/VBox/Runtime/common/alloc/heapoffset.cpp
index f593b66..d621812 100644
--- a/src/VBox/Runtime/common/alloc/heapoffset.cpp
+++ b/src/VBox/Runtime/common/alloc/heapoffset.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/alloc/heapsimple.cpp b/src/VBox/Runtime/common/alloc/heapsimple.cpp
index 015be04..8591640 100644
--- a/src/VBox/Runtime/common/alloc/heapsimple.cpp
+++ b/src/VBox/Runtime/common/alloc/heapsimple.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/alloc/memcache.cpp b/src/VBox/Runtime/common/alloc/memcache.cpp
index 3b60576..0c6ea0b 100644
--- a/src/VBox/Runtime/common/alloc/memcache.cpp
+++ b/src/VBox/Runtime/common/alloc/memcache.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/alloc/memtracker.cpp b/src/VBox/Runtime/common/alloc/memtracker.cpp
index a228e6d..1b4cdf1 100644
--- a/src/VBox/Runtime/common/alloc/memtracker.cpp
+++ b/src/VBox/Runtime/common/alloc/memtracker.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgExU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgExU64.asm
index f6963e1..ec1ee1c 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgExU64.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgExU64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm
index 0474644..583be7b 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm
index 55c92c8..07fe47b 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm
index c7e86e8..7b6139a 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicUoAndU32.asm b/src/VBox/Runtime/common/asm/ASMAtomicUoAndU32.asm
index 77a0e73..529597c 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicUoAndU32.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicUoAndU32.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2013 Oracle Corporation
+; Copyright (C) 2013-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicUoAndU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicUoAndU64.asm
index 70a2cf8..1a027e8 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicUoAndU64.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicUoAndU64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2013 Oracle Corporation
+; Copyright (C) 2013-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicUoDecU32.asm b/src/VBox/Runtime/common/asm/ASMAtomicUoDecU32.asm
index 5a95580..2651bfa 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicUoDecU32.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicUoDecU32.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2014 Oracle Corporation
+; Copyright (C) 2014-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicUoIncU32.asm b/src/VBox/Runtime/common/asm/ASMAtomicUoIncU32.asm
index 7294a64..0c134fa 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicUoIncU32.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicUoIncU32.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2014 Oracle Corporation
+; Copyright (C) 2014-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicUoOrU32.asm b/src/VBox/Runtime/common/asm/ASMAtomicUoOrU32.asm
index 7c0e099..10ed35b 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicUoOrU32.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicUoOrU32.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2013 Oracle Corporation
+; Copyright (C) 2013-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicUoOrU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicUoOrU64.asm
index 729aba5..147485c 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicUoOrU64.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicUoOrU64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2013 Oracle Corporation
+; Copyright (C) 2013-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm
index 8e83ebe..ec5c270 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicUoReadU64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm
index 2530060..6aa1cc0 100644
--- a/src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm
+++ b/src/VBox/Runtime/common/asm/ASMAtomicXchgU64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMCpuIdExSlow.asm b/src/VBox/Runtime/common/asm/ASMCpuIdExSlow.asm
index 772aee3..3f7cd5c 100644
--- a/src/VBox/Runtime/common/asm/ASMCpuIdExSlow.asm
+++ b/src/VBox/Runtime/common/asm/ASMCpuIdExSlow.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2012-2013 Oracle Corporation
+; Copyright (C) 2012-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMCpuId_Idx_ECX.asm b/src/VBox/Runtime/common/asm/ASMCpuId_Idx_ECX.asm
index 9992fb2..eb32bea 100644
--- a/src/VBox/Runtime/common/asm/ASMCpuId_Idx_ECX.asm
+++ b/src/VBox/Runtime/common/asm/ASMCpuId_Idx_ECX.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2012-2013 Oracle Corporation
+; Copyright (C) 2012-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMGetGDTR.asm b/src/VBox/Runtime/common/asm/ASMGetGDTR.asm
index 3d827e4..47f860c 100644
--- a/src/VBox/Runtime/common/asm/ASMGetGDTR.asm
+++ b/src/VBox/Runtime/common/asm/ASMGetGDTR.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMGetIDTR.asm b/src/VBox/Runtime/common/asm/ASMGetIDTR.asm
index 558a6d7..3b0c889 100644
--- a/src/VBox/Runtime/common/asm/ASMGetIDTR.asm
+++ b/src/VBox/Runtime/common/asm/ASMGetIDTR.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMGetLDTR.asm b/src/VBox/Runtime/common/asm/ASMGetLDTR.asm
index f7adf82..7cb7aea 100644
--- a/src/VBox/Runtime/common/asm/ASMGetLDTR.asm
+++ b/src/VBox/Runtime/common/asm/ASMGetLDTR.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMGetSegAttr.asm b/src/VBox/Runtime/common/asm/ASMGetSegAttr.asm
index a9f493e..c37e9a9 100644
--- a/src/VBox/Runtime/common/asm/ASMGetSegAttr.asm
+++ b/src/VBox/Runtime/common/asm/ASMGetSegAttr.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2013 Oracle Corporation
+; Copyright (C) 2013-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMGetTR.asm b/src/VBox/Runtime/common/asm/ASMGetTR.asm
index 3d6fc68..5e58a2f 100644
--- a/src/VBox/Runtime/common/asm/ASMGetTR.asm
+++ b/src/VBox/Runtime/common/asm/ASMGetTR.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMMultU32ByU32DivByU32.asm b/src/VBox/Runtime/common/asm/ASMMultU32ByU32DivByU32.asm
index 7aec907..3f21a12 100644
--- a/src/VBox/Runtime/common/asm/ASMMultU32ByU32DivByU32.asm
+++ b/src/VBox/Runtime/common/asm/ASMMultU32ByU32DivByU32.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm b/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm
index 4308631..b149323 100644
--- a/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm
+++ b/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMNopPause.asm b/src/VBox/Runtime/common/asm/ASMNopPause.asm
index 8447a87..ff60aef 100644
--- a/src/VBox/Runtime/common/asm/ASMNopPause.asm
+++ b/src/VBox/Runtime/common/asm/ASMNopPause.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2009-2010 Oracle Corporation
+; Copyright (C) 2009-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMRdMsrEx.asm b/src/VBox/Runtime/common/asm/ASMRdMsrEx.asm
index 6913562..da8b541 100644
--- a/src/VBox/Runtime/common/asm/ASMRdMsrEx.asm
+++ b/src/VBox/Runtime/common/asm/ASMRdMsrEx.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2013 Oracle Corporation
+; Copyright (C) 2013-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMSetGDTR.asm b/src/VBox/Runtime/common/asm/ASMSetGDTR.asm
index bed159d..5ffd8f0 100644
--- a/src/VBox/Runtime/common/asm/ASMSetGDTR.asm
+++ b/src/VBox/Runtime/common/asm/ASMSetGDTR.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2014 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMSetIDTR.asm b/src/VBox/Runtime/common/asm/ASMSetIDTR.asm
index da42014..b7b56f9 100644
--- a/src/VBox/Runtime/common/asm/ASMSetIDTR.asm
+++ b/src/VBox/Runtime/common/asm/ASMSetIDTR.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2014 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/ASMWrMsrEx.asm b/src/VBox/Runtime/common/asm/ASMWrMsrEx.asm
index 4feeaa9..f36b3f9 100644
--- a/src/VBox/Runtime/common/asm/ASMWrMsrEx.asm
+++ b/src/VBox/Runtime/common/asm/ASMWrMsrEx.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2013 Oracle Corporation
+; Copyright (C) 2013-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asm/asm-fake.cpp b/src/VBox/Runtime/common/asm/asm-fake.cpp
index 15e02bd..2ea244f 100644
--- a/src/VBox/Runtime/common/asm/asm-fake.cpp
+++ b/src/VBox/Runtime/common/asm/asm-fake.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-basics.cpp b/src/VBox/Runtime/common/asn1/asn1-basics.cpp
index 4de3b01..7840792 100644
--- a/src/VBox/Runtime/common/asn1/asn1-basics.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-basics.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-cursor.cpp b/src/VBox/Runtime/common/asn1/asn1-cursor.cpp
index 6e95c36..6d39e12 100644
--- a/src/VBox/Runtime/common/asn1/asn1-cursor.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-cursor.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-default-allocator.cpp b/src/VBox/Runtime/common/asn1/asn1-default-allocator.cpp
index 2e52e57..d610a01 100644
--- a/src/VBox/Runtime/common/asn1/asn1-default-allocator.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-default-allocator.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-dump.cpp b/src/VBox/Runtime/common/asn1/asn1-dump.cpp
index e6f4282..0e52069 100644
--- a/src/VBox/Runtime/common/asn1/asn1-dump.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-dump.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-efence-allocator.cpp b/src/VBox/Runtime/common/asn1/asn1-efence-allocator.cpp
index efdac71..55732ac 100644
--- a/src/VBox/Runtime/common/asn1/asn1-efence-allocator.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-efence-allocator.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-encode.cpp b/src/VBox/Runtime/common/asn1/asn1-encode.cpp
index 554f87c..df8b76c 100644
--- a/src/VBox/Runtime/common/asn1/asn1-encode.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-encode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-bitstring-decode.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-bitstring-decode.cpp
index b82c347..0599f35 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-bitstring-decode.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-bitstring-decode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-bitstring-template.h b/src/VBox/Runtime/common/asn1/asn1-ut-bitstring-template.h
index b5971d4..17a9354 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-bitstring-template.h
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-bitstring-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-bitstring.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-bitstring.cpp
index fc9ae89..d36901a 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-bitstring.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-bitstring.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-boolean-decode.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-boolean-decode.cpp
index 6c4f682..7fcbc83 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-boolean-decode.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-boolean-decode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-boolean-template.h b/src/VBox/Runtime/common/asn1/asn1-ut-boolean-template.h
index db2fa19..e4be88a 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-boolean-template.h
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-boolean-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-boolean.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-boolean.cpp
index 1e65549..a3d89fb 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-boolean.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-boolean.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-core-decode.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-core-decode.cpp
index ab42762..19652d2 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-core-decode.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-core-decode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-core-template.h b/src/VBox/Runtime/common/asn1/asn1-ut-core-template.h
index 2005f2d..7291c8a 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-core-template.h
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-core-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-core.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-core.cpp
index 70b8877..5b86e88 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-core.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-core.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-dyntype-decode.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-dyntype-decode.cpp
index 0900184..be36d02 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-dyntype-decode.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-dyntype-decode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-dyntype.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-dyntype.cpp
index 88962d9..03662ec 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-dyntype.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-dyntype.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-integer-decode.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-integer-decode.cpp
index 0142d02..8aa0847 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-integer-decode.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-integer-decode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-integer-template.h b/src/VBox/Runtime/common/asn1/asn1-ut-integer-template.h
index 4ac433f..8f2e682 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-integer-template.h
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-integer-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-integer.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-integer.cpp
index 4d6ce3d..fa271f6 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-integer.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-integer.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-null-decode.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-null-decode.cpp
index f810089..905fb5d 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-null-decode.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-null-decode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-null.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-null.cpp
index 13ae878..f3ae956 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-null.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-null.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-objid-decode.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-objid-decode.cpp
index e6bc429..150250c 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-objid-decode.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-objid-decode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-objid-template.h b/src/VBox/Runtime/common/asn1/asn1-ut-objid-template.h
index 3f6f862..099ce7c 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-objid-template.h
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-objid-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-objid.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-objid.cpp
index 35143e6..e630533 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-objid.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-objid.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-octetstring-decode.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-octetstring-decode.cpp
index 236efad..daadd77 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-octetstring-decode.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-octetstring-decode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-octetstring-template.h b/src/VBox/Runtime/common/asn1/asn1-ut-octetstring-template.h
index b196bf5..a6c5f25 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-octetstring-template.h
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-octetstring-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-octetstring.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-octetstring.cpp
index 9c5ed37..e2fde5b 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-octetstring.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-octetstring.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-string-decode.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-string-decode.cpp
index 77cb176..020d74c 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-string-decode.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-string-decode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-string-template.h b/src/VBox/Runtime/common/asn1/asn1-ut-string-template.h
index 12915b8..34297a3 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-string-template.h
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-string-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-string-template2.h b/src/VBox/Runtime/common/asn1/asn1-ut-string-template2.h
index 0f835e4..b7cfd1c 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-string-template2.h
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-string-template2.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-string.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-string.cpp
index dc0750a..eb2bc46 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-string.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-string.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-time-decode.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-time-decode.cpp
index 1a1ddd6..ca9e22a 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-time-decode.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-time-decode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-time-template.h b/src/VBox/Runtime/common/asn1/asn1-ut-time-template.h
index abe26d1..1ce37e0 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-time-template.h
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-time-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-time-template2.h b/src/VBox/Runtime/common/asn1/asn1-ut-time-template2.h
index e895cd7..354f7b6 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-time-template2.h
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-time-template2.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/asn1/asn1-ut-time.cpp b/src/VBox/Runtime/common/asn1/asn1-ut-time.cpp
index 77073be..95f1ecb 100644
--- a/src/VBox/Runtime/common/asn1/asn1-ut-time.cpp
+++ b/src/VBox/Runtime/common/asn1/asn1-ut-time.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/RTSha1Digest.cpp b/src/VBox/Runtime/common/checksum/RTSha1Digest.cpp
index e12393a..864ab8c 100644
--- a/src/VBox/Runtime/common/checksum/RTSha1Digest.cpp
+++ b/src/VBox/Runtime/common/checksum/RTSha1Digest.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/RTSha256Digest.cpp b/src/VBox/Runtime/common/checksum/RTSha256Digest.cpp
index a68a5b8..160c93a 100644
--- a/src/VBox/Runtime/common/checksum/RTSha256Digest.cpp
+++ b/src/VBox/Runtime/common/checksum/RTSha256Digest.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/adler32.cpp b/src/VBox/Runtime/common/checksum/adler32.cpp
index 5ab8a55..371e234 100644
--- a/src/VBox/Runtime/common/checksum/adler32.cpp
+++ b/src/VBox/Runtime/common/checksum/adler32.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/alt-md2.cpp b/src/VBox/Runtime/common/checksum/alt-md2.cpp
index 8db73bc..058b223 100644
--- a/src/VBox/Runtime/common/checksum/alt-md2.cpp
+++ b/src/VBox/Runtime/common/checksum/alt-md2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/alt-md5.cpp b/src/VBox/Runtime/common/checksum/alt-md5.cpp
index a2c0b5c..84e93f2 100644
--- a/src/VBox/Runtime/common/checksum/alt-md5.cpp
+++ b/src/VBox/Runtime/common/checksum/alt-md5.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/alt-sha1.cpp b/src/VBox/Runtime/common/checksum/alt-sha1.cpp
index 7ecab09..b0f9a0d 100644
--- a/src/VBox/Runtime/common/checksum/alt-sha1.cpp
+++ b/src/VBox/Runtime/common/checksum/alt-sha1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/alt-sha256.cpp b/src/VBox/Runtime/common/checksum/alt-sha256.cpp
index d0e02a5..987f45e 100644
--- a/src/VBox/Runtime/common/checksum/alt-sha256.cpp
+++ b/src/VBox/Runtime/common/checksum/alt-sha256.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/alt-sha512.cpp b/src/VBox/Runtime/common/checksum/alt-sha512.cpp
index f7e7e20..775f88f 100644
--- a/src/VBox/Runtime/common/checksum/alt-sha512.cpp
+++ b/src/VBox/Runtime/common/checksum/alt-sha512.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/crc32-zlib.cpp b/src/VBox/Runtime/common/checksum/crc32-zlib.cpp
index 0ba474b..ebc96ea 100644
--- a/src/VBox/Runtime/common/checksum/crc32-zlib.cpp
+++ b/src/VBox/Runtime/common/checksum/crc32-zlib.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/crc32.cpp b/src/VBox/Runtime/common/checksum/crc32.cpp
index 0ea4f09..bae5647 100644
--- a/src/VBox/Runtime/common/checksum/crc32.cpp
+++ b/src/VBox/Runtime/common/checksum/crc32.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/crc32c.cpp b/src/VBox/Runtime/common/checksum/crc32c.cpp
index ea4e7ea..8921add 100644
--- a/src/VBox/Runtime/common/checksum/crc32c.cpp
+++ b/src/VBox/Runtime/common/checksum/crc32c.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/crc64.cpp b/src/VBox/Runtime/common/checksum/crc64.cpp
index 0904031..91e7d6d 100644
--- a/src/VBox/Runtime/common/checksum/crc64.cpp
+++ b/src/VBox/Runtime/common/checksum/crc64.cpp
@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/ipv4.cpp b/src/VBox/Runtime/common/checksum/ipv4.cpp
index 0200e74..1e8c4e8 100644
--- a/src/VBox/Runtime/common/checksum/ipv4.cpp
+++ b/src/VBox/Runtime/common/checksum/ipv4.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/ipv6.cpp b/src/VBox/Runtime/common/checksum/ipv6.cpp
index 3364d19..8a74d12 100644
--- a/src/VBox/Runtime/common/checksum/ipv6.cpp
+++ b/src/VBox/Runtime/common/checksum/ipv6.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/manifest-file.cpp b/src/VBox/Runtime/common/checksum/manifest-file.cpp
index d686022..d41e196 100644
--- a/src/VBox/Runtime/common/checksum/manifest-file.cpp
+++ b/src/VBox/Runtime/common/checksum/manifest-file.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/manifest.cpp b/src/VBox/Runtime/common/checksum/manifest.cpp
index 77d4d03..3e9e564 100644
--- a/src/VBox/Runtime/common/checksum/manifest.cpp
+++ b/src/VBox/Runtime/common/checksum/manifest.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/manifest2.cpp b/src/VBox/Runtime/common/checksum/manifest2.cpp
index 84cdb03..f1fe4db 100644
--- a/src/VBox/Runtime/common/checksum/manifest2.cpp
+++ b/src/VBox/Runtime/common/checksum/manifest2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/manifest3.cpp b/src/VBox/Runtime/common/checksum/manifest3.cpp
index fbdfc7e..771c7bc 100644
--- a/src/VBox/Runtime/common/checksum/manifest3.cpp
+++ b/src/VBox/Runtime/common/checksum/manifest3.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/md2str.cpp b/src/VBox/Runtime/common/checksum/md2str.cpp
index 850555a..d78aaca 100644
--- a/src/VBox/Runtime/common/checksum/md2str.cpp
+++ b/src/VBox/Runtime/common/checksum/md2str.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/md5str.cpp b/src/VBox/Runtime/common/checksum/md5str.cpp
index 288d6eb..7dd6e5e 100644
--- a/src/VBox/Runtime/common/checksum/md5str.cpp
+++ b/src/VBox/Runtime/common/checksum/md5str.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/openssl-md2.cpp b/src/VBox/Runtime/common/checksum/openssl-md2.cpp
index 80fa859..07e82ff 100644
--- a/src/VBox/Runtime/common/checksum/openssl-md2.cpp
+++ b/src/VBox/Runtime/common/checksum/openssl-md2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/openssl-md5.cpp b/src/VBox/Runtime/common/checksum/openssl-md5.cpp
index fae89f6..6fa2dba 100644
--- a/src/VBox/Runtime/common/checksum/openssl-md5.cpp
+++ b/src/VBox/Runtime/common/checksum/openssl-md5.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/openssl-sha1.cpp b/src/VBox/Runtime/common/checksum/openssl-sha1.cpp
index db28550..bb84180 100644
--- a/src/VBox/Runtime/common/checksum/openssl-sha1.cpp
+++ b/src/VBox/Runtime/common/checksum/openssl-sha1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/openssl-sha256.cpp b/src/VBox/Runtime/common/checksum/openssl-sha256.cpp
index 6686017..affdddc 100644
--- a/src/VBox/Runtime/common/checksum/openssl-sha256.cpp
+++ b/src/VBox/Runtime/common/checksum/openssl-sha256.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/openssl-sha512.cpp b/src/VBox/Runtime/common/checksum/openssl-sha512.cpp
index 6f70a38..83ea9d5 100644
--- a/src/VBox/Runtime/common/checksum/openssl-sha512.cpp
+++ b/src/VBox/Runtime/common/checksum/openssl-sha512.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/sha1str.cpp b/src/VBox/Runtime/common/checksum/sha1str.cpp
index 2226103..85f0835 100644
--- a/src/VBox/Runtime/common/checksum/sha1str.cpp
+++ b/src/VBox/Runtime/common/checksum/sha1str.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/sha224str.cpp b/src/VBox/Runtime/common/checksum/sha224str.cpp
index c5a3593..0a724b9 100644
--- a/src/VBox/Runtime/common/checksum/sha224str.cpp
+++ b/src/VBox/Runtime/common/checksum/sha224str.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/sha256str.cpp b/src/VBox/Runtime/common/checksum/sha256str.cpp
index 4ca92a2..2b6ad5a 100644
--- a/src/VBox/Runtime/common/checksum/sha256str.cpp
+++ b/src/VBox/Runtime/common/checksum/sha256str.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/sha384str.cpp b/src/VBox/Runtime/common/checksum/sha384str.cpp
index 5d45c3d..d841cf9 100644
--- a/src/VBox/Runtime/common/checksum/sha384str.cpp
+++ b/src/VBox/Runtime/common/checksum/sha384str.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/sha512str.cpp b/src/VBox/Runtime/common/checksum/sha512str.cpp
index 5329f4d..bc30e0e 100644
--- a/src/VBox/Runtime/common/checksum/sha512str.cpp
+++ b/src/VBox/Runtime/common/checksum/sha512str.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/sha512t224str.cpp b/src/VBox/Runtime/common/checksum/sha512t224str.cpp
index 18cc1f6..02440e7 100644
--- a/src/VBox/Runtime/common/checksum/sha512t224str.cpp
+++ b/src/VBox/Runtime/common/checksum/sha512t224str.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/sha512t256str.cpp b/src/VBox/Runtime/common/checksum/sha512t256str.cpp
index 2ba7cb9..c2415f5 100644
--- a/src/VBox/Runtime/common/checksum/sha512t256str.cpp
+++ b/src/VBox/Runtime/common/checksum/sha512t256str.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/checksum/x509.cpp b/src/VBox/Runtime/common/checksum/x509.cpp
index a4c9f95..6204f4c 100644
--- a/src/VBox/Runtime/common/checksum/x509.cpp
+++ b/src/VBox/Runtime/common/checksum/x509.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/RTCrStoreCertAddFromFile.cpp b/src/VBox/Runtime/common/crypto/RTCrStoreCertAddFromFile.cpp
index b79eded..6a3c634 100644
--- a/src/VBox/Runtime/common/crypto/RTCrStoreCertAddFromFile.cpp
+++ b/src/VBox/Runtime/common/crypto/RTCrStoreCertAddFromFile.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/digest-builtin.cpp b/src/VBox/Runtime/common/crypto/digest-builtin.cpp
index 914e2c8..d2b75e8 100644
--- a/src/VBox/Runtime/common/crypto/digest-builtin.cpp
+++ b/src/VBox/Runtime/common/crypto/digest-builtin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/digest-core.cpp b/src/VBox/Runtime/common/crypto/digest-core.cpp
index 3387447..6d8460e 100644
--- a/src/VBox/Runtime/common/crypto/digest-core.cpp
+++ b/src/VBox/Runtime/common/crypto/digest-core.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/iprt-openssl.cpp b/src/VBox/Runtime/common/crypto/iprt-openssl.cpp
index d5eaf94..e03e5ac 100644
--- a/src/VBox/Runtime/common/crypto/iprt-openssl.cpp
+++ b/src/VBox/Runtime/common/crypto/iprt-openssl.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pemfile.cpp b/src/VBox/Runtime/common/crypto/pemfile.cpp
index 441c96e..28d454f 100644
--- a/src/VBox/Runtime/common/crypto/pemfile.cpp
+++ b/src/VBox/Runtime/common/crypto/pemfile.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkcs7-asn1-decoder.cpp b/src/VBox/Runtime/common/crypto/pkcs7-asn1-decoder.cpp
index 0306bbe..40db5c1 100644
--- a/src/VBox/Runtime/common/crypto/pkcs7-asn1-decoder.cpp
+++ b/src/VBox/Runtime/common/crypto/pkcs7-asn1-decoder.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkcs7-core.cpp b/src/VBox/Runtime/common/crypto/pkcs7-core.cpp
index 14003f3..0a928e5 100644
--- a/src/VBox/Runtime/common/crypto/pkcs7-core.cpp
+++ b/src/VBox/Runtime/common/crypto/pkcs7-core.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkcs7-init.cpp b/src/VBox/Runtime/common/crypto/pkcs7-init.cpp
index 8bc966f..9b66ec2 100644
--- a/src/VBox/Runtime/common/crypto/pkcs7-init.cpp
+++ b/src/VBox/Runtime/common/crypto/pkcs7-init.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkcs7-internal.h b/src/VBox/Runtime/common/crypto/pkcs7-internal.h
index d4dc2cf..6f2ee48 100644
--- a/src/VBox/Runtime/common/crypto/pkcs7-internal.h
+++ b/src/VBox/Runtime/common/crypto/pkcs7-internal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkcs7-sanity.cpp b/src/VBox/Runtime/common/crypto/pkcs7-sanity.cpp
index 4b7885b..b2d86e8 100644
--- a/src/VBox/Runtime/common/crypto/pkcs7-sanity.cpp
+++ b/src/VBox/Runtime/common/crypto/pkcs7-sanity.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkcs7-template.h b/src/VBox/Runtime/common/crypto/pkcs7-template.h
index b9d6fc7..0bab59c 100644
--- a/src/VBox/Runtime/common/crypto/pkcs7-template.h
+++ b/src/VBox/Runtime/common/crypto/pkcs7-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkcs7-verify.cpp b/src/VBox/Runtime/common/crypto/pkcs7-verify.cpp
index bb919ad..cdec7b6 100644
--- a/src/VBox/Runtime/common/crypto/pkcs7-verify.cpp
+++ b/src/VBox/Runtime/common/crypto/pkcs7-verify.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkix-signature-builtin.cpp b/src/VBox/Runtime/common/crypto/pkix-signature-builtin.cpp
index b51e93c..815f072 100644
--- a/src/VBox/Runtime/common/crypto/pkix-signature-builtin.cpp
+++ b/src/VBox/Runtime/common/crypto/pkix-signature-builtin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkix-signature-builtin.h b/src/VBox/Runtime/common/crypto/pkix-signature-builtin.h
index c4be73b..746c45d 100644
--- a/src/VBox/Runtime/common/crypto/pkix-signature-builtin.h
+++ b/src/VBox/Runtime/common/crypto/pkix-signature-builtin.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkix-signature-core.cpp b/src/VBox/Runtime/common/crypto/pkix-signature-core.cpp
index c373f1c..41740a0 100644
--- a/src/VBox/Runtime/common/crypto/pkix-signature-core.cpp
+++ b/src/VBox/Runtime/common/crypto/pkix-signature-core.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkix-signature-rsa.cpp b/src/VBox/Runtime/common/crypto/pkix-signature-rsa.cpp
index 6f741a0..5e3edc9 100644
--- a/src/VBox/Runtime/common/crypto/pkix-signature-rsa.cpp
+++ b/src/VBox/Runtime/common/crypto/pkix-signature-rsa.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkix-util.cpp b/src/VBox/Runtime/common/crypto/pkix-util.cpp
index 7dcf812..a4a1d7e 100644
--- a/src/VBox/Runtime/common/crypto/pkix-util.cpp
+++ b/src/VBox/Runtime/common/crypto/pkix-util.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/pkix-verify.cpp b/src/VBox/Runtime/common/crypto/pkix-verify.cpp
index 017270e..46c03dc 100644
--- a/src/VBox/Runtime/common/crypto/pkix-verify.cpp
+++ b/src/VBox/Runtime/common/crypto/pkix-verify.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/rsa-asn1-decoder.cpp b/src/VBox/Runtime/common/crypto/rsa-asn1-decoder.cpp
index c3d68b3..ef1fb46 100644
--- a/src/VBox/Runtime/common/crypto/rsa-asn1-decoder.cpp
+++ b/src/VBox/Runtime/common/crypto/rsa-asn1-decoder.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/rsa-core.cpp b/src/VBox/Runtime/common/crypto/rsa-core.cpp
index dd0e63d..e95d551 100644
--- a/src/VBox/Runtime/common/crypto/rsa-core.cpp
+++ b/src/VBox/Runtime/common/crypto/rsa-core.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/rsa-init.cpp b/src/VBox/Runtime/common/crypto/rsa-init.cpp
index 780d951..73c2d33 100644
--- a/src/VBox/Runtime/common/crypto/rsa-init.cpp
+++ b/src/VBox/Runtime/common/crypto/rsa-init.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/rsa-internal.h b/src/VBox/Runtime/common/crypto/rsa-internal.h
index 696aba4..bd14a83 100644
--- a/src/VBox/Runtime/common/crypto/rsa-internal.h
+++ b/src/VBox/Runtime/common/crypto/rsa-internal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/rsa-sanity.cpp b/src/VBox/Runtime/common/crypto/rsa-sanity.cpp
index b62f79f..2c099ce 100644
--- a/src/VBox/Runtime/common/crypto/rsa-sanity.cpp
+++ b/src/VBox/Runtime/common/crypto/rsa-sanity.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/rsa-template.h b/src/VBox/Runtime/common/crypto/rsa-template.h
index 5199654..fcf9f0b 100644
--- a/src/VBox/Runtime/common/crypto/rsa-template.h
+++ b/src/VBox/Runtime/common/crypto/rsa-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/spc-asn1-decoder.cpp b/src/VBox/Runtime/common/crypto/spc-asn1-decoder.cpp
index 820fadd..d73fc08 100644
--- a/src/VBox/Runtime/common/crypto/spc-asn1-decoder.cpp
+++ b/src/VBox/Runtime/common/crypto/spc-asn1-decoder.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/spc-core.cpp b/src/VBox/Runtime/common/crypto/spc-core.cpp
index 4e58912..025ab47 100644
--- a/src/VBox/Runtime/common/crypto/spc-core.cpp
+++ b/src/VBox/Runtime/common/crypto/spc-core.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/spc-init.cpp b/src/VBox/Runtime/common/crypto/spc-init.cpp
index 1775258..f0c35ab 100644
--- a/src/VBox/Runtime/common/crypto/spc-init.cpp
+++ b/src/VBox/Runtime/common/crypto/spc-init.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/spc-internal.h b/src/VBox/Runtime/common/crypto/spc-internal.h
index fc27316..3d30fd3 100644
--- a/src/VBox/Runtime/common/crypto/spc-internal.h
+++ b/src/VBox/Runtime/common/crypto/spc-internal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/spc-sanity.cpp b/src/VBox/Runtime/common/crypto/spc-sanity.cpp
index cd40719..b521f16 100644
--- a/src/VBox/Runtime/common/crypto/spc-sanity.cpp
+++ b/src/VBox/Runtime/common/crypto/spc-sanity.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/spc-template.h b/src/VBox/Runtime/common/crypto/spc-template.h
index 22bed2e..2c57a5b 100644
--- a/src/VBox/Runtime/common/crypto/spc-template.h
+++ b/src/VBox/Runtime/common/crypto/spc-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/store-inmem.cpp b/src/VBox/Runtime/common/crypto/store-inmem.cpp
index 53d0e15..673c904 100644
--- a/src/VBox/Runtime/common/crypto/store-inmem.cpp
+++ b/src/VBox/Runtime/common/crypto/store-inmem.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/store-internal.h b/src/VBox/Runtime/common/crypto/store-internal.h
index d0e35f3..a24f0c0 100644
--- a/src/VBox/Runtime/common/crypto/store-internal.h
+++ b/src/VBox/Runtime/common/crypto/store-internal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/store.cpp b/src/VBox/Runtime/common/crypto/store.cpp
index b4e1edb..aa4da82 100644
--- a/src/VBox/Runtime/common/crypto/store.cpp
+++ b/src/VBox/Runtime/common/crypto/store.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/taf-asn1-decoder.cpp b/src/VBox/Runtime/common/crypto/taf-asn1-decoder.cpp
index d4c1dc5..3819525 100644
--- a/src/VBox/Runtime/common/crypto/taf-asn1-decoder.cpp
+++ b/src/VBox/Runtime/common/crypto/taf-asn1-decoder.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/taf-core.cpp b/src/VBox/Runtime/common/crypto/taf-core.cpp
index ea1e192..f372ade 100644
--- a/src/VBox/Runtime/common/crypto/taf-core.cpp
+++ b/src/VBox/Runtime/common/crypto/taf-core.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/taf-init.cpp b/src/VBox/Runtime/common/crypto/taf-init.cpp
index c45969c..70febec 100644
--- a/src/VBox/Runtime/common/crypto/taf-init.cpp
+++ b/src/VBox/Runtime/common/crypto/taf-init.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/taf-internal.h b/src/VBox/Runtime/common/crypto/taf-internal.h
index 082002a..0020b6b 100644
--- a/src/VBox/Runtime/common/crypto/taf-internal.h
+++ b/src/VBox/Runtime/common/crypto/taf-internal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/taf-sanity.cpp b/src/VBox/Runtime/common/crypto/taf-sanity.cpp
index 691da41..5aace79 100644
--- a/src/VBox/Runtime/common/crypto/taf-sanity.cpp
+++ b/src/VBox/Runtime/common/crypto/taf-sanity.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/taf-template.h b/src/VBox/Runtime/common/crypto/taf-template.h
index 9067a4b..07a25a7 100644
--- a/src/VBox/Runtime/common/crypto/taf-template.h
+++ b/src/VBox/Runtime/common/crypto/taf-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/tsp-asn1-decoder.cpp b/src/VBox/Runtime/common/crypto/tsp-asn1-decoder.cpp
index 8ec7115..78bdb71 100644
--- a/src/VBox/Runtime/common/crypto/tsp-asn1-decoder.cpp
+++ b/src/VBox/Runtime/common/crypto/tsp-asn1-decoder.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/tsp-core.cpp b/src/VBox/Runtime/common/crypto/tsp-core.cpp
index 30143d6..5571fef 100644
--- a/src/VBox/Runtime/common/crypto/tsp-core.cpp
+++ b/src/VBox/Runtime/common/crypto/tsp-core.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/tsp-init.cpp b/src/VBox/Runtime/common/crypto/tsp-init.cpp
index b516525..7eb1ac3 100644
--- a/src/VBox/Runtime/common/crypto/tsp-init.cpp
+++ b/src/VBox/Runtime/common/crypto/tsp-init.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/tsp-internal.h b/src/VBox/Runtime/common/crypto/tsp-internal.h
index 59131d6..57df4e5 100644
--- a/src/VBox/Runtime/common/crypto/tsp-internal.h
+++ b/src/VBox/Runtime/common/crypto/tsp-internal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/tsp-sanity.cpp b/src/VBox/Runtime/common/crypto/tsp-sanity.cpp
index ac1bccf..957a018 100644
--- a/src/VBox/Runtime/common/crypto/tsp-sanity.cpp
+++ b/src/VBox/Runtime/common/crypto/tsp-sanity.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/tsp-template.h b/src/VBox/Runtime/common/crypto/tsp-template.h
index 8499f3c..25dc242 100644
--- a/src/VBox/Runtime/common/crypto/tsp-template.h
+++ b/src/VBox/Runtime/common/crypto/tsp-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/x509-asn1-decoder.cpp b/src/VBox/Runtime/common/crypto/x509-asn1-decoder.cpp
index 9535e9a..d4353d8 100644
--- a/src/VBox/Runtime/common/crypto/x509-asn1-decoder.cpp
+++ b/src/VBox/Runtime/common/crypto/x509-asn1-decoder.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/x509-certpaths.cpp b/src/VBox/Runtime/common/crypto/x509-certpaths.cpp
index f49eec5..467b034 100644
--- a/src/VBox/Runtime/common/crypto/x509-certpaths.cpp
+++ b/src/VBox/Runtime/common/crypto/x509-certpaths.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/x509-core.cpp b/src/VBox/Runtime/common/crypto/x509-core.cpp
index 212b77d..efd955e 100644
--- a/src/VBox/Runtime/common/crypto/x509-core.cpp
+++ b/src/VBox/Runtime/common/crypto/x509-core.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/x509-file.cpp b/src/VBox/Runtime/common/crypto/x509-file.cpp
index 10bc8e5..1824ebb 100644
--- a/src/VBox/Runtime/common/crypto/x509-file.cpp
+++ b/src/VBox/Runtime/common/crypto/x509-file.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/x509-init.cpp b/src/VBox/Runtime/common/crypto/x509-init.cpp
index ed5f688..5dc3e7a 100644
--- a/src/VBox/Runtime/common/crypto/x509-init.cpp
+++ b/src/VBox/Runtime/common/crypto/x509-init.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/x509-internal.h b/src/VBox/Runtime/common/crypto/x509-internal.h
index 9eb95e8..6976252 100644
--- a/src/VBox/Runtime/common/crypto/x509-internal.h
+++ b/src/VBox/Runtime/common/crypto/x509-internal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/x509-sanity.cpp b/src/VBox/Runtime/common/crypto/x509-sanity.cpp
index 3b8e3a3..4d3583d 100644
--- a/src/VBox/Runtime/common/crypto/x509-sanity.cpp
+++ b/src/VBox/Runtime/common/crypto/x509-sanity.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/x509-template.h b/src/VBox/Runtime/common/crypto/x509-template.h
index d7170d5..b11e812 100644
--- a/src/VBox/Runtime/common/crypto/x509-template.h
+++ b/src/VBox/Runtime/common/crypto/x509-template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/crypto/x509-verify.cpp b/src/VBox/Runtime/common/crypto/x509-verify.cpp
index 1beb086..ed4f4a4 100644
--- a/src/VBox/Runtime/common/crypto/x509-verify.cpp
+++ b/src/VBox/Runtime/common/crypto/x509-verify.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbg.cpp b/src/VBox/Runtime/common/dbg/dbg.cpp
index b5ae1d9..4d7d9ee 100644
--- a/src/VBox/Runtime/common/dbg/dbg.cpp
+++ b/src/VBox/Runtime/common/dbg/dbg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbgas.cpp b/src/VBox/Runtime/common/dbg/dbgas.cpp
index 445cc49..bcb5336 100644
--- a/src/VBox/Runtime/common/dbg/dbgas.cpp
+++ b/src/VBox/Runtime/common/dbg/dbgas.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbgcfg.cpp b/src/VBox/Runtime/common/dbg/dbgcfg.cpp
index 1d497c1..ba940ee 100644
--- a/src/VBox/Runtime/common/dbg/dbgcfg.cpp
+++ b/src/VBox/Runtime/common/dbg/dbgcfg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbgmod.cpp b/src/VBox/Runtime/common/dbg/dbgmod.cpp
index f55bba5..85f9b80 100644
--- a/src/VBox/Runtime/common/dbg/dbgmod.cpp
+++ b/src/VBox/Runtime/common/dbg/dbgmod.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp b/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp
index efa9375..01661df 100644
--- a/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp
+++ b/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp
@@ -19,7 +19,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp b/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp
index 1e36e77..ac85ed2 100644
--- a/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp
+++ b/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbgmoddbghelp.cpp b/src/VBox/Runtime/common/dbg/dbgmoddbghelp.cpp
index f8a1e79..3a34406 100644
--- a/src/VBox/Runtime/common/dbg/dbgmoddbghelp.cpp
+++ b/src/VBox/Runtime/common/dbg/dbgmoddbghelp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbgmoddeferred.cpp b/src/VBox/Runtime/common/dbg/dbgmoddeferred.cpp
index 276d67b..b5d50b9 100644
--- a/src/VBox/Runtime/common/dbg/dbgmoddeferred.cpp
+++ b/src/VBox/Runtime/common/dbg/dbgmoddeferred.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp b/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp
index 840a4fd..1685f61 100644
--- a/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp
+++ b/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbgmodexports.cpp b/src/VBox/Runtime/common/dbg/dbgmodexports.cpp
index b62e250..81288e5 100644
--- a/src/VBox/Runtime/common/dbg/dbgmodexports.cpp
+++ b/src/VBox/Runtime/common/dbg/dbgmodexports.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbgmodldr.cpp b/src/VBox/Runtime/common/dbg/dbgmodldr.cpp
index 7d4a599..8df4638 100644
--- a/src/VBox/Runtime/common/dbg/dbgmodldr.cpp
+++ b/src/VBox/Runtime/common/dbg/dbgmodldr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dbg/dbgmodnm.cpp b/src/VBox/Runtime/common/dbg/dbgmodnm.cpp
index 9a564c3..070de30 100644
--- a/src/VBox/Runtime/common/dbg/dbgmodnm.cpp
+++ b/src/VBox/Runtime/common/dbg/dbgmodnm.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dvm/dvm.cpp b/src/VBox/Runtime/common/dvm/dvm.cpp
index fad9422..4dcba96 100644
--- a/src/VBox/Runtime/common/dvm/dvm.cpp
+++ b/src/VBox/Runtime/common/dvm/dvm.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp b/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp
index d6274fc..3b15bb4 100644
--- a/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp
+++ b/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dvm/dvmgpt.cpp b/src/VBox/Runtime/common/dvm/dvmgpt.cpp
index 866229d..733d4c5 100644
--- a/src/VBox/Runtime/common/dvm/dvmgpt.cpp
+++ b/src/VBox/Runtime/common/dvm/dvmgpt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dvm/dvmmbr.cpp b/src/VBox/Runtime/common/dvm/dvmmbr.cpp
index 91314de..f74e8ff 100644
--- a/src/VBox/Runtime/common/dvm/dvmmbr.cpp
+++ b/src/VBox/Runtime/common/dvm/dvmmbr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/dvm/dvmvfs.cpp b/src/VBox/Runtime/common/dvm/dvmvfs.cpp
index 7e34765..421f73a 100644
--- a/src/VBox/Runtime/common/dvm/dvmvfs.cpp
+++ b/src/VBox/Runtime/common/dvm/dvmvfs.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp b/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp
index f079f06..80c3b6d 100644
--- a/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp
+++ b/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp b/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp
index 0e90b20..85a4ddd 100644
--- a/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp
+++ b/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/errinfo-alloc.cpp b/src/VBox/Runtime/common/err/errinfo-alloc.cpp
index 7e9017b..654f4c0 100644
--- a/src/VBox/Runtime/common/err/errinfo-alloc.cpp
+++ b/src/VBox/Runtime/common/err/errinfo-alloc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/errinfo.cpp b/src/VBox/Runtime/common/err/errinfo.cpp
index aef23b8..d5e09dd 100644
--- a/src/VBox/Runtime/common/err/errinfo.cpp
+++ b/src/VBox/Runtime/common/err/errinfo.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/errmsg.cpp b/src/VBox/Runtime/common/err/errmsg.cpp
index a48f135..ec95523 100644
--- a/src/VBox/Runtime/common/err/errmsg.cpp
+++ b/src/VBox/Runtime/common/err/errmsg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/errmsg.sed b/src/VBox/Runtime/common/err/errmsg.sed
index 2ccc7be..542e3e4 100644
--- a/src/VBox/Runtime/common/err/errmsg.sed
+++ b/src/VBox/Runtime/common/err/errmsg.sed
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2011 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/errmsgcom.sed b/src/VBox/Runtime/common/err/errmsgcom.sed
index bd47a60..4d625ac 100644
--- a/src/VBox/Runtime/common/err/errmsgcom.sed
+++ b/src/VBox/Runtime/common/err/errmsgcom.sed
@@ -3,7 +3,7 @@
 # IPRT - SED script for converting COM errors
 #
 
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/errmsgxpcom.cpp b/src/VBox/Runtime/common/err/errmsgxpcom.cpp
index 8d9903f..eb2694d 100644
--- a/src/VBox/Runtime/common/err/errmsgxpcom.cpp
+++ b/src/VBox/Runtime/common/err/errmsgxpcom.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/filesystem/filesystem.cpp b/src/VBox/Runtime/common/filesystem/filesystem.cpp
index 37deee4..30940bc 100644
--- a/src/VBox/Runtime/common/filesystem/filesystem.cpp
+++ b/src/VBox/Runtime/common/filesystem/filesystem.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/filesystem/filesystemext.cpp b/src/VBox/Runtime/common/filesystem/filesystemext.cpp
index f6e138a..cdd97a9 100644
--- a/src/VBox/Runtime/common/filesystem/filesystemext.cpp
+++ b/src/VBox/Runtime/common/filesystem/filesystemext.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/ldr/ldr.cpp b/src/VBox/Runtime/common/ldr/ldr.cpp
index cc6f547..a1d5919 100644
--- a/src/VBox/Runtime/common/ldr/ldr.cpp
+++ b/src/VBox/Runtime/common/ldr/ldr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/ldr/ldrELF.cpp b/src/VBox/Runtime/common/ldr/ldrELF.cpp
index 8053ec3..2627bfa 100644
--- a/src/VBox/Runtime/common/ldr/ldrELF.cpp
+++ b/src/VBox/Runtime/common/ldr/ldrELF.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h b/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h
index 37a95d8..7de7b95 100644
--- a/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h
+++ b/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/ldr/ldrEx.cpp b/src/VBox/Runtime/common/ldr/ldrEx.cpp
index 554e5d8..73888ac 100644
--- a/src/VBox/Runtime/common/ldr/ldrEx.cpp
+++ b/src/VBox/Runtime/common/ldr/ldrEx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/ldr/ldrFile.cpp b/src/VBox/Runtime/common/ldr/ldrFile.cpp
index ab78e5c..7e8f2ea 100644
--- a/src/VBox/Runtime/common/ldr/ldrFile.cpp
+++ b/src/VBox/Runtime/common/ldr/ldrFile.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/ldr/ldrMemory.cpp b/src/VBox/Runtime/common/ldr/ldrMemory.cpp
index 2cfacb8..6ec29d3 100644
--- a/src/VBox/Runtime/common/ldr/ldrMemory.cpp
+++ b/src/VBox/Runtime/common/ldr/ldrMemory.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/ldr/ldrNative.cpp b/src/VBox/Runtime/common/ldr/ldrNative.cpp
index 1d2f0ab..5ffbf59 100644
--- a/src/VBox/Runtime/common/ldr/ldrNative.cpp
+++ b/src/VBox/Runtime/common/ldr/ldrNative.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/ldr/ldrPE.cpp b/src/VBox/Runtime/common/ldr/ldrPE.cpp
index c9f69c0..d975e93 100644
--- a/src/VBox/Runtime/common/ldr/ldrPE.cpp
+++ b/src/VBox/Runtime/common/ldr/ldrPE.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/ldr/ldrkStuff.cpp b/src/VBox/Runtime/common/ldr/ldrkStuff.cpp
index 7438466..00b1595 100644
--- a/src/VBox/Runtime/common/ldr/ldrkStuff.cpp
+++ b/src/VBox/Runtime/common/ldr/ldrkStuff.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/log/log.cpp b/src/VBox/Runtime/common/log/log.cpp
index b3c6d57..5539350 100644
--- a/src/VBox/Runtime/common/log/log.cpp
+++ b/src/VBox/Runtime/common/log/log.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -300,7 +300,7 @@ static struct
     size_t      cchInstr;               /**< The size of the name. */
     uint32_t    fFlag;                  /**< The flag value. */
     bool        fInverted;              /**< Inverse meaning? */
-} const s_aLogFlags[] =
+} const g_aLogFlags[] =
 {
     { "disabled",     sizeof("disabled"    ) - 1,   RTLOGFLAGS_DISABLED,            false },
     { "enabled",      sizeof("enabled"     ) - 1,   RTLOGFLAGS_DISABLED,            true  },
@@ -2047,21 +2047,21 @@ RTDECL(int) RTLogFlags(PRTLOGGER pLogger, const char *pszValue)
         }
 
         /* instruction. */
-        for (i = 0; i < RT_ELEMENTS(s_aLogFlags); i++)
+        for (i = 0; i < RT_ELEMENTS(g_aLogFlags); i++)
         {
-            if (!strncmp(pszValue, s_aLogFlags[i].pszInstr, s_aLogFlags[i].cchInstr))
+            if (!strncmp(pszValue, g_aLogFlags[i].pszInstr, g_aLogFlags[i].cchInstr))
             {
-                if (fNo == s_aLogFlags[i].fInverted)
-                    pLogger->fFlags |= s_aLogFlags[i].fFlag;
+                if (fNo == g_aLogFlags[i].fInverted)
+                    pLogger->fFlags |= g_aLogFlags[i].fFlag;
                 else
-                    pLogger->fFlags &= ~s_aLogFlags[i].fFlag;
-                pszValue += s_aLogFlags[i].cchInstr;
+                    pLogger->fFlags &= ~g_aLogFlags[i].fFlag;
+                pszValue += g_aLogFlags[i].cchInstr;
                 break;
             }
         }
 
         /* unknown instruction? */
-        if (i >= RT_ELEMENTS(s_aLogFlags))
+        if (i >= RT_ELEMENTS(g_aLogFlags))
         {
             AssertMsgFailed(("Invalid flags! unknown instruction %.20s\n", pszValue));
             pszValue++;
@@ -2173,12 +2173,12 @@ RTDECL(int) RTLogGetFlags(PRTLOGGER pLogger, char *pszBuf, size_t cchBuf)
      * Add the flags in the list.
      */
     fFlags = pLogger->fFlags;
-    for (i = 0; i < RT_ELEMENTS(s_aLogFlags); i++)
-        if (    !s_aLogFlags[i].fInverted
-            ?   (s_aLogFlags[i].fFlag & fFlags)
-            :   !(s_aLogFlags[i].fFlag & fFlags))
+    for (i = 0; i < RT_ELEMENTS(g_aLogFlags); i++)
+        if (    !g_aLogFlags[i].fInverted
+            ?   (g_aLogFlags[i].fFlag & fFlags)
+            :   !(g_aLogFlags[i].fFlag & fFlags))
         {
-            size_t cchInstr = s_aLogFlags[i].cchInstr;
+            size_t cchInstr = g_aLogFlags[i].cchInstr;
             if (cchInstr + fNotFirst + 1 > cchBuf)
             {
                 rc = VERR_BUFFER_OVERFLOW;
@@ -2189,7 +2189,7 @@ RTDECL(int) RTLogGetFlags(PRTLOGGER pLogger, char *pszBuf, size_t cchBuf)
                 *pszBuf++ = ' ';
                 cchBuf--;
             }
-            memcpy(pszBuf, s_aLogFlags[i].pszInstr, cchInstr);
+            memcpy(pszBuf, g_aLogFlags[i].pszInstr, cchInstr);
             pszBuf += cchInstr;
             cchBuf -= cchInstr;
             fNotFirst = true;
@@ -2678,7 +2678,7 @@ RTDECL(PRTLOGGER) RTLogGetDefaultInstanceEx(uint32_t fFlagsAndGroup)
             pLogger = NULL;
         else
         {
-            uint16_t const fFlags = RT_LO_U16(fFlagsAndGroup);
+            uint32_t const fFlags = RT_LO_U16(fFlagsAndGroup);
             uint16_t const iGroup = RT_HI_U16(fFlagsAndGroup);
             if (   iGroup != UINT16_MAX
                  && (   (pLogger->afGroups[iGroup < pLogger->cGroups ? iGroup : 0] & (fFlags | RTLOGGRPFLAGS_ENABLED))
diff --git a/src/VBox/Runtime/common/log/logcom.cpp b/src/VBox/Runtime/common/log/logcom.cpp
index 62400b7..8ddcf34 100644
--- a/src/VBox/Runtime/common/log/logcom.cpp
+++ b/src/VBox/Runtime/common/log/logcom.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/log/logellipsis.cpp b/src/VBox/Runtime/common/log/logellipsis.cpp
index 0088892..e831e33 100644
--- a/src/VBox/Runtime/common/log/logellipsis.cpp
+++ b/src/VBox/Runtime/common/log/logellipsis.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/log/logformat.cpp b/src/VBox/Runtime/common/log/logformat.cpp
index f17f4a0..1161fd8 100644
--- a/src/VBox/Runtime/common/log/logformat.cpp
+++ b/src/VBox/Runtime/common/log/logformat.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/log/logrel.cpp b/src/VBox/Runtime/common/log/logrel.cpp
index 49ca4a6..34df280 100644
--- a/src/VBox/Runtime/common/log/logrel.cpp
+++ b/src/VBox/Runtime/common/log/logrel.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/log/logrelellipsis.cpp b/src/VBox/Runtime/common/log/logrelellipsis.cpp
index 6523994..43631f7 100644
--- a/src/VBox/Runtime/common/log/logrelellipsis.cpp
+++ b/src/VBox/Runtime/common/log/logrelellipsis.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/RTUInt128MulByU64.asm b/src/VBox/Runtime/common/math/RTUInt128MulByU64.asm
index 07e596f..c6da932 100644
--- a/src/VBox/Runtime/common/math/RTUInt128MulByU64.asm
+++ b/src/VBox/Runtime/common/math/RTUInt128MulByU64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2014 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/bignum-amd64-x86.asm b/src/VBox/Runtime/common/math/bignum-amd64-x86.asm
index 7d3c21e..a77e4a9 100644
--- a/src/VBox/Runtime/common/math/bignum-amd64-x86.asm
+++ b/src/VBox/Runtime/common/math/bignum-amd64-x86.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2014 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/bignum.cpp b/src/VBox/Runtime/common/math/bignum.cpp
index 1255658..72bee1d 100644
--- a/src/VBox/Runtime/common/math/bignum.cpp
+++ b/src/VBox/Runtime/common/math/bignum.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/ceill.asm b/src/VBox/Runtime/common/math/ceill.asm
index ec2d037..80174d7 100644
--- a/src/VBox/Runtime/common/math/ceill.asm
+++ b/src/VBox/Runtime/common/math/ceill.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/cosl.asm b/src/VBox/Runtime/common/math/cosl.asm
index ab29ccb..6f37ad7 100644
--- a/src/VBox/Runtime/common/math/cosl.asm
+++ b/src/VBox/Runtime/common/math/cosl.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/fabs.asm b/src/VBox/Runtime/common/math/fabs.asm
index ea510f2..ae5d28f 100644
--- a/src/VBox/Runtime/common/math/fabs.asm
+++ b/src/VBox/Runtime/common/math/fabs.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/fabsf.asm b/src/VBox/Runtime/common/math/fabsf.asm
index 0bb7791..5f4baaf 100644
--- a/src/VBox/Runtime/common/math/fabsf.asm
+++ b/src/VBox/Runtime/common/math/fabsf.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/fabsl.asm b/src/VBox/Runtime/common/math/fabsl.asm
index b7a3dbf..6e4ea50 100644
--- a/src/VBox/Runtime/common/math/fabsl.asm
+++ b/src/VBox/Runtime/common/math/fabsl.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/floor.asm b/src/VBox/Runtime/common/math/floor.asm
index 5df9211..7ef76d4 100644
--- a/src/VBox/Runtime/common/math/floor.asm
+++ b/src/VBox/Runtime/common/math/floor.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/floorf.asm b/src/VBox/Runtime/common/math/floorf.asm
index e5c798a..74152e1 100644
--- a/src/VBox/Runtime/common/math/floorf.asm
+++ b/src/VBox/Runtime/common/math/floorf.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/floorl.asm b/src/VBox/Runtime/common/math/floorl.asm
index 6a89c0a..a1b9ffa 100644
--- a/src/VBox/Runtime/common/math/floorl.asm
+++ b/src/VBox/Runtime/common/math/floorl.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/ldexpl.asm b/src/VBox/Runtime/common/math/ldexpl.asm
index 4b26fc7..0e6caa9 100644
--- a/src/VBox/Runtime/common/math/ldexpl.asm
+++ b/src/VBox/Runtime/common/math/ldexpl.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/llrint.asm b/src/VBox/Runtime/common/math/llrint.asm
index 528bdf0..a7b8022 100644
--- a/src/VBox/Runtime/common/math/llrint.asm
+++ b/src/VBox/Runtime/common/math/llrint.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/llrintf.asm b/src/VBox/Runtime/common/math/llrintf.asm
index fcffd9c..34ea2b8 100644
--- a/src/VBox/Runtime/common/math/llrintf.asm
+++ b/src/VBox/Runtime/common/math/llrintf.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/llrintl.asm b/src/VBox/Runtime/common/math/llrintl.asm
index c30bdfa..bb19ebf 100644
--- a/src/VBox/Runtime/common/math/llrintl.asm
+++ b/src/VBox/Runtime/common/math/llrintl.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/logl.asm b/src/VBox/Runtime/common/math/logl.asm
index b203c4c..10be0e7 100644
--- a/src/VBox/Runtime/common/math/logl.asm
+++ b/src/VBox/Runtime/common/math/logl.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/lrint.asm b/src/VBox/Runtime/common/math/lrint.asm
index 130598a..13d91f7 100644
--- a/src/VBox/Runtime/common/math/lrint.asm
+++ b/src/VBox/Runtime/common/math/lrint.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/lrintf.asm b/src/VBox/Runtime/common/math/lrintf.asm
index 7bc7003..29b0c19 100644
--- a/src/VBox/Runtime/common/math/lrintf.asm
+++ b/src/VBox/Runtime/common/math/lrintf.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/lrintl.asm b/src/VBox/Runtime/common/math/lrintl.asm
index 72795eb..1f789b2 100644
--- a/src/VBox/Runtime/common/math/lrintl.asm
+++ b/src/VBox/Runtime/common/math/lrintl.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/remainder.asm b/src/VBox/Runtime/common/math/remainder.asm
index 7741913..31feb24 100644
--- a/src/VBox/Runtime/common/math/remainder.asm
+++ b/src/VBox/Runtime/common/math/remainder.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/remainderf.asm b/src/VBox/Runtime/common/math/remainderf.asm
index d6f87aa..eb026d5 100644
--- a/src/VBox/Runtime/common/math/remainderf.asm
+++ b/src/VBox/Runtime/common/math/remainderf.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/remainderl.asm b/src/VBox/Runtime/common/math/remainderl.asm
index d5d5319..90dfa52 100644
--- a/src/VBox/Runtime/common/math/remainderl.asm
+++ b/src/VBox/Runtime/common/math/remainderl.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/sinl.asm b/src/VBox/Runtime/common/math/sinl.asm
index 4fb0d7c..5de384a 100644
--- a/src/VBox/Runtime/common/math/sinl.asm
+++ b/src/VBox/Runtime/common/math/sinl.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/tanl.asm b/src/VBox/Runtime/common/math/tanl.asm
index 2fabc36..50ddde6 100644
--- a/src/VBox/Runtime/common/math/tanl.asm
+++ b/src/VBox/Runtime/common/math/tanl.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/trunc.asm b/src/VBox/Runtime/common/math/trunc.asm
index 11d310c..a884191 100644
--- a/src/VBox/Runtime/common/math/trunc.asm
+++ b/src/VBox/Runtime/common/math/trunc.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/truncf.asm b/src/VBox/Runtime/common/math/truncf.asm
index 5914d8e..5223fc6 100644
--- a/src/VBox/Runtime/common/math/truncf.asm
+++ b/src/VBox/Runtime/common/math/truncf.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/math/truncl.asm b/src/VBox/Runtime/common/math/truncl.asm
index b703cba..267fe5f 100644
--- a/src/VBox/Runtime/common/math/truncl.asm
+++ b/src/VBox/Runtime/common/math/truncl.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp
index 06d6afa..9d4f54b 100644
--- a/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp
+++ b/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp
index 69fbd04..9247f5b 100644
--- a/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp
+++ b/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp
index f8bd63e..72c7aaf 100644
--- a/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp
+++ b/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp
index a36a30a..68a1f14 100644
--- a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp
+++ b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp
index 8ffe97e..6a3a34b 100644
--- a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp
+++ b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp
index 7a40d26..08ada4d 100644
--- a/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp
+++ b/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp
index f54b044..e0e17c3 100644
--- a/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp
+++ b/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/RTFileModeToFlags.cpp b/src/VBox/Runtime/common/misc/RTFileModeToFlags.cpp
index b5e10a2..bdd85ad 100644
--- a/src/VBox/Runtime/common/misc/RTFileModeToFlags.cpp
+++ b/src/VBox/Runtime/common/misc/RTFileModeToFlags.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/RTFileOpenF.cpp b/src/VBox/Runtime/common/misc/RTFileOpenF.cpp
index 7383736..51dd093 100644
--- a/src/VBox/Runtime/common/misc/RTFileOpenF.cpp
+++ b/src/VBox/Runtime/common/misc/RTFileOpenF.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/RTFileOpenV.cpp b/src/VBox/Runtime/common/misc/RTFileOpenV.cpp
index b8ed619..259722d 100644
--- a/src/VBox/Runtime/common/misc/RTFileOpenV.cpp
+++ b/src/VBox/Runtime/common/misc/RTFileOpenV.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/RTMemWipeThoroughly.cpp b/src/VBox/Runtime/common/misc/RTMemWipeThoroughly.cpp
index c5656b4..fa566ca 100644
--- a/src/VBox/Runtime/common/misc/RTMemWipeThoroughly.cpp
+++ b/src/VBox/Runtime/common/misc/RTMemWipeThoroughly.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/aiomgr.cpp b/src/VBox/Runtime/common/misc/aiomgr.cpp
index 43f12c8..c7cfb34 100644
--- a/src/VBox/Runtime/common/misc/aiomgr.cpp
+++ b/src/VBox/Runtime/common/misc/aiomgr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/assert.cpp b/src/VBox/Runtime/common/misc/assert.cpp
index 0802e15..76b9324 100644
--- a/src/VBox/Runtime/common/misc/assert.cpp
+++ b/src/VBox/Runtime/common/misc/assert.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/buildconfig.cpp b/src/VBox/Runtime/common/misc/buildconfig.cpp
index 3509a94..807d50e 100644
--- a/src/VBox/Runtime/common/misc/buildconfig.cpp
+++ b/src/VBox/Runtime/common/misc/buildconfig.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/cidr.cpp b/src/VBox/Runtime/common/misc/cidr.cpp
index 802fc01..a964586 100644
--- a/src/VBox/Runtime/common/misc/cidr.cpp
+++ b/src/VBox/Runtime/common/misc/cidr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/circbuf.cpp b/src/VBox/Runtime/common/misc/circbuf.cpp
index 0dff65f..37a72f8 100644
--- a/src/VBox/Runtime/common/misc/circbuf.cpp
+++ b/src/VBox/Runtime/common/misc/circbuf.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/getopt.cpp b/src/VBox/Runtime/common/misc/getopt.cpp
index cf538f2..8bad39f 100644
--- a/src/VBox/Runtime/common/misc/getopt.cpp
+++ b/src/VBox/Runtime/common/misc/getopt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/getoptargv.cpp b/src/VBox/Runtime/common/misc/getoptargv.cpp
index e0bdafc..b071e3a 100644
--- a/src/VBox/Runtime/common/misc/getoptargv.cpp
+++ b/src/VBox/Runtime/common/misc/getoptargv.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/handle.cpp b/src/VBox/Runtime/common/misc/handle.cpp
index b4f81e2..ef591a5 100644
--- a/src/VBox/Runtime/common/misc/handle.cpp
+++ b/src/VBox/Runtime/common/misc/handle.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/handletable.cpp b/src/VBox/Runtime/common/misc/handletable.cpp
index 375e79d..6c8a50b 100644
--- a/src/VBox/Runtime/common/misc/handletable.cpp
+++ b/src/VBox/Runtime/common/misc/handletable.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/handletable.h b/src/VBox/Runtime/common/misc/handletable.h
index 6e76463..83bcff5 100644
--- a/src/VBox/Runtime/common/misc/handletable.h
+++ b/src/VBox/Runtime/common/misc/handletable.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/handletablectx.cpp b/src/VBox/Runtime/common/misc/handletablectx.cpp
index b4d5bfc..af13f37 100644
--- a/src/VBox/Runtime/common/misc/handletablectx.cpp
+++ b/src/VBox/Runtime/common/misc/handletablectx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/handletablesimple.cpp b/src/VBox/Runtime/common/misc/handletablesimple.cpp
index 2969dac..350cf34 100644
--- a/src/VBox/Runtime/common/misc/handletablesimple.cpp
+++ b/src/VBox/Runtime/common/misc/handletablesimple.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/http.cpp b/src/VBox/Runtime/common/misc/http.cpp
index 6c8e294..6bc1303 100644
--- a/src/VBox/Runtime/common/misc/http.cpp
+++ b/src/VBox/Runtime/common/misc/http.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/lockvalidator.cpp b/src/VBox/Runtime/common/misc/lockvalidator.cpp
index 81c8c53..4ddc88f 100644
--- a/src/VBox/Runtime/common/misc/lockvalidator.cpp
+++ b/src/VBox/Runtime/common/misc/lockvalidator.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/message.cpp b/src/VBox/Runtime/common/misc/message.cpp
index 643121a..0b5fb93 100644
--- a/src/VBox/Runtime/common/misc/message.cpp
+++ b/src/VBox/Runtime/common/misc/message.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/once.cpp b/src/VBox/Runtime/common/misc/once.cpp
index ad8fca6..cb7d3c9 100644
--- a/src/VBox/Runtime/common/misc/once.cpp
+++ b/src/VBox/Runtime/common/misc/once.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/req.cpp b/src/VBox/Runtime/common/misc/req.cpp
index fa3e0c2..8ed4c45 100644
--- a/src/VBox/Runtime/common/misc/req.cpp
+++ b/src/VBox/Runtime/common/misc/req.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/reqpool.cpp b/src/VBox/Runtime/common/misc/reqpool.cpp
index bf63d11..80a0d84 100644
--- a/src/VBox/Runtime/common/misc/reqpool.cpp
+++ b/src/VBox/Runtime/common/misc/reqpool.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/reqqueue.cpp b/src/VBox/Runtime/common/misc/reqqueue.cpp
index 4d8a6ec..05846e3 100644
--- a/src/VBox/Runtime/common/misc/reqqueue.cpp
+++ b/src/VBox/Runtime/common/misc/reqqueue.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/s3.cpp b/src/VBox/Runtime/common/misc/s3.cpp
index 8defa73..52d60cd 100644
--- a/src/VBox/Runtime/common/misc/s3.cpp
+++ b/src/VBox/Runtime/common/misc/s3.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/sanity-c.c b/src/VBox/Runtime/common/misc/sanity-c.c
index 61b1ddd..64c0626 100644
--- a/src/VBox/Runtime/common/misc/sanity-c.c
+++ b/src/VBox/Runtime/common/misc/sanity-c.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/sanity-cpp.cpp b/src/VBox/Runtime/common/misc/sanity-cpp.cpp
index e646428..68ee16c 100644
--- a/src/VBox/Runtime/common/misc/sanity-cpp.cpp
+++ b/src/VBox/Runtime/common/misc/sanity-cpp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/sanity.h b/src/VBox/Runtime/common/misc/sanity.h
index 8915138..b06185d 100644
--- a/src/VBox/Runtime/common/misc/sanity.h
+++ b/src/VBox/Runtime/common/misc/sanity.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/semspingpong.cpp b/src/VBox/Runtime/common/misc/semspingpong.cpp
index 1063314..bd5e04c 100644
--- a/src/VBox/Runtime/common/misc/semspingpong.cpp
+++ b/src/VBox/Runtime/common/misc/semspingpong.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/setjmp.asm b/src/VBox/Runtime/common/misc/setjmp.asm
index f4960d9..1d56b17 100644
--- a/src/VBox/Runtime/common/misc/setjmp.asm
+++ b/src/VBox/Runtime/common/misc/setjmp.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/sg.cpp b/src/VBox/Runtime/common/misc/sg.cpp
index 6629c12..6344114 100644
--- a/src/VBox/Runtime/common/misc/sg.cpp
+++ b/src/VBox/Runtime/common/misc/sg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/term.cpp b/src/VBox/Runtime/common/misc/term.cpp
index 7a7fb76..7964425 100644
--- a/src/VBox/Runtime/common/misc/term.cpp
+++ b/src/VBox/Runtime/common/misc/term.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/thread.cpp b/src/VBox/Runtime/common/misc/thread.cpp
index 3299c9b..df331f8 100644
--- a/src/VBox/Runtime/common/misc/thread.cpp
+++ b/src/VBox/Runtime/common/misc/thread.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/uri.cpp b/src/VBox/Runtime/common/misc/uri.cpp
index 056f93c..43b1097 100644
--- a/src/VBox/Runtime/common/misc/uri.cpp
+++ b/src/VBox/Runtime/common/misc/uri.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/misc/zero.asm b/src/VBox/Runtime/common/misc/zero.asm
index 5f6b250..0db7dbc 100644
--- a/src/VBox/Runtime/common/misc/zero.asm
+++ b/src/VBox/Runtime/common/misc/zero.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2013 Oracle Corporation
+; Copyright (C) 2013-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/net/macstr.cpp b/src/VBox/Runtime/common/net/macstr.cpp
index 84ac038..34e506d 100644
--- a/src/VBox/Runtime/common/net/macstr.cpp
+++ b/src/VBox/Runtime/common/net/macstr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/net/netaddrstr.cpp b/src/VBox/Runtime/common/net/netaddrstr.cpp
index 4d754b0..8b7f195 100644
--- a/src/VBox/Runtime/common/net/netaddrstr.cpp
+++ b/src/VBox/Runtime/common/net/netaddrstr.cpp
@@ -10,7 +10,7 @@
 /*
  * Contributed by Oliver Loch.
  *
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/net/netaddrstr2.cpp b/src/VBox/Runtime/common/net/netaddrstr2.cpp
index 30aa7cc..1259b7d 100644
--- a/src/VBox/Runtime/common/net/netaddrstr2.cpp
+++ b/src/VBox/Runtime/common/net/netaddrstr2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathAbsDup.cpp b/src/VBox/Runtime/common/path/RTPathAbsDup.cpp
index 337ce12..9ad768d6 100644
--- a/src/VBox/Runtime/common/path/RTPathAbsDup.cpp
+++ b/src/VBox/Runtime/common/path/RTPathAbsDup.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathAbsEx.cpp b/src/VBox/Runtime/common/path/RTPathAbsEx.cpp
index 86ce86a..8ed1730 100644
--- a/src/VBox/Runtime/common/path/RTPathAbsEx.cpp
+++ b/src/VBox/Runtime/common/path/RTPathAbsEx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp b/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp
index 9247d89..e0df52b 100644
--- a/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp
+++ b/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathAppend.cpp b/src/VBox/Runtime/common/path/RTPathAppend.cpp
index af3e591..c717571 100644
--- a/src/VBox/Runtime/common/path/RTPathAppend.cpp
+++ b/src/VBox/Runtime/common/path/RTPathAppend.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathAppendEx.cpp b/src/VBox/Runtime/common/path/RTPathAppendEx.cpp
index ebed386..199c4f4 100644
--- a/src/VBox/Runtime/common/path/RTPathAppendEx.cpp
+++ b/src/VBox/Runtime/common/path/RTPathAppendEx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathCalcRelative.cpp b/src/VBox/Runtime/common/path/RTPathCalcRelative.cpp
index fbb6b64..60088c0 100644
--- a/src/VBox/Runtime/common/path/RTPathCalcRelative.cpp
+++ b/src/VBox/Runtime/common/path/RTPathCalcRelative.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathChangeToDosSlashes.cpp b/src/VBox/Runtime/common/path/RTPathChangeToDosSlashes.cpp
index 68b5880..6260953 100644
--- a/src/VBox/Runtime/common/path/RTPathChangeToDosSlashes.cpp
+++ b/src/VBox/Runtime/common/path/RTPathChangeToDosSlashes.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathChangeToUnixSlashes.cpp b/src/VBox/Runtime/common/path/RTPathChangeToUnixSlashes.cpp
index c8e5e3c..931b4ca 100644
--- a/src/VBox/Runtime/common/path/RTPathChangeToUnixSlashes.cpp
+++ b/src/VBox/Runtime/common/path/RTPathChangeToUnixSlashes.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathCopyComponents.cpp b/src/VBox/Runtime/common/path/RTPathCopyComponents.cpp
index afe4738..9599fc7 100644
--- a/src/VBox/Runtime/common/path/RTPathCopyComponents.cpp
+++ b/src/VBox/Runtime/common/path/RTPathCopyComponents.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathCountComponents.cpp b/src/VBox/Runtime/common/path/RTPathCountComponents.cpp
index 5096146..2d4f22f 100644
--- a/src/VBox/Runtime/common/path/RTPathCountComponents.cpp
+++ b/src/VBox/Runtime/common/path/RTPathCountComponents.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathExt.cpp b/src/VBox/Runtime/common/path/RTPathExt.cpp
index d337be6..5da48dd 100644
--- a/src/VBox/Runtime/common/path/RTPathExt.cpp
+++ b/src/VBox/Runtime/common/path/RTPathExt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathFilename.cpp b/src/VBox/Runtime/common/path/RTPathFilename.cpp
index 3278383..3ef0450 100644
--- a/src/VBox/Runtime/common/path/RTPathFilename.cpp
+++ b/src/VBox/Runtime/common/path/RTPathFilename.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathHasExt.cpp b/src/VBox/Runtime/common/path/RTPathHasExt.cpp
index 3624c97..abe419a 100644
--- a/src/VBox/Runtime/common/path/RTPathHasExt.cpp
+++ b/src/VBox/Runtime/common/path/RTPathHasExt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathHasPath.cpp b/src/VBox/Runtime/common/path/RTPathHasPath.cpp
index e644717..4352e5e 100644
--- a/src/VBox/Runtime/common/path/RTPathHasPath.cpp
+++ b/src/VBox/Runtime/common/path/RTPathHasPath.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathJoin.cpp b/src/VBox/Runtime/common/path/RTPathJoin.cpp
index 100a798..d9b9d0e 100644
--- a/src/VBox/Runtime/common/path/RTPathJoin.cpp
+++ b/src/VBox/Runtime/common/path/RTPathJoin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathJoinA.cpp b/src/VBox/Runtime/common/path/RTPathJoinA.cpp
index c1b8fbe..0be4fcf 100644
--- a/src/VBox/Runtime/common/path/RTPathJoinA.cpp
+++ b/src/VBox/Runtime/common/path/RTPathJoinA.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathJoinEx.cpp b/src/VBox/Runtime/common/path/RTPathJoinEx.cpp
index d0b43e3..3822642 100644
--- a/src/VBox/Runtime/common/path/RTPathJoinEx.cpp
+++ b/src/VBox/Runtime/common/path/RTPathJoinEx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathParse.cpp b/src/VBox/Runtime/common/path/RTPathParse.cpp
index 3ead690..cb8dae6 100644
--- a/src/VBox/Runtime/common/path/RTPathParse.cpp
+++ b/src/VBox/Runtime/common/path/RTPathParse.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathParse.cpp.h b/src/VBox/Runtime/common/path/RTPathParse.cpp.h
index bef8e7a..09e7cfa 100644
--- a/src/VBox/Runtime/common/path/RTPathParse.cpp.h
+++ b/src/VBox/Runtime/common/path/RTPathParse.cpp.h
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathParseSimple.cpp b/src/VBox/Runtime/common/path/RTPathParseSimple.cpp
index f6de9aa..060096c 100644
--- a/src/VBox/Runtime/common/path/RTPathParseSimple.cpp
+++ b/src/VBox/Runtime/common/path/RTPathParseSimple.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathParsedReassemble.cpp b/src/VBox/Runtime/common/path/RTPathParsedReassemble.cpp
index 5ba842c..bdc8cce 100644
--- a/src/VBox/Runtime/common/path/RTPathParsedReassemble.cpp
+++ b/src/VBox/Runtime/common/path/RTPathParsedReassemble.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathRealDup.cpp b/src/VBox/Runtime/common/path/RTPathRealDup.cpp
index c0d84e4..e87ed44 100644
--- a/src/VBox/Runtime/common/path/RTPathRealDup.cpp
+++ b/src/VBox/Runtime/common/path/RTPathRealDup.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathRmCmd.cpp b/src/VBox/Runtime/common/path/RTPathRmCmd.cpp
index cfb9b73..3902cde 100644
--- a/src/VBox/Runtime/common/path/RTPathRmCmd.cpp
+++ b/src/VBox/Runtime/common/path/RTPathRmCmd.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathSplit.cpp b/src/VBox/Runtime/common/path/RTPathSplit.cpp
index 6c528ce..bf0428e 100644
--- a/src/VBox/Runtime/common/path/RTPathSplit.cpp
+++ b/src/VBox/Runtime/common/path/RTPathSplit.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathSplitA.cpp b/src/VBox/Runtime/common/path/RTPathSplitA.cpp
index e29d315..f53af0f 100644
--- a/src/VBox/Runtime/common/path/RTPathSplitA.cpp
+++ b/src/VBox/Runtime/common/path/RTPathSplitA.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathSplitReassemble.cpp b/src/VBox/Runtime/common/path/RTPathSplitReassemble.cpp
index 8d70317..a6d164e 100644
--- a/src/VBox/Runtime/common/path/RTPathSplitReassemble.cpp
+++ b/src/VBox/Runtime/common/path/RTPathSplitReassemble.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathStartsWithRoot.cpp b/src/VBox/Runtime/common/path/RTPathStartsWithRoot.cpp
index 5211824..6d44fa1 100644
--- a/src/VBox/Runtime/common/path/RTPathStartsWithRoot.cpp
+++ b/src/VBox/Runtime/common/path/RTPathStartsWithRoot.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathStripExt.cpp b/src/VBox/Runtime/common/path/RTPathStripExt.cpp
index 5c0daeb..f0b32b0 100644
--- a/src/VBox/Runtime/common/path/RTPathStripExt.cpp
+++ b/src/VBox/Runtime/common/path/RTPathStripExt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathStripFilename.cpp b/src/VBox/Runtime/common/path/RTPathStripFilename.cpp
index b264783..adf0c20 100644
--- a/src/VBox/Runtime/common/path/RTPathStripFilename.cpp
+++ b/src/VBox/Runtime/common/path/RTPathStripFilename.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathStripTrailingSlash.cpp b/src/VBox/Runtime/common/path/RTPathStripTrailingSlash.cpp
index 2296e04..8a560be 100644
--- a/src/VBox/Runtime/common/path/RTPathStripTrailingSlash.cpp
+++ b/src/VBox/Runtime/common/path/RTPathStripTrailingSlash.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/RTPathTraverseList.cpp b/src/VBox/Runtime/common/path/RTPathTraverseList.cpp
index 361b0f8..0913fe5 100644
--- a/src/VBox/Runtime/common/path/RTPathTraverseList.cpp
+++ b/src/VBox/Runtime/common/path/RTPathTraverseList.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/comparepaths.cpp b/src/VBox/Runtime/common/path/comparepaths.cpp
index bfa5e71..cda6c9b 100644
--- a/src/VBox/Runtime/common/path/comparepaths.cpp
+++ b/src/VBox/Runtime/common/path/comparepaths.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/rtPathRootSpecLen.cpp b/src/VBox/Runtime/common/path/rtPathRootSpecLen.cpp
index 9cdbb40..ec94ead 100644
--- a/src/VBox/Runtime/common/path/rtPathRootSpecLen.cpp
+++ b/src/VBox/Runtime/common/path/rtPathRootSpecLen.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp b/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp
index 5e95e5d..7101cf5 100644
--- a/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp
+++ b/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/path/rtpath-expand-template.cpp.h b/src/VBox/Runtime/common/path/rtpath-expand-template.cpp.h
index 3797733..bc22da9 100644
--- a/src/VBox/Runtime/common/path/rtpath-expand-template.cpp.h
+++ b/src/VBox/Runtime/common/path/rtpath-expand-template.cpp.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/rand/rand.cpp b/src/VBox/Runtime/common/rand/rand.cpp
index c6d4582..081abeb 100644
--- a/src/VBox/Runtime/common/rand/rand.cpp
+++ b/src/VBox/Runtime/common/rand/rand.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/rand/randadv.cpp b/src/VBox/Runtime/common/rand/randadv.cpp
index feff335..8bbac46 100644
--- a/src/VBox/Runtime/common/rand/randadv.cpp
+++ b/src/VBox/Runtime/common/rand/randadv.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/rand/randparkmiller.cpp b/src/VBox/Runtime/common/rand/randparkmiller.cpp
index 4a42904..16d5cd1 100644
--- a/src/VBox/Runtime/common/rand/randparkmiller.cpp
+++ b/src/VBox/Runtime/common/rand/randparkmiller.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/sort/RTSortApvIsSorted.cpp b/src/VBox/Runtime/common/sort/RTSortApvIsSorted.cpp
index ccf4c62..7591949 100644
--- a/src/VBox/Runtime/common/sort/RTSortApvIsSorted.cpp
+++ b/src/VBox/Runtime/common/sort/RTSortApvIsSorted.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/sort/RTSortIsSorted.cpp b/src/VBox/Runtime/common/sort/RTSortIsSorted.cpp
index ff066e4..9bcc4c8 100644
--- a/src/VBox/Runtime/common/sort/RTSortIsSorted.cpp
+++ b/src/VBox/Runtime/common/sort/RTSortIsSorted.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/sort/shellsort.cpp b/src/VBox/Runtime/common/sort/shellsort.cpp
index 23f956f..d2719b3 100644
--- a/src/VBox/Runtime/common/sort/shellsort.cpp
+++ b/src/VBox/Runtime/common/sort/shellsort.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrCat.cpp b/src/VBox/Runtime/common/string/RTStrCat.cpp
index b85a883..024ef8f 100644
--- a/src/VBox/Runtime/common/string/RTStrCat.cpp
+++ b/src/VBox/Runtime/common/string/RTStrCat.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrCatEx.cpp b/src/VBox/Runtime/common/string/RTStrCatEx.cpp
index 69cb92c..d3a17be 100644
--- a/src/VBox/Runtime/common/string/RTStrCatEx.cpp
+++ b/src/VBox/Runtime/common/string/RTStrCatEx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrCatP.cpp b/src/VBox/Runtime/common/string/RTStrCatP.cpp
index 5eb93ff..f3349a5 100644
--- a/src/VBox/Runtime/common/string/RTStrCatP.cpp
+++ b/src/VBox/Runtime/common/string/RTStrCatP.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrCatPEx.cpp b/src/VBox/Runtime/common/string/RTStrCatPEx.cpp
index 808773f..cff13b8 100644
--- a/src/VBox/Runtime/common/string/RTStrCatPEx.cpp
+++ b/src/VBox/Runtime/common/string/RTStrCatPEx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrCmp.cpp b/src/VBox/Runtime/common/string/RTStrCmp.cpp
index 598a186..71da42a 100644
--- a/src/VBox/Runtime/common/string/RTStrCmp.cpp
+++ b/src/VBox/Runtime/common/string/RTStrCmp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrCopy.cpp b/src/VBox/Runtime/common/string/RTStrCopy.cpp
index b8062ce..6257877 100644
--- a/src/VBox/Runtime/common/string/RTStrCopy.cpp
+++ b/src/VBox/Runtime/common/string/RTStrCopy.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrCopyEx.cpp b/src/VBox/Runtime/common/string/RTStrCopyEx.cpp
index 2baabd1..ee53f76 100644
--- a/src/VBox/Runtime/common/string/RTStrCopyEx.cpp
+++ b/src/VBox/Runtime/common/string/RTStrCopyEx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrCopyP.cpp b/src/VBox/Runtime/common/string/RTStrCopyP.cpp
index 0e6c166..8b6a260 100644
--- a/src/VBox/Runtime/common/string/RTStrCopyP.cpp
+++ b/src/VBox/Runtime/common/string/RTStrCopyP.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrCopyPEx.cpp b/src/VBox/Runtime/common/string/RTStrCopyPEx.cpp
index 84919a0..4fca2ba 100644
--- a/src/VBox/Runtime/common/string/RTStrCopyPEx.cpp
+++ b/src/VBox/Runtime/common/string/RTStrCopyPEx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrNCmp.cpp b/src/VBox/Runtime/common/string/RTStrNCmp.cpp
index 5880c8f..f7a31fb 100644
--- a/src/VBox/Runtime/common/string/RTStrNCmp.cpp
+++ b/src/VBox/Runtime/common/string/RTStrNCmp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrNLen.cpp b/src/VBox/Runtime/common/string/RTStrNLen.cpp
index 777c750..faf2020 100644
--- a/src/VBox/Runtime/common/string/RTStrNLen.cpp
+++ b/src/VBox/Runtime/common/string/RTStrNLen.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrNLenEx.cpp b/src/VBox/Runtime/common/string/RTStrNLenEx.cpp
index 19e1815..26d649f 100644
--- a/src/VBox/Runtime/common/string/RTStrNLenEx.cpp
+++ b/src/VBox/Runtime/common/string/RTStrNLenEx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp b/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp
index 8f15551..07ffd45 100644
--- a/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp
+++ b/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTStrStr.cpp b/src/VBox/Runtime/common/string/RTStrStr.cpp
index a6555bf..020208f 100644
--- a/src/VBox/Runtime/common/string/RTStrStr.cpp
+++ b/src/VBox/Runtime/common/string/RTStrStr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTUtf16Cat.cpp b/src/VBox/Runtime/common/string/RTUtf16Cat.cpp
index 4ddac2c..b30a023 100644
--- a/src/VBox/Runtime/common/string/RTUtf16Cat.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16Cat.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTUtf16CatAscii.cpp b/src/VBox/Runtime/common/string/RTUtf16CatAscii.cpp
index 79de535..1e61139 100644
--- a/src/VBox/Runtime/common/string/RTUtf16CatAscii.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16CatAscii.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTUtf16CmpAscii.cpp b/src/VBox/Runtime/common/string/RTUtf16CmpAscii.cpp
index 2a4238b..ee34a82 100644
--- a/src/VBox/Runtime/common/string/RTUtf16CmpAscii.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16CmpAscii.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTUtf16Copy.cpp b/src/VBox/Runtime/common/string/RTUtf16Copy.cpp
index 7325351..0750ce2 100644
--- a/src/VBox/Runtime/common/string/RTUtf16Copy.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16Copy.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTUtf16CopyAscii.cpp b/src/VBox/Runtime/common/string/RTUtf16CopyAscii.cpp
index 510dab3..5519321 100644
--- a/src/VBox/Runtime/common/string/RTUtf16CopyAscii.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16CopyAscii.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTUtf16End.cpp b/src/VBox/Runtime/common/string/RTUtf16End.cpp
index 04d8558..2c79fae 100644
--- a/src/VBox/Runtime/common/string/RTUtf16End.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16End.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTUtf16ICmpAscii.cpp b/src/VBox/Runtime/common/string/RTUtf16ICmpAscii.cpp
index 2b02b34..f87778e 100644
--- a/src/VBox/Runtime/common/string/RTUtf16ICmpAscii.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16ICmpAscii.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTUtf16NLen.cpp b/src/VBox/Runtime/common/string/RTUtf16NLen.cpp
index 3883435..9cea302 100644
--- a/src/VBox/Runtime/common/string/RTUtf16NLen.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16NLen.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTUtf16NLenEx.cpp b/src/VBox/Runtime/common/string/RTUtf16NLenEx.cpp
index 183c692..c261c82 100644
--- a/src/VBox/Runtime/common/string/RTUtf16NLenEx.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16NLenEx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/RTUtf16PrintHexBytes.cpp b/src/VBox/Runtime/common/string/RTUtf16PrintHexBytes.cpp
index 8a32253..a116b9c 100644
--- a/src/VBox/Runtime/common/string/RTUtf16PrintHexBytes.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16PrintHexBytes.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/base64.cpp b/src/VBox/Runtime/common/string/base64.cpp
index 94b1697..afdb3c3 100644
--- a/src/VBox/Runtime/common/string/base64.cpp
+++ b/src/VBox/Runtime/common/string/base64.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memchr.asm b/src/VBox/Runtime/common/string/memchr.asm
index 95fd165..d187c46 100644
--- a/src/VBox/Runtime/common/string/memchr.asm
+++ b/src/VBox/Runtime/common/string/memchr.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memchr.cpp b/src/VBox/Runtime/common/string/memchr.cpp
index abfa379..5235b15 100644
--- a/src/VBox/Runtime/common/string/memchr.cpp
+++ b/src/VBox/Runtime/common/string/memchr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memchr_alias.c b/src/VBox/Runtime/common/string/memchr_alias.c
index 9092954..545d469 100644
--- a/src/VBox/Runtime/common/string/memchr_alias.c
+++ b/src/VBox/Runtime/common/string/memchr_alias.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memcmp.asm b/src/VBox/Runtime/common/string/memcmp.asm
index 5176dfe..439bf0f 100644
--- a/src/VBox/Runtime/common/string/memcmp.asm
+++ b/src/VBox/Runtime/common/string/memcmp.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memcmp.cpp b/src/VBox/Runtime/common/string/memcmp.cpp
index 6ccf9b1..7af29bf 100644
--- a/src/VBox/Runtime/common/string/memcmp.cpp
+++ b/src/VBox/Runtime/common/string/memcmp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memcmp_alias.c b/src/VBox/Runtime/common/string/memcmp_alias.c
index 6a4337b..8dd10f3 100644
--- a/src/VBox/Runtime/common/string/memcmp_alias.c
+++ b/src/VBox/Runtime/common/string/memcmp_alias.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memcpy.asm b/src/VBox/Runtime/common/string/memcpy.asm
index b8f94df..f63d88a 100644
--- a/src/VBox/Runtime/common/string/memcpy.asm
+++ b/src/VBox/Runtime/common/string/memcpy.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memcpy.cpp b/src/VBox/Runtime/common/string/memcpy.cpp
index d04cfe0..dcd0a72 100644
--- a/src/VBox/Runtime/common/string/memcpy.cpp
+++ b/src/VBox/Runtime/common/string/memcpy.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memcpy_alias.c b/src/VBox/Runtime/common/string/memcpy_alias.c
index ecea9ae..4862af7 100644
--- a/src/VBox/Runtime/common/string/memcpy_alias.c
+++ b/src/VBox/Runtime/common/string/memcpy_alias.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memmove.asm b/src/VBox/Runtime/common/string/memmove.asm
index c52d988..e0c0018 100644
--- a/src/VBox/Runtime/common/string/memmove.asm
+++ b/src/VBox/Runtime/common/string/memmove.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memmove_alias.c b/src/VBox/Runtime/common/string/memmove_alias.c
index 1fc2e0c..29556f6 100644
--- a/src/VBox/Runtime/common/string/memmove_alias.c
+++ b/src/VBox/Runtime/common/string/memmove_alias.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/mempcpy.asm b/src/VBox/Runtime/common/string/mempcpy.asm
index 157a63d..3d82152 100644
--- a/src/VBox/Runtime/common/string/mempcpy.asm
+++ b/src/VBox/Runtime/common/string/mempcpy.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memset.asm b/src/VBox/Runtime/common/string/memset.asm
index a2d562b..1a94c32 100644
--- a/src/VBox/Runtime/common/string/memset.asm
+++ b/src/VBox/Runtime/common/string/memset.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memset.cpp b/src/VBox/Runtime/common/string/memset.cpp
index 9935bef..89ceb8f 100644
--- a/src/VBox/Runtime/common/string/memset.cpp
+++ b/src/VBox/Runtime/common/string/memset.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/memset_alias.c b/src/VBox/Runtime/common/string/memset_alias.c
index 6479347..250644e 100644
--- a/src/VBox/Runtime/common/string/memset_alias.c
+++ b/src/VBox/Runtime/common/string/memset_alias.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/ministring.cpp b/src/VBox/Runtime/common/string/ministring.cpp
index f54c31f..07d22e3 100644
--- a/src/VBox/Runtime/common/string/ministring.cpp
+++ b/src/VBox/Runtime/common/string/ministring.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2007-2014 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/simplepattern.cpp b/src/VBox/Runtime/common/string/simplepattern.cpp
index 6f6bdd2..fb67721 100644
--- a/src/VBox/Runtime/common/string/simplepattern.cpp
+++ b/src/VBox/Runtime/common/string/simplepattern.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/straprintf.cpp b/src/VBox/Runtime/common/string/straprintf.cpp
index a09abd3..8b6194e 100644
--- a/src/VBox/Runtime/common/string/straprintf.cpp
+++ b/src/VBox/Runtime/common/string/straprintf.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strcache.cpp b/src/VBox/Runtime/common/string/strcache.cpp
index e452a4a..ae4cc66 100644
--- a/src/VBox/Runtime/common/string/strcache.cpp
+++ b/src/VBox/Runtime/common/string/strcache.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strchr.asm b/src/VBox/Runtime/common/string/strchr.asm
index e890e9c..9a488b0 100644
--- a/src/VBox/Runtime/common/string/strchr.asm
+++ b/src/VBox/Runtime/common/string/strchr.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strchr_alias.c b/src/VBox/Runtime/common/string/strchr_alias.c
index 63a9a59..606e707 100644
--- a/src/VBox/Runtime/common/string/strchr_alias.c
+++ b/src/VBox/Runtime/common/string/strchr_alias.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strcmp.asm b/src/VBox/Runtime/common/string/strcmp.asm
index 31de02d..aeab32c 100644
--- a/src/VBox/Runtime/common/string/strcmp.asm
+++ b/src/VBox/Runtime/common/string/strcmp.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strcmp_alias.c b/src/VBox/Runtime/common/string/strcmp_alias.c
index 9347aff..35c5080 100644
--- a/src/VBox/Runtime/common/string/strcmp_alias.c
+++ b/src/VBox/Runtime/common/string/strcmp_alias.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strcpy.asm b/src/VBox/Runtime/common/string/strcpy.asm
index 85f7ede..a4dd693 100644
--- a/src/VBox/Runtime/common/string/strcpy.asm
+++ b/src/VBox/Runtime/common/string/strcpy.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strcpy.cpp b/src/VBox/Runtime/common/string/strcpy.cpp
index 3ea6cf0..517fcf5 100644
--- a/src/VBox/Runtime/common/string/strcpy.cpp
+++ b/src/VBox/Runtime/common/string/strcpy.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strcpy_alias.c b/src/VBox/Runtime/common/string/strcpy_alias.c
index d703d4c..e77a288 100644
--- a/src/VBox/Runtime/common/string/strcpy_alias.c
+++ b/src/VBox/Runtime/common/string/strcpy_alias.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strformat.cpp b/src/VBox/Runtime/common/string/strformat.cpp
index 61fd186..64fb1de 100644
--- a/src/VBox/Runtime/common/string/strformat.cpp
+++ b/src/VBox/Runtime/common/string/strformat.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strformatnum.cpp b/src/VBox/Runtime/common/string/strformatnum.cpp
index 777e8ec..eb93113 100644
--- a/src/VBox/Runtime/common/string/strformatnum.cpp
+++ b/src/VBox/Runtime/common/string/strformatnum.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strformatrt.cpp b/src/VBox/Runtime/common/string/strformatrt.cpp
index 05ce927..7b4dd93 100644
--- a/src/VBox/Runtime/common/string/strformatrt.cpp
+++ b/src/VBox/Runtime/common/string/strformatrt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strformattype.cpp b/src/VBox/Runtime/common/string/strformattype.cpp
index c37f3b5..502b89f 100644
--- a/src/VBox/Runtime/common/string/strformattype.cpp
+++ b/src/VBox/Runtime/common/string/strformattype.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strhash1.cpp b/src/VBox/Runtime/common/string/strhash1.cpp
index 840f81d..589f93e 100644
--- a/src/VBox/Runtime/common/string/strhash1.cpp
+++ b/src/VBox/Runtime/common/string/strhash1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/stringalloc.cpp b/src/VBox/Runtime/common/string/stringalloc.cpp
index 81f1091..14f4811 100644
--- a/src/VBox/Runtime/common/string/stringalloc.cpp
+++ b/src/VBox/Runtime/common/string/stringalloc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strlen.asm b/src/VBox/Runtime/common/string/strlen.asm
index b34e576..25e35f1 100644
--- a/src/VBox/Runtime/common/string/strlen.asm
+++ b/src/VBox/Runtime/common/string/strlen.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strlen.cpp b/src/VBox/Runtime/common/string/strlen.cpp
index 792b040..61b61da 100644
--- a/src/VBox/Runtime/common/string/strlen.cpp
+++ b/src/VBox/Runtime/common/string/strlen.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strlen_alias.c b/src/VBox/Runtime/common/string/strlen_alias.c
index da47160..c861adf 100644
--- a/src/VBox/Runtime/common/string/strlen_alias.c
+++ b/src/VBox/Runtime/common/string/strlen_alias.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strncmp.asm b/src/VBox/Runtime/common/string/strncmp.asm
index ffd8993..e580a17 100644
--- a/src/VBox/Runtime/common/string/strncmp.asm
+++ b/src/VBox/Runtime/common/string/strncmp.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2014 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strncmp.cpp b/src/VBox/Runtime/common/string/strncmp.cpp
index 24d3fe4..91d4555 100644
--- a/src/VBox/Runtime/common/string/strncmp.cpp
+++ b/src/VBox/Runtime/common/string/strncmp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strncpy.asm b/src/VBox/Runtime/common/string/strncpy.asm
index 45d311d..fe71a54 100644
--- a/src/VBox/Runtime/common/string/strncpy.asm
+++ b/src/VBox/Runtime/common/string/strncpy.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strpbrk.cpp b/src/VBox/Runtime/common/string/strpbrk.cpp
index 4e341ee..57f1c23 100644
--- a/src/VBox/Runtime/common/string/strpbrk.cpp
+++ b/src/VBox/Runtime/common/string/strpbrk.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strprintf.cpp b/src/VBox/Runtime/common/string/strprintf.cpp
index 5e96e25..fa749e3 100644
--- a/src/VBox/Runtime/common/string/strprintf.cpp
+++ b/src/VBox/Runtime/common/string/strprintf.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strspace.cpp b/src/VBox/Runtime/common/string/strspace.cpp
index d76c1c1..5e8274b 100644
--- a/src/VBox/Runtime/common/string/strspace.cpp
+++ b/src/VBox/Runtime/common/string/strspace.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strstrip.cpp b/src/VBox/Runtime/common/string/strstrip.cpp
index 9e930c8..8a52fdf 100644
--- a/src/VBox/Runtime/common/string/strstrip.cpp
+++ b/src/VBox/Runtime/common/string/strstrip.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strtonum.cpp b/src/VBox/Runtime/common/string/strtonum.cpp
index 4d49a30..af6ba5c 100644
--- a/src/VBox/Runtime/common/string/strtonum.cpp
+++ b/src/VBox/Runtime/common/string/strtonum.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/strversion.cpp b/src/VBox/Runtime/common/string/strversion.cpp
index 8c38c86..30b4b00 100644
--- a/src/VBox/Runtime/common/string/strversion.cpp
+++ b/src/VBox/Runtime/common/string/strversion.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/uni.cpp b/src/VBox/Runtime/common/string/uni.cpp
index d1bdb8b..672490f 100644
--- a/src/VBox/Runtime/common/string/uni.cpp
+++ b/src/VBox/Runtime/common/string/uni.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/unidata-flags.cpp b/src/VBox/Runtime/common/string/unidata-flags.cpp
index 6cab483..e5c1f72 100644
--- a/src/VBox/Runtime/common/string/unidata-flags.cpp
+++ b/src/VBox/Runtime/common/string/unidata-flags.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/unidata-lower.cpp b/src/VBox/Runtime/common/string/unidata-lower.cpp
index e912ef6..698b272 100644
--- a/src/VBox/Runtime/common/string/unidata-lower.cpp
+++ b/src/VBox/Runtime/common/string/unidata-lower.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/unidata-upper.cpp b/src/VBox/Runtime/common/string/unidata-upper.cpp
index 5222fe6..ea309c1 100644
--- a/src/VBox/Runtime/common/string/unidata-upper.cpp
+++ b/src/VBox/Runtime/common/string/unidata-upper.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/uniread.cpp b/src/VBox/Runtime/common/string/uniread.cpp
index cf63bea..abf30ed 100644
--- a/src/VBox/Runtime/common/string/uniread.cpp
+++ b/src/VBox/Runtime/common/string/uniread.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1037,7 +1037,7 @@ int PrintHeader(const char *argv0, const char *pszBaseDir)
                   " */\n"
                   "\n"
                   "/*\n"
-                  " * Copyright (C) 2006-2014 Oracle Corporation\n"
+                  " * Copyright (C) 2006-2015 Oracle Corporation \n"
                   " *\n"
                   " * This file is part of VirtualBox Open Source Edition (OSE), as\n"
                   " * available from http://www.virtualbox.org. This file is free software;\n"
diff --git a/src/VBox/Runtime/common/string/utf-16-case.cpp b/src/VBox/Runtime/common/string/utf-16-case.cpp
index bde4700..ceea8ce 100644
--- a/src/VBox/Runtime/common/string/utf-16-case.cpp
+++ b/src/VBox/Runtime/common/string/utf-16-case.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/utf-16-latin-1.cpp b/src/VBox/Runtime/common/string/utf-16-latin-1.cpp
index 9a8b5e8..68d7b0e 100644
--- a/src/VBox/Runtime/common/string/utf-16-latin-1.cpp
+++ b/src/VBox/Runtime/common/string/utf-16-latin-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/utf-16.cpp b/src/VBox/Runtime/common/string/utf-16.cpp
index d684bc9..e3a92c9 100644
--- a/src/VBox/Runtime/common/string/utf-16.cpp
+++ b/src/VBox/Runtime/common/string/utf-16.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/utf-8-case.cpp b/src/VBox/Runtime/common/string/utf-8-case.cpp
index 595b7e0..1f51efc 100644
--- a/src/VBox/Runtime/common/string/utf-8-case.cpp
+++ b/src/VBox/Runtime/common/string/utf-8-case.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/utf-8-case2.cpp b/src/VBox/Runtime/common/string/utf-8-case2.cpp
index fbd053f..94a1713 100644
--- a/src/VBox/Runtime/common/string/utf-8-case2.cpp
+++ b/src/VBox/Runtime/common/string/utf-8-case2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/string/utf-8.cpp b/src/VBox/Runtime/common/string/utf-8.cpp
index bb782a7..b69f31e 100644
--- a/src/VBox/Runtime/common/string/utf-8.cpp
+++ b/src/VBox/Runtime/common/string/utf-8.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/table/avl_Enum.cpp.h b/src/VBox/Runtime/common/table/avl_Enum.cpp.h
index 6cde86a..1ab59f7 100644
--- a/src/VBox/Runtime/common/table/avl_Enum.cpp.h
+++ b/src/VBox/Runtime/common/table/avl_Enum.cpp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/time/time.cpp b/src/VBox/Runtime/common/time/time.cpp
index c47caca..2dcf751 100644
--- a/src/VBox/Runtime/common/time/time.cpp
+++ b/src/VBox/Runtime/common/time/time.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -800,7 +800,7 @@ RTDECL(PRTTIME) RTTimeFromString(PRTTIME pTime, const char *pszString)
         return NULL;
     unsigned const cDaysInMonth = fLeapYear
                                 ? g_acDaysInMonthsLeap[pTime->u8Month - 1]
-                                : g_acDaysInMonthsLeap[pTime->u8Month - 1];
+                                : g_acDaysInMonths[pTime->u8Month - 1];
     if (pTime->u8MonthDay == 0 || pTime->u8MonthDay > cDaysInMonth)
         return NULL;
 
diff --git a/src/VBox/Runtime/common/time/timeprog.cpp b/src/VBox/Runtime/common/time/timeprog.cpp
index 13e810c..358747c 100644
--- a/src/VBox/Runtime/common/time/timeprog.cpp
+++ b/src/VBox/Runtime/common/time/timeprog.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/time/timesupA.asm b/src/VBox/Runtime/common/time/timesupA.asm
index c32c18f..009a482 100644
--- a/src/VBox/Runtime/common/time/timesupA.asm
+++ b/src/VBox/Runtime/common/time/timesupA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/time/timesupA.mac b/src/VBox/Runtime/common/time/timesupA.mac
index cd88193..865df83 100644
--- a/src/VBox/Runtime/common/time/timesupA.mac
+++ b/src/VBox/Runtime/common/time/timesupA.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2014 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/time/timesysalias.cpp b/src/VBox/Runtime/common/time/timesysalias.cpp
index 3b5e47a..37ea7d6 100644
--- a/src/VBox/Runtime/common/time/timesysalias.cpp
+++ b/src/VBox/Runtime/common/time/timesysalias.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/vfs/vfsbase.cpp b/src/VBox/Runtime/common/vfs/vfsbase.cpp
index 8e38715..dbcf4d5 100644
--- a/src/VBox/Runtime/common/vfs/vfsbase.cpp
+++ b/src/VBox/Runtime/common/vfs/vfsbase.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/vfs/vfschain.cpp b/src/VBox/Runtime/common/vfs/vfschain.cpp
index e7ee52e..55953b0 100644
--- a/src/VBox/Runtime/common/vfs/vfschain.cpp
+++ b/src/VBox/Runtime/common/vfs/vfschain.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/vfs/vfsiosmisc.cpp b/src/VBox/Runtime/common/vfs/vfsiosmisc.cpp
index fb9043c..c2ce507 100644
--- a/src/VBox/Runtime/common/vfs/vfsiosmisc.cpp
+++ b/src/VBox/Runtime/common/vfs/vfsiosmisc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/vfs/vfsmemory.cpp b/src/VBox/Runtime/common/vfs/vfsmemory.cpp
index 854c8e4..1ca3113 100644
--- a/src/VBox/Runtime/common/vfs/vfsmemory.cpp
+++ b/src/VBox/Runtime/common/vfs/vfsmemory.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/vfs/vfsmisc.cpp b/src/VBox/Runtime/common/vfs/vfsmisc.cpp
index 1f353fb..714e730 100644
--- a/src/VBox/Runtime/common/vfs/vfsmisc.cpp
+++ b/src/VBox/Runtime/common/vfs/vfsmisc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/vfs/vfsstdfile.cpp b/src/VBox/Runtime/common/vfs/vfsstdfile.cpp
index 5f023e7..af8fb66 100644
--- a/src/VBox/Runtime/common/vfs/vfsstdfile.cpp
+++ b/src/VBox/Runtime/common/vfs/vfsstdfile.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/zip/gzipvfs.cpp b/src/VBox/Runtime/common/zip/gzipvfs.cpp
index a9ef3e8..7582d8e 100644
--- a/src/VBox/Runtime/common/zip/gzipvfs.cpp
+++ b/src/VBox/Runtime/common/zip/gzipvfs.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/zip/pkzip.cpp b/src/VBox/Runtime/common/zip/pkzip.cpp
index 34cb048..d45a22e 100644
--- a/src/VBox/Runtime/common/zip/pkzip.cpp
+++ b/src/VBox/Runtime/common/zip/pkzip.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/zip/pkzipvfs.cpp b/src/VBox/Runtime/common/zip/pkzipvfs.cpp
index d5ddf15..99edc5e 100644
--- a/src/VBox/Runtime/common/zip/pkzipvfs.cpp
+++ b/src/VBox/Runtime/common/zip/pkzipvfs.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/zip/tar.cpp b/src/VBox/Runtime/common/zip/tar.cpp
index e18ecce..1b6edeb 100644
--- a/src/VBox/Runtime/common/zip/tar.cpp
+++ b/src/VBox/Runtime/common/zip/tar.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/zip/tar.h b/src/VBox/Runtime/common/zip/tar.h
index 4e1be25..c215e34 100644
--- a/src/VBox/Runtime/common/zip/tar.h
+++ b/src/VBox/Runtime/common/zip/tar.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/zip/tarcmd.cpp b/src/VBox/Runtime/common/zip/tarcmd.cpp
index aecca4a..acceeec 100644
--- a/src/VBox/Runtime/common/zip/tarcmd.cpp
+++ b/src/VBox/Runtime/common/zip/tarcmd.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/zip/tarvfs.cpp b/src/VBox/Runtime/common/zip/tarvfs.cpp
index 72c3d44..af86217 100644
--- a/src/VBox/Runtime/common/zip/tarvfs.cpp
+++ b/src/VBox/Runtime/common/zip/tarvfs.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/zip/unzipcmd.cpp b/src/VBox/Runtime/common/zip/unzipcmd.cpp
index 7d314ea..377c376 100644
--- a/src/VBox/Runtime/common/zip/unzipcmd.cpp
+++ b/src/VBox/Runtime/common/zip/unzipcmd.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/zip/xarvfs.cpp b/src/VBox/Runtime/common/zip/xarvfs.cpp
index 8b6d0ab..df75ba6 100644
--- a/src/VBox/Runtime/common/zip/xarvfs.cpp
+++ b/src/VBox/Runtime/common/zip/xarvfs.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/zip/zip.cpp b/src/VBox/Runtime/common/zip/zip.cpp
index f6e00d2..47c990f 100644
--- a/src/VBox/Runtime/common/zip/zip.cpp
+++ b/src/VBox/Runtime/common/zip/zip.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp
index 361b25d..a9cb394 100644
--- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp
+++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp
index 9759529..ff558c5 100644
--- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp
+++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp
index daabeaf..3f2e37a 100644
--- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp
+++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp
index 9f32e09..822f549 100644
--- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp
+++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/gc/initterm-gc.cpp b/src/VBox/Runtime/gc/initterm-gc.cpp
index adb07cc..f9dafa2 100644
--- a/src/VBox/Runtime/gc/initterm-gc.cpp
+++ b/src/VBox/Runtime/gc/initterm-gc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp b/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp
index 7c359ff..032fb38 100644
--- a/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp
+++ b/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTDirCreateUniqueNumbered-generic.cpp b/src/VBox/Runtime/generic/RTDirCreateUniqueNumbered-generic.cpp
index 54162d6..9e2eb70 100644
--- a/src/VBox/Runtime/generic/RTDirCreateUniqueNumbered-generic.cpp
+++ b/src/VBox/Runtime/generic/RTDirCreateUniqueNumbered-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTDirExists-generic.cpp b/src/VBox/Runtime/generic/RTDirExists-generic.cpp
index 186160d..c07de4c 100644
--- a/src/VBox/Runtime/generic/RTDirExists-generic.cpp
+++ b/src/VBox/Runtime/generic/RTDirExists-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp b/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp
index 8e92bf1..b2c365b 100644
--- a/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp
+++ b/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp b/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp
index 1616c4f..ab67575 100644
--- a/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp
+++ b/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTEnvDupEx-generic.cpp b/src/VBox/Runtime/generic/RTEnvDupEx-generic.cpp
index 5320cc5..403801d 100644
--- a/src/VBox/Runtime/generic/RTEnvDupEx-generic.cpp
+++ b/src/VBox/Runtime/generic/RTEnvDupEx-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTFileCopy-generic.cpp b/src/VBox/Runtime/generic/RTFileCopy-generic.cpp
index 00222a5..e8fa971 100644
--- a/src/VBox/Runtime/generic/RTFileCopy-generic.cpp
+++ b/src/VBox/Runtime/generic/RTFileCopy-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTFileExists-generic.cpp b/src/VBox/Runtime/generic/RTFileExists-generic.cpp
index e238361..2574107 100644
--- a/src/VBox/Runtime/generic/RTFileExists-generic.cpp
+++ b/src/VBox/Runtime/generic/RTFileExists-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTFileMove-generic.cpp b/src/VBox/Runtime/generic/RTFileMove-generic.cpp
index 3b4e989..ca78f27 100644
--- a/src/VBox/Runtime/generic/RTFileMove-generic.cpp
+++ b/src/VBox/Runtime/generic/RTFileMove-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp b/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp
index 8ff41f4..edfb974 100644
--- a/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp
+++ b/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp
index 1eb3f36..713da96 100644
--- a/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp
+++ b/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp
index 05a32e6..f9a3574 100644
--- a/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp
+++ b/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp
index 5d5f01f..64289ac 100644
--- a/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp
+++ b/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp
index 98f92a8..f42369e 100644
--- a/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp
+++ b/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp
index 2bdcc5c..dddc300 100644
--- a/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp
+++ b/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp b/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp
index 7a44173..e4fb534 100644
--- a/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp
+++ b/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp
index a295fd0..ce48e90 100644
--- a/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp
+++ b/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp
index 0f72f31..6460db7 100644
--- a/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp
+++ b/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp
index 946df0e..969307f 100644
--- a/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp
+++ b/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp
index cb5377f..d7a2925 100644
--- a/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp
+++ b/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp
index a154ede..c195d5a 100644
--- a/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp
+++ b/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp
index a9cdab7..dfbbb37 100644
--- a/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp
+++ b/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp
index 59a7e33..a03608a 100644
--- a/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp
index 91842c0..20d9985 100644
--- a/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp
index 6cda69f..5f17374 100644
--- a/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp b/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp
index 0850497..5c83acd 100644
--- a/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetCoreCount-generic.cpp b/src/VBox/Runtime/generic/RTMpGetCoreCount-generic.cpp
index 9155bc4..76fc90f 100644
--- a/src/VBox/Runtime/generic/RTMpGetCoreCount-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetCoreCount-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp b/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp
index af5cb9f..3056192 100644
--- a/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp b/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp
index f4509e0..e61e28c 100644
--- a/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp b/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp
index 10000c2..5313072 100644
--- a/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp b/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp
index 2a5f6eb..b7568e1 100644
--- a/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp b/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp
index 8c38547..8041366 100644
--- a/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp b/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp
index 197928f..449cd94 100644
--- a/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetOnlineCoreCount-generic.cpp b/src/VBox/Runtime/generic/RTMpGetOnlineCoreCount-generic.cpp
index 19f7814..fe5064b 100644
--- a/src/VBox/Runtime/generic/RTMpGetOnlineCoreCount-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetOnlineCoreCount-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp b/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp
index 40be3d0..97140c4 100644
--- a/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp b/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp
index b3a4fee..a1f585e 100644
--- a/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp b/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp
index debd052..123b407 100644
--- a/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp b/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp
index 987b60a..9f181a0 100644
--- a/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp b/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp
index 6725631..9f0c8fd 100644
--- a/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp
+++ b/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTPathAbs-generic.cpp b/src/VBox/Runtime/generic/RTPathAbs-generic.cpp
index 72ea7bb..e4f8219 100644
--- a/src/VBox/Runtime/generic/RTPathAbs-generic.cpp
+++ b/src/VBox/Runtime/generic/RTPathAbs-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTPathGetCurrentDrive-generic.cpp b/src/VBox/Runtime/generic/RTPathGetCurrentDrive-generic.cpp
index f5706b2..98ebe8b 100644
--- a/src/VBox/Runtime/generic/RTPathGetCurrentDrive-generic.cpp
+++ b/src/VBox/Runtime/generic/RTPathGetCurrentDrive-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTPathGetCurrentOnDrive-generic.cpp b/src/VBox/Runtime/generic/RTPathGetCurrentOnDrive-generic.cpp
index 09a8eb2..a26b0bf 100644
--- a/src/VBox/Runtime/generic/RTPathGetCurrentOnDrive-generic.cpp
+++ b/src/VBox/Runtime/generic/RTPathGetCurrentOnDrive-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTPathIsSame-generic.cpp b/src/VBox/Runtime/generic/RTPathIsSame-generic.cpp
index 2ed42a5..b8d7dd8 100644
--- a/src/VBox/Runtime/generic/RTPathIsSame-generic.cpp
+++ b/src/VBox/Runtime/generic/RTPathIsSame-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp b/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp
index 744dce9..1eef917 100644
--- a/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp
+++ b/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp b/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp
index 56eb519..cc1899a 100644
--- a/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp
+++ b/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTProcessQueryUsernameA-generic.cpp b/src/VBox/Runtime/generic/RTProcessQueryUsernameA-generic.cpp
index cd7790b..f79547f 100644
--- a/src/VBox/Runtime/generic/RTProcessQueryUsernameA-generic.cpp
+++ b/src/VBox/Runtime/generic/RTProcessQueryUsernameA-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp b/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp
index 1aaab2d..a7168c6 100644
--- a/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp
+++ b/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp b/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp
index 402ccb8..67ec96e 100644
--- a/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp
+++ b/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp
index af7933e..731a9ca 100644
--- a/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp
+++ b/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp b/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp
index 46ee3c6..9f6d82c 100644
--- a/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp
+++ b/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp
index 19175a7..0bcf973 100644
--- a/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp
+++ b/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp
index 650d25e..6450034 100644
--- a/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp
+++ b/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp b/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp
index b24fe9d..380d29d 100644
--- a/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp
+++ b/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp
index 2c8181e..703e782 100644
--- a/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp
+++ b/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp b/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp
index 0ef65f4..2d4f91b 100644
--- a/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp
+++ b/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp b/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp
index a26b4af..1b895a9 100644
--- a/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp
+++ b/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTSystemQueryDmiString-generic.cpp b/src/VBox/Runtime/generic/RTSystemQueryDmiString-generic.cpp
index 723f1aa..ec169d8 100644
--- a/src/VBox/Runtime/generic/RTSystemQueryDmiString-generic.cpp
+++ b/src/VBox/Runtime/generic/RTSystemQueryDmiString-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp b/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp
index 7ba8e78..05316be 100644
--- a/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp
+++ b/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTSystemShutdown-generic.cpp b/src/VBox/Runtime/generic/RTSystemShutdown-generic.cpp
index b888fe4..ad81204 100644
--- a/src/VBox/Runtime/generic/RTSystemShutdown-generic.cpp
+++ b/src/VBox/Runtime/generic/RTSystemShutdown-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTThreadGetAffinity-stub-generic.cpp b/src/VBox/Runtime/generic/RTThreadGetAffinity-stub-generic.cpp
index 6bba54e..3f08503 100644
--- a/src/VBox/Runtime/generic/RTThreadGetAffinity-stub-generic.cpp
+++ b/src/VBox/Runtime/generic/RTThreadGetAffinity-stub-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTThreadGetNativeState-generic.cpp b/src/VBox/Runtime/generic/RTThreadGetNativeState-generic.cpp
index ab8229b..95e360c 100644
--- a/src/VBox/Runtime/generic/RTThreadGetNativeState-generic.cpp
+++ b/src/VBox/Runtime/generic/RTThreadGetNativeState-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTThreadSetAffinity-stub-generic.cpp b/src/VBox/Runtime/generic/RTThreadSetAffinity-stub-generic.cpp
index 6d4f6dd..4f55b41 100644
--- a/src/VBox/Runtime/generic/RTThreadSetAffinity-stub-generic.cpp
+++ b/src/VBox/Runtime/generic/RTThreadSetAffinity-stub-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTThreadSetAffinityToCpu-generic.cpp b/src/VBox/Runtime/generic/RTThreadSetAffinityToCpu-generic.cpp
index 173ecf3..2efdfb1 100644
--- a/src/VBox/Runtime/generic/RTThreadSetAffinityToCpu-generic.cpp
+++ b/src/VBox/Runtime/generic/RTThreadSetAffinityToCpu-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp b/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp
index c24b5f3..4dc4c45 100644
--- a/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp
+++ b/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp b/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp
index b7b4e56..164afc5 100644
--- a/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp
+++ b/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTTimeLocalNow-generic.cpp b/src/VBox/Runtime/generic/RTTimeLocalNow-generic.cpp
index f26124e..526cd9e 100644
--- a/src/VBox/Runtime/generic/RTTimeLocalNow-generic.cpp
+++ b/src/VBox/Runtime/generic/RTTimeLocalNow-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp b/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp
index a161d20..28a068a 100644
--- a/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp
+++ b/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp b/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp
index 415fcd0..ba57455 100644
--- a/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp
+++ b/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp b/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp
index 439bf7b..f5424ef 100644
--- a/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp
+++ b/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/cdrom-generic.cpp b/src/VBox/Runtime/generic/cdrom-generic.cpp
index 65332a5..dfabc41 100644
--- a/src/VBox/Runtime/generic/cdrom-generic.cpp
+++ b/src/VBox/Runtime/generic/cdrom-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/createtemp-generic.cpp b/src/VBox/Runtime/generic/createtemp-generic.cpp
index addbb5d..4d3b1cc 100644
--- a/src/VBox/Runtime/generic/createtemp-generic.cpp
+++ b/src/VBox/Runtime/generic/createtemp-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/critsect-generic.cpp b/src/VBox/Runtime/generic/critsect-generic.cpp
index 4d736b9..694a511 100644
--- a/src/VBox/Runtime/generic/critsect-generic.cpp
+++ b/src/VBox/Runtime/generic/critsect-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/critsectrw-generic.cpp b/src/VBox/Runtime/generic/critsectrw-generic.cpp
index 41099ec..abe678a 100644
--- a/src/VBox/Runtime/generic/critsectrw-generic.cpp
+++ b/src/VBox/Runtime/generic/critsectrw-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/env-generic.cpp b/src/VBox/Runtime/generic/env-generic.cpp
index a96f30e..612cdd4 100644
--- a/src/VBox/Runtime/generic/env-generic.cpp
+++ b/src/VBox/Runtime/generic/env-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/errvars-generic.cpp b/src/VBox/Runtime/generic/errvars-generic.cpp
index b623bc8..9b73886 100644
--- a/src/VBox/Runtime/generic/errvars-generic.cpp
+++ b/src/VBox/Runtime/generic/errvars-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/fs-stubs-generic.cpp b/src/VBox/Runtime/generic/fs-stubs-generic.cpp
index 9f07d41..b8d28d4 100644
--- a/src/VBox/Runtime/generic/fs-stubs-generic.cpp
+++ b/src/VBox/Runtime/generic/fs-stubs-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/mempool-generic.cpp b/src/VBox/Runtime/generic/mempool-generic.cpp
index d9bdf35..dcf0f1d 100644
--- a/src/VBox/Runtime/generic/mempool-generic.cpp
+++ b/src/VBox/Runtime/generic/mempool-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/memsafer-generic.cpp b/src/VBox/Runtime/generic/memsafer-generic.cpp
index 29f82f4..7341b66 100644
--- a/src/VBox/Runtime/generic/memsafer-generic.cpp
+++ b/src/VBox/Runtime/generic/memsafer-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/mppresent-generic.cpp b/src/VBox/Runtime/generic/mppresent-generic.cpp
index 2915a65..1809939 100644
--- a/src/VBox/Runtime/generic/mppresent-generic.cpp
+++ b/src/VBox/Runtime/generic/mppresent-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/pathhost-generic.cpp b/src/VBox/Runtime/generic/pathhost-generic.cpp
index fa615e1..480d07d 100644
--- a/src/VBox/Runtime/generic/pathhost-generic.cpp
+++ b/src/VBox/Runtime/generic/pathhost-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/sched-generic.cpp b/src/VBox/Runtime/generic/sched-generic.cpp
index fb5cd97..d5ef2de 100644
--- a/src/VBox/Runtime/generic/sched-generic.cpp
+++ b/src/VBox/Runtime/generic/sched-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/semfastmutex-generic.cpp b/src/VBox/Runtime/generic/semfastmutex-generic.cpp
index 299162f..bf35aa3 100644
--- a/src/VBox/Runtime/generic/semfastmutex-generic.cpp
+++ b/src/VBox/Runtime/generic/semfastmutex-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/semrw-generic.cpp b/src/VBox/Runtime/generic/semrw-generic.cpp
index 9078619..d236065 100644
--- a/src/VBox/Runtime/generic/semrw-generic.cpp
+++ b/src/VBox/Runtime/generic/semrw-generic.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/semrw-lockless-generic.cpp b/src/VBox/Runtime/generic/semrw-lockless-generic.cpp
index 27a37c0..abcb7ff 100644
--- a/src/VBox/Runtime/generic/semrw-lockless-generic.cpp
+++ b/src/VBox/Runtime/generic/semrw-lockless-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/semxroads-generic.cpp b/src/VBox/Runtime/generic/semxroads-generic.cpp
index 6e3ea2e..5ca82d0 100644
--- a/src/VBox/Runtime/generic/semxroads-generic.cpp
+++ b/src/VBox/Runtime/generic/semxroads-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/spinlock-generic.cpp b/src/VBox/Runtime/generic/spinlock-generic.cpp
index 9891b71..d42410d 100644
--- a/src/VBox/Runtime/generic/spinlock-generic.cpp
+++ b/src/VBox/Runtime/generic/spinlock-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/strcache-stubs-generic.cpp b/src/VBox/Runtime/generic/strcache-stubs-generic.cpp
index 71bf5c1..950e7c0 100644
--- a/src/VBox/Runtime/generic/strcache-stubs-generic.cpp
+++ b/src/VBox/Runtime/generic/strcache-stubs-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/timer-generic.cpp b/src/VBox/Runtime/generic/timer-generic.cpp
index 8e4c327..3659213 100644
--- a/src/VBox/Runtime/generic/timer-generic.cpp
+++ b/src/VBox/Runtime/generic/timer-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/timerlr-generic.cpp b/src/VBox/Runtime/generic/timerlr-generic.cpp
index 9f320a8..c0191f7 100644
--- a/src/VBox/Runtime/generic/timerlr-generic.cpp
+++ b/src/VBox/Runtime/generic/timerlr-generic.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/tls-generic.cpp b/src/VBox/Runtime/generic/tls-generic.cpp
index cbcbe4b..3a55c9e 100644
--- a/src/VBox/Runtime/generic/tls-generic.cpp
+++ b/src/VBox/Runtime/generic/tls-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/utf16locale-generic.cpp b/src/VBox/Runtime/generic/utf16locale-generic.cpp
index 7f9f443..ce37df3 100644
--- a/src/VBox/Runtime/generic/utf16locale-generic.cpp
+++ b/src/VBox/Runtime/generic/utf16locale-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/generic/uuid-generic.cpp b/src/VBox/Runtime/generic/uuid-generic.cpp
index c6df68f..642d1c5 100644
--- a/src/VBox/Runtime/generic/uuid-generic.cpp
+++ b/src/VBox/Runtime/generic/uuid-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/alignmentchecks.h b/src/VBox/Runtime/include/internal/alignmentchecks.h
index 38f6915..59ade37 100644
--- a/src/VBox/Runtime/include/internal/alignmentchecks.h
+++ b/src/VBox/Runtime/include/internal/alignmentchecks.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/assert.h b/src/VBox/Runtime/include/internal/assert.h
index 0db64e0..c8e4ce0 100644
--- a/src/VBox/Runtime/include/internal/assert.h
+++ b/src/VBox/Runtime/include/internal/assert.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/bignum.mac b/src/VBox/Runtime/include/internal/bignum.mac
index afaa8a7..61e2905 100644
--- a/src/VBox/Runtime/include/internal/bignum.mac
+++ b/src/VBox/Runtime/include/internal/bignum.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2009-2011 Oracle Corporation
+; Copyright (C) 2009-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/dbgmod.h b/src/VBox/Runtime/include/internal/dbgmod.h
index c71e36b..1529354 100644
--- a/src/VBox/Runtime/include/internal/dbgmod.h
+++ b/src/VBox/Runtime/include/internal/dbgmod.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/dir.h b/src/VBox/Runtime/include/internal/dir.h
index e8e95e8..7508f31 100644
--- a/src/VBox/Runtime/include/internal/dir.h
+++ b/src/VBox/Runtime/include/internal/dir.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/dvm.h b/src/VBox/Runtime/include/internal/dvm.h
index 1064a12..0f60713 100644
--- a/src/VBox/Runtime/include/internal/dvm.h
+++ b/src/VBox/Runtime/include/internal/dvm.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/file.h b/src/VBox/Runtime/include/internal/file.h
index c6e0e15..da38c2b 100644
--- a/src/VBox/Runtime/include/internal/file.h
+++ b/src/VBox/Runtime/include/internal/file.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/fileaio.h b/src/VBox/Runtime/include/internal/fileaio.h
index b5beb86..f1bcbaf 100644
--- a/src/VBox/Runtime/include/internal/fileaio.h
+++ b/src/VBox/Runtime/include/internal/fileaio.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/filesystem.h b/src/VBox/Runtime/include/internal/filesystem.h
index 6b07be3..4600f92 100644
--- a/src/VBox/Runtime/include/internal/filesystem.h
+++ b/src/VBox/Runtime/include/internal/filesystem.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/fs.h b/src/VBox/Runtime/include/internal/fs.h
index 00af45a..336d2a1 100644
--- a/src/VBox/Runtime/include/internal/fs.h
+++ b/src/VBox/Runtime/include/internal/fs.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/initterm.h b/src/VBox/Runtime/include/internal/initterm.h
index a7eebd6..4194c48 100644
--- a/src/VBox/Runtime/include/internal/initterm.h
+++ b/src/VBox/Runtime/include/internal/initterm.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/iprt-openssl.h b/src/VBox/Runtime/include/internal/iprt-openssl.h
index c3cb581..fb007c8 100644
--- a/src/VBox/Runtime/include/internal/iprt-openssl.h
+++ b/src/VBox/Runtime/include/internal/iprt-openssl.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/iprt.h b/src/VBox/Runtime/include/internal/iprt.h
index 15fa196..c03b4e8 100644
--- a/src/VBox/Runtime/include/internal/iprt.h
+++ b/src/VBox/Runtime/include/internal/iprt.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/ldr.h b/src/VBox/Runtime/include/internal/ldr.h
index d9fdaca..a1a9db7 100644
--- a/src/VBox/Runtime/include/internal/ldr.h
+++ b/src/VBox/Runtime/include/internal/ldr.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/ldrELF.h b/src/VBox/Runtime/include/internal/ldrELF.h
index ecb354b..0b54499 100644
--- a/src/VBox/Runtime/include/internal/ldrELF.h
+++ b/src/VBox/Runtime/include/internal/ldrELF.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/ldrELF32.h b/src/VBox/Runtime/include/internal/ldrELF32.h
index a6f789e..85a9ba7 100644
--- a/src/VBox/Runtime/include/internal/ldrELF32.h
+++ b/src/VBox/Runtime/include/internal/ldrELF32.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/ldrELF64.h b/src/VBox/Runtime/include/internal/ldrELF64.h
index 30e1b55..405d039 100644
--- a/src/VBox/Runtime/include/internal/ldrELF64.h
+++ b/src/VBox/Runtime/include/internal/ldrELF64.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/ldrMZ.h b/src/VBox/Runtime/include/internal/ldrMZ.h
index 2feab75..d287368 100644
--- a/src/VBox/Runtime/include/internal/ldrMZ.h
+++ b/src/VBox/Runtime/include/internal/ldrMZ.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/ldrPE.h b/src/VBox/Runtime/include/internal/ldrPE.h
index 5cb4579..22ce702 100644
--- a/src/VBox/Runtime/include/internal/ldrPE.h
+++ b/src/VBox/Runtime/include/internal/ldrPE.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/lockvalidator.h b/src/VBox/Runtime/include/internal/lockvalidator.h
index a40a098..f77c21e 100644
--- a/src/VBox/Runtime/include/internal/lockvalidator.h
+++ b/src/VBox/Runtime/include/internal/lockvalidator.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/magics.h b/src/VBox/Runtime/include/internal/magics.h
index 008504e..7b0d66a 100644
--- a/src/VBox/Runtime/include/internal/magics.h
+++ b/src/VBox/Runtime/include/internal/magics.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/mem.h b/src/VBox/Runtime/include/internal/mem.h
index 0db4651..b890188 100644
--- a/src/VBox/Runtime/include/internal/mem.h
+++ b/src/VBox/Runtime/include/internal/mem.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/memobj.h b/src/VBox/Runtime/include/internal/memobj.h
index 14fef80..7191e39 100644
--- a/src/VBox/Runtime/include/internal/memobj.h
+++ b/src/VBox/Runtime/include/internal/memobj.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/path.h b/src/VBox/Runtime/include/internal/path.h
index 3f6a5a9..9471ef9 100644
--- a/src/VBox/Runtime/include/internal/path.h
+++ b/src/VBox/Runtime/include/internal/path.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/pipe.h b/src/VBox/Runtime/include/internal/pipe.h
index 6712b11..c4e992a 100644
--- a/src/VBox/Runtime/include/internal/pipe.h
+++ b/src/VBox/Runtime/include/internal/pipe.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/process.h b/src/VBox/Runtime/include/internal/process.h
index ab00fb9..ad84f9d 100644
--- a/src/VBox/Runtime/include/internal/process.h
+++ b/src/VBox/Runtime/include/internal/process.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/rand.h b/src/VBox/Runtime/include/internal/rand.h
index 88c8fba..01d877d 100644
--- a/src/VBox/Runtime/include/internal/rand.h
+++ b/src/VBox/Runtime/include/internal/rand.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/req.h b/src/VBox/Runtime/include/internal/req.h
index ee0e734..102d76d 100644
--- a/src/VBox/Runtime/include/internal/req.h
+++ b/src/VBox/Runtime/include/internal/req.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/sched.h b/src/VBox/Runtime/include/internal/sched.h
index 075a583..fdaa21b 100644
--- a/src/VBox/Runtime/include/internal/sched.h
+++ b/src/VBox/Runtime/include/internal/sched.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/socket.h b/src/VBox/Runtime/include/internal/socket.h
index e6a518b..4b15879 100644
--- a/src/VBox/Runtime/include/internal/socket.h
+++ b/src/VBox/Runtime/include/internal/socket.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/strhash.h b/src/VBox/Runtime/include/internal/strhash.h
index e8684c0..e063561 100644
--- a/src/VBox/Runtime/include/internal/strhash.h
+++ b/src/VBox/Runtime/include/internal/strhash.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/strict.h b/src/VBox/Runtime/include/internal/strict.h
index 0d24249..245ab76 100644
--- a/src/VBox/Runtime/include/internal/strict.h
+++ b/src/VBox/Runtime/include/internal/strict.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/string.h b/src/VBox/Runtime/include/internal/string.h
index 25960f7..451100a 100644
--- a/src/VBox/Runtime/include/internal/string.h
+++ b/src/VBox/Runtime/include/internal/string.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/thread.h b/src/VBox/Runtime/include/internal/thread.h
index 11e5b88..96112a5 100644
--- a/src/VBox/Runtime/include/internal/thread.h
+++ b/src/VBox/Runtime/include/internal/thread.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/include/internal/time.h b/src/VBox/Runtime/include/internal/time.h
index 1a02c9c..7714532 100644
--- a/src/VBox/Runtime/include/internal/time.h
+++ b/src/VBox/Runtime/include/internal/time.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp b/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp
index 5da3781..0d5c22d 100644
--- a/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp
+++ b/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp b/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp
index 88cb45d..296f99b 100644
--- a/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp
+++ b/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp b/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp
index e8b61f2..062015a 100644
--- a/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp
+++ b/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp b/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp
index 5107bc7..91e34bd 100644
--- a/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp
+++ b/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/os2/sys0.asm b/src/VBox/Runtime/os2/sys0.asm
index 32b431c..892e01e 100644
--- a/src/VBox/Runtime/os2/sys0.asm
+++ b/src/VBox/Runtime/os2/sys0.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/alloc-r0drv.cpp b/src/VBox/Runtime/r0drv/alloc-r0drv.cpp
index c34ffc3..0955256 100644
--- a/src/VBox/Runtime/r0drv/alloc-r0drv.cpp
+++ b/src/VBox/Runtime/r0drv/alloc-r0drv.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/alloc-r0drv.h b/src/VBox/Runtime/r0drv/alloc-r0drv.h
index bf790c1..b92b149 100644
--- a/src/VBox/Runtime/r0drv/alloc-r0drv.h
+++ b/src/VBox/Runtime/r0drv/alloc-r0drv.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp
index 6b89535..4446ca9 100644
--- a/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp
index bf5e590..b191ee3 100644
--- a/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp
index abb2752..f0a03e6 100644
--- a/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp
index c221df4..59c4693 100644
--- a/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -44,7 +44,7 @@ DECLHIDDEN(void) rtR0AssertNativeMsg1(const char *pszExpr, unsigned uLine, const
 {
     printf("\r\n!!Assertion Failed!!\r\n"
            "Expression: %s\r\n"
-           "Location  : %s(%d) %s\r\n",
+           "Location  : %s(%u) %s\r\n",
            pszExpr, pszFile, uLine, pszFunction);
 }
 
diff --git a/src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp
index 293c4ab..d52aa81 100644
--- a/src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -453,7 +453,7 @@ static int rtR0DbgKrnlDarwinCheckStandardSymbols(RTDBGKRNLINFOINT *pThis)
         KNOWN_ENTRY(ostype),
         KNOWN_ENTRY(panic),
         KNOWN_ENTRY(strprefix),
-        KNOWN_ENTRY(sysctlbyname),
+        //KNOWN_ENTRY(sysctlbyname), - we get kernel_sysctlbyname from the kernel.
         KNOWN_ENTRY(vsscanf),
         KNOWN_ENTRY(page_mask),
 
@@ -1031,6 +1031,8 @@ RTR0DECL(int) RTR0DbgKrnlInfoOpen(PRTDBGKRNLINFO phKrnlInfo, uint32_t fFlags)
     pThis->hFile = NIL_RTFILE;
 
     int rc = RTFileOpen(&pThis->hFile, "/mach_kernel", RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
+    if (rc == VERR_FILE_NOT_FOUND)
+        rc = RTFileOpen(&pThis->hFile, "/System/Library/Kernels/kernel", RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
     if (RT_SUCCESS(rc))
         rc = rtR0DbgKrnlDarwinLoadFileHeaders(pThis);
     if (RT_SUCCESS(rc))
diff --git a/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp
index 98ba22a..6cbe804 100644
--- a/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp
index 6faf85a..8db2e2a 100644
--- a/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp
index 1c16732..7570cd5 100644
--- a/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp
index 40449cb..86dbd78 100644
--- a/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -224,7 +224,6 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
 {
     RT_ASSERT_INTS_ON();
 
-    int rc;
     RTMPARGS Args;
     Args.pfnWorker = pfnWorker;
     Args.pvUser1 = pvUser1;
@@ -258,7 +257,6 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1
 {
     RT_ASSERT_INTS_ON();
 
-    int rc;
     RTMPARGS Args;
     Args.pfnWorker = pfnWorker;
     Args.pvUser1 = pvUser1;
diff --git a/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp
index 71ce84d..ea677a5 100644
--- a/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp
index 9a216f4..3a849e9 100644
--- a/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp
index 9239860..e60c0e2 100644
--- a/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/semfastmutex-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semfastmutex-r0drv-darwin.cpp
index 407381e..c89077b 100644
--- a/src/VBox/Runtime/r0drv/darwin/semfastmutex-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/semfastmutex-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp
index fb20b58..96c55da 100644
--- a/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp
index f3202b9..cc6c2f8 100644
--- a/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h b/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h
index d8be50d..01df5cc 100644
--- a/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h
+++ b/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp
index 0bce605..28fbbb4 100644
--- a/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp
index 431bea8..b4ce12d 100644
--- a/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp
index b636e1d..3b6e8f6 100644
--- a/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -109,7 +109,7 @@ RTDECL(bool) RTThreadPreemptIsPending(RTTHREAD hThread)
     uint32_t volatile *pfAstPending = g_pfnR0DarwinAstPending(); AssertPtr(pfAstPending);
     uint32_t  const    fAstPending = *pfAstPending;
 
-    AssertMsg(!(fAstPending & UINT32_C(0xffff8000)), ("%#x\n", fAstPending));
+    AssertMsg(!(fAstPending & UINT32_C(0xfffe0000)), ("%#x\n", fAstPending));
     return (fAstPending & (AST_PREEMPT | AST_QUANTUM | AST_URGENT)) != 0;
 }
 
diff --git a/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp
index aa0b4d7..bb09ba9 100644
--- a/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp
+++ b/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c
index d7fa0b2..14fdba2 100644
--- a/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c
+++ b/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c
index 8c05a38..2c02060 100644
--- a/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c
+++ b/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c
index addd9d0..014af73 100644
--- a/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c
+++ b/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h b/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h
index 0a0be65..000b1e6 100644
--- a/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h
+++ b/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c
index de14e76..bd0bfb7 100644
--- a/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c
+++ b/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp
index c8d93f5..ac60340 100644
--- a/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp
+++ b/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp
index 52db837..d154c02 100644
--- a/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp
+++ b/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp
index 3a81521..9453a30 100644
--- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp
+++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp
index 107971a..ab739f7 100644
--- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp
+++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp
index 3eaf98a..99ed223 100644
--- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp
+++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp
index 44057f0..cf7f3e2 100644
--- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp
+++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp
index ef2c2dc..6d989b9 100644
--- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp
+++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp
index 9a1406c..5cc4126 100644
--- a/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp
+++ b/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c b/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c
index 7044961..f97a192 100644
--- a/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c
+++ b/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c
index 7d67906..0c0a98b 100644
--- a/src/VBox/Runtime/r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/RTLogWriteDebugger-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/RTLogWriteStdOut-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/RTLogWriteStdOut-r0drv-haiku.c
index 8099609..0217865 100644
--- a/src/VBox/Runtime/r0drv/haiku/RTLogWriteStdOut-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/RTLogWriteStdOut-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c
index 58c7203..5eb8cca 100644
--- a/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/alloc-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/assert-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/assert-r0drv-haiku.c
index 8241e9b..0e0f2d3 100644
--- a/src/VBox/Runtime/r0drv/haiku/assert-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/assert-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/initterm-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/initterm-r0drv-haiku.c
index 3041bea..d11e29c 100644
--- a/src/VBox/Runtime/r0drv/haiku/initterm-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/initterm-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c
index 8c27a26..5c3a358 100644
--- a/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/memobj-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/process-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/process-r0drv-haiku.c
index a3b6a5c..02c2a05 100644
--- a/src/VBox/Runtime/r0drv/haiku/process-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/process-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/semevent-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/semevent-r0drv-haiku.c
index 9914262..4e964fa 100644
--- a/src/VBox/Runtime/r0drv/haiku/semevent-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/semevent-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/semeventmulti-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/semeventmulti-r0drv-haiku.c
index 3179fc9..543109c 100644
--- a/src/VBox/Runtime/r0drv/haiku/semeventmulti-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/semeventmulti-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c
index c34189c..06192e8 100644
--- a/src/VBox/Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/semfastmutex-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/semmutex-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/semmutex-r0drv-haiku.c
index 4f4f68a..f11d189 100644
--- a/src/VBox/Runtime/r0drv/haiku/semmutex-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/semmutex-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/spinlock-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/spinlock-r0drv-haiku.c
index a77d0de..f2fa7c3 100644
--- a/src/VBox/Runtime/r0drv/haiku/spinlock-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/spinlock-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/the-haiku-kernel.h b/src/VBox/Runtime/r0drv/haiku/the-haiku-kernel.h
index d75a163..02ee5d4 100644
--- a/src/VBox/Runtime/r0drv/haiku/the-haiku-kernel.h
+++ b/src/VBox/Runtime/r0drv/haiku/the-haiku-kernel.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/thread-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/thread-r0drv-haiku.c
index 97766d3..7f1fe5a 100644
--- a/src/VBox/Runtime/r0drv/haiku/thread-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/thread-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/thread2-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/thread2-r0drv-haiku.c
index ad76b99..7a7bad3 100644
--- a/src/VBox/Runtime/r0drv/haiku/thread2-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/thread2-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/haiku/time-r0drv-haiku.c b/src/VBox/Runtime/r0drv/haiku/time-r0drv-haiku.c
index 36b8788..64418c3 100644
--- a/src/VBox/Runtime/r0drv/haiku/time-r0drv-haiku.c
+++ b/src/VBox/Runtime/r0drv/haiku/time-r0drv-haiku.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/initterm-r0drv.cpp b/src/VBox/Runtime/r0drv/initterm-r0drv.cpp
index 97a700f..8fd1102 100644
--- a/src/VBox/Runtime/r0drv/initterm-r0drv.cpp
+++ b/src/VBox/Runtime/r0drv/initterm-r0drv.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c
index c34f854..537d19b 100644
--- a/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
index 9b03f7f..1506615 100644
--- a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c
index 11b3a27..c127e28 100644
--- a/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c
index 896b8b0..e1bc5a3 100644
--- a/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
index 62b38b1..f1ae2a5 100644
--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c
index 2b78d7d..e60f328 100644
--- a/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
index 1a07375..dd5b310 100644
--- a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c
index ce2fe31..44d3d7f 100644
--- a/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c
index 9c4c131..c7b46ef 100644
--- a/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c
index 702e1d0..1ae8e51 100644
--- a/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c
index 58e2539..8145400 100644
--- a/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c
index 25f0765..543f09c 100644
--- a/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c
index 0a1a086..dc36656 100644
--- a/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/string.h b/src/VBox/Runtime/r0drv/linux/string.h
index 2314d13..c871825 100644
--- a/src/VBox/Runtime/r0drv/linux/string.h
+++ b/src/VBox/Runtime/r0drv/linux/string.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
index 5a8d162..7b99e3a 100644
--- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
index ec2b491..2a7f2f6 100644
--- a/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
index e67df2a..ab212ac 100644
--- a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
index f1b8b9f..74d2390 100644
--- a/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h b/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
index ba253c6..67d71ae 100644
--- a/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
+++ b/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/memobj-r0drv.cpp b/src/VBox/Runtime/r0drv/memobj-r0drv.cpp
index d8982ff..49669dc 100644
--- a/src/VBox/Runtime/r0drv/memobj-r0drv.cpp
+++ b/src/VBox/Runtime/r0drv/memobj-r0drv.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/mp-r0drv.h b/src/VBox/Runtime/r0drv/mp-r0drv.h
index 0915918..0d1b36b 100644
--- a/src/VBox/Runtime/r0drv/mp-r0drv.h
+++ b/src/VBox/Runtime/r0drv/mp-r0drv.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/mpnotification-r0drv.c b/src/VBox/Runtime/r0drv/mpnotification-r0drv.c
index 612ca01..9cf523a 100644
--- a/src/VBox/Runtime/r0drv/mpnotification-r0drv.c
+++ b/src/VBox/Runtime/r0drv/mpnotification-r0drv.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp
index 0342dbd..01f37d0 100644
--- a/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/RTTimerGetSystemGranularity-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/RTTimerGetSystemGranularity-r0drv-nt.cpp
index fead755..d6cebea 100644
--- a/src/VBox/Runtime/r0drv/nt/RTTimerGetSystemGranularity-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/RTTimerGetSystemGranularity-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp
index e872034..4280c25 100644
--- a/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp
index df6b548..3326689 100644
--- a/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp
index d17f914..b02bd6a 100644
--- a/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h b/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h
index 1f7bfbf..e9d1cb7 100644
--- a/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h
+++ b/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp
index a1c0d86..8318907 100644
--- a/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp
index 982afb8..6b3f087 100644
--- a/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp
index 438795e..145561f 100644
--- a/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp
index 56506d2..53e6e32 100644
--- a/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/ntBldSymDb.cpp b/src/VBox/Runtime/r0drv/nt/ntBldSymDb.cpp
index 3e0fcd0..fb0bccf 100644
--- a/src/VBox/Runtime/r0drv/nt/ntBldSymDb.cpp
+++ b/src/VBox/Runtime/r0drv/nt/ntBldSymDb.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -196,7 +196,7 @@ static void generateHeader(PRTSTREAM pOut)
                  " */\n"
                  "\n"
                  "/*\n"
-                 " * Copyright (C) 2013 Oracle Corporation\n"
+                 " * Copyright (C) 2013-2015 Oracle Corporation \n"
                  " *\n"
                  " * This file is part of VirtualBox Open Source Edition (OSE), as\n"
                  " * available from http://www.virtualbox.org. This file is free software;\n"
@@ -1146,7 +1146,7 @@ int main(int argc, char **argv)
                 break;
 
             case 'V':
-                RTPrintf("$Revision: 92621 $");
+                RTPrintf("$Revision: 100874 $");
                 break;
 
             case 'h':
diff --git a/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp
index ac45498..85f4808 100644
--- a/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp
index 46cd1d7..7d4f7ca 100644
--- a/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp
index 3d253c5..6fa394d 100644
--- a/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp
index eabbc3e..8ee81cc 100644
--- a/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp
index f7b68c4..7c86cca 100644
--- a/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp
index d8ea10d..3c3b579 100644
--- a/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/symdb.h b/src/VBox/Runtime/r0drv/nt/symdb.h
index 3a0f12d..bc159da 100644
--- a/src/VBox/Runtime/r0drv/nt/symdb.h
+++ b/src/VBox/Runtime/r0drv/nt/symdb.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/symdbdata.h b/src/VBox/Runtime/r0drv/nt/symdbdata.h
index d23aca8..7704f66 100644
--- a/src/VBox/Runtime/r0drv/nt/symdbdata.h
+++ b/src/VBox/Runtime/r0drv/nt/symdbdata.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h b/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h
index 8a2276b..6ad8896 100644
--- a/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h
+++ b/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp
index e16a0f8..4004320 100644
--- a/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp
index f112519..bca2855 100644
--- a/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp
index 2fed94a..99f90f3 100644
--- a/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2014 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp
index 5bd19bc..38f5a49 100644
--- a/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp
+++ b/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/nt/toxic-chkstk-r0drv-nt.asm b/src/VBox/Runtime/r0drv/nt/toxic-chkstk-r0drv-nt.asm
index 857c449..016f6b6 100644
--- a/src/VBox/Runtime/r0drv/nt/toxic-chkstk-r0drv-nt.asm
+++ b/src/VBox/Runtime/r0drv/nt/toxic-chkstk-r0drv-nt.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2014 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp
index 0a596bb..a8cf0e1 100644
--- a/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp
+++ b/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/power-r0drv.h b/src/VBox/Runtime/r0drv/power-r0drv.h
index ba1ada0..6181901 100644
--- a/src/VBox/Runtime/r0drv/power-r0drv.h
+++ b/src/VBox/Runtime/r0drv/power-r0drv.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/powernotification-r0drv.c b/src/VBox/Runtime/r0drv/powernotification-r0drv.c
index 87d73d0..02333ef 100644
--- a/src/VBox/Runtime/r0drv/powernotification-r0drv.c
+++ b/src/VBox/Runtime/r0drv/powernotification-r0drv.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c
index 3471874..3f93b99 100644
--- a/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/RTMpPokeCpu-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/RTMpPokeCpu-r0drv-solaris.c
index eb49b62..28bc974 100644
--- a/src/VBox/Runtime/r0drv/solaris/RTMpPokeCpu-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/RTMpPokeCpu-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c
index ba41d4d..0876bef 100644
--- a/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c
index 823c18a..38aceb6 100644
--- a/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/dbgkrnlinfo-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/dbgkrnlinfo-r0drv-solaris.c
index d987633..0118472 100644
--- a/src/VBox/Runtime/r0drv/solaris/dbgkrnlinfo-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/dbgkrnlinfo-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c
index 02a0b99..6018215 100644
--- a/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.h b/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.h
index 8081378..24319ce 100644
--- a/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.h
+++ b/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c
index 4e1e818..fcb3897 100644
--- a/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c
index dfd82e9..3eec3bc 100644
--- a/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c
index 2b4a96a..1611248 100644
--- a/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c
index 5c902bf..dec0dee 100644
--- a/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c
index ddec688..926e180 100644
--- a/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h b/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h
index ee40f2b..6c98e4b 100644
--- a/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h
+++ b/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c
index 3329a56..6a9f831 100644
--- a/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c
index 2a7925d..6af479c 100644
--- a/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c
index 9540241..2ff7c42 100644
--- a/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c
index b8450f2..1bf7eeb 100644
--- a/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c
index e8141b3..7d9c2b5 100644
--- a/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c
index e79f238..861c402 100644
--- a/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c
+++ b/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/alloc-ef-cpp.cpp b/src/VBox/Runtime/r3/alloc-ef-cpp.cpp
index 7ca82b5..5c42ff1 100644
--- a/src/VBox/Runtime/r3/alloc-ef-cpp.cpp
+++ b/src/VBox/Runtime/r3/alloc-ef-cpp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/alloc-ef.cpp b/src/VBox/Runtime/r3/alloc-ef.cpp
index c44974f..62dff38 100644
--- a/src/VBox/Runtime/r3/alloc-ef.cpp
+++ b/src/VBox/Runtime/r3/alloc-ef.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/alloc-ef.h b/src/VBox/Runtime/r3/alloc-ef.h
index f4e81dd..e3a4611 100644
--- a/src/VBox/Runtime/r3/alloc-ef.h
+++ b/src/VBox/Runtime/r3/alloc-ef.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/alloc.cpp b/src/VBox/Runtime/r3/alloc.cpp
index 98892aa..1d01651 100644
--- a/src/VBox/Runtime/r3/alloc.cpp
+++ b/src/VBox/Runtime/r3/alloc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/allocex.cpp b/src/VBox/Runtime/r3/allocex.cpp
index c1bd6a4..3dba0ff 100644
--- a/src/VBox/Runtime/r3/allocex.cpp
+++ b/src/VBox/Runtime/r3/allocex.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/allocex.h b/src/VBox/Runtime/r3/allocex.h
index 2724335..178e9a1 100644
--- a/src/VBox/Runtime/r3/allocex.h
+++ b/src/VBox/Runtime/r3/allocex.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/darwin/RTPathUserDocuments-darwin.cpp b/src/VBox/Runtime/r3/darwin/RTPathUserDocuments-darwin.cpp
index aae9990..df2fef9 100644
--- a/src/VBox/Runtime/r3/darwin/RTPathUserDocuments-darwin.cpp
+++ b/src/VBox/Runtime/r3/darwin/RTPathUserDocuments-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp b/src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp
index 064bdcb..71ff9f7 100644
--- a/src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp
+++ b/src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp b/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp
index 0e4666b..36f3225 100644
--- a/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp
+++ b/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/darwin/mp-darwin.cpp b/src/VBox/Runtime/r3/darwin/mp-darwin.cpp
index bfdeb0d..fba9c79 100644
--- a/src/VBox/Runtime/r3/darwin/mp-darwin.cpp
+++ b/src/VBox/Runtime/r3/darwin/mp-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp b/src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp
index 0f575fb..7239354 100644
--- a/src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp
+++ b/src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp b/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp
index 922bd41..6fce0eb 100644
--- a/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp
+++ b/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/darwin/sched-darwin.cpp b/src/VBox/Runtime/r3/darwin/sched-darwin.cpp
index 3879db8..4dbdd95 100644
--- a/src/VBox/Runtime/r3/darwin/sched-darwin.cpp
+++ b/src/VBox/Runtime/r3/darwin/sched-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/darwin/systemmem-darwin.cpp b/src/VBox/Runtime/r3/darwin/systemmem-darwin.cpp
index 525567b..ec1f21e 100644
--- a/src/VBox/Runtime/r3/darwin/systemmem-darwin.cpp
+++ b/src/VBox/Runtime/r3/darwin/systemmem-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/darwin/time-darwin.cpp b/src/VBox/Runtime/r3/darwin/time-darwin.cpp
index 9dc05ae..f71a3c3 100644
--- a/src/VBox/Runtime/r3/darwin/time-darwin.cpp
+++ b/src/VBox/Runtime/r3/darwin/time-darwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/dir.cpp b/src/VBox/Runtime/r3/dir.cpp
index 1cfa50d..7d36da6 100644
--- a/src/VBox/Runtime/r3/dir.cpp
+++ b/src/VBox/Runtime/r3/dir.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/dir2.cpp b/src/VBox/Runtime/r3/dir2.cpp
index f01f42c..b824299 100644
--- a/src/VBox/Runtime/r3/dir2.cpp
+++ b/src/VBox/Runtime/r3/dir2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/fileio.cpp b/src/VBox/Runtime/r3/fileio.cpp
index 6482fe0..e890533 100644
--- a/src/VBox/Runtime/r3/fileio.cpp
+++ b/src/VBox/Runtime/r3/fileio.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp
index 0f94cd9..2fb664d 100644
--- a/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp
+++ b/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp
index c9846ed..9670ee6 100644
--- a/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp
+++ b/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp
index 216c100..3502236 100644
--- a/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp
+++ b/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp
index a7533a6..e21bc1e 100644
--- a/src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp
+++ b/src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/fs.cpp b/src/VBox/Runtime/r3/fs.cpp
index b79e43d..4b7b322 100644
--- a/src/VBox/Runtime/r3/fs.cpp
+++ b/src/VBox/Runtime/r3/fs.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/generic/allocex-r3-generic.cpp b/src/VBox/Runtime/r3/generic/allocex-r3-generic.cpp
index dd1dea6..fa81e18 100644
--- a/src/VBox/Runtime/r3/generic/allocex-r3-generic.cpp
+++ b/src/VBox/Runtime/r3/generic/allocex-r3-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp b/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp
index e6edca4..b6b9b1a 100644
--- a/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp
+++ b/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/haiku/rtProcInitExePath-haiku.cpp b/src/VBox/Runtime/r3/haiku/rtProcInitExePath-haiku.cpp
index 7a41e9f..09cbd5f 100644
--- a/src/VBox/Runtime/r3/haiku/rtProcInitExePath-haiku.cpp
+++ b/src/VBox/Runtime/r3/haiku/rtProcInitExePath-haiku.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/haiku/time-haiku.cpp b/src/VBox/Runtime/r3/haiku/time-haiku.cpp
index 03e709b..960a447 100644
--- a/src/VBox/Runtime/r3/haiku/time-haiku.cpp
+++ b/src/VBox/Runtime/r3/haiku/time-haiku.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/init.cpp b/src/VBox/Runtime/r3/init.cpp
index 3af5cb0..20a037a 100644
--- a/src/VBox/Runtime/r3/init.cpp
+++ b/src/VBox/Runtime/r3/init.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/init.h b/src/VBox/Runtime/r3/init.h
index fae5c41..f7295d3 100644
--- a/src/VBox/Runtime/r3/init.h
+++ b/src/VBox/Runtime/r3/init.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/isofs.cpp b/src/VBox/Runtime/r3/isofs.cpp
index 16d0334..fba89ab 100644
--- a/src/VBox/Runtime/r3/isofs.cpp
+++ b/src/VBox/Runtime/r3/isofs.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp b/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp
index 64edf95..2e11ed8 100644
--- a/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp b/src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp
index 056a6ad..1f29d2e 100644
--- a/src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/RTSystemShutdown-linux.cpp b/src/VBox/Runtime/r3/linux/RTSystemShutdown-linux.cpp
index e58365a..512b963 100644
--- a/src/VBox/Runtime/r3/linux/RTSystemShutdown-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/RTSystemShutdown-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/RTThreadGetNativeState-linux.cpp b/src/VBox/Runtime/r3/linux/RTThreadGetNativeState-linux.cpp
index 2a7c139..9669fc3 100644
--- a/src/VBox/Runtime/r3/linux/RTThreadGetNativeState-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/RTThreadGetNativeState-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/mp-linux.cpp b/src/VBox/Runtime/r3/linux/mp-linux.cpp
index 210f75a..159c6e0 100644
--- a/src/VBox/Runtime/r3/linux/mp-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/mp-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp b/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp
index cb43d9d..dbec2b0 100644
--- a/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/sched-linux.cpp b/src/VBox/Runtime/r3/linux/sched-linux.cpp
index 82eec1c..e3410f3 100644
--- a/src/VBox/Runtime/r3/linux/sched-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/sched-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/semevent-linux.cpp b/src/VBox/Runtime/r3/linux/semevent-linux.cpp
index 9982d3e..065ef5b 100644
--- a/src/VBox/Runtime/r3/linux/semevent-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/semevent-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp b/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp
index b623c84..2e5dd70 100644
--- a/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/semmutex-linux.cpp b/src/VBox/Runtime/r3/linux/semmutex-linux.cpp
index 60abc1e..af2a87c 100644
--- a/src/VBox/Runtime/r3/linux/semmutex-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/semmutex-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/sysfs.cpp b/src/VBox/Runtime/r3/linux/sysfs.cpp
index bea3641..fda4068 100644
--- a/src/VBox/Runtime/r3/linux/sysfs.cpp
+++ b/src/VBox/Runtime/r3/linux/sysfs.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/systemmem-linux.cpp b/src/VBox/Runtime/r3/linux/systemmem-linux.cpp
index 23fe70b..ad6edac 100644
--- a/src/VBox/Runtime/r3/linux/systemmem-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/systemmem-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp b/src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp
index 8e69d66..0396c48 100644
--- a/src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/linux/time-linux.cpp b/src/VBox/Runtime/r3/linux/time-linux.cpp
index dfd40d8..16dfd52 100644
--- a/src/VBox/Runtime/r3/linux/time-linux.cpp
+++ b/src/VBox/Runtime/r3/linux/time-linux.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -81,12 +81,11 @@ DECLINLINE(int) mono_clock(struct timespec *ts)
          */
         case -1:
         {
-            int rc;
 #ifdef CLOCK_MONOTONIC
             /*
              * Real-Time API.
              */
-            rc = clock_gettime(CLOCK_MONOTONIC, ts);
+            int rc = clock_gettime(CLOCK_MONOTONIC, ts);
             if (!rc)
             {
                 iWorking = 0;
diff --git a/src/VBox/Runtime/r3/memsafer-r3.cpp b/src/VBox/Runtime/r3/memsafer-r3.cpp
index 63b86dd..f67f698 100644
--- a/src/VBox/Runtime/r3/memsafer-r3.cpp
+++ b/src/VBox/Runtime/r3/memsafer-r3.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/nt/RTProcQueryParent-r3-nt.cpp b/src/VBox/Runtime/r3/nt/RTProcQueryParent-r3-nt.cpp
index 1c7fb86..aff6574 100644
--- a/src/VBox/Runtime/r3/nt/RTProcQueryParent-r3-nt.cpp
+++ b/src/VBox/Runtime/r3/nt/RTProcQueryParent-r3-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp b/src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp
index ea2d1e3..b13bc0e 100644
--- a/src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp
+++ b/src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/nt/fs-nt.cpp b/src/VBox/Runtime/r3/nt/fs-nt.cpp
index e89b55b..38b3257 100644
--- a/src/VBox/Runtime/r3/nt/fs-nt.cpp
+++ b/src/VBox/Runtime/r3/nt/fs-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/nt/internal-r3-nt.h b/src/VBox/Runtime/r3/nt/internal-r3-nt.h
index f2d33ca..feb83e3 100644
--- a/src/VBox/Runtime/r3/nt/internal-r3-nt.h
+++ b/src/VBox/Runtime/r3/nt/internal-r3-nt.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/nt/pathint-nt.cpp b/src/VBox/Runtime/r3/nt/pathint-nt.cpp
index aedbc0d..a9b89cf 100644
--- a/src/VBox/Runtime/r3/nt/pathint-nt.cpp
+++ b/src/VBox/Runtime/r3/nt/pathint-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/nt/time-nt.cpp b/src/VBox/Runtime/r3/nt/time-nt.cpp
index a4594f6..8211585 100644
--- a/src/VBox/Runtime/r3/nt/time-nt.cpp
+++ b/src/VBox/Runtime/r3/nt/time-nt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/os2/filelock-os2.cpp b/src/VBox/Runtime/r3/os2/filelock-os2.cpp
index 2183994..f9ddfd3 100644
--- a/src/VBox/Runtime/r3/os2/filelock-os2.cpp
+++ b/src/VBox/Runtime/r3/os2/filelock-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/os2/mp-os2.cpp b/src/VBox/Runtime/r3/os2/mp-os2.cpp
index 78e22a8..d289212 100644
--- a/src/VBox/Runtime/r3/os2/mp-os2.cpp
+++ b/src/VBox/Runtime/r3/os2/mp-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/os2/pipe-os2.cpp b/src/VBox/Runtime/r3/os2/pipe-os2.cpp
index e5832c4..9b1ad48 100644
--- a/src/VBox/Runtime/r3/os2/pipe-os2.cpp
+++ b/src/VBox/Runtime/r3/os2/pipe-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp b/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp
index 3ee59bf..eed5ffe 100644
--- a/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp
+++ b/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/os2/sched-os2.cpp b/src/VBox/Runtime/r3/os2/sched-os2.cpp
index d6e5bce..7a463ba 100644
--- a/src/VBox/Runtime/r3/os2/sched-os2.cpp
+++ b/src/VBox/Runtime/r3/os2/sched-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/os2/sems-os2.cpp b/src/VBox/Runtime/r3/os2/sems-os2.cpp
index a7ca309..6999d01 100644
--- a/src/VBox/Runtime/r3/os2/sems-os2.cpp
+++ b/src/VBox/Runtime/r3/os2/sems-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/os2/systemmem-os2.cpp b/src/VBox/Runtime/r3/os2/systemmem-os2.cpp
index 0f95ab2..97c6efd 100644
--- a/src/VBox/Runtime/r3/os2/systemmem-os2.cpp
+++ b/src/VBox/Runtime/r3/os2/systemmem-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/os2/thread-os2.cpp b/src/VBox/Runtime/r3/os2/thread-os2.cpp
index e6f2021..a5386e3 100644
--- a/src/VBox/Runtime/r3/os2/thread-os2.cpp
+++ b/src/VBox/Runtime/r3/os2/thread-os2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp
index e43f5d9..7c54dae 100644
--- a/src/VBox/Runtime/r3/path.cpp
+++ b/src/VBox/Runtime/r3/path.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/poll.cpp b/src/VBox/Runtime/r3/poll.cpp
index ea71cb4..725feb7 100644
--- a/src/VBox/Runtime/r3/poll.cpp
+++ b/src/VBox/Runtime/r3/poll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp b/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp
index 1e74477..68ea53c 100644
--- a/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/RTHandleGetStandard-posix.cpp b/src/VBox/Runtime/r3/posix/RTHandleGetStandard-posix.cpp
index ef5b4bc..b8fcb65 100644
--- a/src/VBox/Runtime/r3/posix/RTHandleGetStandard-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/RTHandleGetStandard-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/RTMemProtect-posix.cpp b/src/VBox/Runtime/r3/posix/RTMemProtect-posix.cpp
index 8705514..08ebbb5 100644
--- a/src/VBox/Runtime/r3/posix/RTMemProtect-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/RTMemProtect-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp b/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp
index 12fff20..c1fa8bb 100644
--- a/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/RTPathUserDocuments-posix.cpp b/src/VBox/Runtime/r3/posix/RTPathUserDocuments-posix.cpp
index a90a5b8..5fe34b8 100644
--- a/src/VBox/Runtime/r3/posix/RTPathUserDocuments-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/RTPathUserDocuments-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp b/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp
index 144f54a..54c7d0f 100644
--- a/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp b/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp
index 6fe59a6..88c9ae6 100644
--- a/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/RTSystemQueryTotalRam-posix.cpp b/src/VBox/Runtime/r3/posix/RTSystemQueryTotalRam-posix.cpp
index a75d2d5..71fe686 100644
--- a/src/VBox/Runtime/r3/posix/RTSystemQueryTotalRam-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/RTSystemQueryTotalRam-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp b/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp
index 5f75e60..0549c30 100644
--- a/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/RTTimeSet-posix.cpp b/src/VBox/Runtime/r3/posix/RTTimeSet-posix.cpp
index 3bebb9a..a198aa6 100644
--- a/src/VBox/Runtime/r3/posix/RTTimeSet-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/RTTimeSet-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/allocex-r3-posix.cpp b/src/VBox/Runtime/r3/posix/allocex-r3-posix.cpp
index 2aca436..78c38f2 100644
--- a/src/VBox/Runtime/r3/posix/allocex-r3-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/allocex-r3-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/dir-posix.cpp b/src/VBox/Runtime/r3/posix/dir-posix.cpp
index 81065bf..5509a77 100644
--- a/src/VBox/Runtime/r3/posix/dir-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/dir-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/env-posix.cpp b/src/VBox/Runtime/r3/posix/env-posix.cpp
index 677b391..68b606d 100644
--- a/src/VBox/Runtime/r3/posix/env-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/env-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/errvars-posix.cpp b/src/VBox/Runtime/r3/posix/errvars-posix.cpp
index 02caf67..7701237 100644
--- a/src/VBox/Runtime/r3/posix/errvars-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/errvars-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/fileaio-posix.cpp b/src/VBox/Runtime/r3/posix/fileaio-posix.cpp
index f14e800..7d5c70f 100644
--- a/src/VBox/Runtime/r3/posix/fileaio-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/fileaio-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/fileio-posix.cpp b/src/VBox/Runtime/r3/posix/fileio-posix.cpp
index 1af2918..597883f 100644
--- a/src/VBox/Runtime/r3/posix/fileio-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/fileio-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -390,7 +390,6 @@ RTFILE rtFileGetStandard(RTHANDLESTD enmStdHandle)
         case RTHANDLESTD_INPUT:  fd = 0; break;
         case RTHANDLESTD_OUTPUT: fd = 1; break;
         case RTHANDLESTD_ERROR:  fd = 2; break;
-            break;
         default:
             AssertFailedReturn(NIL_RTFILE);
     }
diff --git a/src/VBox/Runtime/r3/posix/fileio2-posix.cpp b/src/VBox/Runtime/r3/posix/fileio2-posix.cpp
index 33e10e3..73c42f5 100644
--- a/src/VBox/Runtime/r3/posix/fileio2-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/fileio2-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/filelock-posix.cpp b/src/VBox/Runtime/r3/posix/filelock-posix.cpp
index 67734d6..de7d3bf 100644
--- a/src/VBox/Runtime/r3/posix/filelock-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/filelock-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/fs-posix.cpp b/src/VBox/Runtime/r3/posix/fs-posix.cpp
index d5e982e..47ccc7b 100644
--- a/src/VBox/Runtime/r3/posix/fs-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/fs-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/fs2-posix.cpp b/src/VBox/Runtime/r3/posix/fs2-posix.cpp
index 5eae05a..fb5425d 100644
--- a/src/VBox/Runtime/r3/posix/fs2-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/fs2-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/fs3-posix.cpp b/src/VBox/Runtime/r3/posix/fs3-posix.cpp
index 94c3fb5..bc3b72e 100644
--- a/src/VBox/Runtime/r3/posix/fs3-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/fs3-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp b/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp
index 15a85f6..35269d9 100644
--- a/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/path-posix.cpp b/src/VBox/Runtime/r3/posix/path-posix.cpp
index 6467d07..683e7c4 100644
--- a/src/VBox/Runtime/r3/posix/path-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/path-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/path2-posix.cpp b/src/VBox/Runtime/r3/posix/path2-posix.cpp
index 856424d..f119fbd 100644
--- a/src/VBox/Runtime/r3/posix/path2-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/path2-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/pathhost-posix.cpp b/src/VBox/Runtime/r3/posix/pathhost-posix.cpp
index 6f75c27..bceee11 100644
--- a/src/VBox/Runtime/r3/posix/pathhost-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/pathhost-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/pipe-posix.cpp b/src/VBox/Runtime/r3/posix/pipe-posix.cpp
index 9d950de..949c928 100644
--- a/src/VBox/Runtime/r3/posix/pipe-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/pipe-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/process-creation-posix.cpp b/src/VBox/Runtime/r3/posix/process-creation-posix.cpp
index 7d701ef..3b9cdd7 100644
--- a/src/VBox/Runtime/r3/posix/process-creation-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/process-creation-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/process-posix.cpp b/src/VBox/Runtime/r3/posix/process-posix.cpp
index 4c2b51e..b96d840 100644
--- a/src/VBox/Runtime/r3/posix/process-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/process-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/rand-posix.cpp b/src/VBox/Runtime/r3/posix/rand-posix.cpp
index 1d1725f..cec0228 100644
--- a/src/VBox/Runtime/r3/posix/rand-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/rand-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp b/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp
index 84dc20c..3431d04 100644
--- a/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp b/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp
index 1b24669..202723c 100644
--- a/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/sched-posix.cpp b/src/VBox/Runtime/r3/posix/sched-posix.cpp
index 4fa2bb9..23b9ac3 100644
--- a/src/VBox/Runtime/r3/posix/sched-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/sched-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/semevent-posix.cpp b/src/VBox/Runtime/r3/posix/semevent-posix.cpp
index 67d69cb..90a17de 100644
--- a/src/VBox/Runtime/r3/posix/semevent-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/semevent-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp b/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp
index 2875a9a..a84ace1 100644
--- a/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/semmutex-posix.cpp b/src/VBox/Runtime/r3/posix/semmutex-posix.cpp
index 89fa962..7e713be 100644
--- a/src/VBox/Runtime/r3/posix/semmutex-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/semmutex-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/semrw-posix.cpp b/src/VBox/Runtime/r3/posix/semrw-posix.cpp
index c6dfeb2..8a47c92 100644
--- a/src/VBox/Runtime/r3/posix/semrw-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/semrw-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/symlink-posix.cpp b/src/VBox/Runtime/r3/posix/symlink-posix.cpp
index b3e1087..1c819d5 100644
--- a/src/VBox/Runtime/r3/posix/symlink-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/symlink-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/thread-posix.cpp b/src/VBox/Runtime/r3/posix/thread-posix.cpp
index 66ccafb..917c1ca 100644
--- a/src/VBox/Runtime/r3/posix/thread-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/thread-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/thread2-posix.cpp b/src/VBox/Runtime/r3/posix/thread2-posix.cpp
index bd7e030..00e68a2 100644
--- a/src/VBox/Runtime/r3/posix/thread2-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/thread2-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/time-posix.cpp b/src/VBox/Runtime/r3/posix/time-posix.cpp
index dad9943..d39ace6 100644
--- a/src/VBox/Runtime/r3/posix/time-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/time-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/timelocal-posix.cpp b/src/VBox/Runtime/r3/posix/timelocal-posix.cpp
index ce60f75..60f068e 100644
--- a/src/VBox/Runtime/r3/posix/timelocal-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/timelocal-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/timer-posix.cpp b/src/VBox/Runtime/r3/posix/timer-posix.cpp
index 7cf2e39..f971cb2 100644
--- a/src/VBox/Runtime/r3/posix/timer-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/timer-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/tls-posix.cpp b/src/VBox/Runtime/r3/posix/tls-posix.cpp
index c79e6e2..c95705d 100644
--- a/src/VBox/Runtime/r3/posix/tls-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/tls-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/posix/utf8-posix.cpp b/src/VBox/Runtime/r3/posix/utf8-posix.cpp
index cb723eb..caa97d0 100644
--- a/src/VBox/Runtime/r3/posix/utf8-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/utf8-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp
index 9f47814..ad55bc6 100644
--- a/src/VBox/Runtime/r3/process.cpp
+++ b/src/VBox/Runtime/r3/process.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/socket.cpp b/src/VBox/Runtime/r3/socket.cpp
index 930076a..5535c40 100644
--- a/src/VBox/Runtime/r3/socket.cpp
+++ b/src/VBox/Runtime/r3/socket.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/solaris/RTSystemQueryDmiString-solaris.cpp b/src/VBox/Runtime/r3/solaris/RTSystemQueryDmiString-solaris.cpp
index 0dc82ed..3619508 100644
--- a/src/VBox/Runtime/r3/solaris/RTSystemQueryDmiString-solaris.cpp
+++ b/src/VBox/Runtime/r3/solaris/RTSystemQueryDmiString-solaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/solaris/RTSystemShutdown-solaris.cpp b/src/VBox/Runtime/r3/solaris/RTSystemShutdown-solaris.cpp
index 4490678..d3da8da 100644
--- a/src/VBox/Runtime/r3/solaris/RTSystemShutdown-solaris.cpp
+++ b/src/VBox/Runtime/r3/solaris/RTSystemShutdown-solaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp b/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp
index fe251ec..4ac0a04 100644
--- a/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp
+++ b/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/solaris/coredumper-solaris.h b/src/VBox/Runtime/r3/solaris/coredumper-solaris.h
index 662effc..de828a3 100644
--- a/src/VBox/Runtime/r3/solaris/coredumper-solaris.h
+++ b/src/VBox/Runtime/r3/solaris/coredumper-solaris.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp b/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp
index 2f21830..59ddca0 100644
--- a/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp
+++ b/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/solaris/mp-solaris.cpp b/src/VBox/Runtime/r3/solaris/mp-solaris.cpp
index d21bbb4..12fdc0b 100644
--- a/src/VBox/Runtime/r3/solaris/mp-solaris.cpp
+++ b/src/VBox/Runtime/r3/solaris/mp-solaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp b/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp
index ffaad25..0a2fd2e 100644
--- a/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp
+++ b/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/solaris/systemmem-solaris.cpp b/src/VBox/Runtime/r3/solaris/systemmem-solaris.cpp
index e5efe63..66fd319 100644
--- a/src/VBox/Runtime/r3/solaris/systemmem-solaris.cpp
+++ b/src/VBox/Runtime/r3/solaris/systemmem-solaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/solaris/thread-affinity-solaris.cpp b/src/VBox/Runtime/r3/solaris/thread-affinity-solaris.cpp
index 0474ffb..dbe9e08 100644
--- a/src/VBox/Runtime/r3/solaris/thread-affinity-solaris.cpp
+++ b/src/VBox/Runtime/r3/solaris/thread-affinity-solaris.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/stream.cpp b/src/VBox/Runtime/r3/stream.cpp
index 19baedc..7b4a648 100644
--- a/src/VBox/Runtime/r3/stream.cpp
+++ b/src/VBox/Runtime/r3/stream.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/tcp.cpp b/src/VBox/Runtime/r3/tcp.cpp
index ec4e5ae..a76b088 100644
--- a/src/VBox/Runtime/r3/tcp.cpp
+++ b/src/VBox/Runtime/r3/tcp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/test.cpp b/src/VBox/Runtime/r3/test.cpp
index bdc4bb2..31a949a 100644
--- a/src/VBox/Runtime/r3/test.cpp
+++ b/src/VBox/Runtime/r3/test.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/testi.cpp b/src/VBox/Runtime/r3/testi.cpp
index b0c7882..ecb8ff0 100644
--- a/src/VBox/Runtime/r3/testi.cpp
+++ b/src/VBox/Runtime/r3/testi.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/udp.cpp b/src/VBox/Runtime/r3/udp.cpp
index 5e46b95..c58975a 100644
--- a/src/VBox/Runtime/r3/udp.cpp
+++ b/src/VBox/Runtime/r3/udp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp b/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp
index 8c3d86b..1dbdca2 100644
--- a/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp
+++ b/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp b/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp
index 69d028a..6c4ab76 100644
--- a/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp
+++ b/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp b/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp
index 8621a36..9c940da 100644
--- a/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp
+++ b/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp b/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp
index 4a2503a..f9eee83 100644
--- a/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp
+++ b/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/RTSystemQueryTotalRam-win.cpp b/src/VBox/Runtime/r3/win/RTSystemQueryTotalRam-win.cpp
index 5e31869..62c133e 100644
--- a/src/VBox/Runtime/r3/win/RTSystemQueryTotalRam-win.cpp
+++ b/src/VBox/Runtime/r3/win/RTSystemQueryTotalRam-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/RTSystemShutdown-win.cpp b/src/VBox/Runtime/r3/win/RTSystemShutdown-win.cpp
index 2ddb96c..ab35912 100644
--- a/src/VBox/Runtime/r3/win/RTSystemShutdown-win.cpp
+++ b/src/VBox/Runtime/r3/win/RTSystemShutdown-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp b/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp
index 7792b79..cd35966 100644
--- a/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp
+++ b/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/VBoxRT-openssl-ose.def b/src/VBox/Runtime/r3/win/VBoxRT-openssl-ose.def
index ad25ff3..249b3fe 100644
--- a/src/VBox/Runtime/r3/win/VBoxRT-openssl-ose.def
+++ b/src/VBox/Runtime/r3/win/VBoxRT-openssl-ose.def
@@ -9,7 +9,7 @@
 ;
 
 ;
-; Copyright (C) 2009-2011 Oracle Corporation
+; Copyright (C) 2009-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/VBoxRT-openssl.def b/src/VBox/Runtime/r3/win/VBoxRT-openssl.def
index 6f59ff8..e4fb30b 100644
--- a/src/VBox/Runtime/r3/win/VBoxRT-openssl.def
+++ b/src/VBox/Runtime/r3/win/VBoxRT-openssl.def
@@ -9,7 +9,7 @@
 ;
 
 ;
-; Copyright (C) 2009-2014 Oracle Corporation
+; Copyright (C) 2009-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/alloc-win.cpp b/src/VBox/Runtime/r3/win/alloc-win.cpp
index b4369a4..bb2a28e 100644
--- a/src/VBox/Runtime/r3/win/alloc-win.cpp
+++ b/src/VBox/Runtime/r3/win/alloc-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/allocex-win.cpp b/src/VBox/Runtime/r3/win/allocex-win.cpp
index 30de9aa..a62c09f 100644
--- a/src/VBox/Runtime/r3/win/allocex-win.cpp
+++ b/src/VBox/Runtime/r3/win/allocex-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/dir-win.cpp b/src/VBox/Runtime/r3/win/dir-win.cpp
index 4f11e82..ffc6099 100644
--- a/src/VBox/Runtime/r3/win/dir-win.cpp
+++ b/src/VBox/Runtime/r3/win/dir-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/direnum-win.cpp b/src/VBox/Runtime/r3/win/direnum-win.cpp
index acc98de..0a97a48 100644
--- a/src/VBox/Runtime/r3/win/direnum-win.cpp
+++ b/src/VBox/Runtime/r3/win/direnum-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/dllmain-win.cpp b/src/VBox/Runtime/r3/win/dllmain-win.cpp
index 6efb702..02ad46b 100644
--- a/src/VBox/Runtime/r3/win/dllmain-win.cpp
+++ b/src/VBox/Runtime/r3/win/dllmain-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/env-win.cpp b/src/VBox/Runtime/r3/win/env-win.cpp
index d9f1198..fcf9ac9 100644
--- a/src/VBox/Runtime/r3/win/env-win.cpp
+++ b/src/VBox/Runtime/r3/win/env-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/errvars-win.cpp b/src/VBox/Runtime/r3/win/errvars-win.cpp
index f99e8a1..aa63fb6 100644
--- a/src/VBox/Runtime/r3/win/errvars-win.cpp
+++ b/src/VBox/Runtime/r3/win/errvars-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/fileaio-win.cpp b/src/VBox/Runtime/r3/win/fileaio-win.cpp
index 73c99a7..6a233e6 100644
--- a/src/VBox/Runtime/r3/win/fileaio-win.cpp
+++ b/src/VBox/Runtime/r3/win/fileaio-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/fileio-win.cpp b/src/VBox/Runtime/r3/win/fileio-win.cpp
index 397d26a..133bca1 100644
--- a/src/VBox/Runtime/r3/win/fileio-win.cpp
+++ b/src/VBox/Runtime/r3/win/fileio-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/fs-win.cpp b/src/VBox/Runtime/r3/win/fs-win.cpp
index 586444e..1bfccee 100644
--- a/src/VBox/Runtime/r3/win/fs-win.cpp
+++ b/src/VBox/Runtime/r3/win/fs-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/init-win.cpp b/src/VBox/Runtime/r3/win/init-win.cpp
index f58a45f..bb95e83 100644
--- a/src/VBox/Runtime/r3/win/init-win.cpp
+++ b/src/VBox/Runtime/r3/win/init-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/ldrNative-win.cpp b/src/VBox/Runtime/r3/win/ldrNative-win.cpp
index 82e7343..e76ef7e 100644
--- a/src/VBox/Runtime/r3/win/ldrNative-win.cpp
+++ b/src/VBox/Runtime/r3/win/ldrNative-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -45,45 +45,90 @@
 #include <iprt/string.h>
 #include "internal/ldr.h"
 
+#ifndef LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR
+# define LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR       UINT32_C(0x100)
+# define LOAD_LIBRARY_SEARCH_APPLICATION_DIR    UINT32_C(0x200)
+# define LOAD_LIBRARY_SEARCH_SYSTEM32           UINT32_C(0x800)
+#endif
+
 
 int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle, uint32_t fFlags, PRTERRINFO pErrInfo)
 {
     Assert(sizeof(*phHandle) >= sizeof(HMODULE));
-    AssertReturn(fFlags == 0 || fFlags == RTLDRLOAD_FLAGS_NO_UNLOAD, VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & RTLDRLOAD_FLAGS_GLOBAL), VERR_INVALID_FLAGS);
     AssertLogRelMsgReturn(RTPathStartsWithRoot(pszFilename),  /* Relative names will still be applied to the search path. */
                           ("pszFilename='%s'\n", pszFilename),
                           VERR_INTERNAL_ERROR_2);
 
     /*
-     * Do we need to add an extension?
+     * Convert to UTF-16 and make sure it got a .DLL suffix.
      */
-    if (!RTPathHasSuffix(pszFilename))
+    int rc;
+    RTUTF16 *pwszNative = NULL;
+    if (RTPathHasSuffix(pszFilename))
+        rc = RTStrToUtf16(pszFilename, &pwszNative);
+    else
     {
-        size_t cch = strlen(pszFilename);
-        char *psz = (char *)alloca(cch + sizeof(".DLL"));
-        if (!psz)
-            return RTErrInfoSet(pErrInfo, VERR_NO_MEMORY, "alloca failed");
-        memcpy(psz, pszFilename, cch);
-        memcpy(psz + cch, ".DLL", sizeof(".DLL"));
-        pszFilename = psz;
+        size_t cwcAlloc;
+        rc = RTStrCalcUtf16LenEx(pszFilename, RTSTR_MAX, &cwcAlloc);
+        if (RT_SUCCESS(rc))
+        {
+            cwcAlloc += sizeof(".DLL");
+            pwszNative = RTUtf16Alloc(cwcAlloc * sizeof(RTUTF16));
+            if (pwszNative)
+            {
+                size_t cwcNative;
+                rc = RTStrToUtf16Ex(pszFilename, RTSTR_MAX, &pwszNative, cwcAlloc, &cwcNative);
+                if (RT_SUCCESS(rc))
+                    rc = RTUtf16CopyAscii(&pwszNative[cwcNative], cwcAlloc - cwcNative, ".DLL");
+            }
+            else
+                rc = VERR_NO_UTF16_MEMORY;
+        }
     }
-
-    /*
-     * Attempt load.
-     */
-    HMODULE hmod = LoadLibrary(pszFilename);
-    if (hmod)
+    if (RT_SUCCESS(rc))
     {
-        *phHandle = (uintptr_t)hmod;
-        return VINF_SUCCESS;
-    }
+        /*
+         * Attempt load.
+         */
+        HMODULE     hmod;
+        static int  s_iSearchDllLoadDirSupported = 0;
+        if (   !(fFlags & RTLDRLOAD_FLAGS_NT_SEARCH_DLL_LOAD_DIR)
+            || s_iSearchDllLoadDirSupported < 0)
+            hmod = LoadLibraryExW(pwszNative, NULL, 0);
+        else
+        {
+            hmod = LoadLibraryExW(pwszNative, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32
+                                  | LOAD_LIBRARY_SEARCH_APPLICATION_DIR);
+            if (s_iSearchDllLoadDirSupported == 0)
+            {
+                if (hmod != NULL || GetLastError() != ERROR_INVALID_PARAMETER)
+                    s_iSearchDllLoadDirSupported = 1;
+                else
+                {
+                    s_iSearchDllLoadDirSupported = -1;
+                    hmod = LoadLibraryExW(pwszNative, NULL, 0);
+                }
+            }
+        }
+        if (hmod)
+        {
+            *phHandle = (uintptr_t)hmod;
+            RTUtf16Free(pwszNative);
+            return VINF_SUCCESS;
+        }
 
-    /*
-     * Try figure why it failed to load.
-     */
-    DWORD dwErr = GetLastError();
-    int rc = RTErrConvertFromWin32(dwErr);
-    return RTErrInfoSetF(pErrInfo, rc, "GetLastError=%u", dwErr);
+        /*
+         * Try figure why it failed to load.
+         */
+        DWORD dwErr = GetLastError();
+        rc = RTErrConvertFromWin32(dwErr);
+        rc = RTErrInfoSetF(pErrInfo, rc, "GetLastError=%u", dwErr);
+    }
+    else
+        rc = RTErrInfoSetF(pErrInfo, rc, "Error converting UTF-8 to UTF-16 string.");
+    RTUtf16Free(pwszNative);
+    return rc;
 }
 
 
diff --git a/src/VBox/Runtime/r3/win/localipc-win.cpp b/src/VBox/Runtime/r3/win/localipc-win.cpp
index 0a12dbb..19f8bcd 100644
--- a/src/VBox/Runtime/r3/win/localipc-win.cpp
+++ b/src/VBox/Runtime/r3/win/localipc-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/mp-win.cpp b/src/VBox/Runtime/r3/win/mp-win.cpp
index b540620..91d1de2 100644
--- a/src/VBox/Runtime/r3/win/mp-win.cpp
+++ b/src/VBox/Runtime/r3/win/mp-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -100,7 +100,7 @@ RTDECL(RTCPUID) RTMpGetCoreCount(void)
 {
     /*
      * Resolve the API dynamically (one try) as it requires XP w/ sp3 or later.
-     */    
+     */
     typedef BOOL (WINAPI *PFNGETLOGICALPROCINFO)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, PDWORD);
     static PFNGETLOGICALPROCINFO s_pfnGetLogicalProcInfo = (PFNGETLOGICALPROCINFO)~(uintptr_t)0;
     if (s_pfnGetLogicalProcInfo == (PFNGETLOGICALPROCINFO)~(uintptr_t)0)
diff --git a/src/VBox/Runtime/r3/win/path-win.cpp b/src/VBox/Runtime/r3/win/path-win.cpp
index 00910ff..b4b1e18 100644
--- a/src/VBox/Runtime/r3/win/path-win.cpp
+++ b/src/VBox/Runtime/r3/win/path-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/pipe-win.cpp b/src/VBox/Runtime/r3/win/pipe-win.cpp
index 11f8b43..b1be306 100644
--- a/src/VBox/Runtime/r3/win/pipe-win.cpp
+++ b/src/VBox/Runtime/r3/win/pipe-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/process-win.cpp b/src/VBox/Runtime/r3/win/process-win.cpp
index ff31df8..353e941 100644
--- a/src/VBox/Runtime/r3/win/process-win.cpp
+++ b/src/VBox/Runtime/r3/win/process-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/rtFileNativeSetAttributes-win.cpp b/src/VBox/Runtime/r3/win/rtFileNativeSetAttributes-win.cpp
index 4bff933..8646d28 100644
--- a/src/VBox/Runtime/r3/win/rtFileNativeSetAttributes-win.cpp
+++ b/src/VBox/Runtime/r3/win/rtFileNativeSetAttributes-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp b/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp
index ab7ff7f..6e0d4d5 100644
--- a/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp
+++ b/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/sched-win.cpp b/src/VBox/Runtime/r3/win/sched-win.cpp
index 54b8154..0df9886 100644
--- a/src/VBox/Runtime/r3/win/sched-win.cpp
+++ b/src/VBox/Runtime/r3/win/sched-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/semevent-win.cpp b/src/VBox/Runtime/r3/win/semevent-win.cpp
index 13d715b..4dba0e3 100644
--- a/src/VBox/Runtime/r3/win/semevent-win.cpp
+++ b/src/VBox/Runtime/r3/win/semevent-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/semeventmulti-win.cpp b/src/VBox/Runtime/r3/win/semeventmulti-win.cpp
index b7f9feb..d6f6ef9 100644
--- a/src/VBox/Runtime/r3/win/semeventmulti-win.cpp
+++ b/src/VBox/Runtime/r3/win/semeventmulti-win.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/semmutex-win.cpp b/src/VBox/Runtime/r3/win/semmutex-win.cpp
index e3ec555..169f27e 100644
--- a/src/VBox/Runtime/r3/win/semmutex-win.cpp
+++ b/src/VBox/Runtime/r3/win/semmutex-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/symlink-win.cpp b/src/VBox/Runtime/r3/win/symlink-win.cpp
index 05e92b7..e6ee839 100644
--- a/src/VBox/Runtime/r3/win/symlink-win.cpp
+++ b/src/VBox/Runtime/r3/win/symlink-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/thread-win.cpp b/src/VBox/Runtime/r3/win/thread-win.cpp
index 581062e..4256b78 100644
--- a/src/VBox/Runtime/r3/win/thread-win.cpp
+++ b/src/VBox/Runtime/r3/win/thread-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/thread2-win.cpp b/src/VBox/Runtime/r3/win/thread2-win.cpp
index e260f75..d80fd21 100644
--- a/src/VBox/Runtime/r3/win/thread2-win.cpp
+++ b/src/VBox/Runtime/r3/win/thread2-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/time-win.cpp b/src/VBox/Runtime/r3/win/time-win.cpp
index d5517bd..2ed062a 100644
--- a/src/VBox/Runtime/r3/win/time-win.cpp
+++ b/src/VBox/Runtime/r3/win/time-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/time2-win.cpp b/src/VBox/Runtime/r3/win/time2-win.cpp
index e2372d9..178bf77 100644
--- a/src/VBox/Runtime/r3/win/time2-win.cpp
+++ b/src/VBox/Runtime/r3/win/time2-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/timer-win.cpp b/src/VBox/Runtime/r3/win/timer-win.cpp
index a23aa17..fb0c2f3 100644
--- a/src/VBox/Runtime/r3/win/timer-win.cpp
+++ b/src/VBox/Runtime/r3/win/timer-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/tls-win.cpp b/src/VBox/Runtime/r3/win/tls-win.cpp
index 51e0b23..5b11ffb 100644
--- a/src/VBox/Runtime/r3/win/tls-win.cpp
+++ b/src/VBox/Runtime/r3/win/tls-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/utf16locale-win.cpp b/src/VBox/Runtime/r3/win/utf16locale-win.cpp
index ccb51ad..dbd24b8 100644
--- a/src/VBox/Runtime/r3/win/utf16locale-win.cpp
+++ b/src/VBox/Runtime/r3/win/utf16locale-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/utf8-win.cpp b/src/VBox/Runtime/r3/win/utf8-win.cpp
index 58a6e39..0db68bb 100644
--- a/src/VBox/Runtime/r3/win/utf8-win.cpp
+++ b/src/VBox/Runtime/r3/win/utf8-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/uuid-win.cpp b/src/VBox/Runtime/r3/win/uuid-win.cpp
index ef1a42b..dbb15b2 100644
--- a/src/VBox/Runtime/r3/win/uuid-win.cpp
+++ b/src/VBox/Runtime/r3/win/uuid-win.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/win/vcc100-kernel32-fakes.cpp b/src/VBox/Runtime/r3/win/vcc100-kernel32-fakes.cpp
index 7cadd30..cc77bf9 100644
--- a/src/VBox/Runtime/r3/win/vcc100-kernel32-fakes.cpp
+++ b/src/VBox/Runtime/r3/win/vcc100-kernel32-fakes.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/r3/xml.cpp b/src/VBox/Runtime/r3/xml.cpp
index 1aa05fa..b935455 100644
--- a/src/VBox/Runtime/r3/xml.cpp
+++ b/src/VBox/Runtime/r3/xml.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -153,6 +153,7 @@ EIPRTFailure::EIPRTFailure(int aRC, const char *pcszContext, ...)
     va_list args;
     va_start(args, pcszContext);
     RTStrAPrintfV(&pszContext2, pcszContext, args);
+    va_end(args);
     char *newMsg;
     RTStrAPrintf(&newMsg, "%s: %d(%s)", pszContext2, aRC, RTErrGetShort(aRC));
     setWhat(newMsg);
diff --git a/src/VBox/Runtime/testcase/72kb-random.h b/src/VBox/Runtime/testcase/72kb-random.h
index 17e1508..46f6998 100644
--- a/src/VBox/Runtime/testcase/72kb-random.h
+++ b/src/VBox/Runtime/testcase/72kb-random.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/Makefile.kmk b/src/VBox/Runtime/testcase/Makefile.kmk
index 60b5049..6a99a6e 100644
--- a/src/VBox/Runtime/testcase/Makefile.kmk
+++ b/src/VBox/Runtime/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp b/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp
index 96ccfa6..9ee0d65 100644
--- a/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp
+++ b/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstDir-2.cpp b/src/VBox/Runtime/testcase/tstDir-2.cpp
index aea861f..23e737a 100644
--- a/src/VBox/Runtime/testcase/tstDir-2.cpp
+++ b/src/VBox/Runtime/testcase/tstDir-2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstDir-3.cpp b/src/VBox/Runtime/testcase/tstDir-3.cpp
index 5b453d0..6e1b82d 100644
--- a/src/VBox/Runtime/testcase/tstDir-3.cpp
+++ b/src/VBox/Runtime/testcase/tstDir-3.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstDir.cpp b/src/VBox/Runtime/testcase/tstDir.cpp
index 470414e..ba30f60 100644
--- a/src/VBox/Runtime/testcase/tstDir.cpp
+++ b/src/VBox/Runtime/testcase/tstDir.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstEnv.cpp b/src/VBox/Runtime/testcase/tstEnv.cpp
index 2ffa30d..ab66ca2 100644
--- a/src/VBox/Runtime/testcase/tstEnv.cpp
+++ b/src/VBox/Runtime/testcase/tstEnv.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstFile.cpp b/src/VBox/Runtime/testcase/tstFile.cpp
index 61d57a7..8a1c081 100644
--- a/src/VBox/Runtime/testcase/tstFile.cpp
+++ b/src/VBox/Runtime/testcase/tstFile.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp b/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp
index 25ab780..d4e4152 100644
--- a/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp
+++ b/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstFileLock.cpp b/src/VBox/Runtime/testcase/tstFileLock.cpp
index 6394245..21e4189 100644
--- a/src/VBox/Runtime/testcase/tstFileLock.cpp
+++ b/src/VBox/Runtime/testcase/tstFileLock.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstFork.cpp b/src/VBox/Runtime/testcase/tstFork.cpp
index 61ccb48..b746887 100644
--- a/src/VBox/Runtime/testcase/tstFork.cpp
+++ b/src/VBox/Runtime/testcase/tstFork.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstHandleTable.cpp b/src/VBox/Runtime/testcase/tstHandleTable.cpp
index 27833f2..7641393 100644
--- a/src/VBox/Runtime/testcase/tstHandleTable.cpp
+++ b/src/VBox/Runtime/testcase/tstHandleTable.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -487,7 +487,7 @@ int main(int argc, char **argv)
                 return 1;
 
             case 'V':
-                RTPrintf("$Revision: 92645 $\n");
+                RTPrintf("$Revision: 100874 $\n");
                 return 0;
 
             default:
diff --git a/src/VBox/Runtime/testcase/tstIprtList.cpp b/src/VBox/Runtime/testcase/tstIprtList.cpp
index 283807d..d3b973f 100644
--- a/src/VBox/Runtime/testcase/tstIprtList.cpp
+++ b/src/VBox/Runtime/testcase/tstIprtList.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstIprtMiniString.cpp b/src/VBox/Runtime/testcase/tstIprtMiniString.cpp
index 704078c..96e81c0 100644
--- a/src/VBox/Runtime/testcase/tstIprtMiniString.cpp
+++ b/src/VBox/Runtime/testcase/tstIprtMiniString.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstLdr-2.cpp b/src/VBox/Runtime/testcase/tstLdr-2.cpp
index 27d5dbb..56ab531 100644
--- a/src/VBox/Runtime/testcase/tstLdr-2.cpp
+++ b/src/VBox/Runtime/testcase/tstLdr-2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstLdr-3.cpp b/src/VBox/Runtime/testcase/tstLdr-3.cpp
index 02a9c84..a1c5a19 100644
--- a/src/VBox/Runtime/testcase/tstLdr-3.cpp
+++ b/src/VBox/Runtime/testcase/tstLdr-3.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstLdr-4.cpp b/src/VBox/Runtime/testcase/tstLdr-4.cpp
index c703feb..c8ad677 100644
--- a/src/VBox/Runtime/testcase/tstLdr-4.cpp
+++ b/src/VBox/Runtime/testcase/tstLdr-4.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstLdr-4Imp-os2.def b/src/VBox/Runtime/testcase/tstLdr-4Imp-os2.def
index 9d92af4..b336f54 100644
--- a/src/VBox/Runtime/testcase/tstLdr-4Imp-os2.def
+++ b/src/VBox/Runtime/testcase/tstLdr-4Imp-os2.def
@@ -2,7 +2,7 @@
 ; tstLdr-4 fake DLL - Definition file.
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstLdr-4Imp-win.def b/src/VBox/Runtime/testcase/tstLdr-4Imp-win.def
index e58384a..0980003 100644
--- a/src/VBox/Runtime/testcase/tstLdr-4Imp-win.def
+++ b/src/VBox/Runtime/testcase/tstLdr-4Imp-win.def
@@ -2,7 +2,7 @@
 ; tstLdr-4 fake DLL - Definition file.
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstLdr.cpp b/src/VBox/Runtime/testcase/tstLdr.cpp
index cf4d55a..2ff3072 100644
--- a/src/VBox/Runtime/testcase/tstLdr.cpp
+++ b/src/VBox/Runtime/testcase/tstLdr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp b/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp
index bc14072..5017e03 100644
--- a/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp
+++ b/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp
@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstLdrLoad.cpp b/src/VBox/Runtime/testcase/tstLdrLoad.cpp
index 57b2bb7..69bfdb2 100644
--- a/src/VBox/Runtime/testcase/tstLdrLoad.cpp
+++ b/src/VBox/Runtime/testcase/tstLdrLoad.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstLdrObj.cpp b/src/VBox/Runtime/testcase/tstLdrObj.cpp
index 2424e9d..41ff7fe 100644
--- a/src/VBox/Runtime/testcase/tstLdrObj.cpp
+++ b/src/VBox/Runtime/testcase/tstLdrObj.cpp
@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstLdrObjR0.cpp b/src/VBox/Runtime/testcase/tstLdrObjR0.cpp
index 94e6eda..c2656e2 100644
--- a/src/VBox/Runtime/testcase/tstLdrObjR0.cpp
+++ b/src/VBox/Runtime/testcase/tstLdrObjR0.cpp
@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstLog.cpp b/src/VBox/Runtime/testcase/tstLog.cpp
index 348aa2c..94ee73c 100644
--- a/src/VBox/Runtime/testcase/tstLog.cpp
+++ b/src/VBox/Runtime/testcase/tstLog.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp b/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp
index 2354d7b..9dd1211 100644
--- a/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp
+++ b/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstMove.cpp b/src/VBox/Runtime/testcase/tstMove.cpp
index e92dde7..fc9fb46 100644
--- a/src/VBox/Runtime/testcase/tstMove.cpp
+++ b/src/VBox/Runtime/testcase/tstMove.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstNoCrt-1.cpp b/src/VBox/Runtime/testcase/tstNoCrt-1.cpp
index 52e2099..ebe8135 100644
--- a/src/VBox/Runtime/testcase/tstNoCrt-1.cpp
+++ b/src/VBox/Runtime/testcase/tstNoCrt-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstOnce.cpp b/src/VBox/Runtime/testcase/tstOnce.cpp
index e09d93b..1ee5702 100644
--- a/src/VBox/Runtime/testcase/tstOnce.cpp
+++ b/src/VBox/Runtime/testcase/tstOnce.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstPrfRT.cpp b/src/VBox/Runtime/testcase/tstPrfRT.cpp
index 5cff5f3..a77a26e 100644
--- a/src/VBox/Runtime/testcase/tstPrfRT.cpp
+++ b/src/VBox/Runtime/testcase/tstPrfRT.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp b/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp
index a14f86e..5ca22c7 100644
--- a/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp
+++ b/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTAvl.cpp b/src/VBox/Runtime/testcase/tstRTAvl.cpp
index b460946..f2e751a 100644
--- a/src/VBox/Runtime/testcase/tstRTAvl.cpp
+++ b/src/VBox/Runtime/testcase/tstRTAvl.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTBase64.cpp b/src/VBox/Runtime/testcase/tstRTBase64.cpp
index 6f86c6b..3be9862 100644
--- a/src/VBox/Runtime/testcase/tstRTBase64.cpp
+++ b/src/VBox/Runtime/testcase/tstRTBase64.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTBigNum.cpp b/src/VBox/Runtime/testcase/tstRTBigNum.cpp
index 040d237..df892e3 100644
--- a/src/VBox/Runtime/testcase/tstRTBigNum.cpp
+++ b/src/VBox/Runtime/testcase/tstRTBigNum.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTBitOperations.cpp b/src/VBox/Runtime/testcase/tstRTBitOperations.cpp
index d45bfcd..7f4e9b6 100644
--- a/src/VBox/Runtime/testcase/tstRTBitOperations.cpp
+++ b/src/VBox/Runtime/testcase/tstRTBitOperations.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTCType.cpp b/src/VBox/Runtime/testcase/tstRTCType.cpp
index 5df099c..c3fe55c 100644
--- a/src/VBox/Runtime/testcase/tstRTCType.cpp
+++ b/src/VBox/Runtime/testcase/tstRTCType.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTCidr.cpp b/src/VBox/Runtime/testcase/tstRTCidr.cpp
index ab13258..bc9b92b 100644
--- a/src/VBox/Runtime/testcase/tstRTCidr.cpp
+++ b/src/VBox/Runtime/testcase/tstRTCidr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTCircBuf.cpp b/src/VBox/Runtime/testcase/tstRTCircBuf.cpp
index be82ed5..8da3834 100644
--- a/src/VBox/Runtime/testcase/tstRTCircBuf.cpp
+++ b/src/VBox/Runtime/testcase/tstRTCircBuf.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTCoreDump.cpp b/src/VBox/Runtime/testcase/tstRTCoreDump.cpp
index 7594f71..722cda1 100644
--- a/src/VBox/Runtime/testcase/tstRTCoreDump.cpp
+++ b/src/VBox/Runtime/testcase/tstRTCoreDump.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTCoreDump.h b/src/VBox/Runtime/testcase/tstRTCoreDump.h
index 524db66..1071a3d 100644
--- a/src/VBox/Runtime/testcase/tstRTCoreDump.h
+++ b/src/VBox/Runtime/testcase/tstRTCoreDump.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTCritSect.cpp b/src/VBox/Runtime/testcase/tstRTCritSect.cpp
index c143a8b..d8d910b 100644
--- a/src/VBox/Runtime/testcase/tstRTCritSect.cpp
+++ b/src/VBox/Runtime/testcase/tstRTCritSect.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -491,7 +491,7 @@ int main(int argc, char **argv)
                 return 1;
 
             case 'V':
-                RTPrintf("$Revision: 89632 $\n");
+                RTPrintf("$Revision: 100874 $\n");
                 return 0;
 
             default:
diff --git a/src/VBox/Runtime/testcase/tstRTCritSectRw.cpp b/src/VBox/Runtime/testcase/tstRTCritSectRw.cpp
index f946a1b..a172813 100644
--- a/src/VBox/Runtime/testcase/tstRTCritSectRw.cpp
+++ b/src/VBox/Runtime/testcase/tstRTCritSectRw.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTDarwinMachKernel.cpp b/src/VBox/Runtime/testcase/tstRTDarwinMachKernel.cpp
index 32f2a8f..ac66f5d 100644
--- a/src/VBox/Runtime/testcase/tstRTDarwinMachKernel.cpp
+++ b/src/VBox/Runtime/testcase/tstRTDarwinMachKernel.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTDigest-2.cpp b/src/VBox/Runtime/testcase/tstRTDigest-2.cpp
index 3137c91..915b7ae 100644
--- a/src/VBox/Runtime/testcase/tstRTDigest-2.cpp
+++ b/src/VBox/Runtime/testcase/tstRTDigest-2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTDigest.cpp b/src/VBox/Runtime/testcase/tstRTDigest.cpp
index 6df329c..5dbfb73 100644
--- a/src/VBox/Runtime/testcase/tstRTDigest.cpp
+++ b/src/VBox/Runtime/testcase/tstRTDigest.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp b/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp
index 076a3c8..96628fd 100644
--- a/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp
+++ b/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTDvm.cpp b/src/VBox/Runtime/testcase/tstRTDvm.cpp
index 561b4ee..e80823c 100644
--- a/src/VBox/Runtime/testcase/tstRTDvm.cpp
+++ b/src/VBox/Runtime/testcase/tstRTDvm.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTErrUnique.cpp b/src/VBox/Runtime/testcase/tstRTErrUnique.cpp
index db2aab6..3c57bbe 100644
--- a/src/VBox/Runtime/testcase/tstRTErrUnique.cpp
+++ b/src/VBox/Runtime/testcase/tstRTErrUnique.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTFileAio.cpp b/src/VBox/Runtime/testcase/tstRTFileAio.cpp
index 0eec472..9e330cb 100644
--- a/src/VBox/Runtime/testcase/tstRTFileAio.cpp
+++ b/src/VBox/Runtime/testcase/tstRTFileAio.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTFileAppend-1.cpp b/src/VBox/Runtime/testcase/tstRTFileAppend-1.cpp
index c18940b..40dbe1f 100644
--- a/src/VBox/Runtime/testcase/tstRTFileAppend-1.cpp
+++ b/src/VBox/Runtime/testcase/tstRTFileAppend-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTFileGetSize-1.cpp b/src/VBox/Runtime/testcase/tstRTFileGetSize-1.cpp
index 923b519..2fcf9a2 100644
--- a/src/VBox/Runtime/testcase/tstRTFileGetSize-1.cpp
+++ b/src/VBox/Runtime/testcase/tstRTFileGetSize-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTFileModeStringToFlags.cpp b/src/VBox/Runtime/testcase/tstRTFileModeStringToFlags.cpp
index dab4203..41d765e 100644
--- a/src/VBox/Runtime/testcase/tstRTFileModeStringToFlags.cpp
+++ b/src/VBox/Runtime/testcase/tstRTFileModeStringToFlags.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTFilesystem.cpp b/src/VBox/Runtime/testcase/tstRTFilesystem.cpp
index cd86af5..04b81aa 100644
--- a/src/VBox/Runtime/testcase/tstRTFilesystem.cpp
+++ b/src/VBox/Runtime/testcase/tstRTFilesystem.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTFsQueries.cpp b/src/VBox/Runtime/testcase/tstRTFsQueries.cpp
index e141093..148504c 100644
--- a/src/VBox/Runtime/testcase/tstRTFsQueries.cpp
+++ b/src/VBox/Runtime/testcase/tstRTFsQueries.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTGetOpt.cpp b/src/VBox/Runtime/testcase/tstRTGetOpt.cpp
index f76f8db..631655e 100644
--- a/src/VBox/Runtime/testcase/tstRTGetOpt.cpp
+++ b/src/VBox/Runtime/testcase/tstRTGetOpt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTGetOptArgv.cpp b/src/VBox/Runtime/testcase/tstRTGetOptArgv.cpp
index 7fed435..58bde6f 100644
--- a/src/VBox/Runtime/testcase/tstRTGetOptArgv.cpp
+++ b/src/VBox/Runtime/testcase/tstRTGetOptArgv.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp b/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp
index 2557423..1a5e5ef 100644
--- a/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp
+++ b/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp b/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp
index 930e48b..b333c91 100644
--- a/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp
+++ b/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTHttp.cpp b/src/VBox/Runtime/testcase/tstRTHttp.cpp
index 3885c40..a722b30 100644
--- a/src/VBox/Runtime/testcase/tstRTHttp.cpp
+++ b/src/VBox/Runtime/testcase/tstRTHttp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp b/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp
index 1e3a33b..67ab696 100644
--- a/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp
+++ b/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTLdrVerifyPeImage.cpp b/src/VBox/Runtime/testcase/tstRTLdrVerifyPeImage.cpp
index 4a19ca5..b0b68c3 100644
--- a/src/VBox/Runtime/testcase/tstRTLdrVerifyPeImage.cpp
+++ b/src/VBox/Runtime/testcase/tstRTLdrVerifyPeImage.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTList.cpp b/src/VBox/Runtime/testcase/tstRTList.cpp
index bfa8884..d2f204e 100644
--- a/src/VBox/Runtime/testcase/tstRTList.cpp
+++ b/src/VBox/Runtime/testcase/tstRTList.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTLocalIpc.cpp b/src/VBox/Runtime/testcase/tstRTLocalIpc.cpp
index 476cc04..56a7ecc 100644
--- a/src/VBox/Runtime/testcase/tstRTLocalIpc.cpp
+++ b/src/VBox/Runtime/testcase/tstRTLocalIpc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTLockValidator.cpp b/src/VBox/Runtime/testcase/tstRTLockValidator.cpp
index bda7519..c899213 100644
--- a/src/VBox/Runtime/testcase/tstRTLockValidator.cpp
+++ b/src/VBox/Runtime/testcase/tstRTLockValidator.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTManifest.cpp b/src/VBox/Runtime/testcase/tstRTManifest.cpp
index 766d36f..b402fba 100644
--- a/src/VBox/Runtime/testcase/tstRTManifest.cpp
+++ b/src/VBox/Runtime/testcase/tstRTManifest.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTMemCache.cpp b/src/VBox/Runtime/testcase/tstRTMemCache.cpp
index 73c4814..cd89177 100644
--- a/src/VBox/Runtime/testcase/tstRTMemCache.cpp
+++ b/src/VBox/Runtime/testcase/tstRTMemCache.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTMemEf.cpp b/src/VBox/Runtime/testcase/tstRTMemEf.cpp
index 904c6ed..63ee641 100644
--- a/src/VBox/Runtime/testcase/tstRTMemEf.cpp
+++ b/src/VBox/Runtime/testcase/tstRTMemEf.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTMemPool.cpp b/src/VBox/Runtime/testcase/tstRTMemPool.cpp
index fc59a8b..7468abb 100644
--- a/src/VBox/Runtime/testcase/tstRTMemPool.cpp
+++ b/src/VBox/Runtime/testcase/tstRTMemPool.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTMemSafer.cpp b/src/VBox/Runtime/testcase/tstRTMemSafer.cpp
index 4f0105b..64e2a8b 100644
--- a/src/VBox/Runtime/testcase/tstRTMemSafer.cpp
+++ b/src/VBox/Runtime/testcase/tstRTMemSafer.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTMemWipe.cpp b/src/VBox/Runtime/testcase/tstRTMemWipe.cpp
index 20a8738..ca088ce 100644
--- a/src/VBox/Runtime/testcase/tstRTMemWipe.cpp
+++ b/src/VBox/Runtime/testcase/tstRTMemWipe.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTMp-1.cpp b/src/VBox/Runtime/testcase/tstRTMp-1.cpp
index 4a09ba5..3f326bf 100644
--- a/src/VBox/Runtime/testcase/tstRTMp-1.cpp
+++ b/src/VBox/Runtime/testcase/tstRTMp-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTNetIPv4.cpp b/src/VBox/Runtime/testcase/tstRTNetIPv4.cpp
index 991544c..00acbfd 100644
--- a/src/VBox/Runtime/testcase/tstRTNetIPv4.cpp
+++ b/src/VBox/Runtime/testcase/tstRTNetIPv4.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTNetIPv6.cpp b/src/VBox/Runtime/testcase/tstRTNetIPv6.cpp
index 2878818..a023827 100644
--- a/src/VBox/Runtime/testcase/tstRTNetIPv6.cpp
+++ b/src/VBox/Runtime/testcase/tstRTNetIPv6.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTPath.cpp b/src/VBox/Runtime/testcase/tstRTPath.cpp
index 25538d0..e1056cd 100644
--- a/src/VBox/Runtime/testcase/tstRTPath.cpp
+++ b/src/VBox/Runtime/testcase/tstRTPath.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTPipe.cpp b/src/VBox/Runtime/testcase/tstRTPipe.cpp
index f034899..35e1568 100644
--- a/src/VBox/Runtime/testcase/tstRTPipe.cpp
+++ b/src/VBox/Runtime/testcase/tstRTPipe.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTPoll.cpp b/src/VBox/Runtime/testcase/tstRTPoll.cpp
index 8e14c23..2249fc7 100644
--- a/src/VBox/Runtime/testcase/tstRTPoll.cpp
+++ b/src/VBox/Runtime/testcase/tstRTPoll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTPrfIO.cpp b/src/VBox/Runtime/testcase/tstRTPrfIO.cpp
index 7b2bfe1..b4c3edc 100644
--- a/src/VBox/Runtime/testcase/tstRTPrfIO.cpp
+++ b/src/VBox/Runtime/testcase/tstRTPrfIO.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -210,7 +210,7 @@ int main(int argc, char **argv)
                 break;
 
             case 'V':
-                RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "$Revision: 67140 $\n");
+                RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "$Revision: 100874 $\n");
                 return RTTestSummaryAndDestroy(g_hTest);
 
             case 'h':
diff --git a/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp b/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp
index af837a8..89fef57 100644
--- a/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp
+++ b/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTProcCreatePrf.cpp b/src/VBox/Runtime/testcase/tstRTProcCreatePrf.cpp
index b2eaa26..2e746ee 100644
--- a/src/VBox/Runtime/testcase/tstRTProcCreatePrf.cpp
+++ b/src/VBox/Runtime/testcase/tstRTProcCreatePrf.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp b/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp
index f784d94..64be70b 100644
--- a/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp
+++ b/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTProcQueryUsername.cpp b/src/VBox/Runtime/testcase/tstRTProcQueryUsername.cpp
index 50677fc..ba47025 100644
--- a/src/VBox/Runtime/testcase/tstRTProcQueryUsername.cpp
+++ b/src/VBox/Runtime/testcase/tstRTProcQueryUsername.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTProcWait.cpp b/src/VBox/Runtime/testcase/tstRTProcWait.cpp
index fb55567..8a0bedf 100644
--- a/src/VBox/Runtime/testcase/tstRTProcWait.cpp
+++ b/src/VBox/Runtime/testcase/tstRTProcWait.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0Common.h b/src/VBox/Runtime/testcase/tstRTR0Common.h
index ed8a5a7..c128a59 100644
--- a/src/VBox/Runtime/testcase/tstRTR0Common.h
+++ b/src/VBox/Runtime/testcase/tstRTR0Common.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0CommonDriver.h b/src/VBox/Runtime/testcase/tstRTR0CommonDriver.h
index 17d5566..a856d54 100644
--- a/src/VBox/Runtime/testcase/tstRTR0CommonDriver.h
+++ b/src/VBox/Runtime/testcase/tstRTR0CommonDriver.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0CommonReq.h b/src/VBox/Runtime/testcase/tstRTR0CommonReq.h
index b32e174..1c53dc6 100644
--- a/src/VBox/Runtime/testcase/tstRTR0CommonReq.h
+++ b/src/VBox/Runtime/testcase/tstRTR0CommonReq.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfo.cpp b/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfo.cpp
index 6216612..4403776 100644
--- a/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfo.cpp
+++ b/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfo.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfo.h b/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfo.h
index 17b9d5e..129d941 100644
--- a/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfo.h
+++ b/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfo.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfoDriver.cpp b/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfoDriver.cpp
index 9de1a72..61c6606 100644
--- a/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfoDriver.cpp
+++ b/src/VBox/Runtime/testcase/tstRTR0DbgKrnlInfoDriver.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp
index 49c61d3..4327893 100644
--- a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp
+++ b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h
index c4795b1..9cd87b1 100644
--- a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h
+++ b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp b/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp
index 7f069d0..3c7a815 100644
--- a/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp
+++ b/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp b/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp
index b33ba50..cf54059 100644
--- a/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp
+++ b/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0SemMutex.h b/src/VBox/Runtime/testcase/tstRTR0SemMutex.h
index ee5cf4d..e161793 100644
--- a/src/VBox/Runtime/testcase/tstRTR0SemMutex.h
+++ b/src/VBox/Runtime/testcase/tstRTR0SemMutex.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp b/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp
index 652641a..6b6eb3a 100644
--- a/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp
+++ b/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0Timer.cpp b/src/VBox/Runtime/testcase/tstRTR0Timer.cpp
index db48468..9bc3430 100644
--- a/src/VBox/Runtime/testcase/tstRTR0Timer.cpp
+++ b/src/VBox/Runtime/testcase/tstRTR0Timer.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0Timer.h b/src/VBox/Runtime/testcase/tstRTR0Timer.h
index 8edf273..73ec78a 100644
--- a/src/VBox/Runtime/testcase/tstRTR0Timer.h
+++ b/src/VBox/Runtime/testcase/tstRTR0Timer.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTR0TimerDriver.cpp b/src/VBox/Runtime/testcase/tstRTR0TimerDriver.cpp
index aa55fab..552158f 100644
--- a/src/VBox/Runtime/testcase/tstRTR0TimerDriver.cpp
+++ b/src/VBox/Runtime/testcase/tstRTR0TimerDriver.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTReqPool.cpp b/src/VBox/Runtime/testcase/tstRTReqPool.cpp
index a27a758..999a9ea 100644
--- a/src/VBox/Runtime/testcase/tstRTReqPool.cpp
+++ b/src/VBox/Runtime/testcase/tstRTReqPool.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTS3.cpp b/src/VBox/Runtime/testcase/tstRTS3.cpp
index 3b5b051..7d773e7 100644
--- a/src/VBox/Runtime/testcase/tstRTS3.cpp
+++ b/src/VBox/Runtime/testcase/tstRTS3.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTSemEventMulti.cpp b/src/VBox/Runtime/testcase/tstRTSemEventMulti.cpp
index 3857a4c..6f7312c 100644
--- a/src/VBox/Runtime/testcase/tstRTSemEventMulti.cpp
+++ b/src/VBox/Runtime/testcase/tstRTSemEventMulti.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTSemRW.cpp b/src/VBox/Runtime/testcase/tstRTSemRW.cpp
index ea2a760..017cc7d 100644
--- a/src/VBox/Runtime/testcase/tstRTSemRW.cpp
+++ b/src/VBox/Runtime/testcase/tstRTSemRW.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp b/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp
index a6759a6..11a8d58 100644
--- a/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp
+++ b/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTSort.cpp b/src/VBox/Runtime/testcase/tstRTSort.cpp
index 0bc0e83..be7f38f 100644
--- a/src/VBox/Runtime/testcase/tstRTSort.cpp
+++ b/src/VBox/Runtime/testcase/tstRTSort.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp b/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp
index b1240c2..5b2c43e 100644
--- a/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp
+++ b/src/VBox/Runtime/testcase/tstRTStrAlloc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTStrCache.cpp b/src/VBox/Runtime/testcase/tstRTStrCache.cpp
index 15d9da8..5b19d3f 100644
--- a/src/VBox/Runtime/testcase/tstRTStrCache.cpp
+++ b/src/VBox/Runtime/testcase/tstRTStrCache.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTStrCatCopy.cpp b/src/VBox/Runtime/testcase/tstRTStrCatCopy.cpp
index 36ab676..6e1b6bf 100644
--- a/src/VBox/Runtime/testcase/tstRTStrCatCopy.cpp
+++ b/src/VBox/Runtime/testcase/tstRTStrCatCopy.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTStrFormat.cpp b/src/VBox/Runtime/testcase/tstRTStrFormat.cpp
index e0504e5..32048a0 100644
--- a/src/VBox/Runtime/testcase/tstRTStrFormat.cpp
+++ b/src/VBox/Runtime/testcase/tstRTStrFormat.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTStrVersion.cpp b/src/VBox/Runtime/testcase/tstRTStrVersion.cpp
index f9c8c07..1300b40 100644
--- a/src/VBox/Runtime/testcase/tstRTStrVersion.cpp
+++ b/src/VBox/Runtime/testcase/tstRTStrVersion.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTSymlink.cpp b/src/VBox/Runtime/testcase/tstRTSymlink.cpp
index dd852ec..909a7b4 100644
--- a/src/VBox/Runtime/testcase/tstRTSymlink.cpp
+++ b/src/VBox/Runtime/testcase/tstRTSymlink.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp b/src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp
index a92b22b..8a02b05 100644
--- a/src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp
+++ b/src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp b/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp
index 338e59f..0406c44 100644
--- a/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp
+++ b/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTTemp.cpp b/src/VBox/Runtime/testcase/tstRTTemp.cpp
index 758f538..36d813b 100644
--- a/src/VBox/Runtime/testcase/tstRTTemp.cpp
+++ b/src/VBox/Runtime/testcase/tstRTTemp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTThreadExecutionTime.cpp b/src/VBox/Runtime/testcase/tstRTThreadExecutionTime.cpp
index 4050791..0eb4255 100644
--- a/src/VBox/Runtime/testcase/tstRTThreadExecutionTime.cpp
+++ b/src/VBox/Runtime/testcase/tstRTThreadExecutionTime.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTThreadPoke.cpp b/src/VBox/Runtime/testcase/tstRTThreadPoke.cpp
index 47588db..d63cce2 100644
--- a/src/VBox/Runtime/testcase/tstRTThreadPoke.cpp
+++ b/src/VBox/Runtime/testcase/tstRTThreadPoke.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTTime.cpp b/src/VBox/Runtime/testcase/tstRTTime.cpp
index b76f3b6..a8db004 100644
--- a/src/VBox/Runtime/testcase/tstRTTime.cpp
+++ b/src/VBox/Runtime/testcase/tstRTTime.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp b/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp
index 450041f..bdddec5 100644
--- a/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp
+++ b/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTUri.cpp b/src/VBox/Runtime/testcase/tstRTUri.cpp
index e94ade2..2324c1b 100644
--- a/src/VBox/Runtime/testcase/tstRTUri.cpp
+++ b/src/VBox/Runtime/testcase/tstRTUri.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTUuid.cpp b/src/VBox/Runtime/testcase/tstRTUuid.cpp
index a2fd7e0..7ed10ca 100644
--- a/src/VBox/Runtime/testcase/tstRTUuid.cpp
+++ b/src/VBox/Runtime/testcase/tstRTUuid.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRTZip.cpp b/src/VBox/Runtime/testcase/tstRTZip.cpp
index a2a9e00..d050cef 100644
--- a/src/VBox/Runtime/testcase/tstRTZip.cpp
+++ b/src/VBox/Runtime/testcase/tstRTZip.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstRand.cpp b/src/VBox/Runtime/testcase/tstRand.cpp
index 88edf85..bef6e1f 100644
--- a/src/VBox/Runtime/testcase/tstRand.cpp
+++ b/src/VBox/Runtime/testcase/tstRand.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2011 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstSemMutex.cpp b/src/VBox/Runtime/testcase/tstSemMutex.cpp
index 1bdb4a9..cfaa66c 100644
--- a/src/VBox/Runtime/testcase/tstSemMutex.cpp
+++ b/src/VBox/Runtime/testcase/tstSemMutex.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstSemPingPong.cpp b/src/VBox/Runtime/testcase/tstSemPingPong.cpp
index 0be9f7e..dd55be4 100644
--- a/src/VBox/Runtime/testcase/tstSemPingPong.cpp
+++ b/src/VBox/Runtime/testcase/tstSemPingPong.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp b/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp
index 756b843..061bbee 100644
--- a/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp
+++ b/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstStrToNum.cpp b/src/VBox/Runtime/testcase/tstStrToNum.cpp
index 53b9227..c15dc3d 100644
--- a/src/VBox/Runtime/testcase/tstStrToNum.cpp
+++ b/src/VBox/Runtime/testcase/tstStrToNum.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstTSC.cpp b/src/VBox/Runtime/testcase/tstTSC.cpp
index b18d843..dcc3a1c 100644
--- a/src/VBox/Runtime/testcase/tstTSC.cpp
+++ b/src/VBox/Runtime/testcase/tstTSC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -437,7 +437,7 @@ int main(int argc, char **argv)
                 return 1;
 
             case 'V':
-                RTPrintf("$Revision: 89632 $\n");
+                RTPrintf("$Revision: 100874 $\n");
                 return 0;
 
             default:
diff --git a/src/VBox/Runtime/testcase/tstTermCallbacks.cpp b/src/VBox/Runtime/testcase/tstTermCallbacks.cpp
index ea33f88..df8247c 100644
--- a/src/VBox/Runtime/testcase/tstTermCallbacks.cpp
+++ b/src/VBox/Runtime/testcase/tstTermCallbacks.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstThread-1.cpp b/src/VBox/Runtime/testcase/tstThread-1.cpp
index e4cfebe..d45c190 100644
--- a/src/VBox/Runtime/testcase/tstThread-1.cpp
+++ b/src/VBox/Runtime/testcase/tstThread-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstTime-2.cpp b/src/VBox/Runtime/testcase/tstTime-2.cpp
index 8d2405d..9e30767 100644
--- a/src/VBox/Runtime/testcase/tstTime-2.cpp
+++ b/src/VBox/Runtime/testcase/tstTime-2.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstTime-3.cpp b/src/VBox/Runtime/testcase/tstTime-3.cpp
index 436b095..a31dc5b 100644
--- a/src/VBox/Runtime/testcase/tstTime-3.cpp
+++ b/src/VBox/Runtime/testcase/tstTime-3.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstTime-4.cpp b/src/VBox/Runtime/testcase/tstTime-4.cpp
index c9d1cf6..5958901 100644
--- a/src/VBox/Runtime/testcase/tstTime-4.cpp
+++ b/src/VBox/Runtime/testcase/tstTime-4.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstTimer.cpp b/src/VBox/Runtime/testcase/tstTimer.cpp
index 6fdee70..d9c809c 100644
--- a/src/VBox/Runtime/testcase/tstTimer.cpp
+++ b/src/VBox/Runtime/testcase/tstTimer.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstTimerLR.cpp b/src/VBox/Runtime/testcase/tstTimerLR.cpp
index b179ed7..eea33fe 100644
--- a/src/VBox/Runtime/testcase/tstTimerLR.cpp
+++ b/src/VBox/Runtime/testcase/tstTimerLR.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstUtf8.cpp b/src/VBox/Runtime/testcase/tstUtf8.cpp
index 8bbe882..d5c7217 100644
--- a/src/VBox/Runtime/testcase/tstUtf8.cpp
+++ b/src/VBox/Runtime/testcase/tstUtf8.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/testcase/tstVector.cpp b/src/VBox/Runtime/testcase/tstVector.cpp
index 943a0be..935a5bb 100644
--- a/src/VBox/Runtime/testcase/tstVector.cpp
+++ b/src/VBox/Runtime/testcase/tstVector.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/tools/Makefile.kmk b/src/VBox/Runtime/tools/Makefile.kmk
index bc05a7f..0c4e1d2 100644
--- a/src/VBox/Runtime/tools/Makefile.kmk
+++ b/src/VBox/Runtime/tools/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/tools/RTDbgSymCache.cpp b/src/VBox/Runtime/tools/RTDbgSymCache.cpp
index 030f253..61260da 100644
--- a/src/VBox/Runtime/tools/RTDbgSymCache.cpp
+++ b/src/VBox/Runtime/tools/RTDbgSymCache.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/tools/RTGzip.cpp b/src/VBox/Runtime/tools/RTGzip.cpp
index 693ad6a..17a5787 100644
--- a/src/VBox/Runtime/tools/RTGzip.cpp
+++ b/src/VBox/Runtime/tools/RTGzip.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/tools/RTLdrFlt.cpp b/src/VBox/Runtime/tools/RTLdrFlt.cpp
index bae231f..77115f6 100644
--- a/src/VBox/Runtime/tools/RTLdrFlt.cpp
+++ b/src/VBox/Runtime/tools/RTLdrFlt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -224,7 +224,7 @@ int main(int argc, char **argv)
                 return RTEXITCODE_SUCCESS;
 
             case 'V':
-                RTPrintf("$Revision: 87101 $\n");
+                RTPrintf("$Revision: 100874 $\n");
                 return RTEXITCODE_SUCCESS;
 
             case VINF_GETOPT_NOT_OPTION:
diff --git a/src/VBox/Runtime/tools/RTManifest.cpp b/src/VBox/Runtime/tools/RTManifest.cpp
index 828204d..c446518 100644
--- a/src/VBox/Runtime/tools/RTManifest.cpp
+++ b/src/VBox/Runtime/tools/RTManifest.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/tools/RTNtDbgHelp.cpp b/src/VBox/Runtime/tools/RTNtDbgHelp.cpp
index a7030df..fccd902 100644
--- a/src/VBox/Runtime/tools/RTNtDbgHelp.cpp
+++ b/src/VBox/Runtime/tools/RTNtDbgHelp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -358,7 +358,7 @@ int main(int argc, char **argv)
 
 
             case 'V':
-                RTPrintf("$Revision: 94014 $");
+                RTPrintf("$Revision: 100874 $");
                 break;
 
             case 'h':
diff --git a/src/VBox/Runtime/tools/RTRm.cpp b/src/VBox/Runtime/tools/RTRm.cpp
index 3ae187f..8a2fb50 100644
--- a/src/VBox/Runtime/tools/RTRm.cpp
+++ b/src/VBox/Runtime/tools/RTRm.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/tools/RTShutdown.cpp b/src/VBox/Runtime/tools/RTShutdown.cpp
index 2addc44..fb84b6a 100644
--- a/src/VBox/Runtime/tools/RTShutdown.cpp
+++ b/src/VBox/Runtime/tools/RTShutdown.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/tools/RTSignTool.cpp b/src/VBox/Runtime/tools/RTSignTool.cpp
index 51554b9..a82284e 100644
--- a/src/VBox/Runtime/tools/RTSignTool.cpp
+++ b/src/VBox/Runtime/tools/RTSignTool.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/tools/RTTar.cpp b/src/VBox/Runtime/tools/RTTar.cpp
index 784dfe9..2e7ae5c 100644
--- a/src/VBox/Runtime/tools/RTTar.cpp
+++ b/src/VBox/Runtime/tools/RTTar.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/tools/RTUnzip.cpp b/src/VBox/Runtime/tools/RTUnzip.cpp
index b420246..9b8ab03 100644
--- a/src/VBox/Runtime/tools/RTUnzip.cpp
+++ b/src/VBox/Runtime/tools/RTUnzip.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp b/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp
index 8b095ca..5f7da88 100644
--- a/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp
+++ b/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicBitClear.asm b/src/VBox/Runtime/win/amd64/ASMAtomicBitClear.asm
index 4cba389..f7b0409 100644
--- a/src/VBox/Runtime/win/amd64/ASMAtomicBitClear.asm
+++ b/src/VBox/Runtime/win/amd64/ASMAtomicBitClear.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicBitTestAndToggle.asm b/src/VBox/Runtime/win/amd64/ASMAtomicBitTestAndToggle.asm
index c84ccd3..2b90d8a 100644
--- a/src/VBox/Runtime/win/amd64/ASMAtomicBitTestAndToggle.asm
+++ b/src/VBox/Runtime/win/amd64/ASMAtomicBitTestAndToggle.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicBitToggle.asm b/src/VBox/Runtime/win/amd64/ASMAtomicBitToggle.asm
index 21790e0..dc264ba 100644
--- a/src/VBox/Runtime/win/amd64/ASMAtomicBitToggle.asm
+++ b/src/VBox/Runtime/win/amd64/ASMAtomicBitToggle.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicReadU64.asm b/src/VBox/Runtime/win/amd64/ASMAtomicReadU64.asm
index b201285..e6e29ef 100644
--- a/src/VBox/Runtime/win/amd64/ASMAtomicReadU64.asm
+++ b/src/VBox/Runtime/win/amd64/ASMAtomicReadU64.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicXchgU16.asm b/src/VBox/Runtime/win/amd64/ASMAtomicXchgU16.asm
index d4e85be..e6b718c 100644
--- a/src/VBox/Runtime/win/amd64/ASMAtomicXchgU16.asm
+++ b/src/VBox/Runtime/win/amd64/ASMAtomicXchgU16.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicXchgU8.asm b/src/VBox/Runtime/win/amd64/ASMAtomicXchgU8.asm
index a7abc34..5569b23 100644
--- a/src/VBox/Runtime/win/amd64/ASMAtomicXchgU8.asm
+++ b/src/VBox/Runtime/win/amd64/ASMAtomicXchgU8.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMBitFirstClear.asm b/src/VBox/Runtime/win/amd64/ASMBitFirstClear.asm
index acff245..ffcd943 100644
--- a/src/VBox/Runtime/win/amd64/ASMBitFirstClear.asm
+++ b/src/VBox/Runtime/win/amd64/ASMBitFirstClear.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMBitFirstSet.asm b/src/VBox/Runtime/win/amd64/ASMBitFirstSet.asm
index 4d48d2e..387f482 100644
--- a/src/VBox/Runtime/win/amd64/ASMBitFirstSet.asm
+++ b/src/VBox/Runtime/win/amd64/ASMBitFirstSet.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetCS.asm b/src/VBox/Runtime/win/amd64/ASMGetCS.asm
index b07e9e2..dfae090 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetCS.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetCS.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR0.asm b/src/VBox/Runtime/win/amd64/ASMGetDR0.asm
index 9fdd308..f8f84b3 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetDR0.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetDR0.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR1.asm b/src/VBox/Runtime/win/amd64/ASMGetDR1.asm
index 7c4d091..1245deb 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetDR1.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetDR1.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR2.asm b/src/VBox/Runtime/win/amd64/ASMGetDR2.asm
index be74bff..ce1899e 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetDR2.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetDR2.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR3.asm b/src/VBox/Runtime/win/amd64/ASMGetDR3.asm
index 68f3788..a480938 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetDR3.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetDR3.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR6.asm b/src/VBox/Runtime/win/amd64/ASMGetDR6.asm
index 7125ff0..c78bd94 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetDR6.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetDR6.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR7.asm b/src/VBox/Runtime/win/amd64/ASMGetDR7.asm
index b97eceb..d85ac5b 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetDR7.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetDR7.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetDS.asm b/src/VBox/Runtime/win/amd64/ASMGetDS.asm
index 3c155fc..e9a2171 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetDS.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetDS.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetES.asm b/src/VBox/Runtime/win/amd64/ASMGetES.asm
index a13dc06..fbef691 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetES.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetES.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetFS.asm b/src/VBox/Runtime/win/amd64/ASMGetFS.asm
index 107b9cc..b35b3b2 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetFS.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetFS.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetFlags.asm b/src/VBox/Runtime/win/amd64/ASMGetFlags.asm
index 6a2790d..896e492 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetFlags.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetFlags.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetGS.asm b/src/VBox/Runtime/win/amd64/ASMGetGS.asm
index ea50571..46b211d 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetGS.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetGS.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMGetSS.asm b/src/VBox/Runtime/win/amd64/ASMGetSS.asm
index 206e35c..d990c2b 100644
--- a/src/VBox/Runtime/win/amd64/ASMGetSS.asm
+++ b/src/VBox/Runtime/win/amd64/ASMGetSS.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMProbeReadByte.asm b/src/VBox/Runtime/win/amd64/ASMProbeReadByte.asm
index bfc6a53..f5e5730 100644
--- a/src/VBox/Runtime/win/amd64/ASMProbeReadByte.asm
+++ b/src/VBox/Runtime/win/amd64/ASMProbeReadByte.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/amd64/ASMSetFlags.asm b/src/VBox/Runtime/win/amd64/ASMSetFlags.asm
index 8744def..74941bf 100644
--- a/src/VBox/Runtime/win/amd64/ASMSetFlags.asm
+++ b/src/VBox/Runtime/win/amd64/ASMSetFlags.asm
@@ -3,7 +3,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/win/errmsgwin.cpp b/src/VBox/Runtime/win/errmsgwin.cpp
index ee85d13..bf749f8 100644
--- a/src/VBox/Runtime/win/errmsgwin.cpp
+++ b/src/VBox/Runtime/win/errmsgwin.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Storage/Debug/Makefile.kmk b/src/VBox/Storage/Debug/Makefile.kmk
index 8747eb0..8c9453c 100644
--- a/src/VBox/Storage/Debug/Makefile.kmk
+++ b/src/VBox/Storage/Debug/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Storage/ISCSI.cpp b/src/VBox/Storage/ISCSI.cpp
index d31608c..f340b6b 100644
--- a/src/VBox/Storage/ISCSI.cpp
+++ b/src/VBox/Storage/ISCSI.cpp
@@ -4744,7 +4744,6 @@ static int iscsiRead(void *pBackendData, uint64_t uOffset, size_t cbToRead,
         pReq->cI2TSegs      = 0;
         pReq->cbT2IData     = cbToRead;
         pReq->paT2ISegs     = &pReq->aSegs[pReq->cI2TSegs];
-        pReq->cT2ISegs      = pReq->cT2ISegs;
         pReq->cbSense       = sizeof(pReq->abSense);
         pReq->cT2ISegs      = cT2ISegs;
         pReq->pIoCtx        = pIoCtx;
diff --git a/src/VBox/Storage/Makefile.kmk b/src/VBox/Storage/Makefile.kmk
index 4527ce1..ab3522b 100644
--- a/src/VBox/Storage/Makefile.kmk
+++ b/src/VBox/Storage/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Storage/VCICache.cpp b/src/VBox/Storage/VCICache.cpp
index 1c58c75..dd22fd0 100644
--- a/src/VBox/Storage/VCICache.cpp
+++ b/src/VBox/Storage/VCICache.cpp
@@ -671,7 +671,7 @@ static int vciBlkMapLoad(PVCICACHE pStorage, uint64_t offBlkMap, uint32_t cBlkMa
             else
                 rc = VERR_VD_GEN_INVALID_HEADER;
         }
-        else if (RT_SUCCESS(rc))
+        else
             rc = VERR_VD_GEN_INVALID_HEADER;
     }
     else
diff --git a/src/VBox/Storage/VMDK.cpp b/src/VBox/Storage/VMDK.cpp
index c60dfff..502ec2f 100644
--- a/src/VBox/Storage/VMDK.cpp
+++ b/src/VBox/Storage/VMDK.cpp
@@ -2894,10 +2894,11 @@ static int vmdkFreeExtentData(PVMDKIMAGE pImage, PVMDKEXTENT pExtent,
     if (pExtent->pFile != NULL)
     {
         /* Do not delete raw extents, these have full and base names equal. */
-        rc =vmdkFileClose(pImage, &pExtent->pFile,
-                             fDelete
-                          && pExtent->pszFullname
-                          && strcmp(pExtent->pszFullname, pExtent->pszBasename));
+        rc = vmdkFileClose(pImage, &pExtent->pFile,
+                              fDelete
+                           && pExtent->pszFullname
+                           && pExtent->pszBasename
+                           && strcmp(pExtent->pszFullname, pExtent->pszBasename));
     }
     if (pExtent->pszBasename)
     {
@@ -6302,19 +6303,21 @@ static int vmdkSetComment(void *pBackendData, const char *pszComment)
 
     AssertPtr(pImage);
 
-    if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
-    {
-        rc = VERR_VD_IMAGE_READ_ONLY;
-        goto out;
-    }
-    if (pImage->uOpenFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
+    if (pImage)
     {
-        rc = VERR_NOT_SUPPORTED;
-        goto out;
-    }
+        if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
+        {
+            rc = VERR_VD_IMAGE_READ_ONLY;
+            goto out;
+        }
+        if (pImage->uOpenFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
+        {
+            rc = VERR_NOT_SUPPORTED;
+            goto out;
+        }
 
-    if (pImage)
         rc = vmdkSetImageComment(pImage, pszComment);
+    }
     else
         rc = VERR_VD_NOT_OPENED;
 
diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk
index 6aeeca8..5ebc364 100644
--- a/src/VBox/Storage/testcase/Makefile.kmk
+++ b/src/VBox/Storage/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Storage/testcase/tstVDIo.cpp b/src/VBox/Storage/testcase/tstVDIo.cpp
index a992798..67e2bc1 100644
--- a/src/VBox/Storage/testcase/tstVDIo.cpp
+++ b/src/VBox/Storage/testcase/tstVDIo.cpp
@@ -667,6 +667,41 @@ static DECLCALLBACK(int) vdScriptHandlerOpen(PVDSCRIPTARG paScriptArgs, void *pv
     return rc;
 }
 
+/**
+ * Returns the speed in KB/s from the amount of and the time in nanoseconds it
+ * took to complete the test.
+ *
+ * @returns Speed in KB/s
+ * @param   cbIo     Size of the I/O test
+ * @param   tsNano   Time in nanoseconds it took to complete the test.
+ */
+static uint64_t tstVDIoGetSpeedKBs(uint64_t cbIo, uint64_t tsNano)
+{
+    /* Seen on one of the testboxes, avoid division by 0 below. */
+    if (tsNano == 0)
+        return 0;
+
+    /*
+     * Blow up the value until we can do the calculation without getting 0 as
+     * a result.
+     */
+    uint64_t cbIoTemp = cbIo;
+    uint64_t uSpeedKBs;
+    unsigned cRounds = 0;
+    while (cbIoTemp < tsNano)
+    {
+        cbIoTemp *= 1000;
+        cRounds++;
+    }
+
+    uSpeedKBs = ((cbIoTemp / tsNano) * RT_NS_1SEC) / 1024;
+
+    while (cRounds-- > 0)
+        uSpeedKBs /= 1000;
+
+    return uSpeedKBs;
+}
+
 static DECLCALLBACK(int) vdScriptHandlerIo(PVDSCRIPTARG paScriptArgs, void *pvUser)
 {
     int rc = VINF_SUCCESS;
@@ -954,7 +989,7 @@ static DECLCALLBACK(int) vdScriptHandlerIo(PVDSCRIPTARG paScriptArgs, void *pvUs
                 }
 
                 NanoTS = RTTimeNanoTS() - NanoTS;
-                uint64_t SpeedKBs = (uint64_t)(cbIo / (NanoTS / 1000000000.0) / 1024);
+                uint64_t SpeedKBs = tstVDIoGetSpeedKBs(cbIo, NanoTS);
                 RTTestValue(pGlob->hTest, "Throughput", SpeedKBs, RTTESTUNIT_KILOBYTES_PER_SEC);
 
                 for (unsigned i = 0; i < cMaxTasksOutstanding; i++)
diff --git a/src/VBox/VMM/Docs-CodingGuidelines.cpp b/src/VBox/VMM/Docs-CodingGuidelines.cpp
index f458048..bd6fad5 100644
--- a/src/VBox/VMM/Docs-CodingGuidelines.cpp
+++ b/src/VBox/VMM/Docs-CodingGuidelines.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/Docs-RawMode.cpp b/src/VBox/VMM/Docs-RawMode.cpp
index 9b60d27..8df7f74 100644
--- a/src/VBox/VMM/Docs-RawMode.cpp
+++ b/src/VBox/VMM/Docs-RawMode.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/Makefile.kmk b/src/VBox/VMM/Makefile.kmk
index 5d6f527..1bd9f94 100644
--- a/src/VBox/VMM/Makefile.kmk
+++ b/src/VBox/VMM/Makefile.kmk
@@ -35,6 +35,9 @@ VMM_COMMON_DEFS ?= VBOX_IN_VMM
 ifdef VBOX_WITH_2ND_IEM_STEP
  VMM_COMMON_DEFS += VBOX_WITH_2ND_IEM_STEP
 endif
+ifdef VBOX_WITH_3RD_IEM_STEP
+ VMM_COMMON_DEFS += VBOX_WITH_3RD_IEM_STEP
+endif
 #ifdef VBOX_WITH_IEM
 # VMM_COMMON_DEFS += VBOX_WITH_IEM
 #endif
@@ -408,12 +411,11 @@ endif
 
 if defined(VBOX_WITH_RAW_MODE) && !defined(VBOX_ONLY_EXTPACKS)
  #
- # VMMRC.gc
+ # VMMRC.rc
  #
  SYSMODS += VMMRC
  VMMRC_TEMPLATE  = VBoxRc
- VMMRC_NAME      = VMMGC
- VMMRC_SYSSUFF   = .gc
+ VMMRC_NAME      = VMMRC
 
  VMMRC_DEFS      = IN_VMM_RC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE VBOX_WITH_RAW_MODE_NOT_R0 IN_SUP_RC \
  	$(VMM_COMMON_DEFS)
diff --git a/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp b/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp
index c507169..71901dc 100644
--- a/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp
+++ b/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013-201 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/CSAMAll.cpp b/src/VBox/VMM/VMMAll/CSAMAll.cpp
index 0892ce7..a0f7e87 100644
--- a/src/VBox/VMM/VMMAll/CSAMAll.cpp
+++ b/src/VBox/VMM/VMMAll/CSAMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -69,15 +69,13 @@
  * @param   cbBuf           How much it's reading/writing.
  * @param   enmAccessType   The access type.
  * @param   enmOrigin       Who is making this write.
- * @param   pvUser          User argument.
+ * @param   pvUser          The CSAMPAGEREC in ring-3, NIL in RC.
  */
 PGM_ALL_CB2_DECL(VBOXSTRICTRC)
 csamCodePageWriteHandler(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, void *pvPtr, void *pvBuf, size_t cbBuf,
                          PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser)
 {
-    RTGCPTR const GCPtrMonitored = (uintptr_t)pvUser | (GCPtr & PAGE_OFFSET_MASK);
     Log(("csamCodePageWriteHandler: write to %RGv LB %zu\n", GCPtr, cbBuf));
-
     Assert(enmAccessType == PGMACCESSTYPE_WRITE); NOREF(enmAccessType);
     Assert(VMCPU_IS_EMT(pVCpu));
 
@@ -95,7 +93,7 @@ csamCodePageWriteHandler(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, void *pvPtr, void
     /*
      * Ring-3: Do proper handling.
      */
-    int rc = PATMR3PatchWrite(pVM, GCPtrMonitored, (uint32_t)cbBuf);
+    int rc = PATMR3PatchWrite(pVM, GCPtr, (uint32_t)cbBuf);
     AssertRC(rc);
     return VINF_PGM_HANDLER_DO_DEFAULT;
 
@@ -127,7 +125,7 @@ csamCodePageWriteHandler(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, void *pvPtr, void
         return VINF_PGM_HANDLER_DO_DEFAULT;
     }
 
-    Log(("csamRCCodePageWriteHandler: code page write at %RGv original address %RGv (cpl=%d)\n", GCPtr, GCPtrMonitored, cpl));
+    Log(("csamRCCodePageWriteHandler: code page write at %RGv (cpl=%d)\n", GCPtr, cpl));
 
     /*
      * If user code is modifying one of our monitored pages, then we can safely
@@ -135,8 +133,7 @@ csamCodePageWriteHandler(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, void *pvPtr, void
      */
     if (cpl != 3)
     {
-        VBOXSTRICTRC rcStrict = PATMRCHandleWriteToPatchPage(pVM, NULL /* pRegFrame = no interpret */,
-                                                             (RTRCPTR)GCPtrMonitored, cbBuf);
+        VBOXSTRICTRC rcStrict = PATMRCHandleWriteToPatchPage(pVM, NULL /* pRegFrame = no interpret */, (RTRCPTR)GCPtr, cbBuf);
         if (   rcStrict == VINF_PGM_HANDLER_DO_DEFAULT
             || rcStrict == VINF_SUCCESS)
             return rcStrict;
@@ -154,7 +151,7 @@ csamCodePageWriteHandler(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, void *pvPtr, void
      * take down both alternatives.
      */
     VMCPU_FF_SET(pVCpu, VMCPU_FF_CSAM_PENDING_ACTION);
-    pVM->csam.s.pvDirtyBasePage[pVM->csam.s.cDirtyPages]  = (RTRCPTR)GCPtrMonitored;
+    pVM->csam.s.pvDirtyBasePage[pVM->csam.s.cDirtyPages]  = (RTRCPTR)GCPtr;
     pVM->csam.s.pvDirtyFaultPage[pVM->csam.s.cDirtyPages] = (RTRCPTR)GCPtr;
     if (++pVM->csam.s.cDirtyPages == CSAM_MAX_DIRTY_PAGES)
         return VINF_CSAM_PENDING_ACTION;
@@ -162,7 +159,7 @@ csamCodePageWriteHandler(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, void *pvPtr, void
     /*
      * Continue with the write. The VM_FF_CSAM_FLUSH_DIRTY_PAGE handler will reset it to readonly again.
      */
-    Log(("csamRCCodePageWriteHandler: enabled r/w for page %RGv (%RGv)\n", GCPtr, GCPtrMonitored));
+    Log(("csamRCCodePageWriteHandler: enabled r/w for page %RGv (%RGv)\n", GCPtr, GCPtr));
     STAM_COUNTER_INC(&pVM->csam.s.StatCodePageModified);
     return VINF_PGM_HANDLER_DO_DEFAULT;
 #endif
diff --git a/src/VBox/VMM/VMMAll/DBGFAll.cpp b/src/VBox/VMM/VMMAll/DBGFAll.cpp
index e2881a0..d5a1fa1 100644
--- a/src/VBox/VMM/VMMAll/DBGFAll.cpp
+++ b/src/VBox/VMM/VMMAll/DBGFAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/EMAll.cpp b/src/VBox/VMM/VMMAll/EMAll.cpp
index 860b260..c6685fc 100644
--- a/src/VBox/VMM/VMMAll/EMAll.cpp
+++ b/src/VBox/VMM/VMMAll/EMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/EMAllA.asm b/src/VBox/VMM/VMMAll/EMAllA.asm
index 46c9d3f..05744be 100644
--- a/src/VBox/VMM/VMMAll/EMAllA.asm
+++ b/src/VBox/VMM/VMMAll/EMAllA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2011 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/FTMAll.cpp b/src/VBox/VMM/VMMAll/FTMAll.cpp
index 0712804..a286434 100644
--- a/src/VBox/VMM/VMMAll/FTMAll.cpp
+++ b/src/VBox/VMM/VMMAll/FTMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/HMAll.cpp b/src/VBox/VMM/VMMAll/HMAll.cpp
index 10cb425..572b407 100644
--- a/src/VBox/VMM/VMMAll/HMAll.cpp
+++ b/src/VBox/VMM/VMMAll/HMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/IEMAll.cpp b/src/VBox/VMM/VMMAll/IEMAll.cpp
index 3034491..878ac80 100644
--- a/src/VBox/VMM/VMMAll/IEMAll.cpp
+++ b/src/VBox/VMM/VMMAll/IEMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -768,6 +768,9 @@ DECLINLINE(void) iemInitExec(PIEMCPU pIemCpu, bool fBypassHandlers)
     PCPUMCTX pCtx  = pIemCpu->CTX_SUFF(pCtx);
     PVMCPU   pVCpu = IEMCPU_TO_VMCPU(pIemCpu);
 
+    Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_IEM));
+    Assert(pIemCpu->PendingCommit.enmFn == IEMCOMMIT_INVALID);
+
 #if defined(VBOX_STRICT) && (defined(IEM_VERIFICATION_MODE_FULL) || !defined(VBOX_WITH_RAW_MODE_NOT_R0))
     Assert(CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, &pCtx->cs));
     Assert(CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, &pCtx->ss));
@@ -829,6 +832,9 @@ DECLINLINE(void) iemInitDecoder(PIEMCPU pIemCpu, bool fBypassHandlers)
     PCPUMCTX pCtx  = pIemCpu->CTX_SUFF(pCtx);
     PVMCPU   pVCpu = IEMCPU_TO_VMCPU(pIemCpu);
 
+    Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_IEM));
+    Assert(pIemCpu->PendingCommit.enmFn == IEMCOMMIT_INVALID);
+
 #if defined(VBOX_STRICT) && (defined(IEM_VERIFICATION_MODE_FULL) || !defined(VBOX_WITH_RAW_MODE_NOT_R0))
     Assert(CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, &pCtx->cs));
     Assert(CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, &pCtx->ss));
@@ -2143,7 +2149,7 @@ IEM_STATIC VBOXSTRICTRC iemRaiseLoadStackFromTss32Or16(PIEMCPU pIemCpu, PCCPUMCT
         }
 
         default:
-            AssertFailedReturn(VERR_INTERNAL_ERROR_2);
+            AssertFailedReturn(VERR_IEM_IPE_4);
     }
     return rcStrict;
 }
@@ -2165,7 +2171,7 @@ IEM_STATIC VBOXSTRICTRC iemRaiseLoadStackFromTss64(PIEMCPU pIemCpu, PCCPUMCTX pC
     Assert(uIst < 8);
     *puRsp  = 0; /* make gcc happy */
 
-    AssertReturn(pCtx->tr.Attr.n.u4Type == AMD64_SEL_TYPE_SYS_TSS_BUSY, VERR_INTERNAL_ERROR_2);
+    AssertReturn(pCtx->tr.Attr.n.u4Type == AMD64_SEL_TYPE_SYS_TSS_BUSY, VERR_IEM_IPE_5);
 
     uint32_t off;
     if (uIst)
@@ -2222,7 +2228,7 @@ iemRaiseXcptOrIntInRealMode(PIEMCPU     pIemCpu,
                             uint16_t    uErr,
                             uint64_t    uCr2)
 {
-    AssertReturn(pIemCpu->enmCpuMode == IEMMODE_16BIT, VERR_INTERNAL_ERROR_3);
+    AssertReturn(pIemCpu->enmCpuMode == IEMMODE_16BIT, VERR_IEM_IPE_6);
     NOREF(uErr); NOREF(uCr2);
 
     /*
@@ -4900,14 +4906,11 @@ IEM_STATIC void iemRegAddToRipAndClearRF(PIEMCPU pIemCpu, uint8_t cbInstr)
 
     pCtx->eflags.Bits.u1RF = 0;
 
+    /* NB: Must be kept in sync with HM (xxxAdvanceGuestRip). */
     switch (pIemCpu->enmCpuMode)
     {
+        /** @todo investigate if EIP or RIP is really incremented. */
         case IEMMODE_16BIT:
-            Assert(pCtx->rip <= UINT16_MAX);
-            pCtx->eip += cbInstr;
-            pCtx->eip &= UINT32_C(0xffff);
-            break;
-
         case IEMMODE_32BIT:
             pCtx->eip += cbInstr;
             Assert(pCtx->rip <= UINT32_MAX);
@@ -6234,7 +6237,7 @@ iemMemApplySegment(PIEMCPU pIemCpu, uint32_t fAccess, uint8_t iSegReg, size_t cb
             return VINF_SUCCESS;
 
         default:
-            AssertFailedReturn(VERR_INTERNAL_ERROR_5);
+            AssertFailedReturn(VERR_IEM_IPE_7);
     }
 }
 
@@ -6828,7 +6831,7 @@ IEM_STATIC VBOXSTRICTRC iemMemBounceBufferMapPhys(PIEMCPU pIemCpu, unsigned iMem
         && rcMap != VERR_PGM_PHYS_TLB_CATCH_ALL
         && rcMap != VERR_PGM_PHYS_TLB_UNASSIGNED)
     {
-        AssertReturn(RT_FAILURE_NP(rcMap), VERR_INTERNAL_ERROR_3);
+        AssertReturn(RT_FAILURE_NP(rcMap), VERR_IEM_IPE_8);
         return rcMap;
     }
     pIemCpu->cPotentialExits++;
@@ -6964,7 +6967,11 @@ iemMemMap(PIEMCPU pIemCpu, void **ppvMem, size_t cbMem, uint8_t iSegReg, RTGCPTR
         || pIemCpu->aMemMappings[iMemMap].fAccess != IEM_ACCESS_INVALID)
     {
         iMemMap = iemMemMapFindFree(pIemCpu);
-        AssertReturn(iMemMap < RT_ELEMENTS(pIemCpu->aMemMappings), VERR_INTERNAL_ERROR_3);
+        AssertLogRelMsgReturn(iMemMap < RT_ELEMENTS(pIemCpu->aMemMappings),
+                              ("active=%d fAccess[0] = {%#x, %#x, %#x}\n", pIemCpu->cActiveMappings,
+                               pIemCpu->aMemMappings[0].fAccess, pIemCpu->aMemMappings[1].fAccess,
+                               pIemCpu->aMemMappings[2].fAccess),
+                              VERR_IEM_IPE_9);
     }
 
     /*
@@ -9438,7 +9445,7 @@ IEM_STATIC VBOXSTRICTRC iemOpHlpCalcRmEffAddr(PIEMCPU pIemCpu, uint8_t bRm, uint
                     case 0:  u16EffAddr = 0;                             break;
                     case 1:  IEM_OPCODE_GET_NEXT_S8_SX_U16(&u16EffAddr); break;
                     case 2:  IEM_OPCODE_GET_NEXT_U16(&u16EffAddr);       break;
-                    default: AssertFailedReturn(VERR_INTERNAL_ERROR_2); /* (caller checked for these) */
+                    default: AssertFailedReturn(VERR_IEM_IPE_1); /* (caller checked for these) */
                 }
 
                 /* Add the base and index registers to the disp. */
@@ -9544,7 +9551,7 @@ IEM_STATIC VBOXSTRICTRC iemOpHlpCalcRmEffAddr(PIEMCPU pIemCpu, uint8_t bRm, uint
                         break;
                     }
                     default:
-                        AssertFailedReturn(VERR_INTERNAL_ERROR_2); /* (caller checked for these) */
+                        AssertFailedReturn(VERR_IEM_IPE_2); /* (caller checked for these) */
                 }
 
             }
@@ -9997,13 +10004,13 @@ VMM_INT_DECL(void)   IEMNotifyIOPortWrite(PVM pVM, RTIOPORT Port, uint32_t u32Va
 }
 
 
-VMM_INT_DECL(void)   IEMNotifyIOPortReadString(PVM pVM, RTIOPORT Port, RTGCPTR GCPtrDst, RTGCUINTREG cTransfers, size_t cbValue)
+VMM_INT_DECL(void)   IEMNotifyIOPortReadString(PVM pVM, RTIOPORT Port, void *pvDst, RTGCUINTREG cTransfers, size_t cbValue)
 {
     AssertFailed();
 }
 
 
-VMM_INT_DECL(void)   IEMNotifyIOPortWriteString(PVM pVM, RTIOPORT Port, RTGCPTR GCPtrSrc, RTGCUINTREG cTransfers, size_t cbValue)
+VMM_INT_DECL(void)   IEMNotifyIOPortWriteString(PVM pVM, RTIOPORT Port, void const *pvSrc, RTGCUINTREG cTransfers, size_t cbValue)
 {
     AssertFailed();
 }
@@ -10714,6 +10721,8 @@ DECL_FORCE_INLINE(VBOXSTRICTRC) iemExecStatusCodeFiddling(PIEMCPU pIemCpu, VBOXS
                       || rcStrict == VINF_CPUM_R3_MSR_READ
                       || rcStrict == VINF_CPUM_R3_MSR_WRITE
                       || rcStrict == VINF_EM_RAW_EMULATE_INSTR
+                      || rcStrict == VINF_EM_RAW_TO_R3
+                      || rcStrict == VINF_EM_RAW_EMULATE_IO_BLOCK
                       /* raw-mode / virt handlers only: */
                       || rcStrict == VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT
                       || rcStrict == VINF_EM_RAW_EMULATE_INSTR_TSS_FAULT
@@ -11554,3 +11563,88 @@ VMM_INT_DECL(VBOXSTRICTRC) IEMExecDecodedXsetbv(PVMCPU pVCpu, uint8_t cbInstr)
     return iemExecStatusCodeFiddling(pIemCpu, rcStrict);
 }
 
+#ifdef IN_RING3
+
+/**
+ * Called by force-flag handling code when VMCPU_FF_IEM is set.
+ *
+ * @returns Merge between @a rcStrict and what the commit operation returned.
+ * @param   pVCpu           Pointer to the cross context CPU structure for the
+ *                          calling EMT.
+ * @param   rcStrict        The status code returned by ring-0 or raw-mode.
+ */
+VMMR3_INT_DECL(VBOXSTRICTRC) IEMR3DoPendingAction(PVMCPU pVCpu, VBOXSTRICTRC rcStrict)
+{
+    PIEMCPU      pIemCpu = &pVCpu->iem.s;
+
+    /*
+     * Retrieve and reset the pending commit.
+     */
+    IEMCOMMIT const enmFn = pIemCpu->PendingCommit.enmFn;
+    pIemCpu->PendingCommit.enmFn = IEMCOMMIT_INVALID;
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_IEM);
+
+    /*
+     * Must reset pass-up status code.
+     */
+    pIemCpu->rcPassUp = VINF_SUCCESS;
+
+    /*
+     * Call the function.  Currently using switch here instead of function
+     * pointer table as a switch won't get skewed.
+     */
+    VBOXSTRICTRC rcStrictCommit;
+    switch (enmFn)
+    {
+        case IEMCOMMIT_INS_OP8_ADDR16:          rcStrictCommit = iemR3CImpl_commit_ins_op8_addr16(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_INS_OP8_ADDR32:          rcStrictCommit = iemR3CImpl_commit_ins_op8_addr32(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_INS_OP8_ADDR64:          rcStrictCommit = iemR3CImpl_commit_ins_op8_addr64(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_INS_OP16_ADDR16:         rcStrictCommit = iemR3CImpl_commit_ins_op16_addr16(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_INS_OP16_ADDR32:         rcStrictCommit = iemR3CImpl_commit_ins_op16_addr32(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_INS_OP16_ADDR64:         rcStrictCommit = iemR3CImpl_commit_ins_op16_addr64(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_INS_OP32_ADDR16:         rcStrictCommit = iemR3CImpl_commit_ins_op32_addr16(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_INS_OP32_ADDR32:         rcStrictCommit = iemR3CImpl_commit_ins_op32_addr32(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_INS_OP32_ADDR64:         rcStrictCommit = iemR3CImpl_commit_ins_op32_addr64(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_REP_INS_OP8_ADDR16:      rcStrictCommit = iemR3CImpl_commit_rep_ins_op8_addr16(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_REP_INS_OP8_ADDR32:      rcStrictCommit = iemR3CImpl_commit_rep_ins_op8_addr32(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_REP_INS_OP8_ADDR64:      rcStrictCommit = iemR3CImpl_commit_rep_ins_op8_addr64(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_REP_INS_OP16_ADDR16:     rcStrictCommit = iemR3CImpl_commit_rep_ins_op16_addr16(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_REP_INS_OP16_ADDR32:     rcStrictCommit = iemR3CImpl_commit_rep_ins_op16_addr32(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_REP_INS_OP16_ADDR64:     rcStrictCommit = iemR3CImpl_commit_rep_ins_op16_addr64(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_REP_INS_OP32_ADDR16:     rcStrictCommit = iemR3CImpl_commit_rep_ins_op32_addr16(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_REP_INS_OP32_ADDR32:     rcStrictCommit = iemR3CImpl_commit_rep_ins_op32_addr32(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        case IEMCOMMIT_REP_INS_OP32_ADDR64:     rcStrictCommit = iemR3CImpl_commit_rep_ins_op32_addr64(pIemCpu, pIemCpu->PendingCommit.cbInstr); break;
+        default:
+            AssertLogRelMsgFailedReturn(("enmFn=%#x (%d)\n", pIemCpu->PendingCommit.enmFn, pIemCpu->PendingCommit.enmFn), VERR_IEM_IPE_2);
+    }
+
+    /*
+     * Merge status code (if any) with the incomming one.
+     */
+    rcStrictCommit = iemExecStatusCodeFiddling(pIemCpu, rcStrictCommit);
+    if (RT_LIKELY(rcStrictCommit == VINF_SUCCESS))
+        return rcStrict;
+    if (RT_LIKELY(rcStrict == VINF_SUCCESS || rcStrict == VINF_EM_RAW_TO_R3))
+        return rcStrictCommit;
+
+    /* Complicated. */
+    if (RT_FAILURE(rcStrict))
+        return rcStrict;
+    if (RT_FAILURE(rcStrictCommit))
+        return rcStrictCommit;
+    if (   rcStrict >= VINF_EM_FIRST
+        && rcStrict <= VINF_EM_LAST)
+    {
+        if (   rcStrictCommit >= VINF_EM_FIRST
+            && rcStrictCommit <= VINF_EM_LAST)
+            return rcStrict < rcStrictCommit ? rcStrict : rcStrictCommit;
+
+        /* This really shouldn't happen. Check PGM + handler code! */
+        AssertLogRelMsgFailedReturn(("rcStrictCommit=%Rrc rcStrict=%Rrc enmFn=%d\n", VBOXSTRICTRC_VAL(rcStrictCommit), VBOXSTRICTRC_VAL(rcStrict), enmFn), VERR_IEM_IPE_1);
+    }
+    /* This shouldn't really happen either, see IOM_SUCCESS. */
+    AssertLogRelMsgFailedReturn(("rcStrictCommit=%Rrc rcStrict=%Rrc enmFn=%d\n", VBOXSTRICTRC_VAL(rcStrictCommit), VBOXSTRICTRC_VAL(rcStrict), enmFn), VERR_IEM_IPE_2);
+}
+
+#endif /* IN_RING */
+
diff --git a/src/VBox/VMM/VMMAll/IEMAllAImpl.asm b/src/VBox/VMM/VMMAll/IEMAllAImpl.asm
index fc0ea98..6fe5930 100644
--- a/src/VBox/VMM/VMMAll/IEMAllAImpl.asm
+++ b/src/VBox/VMM/VMMAll/IEMAllAImpl.asm
@@ -3,7 +3,7 @@
 ; IEM - Instruction Implementation in Assembly.
 ;
 
-; Copyright (C) 2011-2012 Oracle Corporation
+; Copyright (C) 2011-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/IEMAllAImplC.cpp b/src/VBox/VMM/VMMAll/IEMAllAImplC.cpp
index 1391f68..503252d 100644
--- a/src/VBox/VMM/VMMAll/IEMAllAImplC.cpp
+++ b/src/VBox/VMM/VMMAll/IEMAllAImplC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h b/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h
index c22ee08..256c0d9 100644
--- a/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h
+++ b/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -5287,7 +5287,7 @@ IEM_CIMPL_DEF_2(iemCImpl_mov_Dd_Rd, uint8_t, iDrReg, uint8_t, iGReg)
     if (!IEM_VERIFICATION_ENABLED(pIemCpu))
     {
         int rc = CPUMSetGuestDRx(IEMCPU_TO_VMCPU(pIemCpu), iDrReg, uNewDrX);
-        AssertRCSuccessReturn(rc, RT_SUCCESS_NP(rc) ? VERR_INTERNAL_ERROR : rc);
+        AssertRCSuccessReturn(rc, RT_SUCCESS_NP(rc) ? VERR_IEM_IPE_1 : rc);
     }
     else
         pCtx->dr[iDrReg] = uNewDrX;
@@ -5442,7 +5442,7 @@ IEM_CIMPL_DEF_0(iemCImpl_wrmsr)
         *pCtx = *pCtx2;
         *pCtx2 = CtxTmp;
 #else
-        AssertReleaseFailedReturn(VERR_INTERNAL_ERROR_4);
+        AssertReleaseFailedReturn(VERR_IEM_IPE_2);
 #endif
     }
     if (rcStrict == VINF_SUCCESS)
@@ -5503,7 +5503,7 @@ IEM_CIMPL_DEF_2(iemCImpl_in, uint16_t, u16Port, uint8_t, cbReg)
             case 1: pCtx->al  = (uint8_t)u32Value;  break;
             case 2: pCtx->ax  = (uint16_t)u32Value; break;
             case 4: pCtx->rax = u32Value;           break;
-            default: AssertFailedReturn(VERR_INTERNAL_ERROR_3);
+            default: AssertFailedReturn(VERR_IEM_IPE_3);
         }
         iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
         pIemCpu->cPotentialExits++;
@@ -5567,7 +5567,7 @@ IEM_CIMPL_DEF_2(iemCImpl_out, uint16_t, u16Port, uint8_t, cbReg)
         case 1: u32Value = pCtx->al;  break;
         case 2: u32Value = pCtx->ax;  break;
         case 4: u32Value = pCtx->eax; break;
-        default: AssertFailedReturn(VERR_INTERNAL_ERROR_3);
+        default: AssertFailedReturn(VERR_IEM_IPE_4);
     }
     if (!IEM_VERIFICATION_ENABLED(pIemCpu))
         rcStrict = IOMIOPortWrite(IEMCPU_TO_VM(pIemCpu), IEMCPU_TO_VMCPU(pIemCpu), u16Port, u32Value, cbReg);
diff --git a/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h b/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h
index cf7e441..7701ed9 100644
--- a/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h
+++ b/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1014,6 +1014,60 @@ IEM_CIMPL_DEF_1(RT_CONCAT4(iemCImpl_lods_,OP_rAX,_m,ADDR_SIZE), int8_t, iEffSeg)
 
 #if OP_SIZE != 64
 
+# if !defined(IN_RING3) && !defined(IEMCIMPL_INS_INLINES)
+#  define IEMCIMPL_INS_INLINES 1
+
+/**
+ * Check if we should postpone committing an INS instruction to ring-3, or if we
+ * should rather panic.
+ *
+ * @returns true if we should postpone it, false if it's better to panic.
+ * @param   rcStrictMem     The status code returned by the memory write.
+ */
+DECLINLINE(bool) iemCImpl_ins_shouldPostponeCommitToRing3(VBOXSTRICTRC rcStrictMem)
+{
+    /*
+     * The following requires executing the write in ring-3.
+     * See PGMPhysWrite for status code explanations.
+     */
+    if (   rcStrictMem == VINF_IOM_R3_MMIO_WRITE
+        || rcStrictMem == VINF_IOM_R3_MMIO_READ_WRITE
+        || rcStrictMem == VINF_EM_RAW_EMULATE_INSTR
+# ifdef IN_RC
+        || rcStrictMem == VINF_EM_RAW_EMULATE_INSTR_LDT_FAULT
+        || rcStrictMem == VINF_EM_RAW_EMULATE_INSTR_TSS_FAULT
+        || rcStrictMem == VINF_EM_RAW_EMULATE_INSTR_IDT_FAULT
+        || rcStrictMem == VINF_CSAM_PENDING_ACTION
+        || rcStrictMem == VINF_PATM_CHECK_PATCH_PAGE
+# endif
+       )
+        return true;
+
+    /* For the other status code, the pass-up handling should already have
+       caught them. So, anything getting down here is a real problem worth
+       meditating over. */
+    return false;
+}
+
+
+/**
+ * Merges a iemCImpl_ins_shouldPostponeCommitToRing3() status with the I/O port
+ * status.
+ *
+ * @returns status code.
+ * @param   rcStrictPort    The status returned by the I/O port read.
+ * @param   rcStrictMem     The status code returned by the memory write.
+ */
+DECLINLINE(VBOXSTRICTRC) iemCImpl_ins_mergePostponedCommitStatuses(VBOXSTRICTRC rcStrictPort, VBOXSTRICTRC rcStrictMem)
+{
+    /* Turns out we don't need a lot of merging, since we'll be redoing the
+       write anyway.  (CSAM, PATM status codes, perhaps, but that's about it.) */
+    return rcStrictPort == VINF_SUCCESS ? VINF_EM_RAW_TO_R3 : rcStrictPort;
+}
+
+# endif /* !IN_RING3 || !IEMCIMPL_INS_INLINES */
+
+
 /**
  * Implements 'INS' (no rep)
  */
@@ -1066,15 +1120,49 @@ IEM_CIMPL_DEF_1(RT_CONCAT4(iemCImpl_ins_op,OP_SIZE,_addr,ADDR_SIZE), bool, fIoCh
                 pCtx->ADDR_rDI -= OP_SIZE / 8;
             iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
         }
+#ifndef IN_RING3
         /* iemMemMap already checked permissions, so this may only be real errors
-           or access handlers meddling. The access handler case is going to
-           cause misbehavior if the instruction is re-interpreted or smth. So,
-           we fail with an internal error here instead. */
+           or access handlers meddling. In the access handler case, we must postpone
+           the instruction committing to ring-3. */
+        else if (iemCImpl_ins_shouldPostponeCommitToRing3(rcStrict2))
+        {
+            pIemCpu->PendingCommit.cbInstr = cbInstr;
+            pIemCpu->PendingCommit.uValue  = u32Value;
+            pIemCpu->PendingCommit.enmFn   = RT_CONCAT4(IEMCOMMIT_INS_OP,OP_SIZE,_ADDR,ADDR_SIZE);
+            pIemCpu->cPendingCommit++;
+            VMCPU_FF_SET(IEMCPU_TO_VMCPU(pIemCpu), VMCPU_FF_IEM);
+            Log(("%s: Postponing to ring-3; cbInstr=%#x u32Value=%#x rcStrict2=%Rrc rcStrict=%Rrc\n", __FUNCTION__,
+                 cbInstr, u32Value, VBOXSTRICTRC_VAL(rcStrict2),  VBOXSTRICTRC_VAL(rcStrict)));
+            rcStrict = iemCImpl_ins_mergePostponedCommitStatuses(rcStrict, rcStrict2);
+        }
+#endif
+        else
+            AssertLogRelMsgFailedReturn(("rcStrict2=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict2)), RT_FAILURE_NP(rcStrict2) ? rcStrict2 : VERR_IEM_IPE_1);
+    }
+    return rcStrict;
+}
+
+
+# ifdef IN_RING3
+/**
+ * Called in ring-3 when raw-mode or ring-0 was forced to return while
+ * committing the instruction (hit access handler).
+ */
+IEM_CIMPL_DEF_0(RT_CONCAT4(iemR3CImpl_commit_ins_op,OP_SIZE,_addr,ADDR_SIZE))
+{
+    PCPUMCTX     pCtx     = pIemCpu->CTX_SUFF(pCtx);
+    VBOXSTRICTRC rcStrict = RT_CONCAT(iemMemStoreDataU,OP_SIZE)(pIemCpu, X86_SREG_ES, pCtx->ADDR_rDI, (OP_TYPE)pIemCpu->PendingCommit.uValue);
+    if (rcStrict == VINF_SUCCESS)
+    {
+        if (!pCtx->eflags.Bits.u1DF)
+            pCtx->ADDR_rDI += OP_SIZE / 8;
         else
-            AssertLogRelMsgFailedReturn(("rcStrict2=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict2)), VERR_IEM_IPE_1);
+            pCtx->ADDR_rDI -= OP_SIZE / 8;
+        iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
     }
     return rcStrict;
 }
+# endif /* IN_RING3 */
 
 
 /**
@@ -1140,6 +1228,7 @@ IEM_CIMPL_DEF_1(RT_CONCAT4(iemCImpl_rep_ins_op,OP_SIZE,_addr,ADDR_SIZE), bool, f
                 || (   uAddrReg < pCtx->es.u32Limit
                     && uAddrReg + (cLeftPage * (OP_SIZE / 8)) <= pCtx->es.u32Limit)
                )
+            && !IEM_VERIFICATION_ENABLED(pIemCpu)
            )
         {
             RTGCPHYS GCPhysMem;
@@ -1148,47 +1237,35 @@ IEM_CIMPL_DEF_1(RT_CONCAT4(iemCImpl_rep_ins_op,OP_SIZE,_addr,ADDR_SIZE), bool, f
                 return rcStrict;
 
             /*
-             * If we can map the page without trouble, we would've liked to use
-             * an string I/O method to do the work, but the current IOM
-             * interface doesn't match our current approach. So, do a regular
-             * loop instead.
+             * If we can map the page without trouble, use the IOM
+             * string I/O interface to do the work.
              */
-            /** @todo Change the I/O manager interface to make use of
-             *        mapped buffers instead of leaving those bits to the
-             *        device implementation! */
             PGMPAGEMAPLOCK PgLockMem;
             OP_TYPE *puMem;
             rcStrict = iemMemPageMap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_W, (void **)&puMem, &PgLockMem);
             if (rcStrict == VINF_SUCCESS)
             {
-                uint32_t off = 0;
-                while (off < cLeftPage)
+                uint32_t cTransfers = cLeftPage;
+                rcStrict = IOMIOPortReadString(pVM, pVCpu, u16Port, puMem, &cTransfers, OP_SIZE / 8);
+
+                uint32_t cActualTransfers = cLeftPage - cTransfers;
+                Assert(cActualTransfers <= cLeftPage);
+                pCtx->ADDR_rDI = uAddrReg    += cbIncr * cActualTransfers;
+                pCtx->ADDR_rCX = uCounterReg -= cActualTransfers;
+                puMem += cActualTransfers;
+
+                iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_W, puMem, &PgLockMem);
+
+                if (rcStrict != VINF_SUCCESS)
                 {
-                    uint32_t u32Value;
-                    if (!IEM_VERIFICATION_ENABLED(pIemCpu))
-                        rcStrict = IOMIOPortRead(pVM, pVCpu, u16Port, &u32Value, OP_SIZE / 8);
-                    else
-                        rcStrict = iemVerifyFakeIOPortRead(pIemCpu, u16Port, &u32Value, OP_SIZE / 8);
                     if (IOM_SUCCESS(rcStrict))
                     {
-                        puMem[off]     = (OP_TYPE)u32Value;
-                        pCtx->ADDR_rDI = uAddrReg += cbIncr;
-                        pCtx->ADDR_rCX = --uCounterReg;
+                        rcStrict = iemSetPassUpStatus(pIemCpu, rcStrict);
+                        if (uCounterReg == 0)
+                            iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
                     }
-                    if (rcStrict != VINF_SUCCESS)
-                    {
-                        if (IOM_SUCCESS(rcStrict))
-                        {
-                            rcStrict = iemSetPassUpStatus(pIemCpu, rcStrict);
-                            if (uCounterReg == 0)
-                                iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
-                        }
-                        iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_W, puMem, &PgLockMem);
-                        return rcStrict;
-                    }
-                    off++;
+                    return rcStrict;
                 }
-                iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_W, puMem, &PgLockMem);
 
                 /* If unaligned, we drop thru and do the page crossing access
                    below. Otherwise, do the next page. */
@@ -1227,8 +1304,27 @@ IEM_CIMPL_DEF_1(RT_CONCAT4(iemCImpl_rep_ins_op,OP_SIZE,_addr,ADDR_SIZE), bool, f
 
             *puMem = (OP_TYPE)u32Value;
             VBOXSTRICTRC rcStrict2 = iemMemCommitAndUnmap(pIemCpu, puMem, IEM_ACCESS_DATA_W);
-            AssertLogRelMsgReturn(rcStrict2 == VINF_SUCCESS, ("rcStrict2=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict2)),
-                                  VERR_IEM_IPE_1); /* See non-rep version. */
+            if (rcStrict2 == VINF_SUCCESS)
+            { /* likely */ }
+#ifndef IN_RING3
+            /* iemMemMap already checked permissions, so this may only be real errors
+               or access handlers meddling. In the access handler case, we must postpone
+               the instruction committing to ring-3. */
+            else if (iemCImpl_ins_shouldPostponeCommitToRing3(rcStrict2))
+            {
+                pIemCpu->PendingCommit.cbInstr = cbInstr;
+                pIemCpu->PendingCommit.uValue  = u32Value;
+                pIemCpu->PendingCommit.enmFn   = RT_CONCAT4(IEMCOMMIT_REP_INS_OP,OP_SIZE,_ADDR,ADDR_SIZE);
+                pIemCpu->cPendingCommit++;
+                VMCPU_FF_SET(IEMCPU_TO_VMCPU(pIemCpu), VMCPU_FF_IEM);
+                Log(("%s: Postponing to ring-3; cbInstr=%#x u32Value=%#x rcStrict2=%Rrc rcStrict=%Rrc\n", __FUNCTION__,
+                     cbInstr, u32Value, VBOXSTRICTRC_VAL(rcStrict2),  VBOXSTRICTRC_VAL(rcStrict)));
+                return iemCImpl_ins_mergePostponedCommitStatuses(rcStrict, rcStrict2);
+            }
+#endif
+            else
+                AssertLogRelMsgFailedReturn(("rcStrict2=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict2)),
+                                            RT_FAILURE(rcStrict2) ? rcStrict2 : VERR_IEM_IPE_1);
 
             pCtx->ADDR_rDI = uAddrReg += cbIncr;
             pCtx->ADDR_rCX = --uCounterReg;
@@ -1251,6 +1347,29 @@ IEM_CIMPL_DEF_1(RT_CONCAT4(iemCImpl_rep_ins_op,OP_SIZE,_addr,ADDR_SIZE), bool, f
     return VINF_SUCCESS;
 }
 
+# ifdef IN_RING3
+/**
+ * Called in ring-3 when raw-mode or ring-0 was forced to return while
+ * committing the instruction (hit access handler).
+ */
+IEM_CIMPL_DEF_0(RT_CONCAT4(iemR3CImpl_commit_rep_ins_op,OP_SIZE,_addr,ADDR_SIZE))
+{
+    PCPUMCTX     pCtx     = pIemCpu->CTX_SUFF(pCtx);
+    VBOXSTRICTRC rcStrict = RT_CONCAT(iemMemStoreDataU,OP_SIZE)(pIemCpu, X86_SREG_ES, pCtx->ADDR_rDI, (OP_TYPE)pIemCpu->PendingCommit.uValue);
+    if (rcStrict == VINF_SUCCESS)
+    {
+        if (!pCtx->eflags.Bits.u1DF)
+            pCtx->ADDR_rDI += OP_SIZE / 8;
+        else
+            pCtx->ADDR_rDI -= OP_SIZE / 8;
+        pCtx->ADDR_rCX -= 1;
+        if (pCtx->ADDR_rCX == 0)
+            iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
+    }
+    return rcStrict;
+}
+# endif /* IN_RING3 */
+
 
 /**
  * Implements 'OUTS' (no rep)
@@ -1351,6 +1470,7 @@ IEM_CIMPL_DEF_2(RT_CONCAT4(iemCImpl_rep_outs_op,OP_SIZE,_addr,ADDR_SIZE), uint8_
                 || (   uAddrReg < pHid->u32Limit
                     && uAddrReg + (cLeftPage * (OP_SIZE / 8)) <= pHid->u32Limit)
                )
+            && !IEM_VERIFICATION_ENABLED(pIemCpu)
            )
         {
             RTGCPHYS GCPhysMem;
@@ -1359,46 +1479,35 @@ IEM_CIMPL_DEF_2(RT_CONCAT4(iemCImpl_rep_outs_op,OP_SIZE,_addr,ADDR_SIZE), uint8_
                 return rcStrict;
 
             /*
-             * If we can map the page without trouble, we would've liked to use
-             * an string I/O method to do the work, but the current IOM
-             * interface doesn't match our current approach. So, do a regular
-             * loop instead.
+             * If we can map the page without trouble, we use the IOM
+             * string I/O interface to do the job.
              */
-            /** @todo Change the I/O manager interface to make use of
-             *        mapped buffers instead of leaving those bits to the
-             *        device implementation? */
             PGMPAGEMAPLOCK PgLockMem;
             OP_TYPE const *puMem;
             rcStrict = iemMemPageMap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_R, (void **)&puMem, &PgLockMem);
             if (rcStrict == VINF_SUCCESS)
             {
-                uint32_t off = 0;
-                while (off < cLeftPage)
+                uint32_t cTransfers = cLeftPage;
+                rcStrict = IOMIOPortWriteString(pVM, pVCpu, u16Port, puMem, &cTransfers, OP_SIZE / 8);
+
+                uint32_t cActualTransfers = cLeftPage - cTransfers;
+                Assert(cActualTransfers <= cLeftPage);
+                pCtx->ADDR_rSI = uAddrReg    += cbIncr * cActualTransfers;
+                pCtx->ADDR_rCX = uCounterReg -= cActualTransfers;
+                puMem += cActualTransfers;
+
+                iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_R, puMem, &PgLockMem);
+
+                if (rcStrict != VINF_SUCCESS)
                 {
-                    uint32_t u32Value = *puMem++;
-                    if (!IEM_VERIFICATION_ENABLED(pIemCpu))
-                        rcStrict = IOMIOPortWrite(pVM, pVCpu, u16Port, u32Value, OP_SIZE / 8);
-                    else
-                        rcStrict = iemVerifyFakeIOPortWrite(pIemCpu, u16Port, u32Value, OP_SIZE / 8);
                     if (IOM_SUCCESS(rcStrict))
                     {
-                        pCtx->ADDR_rSI = uAddrReg += cbIncr;
-                        pCtx->ADDR_rCX = --uCounterReg;
+                        rcStrict = iemSetPassUpStatus(pIemCpu, rcStrict);
+                        if (uCounterReg == 0)
+                            iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
                     }
-                    if (rcStrict != VINF_SUCCESS)
-                    {
-                        if (IOM_SUCCESS(rcStrict))
-                        {
-                            rcStrict = iemSetPassUpStatus(pIemCpu, rcStrict);
-                            if (uCounterReg == 0)
-                                iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
-                        }
-                        iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_R, puMem, &PgLockMem);
-                        return rcStrict;
-                    }
-                    off++;
+                    return rcStrict;
                 }
-                iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_R, puMem, &PgLockMem);
 
                 /* If unaligned, we drop thru and do the page crossing access
                    below. Otherwise, do the next page. */
diff --git a/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h b/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h
index cfbfce4..f8f5599 100644
--- a/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h
+++ b/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -8455,7 +8455,7 @@ FNIEMOP_DEF(iemOp_imul_Gv_Ev_Iz)
             return VINF_SUCCESS;
         }
     }
-    AssertFailedReturn(VERR_INTERNAL_ERROR_3);
+    AssertFailedReturn(VERR_IEM_IPE_9);
 }
 
 
@@ -8636,7 +8636,7 @@ FNIEMOP_DEF(iemOp_imul_Gv_Ev_Ib)
             }
             return VINF_SUCCESS;
     }
-    AssertFailedReturn(VERR_INTERNAL_ERROR_3);
+    AssertFailedReturn(VERR_IEM_IPE_8);
 }
 
 
@@ -10104,7 +10104,7 @@ FNIEMOP_DEF(iemOp_lea_Gv_M)
             IEM_MC_END();
             return VINF_SUCCESS;
     }
-    AssertFailedReturn(VERR_INTERNAL_ERROR_5);
+    AssertFailedReturn(VERR_IEM_IPE_7);
 }
 
 
@@ -10843,7 +10843,7 @@ FNIEMOP_DEF(iemOp_movswd_Xv_Yv)
             case IEMMODE_64BIT:
                 switch (pIemCpu->enmEffAddrMode)
                 {
-                    case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_3);
+                    case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_6);
                     case IEMMODE_32BIT: return IEM_MC_DEFER_TO_CIMPL_1(iemCImpl_rep_movs_op64_addr32, pIemCpu->iEffSeg);
                     case IEMMODE_64BIT: return IEM_MC_DEFER_TO_CIMPL_1(iemCImpl_rep_movs_op64_addr64, pIemCpu->iEffSeg);
                     IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -10882,7 +10882,7 @@ FNIEMOP_DEF(iemOp_movswd_Xv_Yv)
         case IEMMODE_64BIT:
             switch (pIemCpu->enmEffAddrMode)
             {
-                case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_4); /* cannot be encoded */ break;
+                case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_1); /* cannot be encoded */ break;
                 case IEMMODE_32BIT: IEM_MOVS_CASE(64, 32); break;
                 case IEMMODE_64BIT: IEM_MOVS_CASE(64, 64); break;
                 IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -11002,7 +11002,7 @@ FNIEMOP_DEF(iemOp_cmpswd_Xv_Yv)
             case IEMMODE_64BIT:
                 switch (pIemCpu->enmEffAddrMode)
                 {
-                    case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_3);
+                    case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_4);
                     case IEMMODE_32BIT: return IEM_MC_DEFER_TO_CIMPL_1(iemCImpl_repe_cmps_op64_addr32, pIemCpu->iEffSeg);
                     case IEMMODE_64BIT: return IEM_MC_DEFER_TO_CIMPL_1(iemCImpl_repe_cmps_op64_addr64, pIemCpu->iEffSeg);
                     IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -11036,7 +11036,7 @@ FNIEMOP_DEF(iemOp_cmpswd_Xv_Yv)
             case IEMMODE_64BIT:
                 switch (pIemCpu->enmEffAddrMode)
                 {
-                    case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_3);
+                    case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_2);
                     case IEMMODE_32BIT: return IEM_MC_DEFER_TO_CIMPL_1(iemCImpl_repne_cmps_op64_addr32, pIemCpu->iEffSeg);
                     case IEMMODE_64BIT: return IEM_MC_DEFER_TO_CIMPL_1(iemCImpl_repne_cmps_op64_addr64, pIemCpu->iEffSeg);
                     IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -11076,7 +11076,7 @@ FNIEMOP_DEF(iemOp_cmpswd_Xv_Yv)
         case IEMMODE_64BIT:
             switch (pIemCpu->enmEffAddrMode)
             {
-                case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_4); /* cannot be encoded */ break;
+                case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_1); /* cannot be encoded */ break;
                 case IEMMODE_32BIT: IEM_CMPS_CASE(64, 32); break;
                 case IEMMODE_64BIT: IEM_CMPS_CASE(64, 64); break;
                 IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -11192,7 +11192,7 @@ FNIEMOP_DEF(iemOp_stoswd_Yv_eAX)
             case IEMMODE_64BIT:
                 switch (pIemCpu->enmEffAddrMode)
                 {
-                    case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_3);
+                    case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_9);
                     case IEMMODE_32BIT: return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_stos_rax_m32);
                     case IEMMODE_64BIT: return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_stos_rax_m64);
                     IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -11231,7 +11231,7 @@ FNIEMOP_DEF(iemOp_stoswd_Yv_eAX)
         case IEMMODE_64BIT:
             switch (pIemCpu->enmEffAddrMode)
             {
-                case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_4); /* cannot be encoded */ break;
+                case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_1); /* cannot be encoded */ break;
                 case IEMMODE_32BIT: IEM_STOS_CASE(64, 32); break;
                 case IEMMODE_64BIT: IEM_STOS_CASE(64, 64); break;
                 IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -11328,7 +11328,7 @@ FNIEMOP_DEF(iemOp_lodswd_eAX_Xv)
             case IEMMODE_64BIT:
                 switch (pIemCpu->enmEffAddrMode)
                 {
-                    case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_3);
+                    case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_7);
                     case IEMMODE_32BIT: return IEM_MC_DEFER_TO_CIMPL_1(iemCImpl_lods_rax_m32, pIemCpu->iEffSeg);
                     case IEMMODE_64BIT: return IEM_MC_DEFER_TO_CIMPL_1(iemCImpl_lods_rax_m64, pIemCpu->iEffSeg);
                     IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -11367,7 +11367,7 @@ FNIEMOP_DEF(iemOp_lodswd_eAX_Xv)
         case IEMMODE_64BIT:
             switch (pIemCpu->enmEffAddrMode)
             {
-                case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_4); /* cannot be encoded */ break;
+                case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_1); /* cannot be encoded */ break;
                 case IEMMODE_32BIT: IEM_LODS_CASE(64, 32); break;
                 case IEMMODE_64BIT: IEM_LODS_CASE(64, 64); break;
                 IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -11481,7 +11481,7 @@ FNIEMOP_DEF(iemOp_scaswd_eAX_Xv)
             case IEMMODE_64BIT:
                 switch (pIemCpu->enmEffAddrMode)
                 {
-                    case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_3); /** @todo It's this wrong, we can do 16-bit addressing in 64-bit mode, but not 32-bit. right? */
+                    case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_6); /** @todo It's this wrong, we can do 16-bit addressing in 64-bit mode, but not 32-bit. right? */
                     case IEMMODE_32BIT: return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_repe_scas_rax_m32);
                     case IEMMODE_64BIT: return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_repe_scas_rax_m64);
                     IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -11514,7 +11514,7 @@ FNIEMOP_DEF(iemOp_scaswd_eAX_Xv)
             case IEMMODE_64BIT:
                 switch (pIemCpu->enmEffAddrMode)
                 {
-                    case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_3);
+                    case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_5);
                     case IEMMODE_32BIT: return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_repne_scas_rax_m32);
                     case IEMMODE_64BIT: return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_repne_scas_rax_m64);
                     IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -11553,7 +11553,7 @@ FNIEMOP_DEF(iemOp_scaswd_eAX_Xv)
         case IEMMODE_64BIT:
             switch (pIemCpu->enmEffAddrMode)
             {
-                case IEMMODE_16BIT: AssertFailedReturn(VERR_INTERNAL_ERROR_4); /* cannot be encoded */ break;
+                case IEMMODE_16BIT: AssertFailedReturn(VERR_IEM_IPE_1); /* cannot be encoded */ break;
                 case IEMMODE_32BIT: IEM_SCAS_CASE(64, 32); break;
                 case IEMMODE_64BIT: IEM_SCAS_CASE(64, 64); break;
                 IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -17300,7 +17300,7 @@ FNIEMOP_DEF(iemOp_Grp5)
             IEMOP_MNEMONIC("grp5-ud");
             return IEMOP_RAISE_INVALID_OPCODE();
     }
-    AssertFailedReturn(VERR_INTERNAL_ERROR_2);
+    AssertFailedReturn(VERR_IEM_IPE_3);
 }
 
 
diff --git a/src/VBox/VMM/VMMAll/IOMAll.cpp b/src/VBox/VMM/VMMAll/IOMAll.cpp
index f2a698c..48b831f 100644
--- a/src/VBox/VMM/VMMAll/IOMAll.cpp
+++ b/src/VBox/VMM/VMMAll/IOMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -67,7 +67,7 @@ VMMDECL(bool) IOMIsLockWriteOwner(PVM pVM)
  * @retval  VINF_SUCCESS                Success.
  * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_R3_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
+ * @retval  VINF_IOM_R3_IOPORT_READ     Defer the read to ring-3. (R0/RC only)
  *
  * @param   pVM         Pointer to the VM.
  * @param   pVCpu       Pointer to the virtual CPU structure of the caller.
@@ -122,7 +122,9 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortRead(PVM pVM, PVMCPU pVCpu, RTIOPORT Port, uint32
          */
         PFNIOMIOPORTIN  pfnInCallback = pRange->pfnInCallback;
 #ifndef IN_RING3
-        if (!pfnInCallback)
+        if (pfnInCallback)
+        { /* likely */ }
+        else
         {
             STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->InRZToR3); });
             IOM_UNLOCK_SHARED(pVM);
@@ -137,7 +139,9 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortRead(PVM pVM, PVMCPU pVCpu, RTIOPORT Port, uint32
          * Call the device.
          */
         VBOXSTRICTRC rcStrict = PDMCritSectEnter(pDevIns->CTX_SUFF(pCritSectRo), VINF_IOM_R3_IOPORT_READ);
-        if (rcStrict != VINF_SUCCESS)
+        if (rcStrict == VINF_SUCCESS)
+        { /* likely */ }
+        else
         {
             STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->InRZToR3); });
             return rcStrict;
@@ -226,20 +230,21 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortRead(PVM pVM, PVMCPU pVCpu, RTIOPORT Port, uint32
  *
  * @returns Strict VBox status code. Informational status codes other than the one documented
  *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
+ * @retval  VINF_SUCCESS                Success or no string I/O callback in
+ *                                      this context.
  * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_R3_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
+ * @retval  VINF_IOM_R3_IOPORT_READ     Defer the read to ring-3. (R0/RC only)
  *
  * @param   pVM         Pointer to the VM.
  * @param   pVCpu       Pointer to the virtual CPU structure of the caller.
  * @param   Port        The port to read.
- * @param   pGCPtrDst   Pointer to the destination buffer (GC, incremented appropriately).
+ * @param   pvDst       Pointer to the destination buffer.
  * @param   pcTransfers Pointer to the number of transfer units to read, on return remaining transfer units.
  * @param   cb          Size of the transfer unit (1, 2 or 4 bytes).
  */
-VMMDECL(VBOXSTRICTRC) IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
-                                          PRTGCPTR pGCPtrDst, PRTGCUINTREG pcTransfers, unsigned cb)
+VMM_INT_DECL(VBOXSTRICTRC) IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT uPort,
+                                               void *pvDst, uint32_t *pcTransfers, unsigned cb)
 {
     /* Take the IOM lock before performing any device I/O. */
     int rc2 = IOM_LOCK_SHARED(pVM);
@@ -249,20 +254,20 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
 #endif
     AssertRC(rc2);
 #if defined(IEM_VERIFICATION_MODE) && defined(IN_RING3)
-    IEMNotifyIOPortReadString(pVM, Port, *pGCPtrDst, *pcTransfers, cb);
+    IEMNotifyIOPortReadString(pVM, uPort, pvDst, *pcTransfers, cb);
 #endif
 
-#ifdef LOG_ENABLED
-    const RTGCUINTREG cTransfers = *pcTransfers;
-#endif
+    const uint32_t cRequestedTransfers = *pcTransfers;
+    Assert(cRequestedTransfers > 0);
+
 #ifdef VBOX_WITH_STATISTICS
     /*
      * Get the statistics record.
      */
     PIOMIOPORTSTATS pStats = pVCpu->iom.s.CTX_SUFF(pStatsLastRead);
-    if (!pStats || pStats->Core.Key != Port)
+    if (!pStats || pStats->Core.Key != uPort)
     {
-        pStats = (PIOMIOPORTSTATS)RTAvloIOPortGet(&pVM->iom.s.CTX_SUFF(pTrees)->IOPortStatTree, Port);
+        pStats = (PIOMIOPORTSTATS)RTAvloIOPortGet(&pVM->iom.s.CTX_SUFF(pTrees)->IOPortStatTree, uPort);
         if (pStats)
             pVCpu->iom.s.CTX_SUFF(pStatsLastRead) = pStats;
     }
@@ -273,9 +278,9 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
      */
     CTX_SUFF(PIOMIOPORTRANGE) pRange = pVCpu->iom.s.CTX_SUFF(pRangeLastRead);
     if (    !pRange
-        ||   (unsigned)Port - (unsigned)pRange->Port >= (unsigned)pRange->cPorts)
+        ||   (unsigned)uPort - (unsigned)pRange->Port >= (unsigned)pRange->cPorts)
     {
-        pRange = iomIOPortGetRange(pVM, Port);
+        pRange = iomIOPortGetRange(pVM, uPort);
         if (pRange)
             pVCpu->iom.s.CTX_SUFF(pRangeLastRead) = pRange;
     }
@@ -286,12 +291,16 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
          * Found a range.
          */
         PFNIOMIOPORTINSTRING pfnInStrCallback = pRange->pfnInStrCallback;
+        PFNIOMIOPORTIN       pfnInCallback    = pRange->pfnInCallback;
 #ifndef IN_RING3
-        if (!pfnInStrCallback)
+        if (pfnInStrCallback || pfnInCallback)
+        { /* likely */ }
+        else
         {
-            STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->InRZToR3); });
+            STAM_STATS({ if (pStats)
+                    STAM_COUNTER_INC(&pStats->InRZToR3); });
             IOM_UNLOCK_SHARED(pVM);
-            return VINF_IOM_R3_IOPORT_READ;
+            return VINF_SUCCESS;
         }
 #endif
         void           *pvUser    = pRange->pvUser;
@@ -302,21 +311,70 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
          * Call the device.
          */
         VBOXSTRICTRC rcStrict = PDMCritSectEnter(pDevIns->CTX_SUFF(pCritSectRo), VINF_IOM_R3_IOPORT_READ);
-        if (rcStrict != VINF_SUCCESS)
+        if (rcStrict == VINF_SUCCESS)
+        { /* likely */ }
+        else
         {
             STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->InRZToR3); });
             return rcStrict;
         }
+
+        /*
+         * First using the string I/O callback.
+         */
+        if (pfnInStrCallback)
+        {
 #ifdef VBOX_WITH_STATISTICS
-        if (pStats)
+            if (pStats)
+            {
+                STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfIn), a);
+                rcStrict = pfnInStrCallback(pDevIns, pvUser, uPort, (uint8_t *)pvDst, pcTransfers, cb);
+                STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfIn), a);
+            }
+            else
+#endif
+                rcStrict = pfnInStrCallback(pDevIns, pvUser, uPort, (uint8_t *)pvDst, pcTransfers, cb);
+        }
+
+        /*
+         * Then doing the single I/O fallback.
+         */
+        if (   *pcTransfers > 0
+            && rcStrict == VINF_SUCCESS)
         {
-            STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfIn), a);
-            rcStrict = pfnInStrCallback(pDevIns, pvUser, Port, pGCPtrDst, pcTransfers, cb);
-            STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfIn), a);
+            pvDst = (uint8_t *)pvDst + (cRequestedTransfers - *pcTransfers) * cb;
+            do
+            {
+                uint32_t u32Value = 0;
+#ifdef VBOX_WITH_STATISTICS
+                if (pStats)
+                {
+                    STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfIn), a);
+                    rcStrict = pfnInCallback(pDevIns, pvUser, uPort, &u32Value, cb);
+                    STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfIn), a);
+                }
+                else
+#endif
+                    rcStrict = pfnInCallback(pDevIns, pvUser, uPort, &u32Value, cb);
+                if (rcStrict == VERR_IOM_IOPORT_UNUSED)
+                {
+                    u32Value = UINT32_MAX;
+                    rcStrict = VINF_SUCCESS;
+                }
+                if (IOM_SUCCESS(rcStrict))
+                {
+                    switch (cb)
+                    {
+                        case 4: *(uint32_t *)pvDst =           u32Value; pvDst = (uint8_t *)pvDst + 4; break;
+                        case 2: *(uint16_t *)pvDst = (uint16_t)u32Value; pvDst = (uint8_t *)pvDst + 2; break;
+                        case 1: *(uint8_t  *)pvDst = (uint8_t )u32Value; pvDst = (uint8_t *)pvDst + 1; break;
+                        default: AssertFailed();
+                    }
+                    *pcTransfers -= 1;
+                }
+            } while (   *pcTransfers > 0
+                     && rcStrict == VINF_SUCCESS);
         }
-        else
-#endif
-            rcStrict = pfnInStrCallback(pDevIns, pvUser, Port, pGCPtrDst, pcTransfers, cb);
         PDMCritSectLeave(pDevIns->CTX_SUFF(pCritSectRo));
 
 #ifdef VBOX_WITH_STATISTICS
@@ -327,8 +385,8 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
             STAM_COUNTER_INC(&pStats->InRZToR3);
 # endif
 #endif
-        Log3(("IOMIOPortReadStr: Port=%RTiop pGCPtrDst=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=%Rrc\n",
-              Port, pGCPtrDst, pcTransfers, cTransfers, *pcTransfers, cb, VBOXSTRICTRC_VAL(rcStrict)));
+        Log3(("IOMIOPortReadStr: uPort=%RTiop pvDst=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=%Rrc\n",
+              uPort, pvDst, pcTransfers, cRequestedTransfers, *pcTransfers, cb, VBOXSTRICTRC_VAL(rcStrict)));
         return rcStrict;
     }
 
@@ -336,7 +394,7 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
     /*
      * Handler in ring-3?
      */
-    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(pVM, Port);
+    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(pVM, uPort);
     if (pRangeR3)
     {
 # ifdef VBOX_WITH_STATISTICS
@@ -356,8 +414,8 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
         STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(In));
 #endif
 
-    Log3(("IOMIOPortReadStr: Port=%RTiop pGCPtrDst=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=VINF_SUCCESS\n",
-          Port, pGCPtrDst, pcTransfers, cTransfers, *pcTransfers, cb));
+    Log3(("IOMIOPortReadStr: uPort=%RTiop pvDst=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=VINF_SUCCESS\n",
+          uPort, pvDst, pcTransfers, cRequestedTransfers, *pcTransfers, cb));
     IOM_UNLOCK_SHARED(pVM);
     return VINF_SUCCESS;
 }
@@ -371,7 +429,7 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortReadString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
  * @retval  VINF_SUCCESS                Success.
  * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_R3_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
+ * @retval  VINF_IOM_R3_IOPORT_WRITE    Defer the write to ring-3. (R0/RC only)
  *
  * @param   pVM         Pointer to the VM.
  * @param   pVCpu       Pointer to the virtual CPU structure of the caller.
@@ -426,7 +484,9 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortWrite(PVM pVM, PVMCPU pVCpu, RTIOPORT Port, uint3
          */
         PFNIOMIOPORTOUT pfnOutCallback = pRange->pfnOutCallback;
 #ifndef IN_RING3
-        if (!pfnOutCallback)
+        if (pfnOutCallback)
+        { /* likely */ }
+        else
         {
             STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->OutRZToR3); });
             IOM_UNLOCK_SHARED(pVM);
@@ -441,7 +501,9 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortWrite(PVM pVM, PVMCPU pVCpu, RTIOPORT Port, uint3
          * Call the device.
          */
         VBOXSTRICTRC rcStrict = PDMCritSectEnter(pDevIns->CTX_SUFF(pCritSectRo), VINF_IOM_R3_IOPORT_WRITE);
-        if (rcStrict != VINF_SUCCESS)
+        if (rcStrict == VINF_SUCCESS)
+        { /* likely */ }
+        else
         {
             STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->OutRZToR3); });
             return rcStrict;
@@ -505,21 +567,25 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortWrite(PVM pVM, PVMCPU pVCpu, RTIOPORT Port, uint3
  *
  * @returns Strict VBox status code. Informational status codes other than the one documented
  *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
+ * @retval  VINF_SUCCESS                Success or no string I/O callback in
+ *                                      this context.
  * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
- * @retval  VINF_IOM_R3_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
+ * @retval  VINF_IOM_R3_IOPORT_WRITE    Defer the write to ring-3. (R0/RC only)
  *
  * @param   pVM         Pointer to the VM.
  * @param   pVCpu       Pointer to the virtual CPU structure of the caller.
- * @param   Port        The port to write.
- * @param   pGCPtrSrc   Pointer to the source buffer (GC, incremented appropriately).
- * @param   pcTransfers Pointer to the number of transfer units to write, on return remaining transfer units.
+ * @param   uPort       The port to write to.
+ * @param   pvSrc       The guest page to read from.
+ * @param   pcTransfers Pointer to the number of transfer units to write, on
+ *                      return remaining transfer units.
  * @param   cb          Size of the transfer unit (1, 2 or 4 bytes).
  */
-VMMDECL(VBOXSTRICTRC) IOMIOPortWriteString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
-                                           PRTGCPTR pGCPtrSrc, PRTGCUINTREG pcTransfers, unsigned cb)
+VMM_INT_DECL(VBOXSTRICTRC) IOMIOPortWriteString(PVM pVM, PVMCPU pVCpu, RTIOPORT uPort, void const *pvSrc,
+                                                uint32_t *pcTransfers, unsigned cb)
 {
+    Assert(cb == 1 || cb == 2 || cb == 4);
+
     /* Take the IOM lock before performing any device I/O. */
     int rc2 = IOM_LOCK_SHARED(pVM);
 #ifndef IN_RING3
@@ -528,20 +594,20 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortWriteString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
 #endif
     AssertRC(rc2);
 #if defined(IEM_VERIFICATION_MODE) && defined(IN_RING3)
-    IEMNotifyIOPortWriteString(pVM, Port, *pGCPtrSrc, *pcTransfers, cb);
+    IEMNotifyIOPortWriteString(pVM, uPort, pvSrc, *pcTransfers, cb);
 #endif
 
-#ifdef LOG_ENABLED
-    const RTGCUINTREG cTransfers = *pcTransfers;
-#endif
+    const uint32_t cRequestedTransfers = *pcTransfers;
+    Assert(cRequestedTransfers > 0);
+
 #ifdef VBOX_WITH_STATISTICS
     /*
      * Get the statistics record.
      */
     PIOMIOPORTSTATS     pStats = pVCpu->iom.s.CTX_SUFF(pStatsLastWrite);
-    if (!pStats || pStats->Core.Key != Port)
+    if (!pStats || pStats->Core.Key != uPort)
     {
-        pStats = (PIOMIOPORTSTATS)RTAvloIOPortGet(&pVM->iom.s.CTX_SUFF(pTrees)->IOPortStatTree, Port);
+        pStats = (PIOMIOPORTSTATS)RTAvloIOPortGet(&pVM->iom.s.CTX_SUFF(pTrees)->IOPortStatTree, uPort);
         if (pStats)
             pVCpu->iom.s.CTX_SUFF(pStatsLastWrite) = pStats;
     }
@@ -552,9 +618,9 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortWriteString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
      */
     CTX_SUFF(PIOMIOPORTRANGE) pRange = pVCpu->iom.s.CTX_SUFF(pRangeLastWrite);
     if (    !pRange
-        ||   (unsigned)Port - (unsigned)pRange->Port >= (unsigned)pRange->cPorts)
+        ||   (unsigned)uPort - (unsigned)pRange->Port >= (unsigned)pRange->cPorts)
     {
-        pRange = iomIOPortGetRange(pVM, Port);
+        pRange = iomIOPortGetRange(pVM, uPort);
         if (pRange)
             pVCpu->iom.s.CTX_SUFF(pRangeLastWrite) = pRange;
     }
@@ -565,12 +631,15 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortWriteString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
          * Found a range.
          */
         PFNIOMIOPORTOUTSTRING   pfnOutStrCallback = pRange->pfnOutStrCallback;
+        PFNIOMIOPORTOUT         pfnOutCallback    = pRange->pfnOutCallback;
 #ifndef IN_RING3
-        if (!pfnOutStrCallback)
+        if (pfnOutStrCallback || pfnOutCallback)
+        { /* likely */ }
+        else
         {
             STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->OutRZToR3); });
             IOM_UNLOCK_SHARED(pVM);
-            return VINF_IOM_R3_IOPORT_WRITE;
+            return VINF_SUCCESS;
         }
 #endif
         void           *pvUser    = pRange->pvUser;
@@ -581,21 +650,64 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortWriteString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
          * Call the device.
          */
         VBOXSTRICTRC rcStrict = PDMCritSectEnter(pDevIns->CTX_SUFF(pCritSectRo), VINF_IOM_R3_IOPORT_WRITE);
-        if (rcStrict != VINF_SUCCESS)
+        if (rcStrict == VINF_SUCCESS)
+        { /* likely */ }
+        else
         {
             STAM_STATS({ if (pStats) STAM_COUNTER_INC(&pStats->OutRZToR3); });
             return rcStrict;
         }
+
+        /*
+         * First using string I/O if possible.
+         */
+        if (pfnOutStrCallback)
+        {
 #ifdef VBOX_WITH_STATISTICS
-        if (pStats)
+            if (pStats)
+            {
+                STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfOut), a);
+                rcStrict = pfnOutStrCallback(pDevIns, pvUser, uPort, (uint8_t const *)pvSrc, pcTransfers, cb);
+                STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfOut), a);
+            }
+            else
+#endif
+                rcStrict = pfnOutStrCallback(pDevIns, pvUser, uPort, (uint8_t const *)pvSrc, pcTransfers, cb);
+        }
+
+        /*
+         * Then doing the single I/O fallback.
+         */
+        if (   *pcTransfers > 0
+            && rcStrict == VINF_SUCCESS)
         {
-            STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfOut), a);
-            rcStrict = pfnOutStrCallback(pDevIns, pvUser, Port, pGCPtrSrc, pcTransfers, cb);
-            STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfOut), a);
+            pvSrc = (uint8_t *)pvSrc + (cRequestedTransfers - *pcTransfers) * cb;
+            do
+            {
+                uint32_t u32Value;
+                switch (cb)
+                {
+                    case 4: u32Value = *(uint32_t *)pvSrc; pvSrc = (uint8_t const *)pvSrc + 4; break;
+                    case 2: u32Value = *(uint16_t *)pvSrc; pvSrc = (uint8_t const *)pvSrc + 2; break;
+                    case 1: u32Value = *(uint8_t  *)pvSrc; pvSrc = (uint8_t const *)pvSrc + 1; break;
+                    default: AssertFailed(); u32Value = UINT32_MAX;
+                }
+#ifdef VBOX_WITH_STATISTICS
+                if (pStats)
+                {
+                    STAM_PROFILE_START(&pStats->CTX_SUFF_Z(ProfOut), a);
+                    rcStrict = pfnOutCallback(pDevIns, pvUser, uPort, u32Value, cb);
+                    STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfOut), a);
+                }
+                else
+#endif
+                    rcStrict = pfnOutCallback(pDevIns, pvUser, uPort, u32Value, cb);
+                if (IOM_SUCCESS(rcStrict))
+                    *pcTransfers -= 1;
+            } while (   *pcTransfers > 0
+                     && rcStrict == VINF_SUCCESS);
         }
-        else
-#endif
-            rcStrict = pfnOutStrCallback(pDevIns, pvUser, Port, pGCPtrSrc, pcTransfers, cb);
+
         PDMCritSectLeave(pDevIns->CTX_SUFF(pCritSectRo));
 
 #ifdef VBOX_WITH_STATISTICS
@@ -606,8 +718,8 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortWriteString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
             STAM_COUNTER_INC(&pStats->OutRZToR3);
 # endif
 #endif
-        Log3(("IOMIOPortWriteStr: Port=%RTiop pGCPtrSrc=%p pcTransfer=%p:{%#x->%#x} cb=%d rcStrict=%Rrc\n",
-              Port, pGCPtrSrc, pcTransfers, cTransfers, *pcTransfers, cb, VBOXSTRICTRC_VAL(rcStrict)));
+        Log3(("IOMIOPortWriteStr: uPort=%RTiop pvSrc=%p pcTransfer=%p:{%#x->%#x} cb=%d rcStrict=%Rrc\n",
+              uPort, pvSrc, pcTransfers, cRequestedTransfers, *pcTransfers, cb, VBOXSTRICTRC_VAL(rcStrict)));
         return rcStrict;
     }
 
@@ -615,7 +727,7 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortWriteString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
     /*
      * Handler in ring-3?
      */
-    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(pVM, Port);
+    PIOMIOPORTRANGER3 pRangeR3 = iomIOPortGetRangeR3(pVM, uPort);
     if (pRangeR3)
     {
 # ifdef VBOX_WITH_STATISTICS
@@ -635,8 +747,8 @@ VMMDECL(VBOXSTRICTRC) IOMIOPortWriteString(PVM pVM, PVMCPU pVCpu, RTIOPORT Port,
         STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Out));
 #endif
 
-    Log3(("IOMIOPortWriteStr: Port=%RTiop pGCPtrSrc=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=VINF_SUCCESS\n",
-          Port, pGCPtrSrc, pcTransfers, cTransfers, *pcTransfers, cb));
+    Log3(("IOMIOPortWriteStr: uPort=%RTiop pvSrc=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=VINF_SUCCESS\n",
+          uPort, pvSrc, pcTransfers, cRequestedTransfers, *pcTransfers, cb));
     IOM_UNLOCK_SHARED(pVM);
     return VINF_SUCCESS;
 }
diff --git a/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp b/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp
index 2100861..c8c9a4d 100644
--- a/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp
+++ b/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp
@@ -45,6 +45,18 @@
 #include <iprt/asm.h>
 #include <iprt/string.h>
 
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** @def IEM_USE_IEM_INSTEAD
+ * Use IEM instead of IOM for interpreting MMIO accesses.
+ * Because of PATM/CSAM issues in raw-mode, we've split this up into 2nd and 3rd
+ * IEM deployment step. */
+#if  ((defined(IN_RING3) || defined(IN_RING0)) && defined(VBOX_WITH_2ND_IEM_STEP)) \
+  || defined(VBOX_WITH_3RD_IEM_STEP)
+# define IEM_USE_IEM_INSTEAD
+#endif
+
 
 /*******************************************************************************
 *   Global Variables                                                           *
@@ -719,7 +731,7 @@ DECLINLINE(void) iomMMIOStatLength(PVM pVM, unsigned cb)
 }
 
 
-#ifndef VBOX_WITH_2ND_IEM_STEP
+#ifndef IEM_USE_IEM_INSTEAD
 
 /**
  * MOV      reg, mem         (read)
@@ -1646,7 +1658,7 @@ static int iomInterpretXCHG(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCP
     return rc;
 }
 
-#endif /* !VBOX_WITH_2ND_IEM_STEP */
+#endif /* !IEM_USE_IEM_INSTEAD */
 
 /**
  * \#PF Handler callback for MMIO ranges.
@@ -1736,7 +1748,7 @@ static VBOXSTRICTRC iomMMIOHandler(PVM pVM, PVMCPU pVCpu, uint32_t uErrorCode, P
         return rc;
     }
 
-#ifdef VBOX_WITH_2ND_IEM_STEP
+#ifdef IEM_USE_IEM_INSTEAD
 
     /*
      * Let IEM call us back via iomMmioHandler.
@@ -1895,7 +1907,7 @@ static VBOXSTRICTRC iomMMIOHandler(PVM pVM, PVMCPU pVCpu, uint32_t uErrorCode, P
     PDMCritSectLeave(pDevIns->CTX_SUFF(pCritSectRo));
     iomMmioReleaseRange(pVM, pRange);
     return rc;
-#endif /* !VBOX_WITH_2ND_IEM_STEP */
+#endif /* !IEM_USE_IEM_INSTEAD */
 }
 
 
@@ -2001,6 +2013,7 @@ PGM_ALL_CB2_DECL(VBOXSTRICTRC) iomMmioHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GC
                   || rcStrict == VINF_EM_OFF
                   || rcStrict == VINF_EM_SUSPEND
                   || rcStrict == VINF_EM_RESET
+                  || rcStrict == VINF_EM_RAW_EMULATE_IO_BLOCK
                   //|| rcStrict == VINF_EM_HALT       /* ?? */
                   //|| rcStrict == VINF_EM_NO_MEMORY  /* ?? */
                   , ("%Rrc - %RGp - %p\n", VBOXSTRICTRC_VAL(rcStrict), GCPhysFault, pDevIns));
@@ -2256,7 +2269,7 @@ VMMDECL(VBOXSTRICTRC) IOMMMIOWrite(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, uint3
 }
 
 #endif /* IN_RING3 - only used by REM. */
-#ifndef VBOX_WITH_2ND_IEM_STEP
+#ifndef IEM_USE_IEM_INSTEAD
 
 /**
  * [REP*] INSB/INSW/INSD
@@ -2338,15 +2351,60 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretINSEx(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pReg
     VBOXSTRICTRC rcStrict = VINF_SUCCESS;
     if (cTransfers > 1)
     {
-        /* If the device supports string transfers, ask it to do as
-         * much as it wants. The rest is done with single-word transfers. */
-        const RTGCUINTREG cTransfersOrg = cTransfers;
-        rcStrict = IOMIOPortReadString(pVM, pVCpu, uPort, &GCPtrDst, &cTransfers, cbTransfer);
-        AssertRC(VBOXSTRICTRC_VAL(rcStrict)); Assert(cTransfers <= cTransfersOrg);
-        pRegFrame->rdi  = ((pRegFrame->rdi + (cTransfersOrg - cTransfers) * cbTransfer) & fAddrMask)
-                        | (pRegFrame->rdi & ~fAddrMask);
+        /*
+         * Work the string page by page, letting the device handle as much
+         * as it likes via the string I/O interface.
+         */
+        for (;;)
+        {
+            PGMPAGEMAPLOCK Lock;
+            void          *pvDst;
+            rc2 = PGMPhysGCPtr2CCPtr(pVCpu, GCPtrDst, &pvDst, &Lock);
+            if (RT_SUCCESS(rc2))
+            {
+                uint32_t cMaxThisTime = (PAGE_SIZE - (GCPtrDst & PAGE_OFFSET_MASK)) / cbTransfer;
+                if (cMaxThisTime > cTransfers)
+                    cMaxThisTime      = cTransfers;
+                if (!cMaxThisTime)
+                    break;
+                uint32_t cThisTime    = cMaxThisTime;
+
+                rcStrict = IOMIOPortReadString(pVM, pVCpu, uPort, pvDst, &cThisTime, cbTransfer);
+                AssertRC(VBOXSTRICTRC_VAL(rcStrict));
+                Assert(cThisTime <= cMaxThisTime); /* cThisTime is now how many transfers we have left. */
+
+                uint32_t const cActual  = cMaxThisTime - cThisTime;
+                if (cActual)
+                {   /* Must dirty the page.  */
+                    uint8_t b = *(uint8_t *)pvDst;
+                    iomRamWrite(pVCpu, pRegFrame, GCPtrDst, &b, 1);
+                }
+
+                PGMPhysReleasePageMappingLock(pVM, &Lock);
+
+                uint32_t const cbActual = cActual * cbTransfer;
+                cTransfers    -= cActual;
+                pRegFrame->rdi = ((pRegFrame->rdi + cbActual) & fAddrMask)
+                               | (pRegFrame->rdi & ~fAddrMask);
+                GCPtrDst      += cbActual;
+
+                if (   cThisTime
+                    || !cTransfers
+                    || rcStrict != VINF_SUCCESS
+                    || (GCPtrDst & PAGE_OFFSET_MASK))
+                    break;
+            }
+            else
+            {
+                Log(("IOMInterpretOUTSEx: PGMPhysGCPtr2CCPtr %#RGv -> %Rrc\n", GCPtrDst, rc2));
+                break;
+            }
+        }
     }
 
+    /*
+     * Single transfer / unmapped memory fallback.
+     */
 #ifdef IN_RC
     MMGCRamRegisterTrapHandler(pVM);
 #endif
@@ -2394,12 +2452,15 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretINSEx(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pReg
  * @retval  VINF_EM_RESCHEDULE_REM      The exception was dispatched and cannot be executed in raw-mode. (TRPMRaiseXcptErr)
  *
  * @param   pVM             The virtual machine.
- * @param   pVCpu       Pointer to the virtual CPU structure of the caller.
+ * @param   pVCpu           Pointer to the virtual CPU structure of the caller.
  * @param   pRegFrame       Pointer to CPUMCTXCORE guest registers structure.
  * @param   uPort           IO Port
  * @param   uPrefix         IO instruction prefix
  * @param   enmAddrMode     The address mode.
  * @param   cbTransfer      Size of transfer unit
+ *
+ * @remarks This API will probably be relaced by IEM before long, so no use in
+ *          optimizing+fixing stuff too much here.
  */
 VMMDECL(VBOXSTRICTRC) IOMInterpretOUTSEx(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, uint32_t uPort, uint32_t uPrefix,
                                          DISCPUMODE enmAddrMode, uint32_t cbTransfer)
@@ -2457,16 +2518,53 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretOUTSEx(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRe
     if (cTransfers > 1)
     {
         /*
-         * If the device supports string transfers, ask it to do as
-         * much as it wants. The rest is done with single-word transfers.
+         * Work the string page by page, letting the device handle as much
+         * as it likes via the string I/O interface.
          */
-        const RTGCUINTREG cTransfersOrg = cTransfers;
-        rcStrict = IOMIOPortWriteString(pVM, pVCpu, uPort, &GCPtrSrc, &cTransfers, cbTransfer);
-        AssertRC(VBOXSTRICTRC_VAL(rcStrict)); Assert(cTransfers <= cTransfersOrg);
-        pRegFrame->rsi  = ((pRegFrame->rsi + (cTransfersOrg - cTransfers) * cbTransfer) & fAddrMask)
-                        | (pRegFrame->rsi & ~fAddrMask);
+        for (;;)
+        {
+            PGMPAGEMAPLOCK Lock;
+            void const    *pvSrc;
+            rc2 = PGMPhysGCPtr2CCPtrReadOnly(pVCpu, GCPtrSrc, &pvSrc, &Lock);
+            if (RT_SUCCESS(rc2))
+            {
+                uint32_t cMaxThisTime = (PAGE_SIZE - (GCPtrSrc & PAGE_OFFSET_MASK)) / cbTransfer;
+                if (cMaxThisTime > cTransfers)
+                    cMaxThisTime      = cTransfers;
+                if (!cMaxThisTime)
+                    break;
+                uint32_t cThisTime    = cMaxThisTime;
+
+                rcStrict = IOMIOPortWriteString(pVM, pVCpu, uPort, pvSrc, &cThisTime, cbTransfer);
+                AssertRC(VBOXSTRICTRC_VAL(rcStrict));
+                Assert(cThisTime <= cMaxThisTime); /* cThisTime is now how many transfers we have left. */
+
+                PGMPhysReleasePageMappingLock(pVM, &Lock);
+
+                uint32_t const cActual  = cMaxThisTime - cThisTime;
+                uint32_t const cbActual = cActual * cbTransfer;
+                cTransfers    -= cActual;
+                pRegFrame->rsi = ((pRegFrame->rsi + cbActual) & fAddrMask)
+                               | (pRegFrame->rsi & ~fAddrMask);
+                GCPtrSrc      += cbActual;
+
+                if (   cThisTime
+                    || !cTransfers
+                    || rcStrict != VINF_SUCCESS
+                    || (GCPtrSrc & PAGE_OFFSET_MASK))
+                    break;
+            }
+            else
+            {
+                Log(("IOMInterpretOUTSEx: PGMPhysGCPtr2CCPtrReadOnly %#RGv -> %Rrc\n", GCPtrSrc, rc2));
+                break;
+            }
+        }
     }
 
+    /*
+     * Single transfer / unmapped memory fallback.
+     */
 #ifdef IN_RC
     MMGCRamRegisterTrapHandler(pVM);
 #endif
@@ -2499,7 +2597,7 @@ VMMDECL(VBOXSTRICTRC) IOMInterpretOUTSEx(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRe
     return rcStrict;
 }
 
-#endif /* !VBOX_WITH_2ND_IEM_STEP */
+#endif /* !IEM_USE_IEM_INSTEAD */
 
 
 #ifndef IN_RC
diff --git a/src/VBox/VMM/VMMAll/MMAll.cpp b/src/VBox/VMM/VMMAll/MMAll.cpp
index 5d5944c..842078c 100644
--- a/src/VBox/VMM/VMMAll/MMAll.cpp
+++ b/src/VBox/VMM/VMMAll/MMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/MMAllHyper.cpp b/src/VBox/VMM/VMMAll/MMAllHyper.cpp
index 084875b..1ae88e7 100644
--- a/src/VBox/VMM/VMMAll/MMAllHyper.cpp
+++ b/src/VBox/VMM/VMMAll/MMAllHyper.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/MMAllPagePool.cpp b/src/VBox/VMM/VMMAll/MMAllPagePool.cpp
index 8f915b2..060d825 100644
--- a/src/VBox/VMM/VMMAll/MMAllPagePool.cpp
+++ b/src/VBox/VMM/VMMAll/MMAllPagePool.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/PATMAll.cpp b/src/VBox/VMM/VMMAll/PATMAll.cpp
index 4a935f0..8bdd9a7 100644
--- a/src/VBox/VMM/VMMAll/PATMAll.cpp
+++ b/src/VBox/VMM/VMMAll/PATMAll.cpp
@@ -44,14 +44,18 @@
  * @remarks The @a pvUser argument is the base address of the page being
  *          monitored.
  */
-PGM_ALL_CB2_DECL(VBOXSTRICTRC) patmVirtPageHandler(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, void *pvPtr, void *pvBuf, size_t cbBuf,
-                                                   PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser)
+PGM_ALL_CB2_DECL(VBOXSTRICTRC)
+patmVirtPageHandler(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, void *pvPtr, void *pvBuf, size_t cbBuf,
+                    PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser)
 {
     Assert(enmAccessType == PGMACCESSTYPE_WRITE); NOREF(enmAccessType);
     NOREF(pvPtr); NOREF(pvBuf); NOREF(cbBuf); NOREF(enmOrigin); NOREF(pvUser);
-    Assert(pvUser); Assert(!((uintptr_t)pvUser & PAGE_OFFSET_MASK));
 
-    pVM->patm.s.pvFaultMonitor = (RTRCPTR)((uintptr_t)pvUser + (GCPtr & PAGE_OFFSET_MASK));
+    Assert(pvUser);
+    Assert(!((uintptr_t)pvUser & PAGE_OFFSET_MASK));
+    Assert(((uintptr_t)pvUser + (GCPtr & PAGE_OFFSET_MASK)) == GCPtr);
+
+    pVM->patm.s.pvFaultMonitor = (RTRCPTR)GCPtr;
 #ifdef IN_RING3
     PATMR3HandleMonitoredPage(pVM);
     return VINF_PGM_HANDLER_DO_DEFAULT;
diff --git a/src/VBox/VMM/VMMAll/PDMAll.cpp b/src/VBox/VMM/VMMAll/PDMAll.cpp
index 725412f..ba30894 100644
--- a/src/VBox/VMM/VMMAll/PDMAll.cpp
+++ b/src/VBox/VMM/VMMAll/PDMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp b/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp
index 984e806..5e7782f 100644
--- a/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp
+++ b/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -584,9 +584,9 @@ VMMDECL(int) PDMCritSectLeave(PPDMCRITSECT pCritSect)
          * Leave for real.
          */
         /* update members. */
+        SUPSEMEVENT hEventToSignal  = pCritSect->s.hEventToSignal;
+        pCritSect->s.hEventToSignal = NIL_SUPSEMEVENT;
 # ifdef IN_RING3
-        RTSEMEVENT hEventToSignal    = pCritSect->s.EventToSignal;
-        pCritSect->s.EventToSignal   = NIL_RTSEMEVENT;
 #  if defined(PDMCRITSECT_STRICT)
         if (pCritSect->s.Core.pValidatorRec->hThread != NIL_RTTHREAD)
             RTLockValidatorRecExclReleaseOwnerUnchecked(pCritSect->s.Core.pValidatorRec);
@@ -610,15 +610,13 @@ VMMDECL(int) PDMCritSectLeave(PPDMCRITSECT pCritSect)
             AssertRC(rc);
         }
 
-# ifdef IN_RING3
         /* Signal exit event. */
-        if (hEventToSignal != NIL_RTSEMEVENT)
+        if (hEventToSignal != NIL_SUPSEMEVENT)
         {
-            Log8(("Signalling %#x\n", hEventToSignal));
-            int rc = RTSemEventSignal(hEventToSignal);
+            Log8(("Signalling %#p\n", hEventToSignal));
+            int rc = SUPSemEventSignal(pCritSect->s.CTX_SUFF(pVM)->pSession, hEventToSignal);
             AssertRC(rc);
         }
-# endif
 
 # if defined(DEBUG_bird) && defined(IN_RING0)
         VMMTrashVolatileXMMRegs();
@@ -672,6 +670,39 @@ VMMDECL(int) PDMCritSectLeave(PPDMCRITSECT pCritSect)
 }
 
 
+#if defined(IN_RING0) || defined(IN_RING3)
+/**
+ * Schedule a event semaphore for signalling upon critsect exit.
+ *
+ * @returns VINF_SUCCESS on success.
+ * @returns VERR_TOO_MANY_SEMAPHORES if an event was already scheduled.
+ * @returns VERR_NOT_OWNER if we're not the critsect owner (ring-3 only).
+ * @returns VERR_SEM_DESTROYED if RTCritSectDelete was called while waiting.
+ *
+ * @param   pCritSect       The critical section.
+ * @param   hEventToSignal  The support driver event semaphore that should be
+ *                          signalled.
+ */
+VMMDECL(int) PDMHCCritSectScheduleExitEvent(PPDMCRITSECT pCritSect, SUPSEMEVENT hEventToSignal)
+{
+    AssertPtr(pCritSect);
+    Assert(!(pCritSect->s.Core.fFlags & RTCRITSECT_FLAGS_NOP));
+    Assert(hEventToSignal != NIL_SUPSEMEVENT);
+# ifdef IN_RING3
+    if (RT_UNLIKELY(!RTCritSectIsOwner(&pCritSect->s.Core)))
+        return VERR_NOT_OWNER;
+# endif
+    if (RT_LIKELY(   pCritSect->s.hEventToSignal == NIL_RTSEMEVENT
+                  || pCritSect->s.hEventToSignal == hEventToSignal))
+    {
+        pCritSect->s.hEventToSignal = hEventToSignal;
+        return VINF_SUCCESS;
+    }
+    return VERR_TOO_MANY_SEMAPHORES;
+}
+#endif /* IN_RING0 || IN_RING3 */
+
+
 /**
  * Checks the caller is the owner of the critical section.
  *
diff --git a/src/VBox/VMM/VMMAll/PDMAllCritSectBoth.cpp b/src/VBox/VMM/VMMAll/PDMAllCritSectBoth.cpp
index 1ea4956..32561b4 100644
--- a/src/VBox/VMM/VMMAll/PDMAllCritSectBoth.cpp
+++ b/src/VBox/VMM/VMMAll/PDMAllCritSectBoth.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/PDMAllCritSectRw.cpp b/src/VBox/VMM/VMMAll/PDMAllCritSectRw.cpp
index f8feee9..9f8da8c 100644
--- a/src/VBox/VMM/VMMAll/PDMAllCritSectRw.cpp
+++ b/src/VBox/VMM/VMMAll/PDMAllCritSectRw.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/PDMAllNetShaper.cpp b/src/VBox/VMM/VMMAll/PDMAllNetShaper.cpp
index 21e8047..c32f194 100644
--- a/src/VBox/VMM/VMMAll/PDMAllNetShaper.cpp
+++ b/src/VBox/VMM/VMMAll/PDMAllNetShaper.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/PDMAllQueue.cpp b/src/VBox/VMM/VMMAll/PDMAllQueue.cpp
index 6ef6ae2..0c4d483 100644
--- a/src/VBox/VMM/VMMAll/PDMAllQueue.cpp
+++ b/src/VBox/VMM/VMMAll/PDMAllQueue.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/PGMAll.cpp b/src/VBox/VMM/VMMAll/PGMAll.cpp
index 49741fa..5432f4a 100644
--- a/src/VBox/VMM/VMMAll/PGMAll.cpp
+++ b/src/VBox/VMM/VMMAll/PGMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/PGMAllGst.h b/src/VBox/VMM/VMMAll/PGMAllGst.h
index 231ca08..d9a71fc 100644
--- a/src/VBox/VMM/VMMAll/PGMAllGst.h
+++ b/src/VBox/VMM/VMMAll/PGMAllGst.h
@@ -449,9 +449,10 @@ PGM_GST_DECL(int, GetPDE)(PVMCPU pVCpu, RTGCPTR GCPtr, PX86PDEPAE pPDE)
 }
 
 
-#if PGM_GST_TYPE == PGM_TYPE_32BIT \
- || PGM_GST_TYPE == PGM_TYPE_PAE \
- || PGM_GST_TYPE == PGM_TYPE_AMD64
+#if (   PGM_GST_TYPE == PGM_TYPE_32BIT \
+     || PGM_GST_TYPE == PGM_TYPE_PAE \
+     || PGM_GST_TYPE == PGM_TYPE_AMD64) \
+ && defined(VBOX_WITH_RAW_MODE)
 /**
  * Updates one virtual handler range.
  *
@@ -607,7 +608,7 @@ static DECLCALLBACK(int) PGM_GST_NAME(VirtHandlerUpdateOne)(PAVLROGCPTRNODECORE
 
     return 0;
 }
-#endif /* 32BIT, PAE and AMD64 */
+#endif /* 32BIT, PAE and AMD64 + VBOX_WITH_RAW_MODE */
 
 
 /**
@@ -621,9 +622,10 @@ static DECLCALLBACK(int) PGM_GST_NAME(VirtHandlerUpdateOne)(PAVLROGCPTRNODECORE
  */
 PGM_GST_DECL(bool, HandlerVirtualUpdate)(PVM pVM, uint32_t cr4)
 {
-#if PGM_GST_TYPE == PGM_TYPE_32BIT \
- || PGM_GST_TYPE == PGM_TYPE_PAE \
- || PGM_GST_TYPE == PGM_TYPE_AMD64
+#if (   PGM_GST_TYPE == PGM_TYPE_32BIT \
+     || PGM_GST_TYPE == PGM_TYPE_PAE \
+     || PGM_GST_TYPE == PGM_TYPE_AMD64) \
+ && defined(VBOX_WITH_RAW_MODE)
 
     /** @todo
      * In theory this is not sufficient: the guest can change a single page in a range with invlpg
diff --git a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp
index dcfa230..b69053e 100644
--- a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp
+++ b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp
@@ -1365,6 +1365,8 @@ bool pgmHandlerPhysicalIsAll(PVM pVM, RTGCPHYS GCPhys)
 }
 
 
+#ifdef VBOX_WITH_RAW_MODE
+
 /**
  * Internal worker for releasing a virtual handler type registration reference.
  *
@@ -1610,7 +1612,7 @@ DECLCALLBACK(int) pgmHandlerVirtualResetOne(PAVLROGCPTRNODECORE pNode, void *pvU
     return 0;
 }
 
-#if defined(VBOX_STRICT) || defined(LOG_ENABLED)
+# if defined(VBOX_STRICT) || defined(LOG_ENABLED)
 
 /**
  * Worker for pgmHandlerVirtualDumpPhysPages.
@@ -1642,7 +1644,8 @@ void pgmHandlerVirtualDumpPhysPages(PVM pVM)
                            pgmHandlerVirtualDumpPhysPagesCallback, 0);
 }
 
-#endif /* VBOX_STRICT || LOG_ENABLED */
+# endif /* VBOX_STRICT || LOG_ENABLED */
+#endif /* VBOX_WITH_RAW_MODE */
 #ifdef VBOX_STRICT
 
 /**
@@ -1663,8 +1666,9 @@ typedef struct PGMAHAFIS
     PVM         pVM;
 } PGMAHAFIS, *PPGMAHAFIS;
 
+# ifdef VBOX_WITH_RAW_MODE
 
-#if 0 /* unused */
+#  if 0 /* unused */
 /**
  * Verify virtual handler by matching physical address.
  *
@@ -1693,7 +1697,7 @@ static DECLCALLBACK(int) pgmHandlerVirtualVerifyOneByPhysAddr(PAVLROGCPTRNODECOR
     }
     return 0;
 }
-#endif /* unused */
+#  endif /* unused */
 
 
 /**
@@ -1803,6 +1807,7 @@ static DECLCALLBACK(int) pgmHandlerVirtualVerifyOne(PAVLROGCPTRNODECORE pNode, v
     return 0;
 }
 
+# endif /* VBOX_WITH_RAW_MODE */
 
 /**
  * Asserts that the handlers+guest-page-tables == ramrange-flags and
@@ -1879,8 +1884,8 @@ VMMDECL(unsigned) PGMAssertHandlerAndFlagsInSync(PVM pVM)
                             State.cErrors++;
                         }
 
-#ifdef VBOX_WITH_REM
-# ifdef IN_RING3
+# ifdef VBOX_WITH_REM
+#  ifdef IN_RING3
                         /* validate that REM is handling it. */
                         if (    !REMR3IsPageAccessHandled(pVM, State.GCPhys)
                                 /* ignore shadowed ROM for the time being. */
@@ -1890,8 +1895,8 @@ VMMDECL(unsigned) PGMAssertHandlerAndFlagsInSync(PVM pVM)
                                              State.GCPhys, PGM_PAGE_GET_HNDL_PHYS_STATE(pPage), pPhysType->pszDesc));
                             State.cErrors++;
                         }
+#  endif
 # endif
-#endif
                     }
                     else
                     {
@@ -1906,9 +1911,10 @@ VMMDECL(unsigned) PGMAssertHandlerAndFlagsInSync(PVM pVM)
                 if (PGM_PAGE_HAS_ACTIVE_VIRTUAL_HANDLERS(pPage))
                 {
                     State.uVirtState = PGM_PAGE_GET_HNDL_VIRT_STATE(pPage);
-#if 1
+
                     /* locate all the matching physical ranges. */
                     State.uVirtStateFound = PGM_PAGE_HNDL_VIRT_STATE_NONE;
+# ifdef VBOX_WITH_RAW_MODE
                     RTGCPHYS GCPhysKey = State.GCPhys;
                     for (;;)
                     {
@@ -1937,10 +1943,7 @@ VMMDECL(unsigned) PGMAssertHandlerAndFlagsInSync(PVM pVM)
                         if ((GCPhysKey & X86_PTE_PAE_PG_MASK) != State.GCPhys)
                             break;
                     }
-#else
-                    /* very slow */
-                    RTAvlroGCPtrDoWithAll(&pVM->pgm.s.CTX_SUFF(pTrees)->VirtHandlers, true, pgmHandlerVirtualVerifyOneByPhysAddr, &State);
-#endif
+# endif /* VBOX_WITH_RAW_MODE */
                     if (State.uVirtState != State.uVirtStateFound)
                     {
                         AssertMsgFailed(("ram range vs virt handler flags mismatch. GCPhys=%RGp uVirtState=%#x uVirtStateFound=%#x\n",
@@ -1952,11 +1955,13 @@ VMMDECL(unsigned) PGMAssertHandlerAndFlagsInSync(PVM pVM)
         } /* foreach page in ram range. */
     } /* foreach ram range. */
 
+# ifdef VBOX_WITH_RAW_MODE
     /*
      * Check that the physical addresses of the virtual handlers matches up
      * and that they are otherwise sane.
      */
     RTAvlroGCPtrDoWithAll(&pVM->pgm.s.CTX_SUFF(pTrees)->VirtHandlers, true, pgmHandlerVirtualVerifyOne, &State);
+# endif
 
     /*
      * Do the reverse check for physical handlers.
diff --git a/src/VBox/VMM/VMMAll/PGMAllMap.cpp b/src/VBox/VMM/VMMAll/PGMAllMap.cpp
index 8edb607..b759ecb 100644
--- a/src/VBox/VMM/VMMAll/PGMAllMap.cpp
+++ b/src/VBox/VMM/VMMAll/PGMAllMap.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/PGMAllPhys.cpp b/src/VBox/VMM/VMMAll/PGMAllPhys.cpp
index f25fb6b..b74c859 100644
--- a/src/VBox/VMM/VMMAll/PGMAllPhys.cpp
+++ b/src/VBox/VMM/VMMAll/PGMAllPhys.cpp
@@ -73,6 +73,8 @@
      || (a_rcStrict) == ((a_fWrite) ? VINF_IOM_R3_MMIO_WRITE : VINF_IOM_R3_MMIO_READ) \
      || (a_rcStrict) == VINF_IOM_R3_MMIO_READ_WRITE \
      \
+     || ((a_fWrite) ? (a_rcStrict) == VINF_EM_RAW_EMULATE_IO_BLOCK : false) \
+     \
      || (a_rcStrict) == VINF_EM_RAW_EMULATE_INSTR  \
      || (a_rcStrict) == VINF_EM_DBG_STOP \
      || (a_rcStrict) == VINF_EM_DBG_BREAKPOINT \
@@ -565,7 +567,7 @@ VMMDECL(bool) PGMPhysIsGCPhysNormal(PVM pVM, RTGCPHYS GCPhys)
  * @param   GCPhys  The GC physical address to convert.
  * @param   pHCPhys Where to store the HC physical address on success.
  */
-VMMDECL(int) PGMPhysGCPhys2HCPhys(PVM pVM, RTGCPHYS GCPhys, PRTHCPHYS pHCPhys)
+VMM_INT_DECL(int) PGMPhysGCPhys2HCPhys(PVM pVM, RTGCPHYS GCPhys, PRTHCPHYS pHCPhys)
 {
     pgmLock(pVM);
     PPGMPAGE pPage;
@@ -1245,10 +1247,15 @@ static int pgmPhysPageMapCommon(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys, PPPGMP
             *ppv = pVM->pgm.s.CTXALLSUFF(pvZeroPg);
         }
         else
+# ifdef VBOX_WITH_2ND_IEM_STEP
+            *ppv = pVM->pgm.s.CTXALLSUFF(pvZeroPg);
+# else
         {
+            /* This kind of screws up the TLB entry if accessed from a different section afterwards. */
             static uint8_t s_abPlayItSafe[0x1000*2];  /* I don't dare return the zero page at the moment. */
             *ppv = (uint8_t *)((uintptr_t)&s_abPlayItSafe[0x1000] & ~(uintptr_t)0xfff);
         }
+# endif
         *ppMap = NULL;
         return VINF_SUCCESS;
     }
@@ -1759,7 +1766,7 @@ int pgmPhysGCPhys2CCPtrInternalReadOnly(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys
  *          before the returned page!
  * @thread  Any thread.
  */
-VMMDECL(int) PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock)
+VMM_INT_DECL(int) PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock)
 {
     int rc = pgmLock(pVM);
     AssertRCReturn(rc, rc);
@@ -1862,7 +1869,7 @@ VMMDECL(int) PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEM
  *          before the returned page!
  * @thread  Any thread.
  */
-VMMDECL(int) PGMPhysGCPhys2CCPtrReadOnly(PVM pVM, RTGCPHYS GCPhys, void const **ppv, PPGMPAGEMAPLOCK pLock)
+VMM_INT_DECL(int) PGMPhysGCPhys2CCPtrReadOnly(PVM pVM, RTGCPHYS GCPhys, void const **ppv, PPGMPAGEMAPLOCK pLock)
 {
     int rc = pgmLock(pVM);
     AssertRCReturn(rc, rc);
@@ -1952,7 +1959,7 @@ VMMDECL(int) PGMPhysGCPhys2CCPtrReadOnly(PVM pVM, RTGCPHYS GCPhys, void const **
  *          the PGM one) because of the deadlock risk.
  * @thread  EMT
  */
-VMMDECL(int) PGMPhysGCPtr2CCPtr(PVMCPU pVCpu, RTGCPTR GCPtr, void **ppv, PPGMPAGEMAPLOCK pLock)
+VMM_INT_DECL(int) PGMPhysGCPtr2CCPtr(PVMCPU pVCpu, RTGCPTR GCPtr, void **ppv, PPGMPAGEMAPLOCK pLock)
 {
     VM_ASSERT_EMT(pVCpu->CTX_SUFF(pVM));
     RTGCPHYS GCPhys;
@@ -1978,15 +1985,16 @@ VMMDECL(int) PGMPhysGCPtr2CCPtr(PVMCPU pVCpu, RTGCPTR GCPtr, void **ppv, PPGMPAG
  * @retval  VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS if it's not a valid physical address.
  *
  * @param   pVCpu       Pointer to the VMCPU.
- * @param   GCPhys      The guest physical address of the page that should be mapped.
- * @param   ppv         Where to store the address corresponding to GCPhys.
+ * @param   GCPtr       The guest physical address of the page that should be
+ *                      mapped.
+ * @param   ppv         Where to store the address corresponding to GCPtr.
  * @param   pLock       Where to store the lock information that PGMPhysReleasePageMappingLock needs.
  *
  * @remark  Avoid calling this API from within critical sections (other than
  *          the PGM one) because of the deadlock risk.
  * @thread  EMT
  */
-VMMDECL(int) PGMPhysGCPtr2CCPtrReadOnly(PVMCPU pVCpu, RTGCPTR GCPtr, void const **ppv, PPGMPAGEMAPLOCK pLock)
+VMM_INT_DECL(int) PGMPhysGCPtr2CCPtrReadOnly(PVMCPU pVCpu, RTGCPTR GCPtr, void const **ppv, PPGMPAGEMAPLOCK pLock)
 {
     VM_ASSERT_EMT(pVCpu->CTX_SUFF(pVM));
     RTGCPHYS GCPhys;
@@ -2203,7 +2211,7 @@ VMMDECL(int) PGMPhysGCPtr2GCPhys(PVMCPU pVCpu, RTGCPTR GCPtr, PRTGCPHYS pGCPhys)
  * @param   GCPtr       The guest pointer to convert.
  * @param   pHCPhys     Where to store the HC physical address.
  */
-VMMDECL(int) PGMPhysGCPtr2HCPhys(PVMCPU pVCpu, RTGCPTR GCPtr, PRTHCPHYS pHCPhys)
+VMM_INT_DECL(int) PGMPhysGCPtr2HCPhys(PVMCPU pVCpu, RTGCPTR GCPtr, PRTHCPHYS pHCPhys)
 {
     PVM pVM = pVCpu->CTX_SUFF(pVM);
     RTGCPHYS GCPhys;
@@ -2426,8 +2434,8 @@ static VBOXSTRICTRC pgmPhysReadHandler(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys,
  * @retval  VINF_EM_HALT in RC and R0 - read completed.
  * @retval  VINF_SELM_SYNC_GDT in RC only - read completed.
  *
- * @retval  VINF_EM_DBG_STOP in RC and R0.
- * @retval  VINF_EM_DBG_BREAKPOINT in RC and R0.
+ * @retval  VINF_EM_DBG_STOP in RC and R0 - read completed.
+ * @retval  VINF_EM_DBG_BREAKPOINT in RC and R0 - read completed.
  * @retval  VINF_EM_RAW_EMULATE_INSTR in RC and R0 only.
  *
  * @retval  VINF_IOM_R3_MMIO_READ in RC and R0.
@@ -3046,13 +3054,15 @@ static VBOXSTRICTRC pgmPhysWriteHandler(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys
  * @retval  VINF_EM_HALT in RC and R0 - write completed.
  * @retval  VINF_SELM_SYNC_GDT in RC only - write completed.
  *
- * @retval  VINF_EM_DBG_STOP in RC and R0.
- * @retval  VINF_EM_DBG_BREAKPOINT in RC and R0.
+ * @retval  VINF_EM_DBG_STOP in RC and R0 - write completed.
+ * @retval  VINF_EM_DBG_BREAKPOINT in RC and R0 - write completed.
  * @retval  VINF_EM_RAW_EMULATE_INSTR in RC and R0 only.
  *
  * @retval  VINF_IOM_R3_MMIO_WRITE in RC and R0.
  * @retval  VINF_IOM_R3_MMIO_READ_WRITE in RC and R0.
  *
+ * @retval  VINF_EM_RAW_EMULATE_IO_BLOCK in R0 only.
+ *
  * @retval  VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT in RC only - write completed.
  * @retval  VINF_EM_RAW_EMULATE_INSTR_LDT_FAULT in RC only.
  * @retval  VINF_EM_RAW_EMULATE_INSTR_TSS_FAULT in RC only.
@@ -4349,7 +4359,7 @@ VMMDECL(int) PGMPhysInterpretedWriteNoHandlers(PVMCPU pVCpu, PCPUMCTXCORE pCtxCo
  * @param   pVM             Pointer to the VM.
  * @param   GCPhys          Guest physical address
  */
-VMMDECL(PGMPAGETYPE) PGMPhysGetPageType(PVM pVM, RTGCPHYS GCPhys)
+VMM_INT_DECL(PGMPAGETYPE) PGMPhysGetPageType(PVM pVM, RTGCPHYS GCPhys)
 {
     pgmLock(pVM);
     PPGMPAGE pPage = pgmPhysGetPage(pVM, GCPhys);
diff --git a/src/VBox/VMM/VMMAll/PGMAllPool.cpp b/src/VBox/VMM/VMMAll/PGMAllPool.cpp
index 039a848..d1a6dd3 100644
--- a/src/VBox/VMM/VMMAll/PGMAllPool.cpp
+++ b/src/VBox/VMM/VMMAll/PGMAllPool.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/PGMAllShw.h b/src/VBox/VMM/VMMAll/PGMAllShw.h
index 41d6ffa..557ca2b 100644
--- a/src/VBox/VMM/VMMAll/PGMAllShw.h
+++ b/src/VBox/VMM/VMMAll/PGMAllShw.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/REMAll.cpp b/src/VBox/VMM/VMMAll/REMAll.cpp
index 2117464..4947673 100644
--- a/src/VBox/VMM/VMMAll/REMAll.cpp
+++ b/src/VBox/VMM/VMMAll/REMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/SELMAll.cpp b/src/VBox/VMM/VMMAll/SELMAll.cpp
index 86b3f73..163e337 100644
--- a/src/VBox/VMM/VMMAll/SELMAll.cpp
+++ b/src/VBox/VMM/VMMAll/SELMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/TMAllReal.cpp b/src/VBox/VMM/VMMAll/TMAllReal.cpp
index a68a441..a9d01a2 100644
--- a/src/VBox/VMM/VMMAll/TMAllReal.cpp
+++ b/src/VBox/VMM/VMMAll/TMAllReal.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp
index 4b74903..a5c9afa 100644
--- a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp
+++ b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/TRPMAll.cpp b/src/VBox/VMM/VMMAll/TRPMAll.cpp
index 53255b4..916019e 100644
--- a/src/VBox/VMM/VMMAll/TRPMAll.cpp
+++ b/src/VBox/VMM/VMMAll/TRPMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/VMAll.cpp b/src/VBox/VMM/VMMAll/VMAll.cpp
index 2d6a5ad..2e4e16f 100644
--- a/src/VBox/VMM/VMMAll/VMAll.cpp
+++ b/src/VBox/VMM/VMMAll/VMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/VMMAll.cpp b/src/VBox/VMM/VMMAll/VMMAll.cpp
index ae7fc1b..f6482b9 100644
--- a/src/VBox/VMM/VMMAll/VMMAll.cpp
+++ b/src/VBox/VMM/VMMAll/VMMAll.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMAll/VMMAllA.asm b/src/VBox/VMM/VMMAll/VMMAllA.asm
index 7d07774..38b4219 100644
--- a/src/VBox/VMM/VMMAll/VMMAllA.asm
+++ b/src/VBox/VMM/VMMAll/VMMAllA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2009-2010 Oracle Corporation
+; Copyright (C) 2009-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/GIMR0Hv.cpp b/src/VBox/VMM/VMMR0/GIMR0Hv.cpp
index 8764bbe..f9b9d08 100644
--- a/src/VBox/VMM/VMMR0/GIMR0Hv.cpp
+++ b/src/VBox/VMM/VMMR0/GIMR0Hv.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/GMMR0.cpp b/src/VBox/VMM/VMMR0/GMMR0.cpp
index 5accfe2..89fb402 100644
--- a/src/VBox/VMM/VMMR0/GMMR0.cpp
+++ b/src/VBox/VMM/VMMR0/GMMR0.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/GMMR0Internal.h b/src/VBox/VMM/VMMR0/GMMR0Internal.h
index 0ce8986..24106ec 100644
--- a/src/VBox/VMM/VMMR0/GMMR0Internal.h
+++ b/src/VBox/VMM/VMMR0/GMMR0Internal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/GVMMR0.cpp b/src/VBox/VMM/VMMR0/GVMMR0.cpp
index 25ae0a8..0b5de5c 100644
--- a/src/VBox/VMM/VMMR0/GVMMR0.cpp
+++ b/src/VBox/VMM/VMMR0/GVMMR0.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2014 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/GVMMR0Internal.h b/src/VBox/VMM/VMMR0/GVMMR0Internal.h
index 7e937f0..b205a5b 100644
--- a/src/VBox/VMM/VMMR0/GVMMR0Internal.h
+++ b/src/VBox/VMM/VMMR0/GVMMR0Internal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2010 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/HMR0.cpp b/src/VBox/VMM/VMMR0/HMR0.cpp
index 4aaf50e..c37ac76 100644
--- a/src/VBox/VMM/VMMR0/HMR0.cpp
+++ b/src/VBox/VMM/VMMR0/HMR0.cpp
@@ -113,7 +113,6 @@ static struct
         uint8_t                     cPreemptTimerShift;
 
         /** Host CR4 value (set by ring-0 VMX init) */
-        /** @todo This isn't used for anything relevant. Remove later? */
         uint64_t                    u64HostCr4;
 
         /** Host EFER value (set by ring-0 VMX init) */
@@ -144,6 +143,7 @@ static struct
     /** Saved error from detection */
     int32_t                         lLastError;
 
+    /** CPUID 0x80000001 ecx:edx features */
     struct
     {
         uint32_t                    u32AMDFeatureECX;
@@ -164,7 +164,7 @@ static struct
     bool                            fEnabled;
     /** Serialize initialization in HMR0EnableAllCpus. */
     RTONCE                          EnableAllCpusOnce;
-} g_HvmR0;
+} g_HmR0;
 
 
 
@@ -342,70 +342,68 @@ static int hmR0InitIntel(uint32_t u32FeaturesECX, uint32_t u32FeaturesEDX)
          && (u32FeaturesEDX & X86_CPUID_FEATURE_EDX_FXSR)
        )
     {
-        /** @todo move this into a separate function. */
-        g_HvmR0.vmx.Msrs.u64FeatureCtrl = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);
+        /* Read this MSR now as it may be useful for error reporting when initializing VT-x fails. */
+        g_HmR0.vmx.Msrs.u64FeatureCtrl = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);
 
         /*
          * First try use native kernel API for controlling VT-x.
          * (This is only supported by some Mac OS X kernels atm.)
          */
-        int rc = g_HvmR0.lLastError = SUPR0EnableVTx(true /* fEnable */);
-        g_HvmR0.vmx.fUsingSUPR0EnableVTx = rc != VERR_NOT_SUPPORTED;
-        if (g_HvmR0.vmx.fUsingSUPR0EnableVTx)
+        int rc = g_HmR0.lLastError = SUPR0EnableVTx(true /* fEnable */);
+        g_HmR0.vmx.fUsingSUPR0EnableVTx = rc != VERR_NOT_SUPPORTED;
+        if (g_HmR0.vmx.fUsingSUPR0EnableVTx)
         {
             AssertLogRelMsg(rc == VINF_SUCCESS || rc == VERR_VMX_IN_VMX_ROOT_MODE || rc == VERR_VMX_NO_VMX, ("%Rrc\n", rc));
             if (RT_SUCCESS(rc))
             {
-                g_HvmR0.vmx.fSupported = true;
+                g_HmR0.vmx.fSupported = true;
                 rc = SUPR0EnableVTx(false /* fEnable */);
                 AssertLogRelRC(rc);
             }
         }
         else
         {
-            /* We need to check if VT-x has been properly initialized on all
-               CPUs. Some BIOSes do a lousy job. */
             HMR0FIRSTRC FirstRc;
             hmR0FirstRcInit(&FirstRc);
-            g_HvmR0.lLastError = RTMpOnAll(hmR0InitIntelCpu, &FirstRc, NULL);
-            if (RT_SUCCESS(g_HvmR0.lLastError))
-                g_HvmR0.lLastError = hmR0FirstRcGetStatus(&FirstRc);
+            g_HmR0.lLastError = RTMpOnAll(hmR0InitIntelCpu, &FirstRc, NULL);
+            if (RT_SUCCESS(g_HmR0.lLastError))
+                g_HmR0.lLastError = hmR0FirstRcGetStatus(&FirstRc);
         }
-        if (RT_SUCCESS(g_HvmR0.lLastError))
+        if (RT_SUCCESS(g_HmR0.lLastError))
         {
-            /* Reread in case it was changed by hmR0InitIntelCpu(). */
-            g_HvmR0.vmx.Msrs.u64FeatureCtrl = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);
+            /* Reread in case it was changed by SUPR0GetVmxUsability(). */
+            g_HmR0.vmx.Msrs.u64FeatureCtrl = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);
 
             /*
              * Read all relevant registers and MSRs.
              */
-            g_HvmR0.vmx.u64HostCr4          = ASMGetCR4();
-            g_HvmR0.vmx.u64HostEfer         = ASMRdMsr(MSR_K6_EFER);
-            g_HvmR0.vmx.Msrs.u64BasicInfo   = ASMRdMsr(MSR_IA32_VMX_BASIC_INFO);
-            g_HvmR0.vmx.Msrs.VmxPinCtls.u   = ASMRdMsr(MSR_IA32_VMX_PINBASED_CTLS);
-            g_HvmR0.vmx.Msrs.VmxProcCtls.u  = ASMRdMsr(MSR_IA32_VMX_PROCBASED_CTLS);
-            g_HvmR0.vmx.Msrs.VmxExit.u      = ASMRdMsr(MSR_IA32_VMX_EXIT_CTLS);
-            g_HvmR0.vmx.Msrs.VmxEntry.u     = ASMRdMsr(MSR_IA32_VMX_ENTRY_CTLS);
-            g_HvmR0.vmx.Msrs.u64Misc        = ASMRdMsr(MSR_IA32_VMX_MISC);
-            g_HvmR0.vmx.Msrs.u64Cr0Fixed0   = ASMRdMsr(MSR_IA32_VMX_CR0_FIXED0);
-            g_HvmR0.vmx.Msrs.u64Cr0Fixed1   = ASMRdMsr(MSR_IA32_VMX_CR0_FIXED1);
-            g_HvmR0.vmx.Msrs.u64Cr4Fixed0   = ASMRdMsr(MSR_IA32_VMX_CR4_FIXED0);
-            g_HvmR0.vmx.Msrs.u64Cr4Fixed1   = ASMRdMsr(MSR_IA32_VMX_CR4_FIXED1);
-            g_HvmR0.vmx.Msrs.u64VmcsEnum    = ASMRdMsr(MSR_IA32_VMX_VMCS_ENUM);
+            g_HmR0.vmx.u64HostCr4          = ASMGetCR4();
+            g_HmR0.vmx.u64HostEfer         = ASMRdMsr(MSR_K6_EFER);
+            g_HmR0.vmx.Msrs.u64BasicInfo   = ASMRdMsr(MSR_IA32_VMX_BASIC_INFO);
+            g_HmR0.vmx.Msrs.VmxPinCtls.u   = ASMRdMsr(MSR_IA32_VMX_PINBASED_CTLS);
+            g_HmR0.vmx.Msrs.VmxProcCtls.u  = ASMRdMsr(MSR_IA32_VMX_PROCBASED_CTLS);
+            g_HmR0.vmx.Msrs.VmxExit.u      = ASMRdMsr(MSR_IA32_VMX_EXIT_CTLS);
+            g_HmR0.vmx.Msrs.VmxEntry.u     = ASMRdMsr(MSR_IA32_VMX_ENTRY_CTLS);
+            g_HmR0.vmx.Msrs.u64Misc        = ASMRdMsr(MSR_IA32_VMX_MISC);
+            g_HmR0.vmx.Msrs.u64Cr0Fixed0   = ASMRdMsr(MSR_IA32_VMX_CR0_FIXED0);
+            g_HmR0.vmx.Msrs.u64Cr0Fixed1   = ASMRdMsr(MSR_IA32_VMX_CR0_FIXED1);
+            g_HmR0.vmx.Msrs.u64Cr4Fixed0   = ASMRdMsr(MSR_IA32_VMX_CR4_FIXED0);
+            g_HmR0.vmx.Msrs.u64Cr4Fixed1   = ASMRdMsr(MSR_IA32_VMX_CR4_FIXED1);
+            g_HmR0.vmx.Msrs.u64VmcsEnum    = ASMRdMsr(MSR_IA32_VMX_VMCS_ENUM);
             /* VPID 16 bits ASID. */
-            g_HvmR0.uMaxAsid                = 0x10000; /* exclusive */
+            g_HmR0.uMaxAsid                = 0x10000; /* exclusive */
 
-            if (g_HvmR0.vmx.Msrs.VmxProcCtls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_USE_SECONDARY_EXEC_CTRL)
+            if (g_HmR0.vmx.Msrs.VmxProcCtls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_USE_SECONDARY_EXEC_CTRL)
             {
-                g_HvmR0.vmx.Msrs.VmxProcCtls2.u = ASMRdMsr(MSR_IA32_VMX_PROCBASED_CTLS2);
-                if (g_HvmR0.vmx.Msrs.VmxProcCtls2.n.allowed1 & (VMX_VMCS_CTRL_PROC_EXEC2_EPT | VMX_VMCS_CTRL_PROC_EXEC2_VPID))
-                    g_HvmR0.vmx.Msrs.u64EptVpidCaps = ASMRdMsr(MSR_IA32_VMX_EPT_VPID_CAP);
+                g_HmR0.vmx.Msrs.VmxProcCtls2.u = ASMRdMsr(MSR_IA32_VMX_PROCBASED_CTLS2);
+                if (g_HmR0.vmx.Msrs.VmxProcCtls2.n.allowed1 & (VMX_VMCS_CTRL_PROC_EXEC2_EPT | VMX_VMCS_CTRL_PROC_EXEC2_VPID))
+                    g_HmR0.vmx.Msrs.u64EptVpidCaps = ASMRdMsr(MSR_IA32_VMX_EPT_VPID_CAP);
 
-                if (g_HvmR0.vmx.Msrs.VmxProcCtls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_VMFUNC)
-                    g_HvmR0.vmx.Msrs.u64Vmfunc = ASMRdMsr(MSR_IA32_VMX_VMFUNC);
+                if (g_HmR0.vmx.Msrs.VmxProcCtls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_VMFUNC)
+                    g_HmR0.vmx.Msrs.u64Vmfunc = ASMRdMsr(MSR_IA32_VMX_VMFUNC);
             }
 
-            if (!g_HvmR0.vmx.fUsingSUPR0EnableVTx)
+            if (!g_HmR0.vmx.fUsingSUPR0EnableVTx)
             {
                 /*
                  * Enter root mode
@@ -423,7 +421,7 @@ static int hmR0InitIntel(uint32_t u32FeaturesECX, uint32_t u32FeaturesEDX)
                 ASMMemZeroPage(pvScatchPage);
 
                 /* Set revision dword at the beginning of the structure. */
-                *(uint32_t *)pvScatchPage = MSR_IA32_VMX_BASIC_INFO_VMCS_ID(g_HvmR0.vmx.Msrs.u64BasicInfo);
+                *(uint32_t *)pvScatchPage = MSR_IA32_VMX_BASIC_INFO_VMCS_ID(g_HmR0.vmx.Msrs.u64BasicInfo);
 
                 /* Make sure we don't get rescheduled to another cpu during this probe. */
                 RTCCUINTREG fFlags = ASMIntDisableFlags();
@@ -431,12 +429,12 @@ static int hmR0InitIntel(uint32_t u32FeaturesECX, uint32_t u32FeaturesEDX)
                 /*
                  * Check CR4.VMXE
                  */
-                g_HvmR0.vmx.u64HostCr4 = ASMGetCR4();
-                if (!(g_HvmR0.vmx.u64HostCr4 & X86_CR4_VMXE))
+                g_HmR0.vmx.u64HostCr4 = ASMGetCR4();
+                if (!(g_HmR0.vmx.u64HostCr4 & X86_CR4_VMXE))
                 {
                     /* In theory this bit could be cleared behind our back.  Which would cause
                        #UD faults when we try to execute the VMX instructions... */
-                    ASMSetCR4(g_HvmR0.vmx.u64HostCr4 | X86_CR4_VMXE);
+                    ASMSetCR4(g_HmR0.vmx.u64HostCr4 | X86_CR4_VMXE);
                 }
 
                 /*
@@ -447,7 +445,7 @@ static int hmR0InitIntel(uint32_t u32FeaturesECX, uint32_t u32FeaturesEDX)
                 rc = VMXEnable(HCPhysScratchPage);
                 if (RT_SUCCESS(rc))
                 {
-                    g_HvmR0.vmx.fSupported = true;
+                    g_HmR0.vmx.fSupported = true;
                     VMXDisable();
                 }
                 else
@@ -463,58 +461,58 @@ static int hmR0InitIntel(uint32_t u32FeaturesECX, uint32_t u32FeaturesEDX)
                      *
                      * They should fix their code, but until they do we simply refuse to run.
                      */
-                    g_HvmR0.lLastError = VERR_VMX_IN_VMX_ROOT_MODE;
-                    Assert(g_HvmR0.vmx.fSupported == false);
+                    g_HmR0.lLastError = VERR_VMX_IN_VMX_ROOT_MODE;
+                    Assert(g_HmR0.vmx.fSupported == false);
                 }
 
                 /* Restore CR4 again; don't leave the X86_CR4_VMXE flag set
                    if it wasn't so before (some software could incorrectly
                    think it's in VMX mode). */
-                ASMSetCR4(g_HvmR0.vmx.u64HostCr4);
+                ASMSetCR4(g_HmR0.vmx.u64HostCr4);
                 ASMSetFlags(fFlags);
 
                 RTR0MemObjFree(hScatchMemObj, false);
             }
 
-            if (g_HvmR0.vmx.fSupported)
+            if (g_HmR0.vmx.fSupported)
             {
                 rc = VMXR0GlobalInit();
                 if (RT_FAILURE(rc))
-                    g_HvmR0.lLastError = rc;
+                    g_HmR0.lLastError = rc;
 
                 /*
                  * Install the VT-x methods.
                  */
-                g_HvmR0.pfnEnterSession      = VMXR0Enter;
-                g_HvmR0.pfnThreadCtxCallback = VMXR0ThreadCtxCallback;
-                g_HvmR0.pfnSaveHostState     = VMXR0SaveHostState;
-                g_HvmR0.pfnRunGuestCode      = VMXR0RunGuestCode;
-                g_HvmR0.pfnEnableCpu         = VMXR0EnableCpu;
-                g_HvmR0.pfnDisableCpu        = VMXR0DisableCpu;
-                g_HvmR0.pfnInitVM            = VMXR0InitVM;
-                g_HvmR0.pfnTermVM            = VMXR0TermVM;
-                g_HvmR0.pfnSetupVM           = VMXR0SetupVM;
+                g_HmR0.pfnEnterSession      = VMXR0Enter;
+                g_HmR0.pfnThreadCtxCallback = VMXR0ThreadCtxCallback;
+                g_HmR0.pfnSaveHostState     = VMXR0SaveHostState;
+                g_HmR0.pfnRunGuestCode      = VMXR0RunGuestCode;
+                g_HmR0.pfnEnableCpu         = VMXR0EnableCpu;
+                g_HmR0.pfnDisableCpu        = VMXR0DisableCpu;
+                g_HmR0.pfnInitVM            = VMXR0InitVM;
+                g_HmR0.pfnTermVM            = VMXR0TermVM;
+                g_HmR0.pfnSetupVM           = VMXR0SetupVM;
 
                 /*
                  * Check for the VMX-Preemption Timer and adjust for the "VMX-Preemption
                  * Timer Does Not Count Down at the Rate Specified" erratum.
                  */
-                if (g_HvmR0.vmx.Msrs.VmxPinCtls.n.allowed1 & VMX_VMCS_CTRL_PIN_EXEC_PREEMPT_TIMER)
+                if (g_HmR0.vmx.Msrs.VmxPinCtls.n.allowed1 & VMX_VMCS_CTRL_PIN_EXEC_PREEMPT_TIMER)
                 {
-                    g_HvmR0.vmx.fUsePreemptTimer   = true;
-                    g_HvmR0.vmx.cPreemptTimerShift = MSR_IA32_VMX_MISC_PREEMPT_TSC_BIT(g_HvmR0.vmx.Msrs.u64Misc);
+                    g_HmR0.vmx.fUsePreemptTimer   = true;
+                    g_HmR0.vmx.cPreemptTimerShift = MSR_IA32_VMX_MISC_PREEMPT_TSC_BIT(g_HmR0.vmx.Msrs.u64Misc);
                     if (hmR0InitIntelIsSubjectToVmxPreemptionTimerErratum())
-                        g_HvmR0.vmx.cPreemptTimerShift = 0; /* This is about right most of the time here. */
+                        g_HmR0.vmx.cPreemptTimerShift = 0; /* This is about right most of the time here. */
                 }
             }
         }
 #ifdef LOG_ENABLED
         else
-            SUPR0Printf("hmR0InitIntelCpu failed with rc=%d\n", g_HvmR0.lLastError);
+            SUPR0Printf("hmR0InitIntelCpu failed with rc=%d\n", g_HmR0.lLastError);
 #endif
     }
     else
-        g_HvmR0.lLastError = VERR_VMX_NO_VMX;
+        g_HmR0.lLastError = VERR_VMX_NO_VMX;
     return VINF_SUCCESS;
 }
 
@@ -531,7 +529,7 @@ static int hmR0InitAmd(uint32_t u32FeaturesEDX, uint32_t uMaxExtLeaf)
      * We also assume all SVM-enabled CPUs support fxsave/fxrstor.
      */
     int rc;
-    if (   (g_HvmR0.cpuid.u32AMDFeatureECX & X86_CPUID_AMD_FEATURE_ECX_SVM)
+    if (   (g_HmR0.cpuid.u32AMDFeatureECX & X86_CPUID_AMD_FEATURE_ECX_SVM)
         && (u32FeaturesEDX & X86_CPUID_FEATURE_EDX_MSR)
         && (u32FeaturesEDX & X86_CPUID_FEATURE_EDX_FXSR)
         && ASMIsValidExtRange(uMaxExtLeaf)
@@ -542,26 +540,26 @@ static int hmR0InitAmd(uint32_t u32FeaturesEDX, uint32_t uMaxExtLeaf)
         rc = SVMR0GlobalInit();
         if (RT_FAILURE(rc))
         {
-            g_HvmR0.lLastError = rc;
+            g_HmR0.lLastError = rc;
             return rc;
         }
 
         /*
          * Install the AMD-V methods.
          */
-        g_HvmR0.pfnEnterSession      = SVMR0Enter;
-        g_HvmR0.pfnThreadCtxCallback = SVMR0ThreadCtxCallback;
-        g_HvmR0.pfnSaveHostState     = SVMR0SaveHostState;
-        g_HvmR0.pfnRunGuestCode      = SVMR0RunGuestCode;
-        g_HvmR0.pfnEnableCpu         = SVMR0EnableCpu;
-        g_HvmR0.pfnDisableCpu        = SVMR0DisableCpu;
-        g_HvmR0.pfnInitVM            = SVMR0InitVM;
-        g_HvmR0.pfnTermVM            = SVMR0TermVM;
-        g_HvmR0.pfnSetupVM           = SVMR0SetupVM;
+        g_HmR0.pfnEnterSession      = SVMR0Enter;
+        g_HmR0.pfnThreadCtxCallback = SVMR0ThreadCtxCallback;
+        g_HmR0.pfnSaveHostState     = SVMR0SaveHostState;
+        g_HmR0.pfnRunGuestCode      = SVMR0RunGuestCode;
+        g_HmR0.pfnEnableCpu         = SVMR0EnableCpu;
+        g_HmR0.pfnDisableCpu        = SVMR0DisableCpu;
+        g_HmR0.pfnInitVM            = SVMR0InitVM;
+        g_HmR0.pfnTermVM            = SVMR0TermVM;
+        g_HmR0.pfnSetupVM           = SVMR0SetupVM;
 
         /* Query AMD features. */
         uint32_t u32Dummy;
-        ASMCpuId(0x8000000a, &g_HvmR0.svm.u32Rev, &g_HvmR0.uMaxAsid, &u32Dummy, &g_HvmR0.svm.u32Features);
+        ASMCpuId(0x8000000a, &g_HmR0.svm.u32Rev, &g_HmR0.uMaxAsid, &u32Dummy, &g_HmR0.svm.u32Features);
 
         /*
          * We need to check if AMD-V has been properly initialized on all CPUs.
@@ -580,12 +578,12 @@ static int hmR0InitAmd(uint32_t u32FeaturesEDX, uint32_t uMaxExtLeaf)
         if (RT_SUCCESS(rc))
         {
             /* Read the HWCR MSR for diagnostics. */
-            g_HvmR0.svm.u64MsrHwcr = ASMRdMsr(MSR_K8_HWCR);
-            g_HvmR0.svm.fSupported = true;
+            g_HmR0.svm.u64MsrHwcr = ASMRdMsr(MSR_K8_HWCR);
+            g_HmR0.svm.fSupported = true;
         }
         else
         {
-            g_HvmR0.lLastError = rc;
+            g_HmR0.lLastError = rc;
             if (rc == VERR_SVM_DISABLED || rc == VERR_SVM_IN_USE)
                 rc = VINF_SUCCESS; /* Don't fail if AMD-V is disabled or in use. */
         }
@@ -593,7 +591,7 @@ static int hmR0InitAmd(uint32_t u32FeaturesEDX, uint32_t uMaxExtLeaf)
     else
     {
         rc = VINF_SUCCESS;              /* Don't fail if AMD-V is not supported. See @bugref{6785}. */
-        g_HvmR0.lLastError = VERR_SVM_NO_SVM;
+        g_HmR0.lLastError = VERR_SVM_NO_SVM;
     }
     return rc;
 }
@@ -609,35 +607,35 @@ VMMR0_INT_DECL(int) HMR0Init(void)
     /*
      * Initialize the globals.
      */
-    g_HvmR0.fEnabled = false;
+    g_HmR0.fEnabled = false;
     static RTONCE s_OnceInit = RTONCE_INITIALIZER;
-    g_HvmR0.EnableAllCpusOnce = s_OnceInit;
-    for (unsigned i = 0; i < RT_ELEMENTS(g_HvmR0.aCpuInfo); i++)
+    g_HmR0.EnableAllCpusOnce = s_OnceInit;
+    for (unsigned i = 0; i < RT_ELEMENTS(g_HmR0.aCpuInfo); i++)
     {
-        g_HvmR0.aCpuInfo[i].hMemObj = NIL_RTR0MEMOBJ;
-        g_HvmR0.aCpuInfo[i].idCpu   = NIL_RTCPUID;
+        g_HmR0.aCpuInfo[i].hMemObj = NIL_RTR0MEMOBJ;
+        g_HmR0.aCpuInfo[i].idCpu   = NIL_RTCPUID;
     }
 
     /* Fill in all callbacks with placeholders. */
-    g_HvmR0.pfnEnterSession      = hmR0DummyEnter;
-    g_HvmR0.pfnThreadCtxCallback = hmR0DummyThreadCtxCallback;
-    g_HvmR0.pfnSaveHostState     = hmR0DummySaveHostState;
-    g_HvmR0.pfnRunGuestCode      = hmR0DummyRunGuestCode;
-    g_HvmR0.pfnEnableCpu         = hmR0DummyEnableCpu;
-    g_HvmR0.pfnDisableCpu        = hmR0DummyDisableCpu;
-    g_HvmR0.pfnInitVM            = hmR0DummyInitVM;
-    g_HvmR0.pfnTermVM            = hmR0DummyTermVM;
-    g_HvmR0.pfnSetupVM           = hmR0DummySetupVM;
+    g_HmR0.pfnEnterSession      = hmR0DummyEnter;
+    g_HmR0.pfnThreadCtxCallback = hmR0DummyThreadCtxCallback;
+    g_HmR0.pfnSaveHostState     = hmR0DummySaveHostState;
+    g_HmR0.pfnRunGuestCode      = hmR0DummyRunGuestCode;
+    g_HmR0.pfnEnableCpu         = hmR0DummyEnableCpu;
+    g_HmR0.pfnDisableCpu        = hmR0DummyDisableCpu;
+    g_HmR0.pfnInitVM            = hmR0DummyInitVM;
+    g_HmR0.pfnTermVM            = hmR0DummyTermVM;
+    g_HmR0.pfnSetupVM           = hmR0DummySetupVM;
 
     /* Default is global VT-x/AMD-V init. */
-    g_HvmR0.fGlobalInit         = true;
+    g_HmR0.fGlobalInit         = true;
 
     /*
      * Make sure aCpuInfo is big enough for all the CPUs on this system.
      */
-    if (RTMpGetArraySize() > RT_ELEMENTS(g_HvmR0.aCpuInfo))
+    if (RTMpGetArraySize() > RT_ELEMENTS(g_HmR0.aCpuInfo))
     {
-        LogRel(("HM: Too many real CPUs/cores/threads - %u, max %u\n", RTMpGetArraySize(), RT_ELEMENTS(g_HvmR0.aCpuInfo)));
+        LogRel(("HM: Too many real CPUs/cores/threads - %u, max %u\n", RTMpGetArraySize(), RT_ELEMENTS(g_HmR0.aCpuInfo)));
         return VERR_TOO_MANY_CPUS;
     }
 
@@ -659,10 +657,10 @@ VMMR0_INT_DECL(int) HMR0Init(void)
             uint32_t uMaxExtLeaf = ASMCpuId_EAX(0x80000000);
             if (ASMIsValidExtRange(uMaxExtLeaf))
                 ASMCpuId(0x80000001, &u32Dummy, &u32Dummy,
-                         &g_HvmR0.cpuid.u32AMDFeatureECX,
-                         &g_HvmR0.cpuid.u32AMDFeatureEDX);
+                         &g_HmR0.cpuid.u32AMDFeatureECX,
+                         &g_HmR0.cpuid.u32AMDFeatureEDX);
             else
-                g_HvmR0.cpuid.u32AMDFeatureECX = g_HvmR0.cpuid.u32AMDFeatureEDX = 0;
+                g_HmR0.cpuid.u32AMDFeatureECX = g_HmR0.cpuid.u32AMDFeatureEDX = 0;
 
             /* Go to CPU specific initialization code. */
             if (   ASMIsIntelCpuEx(u32VendorEBX, u32VendorECX, u32VendorEDX)
@@ -679,19 +677,19 @@ VMMR0_INT_DECL(int) HMR0Init(void)
                     return rc;
             }
             else
-                g_HvmR0.lLastError = VERR_HM_UNKNOWN_CPU;
+                g_HmR0.lLastError = VERR_HM_UNKNOWN_CPU;
         }
         else
-            g_HvmR0.lLastError = VERR_HM_UNKNOWN_CPU;
+            g_HmR0.lLastError = VERR_HM_UNKNOWN_CPU;
     }
     else
-        g_HvmR0.lLastError = VERR_HM_NO_CPUID;
+        g_HmR0.lLastError = VERR_HM_NO_CPUID;
 
     /*
      * Register notification callbacks that we can use to disable/enable CPUs
      * when brought offline/online or suspending/resuming.
      */
-    if (!g_HvmR0.vmx.fUsingSUPR0EnableVTx)
+    if (!g_HmR0.vmx.fUsingSUPR0EnableVTx)
     {
         rc = RTMpNotificationRegister(hmR0MpEventCallback, NULL);
         AssertRC(rc);
@@ -714,37 +712,33 @@ VMMR0_INT_DECL(int) HMR0Init(void)
 VMMR0_INT_DECL(int) HMR0Term(void)
 {
     int rc;
-    if (   g_HvmR0.vmx.fSupported
-        && g_HvmR0.vmx.fUsingSUPR0EnableVTx)
+    if (   g_HmR0.vmx.fSupported
+        && g_HmR0.vmx.fUsingSUPR0EnableVTx)
     {
         /*
          * Simple if the host OS manages VT-x.
          */
-        Assert(g_HvmR0.fGlobalInit);
+        Assert(g_HmR0.fGlobalInit);
         rc = SUPR0EnableVTx(false /* fEnable */);
 
-        for (unsigned iCpu = 0; iCpu < RT_ELEMENTS(g_HvmR0.aCpuInfo); iCpu++)
+        for (unsigned iCpu = 0; iCpu < RT_ELEMENTS(g_HmR0.aCpuInfo); iCpu++)
         {
-            g_HvmR0.aCpuInfo[iCpu].fConfigured = false;
-            Assert(g_HvmR0.aCpuInfo[iCpu].hMemObj == NIL_RTR0MEMOBJ);
+            g_HmR0.aCpuInfo[iCpu].fConfigured = false;
+            Assert(g_HmR0.aCpuInfo[iCpu].hMemObj == NIL_RTR0MEMOBJ);
         }
     }
     else
     {
-        Assert(!g_HvmR0.vmx.fUsingSUPR0EnableVTx);
-        if (!g_HvmR0.vmx.fUsingSUPR0EnableVTx)
-        {
-            /* Doesn't really matter if this fails. */
-            rc = RTMpNotificationDeregister(hmR0MpEventCallback, NULL);  AssertRC(rc);
-            rc = RTPowerNotificationDeregister(hmR0PowerCallback, NULL); AssertRC(rc);
-        }
-        else
-            rc = VINF_SUCCESS;
+        Assert(!g_HmR0.vmx.fSupported || !g_HmR0.vmx.fUsingSUPR0EnableVTx);
+
+        /* Doesn't really matter if this fails. */
+        rc = RTMpNotificationDeregister(hmR0MpEventCallback, NULL);  AssertRC(rc);
+        rc = RTPowerNotificationDeregister(hmR0PowerCallback, NULL); AssertRC(rc);
 
         /*
          * Disable VT-x/AMD-V on all CPUs if we enabled it before.
          */
-        if (g_HvmR0.fGlobalInit)
+        if (g_HmR0.fGlobalInit)
         {
             HMR0FIRSTRC FirstRc;
             hmR0FirstRcInit(&FirstRc);
@@ -757,12 +751,12 @@ VMMR0_INT_DECL(int) HMR0Term(void)
         /*
          * Free the per-cpu pages used for VT-x and AMD-V.
          */
-        for (unsigned i = 0; i < RT_ELEMENTS(g_HvmR0.aCpuInfo); i++)
+        for (unsigned i = 0; i < RT_ELEMENTS(g_HmR0.aCpuInfo); i++)
         {
-            if (g_HvmR0.aCpuInfo[i].hMemObj != NIL_RTR0MEMOBJ)
+            if (g_HmR0.aCpuInfo[i].hMemObj != NIL_RTR0MEMOBJ)
             {
-                RTR0MemObjFree(g_HvmR0.aCpuInfo[i].hMemObj, false);
-                g_HvmR0.aCpuInfo[i].hMemObj = NIL_RTR0MEMOBJ;
+                RTR0MemObjFree(g_HmR0.aCpuInfo[i].hMemObj, false);
+                g_HmR0.aCpuInfo[i].hMemObj = NIL_RTR0MEMOBJ;
             }
         }
     }
@@ -771,9 +765,9 @@ VMMR0_INT_DECL(int) HMR0Term(void)
      *        hmR0TermIntel()/hmR0TermAmd() and all the VT-x/AMD-V specific bits
      *        should move into their respective modules. */
     /* Finally, call global VT-x/AMD-V termination. */
-    if (g_HvmR0.vmx.fSupported)
+    if (g_HmR0.vmx.fSupported)
         VMXR0GlobalTerm();
-    else if (g_HvmR0.svm.fSupported)
+    else if (g_HmR0.svm.fSupported)
         SVMR0GlobalTerm();
 
     return rc;
@@ -790,7 +784,6 @@ VMMR0_INT_DECL(int) HMR0Term(void)
  */
 static DECLCALLBACK(void) hmR0InitIntelCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
 {
-    /** @todo Unify code with SUPR0QueryVTCaps(). */
     PHMR0FIRSTRC pFirstRc = (PHMR0FIRSTRC)pvUser1;
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /** @todo fix idCpu == index assumption (rainy day) */
@@ -832,10 +825,10 @@ static DECLCALLBACK(void) hmR0InitAmdCpu(RTCPUID idCpu, void *pvUser1, void *pvU
  */
 static int hmR0EnableCpu(PVM pVM, RTCPUID idCpu)
 {
-    PHMGLOBALCPUINFO pCpu = &g_HvmR0.aCpuInfo[idCpu];
+    PHMGLOBALCPUINFO pCpu = &g_HmR0.aCpuInfo[idCpu];
 
     Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /** @todo fix idCpu == index assumption (rainy day) */
-    Assert(idCpu < RT_ELEMENTS(g_HvmR0.aCpuInfo));
+    Assert(idCpu < RT_ELEMENTS(g_HmR0.aCpuInfo));
     Assert(!pCpu->fConfigured);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
@@ -843,18 +836,18 @@ static int hmR0EnableCpu(PVM pVM, RTCPUID idCpu)
     /* Do NOT reset cTlbFlushes here, see @bugref{6255}. */
 
     int rc;
-    if (g_HvmR0.vmx.fSupported && g_HvmR0.vmx.fUsingSUPR0EnableVTx)
-        rc = g_HvmR0.pfnEnableCpu(pCpu, pVM, NULL /* pvCpuPage */, NIL_RTHCPHYS, true, &g_HvmR0.vmx.Msrs);
+    if (g_HmR0.vmx.fSupported && g_HmR0.vmx.fUsingSUPR0EnableVTx)
+        rc = g_HmR0.pfnEnableCpu(pCpu, pVM, NULL /* pvCpuPage */, NIL_RTHCPHYS, true, &g_HmR0.vmx.Msrs);
     else
     {
         AssertLogRelMsgReturn(pCpu->hMemObj != NIL_RTR0MEMOBJ, ("hmR0EnableCpu failed idCpu=%u.\n", idCpu), VERR_HM_IPE_1);
         void    *pvCpuPage     = RTR0MemObjAddress(pCpu->hMemObj);
         RTHCPHYS HCPhysCpuPage = RTR0MemObjGetPagePhysAddr(pCpu->hMemObj, 0 /* iPage */);
 
-        if (g_HvmR0.vmx.fSupported)
-            rc = g_HvmR0.pfnEnableCpu(pCpu, pVM, pvCpuPage, HCPhysCpuPage, false, &g_HvmR0.vmx.Msrs);
+        if (g_HmR0.vmx.fSupported)
+            rc = g_HmR0.pfnEnableCpu(pCpu, pVM, pvCpuPage, HCPhysCpuPage, false, &g_HmR0.vmx.Msrs);
         else
-            rc = g_HvmR0.pfnEnableCpu(pCpu, pVM, pvCpuPage, HCPhysCpuPage, false, NULL /* pvArg */);
+            rc = g_HmR0.pfnEnableCpu(pCpu, pVM, pvCpuPage, HCPhysCpuPage, false, NULL /* pvArg */);
     }
     if (RT_SUCCESS(rc))
         pCpu->fConfigured = true;
@@ -874,7 +867,7 @@ static DECLCALLBACK(void) hmR0EnableCpuCallback(RTCPUID idCpu, void *pvUser1, vo
 {
     PVM             pVM      = (PVM)pvUser1;     /* can be NULL! */
     PHMR0FIRSTRC    pFirstRc = (PHMR0FIRSTRC)pvUser2;
-    AssertReturnVoid(g_HvmR0.fGlobalInit);
+    AssertReturnVoid(g_HmR0.fGlobalInit);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     hmR0FirstRcSetStatus(pFirstRc, hmR0EnableCpu(pVM, idCpu));
 }
@@ -897,27 +890,27 @@ static DECLCALLBACK(int32_t) hmR0EnableAllCpuOnce(void *pvUser)
      * Note! There is a potential race between this function and the suspend
      *       notification.  Kind of unlikely though, so ignored for now.
      */
-    AssertReturn(!g_HvmR0.fEnabled, VERR_HM_ALREADY_ENABLED_IPE);
-    ASMAtomicWriteBool(&g_HvmR0.fEnabled, true);
+    AssertReturn(!g_HmR0.fEnabled, VERR_HM_ALREADY_ENABLED_IPE);
+    ASMAtomicWriteBool(&g_HmR0.fEnabled, true);
 
     /*
      * The global init variable is set by the first VM.
      */
-    g_HvmR0.fGlobalInit = pVM->hm.s.fGlobalInit;
+    g_HmR0.fGlobalInit = pVM->hm.s.fGlobalInit;
 
 #ifdef VBOX_STRICT
-    for (unsigned i = 0; i < RT_ELEMENTS(g_HvmR0.aCpuInfo); i++)
+    for (unsigned i = 0; i < RT_ELEMENTS(g_HmR0.aCpuInfo); i++)
     {
-        Assert(g_HvmR0.aCpuInfo[i].hMemObj == NIL_RTR0MEMOBJ);
-        Assert(!g_HvmR0.aCpuInfo[i].fConfigured);
-        Assert(!g_HvmR0.aCpuInfo[i].cTlbFlushes);
-        Assert(!g_HvmR0.aCpuInfo[i].uCurrentAsid);
+        Assert(g_HmR0.aCpuInfo[i].hMemObj == NIL_RTR0MEMOBJ);
+        Assert(!g_HmR0.aCpuInfo[i].fConfigured);
+        Assert(!g_HmR0.aCpuInfo[i].cTlbFlushes);
+        Assert(!g_HmR0.aCpuInfo[i].uCurrentAsid);
     }
 #endif
 
     int rc;
-    if (   g_HvmR0.vmx.fSupported
-        && g_HvmR0.vmx.fUsingSUPR0EnableVTx)
+    if (   g_HmR0.vmx.fSupported
+        && g_HmR0.vmx.fUsingSUPR0EnableVTx)
     {
         /*
          * Global VT-x initialization API (only darwin for now).
@@ -926,7 +919,7 @@ static DECLCALLBACK(int32_t) hmR0EnableAllCpuOnce(void *pvUser)
         if (RT_SUCCESS(rc))
         {
             /* If the host provides a VT-x init API, then we'll rely on that for global init. */
-            g_HvmR0.fGlobalInit = pVM->hm.s.fGlobalInit = true;
+            g_HmR0.fGlobalInit = pVM->hm.s.fGlobalInit = true;
         }
         else
             AssertMsgFailed(("hmR0EnableAllCpuOnce/SUPR0EnableVTx: rc=%Rrc\n", rc));
@@ -937,16 +930,16 @@ static DECLCALLBACK(int32_t) hmR0EnableAllCpuOnce(void *pvUser)
          * We're doing the job ourselves.
          */
         /* Allocate one page per cpu for the global VT-x and AMD-V pages */
-        for (unsigned i = 0; i < RT_ELEMENTS(g_HvmR0.aCpuInfo); i++)
+        for (unsigned i = 0; i < RT_ELEMENTS(g_HmR0.aCpuInfo); i++)
         {
-            Assert(g_HvmR0.aCpuInfo[i].hMemObj == NIL_RTR0MEMOBJ);
+            Assert(g_HmR0.aCpuInfo[i].hMemObj == NIL_RTR0MEMOBJ);
 
             if (RTMpIsCpuPossible(RTMpCpuIdFromSetIndex(i)))
             {
-                rc = RTR0MemObjAllocCont(&g_HvmR0.aCpuInfo[i].hMemObj, PAGE_SIZE, false /* executable R0 mapping */);
+                rc = RTR0MemObjAllocCont(&g_HmR0.aCpuInfo[i].hMemObj, PAGE_SIZE, false /* executable R0 mapping */);
                 AssertLogRelRCReturn(rc, rc);
 
-                void *pvR0 = RTR0MemObjAddress(g_HvmR0.aCpuInfo[i].hMemObj); Assert(pvR0);
+                void *pvR0 = RTR0MemObjAddress(g_HmR0.aCpuInfo[i].hMemObj); Assert(pvR0);
                 ASMMemZeroPage(pvR0);
             }
         }
@@ -955,7 +948,7 @@ static DECLCALLBACK(int32_t) hmR0EnableAllCpuOnce(void *pvUser)
     }
 
     if (   RT_SUCCESS(rc)
-        && g_HvmR0.fGlobalInit)
+        && g_HmR0.fGlobalInit)
     {
         /* First time, so initialize each cpu/core. */
         HMR0FIRSTRC FirstRc;
@@ -978,10 +971,10 @@ static DECLCALLBACK(int32_t) hmR0EnableAllCpuOnce(void *pvUser)
 VMMR0_INT_DECL(int) HMR0EnableAllCpus(PVM pVM)
 {
     /* Make sure we don't touch HM after we've disabled HM in preparation of a suspend. */
-    if (ASMAtomicReadBool(&g_HvmR0.fSuspended))
+    if (ASMAtomicReadBool(&g_HmR0.fSuspended))
         return VERR_HM_SUSPEND_PENDING;
 
-    return RTOnce(&g_HvmR0.EnableAllCpusOnce, hmR0EnableAllCpuOnce, pVM);
+    return RTOnce(&g_HmR0.EnableAllCpusOnce, hmR0EnableAllCpuOnce, pVM);
 }
 
 
@@ -995,12 +988,12 @@ VMMR0_INT_DECL(int) HMR0EnableAllCpus(PVM pVM)
  */
 static int hmR0DisableCpu(RTCPUID idCpu)
 {
-    PHMGLOBALCPUINFO pCpu = &g_HvmR0.aCpuInfo[idCpu];
+    PHMGLOBALCPUINFO pCpu = &g_HmR0.aCpuInfo[idCpu];
 
-    Assert(!g_HvmR0.vmx.fSupported || !g_HvmR0.vmx.fUsingSUPR0EnableVTx);
+    Assert(!g_HmR0.vmx.fSupported || !g_HmR0.vmx.fUsingSUPR0EnableVTx);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /** @todo fix idCpu == index assumption (rainy day) */
-    Assert(idCpu < RT_ELEMENTS(g_HvmR0.aCpuInfo));
+    Assert(idCpu < RT_ELEMENTS(g_HmR0.aCpuInfo));
     Assert(!pCpu->fConfigured || pCpu->hMemObj != NIL_RTR0MEMOBJ);
     AssertRelease(idCpu == RTMpCpuId());
 
@@ -1013,7 +1006,7 @@ static int hmR0DisableCpu(RTCPUID idCpu)
         void    *pvCpuPage     = RTR0MemObjAddress(pCpu->hMemObj);
         RTHCPHYS HCPhysCpuPage = RTR0MemObjGetPagePhysAddr(pCpu->hMemObj, 0);
 
-        rc = g_HvmR0.pfnDisableCpu(pCpu, pvCpuPage, HCPhysCpuPage);
+        rc = g_HmR0.pfnDisableCpu(pCpu, pvCpuPage, HCPhysCpuPage);
         AssertRCReturn(rc, rc);
 
         pCpu->fConfigured = false;
@@ -1036,7 +1029,7 @@ static int hmR0DisableCpu(RTCPUID idCpu)
 static DECLCALLBACK(void) hmR0DisableCpuCallback(RTCPUID idCpu, void *pvUser1, void *pvUser2)
 {
     PHMR0FIRSTRC pFirstRc = (PHMR0FIRSTRC)pvUser2; NOREF(pvUser1);
-    AssertReturnVoid(g_HvmR0.fGlobalInit);
+    AssertReturnVoid(g_HmR0.fGlobalInit);
     hmR0FirstRcSetStatus(pFirstRc, hmR0DisableCpu(idCpu));
 }
 
@@ -1067,6 +1060,7 @@ static DECLCALLBACK(void) hmR0DisableCpuOnSpecificCallback(RTCPUID idCpu, void *
 static DECLCALLBACK(void) hmR0MpEventCallback(RTMPEVENT enmEvent, RTCPUID idCpu, void *pvData)
 {
     NOREF(pvData);
+    Assert(!g_HmR0.vmx.fSupported || !g_HmR0.vmx.fUsingSUPR0EnableVTx);
 
     /*
      * We only care about uninitializing a CPU that is going offline. When a
@@ -1107,7 +1101,7 @@ static DECLCALLBACK(void) hmR0MpEventCallback(RTMPEVENT enmEvent, RTCPUID idCpu,
 static DECLCALLBACK(void) hmR0PowerCallback(RTPOWEREVENT enmEvent, void *pvUser)
 {
     NOREF(pvUser);
-    Assert(!g_HvmR0.vmx.fSupported || !g_HvmR0.vmx.fUsingSUPR0EnableVTx);
+    Assert(!g_HmR0.vmx.fSupported || !g_HmR0.vmx.fUsingSUPR0EnableVTx);
 
 #ifdef LOG_ENABLED
     if (enmEvent == RTPOWEREVENT_SUSPEND)
@@ -1117,9 +1111,9 @@ static DECLCALLBACK(void) hmR0PowerCallback(RTPOWEREVENT enmEvent, void *pvUser)
 #endif
 
     if (enmEvent == RTPOWEREVENT_SUSPEND)
-        ASMAtomicWriteBool(&g_HvmR0.fSuspended, true);
+        ASMAtomicWriteBool(&g_HmR0.fSuspended, true);
 
-    if (g_HvmR0.fEnabled)
+    if (g_HmR0.fEnabled)
     {
         int         rc;
         HMR0FIRSTRC FirstRc;
@@ -1127,7 +1121,7 @@ static DECLCALLBACK(void) hmR0PowerCallback(RTPOWEREVENT enmEvent, void *pvUser)
 
         if (enmEvent == RTPOWEREVENT_SUSPEND)
         {
-            if (g_HvmR0.fGlobalInit)
+            if (g_HmR0.fGlobalInit)
             {
                 /* Turn off VT-x or AMD-V on all CPUs. */
                 rc = RTMpOnAll(hmR0DisableCpuCallback, NULL /* pvUser 1 */, &FirstRc);
@@ -1139,7 +1133,7 @@ static DECLCALLBACK(void) hmR0PowerCallback(RTPOWEREVENT enmEvent, void *pvUser)
         {
             /* Reinit the CPUs from scratch as the suspend state might have
                messed with the MSRs. (lousy BIOSes as usual) */
-            if (g_HvmR0.vmx.fSupported)
+            if (g_HmR0.vmx.fSupported)
                 rc = RTMpOnAll(hmR0InitIntelCpu, &FirstRc, NULL);
             else
                 rc = RTMpOnAll(hmR0InitAmdCpu, &FirstRc, NULL);
@@ -1150,7 +1144,7 @@ static DECLCALLBACK(void) hmR0PowerCallback(RTPOWEREVENT enmEvent, void *pvUser)
             if (RT_FAILURE(rc))
                 SUPR0Printf("hmR0PowerCallback hmR0InitXxxCpu failed with %Rc\n", rc);
 #endif
-            if (g_HvmR0.fGlobalInit)
+            if (g_HmR0.fGlobalInit)
             {
                 /* Turn VT-x or AMD-V back on on all CPUs. */
                 rc = RTMpOnAll(hmR0EnableCpuCallback, NULL /* pVM */, &FirstRc /* output ignored */);
@@ -1161,7 +1155,7 @@ static DECLCALLBACK(void) hmR0PowerCallback(RTPOWEREVENT enmEvent, void *pvUser)
     }
 
     if (enmEvent == RTPOWEREVENT_RESUME)
-        ASMAtomicWriteBool(&g_HvmR0.fSuspended, false);
+        ASMAtomicWriteBool(&g_HmR0.fSuspended, false);
 }
 
 
@@ -1186,27 +1180,27 @@ VMMR0_INT_DECL(int) HMR0InitVM(PVM pVM)
 #endif
 
     /* Make sure we don't touch HM after we've disabled HM in preparation of a suspend. */
-    if (ASMAtomicReadBool(&g_HvmR0.fSuspended))
+    if (ASMAtomicReadBool(&g_HmR0.fSuspended))
         return VERR_HM_SUSPEND_PENDING;
 
     /*
      * Copy globals to the VM structure.
      */
-    pVM->hm.s.vmx.fSupported            = g_HvmR0.vmx.fSupported;
-    pVM->hm.s.svm.fSupported            = g_HvmR0.svm.fSupported;
-
-    pVM->hm.s.vmx.fUsePreemptTimer     &= g_HvmR0.vmx.fUsePreemptTimer;     /* Can be overridden by CFGM. See HMR3Init(). */
-    pVM->hm.s.vmx.cPreemptTimerShift    = g_HvmR0.vmx.cPreemptTimerShift;
-    pVM->hm.s.vmx.u64HostCr4            = g_HvmR0.vmx.u64HostCr4;
-    pVM->hm.s.vmx.u64HostEfer           = g_HvmR0.vmx.u64HostEfer;
-    pVM->hm.s.vmx.Msrs                  = g_HvmR0.vmx.Msrs;
-    pVM->hm.s.svm.u64MsrHwcr            = g_HvmR0.svm.u64MsrHwcr;
-    pVM->hm.s.svm.u32Rev                = g_HvmR0.svm.u32Rev;
-    pVM->hm.s.svm.u32Features           = g_HvmR0.svm.u32Features;
-    pVM->hm.s.cpuid.u32AMDFeatureECX    = g_HvmR0.cpuid.u32AMDFeatureECX;
-    pVM->hm.s.cpuid.u32AMDFeatureEDX    = g_HvmR0.cpuid.u32AMDFeatureEDX;
-    pVM->hm.s.lLastError                = g_HvmR0.lLastError;
-    pVM->hm.s.uMaxAsid                  = g_HvmR0.uMaxAsid;
+    pVM->hm.s.vmx.fSupported            = g_HmR0.vmx.fSupported;
+    pVM->hm.s.svm.fSupported            = g_HmR0.svm.fSupported;
+
+    pVM->hm.s.vmx.fUsePreemptTimer     &= g_HmR0.vmx.fUsePreemptTimer;     /* Can be overridden by CFGM. See HMR3Init(). */
+    pVM->hm.s.vmx.cPreemptTimerShift    = g_HmR0.vmx.cPreemptTimerShift;
+    pVM->hm.s.vmx.u64HostCr4            = g_HmR0.vmx.u64HostCr4;
+    pVM->hm.s.vmx.u64HostEfer           = g_HmR0.vmx.u64HostEfer;
+    pVM->hm.s.vmx.Msrs                  = g_HmR0.vmx.Msrs;
+    pVM->hm.s.svm.u64MsrHwcr            = g_HmR0.svm.u64MsrHwcr;
+    pVM->hm.s.svm.u32Rev                = g_HmR0.svm.u32Rev;
+    pVM->hm.s.svm.u32Features           = g_HmR0.svm.u32Features;
+    pVM->hm.s.cpuid.u32AMDFeatureECX    = g_HmR0.cpuid.u32AMDFeatureECX;
+    pVM->hm.s.cpuid.u32AMDFeatureEDX    = g_HmR0.cpuid.u32AMDFeatureEDX;
+    pVM->hm.s.lLastError                = g_HmR0.lLastError;
+    pVM->hm.s.uMaxAsid                  = g_HmR0.uMaxAsid;
 
     if (!pVM->hm.s.cMaxResumeLoops) /* allow ring-3 overrides */
     {
@@ -1234,7 +1228,7 @@ VMMR0_INT_DECL(int) HMR0InitVM(PVM pVM)
     /*
      * Call the hardware specific initialization method.
      */
-    return g_HvmR0.pfnInitVM(pVM);
+    return g_HmR0.pfnInitVM(pVM);
 }
 
 
@@ -1255,7 +1249,7 @@ VMMR0_INT_DECL(int) HMR0TermVM(PVM pVM)
      * Note! We might be preparing for a suspend, so the pfnTermVM() functions should probably not
      * mess with VT-x/AMD-V features on the CPU, currently all they do is free memory so this is safe.
      */
-    return g_HvmR0.pfnTermVM(pVM);
+    return g_HmR0.pfnTermVM(pVM);
 }
 
 
@@ -1273,7 +1267,7 @@ VMMR0_INT_DECL(int) HMR0SetupVM(PVM pVM)
     AssertReturn(pVM, VERR_INVALID_PARAMETER);
 
     /* Make sure we don't touch HM after we've disabled HM in preparation of a suspend. */
-    AssertReturn(!ASMAtomicReadBool(&g_HvmR0.fSuspended), VERR_HM_SUSPEND_PENDING);
+    AssertReturn(!ASMAtomicReadBool(&g_HmR0.fSuspended), VERR_HM_SUSPEND_PENDING);
 
     /* On first entry we'll sync everything. */
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
@@ -1289,8 +1283,9 @@ VMMR0_INT_DECL(int) HMR0SetupVM(PVM pVM)
 
     /* Enable VT-x or AMD-V if local init is required. */
     int rc;
-    if (!g_HvmR0.fGlobalInit)
+    if (!g_HmR0.fGlobalInit)
     {
+        Assert(!g_HmR0.vmx.fSupported || !g_HmR0.vmx.fUsingSUPR0EnableVTx);
         rc = hmR0EnableCpu(pVM, idCpu);
         if (RT_FAILURE(rc))
         {
@@ -1300,11 +1295,12 @@ VMMR0_INT_DECL(int) HMR0SetupVM(PVM pVM)
     }
 
     /* Setup VT-x or AMD-V. */
-    rc = g_HvmR0.pfnSetupVM(pVM);
+    rc = g_HmR0.pfnSetupVM(pVM);
 
     /* Disable VT-x or AMD-V if local init was done before. */
-    if (!g_HvmR0.fGlobalInit)
+    if (!g_HmR0.fGlobalInit)
     {
+        Assert(!g_HmR0.vmx.fSupported || !g_HmR0.vmx.fUsingSUPR0EnableVTx);
         int rc2 = hmR0DisableCpu(idCpu);
         AssertRC(rc2);
     }
@@ -1329,7 +1325,7 @@ VMMR0_INT_DECL(int) HMR0EnterCpu(PVMCPU pVCpu)
 
     int              rc    = VINF_SUCCESS;
     RTCPUID          idCpu = RTMpCpuId();
-    PHMGLOBALCPUINFO pCpu = &g_HvmR0.aCpuInfo[idCpu];
+    PHMGLOBALCPUINFO pCpu = &g_HmR0.aCpuInfo[idCpu];
     AssertPtr(pCpu);
 
     /* Enable VT-x or AMD-V if local init is required, or enable if it's a freshly onlined CPU. */
@@ -1357,7 +1353,7 @@ VMMR0_INT_DECL(int) HMR0EnterCpu(PVMCPU pVCpu)
 VMMR0_INT_DECL(int) HMR0Enter(PVM pVM, PVMCPU pVCpu)
 {
     /* Make sure we can't enter a session after we've disabled HM in preparation of a suspend. */
-    AssertReturn(!ASMAtomicReadBool(&g_HvmR0.fSuspended), VERR_HM_SUSPEND_PENDING);
+    AssertReturn(!ASMAtomicReadBool(&g_HmR0.fSuspended), VERR_HM_SUSPEND_PENDING);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
     /* Load the bare minimum state required for entering HM. */
@@ -1370,16 +1366,16 @@ VMMR0_INT_DECL(int) HMR0Enter(PVM pVM, PVMCPU pVCpu)
 #endif
 
     RTCPUID          idCpu = RTMpCpuId();
-    PHMGLOBALCPUINFO pCpu  = &g_HvmR0.aCpuInfo[idCpu];
+    PHMGLOBALCPUINFO pCpu  = &g_HmR0.aCpuInfo[idCpu];
     Assert(pCpu);
     Assert(HMCPU_CF_IS_SET(pVCpu, HM_CHANGED_HOST_CONTEXT | HM_CHANGED_HOST_GUEST_SHARED_STATE));
 
-    rc = g_HvmR0.pfnEnterSession(pVM, pVCpu, pCpu);
+    rc = g_HmR0.pfnEnterSession(pVM, pVCpu, pCpu);
     AssertMsgRCReturn(rc, ("pfnEnterSession failed. rc=%Rrc pVCpu=%p HostCpuId=%u\n", rc, pVCpu, idCpu), rc);
 
     /* Load the host-state as we may be resuming code after a longjmp and quite
        possibly now be scheduled on a different CPU. */
-    rc = g_HvmR0.pfnSaveHostState(pVM, pVCpu);
+    rc = g_HmR0.pfnSaveHostState(pVM, pVCpu);
     AssertMsgRCReturn(rc, ("pfnSaveHostState failed. rc=%Rrc pVCpu=%p HostCpuId=%u\n", rc, pVCpu, idCpu), rc);
 
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
@@ -1409,9 +1405,9 @@ VMMR0_INT_DECL(int) HMR0LeaveCpu(PVMCPU pVCpu)
     VMCPU_ASSERT_EMT_RETURN(pVCpu, VERR_HM_WRONG_CPU);
 
     RTCPUID          idCpu = RTMpCpuId();
-    PHMGLOBALCPUINFO pCpu  = &g_HvmR0.aCpuInfo[idCpu];
+    PHMGLOBALCPUINFO pCpu  = &g_HmR0.aCpuInfo[idCpu];
 
-    if (   !g_HvmR0.fGlobalInit
+    if (   !g_HmR0.fGlobalInit
         && pCpu->fConfigured)
     {
         int rc = hmR0DisableCpu(idCpu);
@@ -1440,9 +1436,9 @@ VMMR0_INT_DECL(void) HMR0ThreadCtxCallback(RTTHREADCTXEVENT enmEvent, void *pvUs
 {
     PVMCPU pVCpu = (PVMCPU)pvUser;
     Assert(pVCpu);
-    Assert(g_HvmR0.pfnThreadCtxCallback);
+    Assert(g_HmR0.pfnThreadCtxCallback);
 
-    g_HvmR0.pfnThreadCtxCallback(enmEvent, pVCpu, g_HvmR0.fGlobalInit);
+    g_HmR0.pfnThreadCtxCallback(enmEvent, pVCpu, g_HmR0.fGlobalInit);
 }
 
 
@@ -1462,10 +1458,10 @@ VMMR0_INT_DECL(int) HMR0RunGuestCode(PVM pVM, PVMCPU pVCpu)
     /* With thread-context hooks we would be running this code with preemption enabled. */
     if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
     {
-        PHMGLOBALCPUINFO pCpu = &g_HvmR0.aCpuInfo[RTMpCpuId()];
+        PHMGLOBALCPUINFO pCpu = &g_HmR0.aCpuInfo[RTMpCpuId()];
         Assert(!VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL));
         Assert(pCpu->fConfigured);
-        AssertReturn(!ASMAtomicReadBool(&g_HvmR0.fSuspended), VERR_HM_SUSPEND_PENDING);
+        AssertReturn(!ASMAtomicReadBool(&g_HmR0.fSuspended), VERR_HM_SUSPEND_PENDING);
     }
 #endif
 
@@ -1475,7 +1471,7 @@ VMMR0_INT_DECL(int) HMR0RunGuestCode(PVM pVM, PVMCPU pVCpu)
     PGMRZDynMapStartAutoSet(pVCpu);
 #endif
 
-    int rc = g_HvmR0.pfnRunGuestCode(pVM, pVCpu, CPUMQueryGuestCtxPtr(pVCpu));
+    int rc = g_HmR0.pfnRunGuestCode(pVM, pVCpu, CPUMQueryGuestCtxPtr(pVCpu));
 
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
     PGMRZDynMapReleaseAutoSet(pVCpu);
@@ -1551,7 +1547,7 @@ VMMR0_INT_DECL(int)   HMR0TestSwitcher3264(PVM pVM)
  */
 VMMR0_INT_DECL(bool) HMR0SuspendPending(void)
 {
-    return ASMAtomicReadBool(&g_HvmR0.fSuspended);
+    return ASMAtomicReadBool(&g_HmR0.fSuspended);
 }
 
 
@@ -1565,8 +1561,8 @@ VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpu(void)
 {
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     RTCPUID idCpu = RTMpCpuId();
-    Assert(idCpu < RT_ELEMENTS(g_HvmR0.aCpuInfo));
-    return &g_HvmR0.aCpuInfo[idCpu];
+    Assert(idCpu < RT_ELEMENTS(g_HmR0.aCpuInfo));
+    return &g_HmR0.aCpuInfo[idCpu];
 }
 
 
@@ -1579,8 +1575,8 @@ VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpu(void)
  */
 VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpuEx(RTCPUID idCpu)
 {
-    Assert(idCpu < RT_ELEMENTS(g_HvmR0.aCpuInfo));
-    return &g_HvmR0.aCpuInfo[idCpu];
+    Assert(idCpu < RT_ELEMENTS(g_HmR0.aCpuInfo));
+    return &g_HmR0.aCpuInfo[idCpu];
 }
 
 
@@ -1628,6 +1624,7 @@ VMMR0_INT_DECL(void) HMR0SavePendingIOPortWrite(PVMCPU pVCpu, RTGCPTR GCPtrRip,
     return;
 }
 
+#ifdef VBOX_WITH_RAW_MODE
 
 /**
  * Raw-mode switcher hook - disable VT-x if it's active *and* the current
@@ -1647,7 +1644,7 @@ VMMR0_INT_DECL(int) HMR0EnterSwitcher(PVM pVM, VMMSWITCHER enmSwitcher, bool *pf
     *pfVTxDisabled = false;
 
     /* No such issues with AMD-V */
-    if (!g_HvmR0.vmx.fSupported)
+    if (!g_HmR0.vmx.fSupported)
         return VINF_SUCCESS;
 
     /* Check if the switching we're up to is safe. */
@@ -1669,7 +1666,7 @@ VMMR0_INT_DECL(int) HMR0EnterSwitcher(PVM pVM, VMMSWITCHER enmSwitcher, bool *pf
 
     /* When using SUPR0EnableVTx we must let the host suspend and resume VT-x,
        regardless of whether we're currently using VT-x or not. */
-    if (g_HvmR0.vmx.fUsingSUPR0EnableVTx)
+    if (g_HmR0.vmx.fUsingSUPR0EnableVTx)
     {
         *pfVTxDisabled = SUPR0SuspendVTxOnCpu();
         return VINF_SUCCESS;
@@ -1679,11 +1676,11 @@ VMMR0_INT_DECL(int) HMR0EnterSwitcher(PVM pVM, VMMSWITCHER enmSwitcher, bool *pf
     *        system... */
 
     /* Nothing to do if we haven't enabled VT-x. */
-    if (!g_HvmR0.fEnabled)
+    if (!g_HmR0.fEnabled)
         return VINF_SUCCESS;
 
     /* Local init implies the CPU is currently not in VMX root mode. */
-    if (!g_HvmR0.fGlobalInit)
+    if (!g_HmR0.fGlobalInit)
         return VINF_SUCCESS;
 
     /* Ok, disable VT-x. */
@@ -1711,23 +1708,24 @@ VMMR0_INT_DECL(void) HMR0LeaveSwitcher(PVM pVM, bool fVTxDisabled)
     if (!fVTxDisabled)
         return;         /* nothing to do */
 
-    Assert(g_HvmR0.vmx.fSupported);
-    if (g_HvmR0.vmx.fUsingSUPR0EnableVTx)
+    Assert(g_HmR0.vmx.fSupported);
+    if (g_HmR0.vmx.fUsingSUPR0EnableVTx)
         SUPR0ResumeVTxOnCpu(fVTxDisabled);
     else
     {
-        Assert(g_HvmR0.fEnabled);
-        Assert(g_HvmR0.fGlobalInit);
+        Assert(g_HmR0.fEnabled);
+        Assert(g_HmR0.fGlobalInit);
 
         PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
         AssertReturnVoid(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ);
 
         void           *pvCpuPage     = RTR0MemObjAddress(pCpu->hMemObj);
         RTHCPHYS        HCPhysCpuPage = RTR0MemObjGetPagePhysAddr(pCpu->hMemObj, 0);
-        VMXR0EnableCpu(pCpu, pVM, pvCpuPage, HCPhysCpuPage, false, &g_HvmR0.vmx.Msrs);
+        VMXR0EnableCpu(pCpu, pVM, pvCpuPage, HCPhysCpuPage, false, &g_HmR0.vmx.Msrs);
     }
 }
 
+#endif /* VBOX_WITH_RAW_MODE */
 #ifdef VBOX_STRICT
 
 /**
diff --git a/src/VBox/VMM/VMMR0/HMR0Mixed.mac b/src/VBox/VMM/VMMR0/HMR0Mixed.mac
index fe79bb8..e2b99fe 100644
--- a/src/VBox/VMM/VMMR0/HMR0Mixed.mac
+++ b/src/VBox/VMM/VMMR0/HMR0Mixed.mac
@@ -7,7 +7,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/HMSVMR0.h b/src/VBox/VMM/VMMR0/HMSVMR0.h
index aed968f..1456af0 100644
--- a/src/VBox/VMM/VMMR0/HMSVMR0.h
+++ b/src/VBox/VMM/VMMR0/HMSVMR0.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/HMVMXR0.cpp b/src/VBox/VMM/VMMR0/HMVMXR0.cpp
index 8b04cc9..47fd170 100644
--- a/src/VBox/VMM/VMMR0/HMVMXR0.cpp
+++ b/src/VBox/VMM/VMMR0/HMVMXR0.cpp
@@ -1002,7 +1002,7 @@ static int hmR0VmxStructsAlloc(PVM pVM)
          * transparent accesses of specific MSRs.
          *
          * If the condition for enabling MSR bitmaps changes here, don't forget to
-         * update HMIsMsrBitmapsAvailable().
+         * update HMAreMsrBitmapsAvailable().
          */
         if (pVM->hm.s.vmx.Msrs.VmxProcCtls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_USE_MSR_BITMAPS)
         {
@@ -7316,8 +7316,8 @@ static int hmR0VmxExitToRing3(PVM pVM, PVMCPU pVCpu, PCPUMCTX pMixedCtx, int rcE
 
     /* If we're emulating an instruction, we shouldn't have any TRPM traps pending
        and if we're injecting an event we should have a TRPM trap pending. */
-    Assert(rcExit != VINF_EM_RAW_INJECT_TRPM_EVENT || TRPMHasTrap(pVCpu));
-    Assert(rcExit != VINF_EM_RAW_EMULATE_INSTR || !TRPMHasTrap(pVCpu));
+    AssertMsg(rcExit != VINF_EM_RAW_INJECT_TRPM_EVENT || TRPMHasTrap(pVCpu), ("%Rrc\n", rcExit));
+    AssertMsg(rcExit != VINF_EM_RAW_EMULATE_INSTR || !TRPMHasTrap(pVCpu), ("%Rrc\n", rcExit));
 
     /* Save guest state and restore host state bits. */
     int rc = hmR0VmxLeaveSession(pVM, pVCpu, pMixedCtx);
@@ -11365,6 +11365,7 @@ HMVMX_EXIT_DECL hmR0VmxExitIoInstr(PVMCPU pVCpu, PCPUMCTX pMixedCtx, PVMXTRANSIE
                   || rcStrict == VINF_EM_RAW_EMULATE_INSTR
                   || rcStrict == VINF_EM_DBG_BREAKPOINT
                   || rcStrict == VINF_EM_RAW_GUEST_TRAP
+                  || rcStrict == VINF_EM_RAW_TO_R3
                   || rcStrict == VINF_TRPM_XCPT_DISPATCHED, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
     }
 #endif
diff --git a/src/VBox/VMM/VMMR0/HMVMXR0.h b/src/VBox/VMM/VMMR0/HMVMXR0.h
index 46248cc..c671caf 100644
--- a/src/VBox/VMM/VMMR0/HMVMXR0.h
+++ b/src/VBox/VMM/VMMR0/HMVMXR0.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/PDMR0Device.cpp b/src/VBox/VMM/VMMR0/PDMR0Device.cpp
index e3886db..a43727f 100644
--- a/src/VBox/VMM/VMMR0/PDMR0Device.cpp
+++ b/src/VBox/VMM/VMMR0/PDMR0Device.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/PDMR0Driver.cpp b/src/VBox/VMM/VMMR0/PDMR0Driver.cpp
index fb9781f..355521f 100644
--- a/src/VBox/VMM/VMMR0/PDMR0Driver.cpp
+++ b/src/VBox/VMM/VMMR0/PDMR0Driver.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/PGMR0.cpp b/src/VBox/VMM/VMMR0/PGMR0.cpp
index 3e45adc..07a61a9 100644
--- a/src/VBox/VMM/VMMR0/PGMR0.cpp
+++ b/src/VBox/VMM/VMMR0/PGMR0.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/PGMR0Bth.h b/src/VBox/VMM/VMMR0/PGMR0Bth.h
index ca4a5a8..648e1fc 100644
--- a/src/VBox/VMM/VMMR0/PGMR0Bth.h
+++ b/src/VBox/VMM/VMMR0/PGMR0Bth.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp b/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp
index f70c063..607d5f1 100644
--- a/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp
+++ b/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/TRPMR0.cpp b/src/VBox/VMM/VMMR0/TRPMR0.cpp
index dd8affe..b96a7eb 100644
--- a/src/VBox/VMM/VMMR0/TRPMR0.cpp
+++ b/src/VBox/VMM/VMMR0/TRPMR0.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/TRPMR0A.asm b/src/VBox/VMM/VMMR0/TRPMR0A.asm
index 55adbcc..cefbafc 100644
--- a/src/VBox/VMM/VMMR0/TRPMR0A.asm
+++ b/src/VBox/VMM/VMMR0/TRPMR0A.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2011 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/VMMR0.cpp b/src/VBox/VMM/VMMR0/VMMR0.cpp
index 57d325f..7fd3902 100644
--- a/src/VBox/VMM/VMMR0/VMMR0.cpp
+++ b/src/VBox/VMM/VMMR0/VMMR0.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -77,7 +77,7 @@ RT_C_DECLS_END
 *******************************************************************************/
 /** Drag in necessary library bits.
  * The runtime lives here (in VMMR0.r0) and VBoxDD*R0.r0 links against us. */
-PFNRT g_VMMGCDeps[] =
+PFNRT g_VMMR0Deps[] =
 {
     (PFNRT)RTCrc32,
     (PFNRT)RTOnce,
@@ -874,14 +874,15 @@ VMMR0DECL(void) VMMR0EntryFast(PVM pVM, VMCPUID idCpu, VMMR0OPERATION enmOperati
          */
         case VMMR0_DO_RAW_RUN:
         {
-#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+#ifdef VBOX_WITH_RAW_MODE
+# ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
             /* Some safety precautions first. */
             if (RT_UNLIKELY(!PGMGetHyperCR3(pVCpu)))
             {
                 pVCpu->vmm.s.iLastGZRc = VERR_PGM_NO_CR3_SHADOW_ROOT;
                 break;
             }
-#endif
+# endif
 
             /*
              * Disable preemption.
@@ -901,9 +902,9 @@ VMMR0DECL(void) VMMR0EntryFast(PVM pVM, VMCPUID idCpu, VMMR0OPERATION enmOperati
                 /*
                  * Commit the CPU identifiers and update the periodict preemption timer if it's active.
                  */
-#ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
+# ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
                 CPUMR0SetLApic(pVCpu, iHostCpuSet);
-#endif
+# endif
                 pVCpu->iHostCpuSet = iHostCpuSet;
                 ASMAtomicWriteU32(&pVCpu->idHostCpu, idHostCpu);
 
@@ -953,10 +954,10 @@ VMMR0DECL(void) VMMR0EntryFast(PVM pVM, VMCPUID idCpu, VMMR0OPERATION enmOperati
 
                     /* Fire dtrace probe and collect statistics. */
                     VBOXVMM_R0_VMM_RETURN_TO_RING3_RC(pVCpu, CPUMQueryGuestCtxPtr(pVCpu), rc);
-#ifdef VBOX_WITH_STATISTICS
+# ifdef VBOX_WITH_STATISTICS
                     STAM_COUNTER_INC(&pVM->vmm.s.StatRunRC);
                     vmmR0RecordRC(pVM, pVCpu, rc);
-#endif
+# endif
                 }
                 else
                     pVCpu->vmm.s.iLastGZRc = rc;
@@ -988,6 +989,10 @@ VMMR0DECL(void) VMMR0EntryFast(PVM pVM, VMCPUID idCpu, VMMR0OPERATION enmOperati
                 else
                     pVCpu->vmm.s.iLastGZRc = VERR_INVALID_CPU_INDEX;
             }
+
+#else  /* !VBOX_WITH_RAW_MODE */
+            pVCpu->vmm.s.iLastGZRc = VERR_RAW_MODE_NOT_SUPPORTED;
+#endif
             break;
         }
 
@@ -1341,6 +1346,7 @@ static int vmmR0EntryExWorker(PVM pVM, VMCPUID idCpu, VMMR0OPERATION enmOperatio
          */
         case VMMR0_DO_CALL_HYPERVISOR:
         {
+#ifdef VBOX_WITH_RAW_MODE
             /*
              * Validate input / context.
              */
@@ -1349,10 +1355,10 @@ static int vmmR0EntryExWorker(PVM pVM, VMCPUID idCpu, VMMR0OPERATION enmOperatio
             if (RT_UNLIKELY(pVM->cCpus != 1))
                 return VERR_INVALID_PARAMETER;
             PVMCPU pVCpu = &pVM->aCpus[idCpu];
-#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+# ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
             if (RT_UNLIKELY(!PGMGetHyperCR3(pVCpu)))
                 return VERR_PGM_NO_CR3_SHADOW_ROOT;
-#endif
+# endif
 
             /*
              * Disable interrupts.
@@ -1383,9 +1389,9 @@ static int vmmR0EntryExWorker(PVM pVM, VMCPUID idCpu, VMMR0OPERATION enmOperatio
             /*
              * Commit the CPU identifiers.
              */
-#ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
+# ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
             CPUMR0SetLApic(pVCpu, iHostCpuSet);
-#endif
+# endif
             pVCpu->iHostCpuSet = iHostCpuSet;
             ASMAtomicWriteU32(&pVCpu->idHostCpu, idHostCpu);
 
@@ -1418,6 +1424,10 @@ static int vmmR0EntryExWorker(PVM pVM, VMCPUID idCpu, VMMR0OPERATION enmOperatio
             ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
             ASMSetFlags(fFlags);
             return rc;
+
+#else  /* !VBOX_WITH_RAW_MODE */
+            return VERR_RAW_MODE_NOT_SUPPORTED;
+#endif
         }
 
         /*
diff --git a/src/VBox/VMM/VMMR0/VMMR0.def b/src/VBox/VMM/VMMR0/VMMR0.def
index 9b2326b..0b4bf36 100644
--- a/src/VBox/VMM/VMMR0/VMMR0.def
+++ b/src/VBox/VMM/VMMR0/VMMR0.def
@@ -23,6 +23,7 @@ EXPORTS
     PDMCritSectEnterDebug
     PDMCritSectIsOwner
     PDMCritSectLeave
+    PDMHCCritSectScheduleExitEvent
     PDMCritSectTryEnter
     PDMCritSectTryEnterDebug
     PDMQueueAlloc
diff --git a/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm b/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm
index 6c3116f..a793fa0 100644
--- a/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm
+++ b/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2011 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm b/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm
index 8a1c9db..0bbf874 100644
--- a/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm
+++ b/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2011 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/VMMR0TripleFaultHack.cpp b/src/VBox/VMM/VMMR0/VMMR0TripleFaultHack.cpp
index 59f8000..6ba93f5 100644
--- a/src/VBox/VMM/VMMR0/VMMR0TripleFaultHack.cpp
+++ b/src/VBox/VMM/VMMR0/VMMR0TripleFaultHack.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR0/VMMR0TripleFaultHackA.asm b/src/VBox/VMM/VMMR0/VMMR0TripleFaultHackA.asm
index eff2e3a..0046e6f 100644
--- a/src/VBox/VMM/VMMR0/VMMR0TripleFaultHackA.asm
+++ b/src/VBox/VMM/VMMR0/VMMR0TripleFaultHackA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2011-2012 Oracle Corporation
+; Copyright (C) 2011-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/CFGM.cpp b/src/VBox/VMM/VMMR3/CFGM.cpp
index cb7b9a5..c2591ed 100644
--- a/src/VBox/VMM/VMMR3/CFGM.cpp
+++ b/src/VBox/VMM/VMMR3/CFGM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/CSAM.cpp b/src/VBox/VMM/VMMR3/CSAM.cpp
index 7702e81..2758e84 100644
--- a/src/VBox/VMM/VMMR3/CSAM.cpp
+++ b/src/VBox/VMM/VMMR3/CSAM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGF.cpp b/src/VBox/VMM/VMMR3/DBGF.cpp
index 553095c..c578c1c 100644
--- a/src/VBox/VMM/VMMR3/DBGF.cpp
+++ b/src/VBox/VMM/VMMR3/DBGF.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGFAddr.cpp b/src/VBox/VMM/VMMR3/DBGFAddr.cpp
index e285118..d3a4765 100644
--- a/src/VBox/VMM/VMMR3/DBGFAddr.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFAddr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp b/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp
index dbc2c00..795245b 100644
--- a/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGFBp.cpp b/src/VBox/VMM/VMMR3/DBGFBp.cpp
index ff7c432..086fcaa 100644
--- a/src/VBox/VMM/VMMR3/DBGFBp.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFBp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp b/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp
index 797ff65..102be29 100644
--- a/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -50,6 +50,7 @@
 #define LOG_GROUP LOG_GROUP_DBGF
 #include <iprt/param.h>
 #include <iprt/file.h>
+#include <iprt/mem.h>
 
 #include "DBGFInternal.h"
 
@@ -77,12 +78,12 @@
 /*******************************************************************************
 *   Global Variables                                                           *
 *******************************************************************************/
-static const int s_NoteAlign  = 8;
-static const int s_cbNoteName = 16;
+static const int g_NoteAlign  = 8;
+static const int g_cbNoteName = 16;
 
-/* These strings *HAVE* to be 8-byte aligned */
-static const char *s_pcszCoreVBoxCore = "VBCORE";
-static const char *s_pcszCoreVBoxCpu  = "VBCPU";
+/* The size of these strings (incl. NULL terminator) must align to 8 bytes (g_NoteAlign) and -not- 4 bytes. */
+static const char *g_pcszCoreVBoxCore = "VBCORE";
+static const char *g_pcszCoreVBoxCpu  = "VBCPU";
 
 
 /*******************************************************************************
@@ -91,7 +92,7 @@ static const char *s_pcszCoreVBoxCpu  = "VBCPU";
 /**
  * Guest core writer data.
  *
- * Used to pass parameters from DBGFR3CoreWrite to dbgfR3CoreWriteRendezvous.
+ * Used to pass parameters from DBGFR3CoreWrite to dbgfR3CoreWriteRendezvous().
  */
 typedef struct DBGFCOREDATA
 {
@@ -161,12 +162,12 @@ static int Elf64WriteProgHdr(RTFILE hFile, uint32_t Type, uint32_t fFlags, uint6
 {
     Elf64_Phdr ProgHdr;
     RT_ZERO(ProgHdr);
-    ProgHdr.p_type          = Type;
-    ProgHdr.p_flags         = fFlags;
-    ProgHdr.p_offset        = offFileData;
-    ProgHdr.p_filesz        = cbFileData;
-    ProgHdr.p_memsz         = cbMemData;
-    ProgHdr.p_paddr         = Phys;
+    ProgHdr.p_type   = Type;
+    ProgHdr.p_flags  = fFlags;
+    ProgHdr.p_offset = offFileData;
+    ProgHdr.p_filesz = cbFileData;
+    ProgHdr.p_memsz  = cbMemData;
+    ProgHdr.p_paddr  = Phys;
 
     return RTFileWrite(hFile, &ProgHdr, sizeof(ProgHdr), NULL /* all */);
 }
@@ -184,11 +185,11 @@ static uint64_t Elf64NoteSectionSize(const char *pszName, uint64_t cbData)
 {
     uint64_t cbNote = sizeof(Elf64_Nhdr);
 
-    size_t cchName      = strlen(pszName) + 1;
-    size_t cchNameAlign = RT_ALIGN_Z(cchName, s_NoteAlign);
+    size_t cbName      = strlen(pszName) + 1;
+    size_t cbNameAlign = RT_ALIGN_Z(cbName, g_NoteAlign);
 
-    cbNote += cchNameAlign;
-    cbNote += RT_ALIGN_64(cbData, s_NoteAlign);
+    cbNote += cbNameAlign;
+    cbNote += RT_ALIGN_64(cbData, g_NoteAlign);
     return cbNote;
 }
 
@@ -209,38 +210,39 @@ static int Elf64WriteNoteHdr(RTFILE hFile, uint16_t Type, const char *pszName, c
     AssertReturn(pcvData, VERR_INVALID_POINTER);
     AssertReturn(cbData > 0, VERR_NO_DATA);
 
-    char szNoteName[s_cbNoteName];
+    char szNoteName[g_cbNoteName];
     RT_ZERO(szNoteName);
     RTStrCopy(szNoteName, sizeof(szNoteName), pszName);
 
-    size_t cchName       = strlen(szNoteName) + 1;
-    size_t cchNameAlign  = RT_ALIGN_Z(cchName, s_NoteAlign);
-    uint64_t cbDataAlign = RT_ALIGN_64(cbData, s_NoteAlign);
+    size_t   cbName      = strlen(szNoteName) + 1;
+    size_t   cbNameAlign = RT_ALIGN_Z(cbName, g_NoteAlign);
+    uint64_t cbDataAlign = RT_ALIGN_64(cbData, g_NoteAlign);
 
     /*
      * Yell loudly and bail if we are going to be writing a core file that is not compatible with
      * both Solaris and the 64-bit ELF spec. which dictates 8-byte alignment. See @bugref{5211} comment #3.
      */
-    if (cchNameAlign - cchName > 3)
+    if (cbNameAlign - cbName > 3)
     {
-        LogRel((DBGFLOG_NAME ": Elf64WriteNoteHdr pszName=%s cchName=%u cchNameAlign=%u, cchName aligns to 4 not 8-bytes!\n", pszName, cchName,
-                cchNameAlign));
+        LogRel((DBGFLOG_NAME ": Elf64WriteNoteHdr pszName=%s cbName=%u cbNameAlign=%u, cbName aligns to 4 not 8-bytes!\n",
+                pszName, cbName, cbNameAlign));
         return VERR_INVALID_PARAMETER;
     }
 
     if (cbDataAlign - cbData > 3)
     {
-        LogRel((DBGFLOG_NAME ": Elf64WriteNoteHdr pszName=%s cbData=%u cbDataAlign=%u, cbData aligns to 4 not 8-bytes!\n", pszName, cbData,
-                cbDataAlign));
+        LogRel((DBGFLOG_NAME ": Elf64WriteNoteHdr pszName=%s cbData=%u cbDataAlign=%u, cbData aligns to 4 not 8-bytes!\n",
+                pszName, cbData, cbDataAlign));
         return VERR_INVALID_PARAMETER;
     }
 
     static const char s_achPad[7] = { 0, 0, 0, 0, 0, 0, 0 };
-    AssertCompile(sizeof(s_achPad) >= s_NoteAlign - 1);
+    AssertCompile(sizeof(s_achPad) >= g_NoteAlign - 1);
 
     Elf64_Nhdr ElfNoteHdr;
     RT_ZERO(ElfNoteHdr);
-    ElfNoteHdr.n_namesz = (Elf64_Word)cchName - 1; /* Again, a discrepancy between ELF-64 and Solaris (see @bugref{5211} comment #3), we will follow ELF-64 */
+    ElfNoteHdr.n_namesz = (Elf64_Word)cbName - 1;    /* Again, a discrepancy between ELF-64 and Solaris,
+                                                        we will follow ELF-64, see @bugref{5211} comment #3. */
     ElfNoteHdr.n_type   = Type;
     ElfNoteHdr.n_descsz = (Elf64_Word)cbDataAlign;
 
@@ -253,14 +255,14 @@ static int Elf64WriteNoteHdr(RTFILE hFile, uint16_t Type, const char *pszName, c
         /*
          * Write note name.
          */
-        rc = RTFileWrite(hFile, szNoteName, cchName, NULL /* all */);
+        rc = RTFileWrite(hFile, szNoteName, cbName, NULL /* all */);
         if (RT_SUCCESS(rc))
         {
             /*
              * Write note name padding if required.
              */
-            if (cchNameAlign > cchName)
-                rc = RTFileWrite(hFile, s_achPad, cchNameAlign - cchName, NULL);
+            if (cbNameAlign > cbName)
+                rc = RTFileWrite(hFile, s_achPad, cbNameAlign - cbName, NULL);
 
             if (RT_SUCCESS(rc))
             {
@@ -281,8 +283,8 @@ static int Elf64WriteNoteHdr(RTFILE hFile, uint16_t Type, const char *pszName, c
     }
 
     if (RT_FAILURE(rc))
-        LogRel((DBGFLOG_NAME ": RTFileWrite failed. rc=%Rrc pszName=%s cchName=%u cchNameAlign=%u cbData=%u cbDataAlign=%u\n",
-                rc, pszName, cchName, cchNameAlign, cbData, cbDataAlign));
+        LogRel((DBGFLOG_NAME ": RTFileWrite failed. rc=%Rrc pszName=%s cbName=%u cbNameAlign=%u cbData=%u cbDataAlign=%u\n",
+                rc, pszName, cbName, cbNameAlign, cbData, cbDataAlign));
 
     return rc;
 }
@@ -308,7 +310,79 @@ static uint32_t dbgfR3GetRamRangeCount(PVM pVM)
 
 
 /**
- * Worker function for dbgfR3CoreWrite which does the writing.
+ * Gets the guest-CPU context suitable for dumping into the core file.
+ *
+ * @param   pCtx        Pointer to the guest-CPU context.
+ * @param   pDbgfCpu    Where to dump the guest-CPU data.
+ */
+static void dbgfR3GetCoreCpu(PCPUMCTX pCtx, PDBGFCORECPU pDbgfCpu)
+{
+#define DBGFCOPYSEL(a_dbgfsel, a_cpumselreg) \
+    do { \
+        (a_dbgfsel).uBase  = (a_cpumselreg).u64Base; \
+        (a_dbgfsel).uLimit = (a_cpumselreg).u32Limit; \
+        (a_dbgfsel).uAttr  = (a_cpumselreg).Attr.u; \
+        (a_dbgfsel).uSel   = (a_cpumselreg).Sel; \
+    } while (0)
+
+    pDbgfCpu->rax             = pCtx->rax;
+    pDbgfCpu->rbx             = pCtx->rbx;
+    pDbgfCpu->rcx             = pCtx->rcx;
+    pDbgfCpu->rdx             = pCtx->rdx;
+    pDbgfCpu->rsi             = pCtx->rsi;
+    pDbgfCpu->rdi             = pCtx->rdi;
+    pDbgfCpu->r8              = pCtx->r8;
+    pDbgfCpu->r9              = pCtx->r9;
+    pDbgfCpu->r10             = pCtx->r10;
+    pDbgfCpu->r11             = pCtx->r11;
+    pDbgfCpu->r12             = pCtx->r12;
+    pDbgfCpu->r13             = pCtx->r13;
+    pDbgfCpu->r14             = pCtx->r14;
+    pDbgfCpu->r15             = pCtx->r15;
+    pDbgfCpu->rip             = pCtx->rip;
+    pDbgfCpu->rsp             = pCtx->rsp;
+    pDbgfCpu->rbp             = pCtx->rbp;
+    DBGFCOPYSEL(pDbgfCpu->cs, pCtx->cs);
+    DBGFCOPYSEL(pDbgfCpu->ds, pCtx->ds);
+    DBGFCOPYSEL(pDbgfCpu->es, pCtx->es);
+    DBGFCOPYSEL(pDbgfCpu->fs, pCtx->fs);
+    DBGFCOPYSEL(pDbgfCpu->gs, pCtx->gs);
+    DBGFCOPYSEL(pDbgfCpu->ss, pCtx->ss);
+    pDbgfCpu->cr0             = pCtx->cr0;
+    pDbgfCpu->cr2             = pCtx->cr2;
+    pDbgfCpu->cr3             = pCtx->cr3;
+    pDbgfCpu->cr4             = pCtx->cr4;
+    AssertCompile(RT_ELEMENTS(pDbgfCpu->dr) == RT_ELEMENTS(pCtx->dr));
+    for (unsigned i = 0; i < RT_ELEMENTS(pDbgfCpu->dr); i++)
+        pDbgfCpu->dr[i] = pCtx->dr[i];
+    pDbgfCpu->gdtr.uAddr      = pCtx->gdtr.pGdt;
+    pDbgfCpu->gdtr.cb         = pCtx->gdtr.cbGdt;
+    pDbgfCpu->idtr.uAddr      = pCtx->idtr.pIdt;
+    pDbgfCpu->idtr.cb         = pCtx->idtr.cbIdt;
+    DBGFCOPYSEL(pDbgfCpu->ldtr, pCtx->ldtr);
+    DBGFCOPYSEL(pDbgfCpu->tr,   pCtx->tr);
+    pDbgfCpu->sysenter.cs     = pCtx->SysEnter.cs;
+    pDbgfCpu->sysenter.eip    = pCtx->SysEnter.eip;
+    pDbgfCpu->sysenter.esp    = pCtx->SysEnter.esp;
+    pDbgfCpu->msrEFER         = pCtx->msrEFER;
+    pDbgfCpu->msrSTAR         = pCtx->msrSTAR;
+    pDbgfCpu->msrPAT          = pCtx->msrPAT;
+    pDbgfCpu->msrLSTAR        = pCtx->msrLSTAR;
+    pDbgfCpu->msrCSTAR        = pCtx->msrCSTAR;
+    pDbgfCpu->msrSFMASK       = pCtx->msrSFMASK;
+    pDbgfCpu->msrKernelGSBase = pCtx->msrKERNELGSBASE;
+    pDbgfCpu->msrApicBase     = pCtx->msrApicBase;
+    pDbgfCpu->aXcr[0]         = pCtx->aXcr[0];
+    pDbgfCpu->aXcr[1]         = pCtx->aXcr[1];
+    AssertCompile(sizeof(pDbgfCpu->ext) == sizeof(*pCtx->pXStateR3));
+    memcpy(&pDbgfCpu->ext, pCtx->pXStateR3, sizeof(pDbgfCpu->ext));
+
+#undef DBGFCOPYSEL
+}
+
+
+/**
+ * Worker function for dbgfR3CoreWrite() which does the writing.
  *
  * @returns VBox status code
  * @param   pVM                 Pointer to the VM.
@@ -325,27 +399,27 @@ static int dbgfR3CoreWriteWorker(PVM pVM, RTFILE hFile)
 
     DBGFCOREDESCRIPTOR CoreDescriptor;
     RT_ZERO(CoreDescriptor);
-    CoreDescriptor.u32Magic         = DBGFCORE_MAGIC;
-    CoreDescriptor.u32FmtVersion    = DBGFCORE_FMT_VERSION;
-    CoreDescriptor.cbSelf           = sizeof(CoreDescriptor);
-    CoreDescriptor.u32VBoxVersion   = VBOX_FULL_VERSION;
-    CoreDescriptor.u32VBoxRevision  = VMMGetSvnRev();
-    CoreDescriptor.cCpus            = pVM->cCpus;
+    CoreDescriptor.u32Magic           = DBGFCORE_MAGIC;
+    CoreDescriptor.u32FmtVersion      = DBGFCORE_FMT_VERSION;
+    CoreDescriptor.cbSelf             = sizeof(CoreDescriptor);
+    CoreDescriptor.u32VBoxVersion     = VBOX_FULL_VERSION;
+    CoreDescriptor.u32VBoxRevision    = VMMGetSvnRev();
+    CoreDescriptor.cCpus              = pVM->cCpus;
 
     Log((DBGFLOG_NAME ": CoreDescriptor Version=%u Revision=%u\n", CoreDescriptor.u32VBoxVersion, CoreDescriptor.u32VBoxRevision));
 
     /*
      * Compute the file layout (see pg_dbgf_vmcore).
      */
-    uint64_t const offElfHdr        = RTFileTell(hFile);
-    uint64_t const offNoteSection   = offElfHdr         + sizeof(Elf64_Ehdr);
-    uint64_t const offLoadSections  = offNoteSection    + sizeof(Elf64_Phdr);
-    uint64_t const cbLoadSections   = cMemRanges * sizeof(Elf64_Phdr);
-    uint64_t const offCoreDescriptor= offLoadSections   + cbLoadSections;
-    uint64_t const cbCoreDescriptor = Elf64NoteSectionSize(s_pcszCoreVBoxCore, sizeof(CoreDescriptor));
-    uint64_t const offCpuDumps      = offCoreDescriptor + cbCoreDescriptor;
-    uint64_t const cbCpuDumps       = pVM->cCpus * Elf64NoteSectionSize(s_pcszCoreVBoxCpu, sizeof(CPUMCTX));
-    uint64_t const offMemory        = offCpuDumps       + cbCpuDumps;
+    uint64_t const offElfHdr          = RTFileTell(hFile);
+    uint64_t const offNoteSection     = offElfHdr         + sizeof(Elf64_Ehdr);
+    uint64_t const offLoadSections    = offNoteSection    + sizeof(Elf64_Phdr);
+    uint64_t const cbLoadSections     = cMemRanges * sizeof(Elf64_Phdr);
+    uint64_t const offCoreDescriptor  = offLoadSections   + cbLoadSections;
+    uint64_t const cbCoreDescriptor   = Elf64NoteSectionSize(g_pcszCoreVBoxCore, sizeof(CoreDescriptor));
+    uint64_t const offCpuDumps        = offCoreDescriptor + cbCoreDescriptor;
+    uint64_t const cbCpuDumps         = pVM->cCpus * Elf64NoteSectionSize(g_pcszCoreVBoxCpu, sizeof(DBGFCORECPU));
+    uint64_t const offMemory          = offCpuDumps       + cbCpuDumps;
 
     uint64_t const offNoteSectionData = offCoreDescriptor;
     uint64_t const cbNoteSectionData  = cbCoreDescriptor + cbCpuDumps;
@@ -417,29 +491,47 @@ static int dbgfR3CoreWriteWorker(PVM pVM, RTFILE hFile)
      * Write the Core descriptor note header and data.
      */
     Assert(RTFileTell(hFile) == offCoreDescriptor);
-    rc = Elf64WriteNoteHdr(hFile, NT_VBOXCORE, s_pcszCoreVBoxCore, &CoreDescriptor, sizeof(CoreDescriptor));
+    rc = Elf64WriteNoteHdr(hFile, NT_VBOXCORE, g_pcszCoreVBoxCore, &CoreDescriptor, sizeof(CoreDescriptor));
     if (RT_FAILURE(rc))
     {
-        LogRel((DBGFLOG_NAME ": Elf64WriteNoteHdr failed for Note '%s' rc=%Rrc\n", s_pcszCoreVBoxCore, rc));
+        LogRel((DBGFLOG_NAME ": Elf64WriteNoteHdr failed for Note '%s' rc=%Rrc\n", g_pcszCoreVBoxCore, rc));
         return rc;
     }
 
     /*
      * Write the CPU context note headers and data.
      */
-    /** @todo r=ramshankar: Dump a more standardized CPU structure rather than
-     *        dumping CPUMCTX and bump the core file version number. */
     Assert(RTFileTell(hFile) == offCpuDumps);
+    PDBGFCORECPU pDbgfCoreCpu = (PDBGFCORECPU)RTMemAlloc(sizeof(*pDbgfCoreCpu));
+    if (RT_UNLIKELY(!pDbgfCoreCpu))
+    {
+        LogRel((DBGFLOG_NAME ": failed to alloc %u bytes for DBGFCORECPU\n", sizeof(*pDbgfCoreCpu)));
+        return VERR_NO_MEMORY;
+    }
+
     for (uint32_t iCpu = 0; iCpu < pVM->cCpus; iCpu++)
     {
-        PCPUMCTX pCpuCtx = CPUMQueryGuestCtxPtr(&pVM->aCpus[iCpu]);
-        rc = Elf64WriteNoteHdr(hFile, NT_VBOXCPU, s_pcszCoreVBoxCpu, pCpuCtx, sizeof(CPUMCTX));
+        PVMCPU      pVCpu = &pVM->aCpus[iCpu];
+        PCPUMCTX    pCtx  = CPUMQueryGuestCtxPtr(pVCpu);
+        if (RT_UNLIKELY(!pCtx))
+        {
+            LogRel((DBGFLOG_NAME ": CPUMQueryGuestCtxPtr failed for vCPU[%u]\n", iCpu));
+            RTMemFree(pDbgfCoreCpu);
+            return VERR_INVALID_POINTER;
+        }
+
+        RT_BZERO(pDbgfCoreCpu, sizeof(*pDbgfCoreCpu));
+        dbgfR3GetCoreCpu(pCtx, pDbgfCoreCpu);
+        rc = Elf64WriteNoteHdr(hFile, NT_VBOXCPU, g_pcszCoreVBoxCpu, pDbgfCoreCpu, sizeof(*pDbgfCoreCpu));
         if (RT_FAILURE(rc))
         {
             LogRel((DBGFLOG_NAME ": Elf64WriteNoteHdr failed for vCPU[%u] rc=%Rrc\n", iCpu, rc));
+            RTMemFree(pDbgfCoreCpu);
             return rc;
         }
     }
+    RTMemFree(pDbgfCoreCpu);
+    pDbgfCoreCpu = NULL;
 
     /*
      * Write memory ranges.
@@ -493,7 +585,7 @@ static int dbgfR3CoreWriteWorker(PVM pVM, RTFILE hFile)
 
 
 /**
- * EMT Rendezvous worker function for DBGFR3CoreWrite.
+ * EMT Rendezvous worker function for DBGFR3CoreWrite().
  *
  * @param   pVM              Pointer to the VM.
  * @param   pVCpu            The handle of the calling VCPU.
diff --git a/src/VBox/VMM/VMMR3/DBGFCpu.cpp b/src/VBox/VMM/VMMR3/DBGFCpu.cpp
index afb5843..cf0ebd1 100644
--- a/src/VBox/VMM/VMMR3/DBGFCpu.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFCpu.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGFDisas.cpp b/src/VBox/VMM/VMMR3/DBGFDisas.cpp
index 319963d..6b6c77a 100644
--- a/src/VBox/VMM/VMMR3/DBGFDisas.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFDisas.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGFLog.cpp b/src/VBox/VMM/VMMR3/DBGFLog.cpp
index 099b983..a65e19a 100644
--- a/src/VBox/VMM/VMMR3/DBGFLog.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFLog.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGFMem.cpp b/src/VBox/VMM/VMMR3/DBGFMem.cpp
index c601302..c6f3ceb 100644
--- a/src/VBox/VMM/VMMR3/DBGFMem.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFMem.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2013 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGFModule.cpp b/src/VBox/VMM/VMMR3/DBGFModule.cpp
index 2813a61..00456b6 100644
--- a/src/VBox/VMM/VMMR3/DBGFModule.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFModule.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGFOS.cpp b/src/VBox/VMM/VMMR3/DBGFOS.cpp
index 1222d1c..8a008e3 100644
--- a/src/VBox/VMM/VMMR3/DBGFOS.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFOS.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -620,4 +620,3 @@ VMMR3DECL(void *) DBGFR3OSQueryInterface(PUVM pUVM, DBGFOSINTERFACE enmIf)
     return pvIf;
 }
 
-
diff --git a/src/VBox/VMM/VMMR3/DBGFR3Trace.cpp b/src/VBox/VMM/VMMR3/DBGFR3Trace.cpp
index e3c77c8..41e156b 100644
--- a/src/VBox/VMM/VMMR3/DBGFR3Trace.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFR3Trace.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGFReg.cpp b/src/VBox/VMM/VMMR3/DBGFReg.cpp
index 0122826..179efc1 100644
--- a/src/VBox/VMM/VMMR3/DBGFReg.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFReg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/DBGFStack.cpp b/src/VBox/VMM/VMMR3/DBGFStack.cpp
index b6244e7..b14a6a5 100644
--- a/src/VBox/VMM/VMMR3/DBGFStack.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFStack.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/EM.cpp b/src/VBox/VMM/VMMR3/EM.cpp
index 12a7acc..f52bbe5 100644
--- a/src/VBox/VMM/VMMR3/EM.cpp
+++ b/src/VBox/VMM/VMMR3/EM.cpp
@@ -1574,6 +1574,10 @@ int emR3HighPriorityPostForcedActions(PVM pVM, PVMCPU pVCpu, int rc)
             VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_HM_UPDATE_PAE_PDPES);
     }
 
+    /* IEM has pending work (typically memory write after INS instruction). */
+    if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_IEM))
+        rc = VBOXSTRICTRC_TODO(IEMR3DoPendingAction(pVCpu, rc));
+
 #ifdef VBOX_WITH_RAW_MODE
     if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_CSAM_PENDING_ACTION))
         CSAMR3DoPendingAction(pVM, pVCpu);
diff --git a/src/VBox/VMM/VMMR3/EMHM.cpp b/src/VBox/VMM/VMMR3/EMHM.cpp
index 17d0bc1..59267f3 100644
--- a/src/VBox/VMM/VMMR3/EMHM.cpp
+++ b/src/VBox/VMM/VMMR3/EMHM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/EMR3Dbg.cpp b/src/VBox/VMM/VMMR3/EMR3Dbg.cpp
index 458ca6f..8eb438c 100644
--- a/src/VBox/VMM/VMMR3/EMR3Dbg.cpp
+++ b/src/VBox/VMM/VMMR3/EMR3Dbg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -67,8 +67,11 @@ static DBGCCMD const g_aCmds[] =
 
 int emR3InitDbg(PVM pVM)
 {
-    int rc = DBGCRegisterCommands(&g_aCmds[0], RT_ELEMENTS(g_aCmds));
+    int rc = VINF_SUCCESS;
+#ifdef VBOX_WITH_DEBUGGER
+    rc = DBGCRegisterCommands(&g_aCmds[0], RT_ELEMENTS(g_aCmds));
     AssertLogRelRC(rc);
+#endif
     return rc;
 }
 
diff --git a/src/VBox/VMM/VMMR3/EMRaw.cpp b/src/VBox/VMM/VMMR3/EMRaw.cpp
index c76ea61..91f9907 100644
--- a/src/VBox/VMM/VMMR3/EMRaw.cpp
+++ b/src/VBox/VMM/VMMR3/EMRaw.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/FTM.cpp b/src/VBox/VMM/VMMR3/FTM.cpp
index fe21ce2..317cc86 100644
--- a/src/VBox/VMM/VMMR3/FTM.cpp
+++ b/src/VBox/VMM/VMMR3/FTM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/GIMKvm.cpp b/src/VBox/VMM/VMMR3/GIMKvm.cpp
index 7878a24..bb9c7ba 100644
--- a/src/VBox/VMM/VMMR3/GIMKvm.cpp
+++ b/src/VBox/VMM/VMMR3/GIMKvm.cpp
@@ -350,7 +350,8 @@ VMMR3_INT_DECL(int) gimR3KvmLoad(PVM pVM, PSSMHANDLE pSSM, uint32_t uSSMVersion)
         SSMR3GetU64(pSSM, &pKvmCpu->uVirtNanoTS);
         SSMR3GetGCPhys(pSSM, &pKvmCpu->GCPhysSystemTime);
         SSMR3GetU32(pSSM, &pKvmCpu->u32SystemTimeVersion);
-        SSMR3GetU8(pSSM, &fSystemTimeFlags);
+        rc = SSMR3GetU8(pSSM, &fSystemTimeFlags);
+        AssertRCReturn(rc, rc);
 
         /* Enable the system-time struct. if necessary. */
         if (MSR_GIM_KVM_SYSTEM_TIME_IS_ENABLED(pKvmCpu->u64SystemTimeMsr))
@@ -389,6 +390,16 @@ VMMR3_INT_DECL(int) gimR3KvmLoad(PVM pVM, PSSMHANDLE pSSM, uint32_t uSSMVersion)
  */
 VMMR3_INT_DECL(int) gimR3KvmEnableSystemTime(PVM pVM, PVMCPU pVCpu, PGIMKVMCPU pKvmCpu, uint8_t fFlags)
 {
+    /*
+     * Validate the mapping address first.
+     */
+    if (!PGMPhysIsGCPhysNormal(pVM, pKvmCpu->GCPhysSystemTime))
+    {
+        LogRel(("GIM: KVM: VCPU%3d: Invalid physical addr requested for mapping system-time struct. GCPhysSystemTime=%#RGp\n",
+                pKvmCpu->GCPhysSystemTime));
+        return VERR_GIM_OPERATION_FAILED;
+    }
+
     GIMKVMSYSTEMTIME SystemTime;
     RT_ZERO(SystemTime);
     SystemTime.u32Version  = pKvmCpu->u32SystemTimeVersion;
@@ -422,7 +433,6 @@ VMMR3_INT_DECL(int) gimR3KvmEnableSystemTime(PVM pVM, PVMCPU pVCpu, PGIMKVMCPU p
     SystemTime.u32TscScale = ASMDivU64ByU32RetU32(RT_NS_1SEC_64 << 32, uTscFreqLo);
 
     Assert(!(SystemTime.u32Version & UINT32_C(1)));
-    Assert(PGMPhysIsGCPhysNormal(pVM, pKvmCpu->GCPhysSystemTime));
     int rc = PGMPhysSimpleWriteGCPhys(pVM, pKvmCpu->GCPhysSystemTime, &SystemTime, sizeof(GIMKVMSYSTEMTIME));
     if (RT_SUCCESS(rc))
     {
diff --git a/src/VBox/VMM/VMMR3/GMM.cpp b/src/VBox/VMM/VMMR3/GMM.cpp
index cb12d41..c4433d9 100644
--- a/src/VBox/VMM/VMMR3/GMM.cpp
+++ b/src/VBox/VMM/VMMR3/GMM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/HM.cpp b/src/VBox/VMM/VMMR3/HM.cpp
index dbef427..9a3c1c1 100644
--- a/src/VBox/VMM/VMMR3/HM.cpp
+++ b/src/VBox/VMM/VMMR3/HM.cpp
@@ -421,17 +421,24 @@ VMMR3_INT_DECL(int) HMR3Init(PVM pVM)
      * global init for each host CPU.  If false, we do local init each time we wish
      * to execute guest code.
      *
-     * Default is false for Mac OS X and Windows due to the higher risk of conflicts
-     * with other hypervisors.
+     * On Windows, default is false due to the higher risk of conflicts with other
+     * hypervisors.
+     *
+     * On Mac OS X, this setting is ignored since the code does not handle local
+     * init when it utilizes the OS provided VT-x function, SUPR0EnableVTx().
      */
+#if defined(RT_OS_DARWIN)
+    pVM->hm.s.fGlobalInit = true;
+#else
     rc = CFGMR3QueryBoolDef(pCfgHM, "Exclusive", &pVM->hm.s.fGlobalInit,
-#if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS)
+# if defined(RT_OS_WINDOWS)
                             false
-#else
+# else
                             true
-#endif
+# endif
                            );
     AssertLogRelRCReturn(rc, rc);
+#endif
 
     /** @cfgm{/HM/MaxResumeLoops, uint32_t}
      * The number of times to resume guest execution before we forcibly return to
diff --git a/src/VBox/VMM/VMMR3/IEMR3.cpp b/src/VBox/VMM/VMMR3/IEMR3.cpp
index 96be7b4..767e948 100644
--- a/src/VBox/VMM/VMMR3/IEMR3.cpp
+++ b/src/VBox/VMM/VMMR3/IEMR3.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -64,6 +64,8 @@ VMMR3DECL(int)      IEMR3Init(PVM pVM)
                         "Error statuses returned",           "/IEM/CPU%u/cRetErrStatuses", idCpu);
         STAMR3RegisterF(pVM, &pVCpu->iem.s.cbWritten,                 STAMTYPE_U32,       STAMVISIBILITY_ALWAYS, STAMUNIT_BYTES,
                         "Approx bytes written",              "/IEM/CPU%u/cbWritten", idCpu);
+        STAMR3RegisterF(pVM, &pVCpu->iem.s.cPendingCommit,            STAMTYPE_U32,       STAMVISIBILITY_ALWAYS, STAMUNIT_BYTES,
+                        "Times RC/R0 had to postpone instruction committing to ring-3", "/IEM/CPU%u/cPendingCommit", idCpu);
 
         /*
          * Host and guest CPU information.
diff --git a/src/VBox/VMM/VMMR3/IOM.cpp b/src/VBox/VMM/VMMR3/IOM.cpp
index 301e240..eba6734 100644
--- a/src/VBox/VMM/VMMR3/IOM.cpp
+++ b/src/VBox/VMM/VMMR3/IOM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -131,10 +131,10 @@ static DECLCALLBACK(int) iomR3RelocateIOPortCallback(PAVLROIOPORTNODECORE pNode,
 static DECLCALLBACK(int) iomR3RelocateMMIOCallback(PAVLROGCPHYSNODECORE pNode, void *pvUser);
 static DECLCALLBACK(void) iomR3IOPortInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 static DECLCALLBACK(void) iomR3MMIOInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
-static DECLCALLBACK(int) iomR3IOPortDummyIn(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb);
-static DECLCALLBACK(int) iomR3IOPortDummyOut(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
-static DECLCALLBACK(int) iomR3IOPortDummyInStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrDst, PRTGCUINTREG pcTransfer, unsigned cb);
-static DECLCALLBACK(int) iomR3IOPortDummyOutStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrSrc, PRTGCUINTREG pcTransfer, unsigned cb);
+static FNIOMIOPORTIN        iomR3IOPortDummyIn;
+static FNIOMIOPORTOUT       iomR3IOPortDummyOut;
+static FNIOMIOPORTINSTRING  iomR3IOPortDummyInStr;
+static FNIOMIOPORTOUTSTRING iomR3IOPortDummyOutStr;
 
 #ifdef VBOX_WITH_STATISTICS
 static const char *iomR3IOPortGetStandardName(RTIOPORT Port);
@@ -187,8 +187,8 @@ VMMR3_INT_DECL(int) IOMR3Init(PVM pVM)
          */
         rc = PGMR3HandlerPhysicalTypeRegister(pVM, PGMPHYSHANDLERKIND_MMIO,
                                               iomMmioHandler,
-                                              NULL, NULL, "iomMmioPfHandler",
-                                              NULL, NULL, "iomMmioPfHandler",
+                                              NULL, "iomMmioHandler", "iomMmioPfHandler",
+                                              NULL, "iomMmioHandler", "iomMmioPfHandler",
                                               "MMIO", &pVM->iom.s.hMmioHandlerType);
         AssertRC(rc);
         if (RT_SUCCESS(rc))
@@ -1200,21 +1200,13 @@ static DECLCALLBACK(int) iomR3IOPortDummyIn(PPDMDEVINS pDevIns, void *pvUser, RT
 
 
 /**
- * Dummy Port I/O Handler for string IN operations.
- *
- * @returns VBox status code.
- *
- * @param   pDevIns     The device instance.
- * @param   pvUser      User argument.
- * @param   Port        Port number used for the string IN operation.
- * @param   pGCPtrDst   Pointer to the destination buffer (GC, incremented appropriately).
- * @param   pcTransfer  Pointer to the number of transfer units to read, on return remaining transfer units.
- * @param   cb          Size of the transfer unit (1, 2 or 4 bytes).
+ * @callback_method_impl{FNIOMIOPORTINSTRING,
+ *      Dummy Port I/O Handler for string IN operations.}
  */
-static DECLCALLBACK(int) iomR3IOPortDummyInStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrDst,
-                                               PRTGCUINTREG pcTransfer, unsigned cb)
+static DECLCALLBACK(int) iomR3IOPortDummyInStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint8_t *pbDst,
+                                               uint32_t *pcTransfer, unsigned cb)
 {
-    NOREF(pDevIns); NOREF(pvUser); NOREF(Port); NOREF(pGCPtrDst); NOREF(pcTransfer); NOREF(cb);
+    NOREF(pDevIns); NOREF(pvUser); NOREF(Port); NOREF(pbDst); NOREF(pcTransfer); NOREF(cb);
     return VINF_SUCCESS;
 }
 
@@ -1238,21 +1230,13 @@ static DECLCALLBACK(int) iomR3IOPortDummyOut(PPDMDEVINS pDevIns, void *pvUser, R
 
 
 /**
- * Dummy Port I/O Handler for string OUT operations.
- *
- * @returns VBox status code.
- *
- * @param   pDevIns     The device instance.
- * @param   pvUser      User argument.
- * @param   Port        Port number used for the string OUT operation.
- * @param   pGCPtrSrc   Pointer to the source buffer (GC, incremented appropriately).
- * @param   pcTransfer  Pointer to the number of transfer units to write, on return remaining transfer units.
- * @param   cb          Size of the transfer unit (1, 2 or 4 bytes).
+ * @callback_method_impl{FNIOMIOPORTOUTSTRING,
+ *      Dummy Port I/O Handler for string OUT operations.}
  */
-static DECLCALLBACK(int) iomR3IOPortDummyOutStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, RTGCPTR *pGCPtrSrc,
-                                                PRTGCUINTREG pcTransfer, unsigned cb)
+static DECLCALLBACK(int) iomR3IOPortDummyOutStr(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint8_t const *pbSrc,
+                                                uint32_t *pcTransfer, unsigned cb)
 {
-    NOREF(pDevIns); NOREF(pvUser); NOREF(Port); NOREF(pGCPtrSrc); NOREF(pcTransfer); NOREF(cb);
+    NOREF(pDevIns); NOREF(pvUser); NOREF(Port); NOREF(pbSrc); NOREF(pcTransfer); NOREF(cb);
     return VINF_SUCCESS;
 }
 
diff --git a/src/VBox/VMM/VMMR3/MM.cpp b/src/VBox/VMM/VMMR3/MM.cpp
index 315429c..9cc1617 100644
--- a/src/VBox/VMM/VMMR3/MM.cpp
+++ b/src/VBox/VMM/VMMR3/MM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -52,13 +52,13 @@ Hypervisor Memory Area (HMA) Layout: Base 00000000a0000000, 0x00800000 bytes
 00000000a0536000-00000000a05b6000                  MMIO2   0000000000000000 VGA VRam
 00000000a0523000-00000000a0536000 00002aaab3d0c000 LOCKED  autofree         alloc once (PDM_DEVICE)
 00000000a0522000-00000000a0523000                  DYNAMIC                  fence
-00000000a051e000-00000000a0522000 00002aaab36f5000 LOCKED  autofree         VBoxDD2GC.gc
+00000000a051e000-00000000a0522000 00002aaab36f5000 LOCKED  autofree         VBoxDD2RC.rc
 00000000a051d000-00000000a051e000                  DYNAMIC                  fence
-00000000a04eb000-00000000a051d000 00002aaab36c3000 LOCKED  autofree         VBoxDDGC.gc
+00000000a04eb000-00000000a051d000 00002aaab36c3000 LOCKED  autofree         VBoxDDRC.rc
 00000000a04ea000-00000000a04eb000                  DYNAMIC                  fence
 00000000a04e9000-00000000a04ea000 00002aaab36c2000 LOCKED  autofree         ram range (High ROM Region)
 00000000a04e8000-00000000a04e9000                  DYNAMIC                  fence
-00000000a040e000-00000000a04e8000 00002aaab2e6d000 LOCKED  autofree         VMMGC.gc
+00000000a040e000-00000000a04e8000 00002aaab2e6d000 LOCKED  autofree         VMMRC.rc
 00000000a0208000-00000000a040e000 00002aaab2c67000 LOCKED  autofree         alloc once (PATM)
 00000000a01f7000-00000000a0208000 00002aaaab92d000 LOCKED  autofree         alloc once (SELM)
 00000000a01e7000-00000000a01f7000 00002aaaab5e8000 LOCKED  autofree         alloc once (SELM)
diff --git a/src/VBox/VMM/VMMR3/MMHeap.cpp b/src/VBox/VMM/VMMR3/MMHeap.cpp
index 9c52ac6..40df227 100644
--- a/src/VBox/VMM/VMMR3/MMHeap.cpp
+++ b/src/VBox/VMM/VMMR3/MMHeap.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/MMHyper.cpp b/src/VBox/VMM/VMMR3/MMHyper.cpp
index f5fa005..b904856 100644
--- a/src/VBox/VMM/VMMR3/MMHyper.cpp
+++ b/src/VBox/VMM/VMMR3/MMHyper.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/MMPagePool.cpp b/src/VBox/VMM/VMMR3/MMPagePool.cpp
index 44b9b0c..3f4ff77 100644
--- a/src/VBox/VMM/VMMR3/MMPagePool.cpp
+++ b/src/VBox/VMM/VMMR3/MMPagePool.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/MMUkHeap.cpp b/src/VBox/VMM/VMMR3/MMUkHeap.cpp
index 2c60d01..2534ce7 100644
--- a/src/VBox/VMM/VMMR3/MMUkHeap.cpp
+++ b/src/VBox/VMM/VMMR3/MMUkHeap.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PATM.cpp b/src/VBox/VMM/VMMR3/PATM.cpp
index 90b8dab..d24e4f7 100644
--- a/src/VBox/VMM/VMMR3/PATM.cpp
+++ b/src/VBox/VMM/VMMR3/PATM.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PATMGuest.cpp b/src/VBox/VMM/VMMR3/PATMGuest.cpp
index efdd4ea..00c3b74 100644
--- a/src/VBox/VMM/VMMR3/PATMGuest.cpp
+++ b/src/VBox/VMM/VMMR3/PATMGuest.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PATMPatch.h b/src/VBox/VMM/VMMR3/PATMPatch.h
index 42cf0f2..a3d75fb 100644
--- a/src/VBox/VMM/VMMR3/PATMPatch.h
+++ b/src/VBox/VMM/VMMR3/PATMPatch.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PATMR3Dbg.cpp b/src/VBox/VMM/VMMR3/PATMR3Dbg.cpp
index 0ccd732..e87fd18 100644
--- a/src/VBox/VMM/VMMR3/PATMR3Dbg.cpp
+++ b/src/VBox/VMM/VMMR3/PATMR3Dbg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp
index ec97860..ea675eb 100644
--- a/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp
+++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp
index 4105e0c..cc0e49f 100644
--- a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp
+++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PDMBlkCache.cpp b/src/VBox/VMM/VMMR3/PDMBlkCache.cpp
index 17996a8..7e2e3d8 100644
--- a/src/VBox/VMM/VMMR3/PDMBlkCache.cpp
+++ b/src/VBox/VMM/VMMR3/PDMBlkCache.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PDMCritSect.cpp b/src/VBox/VMM/VMMR3/PDMCritSect.cpp
index 039c379..e5e4d9c 100644
--- a/src/VBox/VMM/VMMR3/PDMCritSect.cpp
+++ b/src/VBox/VMM/VMMR3/PDMCritSect.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -182,7 +182,7 @@ static int pdmR3CritSectInitOne(PVM pVM, PPDMCRITSECTINT pCritSect, void *pvKey,
                 pCritSect->pvKey                     = pvKey;
                 pCritSect->fAutomaticDefaultCritsect = false;
                 pCritSect->fUsedByTimerOrSimilar     = false;
-                pCritSect->EventToSignal             = NIL_RTSEMEVENT;
+                pCritSect->hEventToSignal            = NIL_SUPSEMEVENT;
                 pCritSect->pszName                   = pszName;
 
                 STAMR3RegisterF(pVM, &pCritSect->StatContentionRZLock,  STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionRZLock", pCritSect->pszName);
@@ -884,34 +884,6 @@ VMMR3DECL(bool) PDMR3CritSectYield(PPDMCRITSECT pCritSect)
 
 
 /**
- * Schedule a event semaphore for signalling upon critsect exit.
- *
- * @returns VINF_SUCCESS on success.
- * @returns VERR_TOO_MANY_SEMAPHORES if an event was already scheduled.
- * @returns VERR_NOT_OWNER if we're not the critsect owner.
- * @returns VERR_SEM_DESTROYED if RTCritSectDelete was called while waiting.
- *
- * @param   pCritSect       The critical section.
- * @param   EventToSignal   The semaphore that should be signalled.
- */
-VMMR3DECL(int) PDMR3CritSectScheduleExitEvent(PPDMCRITSECT pCritSect, RTSEMEVENT EventToSignal)
-{
-    AssertPtr(pCritSect);
-    Assert(!(pCritSect->s.Core.fFlags & RTCRITSECT_FLAGS_NOP));
-    Assert(EventToSignal != NIL_RTSEMEVENT);
-    if (RT_UNLIKELY(!RTCritSectIsOwner(&pCritSect->s.Core)))
-        return VERR_NOT_OWNER;
-    if (RT_LIKELY(   pCritSect->s.EventToSignal == NIL_RTSEMEVENT
-                  || pCritSect->s.EventToSignal == EventToSignal))
-    {
-        pCritSect->s.EventToSignal = EventToSignal;
-        return VINF_SUCCESS;
-    }
-    return VERR_TOO_MANY_SEMAPHORES;
-}
-
-
-/**
  * PDMR3CritSectBothCountOwned worker.
  *
  * @param   pszName         The critical section name.
diff --git a/src/VBox/VMM/VMMR3/PDMDevHlp.cpp b/src/VBox/VMM/VMMR3/PDMDevHlp.cpp
index 20ba2bf..13b97e1 100644
--- a/src/VBox/VMM/VMMR3/PDMDevHlp.cpp
+++ b/src/VBox/VMM/VMMR3/PDMDevHlp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp b/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp
index c6cadd8..73e2a3b 100644
--- a/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp
+++ b/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PDMDevice.cpp b/src/VBox/VMM/VMMR3/PDMDevice.cpp
index 918c0f8..2a0f989 100644
--- a/src/VBox/VMM/VMMR3/PDMDevice.cpp
+++ b/src/VBox/VMM/VMMR3/PDMDevice.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PDMDriver.cpp b/src/VBox/VMM/VMMR3/PDMDriver.cpp
index b8e53b8..2ca2206 100644
--- a/src/VBox/VMM/VMMR3/PDMDriver.cpp
+++ b/src/VBox/VMM/VMMR3/PDMDriver.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PDMLdr.cpp b/src/VBox/VMM/VMMR3/PDMLdr.cpp
index db7ac7d..85df5a5 100644
--- a/src/VBox/VMM/VMMR3/PDMLdr.cpp
+++ b/src/VBox/VMM/VMMR3/PDMLdr.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -896,9 +896,11 @@ VMMR3DECL(int) PDMR3LdrGetSymbolR0Lazy(PVM pVM, const char *pszModule, const cha
  *
  * @returns VBox status code.
  * @param   pVM             Pointer to the VM.
- * @param   pszModule       Module name. If NULL the main R0 module (VMMGC.gc) is assumes.
- * @param   pszSymbol       Symbol name. If it's value is less than 64k it's treated like a
- *                          ordinal value rather than a string pointer.
+ * @param   pszModule       Module name.  If NULL the main R0 module (VMMRC.rc)
+ *                          is assumes.
+ * @param   pszSymbol       Symbol name.  If it's value is less than 64k it's
+ *                          treated like a ordinal value rather than a string
+ *                          pointer.
  * @param   pRCPtrValue     Where to store the symbol value.
  */
 VMMR3DECL(int) PDMR3LdrGetSymbolRC(PVM pVM, const char *pszModule, const char *pszSymbol, PRTRCPTR pRCPtrValue)
@@ -1592,7 +1594,7 @@ VMMR3_INT_DECL(int) PDMR3LdrGetInterfaceSymbols(PVM pVM, void *pvInterface, size
     PPDMMOD pModule = NULL;
     if (!fNullRun)
         pModule = pdmR3LdrFindModule(pVM->pUVM,
-                                     pszModule ? pszModule : fRing0 ? "VMMR0.r0" : "VMMGC.gc",
+                                     pszModule ? pszModule : fRing0 ? "VMMR0.r0" : "VMMRC.rc",
                                      fRing0 ? PDMMOD_TYPE_R0 : PDMMOD_TYPE_RC,
                                      true /*fLazy*/, pszSearchPath);
     if (pModule || fNullRun)
diff --git a/src/VBox/VMM/VMMR3/PDMNetShaper.cpp b/src/VBox/VMM/VMMR3/PDMNetShaper.cpp
index 255062b..b1bc046 100644
--- a/src/VBox/VMM/VMMR3/PDMNetShaper.cpp
+++ b/src/VBox/VMM/VMMR3/PDMNetShaper.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PDMQueue.cpp b/src/VBox/VMM/VMMR3/PDMQueue.cpp
index 074d72e..2414c5b 100644
--- a/src/VBox/VMM/VMMR3/PDMQueue.cpp
+++ b/src/VBox/VMM/VMMR3/PDMQueue.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PDMThread.cpp b/src/VBox/VMM/VMMR3/PDMThread.cpp
index 391fece..65c8e6a 100644
--- a/src/VBox/VMM/VMMR3/PDMThread.cpp
+++ b/src/VBox/VMM/VMMR3/PDMThread.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PDMUsb.cpp b/src/VBox/VMM/VMMR3/PDMUsb.cpp
index 496a8a7..3faf568 100644
--- a/src/VBox/VMM/VMMR3/PDMUsb.cpp
+++ b/src/VBox/VMM/VMMR3/PDMUsb.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -226,7 +226,7 @@ static DECLCALLBACK(int) pdmR3UsbReg_Register(PCPDMUSBREGCB pCallbacks, PCPDMUSB
                     &&  pdmR3IsValidName(pReg->szName),
                     ("Invalid name '%.s'\n", sizeof(pReg->szName), pReg->szName),
                     VERR_PDM_INVALID_USB_REGISTRATION);
-    AssertMsgReturn((pReg->fFlags & ~(PDM_USBREG_HIGHSPEED_CAPABLE | PDM_USBREG_SUPERSPEED_CAPABLE | PDM_USBREG_EMULATED_DEVICE)) == 0,
+    AssertMsgReturn((pReg->fFlags & ~(PDM_USBREG_HIGHSPEED_CAPABLE | PDM_USBREG_SUPERSPEED_CAPABLE | PDM_USBREG_SAVED_STATE_SUPPORTED)) == 0,
                     ("fFlags=%#x\n", pReg->fFlags), VERR_PDM_INVALID_USB_REGISTRATION);
     AssertMsgReturn(pReg->cMaxInstances > 0,
                     ("Max instances %u! (USB Device %s)\n", pReg->cMaxInstances, pReg->szName),
diff --git a/src/VBox/VMM/VMMR3/PGM.cpp b/src/VBox/VMM/VMMR3/PGM.cpp
index 0b07fa0..911e2f5 100644
--- a/src/VBox/VMM/VMMR3/PGM.cpp
+++ b/src/VBox/VMM/VMMR3/PGM.cpp
@@ -672,8 +672,10 @@ static DECLCALLBACK(void) pgmR3PhysInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char
 static DECLCALLBACK(void) pgmR3InfoMode(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 static DECLCALLBACK(void) pgmR3InfoCr3(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 static DECLCALLBACK(int)  pgmR3RelocatePhysHandler(PAVLROGCPHYSNODECORE pNode, void *pvUser);
+#ifdef VBOX_WITH_RAW_MODE
 static DECLCALLBACK(int)  pgmR3RelocateVirtHandler(PAVLROGCPTRNODECORE pNode, void *pvUser);
 static DECLCALLBACK(int)  pgmR3RelocateHyperVirtHandler(PAVLROGCPTRNODECORE pNode, void *pvUser);
+#endif /* VBOX_WITH_RAW_MODE */
 #ifdef VBOX_STRICT
 static FNVMATSTATE        pgmR3ResetNoMorePhysWritesFlag;
 #endif
@@ -1351,12 +1353,15 @@ VMMR3DECL(int) PGMR3Init(PVM pVM)
     }
 
     /*
-     * Check for PCI pass-through.
+     * Check for PCI pass-through and other configurables.
      */
     rc = CFGMR3QueryBoolDef(pCfgPGM, "PciPassThrough", &pVM->pgm.s.fPciPassthrough, false);
     AssertMsgRCReturn(rc, ("Configuration error: Failed to query integer \"PciPassThrough\", rc=%Rrc.\n", rc), rc);
     AssertLogRelReturn(!pVM->pgm.s.fPciPassthrough || pVM->pgm.s.fRamPreAlloc, VERR_INVALID_PARAMETER);
 
+    rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "PageFusionAllowed", &pVM->pgm.s.fPageFusionAllowed, false);
+    AssertLogRelRCReturn(rc, rc);
+
 #ifdef VBOX_WITH_STATISTICS
     /*
      * Allocate memory for the statistics before someone tries to use them.
@@ -2435,6 +2440,7 @@ VMMR3DECL(void) PGMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
             pCurPhysType->pfnPfHandlerRC += offDelta;
     }
 
+#ifdef VBOX_WITH_RAW_MODE
     RTAvlroGCPtrDoWithAll(&pVM->pgm.s.pTreesR3->VirtHandlers,      true, pgmR3RelocateVirtHandler,      &Args);
     RTAvlroGCPtrDoWithAll(&pVM->pgm.s.pTreesR3->HyperVirtHandlers, true, pgmR3RelocateHyperVirtHandler, &Args);
 
@@ -2446,6 +2452,7 @@ VMMR3DECL(void) PGMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
         if (pCurVirtType->pfnPfHandlerRC != NIL_RTRCPTR)
             pCurVirtType->pfnPfHandlerRC += offDelta;
     }
+#endif
 
     /*
      * The page pool.
@@ -2479,6 +2486,7 @@ static DECLCALLBACK(int) pgmR3RelocatePhysHandler(PAVLROGCPHYSNODECORE pNode, vo
     return 0;
 }
 
+#ifdef VBOX_WITH_RAW_MODE
 
 /**
  * Callback function for relocating a virtual access handler.
@@ -2519,6 +2527,7 @@ static DECLCALLBACK(int) pgmR3RelocateHyperVirtHandler(PAVLROGCPTRNODECORE pNode
     return 0;
 }
 
+#endif /* VBOX_WITH_RAW_MODE */
 
 /**
  * Resets a virtual CPU when unplugged.
@@ -2681,7 +2690,7 @@ static DECLCALLBACK(void) pgmR3ResetNoMorePhysWritesFlag(PUVM pUVM, VMSTATE enmS
 /**
  * Private API to reset fNoMorePhysWrites.
  */
-VMMR3DECL(void) PGMR3ResetNoMorePhysWritesFlag(PVM pVM)
+VMMR3_INT_DECL(void) PGMR3ResetNoMorePhysWritesFlag(PVM pVM)
 {
     pVM->pgm.s.fNoMorePhysWrites = false;
 }
@@ -4040,8 +4049,12 @@ typedef struct PGMCHECKINTARGS
 {
     bool                    fLeftToRight;    /**< true: left-to-right; false: right-to-left. */
     PPGMPHYSHANDLER         pPrevPhys;
+#ifdef VBOX_WITH_RAW_MODE
     PPGMVIRTHANDLER         pPrevVirt;
     PPGMPHYS2VIRTHANDLER    pPrevPhys2Virt;
+#else
+    void                   *pvFiller1, *pvFiller2;
+#endif
     PVM                     pVM;
 } PGMCHECKINTARGS, *PPGMCHECKINTARGS;
 
@@ -4071,6 +4084,7 @@ static DECLCALLBACK(int) pgmR3CheckIntegrityPhysHandlerNode(PAVLROGCPHYSNODECORE
     return 0;
 }
 
+#ifdef VBOX_WITH_RAW_MODE
 
 /**
  * Validate a node in the virtual handler tree.
@@ -4166,6 +4180,7 @@ static DECLCALLBACK(int) pgmR3CheckIntegrityPhysToVirtHandlerNode(PAVLROGCPHYSNO
     return 0;
 }
 
+#endif /* VBOX_WITH_RAW_MODE */
 
 /**
  * Perform an integrity check on the PGM component.
@@ -4188,6 +4203,7 @@ VMMR3DECL(int) PGMR3CheckIntegrity(PVM pVM)
     cErrors += RTAvlroGCPhysDoWithAll(&pVM->pgm.s.pTreesR3->PhysHandlers,       true,  pgmR3CheckIntegrityPhysHandlerNode, &Args);
     Args = s_RightToLeft;
     cErrors += RTAvlroGCPhysDoWithAll(&pVM->pgm.s.pTreesR3->PhysHandlers,       false, pgmR3CheckIntegrityPhysHandlerNode, &Args);
+#ifdef VBOX_WITH_RAW_MODE
     Args = s_LeftToRight;
     cErrors += RTAvlroGCPtrDoWithAll( &pVM->pgm.s.pTreesR3->VirtHandlers,       true,  pgmR3CheckIntegrityVirtHandlerNode, &Args);
     Args = s_RightToLeft;
@@ -4200,6 +4216,7 @@ VMMR3DECL(int) PGMR3CheckIntegrity(PVM pVM)
     cErrors += RTAvlroGCPhysDoWithAll(&pVM->pgm.s.pTreesR3->PhysToVirtHandlers, true,  pgmR3CheckIntegrityPhysToVirtHandlerNode, &Args);
     Args = s_RightToLeft;
     cErrors += RTAvlroGCPhysDoWithAll(&pVM->pgm.s.pTreesR3->PhysToVirtHandlers, false, pgmR3CheckIntegrityPhysToVirtHandlerNode, &Args);
+#endif /* VBOX_WITH_RAW_MODE */
 
     return !cErrors ? VINF_SUCCESS : VERR_INTERNAL_ERROR;
 }
diff --git a/src/VBox/VMM/VMMR3/PGMBth.h b/src/VBox/VMM/VMMR3/PGMBth.h
index 969cfc0..b39988d 100644
--- a/src/VBox/VMM/VMMR3/PGMBth.h
+++ b/src/VBox/VMM/VMMR3/PGMBth.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PGMDbg.cpp b/src/VBox/VMM/VMMR3/PGMDbg.cpp
index da9f7ed..c017389 100644
--- a/src/VBox/VMM/VMMR3/PGMDbg.cpp
+++ b/src/VBox/VMM/VMMR3/PGMDbg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PGMGst.h b/src/VBox/VMM/VMMR3/PGMGst.h
index 64e0747..5b83554 100644
--- a/src/VBox/VMM/VMMR3/PGMGst.h
+++ b/src/VBox/VMM/VMMR3/PGMGst.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PGMHandler.cpp b/src/VBox/VMM/VMMR3/PGMHandler.cpp
index 8bdde63..ff3a3b8 100644
--- a/src/VBox/VMM/VMMR3/PGMHandler.cpp
+++ b/src/VBox/VMM/VMMR3/PGMHandler.cpp
@@ -60,7 +60,9 @@
 static DECLCALLBACK(int) pgmR3HandlerPhysicalOneClear(PAVLROGCPHYSNODECORE pNode, void *pvUser);
 static DECLCALLBACK(int) pgmR3HandlerPhysicalOneSet(PAVLROGCPHYSNODECORE pNode, void *pvUser);
 static DECLCALLBACK(int) pgmR3InfoHandlersPhysicalOne(PAVLROGCPHYSNODECORE pNode, void *pvUser);
+#ifdef VBOX_WITH_RAW_MODE
 static DECLCALLBACK(int) pgmR3InfoHandlersVirtualOne(PAVLROGCPTRNODECORE pNode, void *pvUser);
+#endif
 
 
 
@@ -303,6 +305,7 @@ static DECLCALLBACK(int) pgmR3HandlerPhysicalOneSet(PAVLROGCPHYSNODECORE pNode,
     }
 }
 
+#ifdef VBOX_WITH_RAW_MODE
 
 /**
  * Register a virtual page access handler type, extended version.
@@ -672,6 +675,8 @@ VMMR3_INT_DECL(int) PGMHandlerVirtualDeregister(PVM pVM, PVMCPU pVCpu, RTGCPTR G
     return VINF_SUCCESS;
 }
 
+#endif /* VBOX_WITH_RAW_MODE */
+
 
 /**
  * Arguments for pgmR3InfoHandlersPhysicalOne and pgmR3InfoHandlersVirtualOne.
@@ -727,6 +732,7 @@ DECLCALLBACK(void) pgmR3InfoHandlers(PVM pVM, PCDBGFINFOHLP pHlp, const char *ps
         RTAvlroGCPhysDoWithAll(&pVM->pgm.s.pTreesR3->PhysHandlers, true, pgmR3InfoHandlersPhysicalOne, &Args);
     }
 
+#ifdef VBOX_WITH_RAW_MODE
     if (fVirtual)
     {
         pHlp->pfnPrintf(pHlp,
@@ -750,6 +756,7 @@ DECLCALLBACK(void) pgmR3InfoHandlers(PVM pVM, PCDBGFINFOHLP pHlp, const char *ps
             - (int)sizeof(RTRCPTR) * 2 - 1, "HandlerGC");
         RTAvlroGCPtrDoWithAll(&pVM->pgm.s.pTreesR3->HyperVirtHandlers, true, pgmR3InfoHandlersVirtualOne, &Args);
     }
+#endif
 }
 
 
@@ -788,6 +795,7 @@ static DECLCALLBACK(int) pgmR3InfoHandlersPhysicalOne(PAVLROGCPHYSNODECORE pNode
 }
 
 
+#ifdef VBOX_WITH_RAW_MODE
 /**
  * Displays one virtual handler range.
  *
@@ -811,12 +819,13 @@ static DECLCALLBACK(int) pgmR3InfoHandlersVirtualOne(PAVLROGCPTRNODECORE pNode,
     }
     pHlp->pfnPrintf(pHlp, "%RGv - %RGv  %RHv  %RRv  %s  %s\n",
         pCur->Core.Key, pCur->Core.KeyLast, pCurType->pfnHandlerR3, pCurType->pfnPfHandlerRC, pszType, pCur->pszDesc);
-#ifdef VBOX_WITH_STATISTICS
+# ifdef VBOX_WITH_STATISTICS
     if (pArgs->fStats)
         pHlp->pfnPrintf(pHlp, "   cPeriods: %9RU64  cTicks: %11RU64  Min: %11RU64  Avg: %11RU64 Max: %11RU64\n",
                         pCur->Stat.cPeriods, pCur->Stat.cTicks, pCur->Stat.cTicksMin,
                         pCur->Stat.cPeriods ? pCur->Stat.cTicks / pCur->Stat.cPeriods : 0, pCur->Stat.cTicksMax);
-#endif
+# endif
     return 0;
 }
+#endif /* VBOX_WITH_RAW_MODE */
 
diff --git a/src/VBox/VMM/VMMR3/PGMMap.cpp b/src/VBox/VMM/VMMR3/PGMMap.cpp
index d9ebe48..e20bbe0 100644
--- a/src/VBox/VMM/VMMR3/PGMMap.cpp
+++ b/src/VBox/VMM/VMMR3/PGMMap.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PGMPhys.cpp b/src/VBox/VMM/VMMR3/PGMPhys.cpp
index 8d04445..d96cce2 100644
--- a/src/VBox/VMM/VMMR3/PGMPhys.cpp
+++ b/src/VBox/VMM/VMMR3/PGMPhys.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PGMPool.cpp b/src/VBox/VMM/VMMR3/PGMPool.cpp
index dee8691..2f9849d 100644
--- a/src/VBox/VMM/VMMR3/PGMPool.cpp
+++ b/src/VBox/VMM/VMMR3/PGMPool.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -282,8 +282,8 @@ int pgmR3PoolInit(PVM pVM)
     pPool->hAccessHandlerType = NIL_PGMPHYSHANDLERTYPE;
     rc = PGMR3HandlerPhysicalTypeRegister(pVM, PGMPHYSHANDLERKIND_WRITE,
                                           pgmPoolAccessHandler,
-                                          NULL, NULL, "pgmPoolAccessPfHandler",
-                                          NULL, NULL, "pgmPoolAccessPfHandler",
+                                          NULL, "pgmPoolAccessHandler", "pgmPoolAccessPfHandler",
+                                          NULL, "pgmPoolAccessHandler", "pgmPoolAccessPfHandler",
                                           "Guest Paging Access Handler",
                                           &pPool->hAccessHandlerType);
     AssertLogRelRCReturn(rc, rc);
diff --git a/src/VBox/VMM/VMMR3/PGMSavedState.cpp b/src/VBox/VMM/VMMR3/PGMSavedState.cpp
index 0d0d30e..2eba693 100644
--- a/src/VBox/VMM/VMMR3/PGMSavedState.cpp
+++ b/src/VBox/VMM/VMMR3/PGMSavedState.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/PGMSharedPage.cpp b/src/VBox/VMM/VMMR3/PGMSharedPage.cpp
index b37c445..f03313c 100644
--- a/src/VBox/VMM/VMMR3/PGMSharedPage.cpp
+++ b/src/VBox/VMM/VMMR3/PGMSharedPage.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -75,6 +75,8 @@ VMMR3DECL(int) PGMR3SharedModuleRegister(PVM pVM, VBOXOSFAMILY enmGuestOS, char
      * Sanity check.
      */
     AssertReturn(cRegions <= VMMDEVSHAREDREGIONDESC_MAX, VERR_INVALID_PARAMETER);
+    if (!pVM->pgm.s.fPageFusionAllowed)
+        return VERR_NOT_SUPPORTED;
 
     /*
      * Allocate and initialize a GMM request.
@@ -147,8 +149,10 @@ VMMR3DECL(int) PGMR3SharedModuleRegister(PVM pVM, VBOXOSFAMILY enmGuestOS, char
 VMMR3DECL(int) PGMR3SharedModuleUnregister(PVM pVM, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule)
 {
     Log(("PGMR3SharedModuleUnregister name=%s version=%s base=%RGv size=%x\n", pszModuleName, pszVersion, GCBaseAddr, cbModule));
-    AssertMsgReturn(cbModule > 0 && cbModule < _1G, ("%u\n", cbModule), VERR_OUT_OF_RANGE);
 
+    AssertMsgReturn(cbModule > 0 && cbModule < _1G, ("%u\n", cbModule), VERR_OUT_OF_RANGE);
+    if (!pVM->pgm.s.fPageFusionAllowed)
+        return VERR_NOT_SUPPORTED;
 
     /*
      * Forward the request to GMM (ring-0).
@@ -259,6 +263,9 @@ static DECLCALLBACK(void) pgmR3CheckSharedModulesHelper(PVM pVM, VMCPUID idCpu)
  */
 VMMR3DECL(int) PGMR3SharedModuleCheckAll(PVM pVM)
 {
+    if (!pVM->pgm.s.fPageFusionAllowed)
+        return VERR_NOT_SUPPORTED;
+
     /* Queue the actual registration as we are under the IOM lock right now. Perform this operation on the way out. */
     return VMR3ReqCallNoWait(pVM, VMCPUID_ANY_QUEUE, (PFNRT)pgmR3CheckSharedModulesHelper, 2, pVM, VMMGetCpuId(pVM));
 }
diff --git a/src/VBox/VMM/VMMR3/PGMShw.h b/src/VBox/VMM/VMMR3/PGMShw.h
index 6b2f6b9..b0b1581 100644
--- a/src/VBox/VMM/VMMR3/PGMShw.h
+++ b/src/VBox/VMM/VMMR3/PGMShw.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/SELM.cpp b/src/VBox/VMM/VMMR3/SELM.cpp
index 402b0ee..1d01771 100644
--- a/src/VBox/VMM/VMMR3/SELM.cpp
+++ b/src/VBox/VMM/VMMR3/SELM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/SSM.cpp b/src/VBox/VMM/VMMR3/SSM.cpp
index f08cd77..b29e272 100644
--- a/src/VBox/VMM/VMMR3/SSM.cpp
+++ b/src/VBox/VMM/VMMR3/SSM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/STAM.cpp b/src/VBox/VMM/VMMR3/STAM.cpp
index bac352d..6122182 100644
--- a/src/VBox/VMM/VMMR3/STAM.cpp
+++ b/src/VBox/VMM/VMMR3/STAM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/TRPM.cpp b/src/VBox/VMM/VMMR3/TRPM.cpp
index 497c94a..45cd8fa 100644
--- a/src/VBox/VMM/VMMR3/TRPM.cpp
+++ b/src/VBox/VMM/VMMR3/TRPM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -635,23 +635,23 @@ VMMR3DECL(void) TRPMR3Relocate(PVM pVM, RTGCINTPTR offDelta)
     /*
      * Get the trap handler addresses.
      *
-     * If VMMGC.gc is screwed, so are we. We'll assert here since it elsewise
+     * If VMMRC.rc is screwed, so are we. We'll assert here since it elsewise
      * would make init order impossible if we should assert the presence of these
      * exports in TRPMR3Init().
      */
     RTRCPTR aRCPtrs[TRPM_HANDLER_MAX];
     RT_ZERO(aRCPtrs);
     int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "TRPMGCHandlerInterupt", &aRCPtrs[TRPM_HANDLER_INT]);
-    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerInterupt in VMMGC.gc!\n"));
+    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerInterupt in VMMRC.rc!\n"));
 
     rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "TRPMGCHandlerGeneric",  &aRCPtrs[TRPM_HANDLER_TRAP]);
-    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerGeneric in VMMGC.gc!\n"));
+    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerGeneric in VMMRC.rc!\n"));
 
     rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "TRPMGCHandlerTrap08",   &aRCPtrs[TRPM_HANDLER_TRAP_08]);
-    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerTrap08 in VMMGC.gc!\n"));
+    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerTrap08 in VMMRC.rc!\n"));
 
     rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "TRPMGCHandlerTrap12",   &aRCPtrs[TRPM_HANDLER_TRAP_12]);
-    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerTrap12 in VMMGC.gc!\n"));
+    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerTrap12 in VMMRC.rc!\n"));
 
     RTSEL SelCS = CPUMGetHyperCS(pVCpu);
 
@@ -1180,7 +1180,7 @@ int trpmR3ClearPassThroughHandler(PVM pVM, unsigned iTrap)
     memset(aGCPtrs, 0, sizeof(aGCPtrs));
 
     rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "TRPMGCHandlerInterupt", &aGCPtrs[TRPM_HANDLER_INT]);
-    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerInterupt in VMMGC.gc!\n"));
+    AssertReleaseMsgRC(rc, ("Couldn't find TRPMGCHandlerInterupt in VMMRC.rc!\n"));
 
     if (    iTrap < TRPM_HANDLER_INT_BASE
         ||  iTrap >= RT_ELEMENTS(pVM->trpm.s.aIdt))
diff --git a/src/VBox/VMM/VMMR3/VMEmt.cpp b/src/VBox/VMM/VMMR3/VMEmt.cpp
index 80f4b15..4c173e4 100644
--- a/src/VBox/VMM/VMMR3/VMEmt.cpp
+++ b/src/VBox/VMM/VMMR3/VMEmt.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/VMM.cpp b/src/VBox/VMM/VMMR3/VMM.cpp
index 25eb92f..9f3f9e3 100644
--- a/src/VBox/VMM/VMMR3/VMM.cpp
+++ b/src/VBox/VMM/VMMR3/VMM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -567,13 +567,13 @@ VMMR3_INT_DECL(int) VMMR3InitRC(PVM pVM)
     AssertReturn(pVM->cCpus == 1, VERR_RAW_MODE_INVALID_SMP);
 
     /*
-     * Call VMMGCInit():
+     * Call VMMRCInit():
      *      -# resolve the address.
      *      -# setup stackframe and EIP to use the trampoline.
      *      -# do a generic hypervisor call.
      */
     RTRCPTR RCPtrEP;
-    int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
+    int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMRCEntry", &RCPtrEP);
     if (RT_SUCCESS(rc))
     {
         CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
@@ -582,7 +582,7 @@ VMMR3_INT_DECL(int) VMMR3InitRC(PVM pVM)
         CPUMPushHyper(pVCpu, (uint32_t)u64TS);            /* Param 4: The program startup TS - Lo. */
         CPUMPushHyper(pVCpu, vmmGetBuildType());          /* Param 3: Version argument. */
         CPUMPushHyper(pVCpu, VMMGetSvnRev());             /* Param 2: Version argument. */
-        CPUMPushHyper(pVCpu, VMMGC_DO_VMMGC_INIT);        /* Param 1: Operation. */
+        CPUMPushHyper(pVCpu, VMMRC_DO_VMMRC_INIT);        /* Param 1: Operation. */
         CPUMPushHyper(pVCpu, pVM->pVMRC);                 /* Param 0: pVM */
         CPUMPushHyper(pVCpu, 6 * sizeof(RTRCPTR));        /* trampoline param: stacksize.  */
         CPUMPushHyper(pVCpu, RCPtrEP);                    /* Call EIP. */
@@ -2415,6 +2415,7 @@ static DECLCALLBACK(void) vmmR3InfoFF(PVM pVM, PCDBGFINFOHLP pHlp, const char *p
         PRINT_FLAG(VMCPU_FF_,INTERRUPT_SMI);
         PRINT_FLAG(VMCPU_FF_,PDM_CRITSECT);
         PRINT_FLAG(VMCPU_FF_,UNHALT);
+        PRINT_FLAG(VMCPU_FF_,IEM);
         PRINT_FLAG(VMCPU_FF_,REQUEST);
         PRINT_FLAG(VMCPU_FF_,HM_UPDATE_CR3);
         PRINT_FLAG(VMCPU_FF_,HM_UPDATE_PAE_PDPES);
diff --git a/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp b/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp
index 76986e9..540a390 100644
--- a/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp
+++ b/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/VMMR3.def b/src/VBox/VMM/VMMR3/VMMR3.def
index 7ff7071..8fd8864 100644
--- a/src/VBox/VMM/VMMR3/VMMR3.def
+++ b/src/VBox/VMM/VMMR3/VMMR3.def
@@ -3,7 +3,7 @@
 ; VMM Ring-3 Context DLL - Definition file.
 
 ;
-; Copyright (C) 2010-2014 Oracle Corporation
+; Copyright (C) 2010-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
@@ -342,6 +342,7 @@ EXPORTS
     VMR3GetCpuCoreAndPackageIdFromCpuId
     VMR3GetStateName
     VMR3GetStateU
+    VMR3GetSuspendReason
     VMR3GetVM
     VMR3HotPlugCpu
     VMR3HotUnplugCpu
diff --git a/src/VBox/VMM/VMMR3/VMMSwitcher.cpp b/src/VBox/VMM/VMMR3/VMMSwitcher.cpp
index 5730b24..0dde993 100644
--- a/src/VBox/VMM/VMMR3/VMMSwitcher.cpp
+++ b/src/VBox/VMM/VMMR3/VMMSwitcher.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMR3/VMMTests.cpp b/src/VBox/VMM/VMMR3/VMMTests.cpp
index 2a8cd16..66843dd 100644
--- a/src/VBox/VMM/VMMR3/VMMTests.cpp
+++ b/src/VBox/VMM/VMMR3/VMMTests.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -191,12 +191,12 @@ static int vmmR3DoMsrQuickReport(PVM pVM, PRTSTREAM pReportStrm, bool fWithCpuId
  * @param   enmTestcase The testcase operation to perform.
  * @param   uVariation  The testcase variation id.
  */
-static int vmmR3DoGCTest(PVM pVM, VMMGCOPERATION enmTestcase, unsigned uVariation)
+static int vmmR3DoGCTest(PVM pVM, VMMRCOPERATION enmTestcase, unsigned uVariation)
 {
     PVMCPU pVCpu = &pVM->aCpus[0];
 
     RTRCPTR RCPtrEP;
-    int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
+    int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMRCEntry", &RCPtrEP);
     if (RT_FAILURE(rc))
         return rc;
 
@@ -252,14 +252,14 @@ static int vmmR3DoTrapTest(PVM pVM, uint8_t u8Trap, unsigned uVariation, int rcE
     RTPrintf("VMM: testing 0%x / %d - %s\n", u8Trap, uVariation, pszDesc);
 
     RTRCPTR RCPtrEP;
-    int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
+    int rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMRCEntry", &RCPtrEP);
     if (RT_FAILURE(rc))
         return rc;
 
     CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
     vmmR3TestClearStack(pVCpu);
     CPUMPushHyper(pVCpu, uVariation);
-    CPUMPushHyper(pVCpu, u8Trap + VMMGC_DO_TESTCASE_TRAP_FIRST);
+    CPUMPushHyper(pVCpu, u8Trap + VMMRC_DO_TESTCASE_TRAP_FIRST);
     CPUMPushHyper(pVCpu, pVM->pVMRC);
     CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
     CPUMPushHyper(pVCpu, RCPtrEP);                /* what to call */
@@ -345,13 +345,13 @@ VMMR3DECL(int) VMMDoTest(PVM pVM)
 # endif
 
     /*
-     * Setup stack for calling VMMGCEntry().
+     * Setup stack for calling VMMRCEntry().
      */
     RTRCPTR RCPtrEP;
-    rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
+    rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMRCEntry", &RCPtrEP);
     if (RT_SUCCESS(rc))
     {
-        RTPrintf("VMM: VMMGCEntry=%RRv\n", RCPtrEP);
+        RTPrintf("VMM: VMMRCEntry=%RRv\n", RCPtrEP);
 
         /*
          * Test various crashes which we must be able to recover from.
@@ -368,7 +368,7 @@ VMMR3DECL(int) VMMDoTest(PVM pVM)
         if (RT_SUCCESS(rc) && f)
 # endif
         {
-            /* see triple fault warnings in SELM and VMMGC.cpp. */
+            /* see triple fault warnings in SELM and VMMRC.cpp. */
             vmmR3DoTrapTest(pVM, 0x8, 1, VERR_TRPM_PANIC,       0x00000000, "vmmGCTestTrap8_FaultEIP", "#DF [#PG] WP");
             SELMR3Relocate(pVM); /* this resets the busy flag of the Trap 08 TSS */
         }
@@ -390,7 +390,7 @@ VMMR3DECL(int) VMMDoTest(PVM pVM)
         /*
          * Set a debug register and perform a context switch.
          */
-        rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_NOP, 0);
+        rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_NOP, 0);
         if (rc != VINF_SUCCESS)
         {
             RTPrintf("VMM: Nop test failed, rc=%Rrc not VINF_SUCCESS\n", rc);
@@ -404,23 +404,23 @@ VMMR3DECL(int) VMMDoTest(PVM pVM)
         RTUINT iBp0;
         rc = DBGFR3BpSetReg(pUVM, &Addr, 0,  ~(uint64_t)0, X86_DR7_RW_EO, 1, &iBp0);
         AssertReleaseRC(rc);
-        rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_NOP, 0);
+        rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_NOP, 0);
         if (rc != VINF_SUCCESS)
         {
             RTPrintf("VMM: DR0=0x10000 test failed with rc=%Rrc!\n", rc);
             return RT_FAILURE(rc) ? rc : VERR_IPE_UNEXPECTED_INFO_STATUS;
         }
 
-        /* a bad one at VMMGCEntry */
-        RTPrintf("VMM: testing hardware bp at VMMGCEntry (hit)\n");
+        /* a bad one at VMMRCEntry */
+        RTPrintf("VMM: testing hardware bp at VMMRCEntry (hit)\n");
         DBGFR3AddrFromFlat(pUVM, &Addr, RCPtrEP);
         RTUINT iBp1;
         rc = DBGFR3BpSetReg(pUVM, &Addr, 0,  ~(uint64_t)0, X86_DR7_RW_EO, 1, &iBp1);
         AssertReleaseRC(rc);
-        rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_NOP, 0);
+        rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_NOP, 0);
         if (rc != VINF_EM_DBG_HYPER_BREAKPOINT)
         {
-            RTPrintf("VMM: DR1=VMMGCEntry test failed with rc=%Rrc! expected VINF_EM_RAW_BREAKPOINT_HYPER\n", rc);
+            RTPrintf("VMM: DR1=VMMRCEntry test failed with rc=%Rrc! expected VINF_EM_RAW_BREAKPOINT_HYPER\n", rc);
             return RT_FAILURE(rc) ? rc : VERR_IPE_UNEXPECTED_INFO_STATUS;
         }
 
@@ -435,11 +435,11 @@ VMMR3DECL(int) VMMDoTest(PVM pVM)
         }
 
         /* engage the breakpoint again and try single stepping. */
-        RTPrintf("VMM: testing hardware bp at VMMGCEntry + stepping\n");
-        rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_NOP, 0);
+        RTPrintf("VMM: testing hardware bp at VMMRCEntry + stepping\n");
+        rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_NOP, 0);
         if (rc != VINF_EM_DBG_HYPER_BREAKPOINT)
         {
-            RTPrintf("VMM: DR1=VMMGCEntry test failed with rc=%Rrc! expected VINF_EM_RAW_BREAKPOINT_HYPER\n", rc);
+            RTPrintf("VMM: DR1=VMMRCEntry test failed with rc=%Rrc! expected VINF_EM_RAW_BREAKPOINT_HYPER\n", rc);
             return RT_FAILURE(rc) ? rc : VERR_IPE_UNEXPECTED_INFO_STATUS;
         }
 
@@ -473,7 +473,7 @@ VMMR3DECL(int) VMMDoTest(PVM pVM)
             RTPrintf("VMM: Failed to clear breakpoints!\n");
             return VERR_GENERAL_FAILURE;
         }
-        rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_NOP, 0);
+        rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_NOP, 0);
         if (rc != VINF_SUCCESS)
         {
             RTPrintf("VMM: NOP failed, rc=%Rrc\n", rc);
@@ -487,7 +487,7 @@ VMMR3DECL(int) VMMDoTest(PVM pVM)
         for (i = 0; i < 10000; i++)
         {
             uint64_t StartTick = ASMReadTSC();
-            rc = vmmR3DoGCTest(pVM, VMMGC_DO_TESTCASE_INTERRUPT_MASKING, 0);
+            rc = vmmR3DoGCTest(pVM, VMMRC_DO_TESTCASE_INTERRUPT_MASKING, 0);
             if (rc != VINF_SUCCESS)
             {
                 RTPrintf("VMM: Interrupt masking failed: rc=%Rrc\n", rc);
@@ -503,7 +503,7 @@ VMMR3DECL(int) VMMDoTest(PVM pVM)
          */
         CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
         CPUMPushHyper(pVCpu, 0);
-        CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_HYPER_INTERRUPT);
+        CPUMPushHyper(pVCpu, VMMRC_DO_TESTCASE_HYPER_INTERRUPT);
         CPUMPushHyper(pVCpu, pVM->pVMRC);
         CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
         CPUMPushHyper(pVCpu, RCPtrEP);                /* what to call */
@@ -565,7 +565,7 @@ VMMR3DECL(int) VMMDoTest(PVM pVM)
         {
             CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
             CPUMPushHyper(pVCpu, 0);
-            CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_NOP);
+            CPUMPushHyper(pVCpu, VMMRC_DO_TESTCASE_NOP);
             CPUMPushHyper(pVCpu, pVM->pVMRC);
             CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
             CPUMPushHyper(pVCpu, RCPtrEP);                /* what to call */
@@ -607,7 +607,7 @@ VMMR3DECL(int) VMMDoTest(PVM pVM)
 #endif
     }
     else
-        AssertMsgFailed(("Failed to resolved VMMGC.gc::VMMGCEntry(), rc=%Rrc\n", rc));
+        AssertMsgFailed(("Failed to resolved VMMRC.rc::VMMRCEntry(), rc=%Rrc\n", rc));
 #endif
     return rc;
 }
@@ -675,13 +675,13 @@ VMMR3DECL(int) VMMDoHmTest(PVM pVM)
     VM_FF_CLEAR(pVM, VM_FF_REQUEST);
 
     /*
-     * Setup stack for calling VMMGCEntry().
+     * Setup stack for calling VMMRCEntry().
      */
     RTRCPTR RCPtrEP;
-    rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
+    rc = PDMR3LdrGetSymbolRC(pVM, VMMRC_MAIN_MODULE_NAME, "VMMRCEntry", &RCPtrEP);
     if (RT_SUCCESS(rc))
     {
-        RTPrintf("VMM: VMMGCEntry=%RRv\n", RCPtrEP);
+        RTPrintf("VMM: VMMRCEntry=%RRv\n", RCPtrEP);
 
         pHyperCtx = CPUMGetHyperCtxPtr(pVCpu);
 
@@ -706,7 +706,7 @@ VMMR3DECL(int) VMMDoHmTest(PVM pVM)
         {
             CPUMSetHyperState(pVCpu, pVM->vmm.s.pfnCallTrampolineRC, pVCpu->vmm.s.pbEMTStackBottomRC, 0, 0);
             CPUMPushHyper(pVCpu, 0);
-            CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_HM_NOP);
+            CPUMPushHyper(pVCpu, VMMRC_DO_TESTCASE_HM_NOP);
             CPUMPushHyper(pVCpu, pVM->pVMRC);
             CPUMPushHyper(pVCpu, 3 * sizeof(RTRCPTR));    /* stack frame size */
             CPUMPushHyper(pVCpu, RCPtrEP);                /* what to call */
@@ -750,7 +750,7 @@ VMMR3DECL(int) VMMDoHmTest(PVM pVM)
         rc = VINF_SUCCESS;
     }
     else
-        AssertMsgFailed(("Failed to resolved VMMGC.gc::VMMGCEntry(), rc=%Rrc\n", rc));
+        AssertMsgFailed(("Failed to resolved VMMRC.rc::VMMRCEntry(), rc=%Rrc\n", rc));
 
     return rc;
 }
diff --git a/src/VBox/VMM/VMMR3/VMReq.cpp b/src/VBox/VMM/VMMR3/VMReq.cpp
index ec3ab79..7c3aaf4 100644
--- a/src/VBox/VMM/VMMR3/VMReq.cpp
+++ b/src/VBox/VMM/VMMR3/VMReq.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/CSAMRC.cpp b/src/VBox/VMM/VMMRC/CSAMRC.cpp
index fd276f9..81091d7 100644
--- a/src/VBox/VMM/VMMRC/CSAMRC.cpp
+++ b/src/VBox/VMM/VMMRC/CSAMRC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -64,7 +64,7 @@
  * @param   pvRange     The base address of the handled virtual range.
  * @param   offRange    The offset of the access into this range.
  *                      (If it's a EIP range this is the EIP, if not it's pvFault.)
- * @param   pvUser      Ignored.
+ * @param   pvUser      Ignored (NIL).
  */
 DECLEXPORT(VBOXSTRICTRC) csamRCCodePageWritePfHandler(PVM pVM, PVMCPU pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame,
                                                       RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange, void *pvUser)
diff --git a/src/VBox/VMM/VMMRC/EMRCA.asm b/src/VBox/VMM/VMMRC/EMRCA.asm
index 8f22bf3..f14ea10 100644
--- a/src/VBox/VMM/VMMRC/EMRCA.asm
+++ b/src/VBox/VMM/VMMRC/EMRCA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2011 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/IOMRC.cpp b/src/VBox/VMM/VMMRC/IOMRC.cpp
index 92b5320..d511dec 100644
--- a/src/VBox/VMM/VMMRC/IOMRC.cpp
+++ b/src/VBox/VMM/VMMRC/IOMRC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -42,7 +42,7 @@
 #include <iprt/string.h>
 
 
-#ifdef VBOX_WITH_2ND_IEM_STEP
+#ifdef VBOX_WITH_3RD_IEM_STEP
 /**
  * Converts disassembler mode to IEM mode.
  * @return IEM CPU mode.
@@ -199,7 +199,7 @@ static VBOXSTRICTRC iomRCInterpretOUT(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFr
  */
 static VBOXSTRICTRC iomRCInterpretINS(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
-#ifdef VBOX_WITH_2ND_IEM_STEP
+#ifdef VBOX_WITH_3RD_IEM_STEP
     uint8_t cbValue = pCpu->pCurInstr->uOpcode == OP_INSB ? 1
                     : pCpu->uOpMode == DISCPUMODE_16BIT ? 2 : 4;       /* dword in both 32 & 64 bits mode */
     return IEMExecStringIoRead(pVCpu,
@@ -253,7 +253,7 @@ static VBOXSTRICTRC iomRCInterpretINS(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFr
  */
 static VBOXSTRICTRC iomRCInterpretOUTS(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
-#ifdef VBOX_WITH_2ND_IEM_STEP
+#ifdef VBOX_WITH_3RD_IEM_STEP
     uint8_t cbValue = pCpu->pCurInstr->uOpcode == OP_OUTSB ? 1
                     : pCpu->uOpMode == DISCPUMODE_16BIT ? 2 : 4;       /* dword in both 32 & 64 bits mode */
     return IEMExecStringIoWrite(pVCpu,
diff --git a/src/VBox/VMM/VMMRC/MMRamRC.cpp b/src/VBox/VMM/VMMRC/MMRamRC.cpp
index 45e1270..7eafef5 100644
--- a/src/VBox/VMM/VMMRC/MMRamRC.cpp
+++ b/src/VBox/VMM/VMMRC/MMRamRC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/MMRamRCA.asm b/src/VBox/VMM/VMMRC/MMRamRCA.asm
index f46ecd8..61ae8fa 100644
--- a/src/VBox/VMM/VMMRC/MMRamRCA.asm
+++ b/src/VBox/VMM/VMMRC/MMRamRCA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2011 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/PATMRC.cpp b/src/VBox/VMM/VMMRC/PATMRC.cpp
index 42d65e0..9f8770e 100644
--- a/src/VBox/VMM/VMMRC/PATMRC.cpp
+++ b/src/VBox/VMM/VMMRC/PATMRC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -55,8 +55,12 @@ DECLEXPORT(VBOXSTRICTRC) patmRCVirtPagePfHandler(PVM pVM, PVMCPU pVCpu, RTGCUINT
                                                  RTGCPTR pvFault, RTGCPTR pvRange, uintptr_t offRange, void *pvUser)
 {
     NOREF(pVCpu); NOREF(uErrorCode); NOREF(pRegFrame); NOREF(pvFault); NOREF(pvRange); NOREF(offRange);
-    Assert(pvUser); Assert(!((uintptr_t)pvUser & PAGE_OFFSET_MASK));
-    pVM->patm.s.pvFaultMonitor = (RTRCPTR)((uintptr_t)pvUser + (pvFault & PAGE_OFFSET_MASK));
+
+    Assert(pvUser);
+    Assert(!((uintptr_t)pvUser & PAGE_OFFSET_MASK));
+    Assert(((uintptr_t)pvUser + (pvFault & PAGE_OFFSET_MASK)) == pvRange + offRange);
+
+    pVM->patm.s.pvFaultMonitor = (RTRCPTR)(pvRange + offRange);
     return VINF_PATM_CHECK_PATCH_PAGE;
 }
 
diff --git a/src/VBox/VMM/VMMRC/PDMRCDevice.cpp b/src/VBox/VMM/VMMRC/PDMRCDevice.cpp
index a3f3a56..0cb2fe3 100644
--- a/src/VBox/VMM/VMMRC/PDMRCDevice.cpp
+++ b/src/VBox/VMM/VMMRC/PDMRCDevice.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/PGMRC.cpp b/src/VBox/VMM/VMMRC/PGMRC.cpp
index 4137ee0..80756d2 100644
--- a/src/VBox/VMM/VMMRC/PGMRC.cpp
+++ b/src/VBox/VMM/VMMRC/PGMRC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/PGMRCBth.h b/src/VBox/VMM/VMMRC/PGMRCBth.h
index 8abd7db..8490f1c 100644
--- a/src/VBox/VMM/VMMRC/PGMRCBth.h
+++ b/src/VBox/VMM/VMMRC/PGMRCBth.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/PGMRCGst.h b/src/VBox/VMM/VMMRC/PGMRCGst.h
index 82200f2..db9887d 100644
--- a/src/VBox/VMM/VMMRC/PGMRCGst.h
+++ b/src/VBox/VMM/VMMRC/PGMRCGst.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/PGMRCShw.h b/src/VBox/VMM/VMMRC/PGMRCShw.h
index f7c1b54..abe7559 100644
--- a/src/VBox/VMM/VMMRC/PGMRCShw.h
+++ b/src/VBox/VMM/VMMRC/PGMRCShw.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/SELMRC.cpp b/src/VBox/VMM/VMMRC/SELMRC.cpp
index c6a5e85..78fb582 100644
--- a/src/VBox/VMM/VMMRC/SELMRC.cpp
+++ b/src/VBox/VMM/VMMRC/SELMRC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/TRPMRC.cpp b/src/VBox/VMM/VMMRC/TRPMRC.cpp
index c37548c..b82a941 100644
--- a/src/VBox/VMM/VMMRC/TRPMRC.cpp
+++ b/src/VBox/VMM/VMMRC/TRPMRC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -84,7 +84,7 @@ VMMRCDECL(void) TRPMGCHyperReturnToHost(PVM pVM, int rc)
 
     LogFlow(("TRPMGCHyperReturnToHost: rc=%Rrc\n", rc));
     TRPMResetTrap(pVCpu);
-    VMMGCGuestToHost(pVM, rc);
+    VMMRCGuestToHost(pVM, rc);
     AssertReleaseFailed();
 }
 
diff --git a/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp b/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp
index b8b6623..258d767 100644
--- a/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp
+++ b/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -120,7 +120,7 @@ typedef struct TRPMGCHYPER
 *   Global Variables                                                           *
 *******************************************************************************/
 RT_C_DECLS_BEGIN
-/** Defined in VMMGC0.asm or VMMGC99.asm.
+/** Defined in VMMRC0.asm or VMMRC99.asm.
  * @{ */
 extern const TRPMGCHYPER g_aTrap0bHandlers[1];
 extern const TRPMGCHYPER g_aTrap0bHandlersEnd[1];
@@ -212,6 +212,7 @@ static int trpmGCExitTrap(PVM pVM, PVMCPU pVCpu, int rc, PCPUMCTXCORE pRegFrame)
              || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TIMER | VMCPU_FF_TO_R3 | VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC
                                           | VMCPU_FF_REQUEST | VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL
                                           | VMCPU_FF_PDM_CRITSECT
+                                          | VMCPU_FF_IEM
                                           | VMCPU_FF_SELM_SYNC_GDT | VMCPU_FF_SELM_SYNC_LDT
                                           | VMCPU_FF_SELM_SYNC_TSS | VMCPU_FF_TRPM_SYNC_IDT
                                    )
@@ -222,7 +223,7 @@ static int trpmGCExitTrap(PVM pVM, PVMCPU pVCpu, int rc, PCPUMCTXCORE pRegFrame)
         if (RT_UNLIKELY(VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)))
             rc = VINF_EM_NO_MEMORY;
         /* Pending Ring-3 action. */
-        else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TO_R3 | VMCPU_FF_PDM_CRITSECT))
+        else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TO_R3 | VMCPU_FF_PDM_CRITSECT | VMCPU_FF_IEM))
         {
             VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TO_R3);
             rc = VINF_EM_RAW_TO_R3;
diff --git a/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm b/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm
index 78389b9..7f02489 100644
--- a/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm
+++ b/src/VBox/VMM/VMMRC/TRPMRCHandlersA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/VMMRC.cpp b/src/VBox/VMM/VMMRC/VMMRC.cpp
index eb44d1a..f18b38e 100644
--- a/src/VBox/VMM/VMMRC/VMMRC.cpp
+++ b/src/VBox/VMM/VMMRC/VMMRC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -57,10 +57,10 @@ DECLASM(bool)   vmmRCSafeMsrWrite(uint32_t uMsr, uint64_t u64Value);
  *
  * @returns VBox status code.
  * @param   pVM         Pointer to the VM.
- * @param   uOperation  Which operation to execute (VMMGCOPERATION).
+ * @param   uOperation  Which operation to execute (VMMRCOPERATION).
  * @param   uArg        Argument to that operation.
  */
-VMMRCDECL(int) VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)
+VMMRCDECL(int) VMMRCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)
 {
     /* todo */
     switch (uOperation)
@@ -68,7 +68,7 @@ VMMRCDECL(int) VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)
         /*
          * Init RC modules.
          */
-        case VMMGC_DO_VMMGC_INIT:
+        case VMMRC_DO_VMMRC_INIT:
         {
             /*
              * Validate the svn revision (uArg) and build type (ellipsis).
@@ -91,7 +91,7 @@ VMMRCDECL(int) VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)
             va_end(va);
 
             int rc = RTRCInit(u64TS);
-            Log(("VMMGCEntry: VMMGC_DO_VMMGC_INIT - uArg=%u (svn revision) u64TS=%RX64; rc=%Rrc\n", uArg, u64TS, rc));
+            Log(("VMMRCEntry: VMMRC_DO_VMMRC_INIT - uArg=%u (svn revision) u64TS=%RX64; rc=%Rrc\n", uArg, u64TS, rc));
             AssertRCReturn(rc, rc);
 
             rc = PGMRegisterStringFormatTypes();
@@ -106,7 +106,7 @@ VMMRCDECL(int) VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)
          * Testcase which is used to test interrupt forwarding.
          * It spins for a while with interrupts enabled.
          */
-        case VMMGC_DO_TESTCASE_HYPER_INTERRUPT:
+        case VMMRC_DO_TESTCASE_HYPER_INTERRUPT:
         {
             uint32_t volatile i = 0;
             ASMIntEnable();
@@ -120,20 +120,20 @@ VMMRCDECL(int) VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)
          * Testcase which simply returns, this is used for
          * profiling of the switcher.
          */
-        case VMMGC_DO_TESTCASE_NOP:
+        case VMMRC_DO_TESTCASE_NOP:
             return 0;
 
         /*
          * Testcase executes a privileged instruction to force a world switch. (in both SVM & VMX)
          */
-        case VMMGC_DO_TESTCASE_HM_NOP:
+        case VMMRC_DO_TESTCASE_HM_NOP:
             ASMRdMsr_Low(MSR_IA32_SYSENTER_CS);
             return 0;
 
         /*
          * Delay for ~100us.
          */
-        case VMMGC_DO_TESTCASE_INTERRUPT_MASKING:
+        case VMMRC_DO_TESTCASE_INTERRUPT_MASKING:
         {
             uint64_t u64MaxTicks = (SUPGetCpuHzFromGip(g_pSUPGlobalInfoPage) != ~(uint64_t)0
                                     ? SUPGetCpuHzFromGip(g_pSUPGlobalInfoPage)
@@ -161,8 +161,8 @@ VMMRCDECL(int) VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...)
          * Trap testcases and unknown operations.
          */
         default:
-            if (    uOperation >= VMMGC_DO_TESTCASE_TRAP_FIRST
-                &&  uOperation < VMMGC_DO_TESTCASE_TRAP_LAST)
+            if (    uOperation >= VMMRC_DO_TESTCASE_TRAP_FIRST
+                &&  uOperation < VMMRC_DO_TESTCASE_TRAP_LAST)
                 return vmmGCTest(pVM, uOperation, uArg);
             return VERR_INVALID_PARAMETER;
     }
@@ -191,7 +191,7 @@ VMMRCDECL(int) vmmGCLoggerFlush(PRTLOGGERRC pLogger)
  *
  * @param   pVM             Pointer to the VM.
  */
-VMMRCDECL(void) VMMGCLogFlushIfFull(PVM pVM)
+VMMRCDECL(void) VMMRCLogFlushIfFull(PVM pVM)
 {
     if (    pVM->vmm.s.pRCLoggerRC
         &&  pVM->vmm.s.pRCLoggerRC->offScratch >= (sizeof(pVM->vmm.s.pRCLoggerRC->achScratch)*3/4))
@@ -209,7 +209,7 @@ VMMRCDECL(void) VMMGCLogFlushIfFull(PVM pVM)
  * @param   pVM         Pointer to the VM.
  * @param   rc          The status code.
  */
-VMMRCDECL(void) VMMGCGuestToHost(PVM pVM, int rc)
+VMMRCDECL(void) VMMRCGuestToHost(PVM pVM, int rc)
 {
     pVM->vmm.s.pfnRCToHost(rc);
 }
@@ -272,23 +272,23 @@ static int vmmGCTest(PVM pVM, unsigned uOperation, unsigned uArg)
     int rc = VERR_NOT_IMPLEMENTED;
     switch (uOperation)
     {
-        //case VMMGC_DO_TESTCASE_TRAP_0:
-        //case VMMGC_DO_TESTCASE_TRAP_1:
-        //case VMMGC_DO_TESTCASE_TRAP_2:
+        //case VMMRC_DO_TESTCASE_TRAP_0:
+        //case VMMRC_DO_TESTCASE_TRAP_1:
+        //case VMMRC_DO_TESTCASE_TRAP_2:
 
-        case VMMGC_DO_TESTCASE_TRAP_3:
+        case VMMRC_DO_TESTCASE_TRAP_3:
         {
             if (uArg <= 1)
                 rc = vmmGCTestTrap3();
             break;
         }
 
-        //case VMMGC_DO_TESTCASE_TRAP_4:
-        //case VMMGC_DO_TESTCASE_TRAP_5:
-        //case VMMGC_DO_TESTCASE_TRAP_6:
-        //case VMMGC_DO_TESTCASE_TRAP_7:
+        //case VMMRC_DO_TESTCASE_TRAP_4:
+        //case VMMRC_DO_TESTCASE_TRAP_5:
+        //case VMMRC_DO_TESTCASE_TRAP_6:
+        //case VMMRC_DO_TESTCASE_TRAP_7:
 
-        case VMMGC_DO_TESTCASE_TRAP_8:
+        case VMMRC_DO_TESTCASE_TRAP_8:
         {
 #ifndef DEBUG_bird /** @todo dynamic check that this won't triple fault... */
             if (uArg & 1)
@@ -299,19 +299,19 @@ static int vmmGCTest(PVM pVM, unsigned uOperation, unsigned uArg)
             break;
         }
 
-        //VMMGC_DO_TESTCASE_TRAP_9,
-        //VMMGC_DO_TESTCASE_TRAP_0A,
-        //VMMGC_DO_TESTCASE_TRAP_0B,
-        //VMMGC_DO_TESTCASE_TRAP_0C,
+        //VMMRC_DO_TESTCASE_TRAP_9,
+        //VMMRC_DO_TESTCASE_TRAP_0A,
+        //VMMRC_DO_TESTCASE_TRAP_0B,
+        //VMMRC_DO_TESTCASE_TRAP_0C,
 
-        case VMMGC_DO_TESTCASE_TRAP_0D:
+        case VMMRC_DO_TESTCASE_TRAP_0D:
         {
             if (uArg <= 1)
                 rc = vmmGCTestTrap0d();
             break;
         }
 
-        case VMMGC_DO_TESTCASE_TRAP_0E:
+        case VMMRC_DO_TESTCASE_TRAP_0E:
         {
             if (uArg <= 1)
                 rc = vmmGCTestTrap0e();
diff --git a/src/VBox/VMM/VMMRC/VMMRC.def b/src/VBox/VMM/VMMRC/VMMRC.def
index 5cddd40..4fd38a5 100644
--- a/src/VBox/VMM/VMMRC/VMMRC.def
+++ b/src/VBox/VMM/VMMRC/VMMRC.def
@@ -14,7 +14,7 @@
 ; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 ;
 
-LIBRARY VMMGC.gc
+LIBRARY VMMRC.rc
 EXPORTS
     ; data
 
diff --git a/src/VBox/VMM/VMMRC/VMMRC.mac b/src/VBox/VMM/VMMRC/VMMRC.mac
index 8378785..a8e41a7 100644
--- a/src/VBox/VMM/VMMRC/VMMRC.mac
+++ b/src/VBox/VMM/VMMRC/VMMRC.mac
@@ -1,10 +1,10 @@
 ; $Id: VMMRC.mac $
 ;; @file
-; VMMGC - Raw-mode Context Assembly Macros.
+; VMMRC - Raw-mode Context Assembly Macros.
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
@@ -15,8 +15,8 @@
 ; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 ;
 
-%ifndef __VMMGC_mac__
-%define __VMMGC_mac__
+%ifndef __VMMRC_mac__
+%define __VMMRC_mac__
 
 %include "VBox/asmdefs.mac"
 
diff --git a/src/VBox/VMM/VMMRC/VMMRCA.asm b/src/VBox/VMM/VMMRC/VMMRCA.asm
index ad523a4..7193165 100644
--- a/src/VBox/VMM/VMMRC/VMMRCA.asm
+++ b/src/VBox/VMM/VMMRC/VMMRCA.asm
@@ -1,10 +1,10 @@
 ; $Id: VMMRCA.asm $
 ;; @file
-; VMMGC - Raw-mode Context Virtual Machine Monitor assembly routines.
+; VMMRC - Raw-mode Context Virtual Machine Monitor assembly routines.
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/VMMRCBuiltin.def b/src/VBox/VMM/VMMRC/VMMRCBuiltin.def
index 374a81a..917e3db 100644
--- a/src/VBox/VMM/VMMRC/VMMRCBuiltin.def
+++ b/src/VBox/VMM/VMMRC/VMMRCBuiltin.def
@@ -3,7 +3,7 @@
 ; VMM Raw-mode Context Builtin DLL - Definition file for generating import library.
 ;
 
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRC/VMMRCDeps.cpp b/src/VBox/VMM/VMMRC/VMMRCDeps.cpp
index 374af5d..7246671 100644
--- a/src/VBox/VMM/VMMRC/VMMRCDeps.cpp
+++ b/src/VBox/VMM/VMMRC/VMMRCDeps.cpp
@@ -1,10 +1,10 @@
 /* $Id: VMMRCDeps.cpp $ */
 /** @file
- * VMMGC Runtime Dependencies.
+ * VMMRC Runtime Dependencies.
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -25,7 +25,7 @@ extern uint64_t __umoddi3(uint64_t, uint64_t);
 RT_C_DECLS_END
 #endif // RT_OS_SOLARIS || RT_OS_FREEBSD
 
-PFNRT g_VMMGCDeps[] =
+PFNRT g_VMMRCDeps[] =
 {
     (PFNRT)memset,
     (PFNRT)memcpy,
diff --git a/src/VBox/VMM/VMMRZ/DBGFRZ.cpp b/src/VBox/VMM/VMMRZ/DBGFRZ.cpp
index ba666d7..523aa59 100644
--- a/src/VBox/VMM/VMMRZ/DBGFRZ.cpp
+++ b/src/VBox/VMM/VMMRZ/DBGFRZ.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp b/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp
index c4cd2d2..1357b2d 100644
--- a/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp
+++ b/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMRZ/VMMRZ.cpp b/src/VBox/VMM/VMMRZ/VMMRZ.cpp
index 68168f8..deda2ea 100644
--- a/src/VBox/VMM/VMMRZ/VMMRZ.cpp
+++ b/src/VBox/VMM/VMMRZ/VMMRZ.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm b/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm
index e56df78..b4241bd 100644
--- a/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm
+++ b/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm b/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm
index 42f9dc6..9781580 100644
--- a/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm
+++ b/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm b/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm
index f9ac927..a0b99cb 100644
--- a/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm
+++ b/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/AMD64Stub.asm b/src/VBox/VMM/VMMSwitcher/AMD64Stub.asm
index f06de3e..0238944 100644
--- a/src/VBox/VMM/VMMSwitcher/AMD64Stub.asm
+++ b/src/VBox/VMM/VMMSwitcher/AMD64Stub.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm b/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm
index 28c78aa..586612f 100644
--- a/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm
+++ b/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm b/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm
index 78bf010..8aadbf2 100644
--- a/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm
+++ b/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac b/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac
index 7afd280..0e83630 100644
--- a/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac
+++ b/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2014 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac b/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac
index ba37308..d607fc9 100644
--- a/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac
+++ b/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac
@@ -8,7 +8,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm b/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm
index c39437a..5ac2c5b 100644
--- a/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm
+++ b/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm b/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm
index dac82f0..539bee1 100644
--- a/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm
+++ b/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm b/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm
index 609f66a..c208762 100644
--- a/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm
+++ b/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac b/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac
index b8d0fe0..6f66d4f 100644
--- a/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac
+++ b/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/VMMSwitcher/X86Stub.asm b/src/VBox/VMM/VMMSwitcher/X86Stub.asm
index 257fa56..47d70b6 100644
--- a/src/VBox/VMM/VMMSwitcher/X86Stub.asm
+++ b/src/VBox/VMM/VMMSwitcher/X86Stub.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/dtrace/int-1.d b/src/VBox/VMM/dtrace/int-1.d
index 76bb4c4..17168e2 100644
--- a/src/VBox/VMM/dtrace/int-1.d
+++ b/src/VBox/VMM/dtrace/int-1.d
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/dtrace/lib/amd64/vbox-arch-types.d b/src/VBox/VMM/dtrace/lib/amd64/vbox-arch-types.d
index 6df6530..922c8cd 100644
--- a/src/VBox/VMM/dtrace/lib/amd64/vbox-arch-types.d
+++ b/src/VBox/VMM/dtrace/lib/amd64/vbox-arch-types.d
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/dtrace/lib/vbox-types.d b/src/VBox/VMM/dtrace/lib/vbox-types.d
index b96b7c3..f929b3f 100644
--- a/src/VBox/VMM/dtrace/lib/vbox-types.d
+++ b/src/VBox/VMM/dtrace/lib/vbox-types.d
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/dtrace/lib/x86/vbox-arch-types.d b/src/VBox/VMM/dtrace/lib/x86/vbox-arch-types.d
index c3521b7..6294298 100644
--- a/src/VBox/VMM/dtrace/lib/x86/vbox-arch-types.d
+++ b/src/VBox/VMM/dtrace/lib/x86/vbox-arch-types.d
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/dtrace/return-to-ring-3-aggregation-1.d b/src/VBox/VMM/dtrace/return-to-ring-3-aggregation-1.d
index 741e0dd..ca1da91 100644
--- a/src/VBox/VMM/dtrace/return-to-ring-3-aggregation-1.d
+++ b/src/VBox/VMM/dtrace/return-to-ring-3-aggregation-1.d
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2016 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/dtrace/vmexit-rip-aggregation-1.d b/src/VBox/VMM/dtrace/vmexit-rip-aggregation-1.d
index 5856b84..d03d076 100644
--- a/src/VBox/VMM/dtrace/vmexit-rip-aggregation-1.d
+++ b/src/VBox/VMM/dtrace/vmexit-rip-aggregation-1.d
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/CFGMInternal.h b/src/VBox/VMM/include/CFGMInternal.h
index 7abced2..a4a6a58 100644
--- a/src/VBox/VMM/include/CFGMInternal.h
+++ b/src/VBox/VMM/include/CFGMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/CPUMInternal.mac b/src/VBox/VMM/include/CPUMInternal.mac
index 56950ed..62b57e2 100644
--- a/src/VBox/VMM/include/CPUMInternal.mac
+++ b/src/VBox/VMM/include/CPUMInternal.mac
@@ -62,8 +62,6 @@ endstruc
 %define CPUM_HANDLER_TYPEMASK           0ffh
 %define CPUM_HANDLER_CTXCORE_IN_EBP     RT_BIT(31)
 
-%define VMMGCRET_USED_FPU               040000000h
-
 
 ;; if anyone figures how to do %if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL) in
 ; nasm please tell / fix this hack.
diff --git a/src/VBox/VMM/include/CSAMInternal.h b/src/VBox/VMM/include/CSAMInternal.h
index 6ba5e67..c2b5455 100644
--- a/src/VBox/VMM/include/CSAMInternal.h
+++ b/src/VBox/VMM/include/CSAMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/DBGFInternal.h b/src/VBox/VMM/include/DBGFInternal.h
index b530170..93cee8c 100644
--- a/src/VBox/VMM/include/DBGFInternal.h
+++ b/src/VBox/VMM/include/DBGFInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/EMHandleRCTmpl.h b/src/VBox/VMM/include/EMHandleRCTmpl.h
index 80e80a6..fe55be9 100644
--- a/src/VBox/VMM/include/EMHandleRCTmpl.h
+++ b/src/VBox/VMM/include/EMHandleRCTmpl.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/EMInternal.h b/src/VBox/VMM/include/EMInternal.h
index 0d8842d..cdc9676 100644
--- a/src/VBox/VMM/include/EMInternal.h
+++ b/src/VBox/VMM/include/EMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/FTMInternal.h b/src/VBox/VMM/include/FTMInternal.h
index 6b442f1..ab14d82 100644
--- a/src/VBox/VMM/include/FTMInternal.h
+++ b/src/VBox/VMM/include/FTMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/HMInternal.mac b/src/VBox/VMM/include/HMInternal.mac
index 6345dbd..c951174 100644
--- a/src/VBox/VMM/include/HMInternal.mac
+++ b/src/VBox/VMM/include/HMInternal.mac
@@ -3,7 +3,7 @@
 ; HM - Internal header file.
 ;
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/IEMInternal.h b/src/VBox/VMM/include/IEMInternal.h
index 920f174..4f94da9 100644
--- a/src/VBox/VMM/include/IEMInternal.h
+++ b/src/VBox/VMM/include/IEMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -124,6 +124,45 @@ typedef IEMFPURESULTTWO *PIEMFPURESULTTWO;
 typedef IEMFPURESULTTWO const *PCIEMFPURESULTTWO;
 
 
+/**
+ * IEM pending commit function index.
+ */
+typedef enum IEMCOMMIT
+{
+    /** Invalid / nothing pending. */
+    IEMCOMMIT_INVALID = 0,
+    /** @name INS
+     * @{  */
+    IEMCOMMIT_INS_OP8_ADDR16,
+    IEMCOMMIT_INS_OP8_ADDR32,
+    IEMCOMMIT_INS_OP8_ADDR64,
+    IEMCOMMIT_INS_OP16_ADDR16,
+    IEMCOMMIT_INS_OP16_ADDR32,
+    IEMCOMMIT_INS_OP16_ADDR64,
+    IEMCOMMIT_INS_OP32_ADDR16,
+    IEMCOMMIT_INS_OP32_ADDR32,
+    IEMCOMMIT_INS_OP32_ADDR64,
+    /** @} */
+    /** @name REP INS
+     * @{  */
+    IEMCOMMIT_REP_INS_OP8_ADDR16,
+    IEMCOMMIT_REP_INS_OP8_ADDR32,
+    IEMCOMMIT_REP_INS_OP8_ADDR64,
+    IEMCOMMIT_REP_INS_OP16_ADDR16,
+    IEMCOMMIT_REP_INS_OP16_ADDR32,
+    IEMCOMMIT_REP_INS_OP16_ADDR64,
+    IEMCOMMIT_REP_INS_OP32_ADDR16,
+    IEMCOMMIT_REP_INS_OP32_ADDR32,
+    IEMCOMMIT_REP_INS_OP32_ADDR64,
+    /** @} */
+    /** End of valid functions. */
+    IEMCOMMIT_END,
+    /** Make sure the type is int in call contexts. */
+    IEMCOMMIT_32BIT_HACK = 0x7fffffff
+} IEMCOMMIT;
+AssertCompile(sizeof(IEMCOMMIT) == 4);
+
+
 #ifdef IEM_VERIFICATION_MODE_FULL
 
 /**
@@ -252,6 +291,8 @@ typedef struct IEMCPU
     uint32_t                cRetErrStatuses;
     /** Number of times rcPassUp has been used. */
     uint32_t                cRetPassUpStatus;
+    /** Number of times RZ left with instruction commit pending for ring-3. */
+    uint32_t                cPendingCommit;
 #ifdef IEM_VERIFICATION_MODE_FULL
     /** The Number of I/O port reads that has been performed. */
     uint32_t                cIOReads;
@@ -321,9 +362,6 @@ typedef struct IEMCPU
 
     /** @}*/
 
-    /** Alignment padding for aMemMappings. */
-    uint8_t                 abAlignment2[4];
-
     /** The number of active guest memory mappings. */
     uint8_t                 cActiveMappings;
     /** The next unused mapping index. */
@@ -376,6 +414,19 @@ typedef struct IEMCPU
         uint8_t             ab[512];
     } aBounceBuffers[3];
 
+    /** @name Pending Instruction Commit (R0/RC postponed it to Ring-3).
+     * @{ */
+    struct
+    {
+        /** The commit function to call. */
+        IEMCOMMIT           enmFn;
+        /** The instruction size. */
+        uint8_t             cbInstr;
+        /** Generic value to commit. */
+        uint64_t            uValue;
+    } PendingCommit;
+    /** @} */
+
     /** @name Target CPU information.
      * @{ */
     /** The CPU vendor. */
diff --git a/src/VBox/VMM/include/IOMInline.h b/src/VBox/VMM/include/IOMInline.h
index 7c7ac41..f6829c6 100644
--- a/src/VBox/VMM/include/IOMInline.h
+++ b/src/VBox/VMM/include/IOMInline.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/IOMInternal.h b/src/VBox/VMM/include/IOMInternal.h
index 078e768..b44e9fe 100644
--- a/src/VBox/VMM/include/IOMInternal.h
+++ b/src/VBox/VMM/include/IOMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/MMInternal.h b/src/VBox/VMM/include/MMInternal.h
index 950debe..953ae35 100644
--- a/src/VBox/VMM/include/MMInternal.h
+++ b/src/VBox/VMM/include/MMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/PATMInternal.h b/src/VBox/VMM/include/PATMInternal.h
index a864f39..4503672 100644
--- a/src/VBox/VMM/include/PATMInternal.h
+++ b/src/VBox/VMM/include/PATMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h b/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h
index d9d7816..a8be234 100644
--- a/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h
+++ b/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/PDMAsyncCompletionInternal.h b/src/VBox/VMM/include/PDMAsyncCompletionInternal.h
index 30dbdd8..ba05c9d 100644
--- a/src/VBox/VMM/include/PDMAsyncCompletionInternal.h
+++ b/src/VBox/VMM/include/PDMAsyncCompletionInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/PDMBlkCacheInternal.h b/src/VBox/VMM/include/PDMBlkCacheInternal.h
index 47af634..c1afc72 100644
--- a/src/VBox/VMM/include/PDMBlkCacheInternal.h
+++ b/src/VBox/VMM/include/PDMBlkCacheInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/PDMInline.h b/src/VBox/VMM/include/PDMInline.h
index cf66756..08b4c23 100644
--- a/src/VBox/VMM/include/PDMInline.h
+++ b/src/VBox/VMM/include/PDMInline.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/PDMInternal.h b/src/VBox/VMM/include/PDMInternal.h
index 968c466..932a7cc 100644
--- a/src/VBox/VMM/include/PDMInternal.h
+++ b/src/VBox/VMM/include/PDMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -300,9 +300,9 @@ typedef struct PDMCRITSECTINT
     bool                            fUsedByTimerOrSimilar;
     /** Alignment padding. */
     bool                            afPadding[2];
-    /** Event semaphore that is scheduled to be signaled upon leaving the
-     * critical section. This is Ring-3 only of course. */
-    RTSEMEVENT                      EventToSignal;
+    /** Support driver event semaphore that is scheduled to be signaled upon leaving
+     * the critical section. This is only for Ring-3 and Ring-0. */
+    SUPSEMEVENT                     hEventToSignal;
     /** The lock name. */
     R3PTRTYPE(const char *)         pszName;
     /** R0/RC lock contention. */
diff --git a/src/VBox/VMM/include/PDMNetShaperInternal.h b/src/VBox/VMM/include/PDMNetShaperInternal.h
index 33d8e7e..727025d 100644
--- a/src/VBox/VMM/include/PDMNetShaperInternal.h
+++ b/src/VBox/VMM/include/PDMNetShaperInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/PGMGstDefs.h b/src/VBox/VMM/include/PGMGstDefs.h
index c531a4e..bf5bf64 100644
--- a/src/VBox/VMM/include/PGMGstDefs.h
+++ b/src/VBox/VMM/include/PGMGstDefs.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/PGMInline.h b/src/VBox/VMM/include/PGMInline.h
index 30f28d9..00090ee 100644
--- a/src/VBox/VMM/include/PGMInline.h
+++ b/src/VBox/VMM/include/PGMInline.h
@@ -488,6 +488,14 @@ DECLINLINE(int) pgmPhysPageQueryTlbeWithPage(PVM pVM, PPGMPAGE pPage, RTGCPHYS G
     {
         STAM_COUNTER_INC(&pVM->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,PageMapTlbHits));
         rc = VINF_SUCCESS;
+# if 0 //def VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+#  ifdef IN_RING3
+        if (pTlbe->pv == (void *)pVM->pgm.s.pvZeroPgR0)
+#  else
+        if (pTlbe->pv == (void *)pVM->pgm.s.pvZeroPgR3)
+#  endif
+            pTlbe->pv = pVM->pgm.s.CTX_SUFF(pvZeroPg);
+# endif
         AssertPtr(pTlbe->pv);
 # ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
         Assert(!pTlbe->pMap || RT_VALID_PTR(pTlbe->pMap->pv));
@@ -1198,6 +1206,7 @@ DECLINLINE(PPGMPHYSHANDLER) pgmHandlerPhysicalLookup(PVM pVM, RTGCPHYS GCPhys)
 }
 
 
+#ifdef VBOX_WITH_RAW_MODE
 /**
  * Clears one physical page of a virtual handler.
  *
@@ -1215,16 +1224,16 @@ DECLINLINE(void) pgmHandlerVirtualClearPage(PVM pVM, PPGMVIRTHANDLER pCur, unsig
     /*
      * Remove the node from the tree (it's supposed to be in the tree if we get here!).
      */
-#ifdef VBOX_STRICT_PGM_HANDLER_VIRTUAL
+# ifdef VBOX_STRICT_PGM_HANDLER_VIRTUAL
     AssertReleaseMsg(pPhys2Virt->offNextAlias & PGMPHYS2VIRTHANDLER_IN_TREE,
                      ("pPhys2Virt=%p:{.Core.Key=%RGp, .Core.KeyLast=%RGp, .offVirtHandler=%#RX32, .offNextAlias=%#RX32}\n",
                       pPhys2Virt, pPhys2Virt->Core.Key, pPhys2Virt->Core.KeyLast, pPhys2Virt->offVirtHandler, pPhys2Virt->offNextAlias));
-#endif
+# endif
     if (pPhys2Virt->offNextAlias & PGMPHYS2VIRTHANDLER_IS_HEAD)
     {
         /* We're the head of the alias chain. */
         PPGMPHYS2VIRTHANDLER pRemove = (PPGMPHYS2VIRTHANDLER)RTAvlroGCPhysRemove(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysToVirtHandlers, pPhys2Virt->Core.Key); NOREF(pRemove);
-#ifdef VBOX_STRICT_PGM_HANDLER_VIRTUAL
+# ifdef VBOX_STRICT_PGM_HANDLER_VIRTUAL
         AssertReleaseMsg(pRemove != NULL,
                          ("pPhys2Virt=%p:{.Core.Key=%RGp, .Core.KeyLast=%RGp, .offVirtHandler=%#RX32, .offNextAlias=%#RX32}\n",
                           pPhys2Virt, pPhys2Virt->Core.Key, pPhys2Virt->Core.KeyLast, pPhys2Virt->offVirtHandler, pPhys2Virt->offNextAlias));
@@ -1233,16 +1242,16 @@ DECLINLINE(void) pgmHandlerVirtualClearPage(PVM pVM, PPGMVIRTHANDLER pCur, unsig
                           "   got:    pRemove=%p:{.Core.Key=%RGp, .Core.KeyLast=%RGp, .offVirtHandler=%#RX32, .offNextAlias=%#RX32}\n",
                           pPhys2Virt, pPhys2Virt->Core.Key, pPhys2Virt->Core.KeyLast, pPhys2Virt->offVirtHandler, pPhys2Virt->offNextAlias,
                           pRemove, pRemove->Core.Key, pRemove->Core.KeyLast, pRemove->offVirtHandler, pRemove->offNextAlias));
-#endif
+# endif
         if (pPhys2Virt->offNextAlias & PGMPHYS2VIRTHANDLER_OFF_MASK)
         {
             /* Insert the next list in the alias chain into the tree. */
             PPGMPHYS2VIRTHANDLER pNext = (PPGMPHYS2VIRTHANDLER)((intptr_t)pPhys2Virt + (pPhys2Virt->offNextAlias & PGMPHYS2VIRTHANDLER_OFF_MASK));
-#ifdef VBOX_STRICT_PGM_HANDLER_VIRTUAL
+# ifdef VBOX_STRICT_PGM_HANDLER_VIRTUAL
             AssertReleaseMsg(pNext->offNextAlias & PGMPHYS2VIRTHANDLER_IN_TREE,
                              ("pNext=%p:{.Core.Key=%RGp, .Core.KeyLast=%RGp, .offVirtHandler=%#RX32, .offNextAlias=%#RX32}\n",
                              pNext, pNext->Core.Key, pNext->Core.KeyLast, pNext->offVirtHandler, pNext->offNextAlias));
-#endif
+# endif
             pNext->offNextAlias |= PGMPHYS2VIRTHANDLER_IS_HEAD;
             bool fRc = RTAvlroGCPhysInsert(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysToVirtHandlers, &pNext->Core);
             AssertRelease(fRc);
@@ -1252,11 +1261,11 @@ DECLINLINE(void) pgmHandlerVirtualClearPage(PVM pVM, PPGMVIRTHANDLER pCur, unsig
     {
         /* Locate the previous node in the alias chain. */
         PPGMPHYS2VIRTHANDLER pPrev = (PPGMPHYS2VIRTHANDLER)RTAvlroGCPhysGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysToVirtHandlers, pPhys2Virt->Core.Key);
-#ifdef VBOX_STRICT_PGM_HANDLER_VIRTUAL
+# ifdef VBOX_STRICT_PGM_HANDLER_VIRTUAL
         AssertReleaseMsg(pPrev != pPhys2Virt,
                          ("pPhys2Virt=%p:{.Core.Key=%RGp, .Core.KeyLast=%RGp, .offVirtHandler=%#RX32, .offNextAlias=%#RX32} pPrev=%p\n",
                           pPhys2Virt, pPhys2Virt->Core.Key, pPhys2Virt->Core.KeyLast, pPhys2Virt->offVirtHandler, pPhys2Virt->offNextAlias, pPrev));
-#endif
+# endif
         for (;;)
         {
             PPGMPHYS2VIRTHANDLER pNext = (PPGMPHYS2VIRTHANDLER)((intptr_t)pPrev + (pPrev->offNextAlias & PGMPHYS2VIRTHANDLER_OFF_MASK));
@@ -1279,11 +1288,11 @@ DECLINLINE(void) pgmHandlerVirtualClearPage(PVM pVM, PPGMVIRTHANDLER pCur, unsig
             /* next */
             if (pNext == pPrev)
             {
-#ifdef VBOX_STRICT_PGM_HANDLER_VIRTUAL
+# ifdef VBOX_STRICT_PGM_HANDLER_VIRTUAL
                 AssertReleaseMsg(pNext != pPrev,
                                  ("pPhys2Virt=%p:{.Core.Key=%RGp, .Core.KeyLast=%RGp, .offVirtHandler=%#RX32, .offNextAlias=%#RX32} pPrev=%p\n",
                                   pPhys2Virt, pPhys2Virt->Core.Key, pPhys2Virt->Core.KeyLast, pPhys2Virt->offVirtHandler, pPhys2Virt->offNextAlias, pPrev));
-#endif
+# endif
                 break;
             }
             pPrev = pNext;
@@ -1301,6 +1310,7 @@ DECLINLINE(void) pgmHandlerVirtualClearPage(PVM pVM, PPGMVIRTHANDLER pCur, unsig
     AssertReturnVoid(pPage);
     PGM_PAGE_SET_HNDL_VIRT_STATE(pPage, PGM_PAGE_HNDL_VIRT_STATE_NONE);
 }
+#endif /* VBOX_WITH_RAW_MODE */
 
 
 /**
diff --git a/src/VBox/VMM/include/PGMInternal.h b/src/VBox/VMM/include/PGMInternal.h
index d2276bc..57b5f7e 100644
--- a/src/VBox/VMM/include/PGMInternal.h
+++ b/src/VBox/VMM/include/PGMInternal.h
@@ -664,6 +664,8 @@ typedef PGMPHYSHANDLER *PPGMPHYSHANDLER;
 #define PGMPHYSHANDLER_GET_TYPE(a_pVM, a_pPhysHandler) PGMPHYSHANDLERTYPEINT_FROM_HANDLE(a_pVM, (a_pPhysHandler)->hType)
 
 
+#ifdef VBOX_WITH_RAW_MODE
+
 /**
  * Cache node for the physical addresses covered by a virtual handler.
  */
@@ -684,13 +686,13 @@ typedef PGMPHYS2VIRTHANDLER *PPGMPHYS2VIRTHANDLER;
 
 /** The bit in PGMPHYS2VIRTHANDLER::offNextAlias used to indicate that the
  * node is in the tree. */
-#define PGMPHYS2VIRTHANDLER_IN_TREE     RT_BIT(0)
+# define PGMPHYS2VIRTHANDLER_IN_TREE     RT_BIT(0)
 /** The bit in PGMPHYS2VIRTHANDLER::offNextAlias used to indicate that the
  * node is in the head of an alias chain.
  * The PGMPHYS2VIRTHANDLER_IN_TREE is always set if this bit is set. */
-#define PGMPHYS2VIRTHANDLER_IS_HEAD     RT_BIT(1)
+# define PGMPHYS2VIRTHANDLER_IS_HEAD     RT_BIT(1)
 /** The mask to apply to PGMPHYS2VIRTHANDLER::offNextAlias to get the offset. */
-#define PGMPHYS2VIRTHANDLER_OFF_MASK    (~(int32_t)3)
+# define PGMPHYS2VIRTHANDLER_OFF_MASK    (~(int32_t)3)
 
 
 /**
@@ -725,9 +727,9 @@ typedef struct PGMVIRTANDLERTYPEINT
 /** Pointer to a virtual access handler type registration. */
 typedef PGMVIRTHANDLERTYPEINT *PPGMVIRTHANDLERTYPEINT;
 /** Magic value for the virtual handler callbacks (Sir Arthur Charles Clarke). */
-#define PGMVIRTHANDLERTYPEINT_MAGIC        UINT32_C(0x19171216)
+# define PGMVIRTHANDLERTYPEINT_MAGIC       UINT32_C(0x19171216)
 /** Magic value for the virtual handler callbacks. */
-#define PGMVIRTHANDLERTYPEINT_MAGIC_DEAD   UINT32_C(0x20080319)
+# define PGMVIRTHANDLERTYPEINT_MAGIC_DEAD  UINT32_C(0x20080319)
 
 /**
  * Converts a handle to a pointer.
@@ -735,7 +737,7 @@ typedef PGMVIRTHANDLERTYPEINT *PPGMVIRTHANDLERTYPEINT;
  * @param   a_pVM           Pointer to the cross context VM structure.
  * @param   a_hType         Vitual access handler type handle.
  */
-#define PGMVIRTHANDLERTYPEINT_FROM_HANDLE(a_pVM, a_hType) ((PPGMVIRTHANDLERTYPEINT)MMHyperHeapOffsetToPtr(a_pVM, a_hType))
+# define PGMVIRTHANDLERTYPEINT_FROM_HANDLE(a_pVM, a_hType) ((PPGMVIRTHANDLERTYPEINT)MMHyperHeapOffsetToPtr(a_pVM, a_hType))
 
 
 /**
@@ -760,10 +762,10 @@ typedef struct PGMVIRTHANDLER
     R3PTRTYPE(void *)                   pvUserR3;
     /** Description / Name. For easing debugging. */
     R3PTRTYPE(const char *)             pszDesc;
-#ifdef VBOX_WITH_STATISTICS
+# ifdef VBOX_WITH_STATISTICS
     /** Profiling of this handler. */
     STAMPROFILE                         Stat;
-#endif
+# endif
     /** Array of cached physical addresses for the monitored ranged. */
     PGMPHYS2VIRTHANDLER                 aPhysToVirt[HC_ARCH_BITS == 32 ? 1 : 2];
 } PGMVIRTHANDLER;
@@ -777,7 +779,9 @@ typedef PGMVIRTHANDLER *PPGMVIRTHANDLER;
  * @param   a_pVirtHandler  Pointer to the virtual handler structure
  *                          (PGMVIRTHANDLER).
  */
-#define PGMVIRTANDLER_GET_TYPE(a_pVM, a_pVirtHandler) PGMVIRTHANDLERTYPEINT_FROM_HANDLE(a_pVM, (a_pVirtHandler)->hType)
+# define PGMVIRTANDLER_GET_TYPE(a_pVM, a_pVirtHandler) PGMVIRTHANDLERTYPEINT_FROM_HANDLE(a_pVM, (a_pVirtHandler)->hType)
+
+#endif /* VBOX_WITH_RAW_MODE */
 
 
 /** @name Page type predicates.
@@ -2709,8 +2713,12 @@ DECLINLINE(void *) pgmPoolMapPageStrict(PPGMPOOLPAGE a_pPage, const char *pszCal
  */
 typedef struct PGMTREES
 {
+    /** List of physical access handler types (offset pointers) of type
+     * PGMPHYSHANDLERTYPEINT.  This is needed for relocations. */
+    RTLISTOFF32ANCHOR               HeadPhysHandlerTypes;
     /** Physical access handlers (AVL range+offsetptr tree). */
     AVLROGCPHYSTREE                 PhysHandlers;
+#ifdef VBOX_WITH_RAW_MODE
     /** Virtual access handlers (AVL range + GC ptr tree). */
     AVLROGCPTRTREE                  VirtHandlers;
     /** Virtual access handlers (Phys range AVL range + offsetptr tree).
@@ -2718,12 +2726,10 @@ typedef struct PGMTREES
     AVLROGCPHYSTREE                 PhysToVirtHandlers;
     /** Virtual access handlers for the hypervisor (AVL range + GC ptr tree). */
     AVLROGCPTRTREE                  HyperVirtHandlers;
-    /** List of physical access handler types (offset pointers) of type
-     * PGMPHYSHANDLERTYPEINT.  This is needed for relocations. */
-    RTLISTOFF32ANCHOR               HeadPhysHandlerTypes;
     /** List of virtual access handler types (offset pointers) of type
      * PGMVIRTHANDLERTYPEINT.  This is needed for relocations. */
     RTLISTOFF32ANCHOR               HeadVirtHandlerTypes;
+#endif
 } PGMTREES;
 /** Pointer to PGM trees. */
 typedef PGMTREES *PPGMTREES;
@@ -3228,12 +3234,16 @@ typedef struct PGM
     /** We're not in a state which permits writes to guest memory.
      * (Only used in strict builds.) */
     bool                            fNoMorePhysWrites;
-    /** Set if PCI passthrough is enabled. */
+    /** @cfgm{/PageFusionAllowed, boolean, false}
+     * Whether page fusion is allowed. */
+    bool                            fPageFusionAllowed;
+    /** @cfgm{/PGM/PciPassThrough, boolean, false}
+     * Whether PCI passthrough is enabled. */
     bool                            fPciPassthrough;
     /** The number of MMIO2 regions (serves as the next MMIO2 ID). */
     uint8_t                         cMmio2Regions;
     /** Alignment padding that makes the next member start on a 8 byte boundary. */
-    bool                            afAlignment1[2];
+    bool                            afAlignment1[1];
 
     /** Indicates that PGMR3FinalizeMappings has been called and that further
      * PGMR3MapIntermediate calls will be rejected. */
@@ -4123,13 +4133,15 @@ DECLCALLBACK(void) pgmR3MapInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs
 void            pgmR3HandlerPhysicalUpdateAll(PVM pVM);
 bool            pgmHandlerPhysicalIsAll(PVM pVM, RTGCPHYS GCPhys);
 void            pgmHandlerPhysicalResetAliasedPage(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhysPage, bool fDoAccounting);
+#ifdef VBOX_WITH_RAW_MODE
 PPGMVIRTHANDLER pgmHandlerVirtualFindByPhysAddr(PVM pVM, RTGCPHYS GCPhys, unsigned *piPage);
 DECLCALLBACK(int) pgmHandlerVirtualResetOne(PAVLROGCPTRNODECORE pNode, void *pvUser);
-#if defined(VBOX_STRICT) || defined(LOG_ENABLED)
+# if defined(VBOX_STRICT) || defined(LOG_ENABLED)
 void            pgmHandlerVirtualDumpPhysPages(PVM pVM);
-#else
-# define pgmHandlerVirtualDumpPhysPages(a) do { } while (0)
-#endif
+# else
+#  define pgmHandlerVirtualDumpPhysPages(a) do { } while (0)
+# endif
+#endif /* VBOX_WITH_RAW_MODE */
 DECLCALLBACK(void) pgmR3InfoHandlers(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 int             pgmR3InitSavedState(PVM pVM, uint64_t cbRam);
 
diff --git a/src/VBox/VMM/include/REMInternal.h b/src/VBox/VMM/include/REMInternal.h
index 3007f59..c6bf28c 100644
--- a/src/VBox/VMM/include/REMInternal.h
+++ b/src/VBox/VMM/include/REMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/SELMInline.h b/src/VBox/VMM/include/SELMInline.h
index a122294..1dc97a9 100644
--- a/src/VBox/VMM/include/SELMInline.h
+++ b/src/VBox/VMM/include/SELMInline.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/SELMInternal.h b/src/VBox/VMM/include/SELMInternal.h
index 565db38..c9c9e3b 100644
--- a/src/VBox/VMM/include/SELMInternal.h
+++ b/src/VBox/VMM/include/SELMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/SSMInternal.h b/src/VBox/VMM/include/SSMInternal.h
index 23d2195..7f60011 100644
--- a/src/VBox/VMM/include/SSMInternal.h
+++ b/src/VBox/VMM/include/SSMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/STAMInternal.h b/src/VBox/VMM/include/STAMInternal.h
index 1bfc729..da16992 100644
--- a/src/VBox/VMM/include/STAMInternal.h
+++ b/src/VBox/VMM/include/STAMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/TMInline.h b/src/VBox/VMM/include/TMInline.h
index a73324b..6cbbe39 100644
--- a/src/VBox/VMM/include/TMInline.h
+++ b/src/VBox/VMM/include/TMInline.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/TRPMInternal.h b/src/VBox/VMM/include/TRPMInternal.h
index fa0c558..d095455 100644
--- a/src/VBox/VMM/include/TRPMInternal.h
+++ b/src/VBox/VMM/include/TRPMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/TRPMInternal.mac b/src/VBox/VMM/include/TRPMInternal.mac
index 2485c1e..eb7a0f7 100644
--- a/src/VBox/VMM/include/TRPMInternal.mac
+++ b/src/VBox/VMM/include/TRPMInternal.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/VMInternal.h b/src/VBox/VMM/include/VMInternal.h
index fa42fb1..10fae3c 100644
--- a/src/VBox/VMM/include/VMInternal.h
+++ b/src/VBox/VMM/include/VMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/VMMInternal.h b/src/VBox/VMM/include/VMMInternal.h
index 79cf915..1377757 100644
--- a/src/VBox/VMM/include/VMMInternal.h
+++ b/src/VBox/VMM/include/VMMInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -464,59 +464,59 @@ typedef VMMCPU *PVMMCPU;
 
 
 /**
- * The VMMGCEntry() codes.
+ * The VMMRCEntry() codes.
  */
-typedef enum VMMGCOPERATION
+typedef enum VMMRCOPERATION
 {
     /** Do GC module init. */
-    VMMGC_DO_VMMGC_INIT = 1,
+    VMMRC_DO_VMMRC_INIT = 1,
 
     /** The first Trap testcase. */
-    VMMGC_DO_TESTCASE_TRAP_FIRST = 0x0dead000,
+    VMMRC_DO_TESTCASE_TRAP_FIRST = 0x0dead000,
     /** Trap 0 testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_0 = VMMGC_DO_TESTCASE_TRAP_FIRST,
+    VMMRC_DO_TESTCASE_TRAP_0 = VMMRC_DO_TESTCASE_TRAP_FIRST,
     /** Trap 1 testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_1,
+    VMMRC_DO_TESTCASE_TRAP_1,
     /** Trap 2 testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_2,
+    VMMRC_DO_TESTCASE_TRAP_2,
     /** Trap 3 testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_3,
+    VMMRC_DO_TESTCASE_TRAP_3,
     /** Trap 4 testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_4,
+    VMMRC_DO_TESTCASE_TRAP_4,
     /** Trap 5 testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_5,
+    VMMRC_DO_TESTCASE_TRAP_5,
     /** Trap 6 testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_6,
+    VMMRC_DO_TESTCASE_TRAP_6,
     /** Trap 7 testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_7,
+    VMMRC_DO_TESTCASE_TRAP_7,
     /** Trap 8 testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_8,
+    VMMRC_DO_TESTCASE_TRAP_8,
     /** Trap 9 testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_9,
+    VMMRC_DO_TESTCASE_TRAP_9,
     /** Trap 0a testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_0A,
+    VMMRC_DO_TESTCASE_TRAP_0A,
     /** Trap 0b testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_0B,
+    VMMRC_DO_TESTCASE_TRAP_0B,
     /** Trap 0c testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_0C,
+    VMMRC_DO_TESTCASE_TRAP_0C,
     /** Trap 0d testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_0D,
+    VMMRC_DO_TESTCASE_TRAP_0D,
     /** Trap 0e testcases, uArg selects the variation. */
-    VMMGC_DO_TESTCASE_TRAP_0E,
+    VMMRC_DO_TESTCASE_TRAP_0E,
     /** The last trap testcase (exclusive). */
-    VMMGC_DO_TESTCASE_TRAP_LAST,
+    VMMRC_DO_TESTCASE_TRAP_LAST,
     /** Testcase for checking interrupt forwarding. */
-    VMMGC_DO_TESTCASE_HYPER_INTERRUPT,
+    VMMRC_DO_TESTCASE_HYPER_INTERRUPT,
     /** Switching testing and profiling stub. */
-    VMMGC_DO_TESTCASE_NOP,
+    VMMRC_DO_TESTCASE_NOP,
     /** Testcase for checking interrupt masking.. */
-    VMMGC_DO_TESTCASE_INTERRUPT_MASKING,
+    VMMRC_DO_TESTCASE_INTERRUPT_MASKING,
     /** Switching testing and profiling stub. */
-    VMMGC_DO_TESTCASE_HM_NOP,
+    VMMRC_DO_TESTCASE_HM_NOP,
 
     /** The usual 32-bit hack. */
-    VMMGC_DO_32_BIT_HACK = 0x7fffffff
-} VMMGCOPERATION;
+    VMMRC_DO_32_BIT_HACK = 0x7fffffff
+} VMMRCOPERATION;
 
 
 
@@ -550,11 +550,11 @@ void vmmR3SwitcherRelocate(PVM pVM, RTGCINTPTR offDelta);
 #ifdef IN_RING0
 /**
  * World switcher assembly routine.
- * It will call VMMGCEntry().
+ * It will call VMMRCEntry().
  *
- * @returns return code from VMMGCEntry().
+ * @returns return code from VMMRCEntry().
  * @param   pVM     Pointer to the VM.
- * @param   uArg    See VMMGCEntry().
+ * @param   uArg    See VMMRCEntry().
  * @internal
  */
 DECLASM(int)    vmmR0WorldSwitch(PVM pVM, unsigned uArg);
diff --git a/src/VBox/VMM/include/VMMInternal.mac b/src/VBox/VMM/include/VMMInternal.mac
index 0b2ae30..fb05188 100644
--- a/src/VBox/VMM/include/VMMInternal.mac
+++ b/src/VBox/VMM/include/VMMInternal.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/VMMTracing.h b/src/VBox/VMM/include/VMMTracing.h
index 7b500f6..260420c 100644
--- a/src/VBox/VMM/include/VMMTracing.h
+++ b/src/VBox/VMM/include/VMMTracing.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/include/internal/pgm.h b/src/VBox/VMM/include/internal/pgm.h
index 55cb494..b862941 100644
--- a/src/VBox/VMM/include/internal/pgm.h
+++ b/src/VBox/VMM/include/internal/pgm.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -20,57 +20,5 @@
 
 #include <VBox/vmm/pgm.h>
 
-/** @defgroup grp_pgm_int   Internals
- * @ingroup grp_pgm
- * @internal
- * @{
- */
-
-/**
- * Page type.
- *
- * @remarks This enum has to fit in a 3-bit field (see PGMPAGE::u3Type).
- * @remarks This is used in the saved state, so changes to it requires bumping
- *          the saved state version.
- * @todo    So, convert to \#defines!
- */
-typedef enum PGMPAGETYPE
-{
-    /** The usual invalid zero entry. */
-    PGMPAGETYPE_INVALID = 0,
-    /** RAM page. (RWX) */
-    PGMPAGETYPE_RAM,
-    /** MMIO2 page. (RWX) */
-    PGMPAGETYPE_MMIO2,
-    /** MMIO2 page aliased over an MMIO page. (RWX)
-     * See PGMHandlerPhysicalPageAlias(). */
-    PGMPAGETYPE_MMIO2_ALIAS_MMIO,
-    /** Special page aliased over an MMIO page. (RWX)
-     * See PGMHandlerPhysicalPageAliasHC(), but this is generally only used for
-     * VT-x's APIC access page at the moment.  Treated as MMIO by everyone except
-     * the shadow paging code. */
-    PGMPAGETYPE_SPECIAL_ALIAS_MMIO,
-    /** Shadowed ROM. (RWX) */
-    PGMPAGETYPE_ROM_SHADOW,
-    /** ROM page. (R-X) */
-    PGMPAGETYPE_ROM,
-    /** MMIO page. (---) */
-    PGMPAGETYPE_MMIO,
-    /** End of valid entries. */
-    PGMPAGETYPE_END
-} PGMPAGETYPE;
-AssertCompile(PGMPAGETYPE_END == 8);
-
-VMMDECL(PGMPAGETYPE) PGMPhysGetPageType(PVM pVM, RTGCPHYS GCPhys);
-
-VMMDECL(int)        PGMPhysGCPhys2HCPhys(PVM pVM, RTGCPHYS GCPhys, PRTHCPHYS pHCPhys);
-VMMDECL(int)        PGMPhysGCPtr2HCPhys(PVMCPU pVCpu, RTGCPTR GCPtr, PRTHCPHYS pHCPhys);
-VMMDECL(int)        PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock);
-VMMDECL(int)        PGMPhysGCPhys2CCPtrReadOnly(PVM pVM, RTGCPHYS GCPhys, void const **ppv, PPGMPAGEMAPLOCK pLock);
-VMMDECL(int)        PGMPhysGCPtr2CCPtr(PVMCPU pVCpu, RTGCPTR GCPtr, void **ppv, PPGMPAGEMAPLOCK pLock);
-VMMDECL(int)        PGMPhysGCPtr2CCPtrReadOnly(PVMCPU pVCpu, RTGCPTR GCPtr, void const **ppv, PPGMPAGEMAPLOCK pLock);
-VMMR3DECL(void)     PGMR3ResetNoMorePhysWritesFlag(PVM pVM);
-
-/** @} */
 #endif
 
diff --git a/src/VBox/VMM/pure_test.sh b/src/VBox/VMM/pure_test.sh
index 1d0a2a4..ca9513f 100755
--- a/src/VBox/VMM/pure_test.sh
+++ b/src/VBox/VMM/pure_test.sh
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright (C) 2010 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/InstructionTestGen.py b/src/VBox/VMM/testcase/Instructions/InstructionTestGen.py
index 23063cb..44a61d1 100755
--- a/src/VBox/VMM/testcase/Instructions/InstructionTestGen.py
+++ b/src/VBox/VMM/testcase/Instructions/InstructionTestGen.py
@@ -10,7 +10,7 @@ from __future__ import print_function;
 
 __copyright__ = \
 """
-Copyright (C) 2012-2013 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -20,7 +20,7 @@ Foundation, in version 2 as it comes in the "COPYING" file of the
 VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 """
-__version__ = "$Revision: 90927 $";
+__version__ = "$Revision: 100868 $";
 
 
 # pylint: disable=C0103,R0913
diff --git a/src/VBox/VMM/testcase/Instructions/Makefile.kmk b/src/VBox/VMM/testcase/Instructions/Makefile.kmk
index f529858..132075c 100644
--- a/src/VBox/VMM/testcase/Instructions/Makefile.kmk
+++ b/src/VBox/VMM/testcase/Instructions/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/env-bs2-r0-32-big.mac b/src/VBox/VMM/testcase/Instructions/env-bs2-r0-32-big.mac
index 812ad75..45013dd 100644
--- a/src/VBox/VMM/testcase/Instructions/env-bs2-r0-32-big.mac
+++ b/src/VBox/VMM/testcase/Instructions/env-bs2-r0-32-big.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/env-bs2-r0-64-big.mac b/src/VBox/VMM/testcase/Instructions/env-bs2-r0-64-big.mac
index 4c126d3..873b48f 100644
--- a/src/VBox/VMM/testcase/Instructions/env-bs2-r0-64-big.mac
+++ b/src/VBox/VMM/testcase/Instructions/env-bs2-r0-64-big.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/env-bs2-r0-64.mac b/src/VBox/VMM/testcase/Instructions/env-bs2-r0-64.mac
index da41ba8..c0f9e8f 100644
--- a/src/VBox/VMM/testcase/Instructions/env-bs2-r0-64.mac
+++ b/src/VBox/VMM/testcase/Instructions/env-bs2-r0-64.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/env-bs2-r0-big.mac b/src/VBox/VMM/testcase/Instructions/env-bs2-r0-big.mac
index 3c1d39d..b0d41b1 100644
--- a/src/VBox/VMM/testcase/Instructions/env-bs2-r0-big.mac
+++ b/src/VBox/VMM/testcase/Instructions/env-bs2-r0-big.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/env-bs2-r0-common.mac b/src/VBox/VMM/testcase/Instructions/env-bs2-r0-common.mac
index 1de2f1d..d1d49f2 100644
--- a/src/VBox/VMM/testcase/Instructions/env-bs2-r0-common.mac
+++ b/src/VBox/VMM/testcase/Instructions/env-bs2-r0-common.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/env-bs2-r0.mac b/src/VBox/VMM/testcase/Instructions/env-bs2-r0.mac
index 2e32a81..93e6aba 100644
--- a/src/VBox/VMM/testcase/Instructions/env-bs2-r0.mac
+++ b/src/VBox/VMM/testcase/Instructions/env-bs2-r0.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/env-common.mac b/src/VBox/VMM/testcase/Instructions/env-common.mac
index ff8aeb7..f94837c 100644
--- a/src/VBox/VMM/testcase/Instructions/env-common.mac
+++ b/src/VBox/VMM/testcase/Instructions/env-common.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/env-iprt-r3-32.mac b/src/VBox/VMM/testcase/Instructions/env-iprt-r3-32.mac
index b5225a4..856cfa2 100644
--- a/src/VBox/VMM/testcase/Instructions/env-iprt-r3-32.mac
+++ b/src/VBox/VMM/testcase/Instructions/env-iprt-r3-32.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/env-iprt-r3-64.mac b/src/VBox/VMM/testcase/Instructions/env-iprt-r3-64.mac
index b172ece..7b7e340 100644
--- a/src/VBox/VMM/testcase/Instructions/env-iprt-r3-64.mac
+++ b/src/VBox/VMM/testcase/Instructions/env-iprt-r3-64.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/env-iprt-r3.mac b/src/VBox/VMM/testcase/Instructions/env-iprt-r3.mac
index c64e45c..8a3759a 100644
--- a/src/VBox/VMM/testcase/Instructions/env-iprt-r3.mac
+++ b/src/VBox/VMM/testcase/Instructions/env-iprt-r3.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Instructions/itgTableDaa.py b/src/VBox/VMM/testcase/Instructions/itgTableDaa.py
index f0e0ee0..d4c3216 100644
--- a/src/VBox/VMM/testcase/Instructions/itgTableDaa.py
+++ b/src/VBox/VMM/testcase/Instructions/itgTableDaa.py
@@ -8,7 +8,7 @@ DAA (instruction) result table.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2013 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -18,7 +18,7 @@ Foundation, in version 2 as it comes in the "COPYING" file of the
 VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 """
-__version__ = "$Revision: 90927 $";
+__version__ = "$Revision: 100868 $";
 
 
 ## The 32-bit GCC (C99) program that produced the table below.
diff --git a/src/VBox/VMM/testcase/Instructions/itgTableDas.py b/src/VBox/VMM/testcase/Instructions/itgTableDas.py
index 0582fe0..e771354 100644
--- a/src/VBox/VMM/testcase/Instructions/itgTableDas.py
+++ b/src/VBox/VMM/testcase/Instructions/itgTableDas.py
@@ -8,7 +8,7 @@ DAS (instruction) result table.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2013 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -18,7 +18,7 @@ Foundation, in version 2 as it comes in the "COPYING" file of the
 VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 """
-__version__ = "$Revision: 90927 $";
+__version__ = "$Revision: 100868 $";
 
 
 ## The 32-bit GCC (C99) program that produced the table below.
diff --git a/src/VBox/VMM/testcase/Instructions/tstVBInsTstR3.cpp b/src/VBox/VMM/testcase/Instructions/tstVBInsTstR3.cpp
index 4e645a7..4573c63 100644
--- a/src/VBox/VMM/testcase/Instructions/tstVBInsTstR3.cpp
+++ b/src/VBox/VMM/testcase/Instructions/tstVBInsTstR3.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk
index 5ea5a6b..5f3d41d 100644
--- a/src/VBox/VMM/testcase/Makefile.kmk
+++ b/src/VBox/VMM/testcase/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -420,7 +420,7 @@ ifdef VBOX_WITH_RAW_MODE
  ifeq ($(filter-out pe lx,$(VBOX_LDR_FMT32)),)
   tstMicroRC_LIBS        += \
   	$(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
-  	$(LIB_VMMGC)
+  	$(LIB_VMMRC)
  endif
  tstMicroRC_SOURCES.win = tstMicroRC.def
 
diff --git a/src/VBox/VMM/testcase/mkdsk.sh b/src/VBox/VMM/testcase/mkdsk.sh
index bf28fc3..6fa5e95 100755
--- a/src/VBox/VMM/testcase/mkdsk.sh
+++ b/src/VBox/VMM/testcase/mkdsk.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstAnimate.cpp b/src/VBox/VMM/testcase/tstAnimate.cpp
index 745043b..f1519c2 100644
--- a/src/VBox/VMM/testcase/tstAnimate.cpp
+++ b/src/VBox/VMM/testcase/tstAnimate.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstAsmStructs.cpp b/src/VBox/VMM/testcase/tstAsmStructs.cpp
index c17c210..f5862b6 100644
--- a/src/VBox/VMM/testcase/tstAsmStructs.cpp
+++ b/src/VBox/VMM/testcase/tstAsmStructs.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstAsmStructsAsm.asm b/src/VBox/VMM/testcase/tstAsmStructsAsm.asm
index 2f2ad2b..df2ff08 100644
--- a/src/VBox/VMM/testcase/tstAsmStructsAsm.asm
+++ b/src/VBox/VMM/testcase/tstAsmStructsAsm.asm
@@ -7,7 +7,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstCFGM.cpp b/src/VBox/VMM/testcase/tstCFGM.cpp
index 98e6ce8..f0d3668 100644
--- a/src/VBox/VMM/testcase/tstCFGM.cpp
+++ b/src/VBox/VMM/testcase/tstCFGM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp b/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp
index ee8f379..d05de89 100644
--- a/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp
+++ b/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2011 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstGlobalConfig.cpp b/src/VBox/VMM/testcase/tstGlobalConfig.cpp
index 9605005..4b627ed 100644
--- a/src/VBox/VMM/testcase/tstGlobalConfig.cpp
+++ b/src/VBox/VMM/testcase/tstGlobalConfig.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2014 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstHelp.h b/src/VBox/VMM/testcase/tstHelp.h
index a9f58d4..9fc8c76 100644
--- a/src/VBox/VMM/testcase/tstHelp.h
+++ b/src/VBox/VMM/testcase/tstHelp.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstIEMCheckMc.cpp b/src/VBox/VMM/testcase/tstIEMCheckMc.cpp
index 760bf71..8e1a3a5 100644
--- a/src/VBox/VMM/testcase/tstIEMCheckMc.cpp
+++ b/src/VBox/VMM/testcase/tstIEMCheckMc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstInstrEmul.cpp b/src/VBox/VMM/testcase/tstInstrEmul.cpp
index 3173c48..27116a1 100644
--- a/src/VBox/VMM/testcase/tstInstrEmul.cpp
+++ b/src/VBox/VMM/testcase/tstInstrEmul.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstMMHyperHeap.cpp b/src/VBox/VMM/testcase/tstMMHyperHeap.cpp
index 5f39a7e..9568dc5 100644
--- a/src/VBox/VMM/testcase/tstMMHyperHeap.cpp
+++ b/src/VBox/VMM/testcase/tstMMHyperHeap.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstMicro.cpp b/src/VBox/VMM/testcase/tstMicro.cpp
index 56f6f1d..d6bf925 100644
--- a/src/VBox/VMM/testcase/tstMicro.cpp
+++ b/src/VBox/VMM/testcase/tstMicro.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstMicro.h b/src/VBox/VMM/testcase/tstMicro.h
index dcdcb7b..898518f 100644
--- a/src/VBox/VMM/testcase/tstMicro.h
+++ b/src/VBox/VMM/testcase/tstMicro.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstMicro.mac b/src/VBox/VMM/testcase/tstMicro.mac
index 6ff7519..6a5325d 100644
--- a/src/VBox/VMM/testcase/tstMicro.mac
+++ b/src/VBox/VMM/testcase/tstMicro.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstMicroRC.cpp b/src/VBox/VMM/testcase/tstMicroRC.cpp
index ce5936b..5c65d2a 100644
--- a/src/VBox/VMM/testcase/tstMicroRC.cpp
+++ b/src/VBox/VMM/testcase/tstMicroRC.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstMicroRC.def b/src/VBox/VMM/testcase/tstMicroRC.def
index 3ea7f01..18f9648 100644
--- a/src/VBox/VMM/testcase/tstMicroRC.def
+++ b/src/VBox/VMM/testcase/tstMicroRC.def
@@ -2,7 +2,7 @@
 ;
 ; VMM Guest Context Micro Benchmark - Definition file.
 
-; Copyright (C) 2006-2010 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstMicroRCA.asm b/src/VBox/VMM/testcase/tstMicroRCA.asm
index b560668..757c3fa 100644
--- a/src/VBox/VMM/testcase/tstMicroRCA.asm
+++ b/src/VBox/VMM/testcase/tstMicroRCA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2006-2012 Oracle Corporation
+; Copyright (C) 2006-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp b/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp
index 8cc5b64..9ace5a1 100644
--- a/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp
+++ b/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp
@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp b/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp
index 0dcc347..f2e23aa 100644
--- a/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp
+++ b/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2008-2013 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstSSM.cpp b/src/VBox/VMM/testcase/tstSSM.cpp
index e3d0335..8adc853 100644
--- a/src/VBox/VMM/testcase/tstSSM.cpp
+++ b/src/VBox/VMM/testcase/tstSSM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstVMM-HM.cpp b/src/VBox/VMM/testcase/tstVMM-HM.cpp
index 19d728b..8b1e391 100644
--- a/src/VBox/VMM/testcase/tstVMM-HM.cpp
+++ b/src/VBox/VMM/testcase/tstVMM-HM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstVMM.cpp b/src/VBox/VMM/testcase/tstVMM.cpp
index d35bbb8..f3ed507 100644
--- a/src/VBox/VMM/testcase/tstVMM.cpp
+++ b/src/VBox/VMM/testcase/tstVMM.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -253,7 +253,7 @@ extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
                 return 1;
 
             case 'V':
-                RTPrintf("$Revision: 94786 $\n");
+                RTPrintf("$Revision: 100868 $\n");
                 return 0;
 
             default:
diff --git a/src/VBox/VMM/testcase/tstVMMFork.cpp b/src/VBox/VMM/testcase/tstVMMFork.cpp
index b5e429e..071c28c 100644
--- a/src/VBox/VMM/testcase/tstVMMFork.cpp
+++ b/src/VBox/VMM/testcase/tstVMMFork.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp b/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp
index 1661647..1ee8453 100644
--- a/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp
+++ b/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstVMREQ.cpp b/src/VBox/VMM/testcase/tstVMREQ.cpp
index e312684..9ce53d6 100644
--- a/src/VBox/VMM/testcase/tstVMREQ.cpp
+++ b/src/VBox/VMM/testcase/tstVMREQ.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstVMStruct.h b/src/VBox/VMM/testcase/tstVMStruct.h
index 06553ad..27c38a3 100644
--- a/src/VBox/VMM/testcase/tstVMStruct.h
+++ b/src/VBox/VMM/testcase/tstVMStruct.h
@@ -859,9 +859,13 @@
     GEN_CHECK_OFF(PGMMMIO2RANGE, RamRange);
     GEN_CHECK_SIZE(PGMTREES);
     GEN_CHECK_OFF(PGMTREES, PhysHandlers);
+    GEN_CHECK_OFF(PGMTREES, HeadPhysHandlerTypes);
+#ifdef VBOX_WITH_RAW_MODE
     GEN_CHECK_OFF(PGMTREES, VirtHandlers);
     GEN_CHECK_OFF(PGMTREES, PhysToVirtHandlers);
     GEN_CHECK_OFF(PGMTREES, HyperVirtHandlers);
+    GEN_CHECK_OFF(PGMTREES, HeadVirtHandlerTypes);
+#endif
     GEN_CHECK_SIZE(PGMPOOLPAGE);
     GEN_CHECK_OFF(PGMPOOLPAGE, Core);
     GEN_CHECK_OFF(PGMPOOLPAGE, GCPhys);
diff --git a/src/VBox/VMM/testcase/tstVMStructDTrace.cpp b/src/VBox/VMM/testcase/tstVMStructDTrace.cpp
index 584b6da..880abd8 100644
--- a/src/VBox/VMM/testcase/tstVMStructDTrace.cpp
+++ b/src/VBox/VMM/testcase/tstVMStructDTrace.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstVMStructRC.cpp b/src/VBox/VMM/testcase/tstVMStructRC.cpp
index 49a0efe..8bbf983 100644
--- a/src/VBox/VMM/testcase/tstVMStructRC.cpp
+++ b/src/VBox/VMM/testcase/tstVMStructRC.cpp
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstVMStructSize.cpp b/src/VBox/VMM/testcase/tstVMStructSize.cpp
index 83449f8..9d34af1 100644
--- a/src/VBox/VMM/testcase/tstVMStructSize.cpp
+++ b/src/VBox/VMM/testcase/tstVMStructSize.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstX86-1.cpp b/src/VBox/VMM/testcase/tstX86-1.cpp
index 586104d..6bde70f 100644
--- a/src/VBox/VMM/testcase/tstX86-1.cpp
+++ b/src/VBox/VMM/testcase/tstX86-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstX86-1A.asm b/src/VBox/VMM/testcase/tstX86-1A.asm
index 176d364..871f24c 100644
--- a/src/VBox/VMM/testcase/tstX86-1A.asm
+++ b/src/VBox/VMM/testcase/tstX86-1A.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2011-2012 Oracle Corporation
+; Copyright (C) 2011-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstX86-FpuSaveRestore.cpp b/src/VBox/VMM/testcase/tstX86-FpuSaveRestore.cpp
index b21754a..9d0d215 100644
--- a/src/VBox/VMM/testcase/tstX86-FpuSaveRestore.cpp
+++ b/src/VBox/VMM/testcase/tstX86-FpuSaveRestore.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/testcase/tstX86-FpuSaveRestoreA.asm b/src/VBox/VMM/testcase/tstX86-FpuSaveRestoreA.asm
index 3680553..2f50b09 100644
--- a/src/VBox/VMM/testcase/tstX86-FpuSaveRestoreA.asm
+++ b/src/VBox/VMM/testcase/tstX86-FpuSaveRestoreA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2013 Oracle Corporation
+; Copyright (C) 2013-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/tools/Makefile.kmk b/src/VBox/VMM/tools/Makefile.kmk
index ec5b995..5fb9f82 100644
--- a/src/VBox/VMM/tools/Makefile.kmk
+++ b/src/VBox/VMM/tools/Makefile.kmk
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/tools/VBoxVMMPreload.cpp b/src/VBox/VMM/tools/VBoxVMMPreload.cpp
index e204e03..57942f1 100644
--- a/src/VBox/VMM/tools/VBoxVMMPreload.cpp
+++ b/src/VBox/VMM/tools/VBoxVMMPreload.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/VMM/tools/VBoxVMMPreloadHardened.cpp b/src/VBox/VMM/tools/VBoxVMMPreloadHardened.cpp
index aff9e71..635692e 100644
--- a/src/VBox/VMM/tools/VBoxVMMPreloadHardened.cpp
+++ b/src/VBox/VMM/tools/VBoxVMMPreloadHardened.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/Config.kmk b/src/VBox/ValidationKit/Config.kmk
index c9ff640..003ab0a 100644
--- a/src/VBox/ValidationKit/Config.kmk
+++ b/src/VBox/ValidationKit/Config.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2014 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/Makefile.kmk b/src/VBox/ValidationKit/Makefile.kmk
index 991ff18..83ae57d 100644
--- a/src/VBox/ValidationKit/Makefile.kmk
+++ b/src/VBox/ValidationKit/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/ValidationKitCodingGuidelines.cpp b/src/VBox/ValidationKit/ValidationKitCodingGuidelines.cpp
index cdd069a..17164e5 100644
--- a/src/VBox/ValidationKit/ValidationKitCodingGuidelines.cpp
+++ b/src/VBox/ValidationKit/ValidationKitCodingGuidelines.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/Makefile.kmk b/src/VBox/ValidationKit/bootsectors/Makefile.kmk
index 736455d..f156366 100644
--- a/src/VBox/ValidationKit/bootsectors/Makefile.kmk
+++ b/src/VBox/ValidationKit/bootsectors/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/VBoxBs2Linker.cpp b/src/VBox/ValidationKit/bootsectors/VBoxBs2Linker.cpp
index b9fd8e5..efe192b 100644
--- a/src/VBox/ValidationKit/bootsectors/VBoxBs2Linker.cpp
+++ b/src/VBox/ValidationKit/bootsectors/VBoxBs2Linker.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
                     }
 
                     case 'V':
-                        printf("%s\n", "$Revision: 96152 $");
+                        printf("%s\n", "$Revision: 100880 $");
                         return 0;
 
                     case '?':
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector-empty.asm b/src/VBox/ValidationKit/bootsectors/bootsector-empty.asm
index d24fd92..1bef0a0 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector-empty.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector-empty.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2012-2014 Oracle Corporation
+; Copyright (C) 2012-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector-pae.asm b/src/VBox/ValidationKit/bootsectors/bootsector-pae.asm
index 2103eb4..29d94b4 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector-pae.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector-pae.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector-shutdown.asm b/src/VBox/ValidationKit/bootsectors/bootsector-shutdown.asm
index 717d12f..ea9810b 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector-shutdown.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector-shutdown.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-api.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-api.mac
index 409669f..7d3ee1a 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-api.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-api.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-boot-registers-1.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-boot-registers-1.asm
index 568e30f..b315951 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-boot-registers-1.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-boot-registers-1.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-common-end.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-common-end.mac
index 208e47a..a22ef78 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-common-end.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-common-end.mac
@@ -6,7 +6,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac
index 07c5178..9c3cc49 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac
@@ -40,7 +40,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-traps.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-traps.mac
index beef716..b4412ae 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-traps.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-traps.mac
@@ -7,7 +7,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-common-macros-1.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-common-macros-1.mac
index 40a578a..2d91db0 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-common-macros-1.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-common-macros-1.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines-template-1.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines-template-1.mac
index 2aa776b..0551d86 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines-template-1.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines-template-1.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines-template-2.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines-template-2.mac
index c45e6fe..32900d0 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines-template-2.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines-template-2.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines.mac
index 195b041..2471822 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-common-routines.mac
@@ -45,7 +45,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-common-traprec-template.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-common-traprec-template.mac
index 39c7bbb..d561687 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-common-traprec-template.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-common-traprec-template.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-common-traprec.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-common-traprec.mac
index e613e41..dcaf144 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-common-traprec.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-common-traprec.mac
@@ -6,7 +6,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-a20-1-template.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-a20-1-template.mac
index a05c7f6..7c03d6e 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-a20-1-template.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-a20-1-template.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-a20-1.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-a20-1.asm
index e35aa89..eddafb6 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-a20-1.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-a20-1.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-basic-1-template.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-basic-1-template.mac
index 5c07907..deeee30 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-basic-1-template.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-basic-1-template.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-basic-1.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-basic-1.asm
index d73c2da..1ffc872 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-basic-1.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-basic-1.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-hidden-regs-1-template.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-hidden-regs-1-template.mac
index f3f4799..7b57ef6 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-hidden-regs-1-template.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-hidden-regs-1-template.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-hidden-regs-1.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-hidden-regs-1.asm
index 9f06720..b3045e3 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-hidden-regs-1.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-hidden-regs-1.asm
@@ -6,7 +6,7 @@
 ;   VBoxManage setextradata bs-cpu-hidden-regs-1 VBoxInternal/Devices/VMMDev/0/Config/TestingEnabled  1
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-instr-1-template.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-instr-1-template.mac
index b7cb62f..49d20e2 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-instr-1-template.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-instr-1-template.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-instr-1.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-instr-1.asm
index c19f17d..d2fc64a 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-instr-1.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-instr-1.asm
@@ -7,7 +7,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-pf-1-template.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-pf-1-template.mac
index 5084bd4..94d7026 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-pf-1-template.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-pf-1-template.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-pf-1.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-pf-1.asm
index 23f77bb..5569faf 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-pf-1.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-pf-1.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-1-template.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-1-template.mac
index 081bac0..e11ab73 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-1-template.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-1-template.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-1.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-1.asm
index 13b1af8..95ffbef 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-1.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-1.asm
@@ -7,7 +7,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-2-template.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-2-template.mac
index fb95a94..a9d12f9 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-2-template.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-2-template.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-2.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-2.asm
index c545b46..1f15592 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-2.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-cpu-xcpt-2.asm
@@ -7,7 +7,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-first.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-first.mac
index 2b1d7da..b850851 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-first.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-first.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-structures.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-structures.mac
index 71d93b1..29c6288 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-structures.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-structures.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-template-footer.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-template-footer.mac
index 197af09..54da9a0 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-template-footer.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-template-footer.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-template-header.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-template-header.mac
index 99533da..7dcafd1 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-template-header.mac
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-template-header.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-test1.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-test1.asm
index e085511..a841540 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-test1.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-test1.asm
@@ -6,7 +6,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-triple-fault-1.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-triple-fault-1.asm
index 56a1d24..31a7171 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-triple-fault-1.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-triple-fault-1.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-64-1.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-64-1.asm
index c07a55d..62100ab 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-64-1.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-64-1.asm
@@ -5,7 +5,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-big-template.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-big-template.asm
index 63a964b..3e74fac 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-big-template.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-big-template.asm
@@ -6,7 +6,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-kernel.asm b/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-kernel.asm
index 8855d48..4cb81da 100644
--- a/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-kernel.asm
+++ b/src/VBox/ValidationKit/bootsectors/bootsector2-vbinstst-kernel.asm
@@ -5,7 +5,7 @@
 ;
 
 ;
-; Copyright (C) 2007-2014 Oracle Corporation
+; Copyright (C) 2007-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/common/Makefile.kmk b/src/VBox/ValidationKit/common/Makefile.kmk
index 623860b..e2fb60a 100644
--- a/src/VBox/ValidationKit/common/Makefile.kmk
+++ b/src/VBox/ValidationKit/common/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/common/__init__.py b/src/VBox/ValidationKit/common/__init__.py
index bb84ee6..c45d225 100644
--- a/src/VBox/ValidationKit/common/__init__.py
+++ b/src/VBox/ValidationKit/common/__init__.py
@@ -7,7 +7,7 @@ Common code between testmanager, testbox and testdriver.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 from common import constants;
diff --git a/src/VBox/ValidationKit/common/constants/__init__.py b/src/VBox/ValidationKit/common/constants/__init__.py
index d67c662..6f58763 100644
--- a/src/VBox/ValidationKit/common/constants/__init__.py
+++ b/src/VBox/ValidationKit/common/constants/__init__.py
@@ -7,7 +7,7 @@ Constants.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 from common.constants import tbreq;
diff --git a/src/VBox/ValidationKit/common/constants/result.py b/src/VBox/ValidationKit/common/constants/result.py
index bfea06b..4bbf6f8 100644
--- a/src/VBox/ValidationKit/common/constants/result.py
+++ b/src/VBox/ValidationKit/common/constants/result.py
@@ -7,7 +7,7 @@ Test statuses.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 PASSED      = 'PASSED';
diff --git a/src/VBox/ValidationKit/common/constants/rtexitcode.py b/src/VBox/ValidationKit/common/constants/rtexitcode.py
index cef21a4..9a13f5b 100644
--- a/src/VBox/ValidationKit/common/constants/rtexitcode.py
+++ b/src/VBox/ValidationKit/common/constants/rtexitcode.py
@@ -7,7 +7,7 @@ RTEXITCODE from iprt/types.h.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 ## Success.
diff --git a/src/VBox/ValidationKit/common/constants/tbreq.py b/src/VBox/ValidationKit/common/constants/tbreq.py
index 8754bc3..4f9de43 100644
--- a/src/VBox/ValidationKit/common/constants/tbreq.py
+++ b/src/VBox/ValidationKit/common/constants/tbreq.py
@@ -7,7 +7,7 @@ Test Manager Requests from the TestBox Script.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100967 $"
 
 
 ## @name Test Manager actions
@@ -74,6 +74,7 @@ SIGNON_PARAM_HAS_HW_VIRT        = 'HAS_HW_VIRT';
 SIGNON_PARAM_HAS_NESTED_PAGING  = 'HAS_NESTED_PAGING';
 SIGNON_PARAM_HAS_64_BIT_GUEST   = 'HAS_64_BIT_GUST';
 SIGNON_PARAM_HAS_IOMMU          = 'HAS_IOMMU';
+## TODO: SIGNON_PARAM_WITH_RAW_MODE
 SIGNON_PARAM_MEM_SIZE           = 'MEM_SIZE';
 SIGNON_PARAM_SCRATCH_SIZE       = 'SCRATCH_SIZE';
 SIGNON_PARAM_REPORT             = 'REPORT';
diff --git a/src/VBox/ValidationKit/common/constants/tbresp.py b/src/VBox/ValidationKit/common/constants/tbresp.py
index c4ec18a..d9e24fc 100644
--- a/src/VBox/ValidationKit/common/constants/tbresp.py
+++ b/src/VBox/ValidationKit/common/constants/tbresp.py
@@ -7,7 +7,7 @@ Test Manager Responses to the TestBox Script.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 ## All test manager actions responses to the testbox include a RESULT field.
diff --git a/src/VBox/ValidationKit/common/constants/valueunit.py b/src/VBox/ValidationKit/common/constants/valueunit.py
index c5f1efc..c7e85c0 100644
--- a/src/VBox/ValidationKit/common/constants/valueunit.py
+++ b/src/VBox/ValidationKit/common/constants/valueunit.py
@@ -10,7 +10,7 @@ include/VBox/VMMDevTesting.h.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -29,7 +29,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 
diff --git a/src/VBox/ValidationKit/common/utils.py b/src/VBox/ValidationKit/common/utils.py
index 396bd7a..e42502f 100644
--- a/src/VBox/ValidationKit/common/utils.py
+++ b/src/VBox/ValidationKit/common/utils.py
@@ -8,7 +8,7 @@ Common Utility Functions.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96862 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/common/webutils.py b/src/VBox/ValidationKit/common/webutils.py
index bfd39ec..d41097d 100644
--- a/src/VBox/ValidationKit/common/webutils.py
+++ b/src/VBox/ValidationKit/common/webutils.py
@@ -7,7 +7,7 @@ Common Web Utility Functions.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard Python imports.
 import os;
diff --git a/src/VBox/ValidationKit/docs/AutomaticTestingRevamp.html b/src/VBox/ValidationKit/docs/AutomaticTestingRevamp.html
index 63caa83..c38cfd6 100644
--- a/src/VBox/ValidationKit/docs/AutomaticTestingRevamp.html
+++ b/src/VBox/ValidationKit/docs/AutomaticTestingRevamp.html
@@ -1346,7 +1346,7 @@ smoother.</li>
 <tbody valign="top">
 <tr class="field"><th class="field-name">Status:</th><td class="field-body">$Id: AutomaticTestingRevamp.html $</td>
 </tr>
-<tr class="field"><th class="field-name">Copyright:</th><td class="field-body">Copyright (C) 2010-2014 Oracle Corporation.</td>
+<tr class="field"><th class="field-name">Copyright:</th><td class="field-body">Copyright (C) 2010-2015 Oracle Corporation.</td>
 </tr>
 </tbody>
 </table>
diff --git a/src/VBox/ValidationKit/docs/AutomaticTestingRevamp.txt b/src/VBox/ValidationKit/docs/AutomaticTestingRevamp.txt
index 3e6e824..ae10727 100644
--- a/src/VBox/ValidationKit/docs/AutomaticTestingRevamp.txt
+++ b/src/VBox/ValidationKit/docs/AutomaticTestingRevamp.txt
@@ -1058,5 +1058,5 @@ Discussion Logs
 -----
 
 :Status: $Id: AutomaticTestingRevamp.txt $
-:Copyright: Copyright (C) 2010-2014 Oracle Corporation.
+:Copyright: Copyright (C) 2010-2015 Oracle Corporation.
 
diff --git a/src/VBox/ValidationKit/docs/Makefile.kmk b/src/VBox/ValidationKit/docs/Makefile.kmk
index 83cce6b..fb26469 100644
--- a/src/VBox/ValidationKit/docs/Makefile.kmk
+++ b/src/VBox/ValidationKit/docs/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/docs/VBoxValidationKitReadMe.html b/src/VBox/ValidationKit/docs/VBoxValidationKitReadMe.html
index 5ae3578..5ab362a 100644
--- a/src/VBox/ValidationKit/docs/VBoxValidationKitReadMe.html
+++ b/src/VBox/ValidationKit/docs/VBoxValidationKitReadMe.html
@@ -435,7 +435,7 @@ probably be picking this up again later.</dd>
 <tbody valign="top">
 <tr class="field"><th class="field-name">Status:</th><td class="field-body">$Id: VBoxValidationKitReadMe.html $</td>
 </tr>
-<tr class="field"><th class="field-name">Copyright:</th><td class="field-body">Copyright (C) 2010-2014 Oracle Corporation.</td>
+<tr class="field"><th class="field-name">Copyright:</th><td class="field-body">Copyright (C) 2010-2015 Oracle Corporation.</td>
 </tr>
 </tbody>
 </table>
diff --git a/src/VBox/ValidationKit/docs/VBoxValidationKitReadMe.txt b/src/VBox/ValidationKit/docs/VBoxValidationKitReadMe.txt
index 0a4a177..2f66a9a 100644
--- a/src/VBox/ValidationKit/docs/VBoxValidationKitReadMe.txt
+++ b/src/VBox/ValidationKit/docs/VBoxValidationKitReadMe.txt
@@ -110,5 +110,5 @@ Directory Layout
 
 
 :Status: $Id: VBoxValidationKitReadMe.txt $
-:Copyright: Copyright (C) 2010-2014 Oracle Corporation.
+:Copyright: Copyright (C) 2010-2015 Oracle Corporation.
 
diff --git a/src/VBox/ValidationKit/snippets/alloc-1.c b/src/VBox/ValidationKit/snippets/alloc-1.c
index f799bd0..e1a0f5f 100644
--- a/src/VBox/ValidationKit/snippets/alloc-1.c
+++ b/src/VBox/ValidationKit/snippets/alloc-1.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2014 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/snippets/time-1.c b/src/VBox/ValidationKit/snippets/time-1.c
index 7f5e655..309f9d6 100644
--- a/src/VBox/ValidationKit/snippets/time-1.c
+++ b/src/VBox/ValidationKit/snippets/time-1.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/td-dummy.py b/src/VBox/ValidationKit/td-dummy.py
index d44766d..907fa0b 100755
--- a/src/VBox/ValidationKit/td-dummy.py
+++ b/src/VBox/ValidationKit/td-dummy.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testanalysis/Makefile.kmk b/src/VBox/ValidationKit/testanalysis/Makefile.kmk
index 2a4aac1..9de056e 100644
--- a/src/VBox/ValidationKit/testanalysis/Makefile.kmk
+++ b/src/VBox/ValidationKit/testanalysis/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2014 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testanalysis/__init__.py b/src/VBox/ValidationKit/testanalysis/__init__.py
index 2c3f96c..9fa2e1e 100644
--- a/src/VBox/ValidationKit/testanalysis/__init__.py
+++ b/src/VBox/ValidationKit/testanalysis/__init__.py
@@ -7,7 +7,7 @@ Test analysis package
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,6 +26,6 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 __all__     = ["reader", "diff", "reporting"]
 
diff --git a/src/VBox/ValidationKit/testanalysis/diff.py b/src/VBox/ValidationKit/testanalysis/diff.py
index 1822bf3..fc92739 100644
--- a/src/VBox/ValidationKit/testanalysis/diff.py
+++ b/src/VBox/ValidationKit/testanalysis/diff.py
@@ -7,7 +7,7 @@ Diff two test sets.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 __all__     = ['BaselineDiff', ];
 
 
diff --git a/src/VBox/ValidationKit/testanalysis/reader.py b/src/VBox/ValidationKit/testanalysis/reader.py
index 38f3f7a..93f2028 100644
--- a/src/VBox/ValidationKit/testanalysis/reader.py
+++ b/src/VBox/ValidationKit/testanalysis/reader.py
@@ -10,7 +10,7 @@ reporting.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -29,7 +29,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 __all__     = ['ParseTestResult', ]
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testanalysis/reporting.py b/src/VBox/ValidationKit/testanalysis/reporting.py
index aef5505..1ba8c2a 100644
--- a/src/VBox/ValidationKit/testanalysis/reporting.py
+++ b/src/VBox/ValidationKit/testanalysis/reporting.py
@@ -10,7 +10,7 @@ or normal text report from it.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -29,7 +29,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 __all__     = ['HtmlReport', 'RstReport', 'TextReport'];
 
 
diff --git a/src/VBox/ValidationKit/testanalysis/tst-a1.py b/src/VBox/ValidationKit/testanalysis/tst-a1.py
index be85ac2..6ac67d0 100755
--- a/src/VBox/ValidationKit/testanalysis/tst-a1.py
+++ b/src/VBox/ValidationKit/testanalysis/tst-a1.py
@@ -8,7 +8,7 @@ Analyzer Experiment  1.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 import os.path
diff --git a/src/VBox/ValidationKit/testboxscript/Makefile.kmk b/src/VBox/ValidationKit/testboxscript/Makefile.kmk
index 19add1b..1f908af 100644
--- a/src/VBox/ValidationKit/testboxscript/Makefile.kmk
+++ b/src/VBox/ValidationKit/testboxscript/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012-2014 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testboxscript/TestBoxHelper.cpp b/src/VBox/ValidationKit/testboxscript/TestBoxHelper.cpp
index 80a33e2..a39814b 100644
--- a/src/VBox/ValidationKit/testboxscript/TestBoxHelper.cpp
+++ b/src/VBox/ValidationKit/testboxscript/TestBoxHelper.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testboxscript/darwin/setup-routines.sh b/src/VBox/ValidationKit/testboxscript/darwin/setup-routines.sh
index c7571af..e0457dc 100644
--- a/src/VBox/ValidationKit/testboxscript/darwin/setup-routines.sh
+++ b/src/VBox/ValidationKit/testboxscript/darwin/setup-routines.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testboxscript/linux/setup-routines.sh b/src/VBox/ValidationKit/testboxscript/linux/setup-routines.sh
index ce65f7a..01618ef 100755
--- a/src/VBox/ValidationKit/testboxscript/linux/setup-routines.sh
+++ b/src/VBox/ValidationKit/testboxscript/linux/setup-routines.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh b/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
index a23567b..6c3823e 100755
--- a/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+++ b/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testboxscript/setup.sh b/src/VBox/ValidationKit/testboxscript/setup.sh
index 930c1db..45da909 100755
--- a/src/VBox/ValidationKit/testboxscript/setup.sh
+++ b/src/VBox/ValidationKit/testboxscript/setup.sh
@@ -5,7 +5,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -303,6 +303,23 @@ test_user() {
     fi
 }
 
+##
+# Test if core dumps are enabled. See https://wiki.ubuntu.com/Apport!
+#
+test_coredumps() {
+    if test "`lsb_release -is`" = "Ubuntu"; then
+        if grep -q "apport" /proc/sys/kernel/core_pattern; then
+            if grep -q "#.*problem_types" /etc/apport/crashdb.conf; then
+                echo "It looks like core dumps are properly configured, good!"
+            else
+                echo "Warning: Core dumps will be not always generated!"
+            fi
+        else
+            echo "Warning: Apport not installed! This package is required for core dump handling!"
+        fi
+    fi
+}
+
 
 ##
 # Grants the user write access to the testboxscript files so it can perform
@@ -400,7 +417,7 @@ do
             exit 0;
             ;;
         -V|--version)
-            echo '$Revision: 96152 $'
+            echo '$Revision: 101095 $'
             exit 0;
             ;;
 
@@ -471,6 +488,7 @@ check_proxy_config;
 
 maybe_add_testboxscript_user;
 test_user;
+test_coredumps;
 
 grant_user_testboxscript_write_access;
 
diff --git a/src/VBox/ValidationKit/testboxscript/solaris/setup-routines.sh b/src/VBox/ValidationKit/testboxscript/solaris/setup-routines.sh
index 11947dd..f59c10a 100644
--- a/src/VBox/ValidationKit/testboxscript/solaris/setup-routines.sh
+++ b/src/VBox/ValidationKit/testboxscript/solaris/setup-routines.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testboxscript/testboxcommand.py b/src/VBox/ValidationKit/testboxscript/testboxcommand.py
index a9eb6e4..f7f5c95 100644
--- a/src/VBox/ValidationKit/testboxscript/testboxcommand.py
+++ b/src/VBox/ValidationKit/testboxscript/testboxcommand.py
@@ -7,7 +7,7 @@ TestBox Script - Command Processor.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard python imports.
 import os;
diff --git a/src/VBox/ValidationKit/testboxscript/testboxcommons.py b/src/VBox/ValidationKit/testboxscript/testboxcommons.py
index 623af17..c229edb 100644
--- a/src/VBox/ValidationKit/testboxscript/testboxcommons.py
+++ b/src/VBox/ValidationKit/testboxscript/testboxcommons.py
@@ -10,7 +10,7 @@ the files in this (testbox) directory.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -29,7 +29,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testboxscript/testboxconnection.py b/src/VBox/ValidationKit/testboxscript/testboxconnection.py
index 0683d01..2302d90 100644
--- a/src/VBox/ValidationKit/testboxscript/testboxconnection.py
+++ b/src/VBox/ValidationKit/testboxscript/testboxconnection.py
@@ -7,7 +7,7 @@ TestBox Script - HTTP Connection Handling.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testboxscript/testboxscript.py b/src/VBox/ValidationKit/testboxscript/testboxscript.py
index 13564c7..735ef50 100755
--- a/src/VBox/ValidationKit/testboxscript/testboxscript.py
+++ b/src/VBox/ValidationKit/testboxscript/testboxscript.py
@@ -11,7 +11,7 @@ abnormally or due to an UPGRADE request.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -30,7 +30,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 import subprocess
 import sys
diff --git a/src/VBox/ValidationKit/testboxscript/testboxscript_real.py b/src/VBox/ValidationKit/testboxscript/testboxscript_real.py
index ecab1e4..9eec3d4 100755
--- a/src/VBox/ValidationKit/testboxscript/testboxscript_real.py
+++ b/src/VBox/ValidationKit/testboxscript/testboxscript_real.py
@@ -8,7 +8,7 @@ TestBox Script - main().
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100967 $"
 
 
 # Standard python imports.
@@ -170,6 +170,7 @@ class TestBoxScript(object):
             constants.tbreq.SIGNON_PARAM_HAS_NESTED_PAGING:{ self.VALUE: self._hasHostNestedPaging(),  self.FN: None },
             constants.tbreq.SIGNON_PARAM_HAS_64_BIT_GUEST: { self.VALUE: self._can64BitGuest(),        self.FN: None },
             constants.tbreq.SIGNON_PARAM_HAS_IOMMU:        { self.VALUE: self._hasHostIoMmu(),         self.FN: None },
+            #constants.tbreq.SIGNON_PARAM_WITH_RAW_MODE:    { self.VALUE: self._withRawModeSupport(),   self.FN: None },
             constants.tbreq.SIGNON_PARAM_SCRIPT_REV:       { self.VALUE: self._getScriptRev(),         self.FN: None },
             constants.tbreq.SIGNON_PARAM_REPORT:           { self.VALUE: self._getHostReport(),        self.FN: None },
             constants.tbreq.SIGNON_PARAM_PYTHON_VERSION:   { self.VALUE: self._getPythonHexVersion(),  self.FN: None },
@@ -220,6 +221,8 @@ class TestBoxScript(object):
         os.environ['TESTBOX_CPU_COUNT']         = self.getSignOnParam(constants.tbreq.SIGNON_PARAM_CPU_COUNT);
         os.environ['TESTBOX_MEM_SIZE']          = self.getSignOnParam(constants.tbreq.SIGNON_PARAM_MEM_SIZE);
         os.environ['TESTBOX_SCRATCH_SIZE']      = self.getSignOnParam(constants.tbreq.SIGNON_PARAM_SCRATCH_SIZE);
+        #TODO: os.environ['TESTBOX_WITH_RAW_MODE']     = self.getSignOnParam(constants.tbreq.SIGNON_PARAM_WITH_RAW_MODE);
+        os.environ['TESTBOX_WITH_RAW_MODE']     = self._withRawModeSupport();
         os.environ['TESTBOX_MANAGER_URL']       = self._oOptions.sTestManagerUrl;
         os.environ['TESTBOX_UUID']              = self._sTestBoxUuid;
         os.environ['TESTBOX_REPORTER']          = 'remote';
@@ -531,6 +534,14 @@ class TestBoxScript(object):
             self._oOptions.fHasIoMmu = False;
         return self._oOptions.fHasIoMmu;
 
+    def _withRawModeSupport(self):
+        """
+        Check if the testbox is configured with raw-mode support or not.
+        """
+        if self._oOptions.fWithRawMode is None:
+            self._oOptions.fWithRawMode = True;
+        return self._oOptions.fWithRawMode;
+
     def _getHostReport(self):
         """
         Generate a report about the host hardware and software.
@@ -933,6 +944,12 @@ class TestBoxScript(object):
         parser.add_option("--no-io-mmu",
                           dest="fHasIoMmu", action="store_false", default=None,
                           help="No I/O MMU available");
+        parser.add_option("--raw-mode",
+                          dest="fWithRawMode", action="store_true", default=None,
+                          help="Use raw-mode on this host.");
+        parser.add_option("--no-raw-mode",
+                          dest="fWithRawMode", action="store_false", default=None,
+                          help="Disables raw-mode tests on this host.");
         parser.add_option("--pidfile",
                           dest="sPidFile", default=None,
                           help="For the parent script, ignored.");
diff --git a/src/VBox/ValidationKit/testboxscript/testboxtasks.py b/src/VBox/ValidationKit/testboxscript/testboxtasks.py
index 6078b98..6716550 100644
--- a/src/VBox/ValidationKit/testboxscript/testboxtasks.py
+++ b/src/VBox/ValidationKit/testboxscript/testboxtasks.py
@@ -7,7 +7,7 @@ TestBox Script - Async Tasks.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testboxscript/testboxupgrade.py b/src/VBox/ValidationKit/testboxscript/testboxupgrade.py
index 5a8235e..6a8257c 100644
--- a/src/VBox/ValidationKit/testboxscript/testboxupgrade.py
+++ b/src/VBox/ValidationKit/testboxscript/testboxupgrade.py
@@ -7,7 +7,7 @@ TestBox Script - Upgrade from local file ZIP.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard python imports.
 import os
diff --git a/src/VBox/ValidationKit/testdriver/Makefile.kmk b/src/VBox/ValidationKit/testdriver/Makefile.kmk
index 1ab8c6c..31e5b0f 100644
--- a/src/VBox/ValidationKit/testdriver/Makefile.kmk
+++ b/src/VBox/ValidationKit/testdriver/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2014 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testdriver/__init__.py b/src/VBox/ValidationKit/testdriver/__init__.py
index c5419b3..d1d3528 100644
--- a/src/VBox/ValidationKit/testdriver/__init__.py
+++ b/src/VBox/ValidationKit/testdriver/__init__.py
@@ -7,7 +7,7 @@ Test driver package
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,5 +27,5 @@ You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
 
-__version__ = "$Revision: 96152 $";
+__version__ = "$Revision: 100880 $";
 
diff --git a/src/VBox/ValidationKit/testdriver/base.py b/src/VBox/ValidationKit/testdriver/base.py
index 9eff618..527edf0 100644
--- a/src/VBox/ValidationKit/testdriver/base.py
+++ b/src/VBox/ValidationKit/testdriver/base.py
@@ -8,7 +8,7 @@ Base testdriver module.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/testdriver/reporter.py b/src/VBox/ValidationKit/testdriver/reporter.py
index 7b16915..e19a2fe 100644
--- a/src/VBox/ValidationKit/testdriver/reporter.py
+++ b/src/VBox/ValidationKit/testdriver/reporter.py
@@ -8,7 +8,7 @@ Testdriver reporter module.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 97254 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/testdriver/tst-txsclient.py b/src/VBox/ValidationKit/testdriver/tst-txsclient.py
index 0b0e859..d506666 100644
--- a/src/VBox/ValidationKit/testdriver/tst-txsclient.py
+++ b/src/VBox/ValidationKit/testdriver/tst-txsclient.py
@@ -7,7 +7,7 @@ Simple testcase for txsclient.py.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard python imports.
 import os
diff --git a/src/VBox/ValidationKit/testdriver/txsclient.py b/src/VBox/ValidationKit/testdriver/txsclient.py
index 8222fd2..31f6764 100644
--- a/src/VBox/ValidationKit/testdriver/txsclient.py
+++ b/src/VBox/ValidationKit/testdriver/txsclient.py
@@ -7,7 +7,7 @@ Test eXecution Service Client.
 """
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard Python imports.
 import array
diff --git a/src/VBox/ValidationKit/testdriver/vbox.py b/src/VBox/ValidationKit/testdriver/vbox.py
index 13d9a58..fb8e846 100644
--- a/src/VBox/ValidationKit/testdriver/vbox.py
+++ b/src/VBox/ValidationKit/testdriver/vbox.py
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 100505 $"
+__version__ = "$Revision: 100967 $"
 
 
 # Standard Python imports.
@@ -2689,6 +2689,40 @@ class TestDriver(base.TestDriver):
         sCpuDesc = self._getHostCpuDesc(fQuiet);
         return sCpuDesc.startswith("VIA") or sCpuDesc == 'CentaurHauls';
 
+    def hasRawModeSupport(self, fQuiet = False):
+        """
+        Checks if raw-mode is supported by VirtualBox that the testbox is
+        configured for it.
+
+        Returns True / False.
+        Raises no exceptions.
+
+        Note! Differs from the rest in that we don't require the
+              TESTBOX_WITH_RAW_MODE value to match the API.  It is
+              sometimes helpful to disable raw-mode on individual
+              test boxes. (This probably goes for
+        """
+        # The environment variable can be used to disable raw-mode.
+        fEnv = os.environ.get('TESTBOX_WITH_RAW_MODE', None);
+        if fEnv is not None:
+            fEnv = fEnv.lower() not in [ 'false', 'f', 'not', 'no', 'n', '0', ];
+            if fEnv is False:
+                return False;
+
+        # Starting with 5.0 GA / RC2 the API can tell us whether VBox was built
+        # with raw-mode support or not.
+        self.importVBoxApi();
+        if self.fpApiVer >= 5.0:
+            try:
+                fVBox = self.oVBox.systemProperties.rawModeSupported;
+            except:
+                if not fQuiet:
+                    reporter.logXcpt();
+                fVBox = True;
+            if fVBox is False:
+                return False;
+
+        return True;
 
     #
     # Testdriver execution methods.
diff --git a/src/VBox/ValidationKit/testdriver/vboxcon.py b/src/VBox/ValidationKit/testdriver/vboxcon.py
index a83282a..fd5e1d1 100644
--- a/src/VBox/ValidationKit/testdriver/vboxcon.py
+++ b/src/VBox/ValidationKit/testdriver/vboxcon.py
@@ -9,7 +9,7 @@ See VBoxConstantWrappingHack for details.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -28,7 +28,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/testdriver/vboxinstaller.py b/src/VBox/ValidationKit/testdriver/vboxinstaller.py
index ca22987..3c29a49 100755
--- a/src/VBox/ValidationKit/testdriver/vboxinstaller.py
+++ b/src/VBox/ValidationKit/testdriver/vboxinstaller.py
@@ -11,7 +11,7 @@ other VBox test drivers.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -30,7 +30,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 98725 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/testdriver/vboxtestvms.py b/src/VBox/ValidationKit/testdriver/vboxtestvms.py
index 2f46a95..fc4d9c0 100644
--- a/src/VBox/ValidationKit/testdriver/vboxtestvms.py
+++ b/src/VBox/ValidationKit/testdriver/vboxtestvms.py
@@ -7,7 +7,7 @@ VirtualBox Test VMs
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 99376 $"
+__version__ = "$Revision: 100967 $"
 
 # Standard Python imports.
 import re;
@@ -670,6 +670,11 @@ class TestVmSet(object):
         if 'hwvirt-np' in self.asVirtModes and not oTestDrv.hasHostNestedPaging():
             reporter.log('Nested paging not supported by the host, skipping it.');
             self.asVirtModes.remove('hwvirt-np');
+
+        if 'raw' in self.asVirtModes and not oTestDrv.hasRawModeSupport():
+            reporter.log('Raw-mode virtualization is not available in this build (or perhaps for this host), skipping it.');
+            self.asVirtModes.remove('raw');
+
         return True;
 
     def actionExecute(self, oTestDrv, fnCallback): # pylint: disable=R0914
diff --git a/src/VBox/ValidationKit/testdriver/winbase.py b/src/VBox/ValidationKit/testdriver/winbase.py
index f62c49e..54e9490 100644
--- a/src/VBox/ValidationKit/testdriver/winbase.py
+++ b/src/VBox/ValidationKit/testdriver/winbase.py
@@ -8,7 +8,7 @@ a hard time when running on non-Windows systems.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/testmanager/Makefile.kmk b/src/VBox/ValidationKit/testmanager/Makefile.kmk
index c6378bf..996d25c 100644
--- a/src/VBox/ValidationKit/testmanager/Makefile.kmk
+++ b/src/VBox/ValidationKit/testmanager/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/__init__.py b/src/VBox/ValidationKit/testmanager/__init__.py
index 6a69a4b..aa66b38 100644
--- a/src/VBox/ValidationKit/testmanager/__init__.py
+++ b/src/VBox/ValidationKit/testmanager/__init__.py
@@ -7,7 +7,7 @@ Test Manager.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,5 +26,5 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
diff --git a/src/VBox/ValidationKit/testmanager/apache-template-2.2.conf b/src/VBox/ValidationKit/testmanager/apache-template-2.2.conf
index 805851b..6b1f211 100644
--- a/src/VBox/ValidationKit/testmanager/apache-template-2.2.conf
+++ b/src/VBox/ValidationKit/testmanager/apache-template-2.2.conf
@@ -6,7 +6,7 @@
 #
 
 #
-# Copyright (C) 2012-2014 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/apache-template-2.4.conf b/src/VBox/ValidationKit/testmanager/apache-template-2.4.conf
index fa68f2c..ad1a7a0 100644
--- a/src/VBox/ValidationKit/testmanager/apache-template-2.4.conf
+++ b/src/VBox/ValidationKit/testmanager/apache-template-2.4.conf
@@ -7,7 +7,7 @@
 #
 
 #
-# Copyright (C) 2012-2014 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/batch/Makefile.kmk b/src/VBox/ValidationKit/testmanager/batch/Makefile.kmk
index df27b62..b3e8eb9 100644
--- a/src/VBox/ValidationKit/testmanager/batch/Makefile.kmk
+++ b/src/VBox/ValidationKit/testmanager/batch/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/batch/add_build.py b/src/VBox/ValidationKit/testmanager/batch/add_build.py
index 81a5a33..8ab5ba9 100755
--- a/src/VBox/ValidationKit/testmanager/batch/add_build.py
+++ b/src/VBox/ValidationKit/testmanager/batch/add_build.py
@@ -9,7 +9,7 @@ Interface used by the tinderbox server side software to add a fresh build.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -28,7 +28,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard python imports
 import sys;
diff --git a/src/VBox/ValidationKit/testmanager/batch/close_orphaned_testsets.py b/src/VBox/ValidationKit/testmanager/batch/close_orphaned_testsets.py
index a961e20..0012513 100755
--- a/src/VBox/ValidationKit/testmanager/batch/close_orphaned_testsets.py
+++ b/src/VBox/ValidationKit/testmanager/batch/close_orphaned_testsets.py
@@ -9,7 +9,7 @@ Maintenance tool for closing orphaned testsets.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -28,7 +28,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard python imports
 import sys
diff --git a/src/VBox/ValidationKit/testmanager/batch/del_build.py b/src/VBox/ValidationKit/testmanager/batch/del_build.py
index 99abff8..ba29d10 100755
--- a/src/VBox/ValidationKit/testmanager/batch/del_build.py
+++ b/src/VBox/ValidationKit/testmanager/batch/del_build.py
@@ -10,7 +10,7 @@ deleted.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -29,7 +29,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard python imports
 import sys
diff --git a/src/VBox/ValidationKit/testmanager/batch/filearchiver.py b/src/VBox/ValidationKit/testmanager/batch/filearchiver.py
index 3b81abd..4521c59 100755
--- a/src/VBox/ValidationKit/testmanager/batch/filearchiver.py
+++ b/src/VBox/ValidationKit/testmanager/batch/filearchiver.py
@@ -10,7 +10,7 @@ g_ksZipFileAreaRootDir storage area.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -29,7 +29,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard python imports
 import sys
diff --git a/src/VBox/ValidationKit/testmanager/batch/vcs_import.py b/src/VBox/ValidationKit/testmanager/batch/vcs_import.py
index cada452..cb201f1 100755
--- a/src/VBox/ValidationKit/testmanager/batch/vcs_import.py
+++ b/src/VBox/ValidationKit/testmanager/batch/vcs_import.py
@@ -9,7 +9,7 @@ Cron job for importing revision history for a repository.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -28,7 +28,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard python imports
 import sys;
diff --git a/src/VBox/ValidationKit/testmanager/cgi/Makefile.kmk b/src/VBox/ValidationKit/testmanager/cgi/Makefile.kmk
index df27b62..b3e8eb9 100644
--- a/src/VBox/ValidationKit/testmanager/cgi/Makefile.kmk
+++ b/src/VBox/ValidationKit/testmanager/cgi/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/cgi/admin.py b/src/VBox/ValidationKit/testmanager/cgi/admin.py
index b28579a..d2b191e 100755
--- a/src/VBox/ValidationKit/testmanager/cgi/admin.py
+++ b/src/VBox/ValidationKit/testmanager/cgi/admin.py
@@ -8,7 +8,7 @@ CGI - Administrator Web-UI.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/cgi/debuginfo.py b/src/VBox/ValidationKit/testmanager/cgi/debuginfo.py
index 706b79e..48b23ad 100755
--- a/src/VBox/ValidationKit/testmanager/cgi/debuginfo.py
+++ b/src/VBox/ValidationKit/testmanager/cgi/debuginfo.py
@@ -8,7 +8,7 @@ CGI - Debug Info Page.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/cgi/index.py b/src/VBox/ValidationKit/testmanager/cgi/index.py
index f573709..917e15b 100755
--- a/src/VBox/ValidationKit/testmanager/cgi/index.py
+++ b/src/VBox/ValidationKit/testmanager/cgi/index.py
@@ -8,7 +8,7 @@ CGI - Web UI - Main (index) page.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/cgi/logout.py b/src/VBox/ValidationKit/testmanager/cgi/logout.py
index c3aaa00..b815b88 100755
--- a/src/VBox/ValidationKit/testmanager/cgi/logout.py
+++ b/src/VBox/ValidationKit/testmanager/cgi/logout.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - CGI - Log out page.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/cgi/logout2.py b/src/VBox/ValidationKit/testmanager/cgi/logout2.py
index d3baefb..46a6de0 100755
--- a/src/VBox/ValidationKit/testmanager/cgi/logout2.py
+++ b/src/VBox/ValidationKit/testmanager/cgi/logout2.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - CGI - Log out page for Safari.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/cgi/testboxdisp.py b/src/VBox/ValidationKit/testmanager/cgi/testboxdisp.py
index 0f2babc..3916bcc 100755
--- a/src/VBox/ValidationKit/testmanager/cgi/testboxdisp.py
+++ b/src/VBox/ValidationKit/testmanager/cgi/testboxdisp.py
@@ -8,7 +8,7 @@ CGI - TestBox Interaction (see testboxscript or the other party).
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/config.py b/src/VBox/ValidationKit/testmanager/config.py
index 32c6f59..f0632f2 100644
--- a/src/VBox/ValidationKit/testmanager/config.py
+++ b/src/VBox/ValidationKit/testmanager/config.py
@@ -7,7 +7,7 @@ Test Manager Configuration.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,14 +26,14 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 97536 $"
+__version__ = "$Revision: 100880 $"
 
 import os;
 
 ## Test Manager version string.
 g_ksVersion             = 'v0.0.2';
 ## Test Manager revision string.
-g_ksRevision            = ('$Revision: 97536 $')[11:-2];
+g_ksRevision            = ('$Revision: 100880 $')[11:-2];
 
 ## Enable VBox specific stuff.
 g_kfVBoxSpecific        = True;
diff --git a/src/VBox/ValidationKit/testmanager/core/Makefile.kmk b/src/VBox/ValidationKit/testmanager/core/Makefile.kmk
index df27b62..b3e8eb9 100644
--- a/src/VBox/ValidationKit/testmanager/core/Makefile.kmk
+++ b/src/VBox/ValidationKit/testmanager/core/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/core/__init__.py b/src/VBox/ValidationKit/testmanager/core/__init__.py
index 4012de5..171c327 100644
--- a/src/VBox/ValidationKit/testmanager/core/__init__.py
+++ b/src/VBox/ValidationKit/testmanager/core/__init__.py
@@ -7,7 +7,7 @@ TestBox Script - Core Logic.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,5 +26,5 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
diff --git a/src/VBox/ValidationKit/testmanager/core/base.py b/src/VBox/ValidationKit/testmanager/core/base.py
index c95fd39..336f4d0 100644
--- a/src/VBox/ValidationKit/testmanager/core/base.py
+++ b/src/VBox/ValidationKit/testmanager/core/base.py
@@ -8,7 +8,7 @@ Test Manager Core - Base Class(es).
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/build.py b/src/VBox/ValidationKit/testmanager/core/build.py
index ff123e2..401ac77 100644
--- a/src/VBox/ValidationKit/testmanager/core/build.py
+++ b/src/VBox/ValidationKit/testmanager/core/build.py
@@ -7,7 +7,7 @@ Test Manager - Builds.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/buildblacklist.py b/src/VBox/ValidationKit/testmanager/core/buildblacklist.py
index b823ce6..2be4524 100644
--- a/src/VBox/ValidationKit/testmanager/core/buildblacklist.py
+++ b/src/VBox/ValidationKit/testmanager/core/buildblacklist.py
@@ -7,7 +7,7 @@ Test Manager - Builds Blacklist.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/buildsource.py b/src/VBox/ValidationKit/testmanager/core/buildsource.py
index a788675..1f911ac 100644
--- a/src/VBox/ValidationKit/testmanager/core/buildsource.py
+++ b/src/VBox/ValidationKit/testmanager/core/buildsource.py
@@ -7,7 +7,7 @@ Test Manager - Build Sources.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/coreconsts.py b/src/VBox/ValidationKit/testmanager/core/coreconsts.py
index 7e30711..5cce78a 100644
--- a/src/VBox/ValidationKit/testmanager/core/coreconsts.py
+++ b/src/VBox/ValidationKit/testmanager/core/coreconsts.py
@@ -7,7 +7,7 @@ Test Manager - Test Manager Constants (without a more appropriate home).
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 ## OS agnostic.
 g_ksOsAgnostic      = 'os-agnostic';
diff --git a/src/VBox/ValidationKit/testmanager/core/db.py b/src/VBox/ValidationKit/testmanager/core/db.py
index 729b9ae..59a828c 100644
--- a/src/VBox/ValidationKit/testmanager/core/db.py
+++ b/src/VBox/ValidationKit/testmanager/core/db.py
@@ -7,7 +7,7 @@ Test Manager - Database Interface.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/dbobjcache.py b/src/VBox/ValidationKit/testmanager/core/dbobjcache.py
index 3db2a18..76bde4a 100644
--- a/src/VBox/ValidationKit/testmanager/core/dbobjcache.py
+++ b/src/VBox/ValidationKit/testmanager/core/dbobjcache.py
@@ -7,7 +7,7 @@ Test Manager - Database object cache.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/failurecategory.py b/src/VBox/ValidationKit/testmanager/core/failurecategory.py
index 02224fc..f025c09 100644
--- a/src/VBox/ValidationKit/testmanager/core/failurecategory.py
+++ b/src/VBox/ValidationKit/testmanager/core/failurecategory.py
@@ -7,7 +7,7 @@ Test Manager - Failure Categories.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/failurereason.py b/src/VBox/ValidationKit/testmanager/core/failurereason.py
index 6e6ab62..9aed774 100644
--- a/src/VBox/ValidationKit/testmanager/core/failurereason.py
+++ b/src/VBox/ValidationKit/testmanager/core/failurereason.py
@@ -7,7 +7,7 @@ Test Manager - Failure Reasons.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/globalresource.pgsql b/src/VBox/ValidationKit/testmanager/core/globalresource.pgsql
index 5b20ccd..94bf29c 100644
--- a/src/VBox/ValidationKit/testmanager/core/globalresource.pgsql
+++ b/src/VBox/ValidationKit/testmanager/core/globalresource.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2006-2014 Oracle Corporation
+-- Copyright (C) 2006-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/core/globalresource.py b/src/VBox/ValidationKit/testmanager/core/globalresource.py
index e1dfe92..8df9527 100644
--- a/src/VBox/ValidationKit/testmanager/core/globalresource.py
+++ b/src/VBox/ValidationKit/testmanager/core/globalresource.py
@@ -7,7 +7,7 @@ Test Manager - Global Resources.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/report.py b/src/VBox/ValidationKit/testmanager/core/report.py
index 3d7aa6d..58cf0f5 100644
--- a/src/VBox/ValidationKit/testmanager/core/report.py
+++ b/src/VBox/ValidationKit/testmanager/core/report.py
@@ -7,7 +7,7 @@ Test Manager - Report models.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/schedgroup.py b/src/VBox/ValidationKit/testmanager/core/schedgroup.py
index 30acf51..d536b45 100644
--- a/src/VBox/ValidationKit/testmanager/core/schedgroup.py
+++ b/src/VBox/ValidationKit/testmanager/core/schedgroup.py
@@ -7,7 +7,7 @@ Test Manager - Scheduling Group.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/schedulerbase.py b/src/VBox/ValidationKit/testmanager/core/schedulerbase.py
index 5ec604b..53c1d8c 100644
--- a/src/VBox/ValidationKit/testmanager/core/schedulerbase.py
+++ b/src/VBox/ValidationKit/testmanager/core/schedulerbase.py
@@ -9,7 +9,7 @@ Test Manager - Base class and utilities for the schedulers.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -28,7 +28,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/schedulerbeci.py b/src/VBox/ValidationKit/testmanager/core/schedulerbeci.py
index 86e08af..1da3aaf 100644
--- a/src/VBox/ValidationKit/testmanager/core/schedulerbeci.py
+++ b/src/VBox/ValidationKit/testmanager/core/schedulerbeci.py
@@ -7,7 +7,7 @@ Test Manager - Best-Effort-Continous-Itegration (BECI) scheduler.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/systemlog.py b/src/VBox/ValidationKit/testmanager/core/systemlog.py
index 2e0c5d4..63175e2 100644
--- a/src/VBox/ValidationKit/testmanager/core/systemlog.py
+++ b/src/VBox/ValidationKit/testmanager/core/systemlog.py
@@ -7,7 +7,7 @@ Test Manager - SystemLog.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/testbox.py b/src/VBox/ValidationKit/testmanager/core/testbox.py
index af777b7..93bb6b0 100644
--- a/src/VBox/ValidationKit/testmanager/core/testbox.py
+++ b/src/VBox/ValidationKit/testmanager/core/testbox.py
@@ -7,7 +7,7 @@ Test Manager - TestBox.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/testboxcontroller.py b/src/VBox/ValidationKit/testmanager/core/testboxcontroller.py
index ef480d7..7df2552 100644
--- a/src/VBox/ValidationKit/testmanager/core/testboxcontroller.py
+++ b/src/VBox/ValidationKit/testmanager/core/testboxcontroller.py
@@ -7,7 +7,7 @@ Test Manager Core - Web Server Abstraction Base Class.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/testboxstatus.py b/src/VBox/ValidationKit/testmanager/core/testboxstatus.py
index 471a10e..6d43d1d 100644
--- a/src/VBox/ValidationKit/testmanager/core/testboxstatus.py
+++ b/src/VBox/ValidationKit/testmanager/core/testboxstatus.py
@@ -7,7 +7,7 @@ Test Manager - TestBoxStatus.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/testcase.pgsql b/src/VBox/ValidationKit/testmanager/core/testcase.pgsql
index 1d518a5..86d0c37 100644
--- a/src/VBox/ValidationKit/testmanager/core/testcase.pgsql
+++ b/src/VBox/ValidationKit/testmanager/core/testcase.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/core/testcase.py b/src/VBox/ValidationKit/testmanager/core/testcase.py
index 3f82120..0e5dbe3 100644
--- a/src/VBox/ValidationKit/testmanager/core/testcase.py
+++ b/src/VBox/ValidationKit/testmanager/core/testcase.py
@@ -8,7 +8,7 @@ Test Manager - Test Case.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/testcaseargs.py b/src/VBox/ValidationKit/testmanager/core/testcaseargs.py
index 8a043ee..87ff86c 100644
--- a/src/VBox/ValidationKit/testmanager/core/testcaseargs.py
+++ b/src/VBox/ValidationKit/testmanager/core/testcaseargs.py
@@ -7,7 +7,7 @@ Test Manager - Test Case Arguments Variations.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/testgroup.py b/src/VBox/ValidationKit/testmanager/core/testgroup.py
index e9abc90..92bedbb 100644
--- a/src/VBox/ValidationKit/testmanager/core/testgroup.py
+++ b/src/VBox/ValidationKit/testmanager/core/testgroup.py
@@ -7,7 +7,7 @@ Test Manager - Test groups management.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/testresults.py b/src/VBox/ValidationKit/testmanager/core/testresults.py
index 9dde4ed..80e8869 100644
--- a/src/VBox/ValidationKit/testmanager/core/testresults.py
+++ b/src/VBox/ValidationKit/testmanager/core/testresults.py
@@ -10,7 +10,7 @@ Test Manager - Fetch test results.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -29,7 +29,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96526 $"
+__version__ = "$Revision: 100880 $"
 # Standard python imports.
 import unittest;
 
diff --git a/src/VBox/ValidationKit/testmanager/core/testset.py b/src/VBox/ValidationKit/testmanager/core/testset.py
index f0767a6..230ea7e 100644
--- a/src/VBox/ValidationKit/testmanager/core/testset.py
+++ b/src/VBox/ValidationKit/testmanager/core/testset.py
@@ -7,7 +7,7 @@ Test Manager - TestSet.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/useraccount.pgsql b/src/VBox/ValidationKit/testmanager/core/useraccount.pgsql
index 30fea69..a58032b 100644
--- a/src/VBox/ValidationKit/testmanager/core/useraccount.pgsql
+++ b/src/VBox/ValidationKit/testmanager/core/useraccount.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/core/useraccount.py b/src/VBox/ValidationKit/testmanager/core/useraccount.py
index 725df2d..9a680bc 100644
--- a/src/VBox/ValidationKit/testmanager/core/useraccount.py
+++ b/src/VBox/ValidationKit/testmanager/core/useraccount.py
@@ -7,7 +7,7 @@ Test Manager - User DB records management.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/vcsrevisions.py b/src/VBox/ValidationKit/testmanager/core/vcsrevisions.py
index 842d0ea..795ea62 100644
--- a/src/VBox/ValidationKit/testmanager/core/vcsrevisions.py
+++ b/src/VBox/ValidationKit/testmanager/core/vcsrevisions.py
@@ -7,7 +7,7 @@ Test Manager - VcsRevisions
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/webservergluebase.py b/src/VBox/ValidationKit/testmanager/core/webservergluebase.py
index b7c5360..b9cfe44 100644
--- a/src/VBox/ValidationKit/testmanager/core/webservergluebase.py
+++ b/src/VBox/ValidationKit/testmanager/core/webservergluebase.py
@@ -7,7 +7,7 @@ Test Manager Core - Web Server Abstraction Base Class.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/core/webservergluecgi.py b/src/VBox/ValidationKit/testmanager/core/webservergluecgi.py
index 5ede79b..df82f21 100644
--- a/src/VBox/ValidationKit/testmanager/core/webservergluecgi.py
+++ b/src/VBox/ValidationKit/testmanager/core/webservergluecgi.py
@@ -7,7 +7,7 @@ Test Manager Core - Web Server Abstraction Base Class.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/db/Makefile.kmk b/src/VBox/ValidationKit/testmanager/db/Makefile.kmk
index c74fe9e..ce03d0d 100644
--- a/src/VBox/ValidationKit/testmanager/db/Makefile.kmk
+++ b/src/VBox/ValidationKit/testmanager/db/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseDefaultUserAccounts.pgsql b/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseDefaultUserAccounts.pgsql
index 429e958..81f040d 100644
--- a/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseDefaultUserAccounts.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseDefaultUserAccounts.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseForeignKeyErHacks.pgsql b/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseForeignKeyErHacks.pgsql
index 421ec2d..c80d311 100644
--- a/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseForeignKeyErHacks.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseForeignKeyErHacks.pgsql
@@ -7,7 +7,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseForeignKeyErHacks2.pgsql b/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseForeignKeyErHacks2.pgsql
index 6be7498..f082e81 100644
--- a/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseForeignKeyErHacks2.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseForeignKeyErHacks2.pgsql
@@ -7,7 +7,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseInit.pgsql b/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseInit.pgsql
index f772aa9..aa22a08 100644
--- a/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseInit.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/TestManagerDatabaseInit.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/TestManagerVBoxPilot-1.pgsql b/src/VBox/ValidationKit/testmanager/db/TestManagerVBoxPilot-1.pgsql
index 5bc3646..7551ae1 100644
--- a/src/VBox/ValidationKit/testmanager/db/TestManagerVBoxPilot-1.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/TestManagerVBoxPilot-1.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/gen-sql-comments.py b/src/VBox/ValidationKit/testmanager/db/gen-sql-comments.py
index 889cf61..9746a44 100755
--- a/src/VBox/ValidationKit/testmanager/db/gen-sql-comments.py
+++ b/src/VBox/ValidationKit/testmanager/db/gen-sql-comments.py
@@ -3,7 +3,7 @@
 # $Id: gen-sql-comments.py $
 
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r01-builds-1.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r01-builds-1.pgsql
index d03d5b0..f1f2a52 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r01-builds-1.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r01-builds-1.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r02-testboxes-1.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r02-testboxes-1.pgsql
index a7f345c..88b1fb8 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r02-testboxes-1.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r02-testboxes-1.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r03-teststatus-1.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r03-teststatus-1.pgsql
index c2a0b33..d3a442c 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r03-teststatus-1.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r03-teststatus-1.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r04-teststatus-2.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r04-teststatus-2.pgsql
index 37afe81..fa65bf9 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r04-teststatus-2.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r04-teststatus-2.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r05-teststatus-3.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r05-teststatus-3.pgsql
index c7ddeae..0328d56 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r05-teststatus-3.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r05-teststatus-3.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r06-buildsources-1.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r06-buildsources-1.pgsql
index aa7b8e0..4a4d20e 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r06-buildsources-1.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r06-buildsources-1.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r07-testresults-1.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r07-testresults-1.pgsql
index 16e030e..2e4b6fb 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r07-testresults-1.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r07-testresults-1.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013-2014 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r08-testresultvalues-1.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r08-testresultvalues-1.pgsql
index b754d66..16fb558 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r08-testresultvalues-1.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r08-testresultvalues-1.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013-2014 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r09-testsets-1.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r09-testsets-1.pgsql
index c212c4d..5b0eebc 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r09-testsets-1.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r09-testsets-1.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013-2014 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r10-testresultvalues-2.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r10-testresultvalues-2.pgsql
index 0cf0f9e..ca32d1d 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r10-testresultvalues-2.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r10-testresultvalues-2.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013-2014 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r11-testsets-2.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r11-testsets-2.pgsql
index 4bcc986..dde31f6 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r11-testsets-2.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r11-testsets-2.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013-2014 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r12-testresultvalues-3-testsets-3.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r12-testresultvalues-3-testsets-3.pgsql
index 6a93f3e..b5ad4d0 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r12-testresultvalues-3-testsets-3.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r12-testresultvalues-3-testsets-3.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013-2014 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r13-buildcategories-1-vcsrevisions-1.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r13-buildcategories-1-vcsrevisions-1.pgsql
index cfbba83..9afefa4 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r13-buildcategories-1-vcsrevisions-1.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r13-buildcategories-1-vcsrevisions-1.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013-2014 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/db/tmdb-r14-testboxes-2.pgsql b/src/VBox/ValidationKit/testmanager/db/tmdb-r14-testboxes-2.pgsql
index 99048eb..c273bf5 100644
--- a/src/VBox/ValidationKit/testmanager/db/tmdb-r14-testboxes-2.pgsql
+++ b/src/VBox/ValidationKit/testmanager/db/tmdb-r14-testboxes-2.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2013-2014 Oracle Corporation
+-- Copyright (C) 2013-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/debug/Makefile.kmk b/src/VBox/ValidationKit/testmanager/debug/Makefile.kmk
index df27b62..b3e8eb9 100644
--- a/src/VBox/ValidationKit/testmanager/debug/Makefile.kmk
+++ b/src/VBox/ValidationKit/testmanager/debug/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/debug/__init__.py b/src/VBox/ValidationKit/testmanager/debug/__init__.py
index 1fef390..7ea6583 100644
--- a/src/VBox/ValidationKit/testmanager/debug/__init__.py
+++ b/src/VBox/ValidationKit/testmanager/debug/__init__.py
@@ -7,7 +7,7 @@ Test Manager - Debug Utilities.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,5 +26,5 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
diff --git a/src/VBox/ValidationKit/testmanager/debug/add_testbox.pgsql b/src/VBox/ValidationKit/testmanager/debug/add_testbox.pgsql
index 903c27a..5eef170 100644
--- a/src/VBox/ValidationKit/testmanager/debug/add_testbox.pgsql
+++ b/src/VBox/ValidationKit/testmanager/debug/add_testbox.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/debug/cgiprofiling.py b/src/VBox/ValidationKit/testmanager/debug/cgiprofiling.py
index ee77c87..da24dba 100755
--- a/src/VBox/ValidationKit/testmanager/debug/cgiprofiling.py
+++ b/src/VBox/ValidationKit/testmanager/debug/cgiprofiling.py
@@ -8,7 +8,7 @@ Debug - CGI Profiling.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 def profileIt(fnMain, sAppendToElement = 'main', sSort = 'time'):
diff --git a/src/VBox/ValidationKit/testmanager/debug/functions.pgsql b/src/VBox/ValidationKit/testmanager/debug/functions.pgsql
index e2c661a..2f1ade9 100644
--- a/src/VBox/ValidationKit/testmanager/debug/functions.pgsql
+++ b/src/VBox/ValidationKit/testmanager/debug/functions.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/htdocs/css/common.css b/src/VBox/ValidationKit/testmanager/htdocs/css/common.css
index c8ea2b7..1bbfc53 100644
--- a/src/VBox/ValidationKit/testmanager/htdocs/css/common.css
+++ b/src/VBox/ValidationKit/testmanager/htdocs/css/common.css
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/htdocs/css/details.css b/src/VBox/ValidationKit/testmanager/htdocs/css/details.css
index 796df0a..658a968 100644
--- a/src/VBox/ValidationKit/testmanager/htdocs/css/details.css
+++ b/src/VBox/ValidationKit/testmanager/htdocs/css/details.css
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/htdocs/css/graphwiz.css b/src/VBox/ValidationKit/testmanager/htdocs/css/graphwiz.css
index de89694..3e92905 100644
--- a/src/VBox/ValidationKit/testmanager/htdocs/css/graphwiz.css
+++ b/src/VBox/ValidationKit/testmanager/htdocs/css/graphwiz.css
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/htdocs/css/tooltip.css b/src/VBox/ValidationKit/testmanager/htdocs/css/tooltip.css
index 8b5a712..15704cd 100644
--- a/src/VBox/ValidationKit/testmanager/htdocs/css/tooltip.css
+++ b/src/VBox/ValidationKit/testmanager/htdocs/css/tooltip.css
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/htdocs/js/common.js b/src/VBox/ValidationKit/testmanager/htdocs/js/common.js
index ef34e88..546af08 100644
--- a/src/VBox/ValidationKit/testmanager/htdocs/js/common.js
+++ b/src/VBox/ValidationKit/testmanager/htdocs/js/common.js
@@ -5,7 +5,7 @@
 
 /*
  *
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/htdocs/js/graphwiz.js b/src/VBox/ValidationKit/testmanager/htdocs/js/graphwiz.js
index a15d0b5..cbebc0c 100644
--- a/src/VBox/ValidationKit/testmanager/htdocs/js/graphwiz.js
+++ b/src/VBox/ValidationKit/testmanager/htdocs/js/graphwiz.js
@@ -5,7 +5,7 @@
 
 /*
  *
- * Copyright (C) 2012-2014 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/misc/Makefile.kmk b/src/VBox/ValidationKit/testmanager/misc/Makefile.kmk
index df27b62..b3e8eb9 100644
--- a/src/VBox/ValidationKit/testmanager/misc/Makefile.kmk
+++ b/src/VBox/ValidationKit/testmanager/misc/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/selftest/st1-load.pgsql b/src/VBox/ValidationKit/testmanager/selftest/st1-load.pgsql
index e9618bb..fa27b5b 100644
--- a/src/VBox/ValidationKit/testmanager/selftest/st1-load.pgsql
+++ b/src/VBox/ValidationKit/testmanager/selftest/st1-load.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/selftest/st1-unload.pgsql b/src/VBox/ValidationKit/testmanager/selftest/st1-unload.pgsql
index a250a9c..dec1845 100644
--- a/src/VBox/ValidationKit/testmanager/selftest/st1-unload.pgsql
+++ b/src/VBox/ValidationKit/testmanager/selftest/st1-unload.pgsql
@@ -4,7 +4,7 @@
 --
 
 --
--- Copyright (C) 2012-2014 Oracle Corporation
+-- Copyright (C) 2012-2015 Oracle Corporation
 --
 -- This file is part of VirtualBox Open Source Edition (OSE), as
 -- available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/webui/Makefile.kmk b/src/VBox/ValidationKit/testmanager/webui/Makefile.kmk
index 00a71d6..c66b6fa 100644
--- a/src/VBox/ValidationKit/testmanager/webui/Makefile.kmk
+++ b/src/VBox/ValidationKit/testmanager/webui/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/testmanager/webui/__init__.py b/src/VBox/ValidationKit/testmanager/webui/__init__.py
index d06f985..c205c75 100644
--- a/src/VBox/ValidationKit/testmanager/webui/__init__.py
+++ b/src/VBox/ValidationKit/testmanager/webui/__init__.py
@@ -7,7 +7,7 @@ TestBox Script - WUI Presentation.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,5 +26,5 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
diff --git a/src/VBox/ValidationKit/testmanager/webui/template.html b/src/VBox/ValidationKit/testmanager/webui/template.html
index 7dbcc4b..27af0cc 100644
--- a/src/VBox/ValidationKit/testmanager/webui/template.html
+++ b/src/VBox/ValidationKit/testmanager/webui/template.html
@@ -36,7 +36,7 @@
         VBox Test Manager<br/>@@TESTMANAGER_VERSION@@r@@TESTMANAGER_REVISION@@
         </p>
         <br>
-        <p>Copyright © 2012-2014 Oracle Corporation</p>
+        <p>Copyright © 2012-2015 Oracle Corporation</p>
     </div>
 </div>
 
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadmin.py b/src/VBox/ValidationKit/testmanager/webui/wuiadmin.py
index 55096ad..d03216d 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadmin.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadmin.py
@@ -7,7 +7,7 @@ Test Manager Core - WUI - Admin Main page.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadminbuild.py b/src/VBox/ValidationKit/testmanager/webui/wuiadminbuild.py
index 53daf3c..8e62104 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadminbuild.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadminbuild.py
@@ -7,7 +7,7 @@ Test Manager WUI - Builds.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildblacklist.py b/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildblacklist.py
index cb40ab3..05cbde9 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildblacklist.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildblacklist.py
@@ -7,7 +7,7 @@ Test Manager WUI - Build Blacklist.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildcategory.py b/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildcategory.py
index 0382207..2361f26 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildcategory.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildcategory.py
@@ -7,7 +7,7 @@ Test Manager WUI - Build categories.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildsource.py b/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildsource.py
index ba934c1..13d3d77 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildsource.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadminbuildsource.py
@@ -7,7 +7,7 @@ Test Manager WUI - Build Sources.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadminfailurereason.py b/src/VBox/ValidationKit/testmanager/webui/wuiadminfailurereason.py
index f44dd5a..f4df643 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadminfailurereason.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadminfailurereason.py
@@ -7,7 +7,7 @@ Test Manager WUI - Failure Reasons Web content generator.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadminglobalrsrc.py b/src/VBox/ValidationKit/testmanager/webui/wuiadminglobalrsrc.py
index 28e9439..bcee2ee 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadminglobalrsrc.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadminglobalrsrc.py
@@ -7,7 +7,7 @@ Test Manager WUI - Global resources.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Validation Kit imports.
 from testmanager.webui.wuibase          import WuiException
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadminschedgroup.py b/src/VBox/ValidationKit/testmanager/webui/wuiadminschedgroup.py
index be2e23a..894d489 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadminschedgroup.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadminschedgroup.py
@@ -7,7 +7,7 @@ Test Manager WUI - Scheduling groups.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadminsystemlog.py b/src/VBox/ValidationKit/testmanager/webui/wuiadminsystemlog.py
index 497e516..1571f8f 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadminsystemlog.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadminsystemlog.py
@@ -7,7 +7,7 @@ Test Manager WUI - Admin - System Log.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadmintestbox.py b/src/VBox/ValidationKit/testmanager/webui/wuiadmintestbox.py
index 56ce605..3a4bd69 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadmintestbox.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadmintestbox.py
@@ -7,7 +7,7 @@ Test Manager WUI - TestBox.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96862 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadmintestcase.py b/src/VBox/ValidationKit/testmanager/webui/wuiadmintestcase.py
index f990466..cee610d 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadmintestcase.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadmintestcase.py
@@ -7,7 +7,7 @@ Test Manager WUI - Test Cases.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadmintestgroup.py b/src/VBox/ValidationKit/testmanager/webui/wuiadmintestgroup.py
index 9ae5f48..07409ac 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadmintestgroup.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadmintestgroup.py
@@ -7,7 +7,7 @@ Test Manager WUI - Test Groups.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Validation Kit imports.
 from common                             import utils, webutils;
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuiadminuseraccount.py b/src/VBox/ValidationKit/testmanager/webui/wuiadminuseraccount.py
index 214bf64..7864c01 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuiadminuseraccount.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuiadminuseraccount.py
@@ -7,7 +7,7 @@ Test Manager WUI - User accounts.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Validation Kit imports.
 from testmanager.webui.wuicontentbase   import WuiFormContentBase, WuiListContentBase, WuiTmLink;
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuibase.py b/src/VBox/ValidationKit/testmanager/webui/wuibase.py
index cd8be72..c979247 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuibase.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuibase.py
@@ -7,7 +7,7 @@ Test Manager Web-UI - Base Classes.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuicontentbase.py b/src/VBox/ValidationKit/testmanager/webui/wuicontentbase.py
index b387c70..c59e38e 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuicontentbase.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuicontentbase.py
@@ -7,7 +7,7 @@ Test Manager Web-UI - Content Base Classes.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard python imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuifailurecategory.py b/src/VBox/ValidationKit/testmanager/webui/wuifailurecategory.py
index b62eca7..108c22c 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuifailurecategory.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuifailurecategory.py
@@ -7,7 +7,7 @@ Test Manager WUI - Failure Categories Web content generator.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuigraphwiz.py b/src/VBox/ValidationKit/testmanager/webui/wuigraphwiz.py
index 520f0bf..ac61efa 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuigraphwiz.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuigraphwiz.py
@@ -7,7 +7,7 @@ Test Manager WUI - Graph Wizard
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Python imports.
 import functools;
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuihlpform.py b/src/VBox/ValidationKit/testmanager/webui/wuihlpform.py
index a8d3d0e..3e3d415 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuihlpform.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuihlpform.py
@@ -7,7 +7,7 @@ Test Manager Web-UI - Form Helpers.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard python imports.
 import copy;
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuihlpgraph.py b/src/VBox/ValidationKit/testmanager/webui/wuihlpgraph.py
index ce2ac66..2d4af71 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuihlpgraph.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuihlpgraph.py
@@ -7,7 +7,7 @@ Test Manager Web-UI - Graph Helpers.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 class WuiHlpGraphDataTable(object): # pylint: disable=R0903
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphbase.py b/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphbase.py
index 682be64..f564930 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphbase.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphbase.py
@@ -7,7 +7,7 @@ Test Manager Web-UI - Graph Helpers - Base Class.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 class WuiHlpGraphBase(object):
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphgooglechart.py b/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphgooglechart.py
index f907341..6e5ccc9 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphgooglechart.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphgooglechart.py
@@ -7,7 +7,7 @@ Test Manager Web-UI - Graph Helpers - Implemented using Google Charts.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 97393 $"
+__version__ = "$Revision: 100880 $"
 
 # Validation Kit imports.
 from testmanager.webui.wuihlpgraphbase  import WuiHlpGraphBase;
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphmatplotlib.py b/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphmatplotlib.py
index b94780a..a264a9d 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphmatplotlib.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphmatplotlib.py
@@ -7,7 +7,7 @@ Test Manager Web-UI - Graph Helpers - Implemented using matplotlib.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 97393 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard Python Import and extensions installed on the system.
 import re;
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphsimple.py b/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphsimple.py
index 388395a..b82d384 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphsimple.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphsimple.py
@@ -7,7 +7,7 @@ Test Manager Web-UI - Graph Helpers - Simple/Stub Implementation.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 97393 $"
+__version__ = "$Revision: 100880 $"
 
 # Validation Kit imports.
 from common.webutils                    import escapeAttr, escapeElem;
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuilogviewer.py b/src/VBox/ValidationKit/testmanager/webui/wuilogviewer.py
index cb3f02d..79f4079 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuilogviewer.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuilogviewer.py
@@ -7,7 +7,7 @@ Test Manager WUI - Log viewer
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Validation Kit imports.
 from common                             import webutils;
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuimain.py b/src/VBox/ValidationKit/testmanager/webui/wuimain.py
index 3c1fd88..3474080 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuimain.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuimain.py
@@ -7,7 +7,7 @@ Test Manager Core - WUI - The Main page.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 99364 $"
+__version__ = "$Revision: 100880 $"
 
 # Standard Python imports.
 
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuireport.py b/src/VBox/ValidationKit/testmanager/webui/wuireport.py
index 439a36c..6ecb230 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuireport.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuireport.py
@@ -7,7 +7,7 @@ Test Manager WUI - Reports.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuitestresult.py b/src/VBox/ValidationKit/testmanager/webui/wuitestresult.py
index 47fa347..cfe63b2 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuitestresult.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuitestresult.py
@@ -7,7 +7,7 @@ Test Manager WUI - Test Results.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96526 $"
+__version__ = "$Revision: 100880 $"
 
 # Python imports.
 
diff --git a/src/VBox/ValidationKit/testmanager/webui/wuivcshistory.py b/src/VBox/ValidationKit/testmanager/webui/wuivcshistory.py
index 7fc521e..a5dece7 100644
--- a/src/VBox/ValidationKit/testmanager/webui/wuivcshistory.py
+++ b/src/VBox/ValidationKit/testmanager/webui/wuivcshistory.py
@@ -7,7 +7,7 @@ Test Manager WUI - VCS history
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 # Python imports.
 #import datetime;
diff --git a/src/VBox/ValidationKit/tests/Makefile.kmk b/src/VBox/ValidationKit/tests/Makefile.kmk
index 17ec7ae..2582d56 100644
--- a/src/VBox/ValidationKit/tests/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/additions/Makefile.kmk b/src/VBox/ValidationKit/tests/additions/Makefile.kmk
index a28d635..a8ed3aa 100644
--- a/src/VBox/ValidationKit/tests/additions/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/additions/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py b/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py
index 50c50a8..4a45d80 100755
--- a/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py
+++ b/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - Additions Basics #1.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/api/tdPython1.py b/src/VBox/ValidationKit/tests/api/tdPython1.py
index 9195d3c..9c77abb 100755
--- a/src/VBox/ValidationKit/tests/api/tdPython1.py
+++ b/src/VBox/ValidationKit/tests/api/tdPython1.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - Python Bindings Test #1
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/autostart/Makefile.kmk b/src/VBox/ValidationKit/tests/autostart/Makefile.kmk
index b76897c..d3feeab 100644
--- a/src/VBox/ValidationKit/tests/autostart/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/autostart/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2013 Oracle Corporation
+# Copyright (C) 2013-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py b/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py
index 6458edc..715346d 100755
--- a/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py
+++ b/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py
@@ -7,7 +7,7 @@ AUtostart testcase using.
 
 __copyright__ = \
 """
-Copyright (C) 2013 Oracle Corporation
+Copyright (C) 2013-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/benchmarks/Makefile.kmk b/src/VBox/ValidationKit/tests/benchmarks/Makefile.kmk
index 68904b3..8a79214 100644
--- a/src/VBox/ValidationKit/tests/benchmarks/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/benchmarks/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/benchmarks/tdBenchmark1.py b/src/VBox/ValidationKit/tests/benchmarks/tdBenchmark1.py
index 988e3cb..fefa364 100755
--- a/src/VBox/ValidationKit/tests/benchmarks/tdBenchmark1.py
+++ b/src/VBox/ValidationKit/tests/benchmarks/tdBenchmark1.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - Test that runs various benchmarks.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 97546 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/cpu/Makefile.kmk b/src/VBox/ValidationKit/tests/cpu/Makefile.kmk
index dc92d4e..e673b0e 100644
--- a/src/VBox/ValidationKit/tests/cpu/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/cpu/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/cpu/tdCpuPae1.py b/src/VBox/ValidationKit/tests/cpu/tdCpuPae1.py
index 83076e2..af90f52 100755
--- a/src/VBox/ValidationKit/tests/cpu/tdCpuPae1.py
+++ b/src/VBox/ValidationKit/tests/cpu/tdCpuPae1.py
@@ -11,7 +11,7 @@ the right runtime error.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -30,7 +30,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/installation/Makefile.kmk b/src/VBox/ValidationKit/tests/installation/Makefile.kmk
index dd82869..45e913f 100644
--- a/src/VBox/ValidationKit/tests/installation/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/installation/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/installation/tdGuestOsInstOs2.py b/src/VBox/ValidationKit/tests/installation/tdGuestOsInstOs2.py
index 87cfc70..ee75971 100755
--- a/src/VBox/ValidationKit/tests/installation/tdGuestOsInstOs2.py
+++ b/src/VBox/ValidationKit/tests/installation/tdGuestOsInstOs2.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - OS/2 install tests.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 97235 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/installation/tdGuestOsInstTest1.py b/src/VBox/ValidationKit/tests/installation/tdGuestOsInstTest1.py
index b8fdf92..725ca4f 100755
--- a/src/VBox/ValidationKit/tests/installation/tdGuestOsInstTest1.py
+++ b/src/VBox/ValidationKit/tests/installation/tdGuestOsInstTest1.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - Guest OS installation tests.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 98737 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/network/Makefile.kmk b/src/VBox/ValidationKit/tests/network/Makefile.kmk
index 4b7f549..c2ea3ff 100644
--- a/src/VBox/ValidationKit/tests/network/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/network/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/network/tdNetBenchmark1.py b/src/VBox/ValidationKit/tests/network/tdNetBenchmark1.py
index 8d35617..6f93cdf 100755
--- a/src/VBox/ValidationKit/tests/network/tdNetBenchmark1.py
+++ b/src/VBox/ValidationKit/tests/network/tdNetBenchmark1.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - Networking benchmark #1.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/selftests/Makefile.kmk b/src/VBox/ValidationKit/tests/selftests/Makefile.kmk
index 4662e94..b08cc71 100644
--- a/src/VBox/ValidationKit/tests/selftests/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/selftests/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/selftests/tdSelfTest1.py b/src/VBox/ValidationKit/tests/selftests/tdSelfTest1.py
index f6b8075..39376ec 100755
--- a/src/VBox/ValidationKit/tests/selftests/tdSelfTest1.py
+++ b/src/VBox/ValidationKit/tests/selftests/tdSelfTest1.py
@@ -8,7 +8,7 @@ Test Manager Self Test - Dummy Test Driver.
 
 __copyright__ = \
 """
-Copyright (C) 2012-2014 Oracle Corporation
+Copyright (C) 2012-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 import sys;
diff --git a/src/VBox/ValidationKit/tests/selftests/tdSelfTest2.py b/src/VBox/ValidationKit/tests/selftests/tdSelfTest2.py
index c50f3c1..25df48e 100755
--- a/src/VBox/ValidationKit/tests/selftests/tdSelfTest2.py
+++ b/src/VBox/ValidationKit/tests/selftests/tdSelfTest2.py
@@ -8,7 +8,7 @@ Test Manager / Suite Self Test #2 - Everything should succeed.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/selftests/tdSelfTest3.py b/src/VBox/ValidationKit/tests/selftests/tdSelfTest3.py
index ef2bcda..76e0b56 100755
--- a/src/VBox/ValidationKit/tests/selftests/tdSelfTest3.py
+++ b/src/VBox/ValidationKit/tests/selftests/tdSelfTest3.py
@@ -8,7 +8,7 @@ Test Manager / Suite Self Test #3 - Bad XML input and other Failures.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/selftests/tdSelfTest4.py b/src/VBox/ValidationKit/tests/selftests/tdSelfTest4.py
index 529da04..3eccb9e 100755
--- a/src/VBox/ValidationKit/tests/selftests/tdSelfTest4.py
+++ b/src/VBox/ValidationKit/tests/selftests/tdSelfTest4.py
@@ -8,7 +8,7 @@ Test Manager / Suite Self Test #4 - Testing result overflow handling.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/shutdown/tdGuestOsShutdown1.py b/src/VBox/ValidationKit/tests/shutdown/tdGuestOsShutdown1.py
index 13d5ed8..a8001fe 100755
--- a/src/VBox/ValidationKit/tests/shutdown/tdGuestOsShutdown1.py
+++ b/src/VBox/ValidationKit/tests/shutdown/tdGuestOsShutdown1.py
@@ -7,7 +7,7 @@ VMM Guest OS boot tests.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -26,7 +26,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 97235 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/smoketests/Makefile.kmk b/src/VBox/ValidationKit/tests/smoketests/Makefile.kmk
index 59c2724..e5e035a 100644
--- a/src/VBox/ValidationKit/tests/smoketests/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/smoketests/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/smoketests/tdSmokeTest1.py b/src/VBox/ValidationKit/tests/smoketests/tdSmokeTest1.py
index 7d9340e..cfbd123 100755
--- a/src/VBox/ValidationKit/tests/smoketests/tdSmokeTest1.py
+++ b/src/VBox/ValidationKit/tests/smoketests/tdSmokeTest1.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - Smoke Test #1.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/storage/Makefile.kmk b/src/VBox/ValidationKit/tests/storage/Makefile.kmk
index 7095d1c..bd6125c 100644
--- a/src/VBox/ValidationKit/tests/storage/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/storage/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2012-2014 Oracle Corporation
+# Copyright (C) 2012-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/storage/tdStorageSnapshotMerging1.py b/src/VBox/ValidationKit/tests/storage/tdStorageSnapshotMerging1.py
index ccc9fad..9e9e5cc 100755
--- a/src/VBox/ValidationKit/tests/storage/tdStorageSnapshotMerging1.py
+++ b/src/VBox/ValidationKit/tests/storage/tdStorageSnapshotMerging1.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - Storage snapshotting and merging testcase.
 
 __copyright__ = \
 """
-Copyright (C) 2013 Oracle Corporation
+Copyright (C) 2013-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/teleportation/Makefile.kmk b/src/VBox/ValidationKit/tests/teleportation/Makefile.kmk
index f1f762a..120bb16 100644
--- a/src/VBox/ValidationKit/tests/teleportation/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/teleportation/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/teleportation/tdTeleportLocal1.py b/src/VBox/ValidationKit/tests/teleportation/tdTeleportLocal1.py
index eb99bed..803d5ed 100755
--- a/src/VBox/ValidationKit/tests/teleportation/tdTeleportLocal1.py
+++ b/src/VBox/ValidationKit/tests/teleportation/tdTeleportLocal1.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - Local teleportation testdriver.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 96152 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/unittests/Makefile.kmk b/src/VBox/ValidationKit/tests/unittests/Makefile.kmk
index 4b2099c..5cea077 100644
--- a/src/VBox/ValidationKit/tests/unittests/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/unittests/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py b/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py
index 4ccb683..11f5910 100755
--- a/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py
+++ b/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - Unit Tests.
 
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 98857 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/usb/Makefile.kmk b/src/VBox/ValidationKit/tests/usb/Makefile.kmk
index 959931e..5a5c1fc 100644
--- a/src/VBox/ValidationKit/tests/usb/Makefile.kmk
+++ b/src/VBox/ValidationKit/tests/usb/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2014 Oracle Corporation
+# Copyright (C) 2014-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/tests/usb/tdUsb1.py b/src/VBox/ValidationKit/tests/usb/tdUsb1.py
index c177318..586eeee 100755
--- a/src/VBox/ValidationKit/tests/usb/tdUsb1.py
+++ b/src/VBox/ValidationKit/tests/usb/tdUsb1.py
@@ -8,7 +8,7 @@ VirtualBox Validation Kit - USB testcase and benchmark.
 
 __copyright__ = \
 """
-Copyright (C) 2014 Oracle Corporation
+Copyright (C) 2014-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 98133 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Standard Python imports.
diff --git a/src/VBox/ValidationKit/tests/usb/usbgadget.py b/src/VBox/ValidationKit/tests/usb/usbgadget.py
index 6033cae..6f0e382 100644
--- a/src/VBox/ValidationKit/tests/usb/usbgadget.py
+++ b/src/VBox/ValidationKit/tests/usb/usbgadget.py
@@ -8,7 +8,7 @@ VirtualBox USB gadget control class
 
 __copyright__ = \
 """
-Copyright (C) 2014 Oracle Corporation
+Copyright (C) 2014-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
 available from http://www.virtualbox.org. This file is free software;
@@ -27,7 +27,7 @@ CDDL are applicable instead of those of the GPL.
 You may elect to license modified versions of this file under the
 terms and conditions of either the GPL or the CDDL or both.
 """
-__version__ = "$Revision: 98132 $"
+__version__ = "$Revision: 100880 $"
 
 
 # Validation Kit imports.
diff --git a/src/VBox/ValidationKit/utils/Makefile.kmk b/src/VBox/ValidationKit/utils/Makefile.kmk
index 7580cc5..f6e4fed 100644
--- a/src/VBox/ValidationKit/utils/Makefile.kmk
+++ b/src/VBox/ValidationKit/utils/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2014 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/TestExecServ/Makefile.kmk b/src/VBox/ValidationKit/utils/TestExecServ/Makefile.kmk
index 848ecb9..f37a62c 100644
--- a/src/VBox/ValidationKit/utils/TestExecServ/Makefile.kmk
+++ b/src/VBox/ValidationKit/utils/TestExecServ/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2014 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp b/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp
index 06257b3..de06023 100644
--- a/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp
+++ b/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -3352,7 +3352,7 @@ static RTEXITCODE txsParseArgv(int argc, char **argv, bool *pfExit)
                 break;
 
             case 'V':
-                RTPrintf("$Revision: 96152 $\n");
+                RTPrintf("$Revision: 100880 $\n");
                 *pfExit = true;
                 return RTEXITCODE_SUCCESS;
 
diff --git a/src/VBox/ValidationKit/utils/TestExecServ/TestExecServiceInternal.h b/src/VBox/ValidationKit/utils/TestExecServ/TestExecServiceInternal.h
index 3f82a1c..b6dc7bc 100644
--- a/src/VBox/ValidationKit/utils/TestExecServ/TestExecServiceInternal.h
+++ b/src/VBox/ValidationKit/utils/TestExecServ/TestExecServiceInternal.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/TestExecServ/TestExecServiceTcp.cpp b/src/VBox/ValidationKit/utils/TestExecServ/TestExecServiceTcp.cpp
index c5ce993..80442ff 100644
--- a/src/VBox/ValidationKit/utils/TestExecServ/TestExecServiceTcp.cpp
+++ b/src/VBox/ValidationKit/utils/TestExecServ/TestExecServiceTcp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh b/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
index 994b982..ef0ada1 100755
--- a/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+++ b/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh b/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
index 5ba232d..604b33a 100755
--- a/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+++ b/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs-sol10.xml b/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs-sol10.xml
index 2ff0b14..c921fc8 100644
--- a/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs-sol10.xml
+++ b/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs-sol10.xml
@@ -3,7 +3,7 @@
  Solaris SMF service manifest for the VirtualBox Test eXecution Service.
  $Id: vboxtxs-sol10.xml $
 
-    Copyright (C) 2010-2014 Oracle Corporation
+    Copyright (C) 2010-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs.sh b/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs.sh
index 27df500..993abcf 100755
--- a/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs.sh
+++ b/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs.sh
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2014 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs.xml b/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs.xml
index 2945f10..83e0b23 100644
--- a/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs.xml
+++ b/src/VBox/ValidationKit/utils/TestExecServ/solaris/vboxtxs.xml
@@ -3,7 +3,7 @@
  Solaris SMF service manifest for the VirtualBox Test eXecution Service.
  $Id: vboxtxs.xml $
 
-    Copyright (C) 2010-2014 Oracle Corporation
+    Copyright (C) 2010-2015 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
     available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/TestExecServ/win/vboxtxs-nat.cmd b/src/VBox/ValidationKit/utils/TestExecServ/win/vboxtxs-nat.cmd
index ce91739..83391f9 100644
--- a/src/VBox/ValidationKit/utils/TestExecServ/win/vboxtxs-nat.cmd
+++ b/src/VBox/ValidationKit/utils/TestExecServ/win/vboxtxs-nat.cmd
@@ -3,7 +3,7 @@
 @REM
 
 @REM
-REM Copyright (C) 2006-2014 Oracle Corporation
+REM Copyright (C) 2006-2015 Oracle Corporation
 REM
 REM This file is part of VirtualBox Open Source Edition (OSE), as
 REM available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/TestExecServ/win/vboxtxs.cmd b/src/VBox/ValidationKit/utils/TestExecServ/win/vboxtxs.cmd
index d096375..9e2615a 100644
--- a/src/VBox/ValidationKit/utils/TestExecServ/win/vboxtxs.cmd
+++ b/src/VBox/ValidationKit/utils/TestExecServ/win/vboxtxs.cmd
@@ -3,7 +3,7 @@
 @REM
 
 @REM
-REM Copyright (C) 2006-2014 Oracle Corporation
+REM Copyright (C) 2006-2015 Oracle Corporation
 REM
 REM This file is part of VirtualBox Open Source Edition (OSE), as
 REM available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/Makefile.kmk b/src/VBox/ValidationKit/utils/cpu/Makefile.kmk
index 8b183fe..5d58671 100644
--- a/src/VBox/ValidationKit/utils/cpu/Makefile.kmk
+++ b/src/VBox/ValidationKit/utils/cpu/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2014 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/cidet-app.cpp b/src/VBox/ValidationKit/utils/cpu/cidet-app.cpp
index 9644027..38e3a15 100644
--- a/src/VBox/ValidationKit/utils/cpu/cidet-app.cpp
+++ b/src/VBox/ValidationKit/utils/cpu/cidet-app.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/cidet-appA.asm b/src/VBox/ValidationKit/utils/cpu/cidet-appA.asm
index f4aef8a..8e857ad 100644
--- a/src/VBox/ValidationKit/utils/cpu/cidet-appA.asm
+++ b/src/VBox/ValidationKit/utils/cpu/cidet-appA.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2009-2014 Oracle Corporation
+; Copyright (C) 2009-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/cidet-core.cpp b/src/VBox/ValidationKit/utils/cpu/cidet-core.cpp
index bebcf5c..fa22495 100644
--- a/src/VBox/ValidationKit/utils/cpu/cidet-core.cpp
+++ b/src/VBox/ValidationKit/utils/cpu/cidet-core.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/cidet-instr-1.cpp b/src/VBox/ValidationKit/utils/cpu/cidet-instr-1.cpp
index dd92ea0..cff79aa 100644
--- a/src/VBox/ValidationKit/utils/cpu/cidet-instr-1.cpp
+++ b/src/VBox/ValidationKit/utils/cpu/cidet-instr-1.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/cidet.h b/src/VBox/ValidationKit/utils/cpu/cidet.h
index fca491c..c0576f1 100644
--- a/src/VBox/ValidationKit/utils/cpu/cidet.h
+++ b/src/VBox/ValidationKit/utils/cpu/cidet.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/cidet.mac b/src/VBox/ValidationKit/utils/cpu/cidet.mac
index 8b3da4f..f978943 100644
--- a/src/VBox/ValidationKit/utils/cpu/cidet.mac
+++ b/src/VBox/ValidationKit/utils/cpu/cidet.mac
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2014 Oracle Corporation
+; Copyright (C) 2014-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/cpu-alloc-all-mem.cpp b/src/VBox/ValidationKit/utils/cpu/cpu-alloc-all-mem.cpp
index 16d9ab1..c1e48bd 100644
--- a/src/VBox/ValidationKit/utils/cpu/cpu-alloc-all-mem.cpp
+++ b/src/VBox/ValidationKit/utils/cpu/cpu-alloc-all-mem.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/cpu-numa.cpp b/src/VBox/ValidationKit/utils/cpu/cpu-numa.cpp
index e4831a2..29c85c7 100644
--- a/src/VBox/ValidationKit/utils/cpu/cpu-numa.cpp
+++ b/src/VBox/ValidationKit/utils/cpu/cpu-numa.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/exceptionsR3-asm.asm b/src/VBox/ValidationKit/utils/cpu/exceptionsR3-asm.asm
index 162c39f..cc92fc4 100644
--- a/src/VBox/ValidationKit/utils/cpu/exceptionsR3-asm.asm
+++ b/src/VBox/ValidationKit/utils/cpu/exceptionsR3-asm.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2009-2014 Oracle Corporation
+; Copyright (C) 2009-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/exceptionsR3.cpp b/src/VBox/ValidationKit/utils/cpu/exceptionsR3.cpp
index 327f861..79df0f7 100644
--- a/src/VBox/ValidationKit/utils/cpu/exceptionsR3.cpp
+++ b/src/VBox/ValidationKit/utils/cpu/exceptionsR3.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/rdtsc.cpp b/src/VBox/ValidationKit/utils/cpu/rdtsc.cpp
index 2e1d305..2ccc59c 100644
--- a/src/VBox/ValidationKit/utils/cpu/rdtsc.cpp
+++ b/src/VBox/ValidationKit/utils/cpu/rdtsc.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/xmmsaving-asm.asm b/src/VBox/ValidationKit/utils/cpu/xmmsaving-asm.asm
index 840448e..4a461e0 100644
--- a/src/VBox/ValidationKit/utils/cpu/xmmsaving-asm.asm
+++ b/src/VBox/ValidationKit/utils/cpu/xmmsaving-asm.asm
@@ -4,7 +4,7 @@
 ;
 
 ;
-; Copyright (C) 2009-2014 Oracle Corporation
+; Copyright (C) 2009-2015 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/cpu/xmmsaving.cpp b/src/VBox/ValidationKit/utils/cpu/xmmsaving.cpp
index d409138..d50a4f7 100644
--- a/src/VBox/ValidationKit/utils/cpu/xmmsaving.cpp
+++ b/src/VBox/ValidationKit/utils/cpu/xmmsaving.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/misc/Makefile.kmk b/src/VBox/ValidationKit/utils/misc/Makefile.kmk
index 8d53fd6..50eb1f2 100644
--- a/src/VBox/ValidationKit/utils/misc/Makefile.kmk
+++ b/src/VBox/ValidationKit/utils/misc/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2014 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/misc/loadgenerator.cpp b/src/VBox/ValidationKit/utils/misc/loadgenerator.cpp
index 75ef84b..69f6075 100644
--- a/src/VBox/ValidationKit/utils/misc/loadgenerator.cpp
+++ b/src/VBox/ValidationKit/utils/misc/loadgenerator.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2014 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -305,7 +305,7 @@ int main(int argc, char **argv)
                 return 1;
 
             case 'V':
-                RTPrintf("$Revision: 96152 $\n");
+                RTPrintf("$Revision: 100880 $\n");
                 return 0;
 
             case VINF_GETOPT_NOT_OPTION:
diff --git a/src/VBox/ValidationKit/utils/misc/loadgeneratorR0.cpp b/src/VBox/ValidationKit/utils/misc/loadgeneratorR0.cpp
index 2a98ca6..53134e9 100644
--- a/src/VBox/ValidationKit/utils/misc/loadgeneratorR0.cpp
+++ b/src/VBox/ValidationKit/utils/misc/loadgeneratorR0.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2008-2014 Oracle Corporation
+ * Copyright (C) 2008-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/misc/vts_rm.cpp b/src/VBox/ValidationKit/utils/misc/vts_rm.cpp
index 999cbd9..a3855c2 100644
--- a/src/VBox/ValidationKit/utils/misc/vts_rm.cpp
+++ b/src/VBox/ValidationKit/utils/misc/vts_rm.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/misc/vts_tar.cpp b/src/VBox/ValidationKit/utils/misc/vts_tar.cpp
index 658c78b..595caea 100644
--- a/src/VBox/ValidationKit/utils/misc/vts_tar.cpp
+++ b/src/VBox/ValidationKit/utils/misc/vts_tar.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/network/Makefile.kmk b/src/VBox/ValidationKit/utils/network/Makefile.kmk
index 42a58d7..e742196 100644
--- a/src/VBox/ValidationKit/utils/network/Makefile.kmk
+++ b/src/VBox/ValidationKit/utils/network/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2014 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/network/NetPerf.cpp b/src/VBox/ValidationKit/utils/network/NetPerf.cpp
index 1c92b90..e2b24f0 100644
--- a/src/VBox/ValidationKit/utils/network/NetPerf.cpp
+++ b/src/VBox/ValidationKit/utils/network/NetPerf.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2014 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -1860,7 +1860,7 @@ int main(int argc, char *argv[])
                 return RTEXITCODE_SUCCESS;
 
             case 'V':
-                RTPrintf("$Revision: 96152 $\n");
+                RTPrintf("$Revision: 100880 $\n");
                 return RTEXITCODE_SUCCESS;
 
             case 'w':
diff --git a/src/VBox/ValidationKit/utils/nt/Makefile.kmk b/src/VBox/ValidationKit/utils/nt/Makefile.kmk
index 950e829..51674fb 100644
--- a/src/VBox/ValidationKit/utils/nt/Makefile.kmk
+++ b/src/VBox/ValidationKit/utils/nt/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2014 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/nt/ntsetfreq.cpp b/src/VBox/ValidationKit/utils/nt/ntsetfreq.cpp
index d5bf574..8afa85a 100644
--- a/src/VBox/ValidationKit/utils/nt/ntsetfreq.cpp
+++ b/src/VBox/ValidationKit/utils/nt/ntsetfreq.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2014 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/nt/nttimesources.cpp b/src/VBox/ValidationKit/utils/nt/nttimesources.cpp
index e2d1d61..6c91328 100644
--- a/src/VBox/ValidationKit/utils/nt/nttimesources.cpp
+++ b/src/VBox/ValidationKit/utils/nt/nttimesources.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2009-2014 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/usb/Makefile.kmk b/src/VBox/ValidationKit/utils/usb/Makefile.kmk
index db7433b..d327b2a 100644
--- a/src/VBox/ValidationKit/utils/usb/Makefile.kmk
+++ b/src/VBox/ValidationKit/utils/usb/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2014 Oracle Corporation
+# Copyright (C) 2014-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/ValidationKit/utils/usb/UsbTest.cpp b/src/VBox/ValidationKit/utils/usb/UsbTest.cpp
index 26b8dd3..2b03a47 100644
--- a/src/VBox/ValidationKit/utils/usb/UsbTest.cpp
+++ b/src/VBox/ValidationKit/utils/usb/UsbTest.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/apps/Makefile.kmk b/src/apps/Makefile.kmk
index e89b3f3..c1ca2ac 100644
--- a/src/apps/Makefile.kmk
+++ b/src/apps/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/apps/adpctl/Makefile.kmk b/src/apps/adpctl/Makefile.kmk
index acd6c00..cf95fff 100644
--- a/src/apps/adpctl/Makefile.kmk
+++ b/src/apps/adpctl/Makefile.kmk
@@ -6,7 +6,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/apps/svnsync-vbox/Makefile.kmk b/src/apps/svnsync-vbox/Makefile.kmk
index fc1e871..00d6d6d 100644
--- a/src/apps/svnsync-vbox/Makefile.kmk
+++ b/src/apps/svnsync-vbox/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/apps/tunctl/Makefile.kmk b/src/apps/tunctl/Makefile.kmk
index 67addd4..3820efe 100644
--- a/src/apps/tunctl/Makefile.kmk
+++ b/src/apps/tunctl/Makefile.kmk
@@ -6,7 +6,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/Makefile.kmk b/src/bldprogs/Makefile.kmk
index 2e0f671..73f57fb 100644
--- a/src/bldprogs/Makefile.kmk
+++ b/src/bldprogs/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -33,14 +33,18 @@ VBoxCmp_TEMPLATE = VBoxBldProg
 VBoxCmp_SOURCES = VBoxCmp.cpp
 
 ifndef VBOX_ONLY_BUILD
- BLDPROGS += scm
- scm_TEMPLATE = VBoxAdvBldProg
+ PROGRAMS += scm
+ scm_TEMPLATE = VBoxR3Tool
  scm_SOURCES = \
  	scm.cpp \
  	scmdiff.cpp \
  	scmrw.cpp \
  	scmstream.cpp \
  	scmsubversion.cpp
+ ifdef VBOX_PATH_SUBVERSION_INCS
+  scm_INCS += $(VBOX_PATH_SUBVERSION_INCS) $(VBOX_PATH_APACHE_RUNTIME_INCS)
+  scm_DEFS += SCM_WITH_SVN_HEADERS
+ endif
 
  BLDPROGS += VBoxCPP
  VBoxCPP_TEMPLATE = VBoxAdvBldProg
diff --git a/src/bldprogs/VBoxCPP.cpp b/src/bldprogs/VBoxCPP.cpp
index e6ecdf4..9185b25 100644
--- a/src/bldprogs/VBoxCPP.cpp
+++ b/src/bldprogs/VBoxCPP.cpp
@@ -13,7 +13,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -5359,7 +5359,7 @@ static RTEXITCODE vbcppParseOptions(PVBCPP pThis, int argc, char **argv, bool *p
             case 'V':
             {
                 /* The following is assuming that svn does it's job here. */
-                static const char s_szRev[] = "$Revision: 96254 $";
+                static const char s_szRev[] = "$Revision: 100896 $";
                 const char *psz = RTStrStripL(strchr(s_szRev, ' '));
                 RTPrintf("r%.*s\n", strchr(psz, ' ') - psz, psz);
                 *pfExit = true;
diff --git a/src/bldprogs/VBoxCmp.cpp b/src/bldprogs/VBoxCmp.cpp
index e0a3ffd..b05d8f6 100644
--- a/src/bldprogs/VBoxCmp.cpp
+++ b/src/bldprogs/VBoxCmp.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/VBoxPeSetVersion.cpp b/src/bldprogs/VBoxPeSetVersion.cpp
index 0dc8b21..e2dd846 100644
--- a/src/bldprogs/VBoxPeSetVersion.cpp
+++ b/src/bldprogs/VBoxPeSetVersion.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/VBoxTpG.cpp b/src/bldprogs/VBoxTpG.cpp
index 672ac32..8f874cf 100644
--- a/src/bldprogs/VBoxTpG.cpp
+++ b/src/bldprogs/VBoxTpG.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -2325,7 +2325,7 @@ static RTEXITCODE parseArguments(int argc,  char **argv)
             case 'V':
             {
                 /* The following is assuming that svn does it's job here. */
-                static const char s_szRev[] = "$Revision: 98008 $";
+                static const char s_szRev[] = "$Revision: 100896 $";
                 const char *psz = RTStrStripL(strchr(s_szRev, ' '));
                 RTPrintf("r%.*s\n", strchr(psz, ' ') - psz, psz);
                 return RTEXITCODE_SUCCESS;
diff --git a/src/bldprogs/bin2c.c b/src/bldprogs/bin2c.c
index 8bd75c7..b4cffdc 100644
--- a/src/bldprogs/bin2c.c
+++ b/src/bldprogs/bin2c.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/biossums.c b/src/bldprogs/biossums.c
index aa02a2f..fc9b575 100644
--- a/src/bldprogs/biossums.c
+++ b/src/bldprogs/biossums.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/checkUndefined.sh b/src/bldprogs/checkUndefined.sh
index 389ddf7..d7c9996 100755
--- a/src/bldprogs/checkUndefined.sh
+++ b/src/bldprogs/checkUndefined.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/deftoimp.sed b/src/bldprogs/deftoimp.sed
index 56b4de3..f61ef30 100644
--- a/src/bldprogs/deftoimp.sed
+++ b/src/bldprogs/deftoimp.sed
@@ -5,7 +5,7 @@
 
 #
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/filesplitter.cpp b/src/bldprogs/filesplitter.cpp
index 9c88bcd..6114786 100644
--- a/src/bldprogs/filesplitter.cpp
+++ b/src/bldprogs/filesplitter.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/preload.cpp b/src/bldprogs/preload.cpp
index 827a99c..43e6aa2 100644
--- a/src/bldprogs/preload.cpp
+++ b/src/bldprogs/preload.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -146,7 +146,7 @@ int main(int argc, char **argv)
             if (   !strcmp(argv[i], "--version")
                 || !strcmp(argv[i], "-V"))
             {
-                printf("$Revision: 83575 $\n");
+                printf("$Revision: 100896 $\n");
                 return 0;
             }
             fprintf(stderr, "syntax error: unknown option '%s'\n", argv[i]);
diff --git a/src/bldprogs/scm.cpp b/src/bldprogs/scm.cpp
index f0fb15a..9730e9c 100644
--- a/src/bldprogs/scm.cpp
+++ b/src/bldprogs/scm.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -215,6 +215,16 @@ static PFNSCMREWRITER const g_aRewritersFor_RC[] =
     rewrite_SvnKeywords
 };
 
+static PFNSCMREWRITER const g_aRewritersFor_DEF[] =
+{
+    rewrite_ForceNativeEol,
+    rewrite_ExpandTabs,
+    rewrite_StripTrailingBlanks,
+    rewrite_AdjustTrailingLines,
+    rewrite_SvnNoExecutable,
+    rewrite_SvnKeywords
+};
+
 static PFNSCMREWRITER const g_aRewritersFor_ShellScripts[] =
 {
     rewrite_ForceLF,
@@ -229,6 +239,13 @@ static PFNSCMREWRITER const g_aRewritersFor_BatchFiles[] =
     rewrite_StripTrailingBlanks
 };
 
+static PFNSCMREWRITER const g_aRewritersFor_SedScripts[] =
+{
+    rewrite_ForceLF,
+    rewrite_ExpandTabs,
+    rewrite_StripTrailingBlanks
+};
+
 static PFNSCMREWRITER const g_aRewritersFor_Python[] =
 {
     /** @todo rewrite_ForceLFIfExecutable */
@@ -243,11 +260,13 @@ static SCMCFGENTRY const g_aConfigs[] =
 {
     { RT_ELEMENTS(g_aRewritersFor_Makefile_kup), &g_aRewritersFor_Makefile_kup[0], "Makefile.kup" },
     { RT_ELEMENTS(g_aRewritersFor_Makefile_kmk), &g_aRewritersFor_Makefile_kmk[0], "Makefile.kmk|Config.kmk" },
-    { RT_ELEMENTS(g_aRewritersFor_C_and_CPP),    &g_aRewritersFor_C_and_CPP[0],    "*.c|*.cpp|*.C|*.CPP|*.cxx|*.cc" },
+    { RT_ELEMENTS(g_aRewritersFor_C_and_CPP),    &g_aRewritersFor_C_and_CPP[0],    "*.c|*.cpp|*.C|*.CPP|*.cxx|*.cc|*.m|*.mm" },
     { RT_ELEMENTS(g_aRewritersFor_H_and_HPP),    &g_aRewritersFor_H_and_HPP[0],    "*.h|*.hpp" },
     { RT_ELEMENTS(g_aRewritersFor_RC),           &g_aRewritersFor_RC[0],           "*.rc" },
+    { RT_ELEMENTS(g_aRewritersFor_DEF),          &g_aRewritersFor_DEF[0],          "*.def" },
     { RT_ELEMENTS(g_aRewritersFor_ShellScripts), &g_aRewritersFor_ShellScripts[0], "*.sh|configure" },
     { RT_ELEMENTS(g_aRewritersFor_BatchFiles),   &g_aRewritersFor_BatchFiles[0],   "*.bat|*.cmd|*.btm|*.vbs|*.ps1" },
+    { RT_ELEMENTS(g_aRewritersFor_SedScripts),   &g_aRewritersFor_SedScripts[0],   "*.sed" },
     { RT_ELEMENTS(g_aRewritersFor_Python),       &g_aRewritersFor_Python[0],       "*.py" },
 };
 
@@ -676,6 +695,8 @@ static int scmSettingsAddPair(PSCMSETTINGS pSettings, const char *pchLine, size_
  */
 static int scmSettingsLoadFile(PSCMSETTINGS pSettings, const char *pszFilename)
 {
+    ScmVerbose(NULL, 3, "Loading settings file '%s'...\n", pszFilename);
+
     SCMSTREAM Stream;
     int rc = ScmStreamInitForReading(&Stream, pszFilename);
     if (RT_FAILURE(rc))
@@ -1540,7 +1561,7 @@ int main(int argc, char **argv)
             case 'V':
             {
                 /* The following is assuming that svn does it's job here. */
-                static const char s_szRev[] = "$Revision: 100060 $";
+                static const char s_szRev[] = "$Revision: 100919 $";
                 const char *psz = RTStrStripL(strchr(s_szRev, ' '));
                 RTPrintf("r%.*s\n", strchr(psz, ' ') - psz, psz);
                 return 0;
diff --git a/src/bldprogs/scm.h b/src/bldprogs/scm.h
index 2ac4200..d130fce 100644
--- a/src/bldprogs/scm.h
+++ b/src/bldprogs/scm.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/scmdiff.cpp b/src/bldprogs/scmdiff.cpp
index f2d28e8..bbbb840 100644
--- a/src/bldprogs/scmdiff.cpp
+++ b/src/bldprogs/scmdiff.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/scmdiff.h b/src/bldprogs/scmdiff.h
index 6827dcf..239e884 100644
--- a/src/bldprogs/scmdiff.h
+++ b/src/bldprogs/scmdiff.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/scmrw.cpp b/src/bldprogs/scmrw.cpp
index ea72296..6613363 100644
--- a/src/bldprogs/scmrw.cpp
+++ b/src/bldprogs/scmrw.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/scmstream.cpp b/src/bldprogs/scmstream.cpp
index 4a03ed9..b5782f4 100644
--- a/src/bldprogs/scmstream.cpp
+++ b/src/bldprogs/scmstream.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/scmstream.h b/src/bldprogs/scmstream.h
index cda64a8..e443bca 100644
--- a/src/bldprogs/scmstream.h
+++ b/src/bldprogs/scmstream.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/bldprogs/scmsubversion.cpp b/src/bldprogs/scmsubversion.cpp
index 34505e0..825e6b1 100644
--- a/src/bldprogs/scmsubversion.cpp
+++ b/src/bldprogs/scmsubversion.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -15,7 +15,7 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
 
-#define SCM_WITHOUT_LIBSVN
+#define SCM_WITH_DYNAMIC_LIB_SVN
 
 /*******************************************************************************
 *   Header Files                                                               *
@@ -24,20 +24,104 @@
 #include <iprt/ctype.h>
 #include <iprt/dir.h>
 #include <iprt/env.h>
-#include <iprt/file.h>
 #include <iprt/err.h>
+#include <iprt/file.h>
 #include <iprt/getopt.h>
+#include <iprt/handle.h>
 #include <iprt/initterm.h>
+#include <iprt/ldr.h>
 #include <iprt/mem.h>
 #include <iprt/message.h>
 #include <iprt/param.h>
 #include <iprt/path.h>
+#include <iprt/pipe.h>
+#include <iprt/poll.h>
 #include <iprt/process.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
 
 #include "scm.h"
 
+#if defined(SCM_WITH_DYNAMIC_LIB_SVN) && defined(SCM_WITH_SVN_HEADERS)
+# include <svn_client.h>
+#endif
+
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+#ifdef SCM_WITH_DYNAMIC_LIB_SVN
+# if defined(RT_OS_WINDOWS) && defined(RT_ARCH_X86)
+#  define APR_CALL                       __stdcall
+#  define SVN_CALL                       /* __stdcall ?? */
+# else
+#  define APR_CALL
+#  define SVN_CALL
+# endif
+#endif
+#if defined(SCM_WITH_DYNAMIC_LIB_SVN) && !defined(SCM_WITH_SVN_HEADERS)
+# define SVN_ERR_MISC_CATEGORY_START    200000
+# define SVN_ERR_UNVERSIONED_RESOURCE   (SVN_ERR_MISC_CATEGORY_START + 5)
+#endif
+
+
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+#if defined(SCM_WITH_DYNAMIC_LIB_SVN) && !defined(SCM_WITH_SVN_HEADERS)
+typedef int                         apr_status_t;
+typedef int64_t                     apr_time_t;
+typedef struct apr_pool_t           apr_pool_t;
+typedef struct apr_hash_t           apr_hash_t;
+typedef struct apr_hash_index_t     apr_hash_index_t;
+typedef struct apr_array_header_t   apr_array_header_t;
+
+
+typedef struct svn_error_t
+{
+    apr_status_t                    apr_err;
+    const char                     *_dbgr_message;
+    struct svn_error_t             *_dbgr_child;
+    apr_pool_t                     *_dbgr_pool;
+    const char                     *_dbgr_file;
+    long                            _dbgr_line;
+} svn_error_t;
+typedef int                         svn_boolean_t;
+typedef long int                    svn_revnum_t;
+typedef struct svn_client_ctx_t     svn_client_ctx_t;
+typedef enum svn_opt_revision_kind
+{
+    svn_opt_revision_unspecified = 0,
+    svn_opt_revision_number,
+    svn_opt_revision_date,
+    svn_opt_revision_committed,
+    svn_opt_revision_previous,
+    svn_opt_revision_base,
+    svn_opt_revision_working,
+    svn_opt_revision_head
+} svn_opt_revision_kind;
+typedef union svn_opt_revision_value_t
+{
+    svn_revnum_t                    number;
+    apr_time_t                      date;
+} svn_opt_revision_value_t;
+typedef struct svn_opt_revision_t
+{
+  svn_opt_revision_kind             kind;
+  svn_opt_revision_value_t          value;
+} svn_opt_revision_t;
+typedef enum svn_depth_t
+{
+    svn_depth_unknown = -2,
+    svn_depth_exclude,
+    svn_depth_empty,
+    svn_depth_files,
+    svn_depth_immediates,
+    svn_depth_infinity
+} svn_depth_t;
+
+#endif /* SCM_WITH_DYNAMIC_LIB_SVN && !SCM_WITH_SVN_HEADERS */
+
 
 /*******************************************************************************
 *   Global Variables                                                           *
@@ -48,11 +132,35 @@ static enum
     kScmSvnVersion_Ancient = 1,
     kScmSvnVersion_1_6,
     kScmSvnVersion_1_7,
+    kScmSvnVersion_1_8,
     kScmSvnVersion_End
 }           g_enmSvnVersion = kScmSvnVersion_Ancient;
 
 
-#ifdef SCM_WITHOUT_LIBSVN
+#ifdef SCM_WITH_DYNAMIC_LIB_SVN
+/** Set if all the function pointers are valid. */
+static bool                             g_fSvnFunctionPointersValid;
+/** @name SVN and APR imports.
+ * @{ */
+static apr_status_t          (APR_CALL *g_pfnAprInitialize)(void);
+static apr_hash_index_t *    (APR_CALL *g_pfnAprHashFirst)(apr_pool_t *pPool, apr_hash_t *pHashTab);
+static apr_hash_index_t *    (APR_CALL *g_pfnAprHashNext)(apr_hash_index_t *pCurIdx);
+static void *                (APR_CALL *g_pfnAprHashThisVal)(apr_hash_index_t *pHashIdx);
+static apr_pool_t *          (SVN_CALL *g_pfnSvnPoolCreateEx)(apr_pool_t *pParent, void *pvAllocator);
+static void                  (APR_CALL *g_pfnAprPoolClear)(apr_pool_t *pPool);
+static void                  (APR_CALL *g_pfnAprPoolDestroy)(apr_pool_t *pPool);
+
+static svn_error_t *         (SVN_CALL *g_pfnSvnClientCreateContext)(svn_client_ctx_t **ppCtx, apr_pool_t *pPool);
+static svn_error_t *         (SVN_CALL *g_pfnSvnClientPropGet4)(apr_hash_t **ppHashProps, const char *pszPropName,
+                                                                const char *pszTarget, const svn_opt_revision_t *pPeggedRev,
+                                                                const svn_opt_revision_t *pRevision, svn_revnum_t *pActualRev,
+                                                                svn_depth_t enmDepth, const apr_array_header_t *pChangeList,
+                                                                svn_client_ctx_t *pCtx, apr_pool_t *pResultPool,
+                                                                apr_pool_t *pScratchPool);
+/**@} */
+#endif
+
+
 
 /**
  * Callback that is call for each path to search.
@@ -77,9 +185,6 @@ static DECLCALLBACK(int) scmSvnFindSvnBinaryCallback(char const *pchPath, size_t
     return VERR_TRY_AGAIN;
 }
 
-#include <iprt/handle.h>
-#include <iprt/pipe.h>
-#include <iprt/poll.h>
 
 /**
  * Reads from a pipe.
@@ -547,6 +652,126 @@ static int scmSvnRun(PSCMRWSTATE pState, const char **papszArgs, bool fNormalFai
 }
 
 
+#ifdef SCM_WITH_DYNAMIC_LIB_SVN
+/**
+ * Attempts to resolve the necessary subversion and apache portable runtime APIs
+ * we require dynamically.
+ *
+ * Will set all global function pointers and g_fSvnFunctionPointersValid to true
+ * on success.
+ */
+static void scmSvnTryResolveFunctions(void)
+{
+    char szPath[RTPATH_MAX];
+    int rc = RTStrCopy(szPath, sizeof(szPath), g_szSvnPath);
+    if (RT_SUCCESS(rc))
+    {
+        RTPathStripFilename(szPath);
+        char *pszEndPath = strchr(szPath, '\0');
+# ifdef RT_OS_WINDOWS
+        RTPathChangeToDosSlashes(szPath, false);
+# endif
+
+        /*
+         * Try various prefixes/suffxies/locations.
+         */
+        static struct
+        {
+            const char *pszPrefix;
+            const char *pszSuffix;
+        } const s_aVariations[] =
+        {
+# ifdef RT_OS_WINDOWS
+            { "SlikSvn-lib", "-1.dll" },    /* SlikSVN */
+            { "lib", "-1.dll" },            /* Win32Svn,CollabNet,++ */
+# elif defined(RT_OS_DARWIN)
+            { "../lib/lib", "-1.dylib" },
+# else
+            { "../lib/lib", ".so" },
+            { "../lib/lib", "-1.so" },
+# endif
+        };
+        for (unsigned iVar = 0; RT_ELEMENTS(s_aVariations); iVar++)
+        {
+            /*
+             * Try load the svn_client library ...
+             */
+            static const char * const s_apszLibraries[]   = { "svn_client", "svn_subr",   "apr" };
+            RTLDRMOD ahMods[RT_ELEMENTS(s_apszLibraries)] = { NIL_RTLDRMOD, NIL_RTLDRMOD, NIL_RTLDRMOD };
+
+            rc = VINF_SUCCESS;
+            unsigned iLib;
+            for (iLib = 0; iLib < RT_ELEMENTS(s_apszLibraries) && RT_SUCCESS(rc); iLib++)
+            {
+                *pszEndPath = '\0';
+                rc = RTPathAppend(szPath, sizeof(szPath), s_aVariations[iVar].pszPrefix);
+                if (RT_SUCCESS(rc))
+                    rc = RTStrCat(szPath, sizeof(szPath), s_apszLibraries[iLib]);
+                if (RT_SUCCESS(rc))
+                    rc = RTStrCat(szPath, sizeof(szPath), s_aVariations[iVar].pszSuffix);
+                if (RT_SUCCESS(rc))
+                {
+# ifdef RT_OS_WINDOWS
+                    RTPathChangeToDosSlashes(pszEndPath, false);
+# endif
+                    rc = RTLdrLoadEx(szPath, &ahMods[iLib], RTLDRLOAD_FLAGS_NT_SEARCH_DLL_LOAD_DIR , NULL);
+                }
+            }
+            if (iLib == RT_ELEMENTS(s_apszLibraries) && RT_SUCCESS(rc))
+            {
+                static const struct
+                {
+                    unsigned    iLib;
+                    const char *pszSymbol;
+                    PFNRT      *ppfn;
+                } s_aSymbols[] =
+                {
+                    { 2, "apr_initialize",              (PFNRT *)&g_pfnAprInitialize },
+                    { 2, "apr_hash_first",              (PFNRT *)&g_pfnAprHashFirst },
+                    { 2, "apr_hash_next",               (PFNRT *)&g_pfnAprHashNext },
+                    { 2, "apr_hash_this_val",           (PFNRT *)&g_pfnAprHashThisVal },
+                    { 1, "svn_pool_create_ex",          (PFNRT *)&g_pfnSvnPoolCreateEx },
+                    { 2, "apr_pool_clear",              (PFNRT *)&g_pfnAprPoolClear },
+                    { 2, "apr_pool_destroy",            (PFNRT *)&g_pfnAprPoolDestroy },
+                    { 0, "svn_client_create_context",   (PFNRT *)&g_pfnSvnClientCreateContext },
+                    { 0, "svn_client_propget4",         (PFNRT *)&g_pfnSvnClientPropGet4 },
+                };
+                for (unsigned i = 0; i < RT_ELEMENTS(s_aSymbols); i++)
+                {
+                    rc = RTLdrGetSymbol(ahMods[s_aSymbols[i].iLib], s_aSymbols[i].pszSymbol,
+                                        (void **)(uintptr_t)s_aSymbols[i].ppfn);
+                    if (RT_FAILURE(rc))
+                    {
+                        ScmVerbose(NULL, 0, "Failed to resolve '%s' in '%s'",
+                                   s_aSymbols[i].pszSymbol, s_apszLibraries[s_aSymbols[i].iLib]);
+                        break;
+                    }
+                }
+                if (RT_SUCCESS(rc))
+                {
+                    apr_status_t rcApr = g_pfnAprInitialize();
+                    if (rcApr == 0)
+                    {
+                        ScmVerbose(NULL, 1, "Found subversion APIs.\n");
+                        g_fSvnFunctionPointersValid = true;
+                    }
+                    else
+                    {
+                        ScmVerbose(NULL, 0, "apr_initialize failed: %#x (%d)\n", rcApr, rcApr);
+                        AssertMsgFailed(("%#x (%d)\n", rc, rc));
+                    }
+                    return;
+                }
+            }
+
+            while (iLib-- > 0)
+                RTLdrClose(ahMods[iLib]);
+        }
+    }
+}
+#endif /* SCM_WITH_DYNAMIC_LIB_SVN */
+
+
 /**
  * Finds the svn binary, updating g_szSvnPath and g_enmSvnVersion.
  */
@@ -587,7 +812,9 @@ static void scmSvnFindSvnBinary(PSCMRWSTATE pState)
     if (RT_SUCCESS(rc))
     {
         char *pszStripped = RTStrStrip(pszVersion);
-        if (RTStrVersionCompare(pszVersion, "1.7") >= 0)
+        if (RTStrVersionCompare(pszVersion, "1.8") >= 0)
+            g_enmSvnVersion = kScmSvnVersion_1_8;
+        else if (RTStrVersionCompare(pszVersion, "1.7") >= 0)
             g_enmSvnVersion = kScmSvnVersion_1_7;
         else if (RTStrVersionCompare(pszVersion, "1.6") >= 0)
             g_enmSvnVersion = kScmSvnVersion_1_6;
@@ -597,6 +824,16 @@ static void scmSvnFindSvnBinary(PSCMRWSTATE pState)
     }
     else
         g_enmSvnVersion = kScmSvnVersion_Ancient;
+
+#ifdef SCM_WITH_DYNAMIC_LIB_SVN
+    /*
+     * If we got version 1.8 or later, try see if we can locate a few of the
+     * simpler SVN APIs.
+     */
+    g_fSvnFunctionPointersValid = false;
+    if (g_enmSvnVersion >= kScmSvnVersion_1_8)
+        scmSvnTryResolveFunctions();
+#endif
 }
 
 
@@ -657,7 +894,71 @@ static bool scmSvnReadNumber(const char *pch, size_t cch, size_t *pu)
     return true;
 }
 
-#endif /* SCM_WITHOUT_LIBSVN */
+
+#ifdef SCM_WITH_DYNAMIC_LIB_SVN
+
+/**
+ * Wrapper around RTPathAbs.
+ * @returns Same as RTPathAbs.
+ * @param   pszPath             The relative path.
+ * @param   pszAbsPath          Where to return the absolute path.
+ * @param   cbAbsPath           Size of the @a pszAbsPath buffer.
+ */
+static int scmSvnAbsPath(const char *pszPath, char *pszAbsPath, size_t cbAbsPath)
+{
+    int rc = RTPathAbs(pszPath, pszAbsPath, cbAbsPath);
+# if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+    if (RT_SUCCESS(rc))
+        RTPathChangeToUnixSlashes(pszAbsPath, true /*fForce*/);
+# endif
+    return rc;
+}
+
+
+/**
+ * Checks if @a pszPath exists in the current WC.
+ *
+ * @returns true, false or -1. In the latter case, please use the fallback.
+ * @param   pszPath         Path to the object that should be investigated.
+ */
+static int scmSvnIsObjectInWorkingCopy(const char *pszPath)
+{
+    int rc = -1;
+
+    /* svn_client_propget4 and later requires absolute target path. */
+    char szAbsPath[RTPATH_MAX];
+    int  rc2 = scmSvnAbsPath(pszPath, szAbsPath, sizeof(szAbsPath));
+    if (RT_SUCCESS(rc2))
+    {
+        /* Create calling context. */
+        apr_pool_t *pPool = g_pfnSvnPoolCreateEx(NULL, NULL);
+        if (pPool)
+        {
+            svn_client_ctx_t *pCtx = NULL;
+            svn_error_t *pErr = g_pfnSvnClientCreateContext(&pCtx, pPool);
+            if (!pErr)
+            {
+                /* Make the call. */
+                apr_hash_t         *pHash = NULL;
+                svn_opt_revision_t  Rev;
+                RT_ZERO(Rev);
+                Rev.kind          = svn_opt_revision_base;
+                Rev.value.number  = -1L;
+                pErr = g_pfnSvnClientPropGet4(&pHash, "svn:no-such-property", szAbsPath, &Rev, &Rev,
+                                              NULL /*pActualRev*/, svn_depth_empty, NULL /*pChangeList*/, pCtx, pPool, pPool);
+                if (!pErr)
+                    rc = true;
+                else if (pErr->apr_err == SVN_ERR_UNVERSIONED_RESOURCE)
+                    rc = false;
+            }
+            g_pfnAprPoolDestroy(pPool);
+        }
+    }
+    return rc;
+}
+
+#endif /* SCM_WITH_DYNAMIC_LIB_SVN */
+
 
 /**
  * Checks if the file we're operating on is part of a SVN working copy.
@@ -667,8 +968,18 @@ static bool scmSvnReadNumber(const char *pch, size_t cch, size_t *pu)
  */
 bool ScmSvnIsInWorkingCopy(PSCMRWSTATE pState)
 {
-#ifdef SCM_WITHOUT_LIBSVN
     scmSvnFindSvnBinary(pState);
+
+#ifdef SCM_WITH_DYNAMIC_LIB_SVN
+    if (g_fSvnFunctionPointersValid)
+    {
+        int rc = scmSvnIsObjectInWorkingCopy(pState->pszFilename);
+        if (rc == (int)true || rc == (int)false)
+            return rc == (int)true;
+    }
+
+    /* Fallback: */
+#endif
     if (g_enmSvnVersion < kScmSvnVersion_1_7)
     {
         /*
@@ -690,13 +1001,10 @@ bool ScmSvnIsInWorkingCopy(PSCMRWSTATE pState)
             return true;
         }
     }
-
-#else
-    NOREF(pState);
-#endif
     return false;
 }
 
+
 /**
  * Checks if the specified directory is part of a SVN working copy.
  *
@@ -705,8 +1013,18 @@ bool ScmSvnIsInWorkingCopy(PSCMRWSTATE pState)
  */
 bool ScmSvnIsDirInWorkingCopy(const char *pszDir)
 {
-#ifdef SCM_WITHOUT_LIBSVN
     scmSvnFindSvnBinary(NULL);
+
+#ifdef SCM_WITH_DYNAMIC_LIB_SVN
+    if (g_fSvnFunctionPointersValid)
+    {
+        int rc = scmSvnIsObjectInWorkingCopy(pszDir);
+        if (rc == (int)true || rc == (int)false)
+            return rc == (int)true;
+    }
+
+    /* Fallback: */
+#endif
     if (g_enmSvnVersion < kScmSvnVersion_1_7)
     {
         /*
@@ -728,13 +1046,74 @@ bool ScmSvnIsDirInWorkingCopy(const char *pszDir)
             return true;
         }
     }
-
-#else
-    NOREF(pState);
-#endif
     return false;
 }
 
+
+#ifdef SCM_WITH_DYNAMIC_LIB_SVN
+/**
+ * Checks if @a pszPath exists in the current WC.
+ *
+ * @returns IPRT status code - VERR_NOT_SUPPORT if fallback should be attempted.
+ * @param   pszPath         Path to the object that should be investigated.
+ * @param   pszProperty     The property name.
+ * @param   ppszValue       Where to return the property value. Optional.
+ */
+static int scmSvnQueryPropertyUsingApi(const char *pszPath, const char *pszProperty, char **ppszValue)
+{
+    int rc = VERR_NOT_SUPPORTED;
+
+    /* svn_client_propget4 and later requires absolute target path. */
+    char szAbsPath[RTPATH_MAX];
+    int  rc2 = scmSvnAbsPath(pszPath, szAbsPath, sizeof(szAbsPath));
+    if (RT_SUCCESS(rc2))
+    {
+        /* Create calling context. */
+        apr_pool_t *pPool = g_pfnSvnPoolCreateEx(NULL, NULL);
+        if (pPool)
+        {
+            svn_client_ctx_t *pCtx = NULL;
+            svn_error_t *pErr = g_pfnSvnClientCreateContext(&pCtx, pPool);
+            if (!pErr)
+            {
+                /* Make the call. */
+                apr_hash_t         *pHash = NULL;
+                svn_opt_revision_t  Rev;
+                RT_ZERO(Rev);
+                Rev.kind          = svn_opt_revision_base;
+                Rev.value.number  = -1L;
+                pErr = g_pfnSvnClientPropGet4(&pHash, pszProperty, szAbsPath, &Rev, &Rev,
+                                              NULL /*pActualRev*/, svn_depth_empty, NULL /*pChangeList*/, pCtx, pPool, pPool);
+                if (!pErr)
+                {
+                    /* Get the first value, if any. */
+                    rc = VERR_NOT_FOUND;
+                    apr_hash_index_t *pHashIdx = g_pfnAprHashFirst(pPool, pHash);
+                    if (pHashIdx)
+                    {
+                        const char **ppszFirst = (const char **)g_pfnAprHashThisVal(pHashIdx);
+                        if (ppszFirst && *ppszFirst)
+                        {
+                            if (ppszValue)
+                                rc = RTStrDupEx(ppszValue, *ppszFirst);
+                            else
+                                rc = VINF_SUCCESS;
+                        }
+                    }
+                }
+                else if (pErr->apr_err == SVN_ERR_UNVERSIONED_RESOURCE)
+                    rc = VERR_INVALID_STATE;
+                else
+                    rc = VERR_GENERAL_FAILURE;
+            }
+            g_pfnAprPoolDestroy(pPool);
+        }
+    }
+    return rc;
+}
+#endif /* SCM_WITH_DYNAMIC_LIB_SVN */
+
+
 /**
  * Queries the value of an SVN property.
  *
@@ -750,6 +1129,8 @@ bool ScmSvnIsDirInWorkingCopy(const char *pszDir)
  */
 int ScmSvnQueryProperty(PSCMRWSTATE pState, const char *pszName, char **ppszValue)
 {
+    int rc;
+
     /*
      * Look it up in the scheduled changes.
      */
@@ -765,9 +1146,18 @@ int ScmSvnQueryProperty(PSCMRWSTATE pState, const char *pszName, char **ppszValu
             return VINF_SUCCESS;
         }
 
-#ifdef SCM_WITHOUT_LIBSVN
-    int rc;
     scmSvnFindSvnBinary(pState);
+
+#ifdef SCM_WITH_DYNAMIC_LIB_SVN
+    if (g_fSvnFunctionPointersValid)
+    {
+        rc = scmSvnQueryPropertyUsingApi(pState->pszFilename, pszName, ppszValue);
+        if (rc != VERR_NOT_SUPPORTED)
+            return rc;
+        /* Fallback: */
+    }
+#endif
+
     if (g_enmSvnVersion < kScmSvnVersion_1_7)
     {
         /*
@@ -914,11 +1304,6 @@ int ScmSvnQueryProperty(PSCMRWSTATE pState, const char *pszName, char **ppszValu
         }
     }
     return rc;
-
-#else
-    NOREF(pState);
-#endif
-    return VERR_NOT_FOUND;
 }
 
 
@@ -1030,9 +1415,17 @@ int ScmSvnDisplayChanges(PSCMRWSTATE pState)
  */
 int ScmSvnApplyChanges(PSCMRWSTATE pState)
 {
-#ifdef SCM_WITHOUT_LIBSVN
     scmSvnFindSvnBinary(pState);
 
+#ifdef SCM_WITH_LATER
+    if (0)
+    {
+        return ...;
+    }
+
+    /* Fallback: */
+#endif
+
     /*
      * Iterate thru the changes and apply them by starting the svn client.
      */
@@ -1054,8 +1447,5 @@ int ScmSvnApplyChanges(PSCMRWSTATE pState)
     }
 
     return VINF_SUCCESS;
-#else
-    return VERR_NOT_IMPLEMENTED;
-#endif
 }
 
diff --git a/src/libs/Makefile.kmk b/src/libs/Makefile.kmk
index 28f1b30..db79877 100644
--- a/src/libs/Makefile.kmk
+++ b/src/libs/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2014 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -52,7 +52,7 @@ endif
 if !defined(VBOX_ONLY_SDK) \
  && (   "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
      || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
- include $(PATH_SUB_CURRENT)/openssl-1.0.1m/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/openssl-1.0.1o/Makefile.kmk
 endif
 
 # libjpeg for VRDP video redirection
diff --git a/src/libs/kStuff/Makefile.kmk b/src/libs/kStuff/Makefile.kmk
index 2d9b56d..9498a9b 100644
--- a/src/libs/kStuff/Makefile.kmk
+++ b/src/libs/kStuff/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2007-2012 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk
index c999e6b..f06c002 100644
--- a/src/libs/liblzf-3.4/Makefile.kmk
+++ b/src/libs/liblzf-3.4/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/libs/xpcom18a4/Config.kmk b/src/libs/xpcom18a4/Config.kmk
index 7177b9a..34587b9 100644
--- a/src/libs/xpcom18a4/Config.kmk
+++ b/src/libs/xpcom18a4/Config.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/libs/xpcom18a4/Makefile.kmk b/src/libs/xpcom18a4/Makefile.kmk
index 917e76b..5c4599e 100644
--- a/src/libs/xpcom18a4/Makefile.kmk
+++ b/src/libs/xpcom18a4/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/libs/xpcom18a4/java/Makefile.kmk b/src/libs/xpcom18a4/java/Makefile.kmk
index 51053b7..07ab739 100644
--- a/src/libs/xpcom18a4/java/Makefile.kmk
+++ b/src/libs/xpcom18a4/java/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp b/src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp
index 5649c82..103f2f3 100644
--- a/src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp
+++ b/src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp
@@ -504,7 +504,9 @@ JXUTILS_NATIVE(wrapJavaObject) (JNIEnv* env, jobject, jobject aJavaObject,
       if (iid.Parse(str)) {
         rv = JavaObjectToNativeInterface(env, aJavaObject, iid, &xpcomObject);
         if (NS_SUCCEEDED(rv)) {
-          rv = ((nsISupports*) xpcomObject)->QueryInterface(iid, &xpcomObject);
+          nsISupports *xpcom_nat_obj = (nsISupports*) xpcomObject;
+          rv = xpcom_nat_obj->QueryInterface(iid, &xpcomObject);
+          NS_IF_RELEASE(xpcom_nat_obj);
         }
       } else {
         rv = NS_ERROR_INVALID_ARG;
diff --git a/src/libs/xpcom18a4/java/src/nsJavaWrapper.cpp b/src/libs/xpcom18a4/java/src/nsJavaWrapper.cpp
index 19436f1..a046c8a 100644
--- a/src/libs/xpcom18a4/java/src/nsJavaWrapper.cpp
+++ b/src/libs/xpcom18a4/java/src/nsJavaWrapper.cpp
@@ -757,7 +757,10 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
         rv = JavaObjectToNativeInterface(env, java_obj, iid, &xpcom_obj);
         if (NS_FAILED(rv))
           break;
-        rv = ((nsISupports*) xpcom_obj)->QueryInterface(iid, &xpcom_obj);
+        NS_ENSURE_TRUE(xpcom_obj, NS_ERROR_FAILURE);
+        nsISupports *xpcom_nat_obj = (nsISupports*) xpcom_obj;
+        rv = xpcom_nat_obj->QueryInterface(iid, &xpcom_obj);
+        NS_IF_RELEASE(xpcom_nat_obj);
         if (NS_FAILED(rv))
           break;
 
diff --git a/src/libs/xpcom18a4/java/src/nsJavaXPCOMBindingUtils.cpp b/src/libs/xpcom18a4/java/src/nsJavaXPCOMBindingUtils.cpp
index 33a1849..f91fdd8 100644
--- a/src/libs/xpcom18a4/java/src/nsJavaXPCOMBindingUtils.cpp
+++ b/src/libs/xpcom18a4/java/src/nsJavaXPCOMBindingUtils.cpp
@@ -787,9 +787,16 @@ JavaXPCOMInstance::~JavaXPCOMInstance()
   nsresult rv = NS_OK;
 
 #ifdef VBOX
+# if 0
   nsCOMPtr<nsIEventQueue> eq = do_GetMainThreadQueue();
   rv = NS_ProxyRelease(eq.get(), mInstance);
   rv |= NS_ProxyRelease(eq.get(), mIInfo);
+# else
+  // The above code crashes in nsTraceRefcntImpl::LogAddCOMPtr() (@bugref 7620)
+  NS_RELEASE(mInstance);
+  NS_RELEASE(mIInfo);
+  rv = NS_OK;
+# endif
 #else
   // Need to release these objects on the main thread.
   nsCOMPtr<nsIThread> thread = do_GetMainThread();
diff --git a/src/libs/xpcom18a4/java/src/nsJavaXPCOMGlue.cpp b/src/libs/xpcom18a4/java/src/nsJavaXPCOMGlue.cpp
index 4c8f657..b0b6b72 100644
--- a/src/libs/xpcom18a4/java/src/nsJavaXPCOMGlue.cpp
+++ b/src/libs/xpcom18a4/java/src/nsJavaXPCOMGlue.cpp
@@ -118,6 +118,7 @@ GetJavaFilePath(JNIEnv* env, jobject aFile)
 #include "nsXPTCUtils.h"
 #include "nsCOMPtr.h"
 #include "nsIInterfaceInfoManager.h"
+#include "nsJavaInterfaces.h"
 
 void
 ThrowException(JNIEnv* env, const nsresult aErrorCode, const char* aMessage);
@@ -224,11 +225,17 @@ NS_DestroyXPTCallStub(nsISomeInterface* aStub)
 }
 
 
+extern "C" void JAVAPROXY_NATIVE(finalizeProxy)(JNIEnv *env, jclass that, jobject aJavaProxy);
+
 nsresult
 FindVBoxMethods(JNIEnv* env, jobject aXPCOMPath, void** aFunctions)
 {
     nsresult rv = 0;
 
+    // We only need to care about this function because the C function we offer
+    // is different from what the Java side expects
+    aFunctions[kFunc_FinalizeProxy] = (void*)JAVAPROXY_NATIVE(finalizeProxy);
+
     return rv;
 }
 #else
diff --git a/src/libs/xpcom18a4/python/Makefile.kmk b/src/libs/xpcom18a4/python/Makefile.kmk
index fd09003..e4ea86c 100644
--- a/src/libs/xpcom18a4/python/Makefile.kmk
+++ b/src/libs/xpcom18a4/python/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2009-2012 Oracle Corporation
+# Copyright (C) 2009-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/libs/xpcom18a4/xpcom/base/nsExceptionService.cpp b/src/libs/xpcom18a4/xpcom/base/nsExceptionService.cpp
index 0a50858..fe30c14 100644
--- a/src/libs/xpcom18a4/xpcom/base/nsExceptionService.cpp
+++ b/src/libs/xpcom18a4/xpcom/base/nsExceptionService.cpp
@@ -116,7 +116,7 @@ PRInt32 nsExceptionManager::totalInstances = 0;
 // NS_CheckThreadSafe() assertions will still happen and yell in the debug
 // build. Since it is quite annoying, we use a special ReleaseQuiet() mehtod
 // in DoDropThread() to shut them up.
-NS_IMPL_ISUPPORTS1(nsExceptionManager, nsIExceptionManager)
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsExceptionManager, nsIExceptionManager)
 
 nsExceptionManager::nsExceptionManager(nsExceptionService *svc) :
   mNextThread(nsnull),
diff --git a/src/recompiler/Makefile.kmk b/src/recompiler/Makefile.kmk
index be92c7c..910eb58 100644
--- a/src/recompiler/Makefile.kmk
+++ b/src/recompiler/Makefile.kmk
@@ -4,7 +4,7 @@
 #
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git



More information about the Pkg-virtualbox-commits mailing list